1.17-pre1 stuff (#2436)

* 1.17-pre1 stuff

* Update mappings/net/minecraft/server/MinecraftServer.mapping

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* a

* removed a mappings

* Update SignBlockEntityRenderer.mapping

* Update MinecraftServer.mapping

* more things

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
Shnupbups 2021-06-03 01:35:05 +10:00 committed by GitHub
parent 382232eee2
commit 24a6894e06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 119 additions and 7 deletions

View File

@ -19,5 +19,5 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStri
ARG 0 lightning
ARG 1 bystander
METHOD method_37244 test (Lnet/minecraft/class_47;Ljava/util/List;)Z
ARG 1 lightningContext
ARG 2 bystanderContexts
ARG 1 lightning
ARG 2 bystanders

View File

@ -21,6 +21,7 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock
ARG 1 world
ARG 2 pos
ARG 3 direction
ARG 4 postProcess
METHOD method_33360 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_2350;)Z
ARG 5 to
METHOD method_33361 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680;
@ -36,12 +37,14 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock
ARG 3 pos
ARG 4 from
ARG 5 to
ARG 6 postProcess
METHOD method_33364 trySpreadRandomly (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/Random;Z)Z
ARG 1 state
ARG 2 world
ARG 3 pos
ARG 4 from
ARG 5 random
ARG 6 postProcess
METHOD method_33365 disableDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2746;)Lnet/minecraft/class_2680;
ARG 0 state
ARG 1 direction

View File

