From a046ab2dbb8d31c3f015f49ed304063c9e279e93 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 15 Apr 2021 21:41:15 +1000 Subject: [PATCH] 21w15a stuff (#2330) --- .../client/network/ClientPlayNetworkHandler.mapping | 3 +++ mappings/net/minecraft/client/world/ClientWorld.mapping | 4 ++++ .../net/minecraft/entity/ai/brain/task/RamTask.mapping | 1 + .../net/minecraft/entity/passive/AxolotlEntity.mapping | 1 + mappings/net/minecraft/entity/passive/GoatBrain.mapping | 3 +++ mappings/net/minecraft/entity/passive/GoatEntity.mapping | 9 +++++++++ .../packet/s2c/play/ResourcePackSendS2CPacket.mapping | 3 +++ mappings/net/minecraft/server/MinecraftServer.mapping | 1 + .../server/dedicated/MinecraftDedicatedServer.mapping | 3 +++ .../server/dedicated/ServerPropertiesHandler.mapping | 1 + .../minecraft/server/network/ServerPlayerEntity.mapping | 4 ++++ .../net/minecraft/util/snooper/SnooperListener.mapping | 1 + 12 files changed, 34 insertions(+) create mode 100644 mappings/net/minecraft/entity/ai/brain/task/RamTask.mapping diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 7d556f8bf3..165db98733 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -60,3 +60,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_29356 getWorldKeys ()Ljava/util/Set; METHOD method_31363 getPlayerUuids ()Ljava/util/Collection; + METHOD method_36322 getServerResourcePackPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 0 defaultPrompt + ARG 1 customPrompt diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 730bbffb98..9cd7deb9f6 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -113,6 +113,9 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_32124 (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_35752 getBlockParticle ()Lnet/minecraft/class_638$class_6234; + METHOD method_35753 putMapStates (Ljava/util/Map;)V + ARG 1 mapStates + METHOD method_35754 getMapStates ()Ljava/util/Map; METHOD method_8435 setTimeOfDay (J)V ARG 1 timeOfDay METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V @@ -143,6 +146,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_27876 setDifficultyLocked (Z)V ARG 1 difficultyLocked METHOD method_28105 getSkyDarknessHeight (Lnet/minecraft/class_5539;)D + ARG 1 world METHOD method_28106 getHorizonShadingRatio ()D CLASS class_5612 ClientEntityHandler CLASS class_6234 BlockParticle diff --git a/mappings/net/minecraft/entity/ai/brain/task/RamTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RamTask.mapping new file mode 100644 index 0000000000..de74e2dddd --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/RamTask.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_6338 net/minecraft/entity/ai/brain/task/RamTask diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 2f7940c9dc..d1e0431eb5 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;)V ARG 0 axolotl METHOD method_35176 isAirLessThanMax ()Z + METHOD method_36282 hydrateFromPotion ()V CLASS class_5763 AxolotlData FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767; METHOD ([Lnet/minecraft/class_5762$class_5767;)V diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index 8f50dcb425..7f560e24b5 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain FIELD field_30409 FOLLOW_ADULT_WALK_SPEED F FIELD field_30410 NORMAL_WALK_SPEED F FIELD field_30411 LONG_JUMP_COOLDOWN_RANGE Lnet/minecraft/class_6019; + FIELD field_33499 RAM_COOLDOWN_RANGE Lnet/minecraft/class_6019; METHOD method_35181 getTemptItems ()Lnet/minecraft/class_1856; METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain @@ -19,3 +20,5 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain ARG 0 brain METHOD method_35188 addLongJumpActivities (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_36288 addRamActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain diff --git a/mappings/net/minecraft/entity/passive/GoatEntity.mapping b/mappings/net/minecraft/entity/passive/GoatEntity.mapping index ccc34f73a9..732f43a9ba 100644 --- a/mappings/net/minecraft/entity/passive/GoatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping @@ -4,6 +4,15 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity FIELD field_30401 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_30402 FALL_DAMAGE_SUBTRACTOR I FIELD field_30403 SCREAMING_CHANCE D + FIELD field_33486 SCREAMING Lnet/minecraft/class_2940; METHOD method_35178 isScreaming ()Z METHOD method_35179 createGoatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_35180 getMilkingSound ()Lnet/minecraft/class_3414; + METHOD method_36284 setScreaming (Z)V + ARG 1 screaming + CLASS class_6339 GoatPathNodeMaker + FIELD field_33489 pos Lnet/minecraft/class_2338$class_2339; + CLASS class_6340 GoatNavigation + METHOD (Lnet/minecraft/class_6053;Lnet/minecraft/class_1937;)V + ARG 1 goat + ARG 2 world diff --git a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping index 593a0f8c3e..db4f1ec7cf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping @@ -3,12 +3,15 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/play/ResourcePac FIELD field_12428 hash Ljava/lang/String; FIELD field_27844 required Z FIELD field_33340 MAX_HASH_LENGTH I + FIELD field_33541 prompt Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;Ljava/lang/String;ZLnet/minecraft/class_2561;)V ARG 1 url ARG 2 hash ARG 3 required + ARG 4 prompt METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11772 getURL ()Ljava/lang/String; METHOD method_11773 getSHA1 ()Ljava/lang/String; METHOD method_32307 isRequired ()Z + METHOD method_36340 getPrompt ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 1687421162..3cfb5a1f6f 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -169,6 +169,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 player METHOD method_34864 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_36113 getProxy ()Ljava/net/Proxy; + METHOD method_36326 getResourcePackPrompt ()Lnet/minecraft/class_2561; METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3718 isFlightEnabled ()Z METHOD method_3719 getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 464b254466..cdf975a5e5 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated FIELD field_16799 propertiesLoader Lnet/minecraft/class_3807; FIELD field_16800 gui Lnet/minecraft/class_3182; FIELD field_26898 filterer Lnet/minecraft/class_5514; + FIELD field_33431 resourcePackPrompt Lnet/minecraft/class_2561; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;Lnet/minecraft/class_3807;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread ARG 2 registryManager @@ -32,3 +33,5 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated METHOD method_13951 convertData ()Z METHOD method_16712 setUseWhitelist (Z)V ARG 1 useWhitelist + METHOD method_36239 parseResourcePackPrompt (Lnet/minecraft/class_3807;)Lnet/minecraft/class_2561; + ARG 0 propertiesLoader diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 39362f913b..773334abb6 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -48,6 +48,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_25802 rateLimit I FIELD field_26899 textFilteringConfig Ljava/lang/String; FIELD field_27845 requireResourcePack Z + FIELD field_33432 resourcePackPrompt Ljava/lang/String; METHOD (Ljava/util/Properties;Lnet/minecraft/class_5455;)V ARG 1 properties ARG 2 registryManager diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 65f8a4255f..b16e4d0a20 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -90,6 +90,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 playerName ARG 2 team METHOD method_14228 setExperiencePoints (I)V + ARG 1 points METHOD method_14230 isPvpEnabled ()Z METHOD method_14231 onDisconnect ()V METHOD method_14232 getWatchedSection ()Lnet/minecraft/class_4076; @@ -139,6 +140,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 url ARG 2 hash ARG 3 required + ARG 4 resourcePackPrompt METHOD method_17668 setWatchedSection (Lnet/minecraft/class_4076;)V COMMENT Sets the chunk section position the player's client is currently watching COMMENT from. This is usually called when the player moves to a new chunk section. @@ -193,6 +195,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 type METHOD method_33795 shouldFilterMessagesSentTo (Lnet/minecraft/class_3222;)Z ARG 1 player + METHOD method_34225 onSpawn ()V + METHOD method_34879 areClientChatColorsEnabled ()Z METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 diff --git a/mappings/net/minecraft/util/snooper/SnooperListener.mapping b/mappings/net/minecraft/util/snooper/SnooperListener.mapping index dd74938a7a..b76ebb45f4 100644 --- a/mappings/net/minecraft/util/snooper/SnooperListener.mapping +++ b/mappings/net/minecraft/util/snooper/SnooperListener.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1279 net/minecraft/util/snooper/SnooperListener + METHOD method_35033 isSnooperEnabled ()Z METHOD method_35034 addInitialSnooperInfo (Lnet/minecraft/class_1276;)V ARG 1 snooper METHOD method_5495 addSnooperInfo (Lnet/minecraft/class_1276;)V