diff --git a/build.gradle b/build.gradle
index 58febe63f7..a877ddf62a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ plugins {
id 'maven-publish'
}
-def minecraft_version = "20w08a"
+def minecraft_version = "20w09a"
def ENV = System.getenv()
// Fetch build number from Jenkins
diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping
index aa5ae5864e..d5fe2ce8ed 100644
--- a/mappings/net/minecraft/client/options/GameOptions.mapping
+++ b/mappings/net/minecraft/client/options/GameOptions.mapping
@@ -41,7 +41,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions
FIELD field_1854 touchscreen Z
FIELD field_1856 mipmapLevels I
FIELD field_1857 fullscreen Z
- FIELD field_1859 STRING_LIST_TYPE Ljava/lang/reflect/Type;
+ FIELD field_1859 STRING_LIST_TYPE Lcom/google/gson/reflect/TypeToken;
FIELD field_1863 client Lnet/minecraft/class_310;
FIELD field_1864 lastServer Ljava/lang/String;
FIELD field_1865 invertYMouse Z
diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping
index 58332eca17..0bb54b9cc1 100644
--- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping
+++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping
@@ -52,14 +52,9 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
METHOD method_3365 renderQuad (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFLjava/util/List;II)V
METHOD method_3367 render (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_1087;FFFII)V
METHOD method_3370 renderQuadsFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;IIZLnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;Ljava/util/BitSet;)V
- ARG 1 world
- ARG 2 state
- ARG 3 pos
ARG 4 light
ARG 5 overlay
ARG 6 useWorldLight
- ARG 7 matrix
- ARG 8 vertexConsumer
ARG 9 quads
ARG 10 flags
METHOD method_3373 renderFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z
@@ -90,7 +85,7 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
FIELD field_4194 light [I
FIELD field_4196 brightness [F
METHOD method_3386 getAmbientOcclusionBrightness (IIII)I
- METHOD method_3388 apply (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;[FLjava/util/BitSet;)V
+ METHOD method_3388 apply (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;[FLjava/util/BitSet;Z)V
ARG 1 world
ARG 2 state
ARG 3 pos
diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping
index 0c91834864..5f79f37a2e 100644
--- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping
@@ -15,7 +15,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer
ARG 2 tickDelta
METHOD method_3921 hasLabel (Lnet/minecraft/class_1297;)Z
COMMENT Determines whether the passed entity should render with a nameplate above its head.
- COMMENT
+ COMMENT
COMMENT
Checks for a custom nametag on living entities, and for teams/team visibilities for players.
ARG 1 entity
METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Ljava/lang/String;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V
diff --git a/mappings/net/minecraft/client/render/entity/ZombiePigmanEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ZombiePigmanEntityRenderer.mapping
deleted file mode 100644
index 152b827237..0000000000
--- a/mappings/net/minecraft/client/render/entity/ZombiePigmanEntityRenderer.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS net/minecraft/class_935 net/minecraft/client/render/entity/ZombiePigmanEntityRenderer
- FIELD field_4759 SKIN Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/client/render/model/BakedQuad.mapping b/mappings/net/minecraft/client/render/model/BakedQuad.mapping
index 42779d3669..e74b051d04 100644
--- a/mappings/net/minecraft/client/render/model/BakedQuad.mapping
+++ b/mappings/net/minecraft/client/render/model/BakedQuad.mapping
@@ -3,7 +3,7 @@ CLASS net/minecraft/class_777 net/minecraft/client/render/model/BakedQuad
FIELD field_4174 colorIndex I
FIELD field_4175 vertexData [I
FIELD field_4176 sprite Lnet/minecraft/class_1058;
- METHOD ([IILnet/minecraft/class_2350;Lnet/minecraft/class_1058;)V
+ METHOD ([IILnet/minecraft/class_2350;Lnet/minecraft/class_1058;Z)V
ARG 1 vertexData
ARG 2 colorIndex
ARG 3 face
diff --git a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping
index 04180833ae..3e4a36a072 100644
--- a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping
+++ b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping
@@ -9,10 +9,6 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory
METHOD method_3455 transformVertex (Lnet/minecraft/class_1160;Lnet/minecraft/class_4590;)V
ARG 1 vertex
ARG 2 transformation
- METHOD method_3456 getRelativeDirectionalBrightness (Lnet/minecraft/class_2350;)F
- ARG 1 direction
- METHOD method_3457 getLightmapCoordinate (Lnet/minecraft/class_2350;)I
- ARG 1 direction
METHOD method_3458 packVertexData (Lnet/minecraft/class_787;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;[FLnet/minecraft/class_4590;Lnet/minecraft/class_789;Z)[I
ARG 1 texture
ARG 2 sprite
@@ -24,13 +20,10 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory
METHOD method_3459 getPositionMatrix (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)[F
ARG 1 from
ARG 2 to
- METHOD method_3460 packVertexData ([IILnet/minecraft/class_1160;ILnet/minecraft/class_1058;Lnet/minecraft/class_787;)V
+ METHOD method_3460 packVertexData ([IILnet/minecraft/class_1160;Lnet/minecraft/class_1058;Lnet/minecraft/class_787;)V
ARG 1 vertices
ARG 2 cornerIndex
ARG 3 position
- ARG 4 brightness
- ARG 5 sprite
- ARG 6 texture
METHOD method_3461 packVertexData ([IILnet/minecraft/class_2350;Lnet/minecraft/class_787;[FLnet/minecraft/class_1058;Lnet/minecraft/class_4590;Lnet/minecraft/class_789;Z)V
ARG 1 vertices
ARG 2 cornerIndex
diff --git a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping
index 9b9f1ff9b6..f22b32bbe2 100644
--- a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping
+++ b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping
@@ -4,7 +4,6 @@ CLASS net/minecraft/class_1102 net/minecraft/client/sound/AbstractSoundInstance
FIELD field_5440 attenuationType Lnet/minecraft/class_1113$class_1114;
FIELD field_5441 pitch F
FIELD field_5442 volume F
- FIELD field_5443 soundSet Lnet/minecraft/class_1146;
FIELD field_5444 sound Lnet/minecraft/class_1111;
FIELD field_5446 repeat Z
FIELD field_5447 category Lnet/minecraft/class_3419;
diff --git a/mappings/net/minecraft/client/sound/AudioStream.mapping b/mappings/net/minecraft/client/sound/AudioStream.mapping
index 716c5f46a1..3555fa6909 100644
--- a/mappings/net/minecraft/client/sound/AudioStream.mapping
+++ b/mappings/net/minecraft/client/sound/AudioStream.mapping
@@ -1,3 +1,2 @@
CLASS net/minecraft/class_4234 net/minecraft/client/sound/AudioStream
METHOD method_19719 getFormat ()Ljavax/sound/sampled/AudioFormat;
- METHOD method_19721 getBuffer ()Ljava/nio/ByteBuffer;
diff --git a/mappings/net/minecraft/client/sound/Channel.mapping b/mappings/net/minecraft/client/sound/Channel.mapping
index 756b2c2e67..1e7b5ceb7e 100644
--- a/mappings/net/minecraft/client/sound/Channel.mapping
+++ b/mappings/net/minecraft/client/sound/Channel.mapping
@@ -6,7 +6,7 @@ CLASS net/minecraft/class_4235 net/minecraft/client/sound/Channel
ARG 1 soundEngine
ARG 2 executor
METHOD method_19722 tick ()V
- METHOD method_19723 createSource (Lnet/minecraft/class_4225$class_4105;)Lnet/minecraft/class_4235$class_4236;
+ METHOD method_19723 createSource (Lnet/minecraft/class_4225$class_4105;)Ljava/util/concurrent/CompletableFuture;
ARG 1 mode
METHOD method_19727 execute (Ljava/util/function/Consumer;)V
METHOD method_19728 close ()V
diff --git a/mappings/net/minecraft/client/sound/OggAudioStream.mapping b/mappings/net/minecraft/client/sound/OggAudioStream.mapping
index cf605f192d..f61db39d07 100644
--- a/mappings/net/minecraft/client/sound/OggAudioStream.mapping
+++ b/mappings/net/minecraft/client/sound/OggAudioStream.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_4228 net/minecraft/client/sound/OggAudioStream
METHOD method_19676 readChannels (Ljava/nio/FloatBuffer;Ljava/nio/FloatBuffer;Lnet/minecraft/class_4228$class_4229;)V
METHOD method_19677 readHeader ()Z
METHOD method_19678 increaseBufferSize ()V
+ METHOD method_19721 getBuffer ()Ljava/nio/ByteBuffer;
CLASS class_4229 ChannelList
FIELD field_18911 buffers Ljava/util/List;
FIELD field_18912 size I
diff --git a/mappings/net/minecraft/client/sound/SoundLoader.mapping b/mappings/net/minecraft/client/sound/SoundLoader.mapping
index 97b2c26c72..d4bbca9e66 100644
--- a/mappings/net/minecraft/client/sound/SoundLoader.mapping
+++ b/mappings/net/minecraft/client/sound/SoundLoader.mapping
@@ -8,5 +8,5 @@ CLASS net/minecraft/class_4237 net/minecraft/client/sound/SoundLoader
ARG 1 sounds
METHOD method_19743 loadStatic (Lnet/minecraft/class_2960;)Ljava/util/concurrent/CompletableFuture;
ARG 1 id
- METHOD method_19744 loadStreamed (Lnet/minecraft/class_2960;)Ljava/util/concurrent/CompletableFuture;
+ METHOD method_19744 loadStreamed (Lnet/minecraft/class_2960;Z)Ljava/util/concurrent/CompletableFuture;
ARG 1 id
diff --git a/mappings/net/minecraft/client/sound/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping
index 2c17759676..15544742ac 100644
--- a/mappings/net/minecraft/client/sound/SoundManager.mapping
+++ b/mappings/net/minecraft/client/sound/SoundManager.mapping
@@ -1,7 +1,7 @@
CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager
FIELD field_5588 sounds Ljava/util/Map;
FIELD field_5590 soundSystem Lnet/minecraft/class_1140;
- FIELD field_5591 TYPE Ljava/lang/reflect/ParameterizedType;
+ FIELD field_5591 TYPE Lcom/google/gson/reflect/TypeToken;
FIELD field_5592 MISSING_SOUND Lnet/minecraft/class_1111;
FIELD field_5593 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_5594 GSON Lcom/google/gson/Gson;
@@ -14,7 +14,6 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager
ARG 1 category
ARG 2 volume
METHOD method_4866 unregisterListener (Lnet/minecraft/class_1145;)V
- METHOD method_4867 readSounds (Ljava/io/InputStream;)Ljava/util/Map;
METHOD method_4868 isSoundResourcePresent (Lnet/minecraft/class_1111;Lnet/minecraft/class_2960;Lnet/minecraft/class_3300;)Z
METHOD method_4869 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1146;
METHOD method_4870 stop (Lnet/minecraft/class_1113;)V
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 4f1905c6ee..31cf8d7554 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -342,7 +342,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 1 player
ARG 2 hand
METHOD method_5691 getPermissionLevel ()I
- METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_3494;)Z
+ METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_3494;D)Z
ARG 1 tag
METHOD method_5693 initDataTracker ()V
METHOD method_5694 onPlayerCollision (Lnet/minecraft/class_1657;)V
@@ -383,7 +383,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_5712 playStepSound (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
- METHOD method_5713 checkWaterState ()Z
+ METHOD method_5713 checkWaterState ()V
METHOD method_5715 isSneaking ()Z
METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;ILnet/minecraft/class_1282;)V
ARG 1 killer
@@ -660,7 +660,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 1 other
METHOD method_5875 setNoGravity (Z)V
ARG 1 noGravity
- METHOD method_5876 updateWaterState ()V
+ METHOD method_5876 updateWaterState ()Z
METHOD method_5877 getItemsHand ()Ljava/lang/Iterable;
METHOD method_5878 copyFrom (Lnet/minecraft/class_1297;)V
ARG 1 original
diff --git a/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping
index 04ab4d0f04..eaca1310dc 100644
--- a/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping
@@ -5,6 +5,4 @@ CLASS net/minecraft/class_4809 net/minecraft/entity/ai/brain/task/MemoryTransfer
FIELD field_22291 duration Lnet/minecraft/class_4801;
METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Lnet/minecraft/class_4801;)V
ARG 1 runPredicate
- ARG 2 sourceType
- ARG 3 targetType
ARG 4 duration
diff --git a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping
index bcf2b3712c..c4ed719057 100644
--- a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping
+++ b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping
@@ -40,8 +40,6 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain
METHOD method_24679 addAvoidTasks (Lnet/minecraft/class_4760;Lnet/minecraft/class_4095;)V
ARG 0 hoglin
ARG 1 brain
- METHOD method_24680 isPacified (Lnet/minecraft/class_4760;)Z
- ARG 0 hoglin
METHOD method_24681 avoid (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V
ARG 0 hoglin
ARG 1 target
diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping
index f5c7f7678c..c3eb7364aa 100644
--- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping
@@ -12,5 +12,4 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity
METHOD method_24657 getMovementCooldownTicks ()I
METHOD method_24658 isAdult ()Z
METHOD method_24659 playFightSound ()V
- METHOD method_24660 playAttackedSound ()V
METHOD method_24661 playRetreatSound ()V
diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping
index 1d3f0b1787..acce67c06f 100644
--- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping
+++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping
@@ -4,7 +4,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
FIELD field_22390 RIDE_TARGET_MEMORY_DURATION Lnet/minecraft/class_4801;
FIELD field_22391 AVOID_MEMORY_DURATION Lnet/minecraft/class_4801;
FIELD field_22392 FOOD Ljava/util/Set;
- FIELD field_22394 COLLECTIBLE_ITEMS Ljava/util/Set;
FIELD field_22395 GOLDEN_ITEMS Ljava/util/Set;
METHOD method_24713 hasZombifiedPiglinNearby (Lnet/minecraft/class_4836;)Z
ARG 0 piglin
@@ -29,8 +28,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
METHOD method_24726 loot (Lnet/minecraft/class_4836;Lnet/minecraft/class_1542;)V
ARG 0 piglin
ARG 1 drop
- METHOD method_24727 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;)V
- ARG 0 piglin
+ METHOD method_24727 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
ARG 1 player
METHOD method_24728 playerInteract (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Z
ARG 0 piglin
@@ -40,8 +38,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
ARG 0 piglin
ARG 1 stack
METHOD method_24731 drop (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;Lnet/minecraft/class_243;)V
- ARG 0 piglin
- ARG 1 stack
ARG 2 pos
METHOD method_24732 create (Lnet/minecraft/class_4836;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095;
ARG 0 piglin
@@ -58,7 +54,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
ARG 0 speed
METHOD method_24739 isGoldHoldingPlayer (Lnet/minecraft/class_1309;)Z
ARG 0 target
- METHOD method_24741 consumeOffHandItem (Lnet/minecraft/class_4836;)V
+ METHOD method_24741 consumeOffHandItem (Lnet/minecraft/class_4836;Z)V
ARG 0 piglin
METHOD method_24742 angerAtCloserTargets (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V
ARG 0 piglin
@@ -66,9 +62,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
METHOD method_24743 addIdleActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V
ARG 0 piglin
ARG 1 brain
- METHOD method_24744 canEquip (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)Z
- ARG 0 piglin
- ARG 1 stack
METHOD method_24746 acceptsForBarter (Lnet/minecraft/class_1792;)Z
ARG 0 item
METHOD method_24747 makeGoToZombifiedPiglinTask (F)Lnet/minecraft/class_4121;
@@ -127,26 +120,21 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
ARG 1 brain
METHOD method_24769 hasBeenHurt (Lnet/minecraft/class_1309;)Z
ARG 0 piglin
- METHOD method_24770 hasPlayersNearby (Lnet/minecraft/class_4836;)Z
- ARG 0 piglin
METHOD method_24771 runAwayFromClosestTarget (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V
ARG 0 piglin
ARG 1 target
- METHOD method_24772 doBarter (Lnet/minecraft/class_4836;)V
+ METHOD method_24772 doBarter (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V
ARG 0 piglin
METHOD method_24773 runAwayFrom (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V
ARG 0 piglin
ARG 1 target
- METHOD method_24774 dropBarteredItem (Lnet/minecraft/class_4836;)V
- ARG 0 piglin
+ METHOD method_24774 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V
METHOD method_24776 getBarteredItem (Lnet/minecraft/class_4836;)Lnet/minecraft/class_1799;
ARG 0 piglin
METHOD method_24777 getPreferredTarget (Lnet/minecraft/class_4836;)Ljava/util/Optional;
ARG 0 piglin
METHOD method_24778 playSound (Lnet/minecraft/class_4836;)V
ARG 0 piglin
- METHOD method_24779 hasAdultNearby (Lnet/minecraft/class_4836;)Z
- ARG 0 piglin
METHOD method_24780 getNearbyPiglins (Lnet/minecraft/class_4836;)Ljava/util/List;
ARG 0 piglin
METHOD method_24781 stopWalking (Lnet/minecraft/class_4836;)V
diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping
index d161ad9c68..0c2ec2f05a 100644
--- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping
@@ -25,7 +25,6 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity
ARG 1 slot
ARG 2 stack
METHOD method_24697 playCelebrateSound ()V
- METHOD method_24698 playAttackedSound ()V
METHOD method_24699 playRetreatSound ()V
METHOD method_24700 playJealousSound ()V
METHOD method_24701 playZombifySound ()V
@@ -33,7 +32,6 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity
METHOD method_24703 isCharging ()Z
METHOD method_24704 canConvert ()Z
METHOD method_24705 getActivity ()Lnet/minecraft/class_4836$class_4837;
- METHOD method_24706 isOffHandEmpty ()Z
METHOD method_24707 isRiding ()Z
METHOD method_24708 getWalkSpeed ()F
METHOD method_24709 playAdmireItemSound ()V
diff --git a/mappings/net/minecraft/server/ServerConfigEntry.mapping b/mappings/net/minecraft/server/ServerConfigEntry.mapping
index 33e7e647fb..3d7d15189b 100644
--- a/mappings/net/minecraft/server/ServerConfigEntry.mapping
+++ b/mappings/net/minecraft/server/ServerConfigEntry.mapping
@@ -2,4 +2,3 @@ CLASS net/minecraft/class_3330 net/minecraft/server/ServerConfigEntry
FIELD field_14368 object Ljava/lang/Object;
METHOD method_14626 getKey ()Ljava/lang/Object;
METHOD method_14627 isInvalid ()Z
- METHOD method_14628 serialize (Lcom/google/gson/JsonObject;)V
diff --git a/mappings/net/minecraft/server/ServerConfigList.mapping b/mappings/net/minecraft/server/ServerConfigList.mapping
index 48883c2c9c..23eeaa67f8 100644
--- a/mappings/net/minecraft/server/ServerConfigList.mapping
+++ b/mappings/net/minecraft/server/ServerConfigList.mapping
@@ -22,12 +22,3 @@ CLASS net/minecraft/class_3331 net/minecraft/server/ServerConfigList
METHOD method_14642 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3330;
METHOD method_14643 getFile ()Ljava/io/File;
METHOD method_14644 contains (Ljava/lang/Object;)Z
- CLASS class_3332 DeSerializer
- METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
- ARG 1 functionJson
- ARG 2 unused
- ARG 3 context
- METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
- ARG 1 entry
- ARG 2 unused
- ARG 3 context
diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping
index 133fba5039..03613cbea5 100644
--- a/mappings/net/minecraft/util/JsonHelper.mapping
+++ b/mappings/net/minecraft/util/JsonHelper.mapping
@@ -30,7 +30,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
METHOD method_15261 getArray (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonArray;
ARG 0 object
ARG 1 element
- METHOD method_15262 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/reflect/Type;Z)Ljava/lang/Object;
+ METHOD method_15262 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
ARG 1 content
ARG 3 lenient
METHOD method_15263 asLong (Lcom/google/gson/JsonElement;Ljava/lang/String;)J
@@ -65,7 +65,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
ARG 1 element
ARG 2 context
ARG 3 type
- METHOD method_15273 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/reflect/Type;Z)Ljava/lang/Object;
+ METHOD method_15273 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
ARG 3 lenient
METHOD method_15274 deserialize (Ljava/io/Reader;Z)Lcom/google/gson/JsonObject;
ARG 1 lenient
@@ -115,7 +115,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
METHOD method_15289 hasString (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
ARG 0 object
ARG 1 element
- METHOD method_15290 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/reflect/Type;)Ljava/lang/Object;
+ METHOD method_15290 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;)Ljava/lang/Object;
ARG 1 content
METHOD method_15291 deserialize (Lcom/google/gson/JsonElement;Ljava/lang/String;Lcom/google/gson/JsonDeserializationContext;Ljava/lang/Class;)Ljava/lang/Object;
ARG 0 element
@@ -138,7 +138,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
METHOD method_15296 getObject (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonObject;
ARG 0 object
ARG 1 element
- METHOD method_15297 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/reflect/Type;)Ljava/lang/Object;
+ METHOD method_15297 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;)Ljava/lang/Object;
METHOD method_15298 deserialize (Ljava/lang/String;Z)Lcom/google/gson/JsonObject;
ARG 0 content
ARG 1 lenient
diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping
index 1d579d4f1e..2a3fac21ef 100644
--- a/mappings/net/minecraft/util/UserCache.mapping
+++ b/mappings/net/minecraft/util/UserCache.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache
FIELD field_14313 useRemote Z
FIELD field_14314 cacheFile Ljava/io/File;
FIELD field_14315 profileRepository Lcom/mojang/authlib/GameProfileRepository;
- FIELD field_14316 ENTRY_LIST_TYPE Ljava/lang/reflect/ParameterizedType;
+ FIELD field_14316 ENTRY_LIST_TYPE Lcom/google/gson/reflect/TypeToken;
FIELD field_14317 EXPIRATION_DATE_FORMAT Ljava/text/SimpleDateFormat;
FIELD field_14318 gson Lcom/google/gson/Gson;
METHOD (Lcom/mojang/authlib/GameProfileRepository;Ljava/io/File;)V
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index a6e237f3d3..34567250f8 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -108,7 +108,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
ARG 10 createFire
METHOD method_8455 updateHorizontalAdjacent (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V
ARG 1 pos
- METHOD method_8456 getEffectiveHeight ()I
METHOD method_8457 getDebugString ()Ljava/lang/String;
METHOD method_8458 isSavingDisabled ()Z
METHOD method_8459 isEmittingRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping
index 6bb2e8df35..8e05e6eabb 100644
--- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping
+++ b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping
@@ -126,8 +126,6 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures
FIELD field_22049 SOUL_SAND_CRIMSON_ROOTS_CONFIG Lnet/minecraft/class_4638;
FIELD field_22050 WATER_FLUID Lnet/minecraft/class_3610;
FIELD field_22051 LAVA_FLUID Lnet/minecraft/class_3610;
- FIELD field_22052 CRIMSON_FUNGI_CONFIG Lnet/minecraft/class_4780;
- FIELD field_22053 WARPED_FUNGI_CONFIG Lnet/minecraft/class_4780;
FIELD field_22054 CRIMSON_ROOTS_CONFIG Lnet/minecraft/class_4634;
FIELD field_22055 WARPED_ROOTS_CONFIG Lnet/minecraft/class_4634;
FIELD field_22056 NETHER_SPROUTS_CONFIG Lnet/minecraft/class_4634;
diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping
index 96ad829f1d..fb02bc6251 100644
--- a/mappings/net/minecraft/world/dimension/Dimension.mapping
+++ b/mappings/net/minecraft/world/dimension/Dimension.mapping
@@ -14,12 +14,11 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension
ARG 1 x
ARG 2 z
ARG 3 checkMobSpawnValidity
- METHOD method_12445 modifyFogColor (IF)Lnet/minecraft/class_243;
+ METHOD method_12445 modifyFogColor (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243;
COMMENT Modify the fog color offered (usually by the biome).
COMMENT
COMMENT The overworld slightly whiteshifts and blueshifts this color; the
COMMENT nether doesn't touch it; the end significantly blackshifts this color.
- ARG 1 fogColor
ARG 2 tickDelta
METHOD method_12446 getBackgroundColor (FF)[F
ARG 1 skyAngle
diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungiFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungiFeature.mapping
index 7a792f5b6f..c0f91bdda6 100644
--- a/mappings/net/minecraft/world/gen/feature/HugeFungiFeature.mapping
+++ b/mappings/net/minecraft/world/gen/feature/HugeFungiFeature.mapping
@@ -1,5 +1,5 @@
CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungiFeature
- METHOD method_24438 getStartPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338$class_2339;
+ METHOD method_24438 getStartPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2338$class_2339;
ARG 0 world
ARG 1 pos
METHOD method_24439 generateHatBlock (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338$class_2339;FFF)V
@@ -10,11 +10,10 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungiFeature
ARG 5 decorationChance
ARG 6 generationChance
ARG 7 vineChance
- METHOD method_24440 generateStem (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338$class_2339;IZ)V
+ METHOD method_24440 generateStem (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V
ARG 1 world
ARG 2 random
ARG 3 config
- ARG 4 pos
ARG 5 stemHeight
ARG 6 thickStem
METHOD method_24441 tryGenerateVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
@@ -23,13 +22,9 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungiFeature
ARG 3 pos
ARG 4 state
METHOD method_24442 generateVines (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Ljava/util/Random;)V
- ARG 1 pos
- ARG 2 world
- ARG 3 random
- METHOD method_24443 generateHat (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338$class_2339;IZ)V
+ METHOD method_24443 generateHat (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V
ARG 1 world
ARG 2 random
ARG 3 config
- ARG 4 pos
ARG 5 hatHeight
ARG 6 thickStem
diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungiFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungiFeatureConfig.mapping
index 9a42f203bd..7ceba5ea83 100644
--- a/mappings/net/minecraft/world/gen/feature/HugeFungiFeatureConfig.mapping
+++ b/mappings/net/minecraft/world/gen/feature/HugeFungiFeatureConfig.mapping
@@ -3,9 +3,6 @@ CLASS net/minecraft/class_4780 net/minecraft/world/gen/feature/HugeFungiFeatureC
FIELD field_22192 hatState Lnet/minecraft/class_2680;
FIELD field_22193 decorationState Lnet/minecraft/class_2680;
FIELD field_22194 planted Z
- METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Z)V
+ METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Z)V
ARG 1 stemState
- ARG 2 hatState
- ARG 3 decorationState
- ARG 4 planted
METHOD method_24436 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4780;