@ -9,8 +9,11 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
ARG 1 pos
ARG 2 state
METHOD method_11333 setOwner (Lcom/mojang/authlib/GameProfile;)V
ARG 1 owner
METHOD method_11334 getOwner ()Lcom/mojang/authlib/GameProfile;
METHOD method_11335 loadProperties (Lcom/mojang/authlib/GameProfile;Ljava/util/function/Consumer;)V
ARG 0 owner
ARG 1 callback
METHOD method_11336 setSessionService (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V
ARG 0 value
METHOD method_11337 setUserCache (Lnet/minecraft/class_3312;)V
@ -23,3 +26,5 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
ARG 1 pos
ARG 2 state
ARG 3 blockEntity
METHOD method_37249 (Lcom/mojang/authlib/GameProfile;)V
ARG 1 owner

View File

@ -12,8 +12,18 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen
FIELD field_2634 credits Ljava/util/List;
FIELD field_2635 speed F
FIELD field_32273 CENTERED_LINE_PREFIX Ljava/lang/String;
FIELD field_33954 baseSpeed F
FIELD field_33955 SEPARATOR_LINE Lnet/minecraft/class_5348;
FIELD field_33957 SPACE_BAR_SPEED_MULTIPLIER F
METHOD <init> (ZLjava/lang/Runnable;)V
ARG 1 endCredits
ARG 2 finishAction
METHOD method_2257 close ()V
METHOD method_2258 renderBackground ()V
METHOD method_37304 addText (Lnet/minecraft/class_5348;Z)V
ARG 1 text
ARG 2 centered
METHOD method_37305 addText (Ljava/lang/String;Z)V
ARG 1 text
ARG 2 centered
METHOD method_37306 addEmptyLine ()V

View File

@ -1,6 +1,7 @@
CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlockEntityRenderer
FIELD field_27754 typeToModel Ljava/util/Map;
FIELD field_27755 textRenderer Lnet/minecraft/class_327;
FIELD field_32830 STICK Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V
ARG 1 ctx
METHOD method_32154 getTexturedModelData ()Lnet/minecraft/class_5607;

View File

@ -1,4 +1,6 @@
CLASS net/minecraft/class_1538 net/minecraft/entity/LightningEntity
FIELD field_33904 struckEntities Ljava/util/Set;
FIELD field_33905 blocksSetOnFire I
FIELD field_7182 channeler Lnet/minecraft/class_3222;
FIELD field_7183 remainingActions I
FIELD field_7184 cosmetic Z
@ -22,6 +24,8 @@ CLASS net/minecraft/class_1538 net/minecraft/entity/LightningEntity
ARG 1 pos
METHOD method_35052 getChanneler ()Lnet/minecraft/class_3222;
METHOD method_36607 getAffectedBlockPos ()Lnet/minecraft/class_2338;
METHOD method_37220 getBlocksSetOnFire ()I
METHOD method_37221 getStruckEntities ()Ljava/util/stream/Stream;
METHOD method_6960 spawnFire (I)V
ARG 1 spreadAttempts
METHOD method_6961 setChanneler (Lnet/minecraft/class_3222;)V

View File

@ -18,6 +18,12 @@ CLASS net/minecraft/class_13 net/minecraft/entity/ai/pathing/PathNodeNavigator
ARG 5 distance
ARG 6 rangeMultiplier
METHOD method_54 findPathToAny (Lnet/minecraft/class_3695;Lnet/minecraft/class_9;Ljava/util/Map;FIF)Lnet/minecraft/class_11;
ARG 1 profiler
ARG 2 startNode
ARG 3 positions
ARG 4 followRange
ARG 5 distance
ARG 6 rangeMultiplier
METHOD method_55 createPath (Lnet/minecraft/class_9;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_11;
ARG 1 endNode
ARG 2 target

View File

@ -50,6 +50,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
METHOD method_33221 shouldBabyBeDifferent (Ljava/util/Random;)Z
ARG 0 random
METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V
ARG 1 player
METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767;
METHOD method_33226 isPlayingDead ()Z
METHOD method_33227 createAxolotlAttributes ()Lnet/minecraft/class_5132$class_5133;

View File

@ -1,11 +1,12 @@
CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate
FIELD field_20692 ANY Lnet/minecraft/class_4550;
FIELD field_20693 tag Lnet/minecraft/class_3494;
FIELD field_20694 block Ljava/util/Set;
FIELD field_20694 blocks Ljava/util/Set;
FIELD field_20695 state Lnet/minecraft/class_4559;
FIELD field_20696 nbt Lnet/minecraft/class_2105;
METHOD <init> (Lnet/minecraft/class_3494;Ljava/util/Set;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V
ARG 1 tag
ARG 2 blocks
ARG 3 state
ARG 4 nbt
METHOD method_22452 toJson ()Lcom/google/gson/JsonElement;
@ -17,16 +18,19 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate
METHOD method_33185 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException;
ARG 0 id
CLASS class_4710 Builder
FIELD field_21572 block Ljava/util/Set;
FIELD field_21572 blocks Ljava/util/Set;
FIELD field_21573 tag Lnet/minecraft/class_3494;
FIELD field_21574 state Lnet/minecraft/class_4559;
FIELD field_21575 nbt Lnet/minecraft/class_2105;
METHOD method_23880 create ()Lnet/minecraft/class_4550$class_4710;
METHOD method_23882 build ()Lnet/minecraft/class_4550;
METHOD method_27962 block ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4550$class_4710;
METHOD method_27962 blocks ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4550$class_4710;
ARG 1 blocks
METHOD method_27963 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4550$class_4710;
ARG 1 state
METHOD method_29233 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_4550$class_4710;
ARG 1 tag
METHOD method_35042 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4550$class_4710;
ARG 1 nbt
METHOD method_37214 blocks (Ljava/lang/Iterable;)Lnet/minecraft/class_4550$class_4710;
ARG 1 blocks

View File

@ -6,6 +6,9 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
FIELD field_23135 fishingHook Lnet/minecraft/class_4965;
FIELD field_24488 vehicle Lnet/minecraft/class_2048;
FIELD field_24489 targetedEntity Lnet/minecraft/class_2048;
FIELD field_33912 steppingOn Lnet/minecraft/class_2090;
FIELD field_33913 lightningBolt Lnet/minecraft/class_6404;
FIELD field_33914 passenger Lnet/minecraft/class_2048;
FIELD field_9594 effects Lnet/minecraft/class_2102;
FIELD field_9595 type Lnet/minecraft/class_2050;
FIELD field_9596 location Lnet/minecraft/class_2090;
@ -17,10 +20,31 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
ARG 1 type
ARG 2 distance
ARG 3 location
ARG 4 steppingOn
ARG 5 effects
ARG 6 nbt
ARG 7 flags
ARG 8 equipment
ARG 9 player
ARG 10 fishingHook
ARG 11 lightningBolt
ARG 12 team
ARG 13 catType
METHOD <init> (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_6404;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;Lnet/minecraft/class_2960;)V
ARG 1 type
ARG 2 distance
ARG 3 location
ARG 4 steppingOn
ARG 5 effects
ARG 6 nbt
ARG 7 flags
ARG 8 equipment
ARG 9 player
ARG 10 fishingHook
ARG 12 vehicle
ARG 14 targetedEntity
ARG 15 team
ARG 16 catType
METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47;
ARG 0 player
ARG 1 target
@ -42,6 +66,9 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
FIELD field_23136 fishHook Lnet/minecraft/class_4965;
FIELD field_24490 vehicle Lnet/minecraft/class_2048;
FIELD field_24491 targetedEntity Lnet/minecraft/class_2048;
FIELD field_33915 steppingOn Lnet/minecraft/class_2090;
FIELD field_33916 lightningBolt Lnet/minecraft/class_6404;
FIELD field_33917 passenger Lnet/minecraft/class_2048;
FIELD field_9602 distance Lnet/minecraft/class_2025;
FIELD field_9603 nbt Lnet/minecraft/class_2105;
FIELD field_9604 location Lnet/minecraft/class_2090;
@ -64,6 +91,12 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
ARG 1 vehicle
METHOD method_27972 targetedEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049;
ARG 1 targetedEntity
METHOD method_37228 lightningBolt (Lnet/minecraft/class_6404;)Lnet/minecraft/class_2048$class_2049;
ARG 1 lightningBolt
METHOD method_37229 passenger (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049;
ARG 1 passenger
METHOD method_37230 steppingOn (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2048$class_2049;
ARG 1 location
METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049;
ARG 1 nbt
METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049;

View File

@ -0,0 +1,17 @@
CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredicate
FIELD field_33920 ANY Lnet/minecraft/class_6404;
FIELD field_33921 BLOCKS_SET_ON_FIRE_KEY Ljava/lang/String;
FIELD field_33922 ENTITY_STRUCK_KEY Ljava/lang/String;
FIELD field_33923 blocksSetOnFire Lnet/minecraft/class_2096$class_2100;
FIELD field_33924 entityStruck Lnet/minecraft/class_2048;
METHOD <init> (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)V
ARG 1 blocksSetOnFire
ARG 2 entityStruck
METHOD method_37234 toJson ()Lcom/google/gson/JsonElement;
METHOD method_37236 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z
ARG 1 lightningBolt
ARG 2 world
METHOD method_37237 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_6404;
ARG 0 blocksSetOnFire
METHOD method_37238 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_6404;
ARG 0 json

View File

@ -4,12 +4,13 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate
FIELD field_9641 count Lnet/minecraft/class_2096$class_2100;
FIELD field_9642 potion Lnet/minecraft/class_1842;
FIELD field_9643 tag Lnet/minecraft/class_3494;
FIELD field_9644 item Ljava/util/Set;
FIELD field_9644 items Ljava/util/Set;
FIELD field_9645 nbt Lnet/minecraft/class_2105;
FIELD field_9646 durability Lnet/minecraft/class_2096$class_2100;
FIELD field_9647 enchantments [Lnet/minecraft/class_2035;
METHOD <init> (Lnet/minecraft/class_3494;Ljava/util/Set;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V
ARG 1 tag
ARG 2 items
ARG 3 count
ARG 4 durability
ARG 5 enchantments
@ -48,6 +49,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate
METHOD method_8975 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2073$class_2074;
ARG 1 tag
METHOD method_8976 build ()Lnet/minecraft/class_2073;
METHOD method_8977 item ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2073$class_2074;
METHOD method_8977 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2073$class_2074;
ARG 1 items
METHOD method_8978 enchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074;
ARG 1 enchantment

View File

@ -40,6 +40,7 @@ CLASS net/minecraft/server/MinecraftServer
FIELD field_33211 MAX_WORLD_BORDER_RADIUS I
FIELD field_33217 PLAYER_SAMPLE_UPDATE_INTERVAL J
FIELD field_33219 START_TICKET_CHUNKS I
FIELD field_33979 profilerEnabled Z
FIELD field_4543 onlineMode Z
FIELD field_4544 running Z
FIELD field_4546 LOGGER Lorg/apache/logging/log4j/Logger;
@ -205,6 +206,7 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_3731 setEnforceWhitelist (Z)V
ARG 1 whitelistEnabled
METHOD method_3732 shouldBroadcastRconToOps ()Z
METHOD method_37321 isRunningMonitor ()Z
METHOD method_3734 getCommandManager ()Lnet/minecraft/class_2170;
COMMENT Gets the server's command manager.
COMMENT The command manager is responsible for parsing and dispatching commands.

View File

@ -0,0 +1,8 @@
CLASS net/minecraft/class_6413 net/minecraft/server/dedicated/command/PerfCommand
FIELD field_33985 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_33986 NOT_RUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_33987 ALREADY_RUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
METHOD method_37331 register (Lcom/mojang/brigadier/CommandDispatcher;)V
ARG 0 dispatcher
METHOD method_37333 (Lnet/minecraft/class_2168;)I
ARG 0 source

View File

@ -6,6 +6,8 @@ CLASS net/minecraft/class_5585 net/minecraft/world/gen/feature/GeodeLayerConfig
FIELD field_27299 outerLayerProvider Lnet/minecraft/class_4651;
FIELD field_27300 innerBlocks Ljava/util/List;
FIELD field_27301 CODEC Lcom/mojang/serialization/Codec;
FIELD field_33769 cannotReplace Lnet/minecraft/class_2960;
FIELD field_33931 invalidBlocks Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Ljava/util/List;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V
ARG 1 fillingProvider
ARG 2 innerLayerProvider
@ -13,5 +15,7 @@ CLASS net/minecraft/class_5585 net/minecraft/world/gen/feature/GeodeLayerConfig
ARG 4 middleLayerProvider
ARG 5 outerLayerProvider
ARG 6 innerBlocks
ARG 7 cannotReplace
ARG 8 invalidBlocks
METHOD method_31887 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance

View File

@ -9,10 +9,18 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig
FIELD field_29279 dirtProvider Lnet/minecraft/class_4651;
FIELD field_29280 foliageProvider Lnet/minecraft/class_4651;
FIELD field_29281 forceDirt Z
FIELD field_33933 saplingProvider Lnet/minecraft/class_4651;
METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V
ARG 1 trunkProvider
ARG 2 trunkPlacer
ARG 3 foliageProvider
ARG 4 saplingProvider
ARG 5 foliagePlacer
ARG 6 dirtProvider
ARG 7 maximumSize
ARG 8 decorators
ARG 9 ignoreVines
ARG 10 forceDirt
METHOD method_27373 setTreeDecorators (Ljava/util/List;)Lnet/minecraft/class_4643;
ARG 1 decorators
METHOD method_28811 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
@ -27,10 +35,14 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig
FIELD field_29282 foliageProvider Lnet/minecraft/class_4651;
FIELD field_29283 dirtProvider Lnet/minecraft/class_4651;
FIELD field_29284 forceDirt Z
FIELD field_33934 saplingProvider Lnet/minecraft/class_4651;
METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;)V
ARG 1 trunkProvider
ARG 2 trunkPlacer
ARG 3 foliageProvider
ARG 4 saplingProvider
ARG 5 foliagePlacer
ARG 6 minimumSize
METHOD method_23445 build ()Lnet/minecraft/class_4643;
METHOD method_27374 ignoreVines ()Lnet/minecraft/class_4643$class_4644;
METHOD method_27376 decorators (Ljava/util/List;)Lnet/minecraft/class_4643$class_4644;