diff --git a/mappings/net/minecraft/client/gui/screen/options/AccessibilityScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/screen/options/AccessibilityScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen.mapping index 78ed5d22e5..6a288c06b1 100644 --- a/mappings/net/minecraft/client/gui/screen/options/AccessibilityScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/options/AccessibilityScreen +CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen FIELD field_18730 OPTIONS [Lnet/minecraft/class_316; FIELD field_18734 narratorButton Lnet/minecraft/class_339; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V diff --git a/mappings/net/minecraft/client/gui/screen/SettingsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping similarity index 88% rename from mappings/net/minecraft/client/gui/screen/SettingsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping index c6c5ee4520..04450195fb 100644 --- a/mappings/net/minecraft/client/gui/screen/SettingsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/SettingsScreen +CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/options/OptionsScreen FIELD field_18745 difficulty Lnet/minecraft/class_1267; FIELD field_2500 difficultyButton Lnet/minecraft/class_4185; FIELD field_2501 parent Lnet/minecraft/class_437; diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index 377125de48..eeb1751a4a 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -79,7 +79,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1878 eraseCharacters (I)V ARG 1 characterOffset METHOD method_1880 setMaxLength (I)V - ARG 1 maximumLength + ARG 1 maxLength METHOD method_1881 getCursor ()I METHOD method_1882 getText ()Ljava/lang/String; METHOD method_1883 setCursor (I)V diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 761c097089..5d83d680e2 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -77,7 +77,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 4 maxX ARG 5 maxY ARG 6 maxZ - METHOD method_21596 checkBlockRerender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + METHOD method_21596 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 old ARG 3 updated diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index b68ed42d35..65b7aa3e99 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment ARG 1 weight ARG 2 type ARG 3 slotTypes - METHOD method_20742 getMaximumPower (I)I + METHOD method_20742 getMaxPower (I)I ARG 1 level METHOD method_25949 isAvailableForEnchantedBookOffer ()Z COMMENT Returns whether this enchantment will appear in the enchanted book trade @@ -28,14 +28,14 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment METHOD method_8181 getProtectionAmount (ILnet/minecraft/class_1282;)I ARG 1 level ARG 2 source - METHOD method_8182 getMinimumPower (I)I + METHOD method_8182 getMinPower (I)I ARG 1 level - METHOD method_8183 getMaximumLevel ()I + METHOD method_8183 getMaxLevel ()I METHOD method_8184 getTranslationKey ()Ljava/lang/String; METHOD method_8185 getEquipment (Lnet/minecraft/class_1309;)Ljava/util/Map; ARG 1 entity METHOD method_8186 getRarity ()Lnet/minecraft/class_1887$class_1888; - METHOD method_8187 getMinimumLevel ()I + METHOD method_8187 getMinLevel ()I METHOD method_8188 canCombine (Lnet/minecraft/class_1887;)Z COMMENT Returns whether this enchantment can exist on an item stack with the COMMENT {@code other} enchantment and the {@code other} enchantment can exist diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index a21f473bc0..8743e4b335 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -60,7 +60,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6265 headTrackingIncrements I FIELD field_6266 preferredHand Lnet/minecraft/class_1268; FIELD field_6268 lastBlockPos Lnet/minecraft/class_2338; - FIELD field_6269 defaultMaximumHealth I + FIELD field_6269 defaultMaxHealth I FIELD field_6270 lastAttackTime I FIELD field_6271 knockbackVelocity F FIELD field_6272 dead Z @@ -289,7 +289,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6061 blockedByShield (Lnet/minecraft/class_1282;)Z ARG 1 source METHOD method_6062 isImmobile ()Z - METHOD method_6063 getMaximumHealth ()F + METHOD method_6063 getMaxHealth ()F METHOD method_6064 getNextAirOnLand (I)I ARG 1 air METHOD method_6065 getAttacker ()Lnet/minecraft/class_1309; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index ba7bacf913..8c1053409e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD field_12282 gameMode Lnet/minecraft/class_1934; FIELD field_12284 dimensionTracker Lnet/minecraft/class_5318$class_5319; FIELD field_19145 chunkLoadDistance I - FIELD field_20665 seed J + FIELD field_20665 sha256Seed J FIELD field_20666 flatWorld Z FIELD field_24618 reducedDebugInfo Z FIELD field_24619 showDeathScreen Z @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD (ILnet/minecraft/class_1934;JZLjava/util/Set;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;IIZZZZ)V ARG 1 playerEntityId ARG 2 gameMode - ARG 3 seed + ARG 3 sha256Seed ARG 5 hardcore METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934; METHOD method_11562 hasReducedDebugInfo ()Z @@ -22,7 +22,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD method_11565 getDimension ()Lnet/minecraft/class_5318; METHOD method_11568 isFlatWorld ()Z METHOD method_20204 getChunkLoadDistance ()I - METHOD method_22423 getSeed ()J + METHOD method_22423 getSha256Seed ()J METHOD method_22424 showsDeathScreen ()Z METHOD method_28118 isHardcore ()Z METHOD method_28119 isDebugWorld ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping index 2e668a33f8..8e06fd3948 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2696 net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket - FIELD field_12334 fovModifier F + FIELD field_12334 walkSpeed F FIELD field_12335 flySpeed F FIELD field_12336 creativeMode Z FIELD field_12337 allowFlying Z @@ -9,8 +9,8 @@ CLASS net/minecraft/class_2696 net/minecraft/network/packet/s2c/play/PlayerAbili METHOD method_11688 setFlySpeed (F)V METHOD method_11689 setInvulnerable (Z)V METHOD method_11690 getFlySpeed ()F - METHOD method_11691 getFovModifier ()F - METHOD method_11692 setFovModifier (F)V + METHOD method_11691 getWalkSpeed ()F + METHOD method_11692 setWalkSpeed (F)V METHOD method_11693 setCreativeMode (Z)V METHOD method_11694 setFlying (Z)V METHOD method_11695 isInvulnerable ()Z diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index fc7b123950..9bcdd122e3 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates COMMENT

A living entity is valid when the entity is alive. COMMENT COMMENT @see net.minecraft.entity.LivingEntity#isAlive() - METHOD method_5909 maximumDistance (DDDD)Ljava/util/function/Predicate; + METHOD method_5909 maxDistance (DDDD)Ljava/util/function/Predicate; ARG 0 x ARG 2 y ARG 4 z diff --git a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping index 449ce2a358..f43a7ef365 100644 --- a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping +++ b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand ARG 1 center ARG 2 spreadDistance ARG 3 maxRange - METHOD method_13657 getMinimumDistance (Ljava/util/Collection;Lnet/minecraft/class_3218;[Lnet/minecraft/class_3131$class_3132;IZ)D + METHOD method_13657 getMinDistance (Ljava/util/Collection;Lnet/minecraft/class_3218;[Lnet/minecraft/class_3131$class_3132;IZ)D ARG 0 entities ARG 1 world ARG 2 piles diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index d9f160bc62..c76017e68a 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 1 voxels METHOD method_1089 forEachBox (Lnet/minecraft/class_259$class_260;)V METHOD method_1090 getBoundingBoxes ()Ljava/util/List; - METHOD method_1091 getMinimum (Lnet/minecraft/class_2350$class_2351;)D + METHOD method_1091 getMin (Lnet/minecraft/class_2350$class_2351;)D ARG 1 axis METHOD method_1092 rayTrace (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3965; ARG 1 start @@ -35,7 +35,7 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 2 box ARG 3 maxDist METHOD method_1104 forEachEdge (Lnet/minecraft/class_259$class_260;)V - METHOD method_1105 getMaximum (Lnet/minecraft/class_2350$class_2351;)D + METHOD method_1105 getMax (Lnet/minecraft/class_2350$class_2351;)D ARG 1 axis METHOD method_1107 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_1108 calculateMaxDistance (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;D)D diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 02ac5b8a8a..5259d8b916 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9253 rainGradientPrev F FIELD field_9256 lcgBlockSeed I METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; - METHOD method_16109 checkBlockRerender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + METHOD method_16109 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 old ARG 3 updated diff --git a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping index cf769fba22..e53683dd66 100644 --- a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_3569 net/minecraft/world/chunk/light/SkyLightStorage ARG 1 chunkProvider METHOD method_15566 isLightEnabled (J)Z ARG 1 sectionPos - METHOD method_15567 isAboveMinimumHeight (I)Z + METHOD method_15567 isAboveMinHeight (I)Z ARG 1 blockY METHOD method_15568 isAboveTopmostLightArray (J)Z ARG 1 pos diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping similarity index 99% rename from mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping rename to mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 36d6393dc8..781eca3bd6 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures +CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatures FIELD field_21088 PLAINS_FLOWER_CONFIG Lnet/minecraft/class_4638; FIELD field_21089 FOREST_FLOWER_CONFIG Lnet/minecraft/class_4638; FIELD field_21090 DEAD_BUSH_CONFIG Lnet/minecraft/class_4638;