diff --git a/build.gradle b/build.gradle index 740f099129..2aff841f3b 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.2" +def minecraft_version = "23w40a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping index 5ee74a5395..2704eb0a2d 100644 --- a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping @@ -10,15 +10,13 @@ CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock COMMENT @see PowderSnowCauldronBlock cauldrons filled with powder snow FIELD field_10746 OUTLINE_SHAPE Lnet/minecraft/class_265; FIELD field_10747 RAYCAST_SHAPE Lnet/minecraft/class_265; - FIELD field_27084 behaviorMap Ljava/util/Map; - METHOD (Lnet/minecraft/class_4970$class_2251;Ljava/util/Map;)V + FIELD field_27084 behaviorMap Lnet/minecraft/class_5620$class_8821; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_5620$class_8821;)V COMMENT Constructs a cauldron block. COMMENT COMMENT

The behavior map must match {@link CauldronBehavior#createMap} by providing COMMENT a nonnull value for all items. ARG 1 settings - ARG 2 behaviorMap - COMMENT the map containing cauldron behaviors for each item METHOD method_31615 getFluidHeight (Lnet/minecraft/class_2680;)D ARG 1 state METHOD method_31616 isEntityTouchingFluid (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/block/AbstractSignBlock.mapping b/mappings/net/minecraft/block/AbstractSignBlock.mapping index dfc15fb039..cbf83567af 100644 --- a/mappings/net/minecraft/block/AbstractSignBlock.mapping +++ b/mappings/net/minecraft/block/AbstractSignBlock.mapping @@ -2,9 +2,6 @@ CLASS net/minecraft/class_2478 net/minecraft/block/AbstractSignBlock FIELD field_11491 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_11492 SHAPE Lnet/minecraft/class_265; FIELD field_21675 type Lnet/minecraft/class_4719; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_4719;)V - ARG 1 settings - ARG 2 type METHOD method_24025 getWoodType ()Lnet/minecraft/class_4719; METHOD method_45459 getWoodType (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4719; ARG 0 block diff --git a/mappings/net/minecraft/block/AmethystClusterBlock.mapping b/mappings/net/minecraft/block/AmethystClusterBlock.mapping index 2be4092200..e8245e7266 100644 --- a/mappings/net/minecraft/block/AmethystClusterBlock.mapping +++ b/mappings/net/minecraft/block/AmethystClusterBlock.mapping @@ -7,7 +7,5 @@ CLASS net/minecraft/class_5542 net/minecraft/block/AmethystClusterBlock FIELD field_27091 westShape Lnet/minecraft/class_265; FIELD field_27092 upShape Lnet/minecraft/class_265; FIELD field_27093 downShape Lnet/minecraft/class_265; - METHOD (IILnet/minecraft/class_4970$class_2251;)V - ARG 1 height - ARG 2 xzOffset + METHOD (FFLnet/minecraft/class_4970$class_2251;)V ARG 3 settings diff --git a/mappings/net/minecraft/block/AttachedStemBlock.mapping b/mappings/net/minecraft/block/AttachedStemBlock.mapping index 66edd22e72..6ccecc69d2 100644 --- a/mappings/net/minecraft/block/AttachedStemBlock.mapping +++ b/mappings/net/minecraft/block/AttachedStemBlock.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_2195 net/minecraft/block/AttachedStemBlock - FIELD field_27095 pickBlockItem Ljava/util/function/Supplier; + FIELD field_27095 pickBlockItem Lnet/minecraft/class_5321; FIELD field_9873 FACING Lnet/minecraft/class_2753; FIELD field_9874 FACING_TO_SHAPE Ljava/util/Map; - FIELD field_9875 gourdBlock Lnet/minecraft/class_2511; - METHOD (Lnet/minecraft/class_2511;Ljava/util/function/Supplier;Lnet/minecraft/class_4970$class_2251;)V - ARG 1 gourdBlock - ARG 2 pickBlockItem - ARG 3 settings + FIELD field_9875 gourdBlock Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/block/AzaleaBlock.mapping b/mappings/net/minecraft/block/AzaleaBlock.mapping index 5b7471dedd..b5b5f6b788 100644 --- a/mappings/net/minecraft/block/AzaleaBlock.mapping +++ b/mappings/net/minecraft/block/AzaleaBlock.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_5800 net/minecraft/block/AzaleaBlock FIELD field_30996 SHAPE Lnet/minecraft/class_265; - FIELD field_33563 GENERATOR Lnet/minecraft/class_6349; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 2cd64756fc..14bbed5ef6 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -275,16 +275,15 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 4 options METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; ARG 1 state - METHOD method_9574 getPickStack (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; + METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; COMMENT {@return the new item stack when using pick block functionality} COMMENT COMMENT

Pick block is available via middle-clicking by default. Blocks without the COMMENT corresponding {@link net.minecraft.item.BlockItem}, such as crops, should COMMENT override this method to return the correct item stack. - ARG 1 world ARG 2 pos ARG 3 state - METHOD method_9576 onBreak (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)V + METHOD method_9576 onBreak (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2680; COMMENT Called when a player breaks a block before the block is removed from the world. COMMENT Explosions do not trigger this. COMMENT diff --git a/mappings/net/minecraft/block/BlockSetType.mapping b/mappings/net/minecraft/block/BlockSetType.mapping index 375e37be82..15d2e90222 100644 --- a/mappings/net/minecraft/block/BlockSetType.mapping +++ b/mappings/net/minecraft/block/BlockSetType.mapping @@ -14,9 +14,9 @@ CLASS net/minecraft/class_8177 net/minecraft/block/BlockSetType FIELD field_42831 WARPED Lnet/minecraft/class_8177; FIELD field_42832 MANGROVE Lnet/minecraft/class_8177; FIELD field_42833 BAMBOO Lnet/minecraft/class_8177; - FIELD field_42834 VALUES Ljava/util/Set; METHOD (Ljava/lang/String;)V ARG 1 name METHOD method_49232 stream ()Ljava/util/stream/Stream; METHOD method_49233 register (Lnet/minecraft/class_8177;)Lnet/minecraft/class_8177; ARG 0 blockSetType + CLASS class_2441 ActivationRule diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 5666bfca3c..bcb05d0488 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -6,17 +6,16 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state METHOD method_26105 (Lnet/minecraft/class_2680;)I ARG 0 state - METHOD method_26106 createLeavesBlock (Lnet/minecraft/class_2498;)Lnet/minecraft/class_2397; + METHOD method_26106 createLeavesBlock (Lnet/minecraft/class_2498;)Lnet/minecraft/class_2248; ARG 0 soundGroup METHOD method_26107 createLightLevelFromLitBlockState (I)Ljava/util/function/ToIntFunction; ARG 0 litLevel METHOD method_26108 (ILnet/minecraft/class_2680;)I ARG 1 state - METHOD method_26109 createBedBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2244; + METHOD method_26109 createBedBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2248; ARG 0 color - METHOD method_26110 createShulkerBoxBlock (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2480; + METHOD method_26110 createShulkerBoxBlock (Lnet/minecraft/class_1767;Lnet/minecraft/class_3620;)Lnet/minecraft/class_2248; ARG 0 color - ARG 1 settings METHOD method_26111 (Lnet/minecraft/class_1767;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 1 state METHOD method_26112 (Lnet/minecraft/class_2680;)I @@ -38,14 +37,14 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 mapColor METHOD method_26116 (Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 1 state - METHOD method_26117 createLogBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;)Lnet/minecraft/class_2465; + METHOD method_26117 createLogBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;)Lnet/minecraft/class_2248; ARG 0 topMapColor ARG 1 sideMapColor METHOD method_26118 (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 2 state - METHOD method_26119 createPistonBlock (Z)Lnet/minecraft/class_2665; + METHOD method_26119 createPistonBlock (Z)Lnet/minecraft/class_2248; ARG 0 sticky - METHOD method_26120 createStainedGlassBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2506; + METHOD method_26120 createStainedGlassBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2248; ARG 0 color METHOD method_26121 (Lnet/minecraft/class_2680;)I ARG 0 state @@ -133,10 +132,6 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks METHOD method_26152 (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_26979 refreshShapeCache ()V - METHOD method_27091 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 0 state - ARG 1 world - ARG 2 pos METHOD method_31625 (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_32894 (Lnet/minecraft/class_2680;)I @@ -167,23 +162,20 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state METHOD method_41424 (Lnet/minecraft/class_2680;)I ARG 0 state - METHOD method_45451 createWoodenButtonBlock (Lnet/minecraft/class_8177;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_2269; + METHOD method_45451 createWoodenButtonBlock (Lnet/minecraft/class_8177;)Lnet/minecraft/class_2248; ARG 0 blockSetType - ARG 1 requiredFeatures - METHOD method_45453 createStoneButtonBlock ()Lnet/minecraft/class_2269; - METHOD method_47375 createBambooBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2498;)Lnet/minecraft/class_2465; + METHOD method_45453 createStoneButtonBlock ()Lnet/minecraft/class_2248; + METHOD method_47375 createBambooBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2498;)Lnet/minecraft/class_2248; ARG 0 topMapColor ARG 1 sideMapColor ARG 2 soundGroup METHOD method_47376 (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 2 state - METHOD method_50000 createFlowerPotBlock (Lnet/minecraft/class_2248;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_2362; + METHOD method_50000 createFlowerPotBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 flower - ARG 1 requiredFeatures - METHOD method_50001 createCandleBlock (Lnet/minecraft/class_3620;)Lnet/minecraft/class_5544; + METHOD method_50001 createCandleBlock (Lnet/minecraft/class_3620;)Lnet/minecraft/class_2248; ARG 0 color - METHOD method_52571 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; - ARG 0 id + METHOD method_52571 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 1 block METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 id diff --git a/mappings/net/minecraft/block/BrushableBlock.mapping b/mappings/net/minecraft/block/BrushableBlock.mapping index 8c7aef7475..6c72d66c09 100644 --- a/mappings/net/minecraft/block/BrushableBlock.mapping +++ b/mappings/net/minecraft/block/BrushableBlock.mapping @@ -3,11 +3,8 @@ CLASS net/minecraft/class_8170 net/minecraft/block/BrushableBlock FIELD field_43232 baseBlock Lnet/minecraft/class_2248; FIELD field_43233 brushingSound Lnet/minecraft/class_3414; FIELD field_43234 brushingCompleteSound Lnet/minecraft/class_3414; - METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_4970$class_2251;)V ARG 1 baseBlock - ARG 2 settings - ARG 3 brushingSound - ARG 4 brushingCompleteSound METHOD method_49810 getBaseBlock ()Lnet/minecraft/class_2248; METHOD method_49811 getBrushingSound ()Lnet/minecraft/class_3414; METHOD method_49812 getBrushingCompleteSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/block/ButtonBlock.mapping b/mappings/net/minecraft/block/ButtonBlock.mapping index ab5cf3cff2..35372501e8 100644 --- a/mappings/net/minecraft/block/ButtonBlock.mapping +++ b/mappings/net/minecraft/block/ButtonBlock.mapping @@ -17,13 +17,7 @@ CLASS net/minecraft/class_2269 net/minecraft/block/ButtonBlock FIELD field_10731 WEST_SHAPE Lnet/minecraft/class_265; FIELD field_10732 WEST_PRESSED_SHAPE Lnet/minecraft/class_265; FIELD field_40298 pressTicks I - FIELD field_40299 wooden Z FIELD field_42753 blockSetType Lnet/minecraft/class_8177; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;IZ)V - ARG 1 settings - ARG 2 blockSetType - ARG 3 pressTicks - ARG 4 wooden METHOD method_21845 powerOn (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 state ARG 2 world diff --git a/mappings/net/minecraft/block/ChorusFlowerBlock.mapping b/mappings/net/minecraft/block/ChorusFlowerBlock.mapping index be6a03eaeb..4e86f0e3b2 100644 --- a/mappings/net/minecraft/block/ChorusFlowerBlock.mapping +++ b/mappings/net/minecraft/block/ChorusFlowerBlock.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_2279 net/minecraft/block/ChorusFlowerBlock FIELD field_10762 AGE Lnet/minecraft/class_2758; - FIELD field_10763 plantBlock Lnet/minecraft/class_2283; + FIELD field_10763 plantBlock Lnet/minecraft/class_2248; FIELD field_31060 MAX_AGE I - METHOD (Lnet/minecraft/class_2283;Lnet/minecraft/class_4970$class_2251;)V - ARG 1 plantBlock + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V ARG 2 settings METHOD method_9744 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;I)V ARG 0 world diff --git a/mappings/net/minecraft/block/ChorusPlantBlock.mapping b/mappings/net/minecraft/block/ChorusPlantBlock.mapping index a3ed80de00..5169eda1d1 100644 --- a/mappings/net/minecraft/block/ChorusPlantBlock.mapping +++ b/mappings/net/minecraft/block/ChorusPlantBlock.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_2283 net/minecraft/block/ChorusPlantBlock - METHOD method_9759 withConnectionProperties (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 1 world - ARG 2 pos + METHOD method_9759 withConnectionProperties (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/CommandBlock.mapping b/mappings/net/minecraft/block/CommandBlock.mapping index a217cad0d9..16e8c574fc 100644 --- a/mappings/net/minecraft/block/CommandBlock.mapping +++ b/mappings/net/minecraft/block/CommandBlock.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_2288 net/minecraft/block/CommandBlock FIELD field_10792 LOGGER Lorg/slf4j/Logger; FIELD field_10793 CONDITIONAL Lnet/minecraft/class_2746; FIELD field_27192 auto Z - METHOD (Lnet/minecraft/class_4970$class_2251;Z)V - ARG 1 settings - ARG 2 auto METHOD method_9779 executeCommandChain (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/ConcretePowderBlock.mapping b/mappings/net/minecraft/block/ConcretePowderBlock.mapping index 60112537d6..709ddc67cc 100644 --- a/mappings/net/minecraft/block/ConcretePowderBlock.mapping +++ b/mappings/net/minecraft/block/ConcretePowderBlock.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2292 net/minecraft/block/ConcretePowderBlock - FIELD field_10810 hardenedState Lnet/minecraft/class_2680; + FIELD field_10810 hardenedState Lnet/minecraft/class_2248; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V ARG 1 hardened ARG 2 settings diff --git a/mappings/net/minecraft/block/DoorBlock.mapping b/mappings/net/minecraft/block/DoorBlock.mapping index f36ec06ec2..e675a12f63 100644 --- a/mappings/net/minecraft/block/DoorBlock.mapping +++ b/mappings/net/minecraft/block/DoorBlock.mapping @@ -9,9 +9,6 @@ CLASS net/minecraft/class_2323 net/minecraft/block/DoorBlock FIELD field_10945 OPEN Lnet/minecraft/class_2746; FIELD field_10946 HALF Lnet/minecraft/class_2754; FIELD field_42757 blockSetType Lnet/minecraft/class_8177; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V - ARG 1 settings - ARG 2 blockSetType METHOD method_10033 setOpen (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Z)V ARG 1 entity ARG 2 world diff --git a/mappings/net/minecraft/block/ExperienceDroppingBlock.mapping b/mappings/net/minecraft/block/ExperienceDroppingBlock.mapping index 70899bfe59..4ac2914b21 100644 --- a/mappings/net/minecraft/block/ExperienceDroppingBlock.mapping +++ b/mappings/net/minecraft/block/ExperienceDroppingBlock.mapping @@ -1,5 +1,2 @@ CLASS net/minecraft/class_2431 net/minecraft/block/ExperienceDroppingBlock FIELD field_27195 experienceDropped Lnet/minecraft/class_6017; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_6017;)V - ARG 1 settings - ARG 2 experience diff --git a/mappings/net/minecraft/block/FenceGateBlock.mapping b/mappings/net/minecraft/block/FenceGateBlock.mapping index 35ba6eb53c..190fc58035 100644 --- a/mappings/net/minecraft/block/FenceGateBlock.mapping +++ b/mappings/net/minecraft/block/FenceGateBlock.mapping @@ -15,9 +15,6 @@ CLASS net/minecraft/class_2349 net/minecraft/block/FenceGateBlock FIELD field_40744 Z_AXIS_SIDES_SHAPE Lnet/minecraft/class_265; FIELD field_40745 X_AXIS_SIDES_SHAPE Lnet/minecraft/class_265; FIELD field_42758 type Lnet/minecraft/class_4719; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_4719;)V - ARG 1 settings - ARG 2 type METHOD method_10138 isWall (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_16703 canWallConnect (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index d74c550aa5..a67bea1d77 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock FIELD field_11085 SHAPE Lnet/minecraft/class_265; FIELD field_45775 stewEffects Ljava/util/List; - METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V - ARG 1 suspiciousStewEffect - ARG 2 effectDuration - ARG 3 settings diff --git a/mappings/net/minecraft/block/FungusBlock.mapping b/mappings/net/minecraft/block/FungusBlock.mapping index 5c2eb20e2b..9da2a07218 100644 --- a/mappings/net/minecraft/block/FungusBlock.mapping +++ b/mappings/net/minecraft/block/FungusBlock.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/class_4771 net/minecraft/block/FungusBlock FIELD field_22135 featureKey Lnet/minecraft/class_5321; FIELD field_31099 GROW_CHANCE D FIELD field_41074 nylium Lnet/minecraft/class_2248; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_5321;Lnet/minecraft/class_2248;)V - ARG 1 settings - ARG 2 featureKey - ARG 3 nylium METHOD method_46682 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V ARG 3 featureEntry METHOD method_46683 getFeatureEntry (Lnet/minecraft/class_4538;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/block/GourdBlock.mapping b/mappings/net/minecraft/block/GourdBlock.mapping deleted file mode 100644 index 8441426cc8..0000000000 --- a/mappings/net/minecraft/block/GourdBlock.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2511 net/minecraft/block/GourdBlock - METHOD method_10679 getStem ()Lnet/minecraft/class_2513; - METHOD method_10680 getAttachedStem ()Lnet/minecraft/class_2195; diff --git a/mappings/net/minecraft/block/GravelBlock.mapping b/mappings/net/minecraft/block/GravelBlock.mapping deleted file mode 100644 index a1da4251c5..0000000000 --- a/mappings/net/minecraft/block/GravelBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2375 net/minecraft/block/GravelBlock diff --git a/mappings/net/minecraft/block/LeveledCauldronBlock.mapping b/mappings/net/minecraft/block/LeveledCauldronBlock.mapping index 94fe650de9..5608029d4b 100644 --- a/mappings/net/minecraft/block/LeveledCauldronBlock.mapping +++ b/mappings/net/minecraft/block/LeveledCauldronBlock.mapping @@ -6,34 +6,18 @@ CLASS net/minecraft/class_5556 net/minecraft/block/LeveledCauldronBlock COMMENT block state property which can take values between {@value #MIN_LEVEL} and COMMENT {@value #MAX_LEVEL} (inclusive). FIELD field_27206 LEVEL Lnet/minecraft/class_2758; - FIELD field_27880 RAIN_PREDICATE Ljava/util/function/Predicate; - COMMENT A precipitation predicate that allows {@link Biome.Precipitation#RAIN}. - FIELD field_27881 SNOW_PREDICATE Ljava/util/function/Predicate; - COMMENT A precipitation predicate that allows {@link Biome.Precipitation#SNOW}. - FIELD field_27882 precipitationPredicate Ljava/util/function/Predicate; FIELD field_31107 MIN_LEVEL I FIELD field_31108 MAX_LEVEL I FIELD field_31109 BASE_FLUID_HEIGHT I FIELD field_31110 FLUID_HEIGHT_PER_LEVEL D - METHOD (Lnet/minecraft/class_4970$class_2251;Ljava/util/function/Predicate;Ljava/util/Map;)V + METHOD (Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_5620$class_8821;Lnet/minecraft/class_4970$class_2251;)V COMMENT Constructs a leveled cauldron block. COMMENT COMMENT @apiNote The precipitation predicates are compared using identity comparisons in some cases, COMMENT so callers should typically use {@link #RAIN_PREDICATE} and {@link #SNOW_PREDICATE} if applicable. - ARG 1 settings - ARG 2 precipitationPredicate - COMMENT a predicate that checks what type of precipitation can fill this cauldron - ARG 3 behaviorMap - COMMENT the map containing cauldron behaviors for each item METHOD method_31650 decrementFluidLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 state ARG 1 world ARG 2 pos - METHOD method_32352 (Lnet/minecraft/class_1959$class_1963;)Z - ARG 0 precipitation - METHOD method_32353 (Lnet/minecraft/class_1959$class_1963;)Z - ARG 0 precipitation METHOD method_36994 onFireCollision (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 1 state - ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/block/MelonBlock.mapping b/mappings/net/minecraft/block/MelonBlock.mapping deleted file mode 100644 index 0a1f85c3f1..0000000000 --- a/mappings/net/minecraft/block/MelonBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2411 net/minecraft/block/MelonBlock diff --git a/mappings/net/minecraft/block/MushroomPlantBlock.mapping b/mappings/net/minecraft/block/MushroomPlantBlock.mapping index c1db7afee6..e12bddab74 100644 --- a/mappings/net/minecraft/block/MushroomPlantBlock.mapping +++ b/mappings/net/minecraft/block/MushroomPlantBlock.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_2420 net/minecraft/block/MushroomPlantBlock FIELD field_11304 SHAPE Lnet/minecraft/class_265; FIELD field_27194 featureKey Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_5321;)V - ARG 1 settings - ARG 2 featureKey METHOD method_10349 trySpawningBigMushroom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/PowderSnowCauldronBlock.mapping b/mappings/net/minecraft/block/PowderSnowCauldronBlock.mapping deleted file mode 100644 index 61972d96c3..0000000000 --- a/mappings/net/minecraft/block/PowderSnowCauldronBlock.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_6377 net/minecraft/block/PowderSnowCauldronBlock - COMMENT A cauldron filled with powder snow. diff --git a/mappings/net/minecraft/block/PressurePlateBlock.mapping b/mappings/net/minecraft/block/PressurePlateBlock.mapping index 06d67a3178..70abf68c1d 100644 --- a/mappings/net/minecraft/block/PressurePlateBlock.mapping +++ b/mappings/net/minecraft/block/PressurePlateBlock.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_2440 net/minecraft/block/PressurePlateBlock FIELD field_11358 POWERED Lnet/minecraft/class_2746; - FIELD field_11359 type Lnet/minecraft/class_2440$class_2441; - METHOD (Lnet/minecraft/class_2440$class_2441;Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V - ARG 1 type + METHOD (Lnet/minecraft/class_8177;Lnet/minecraft/class_4970$class_2251;)V ARG 2 settings - ARG 3 blockSetType - CLASS class_2441 ActivationRule diff --git a/mappings/net/minecraft/block/SandBlock.mapping b/mappings/net/minecraft/block/SandBlock.mapping deleted file mode 100644 index d5ff7395ba..0000000000 --- a/mappings/net/minecraft/block/SandBlock.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2468 net/minecraft/block/SandBlock - FIELD field_11462 color I - METHOD (ILnet/minecraft/class_4970$class_2251;)V - ARG 1 color - ARG 2 settings diff --git a/mappings/net/minecraft/block/SaplingBlock.mapping b/mappings/net/minecraft/block/SaplingBlock.mapping index 65b6281f75..02b74b5894 100644 --- a/mappings/net/minecraft/block/SaplingBlock.mapping +++ b/mappings/net/minecraft/block/SaplingBlock.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2473 net/minecraft/block/SaplingBlock FIELD field_11476 STAGE Lnet/minecraft/class_2758; - FIELD field_11477 generator Lnet/minecraft/class_2647; + FIELD field_11477 generator Lnet/minecraft/class_8813; FIELD field_11478 SHAPE Lnet/minecraft/class_265; - METHOD (Lnet/minecraft/class_2647;Lnet/minecraft/class_4970$class_2251;)V + METHOD (Lnet/minecraft/class_8813;Lnet/minecraft/class_4970$class_2251;)V ARG 1 generator ARG 2 settings METHOD method_10507 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)V diff --git a/mappings/net/minecraft/block/StemBlock.mapping b/mappings/net/minecraft/block/StemBlock.mapping index d657118bf3..d4f4fd4a20 100644 --- a/mappings/net/minecraft/block/StemBlock.mapping +++ b/mappings/net/minecraft/block/StemBlock.mapping @@ -1,11 +1,6 @@ CLASS net/minecraft/class_2513 net/minecraft/block/StemBlock FIELD field_11583 AGE_TO_SHAPE [Lnet/minecraft/class_265; FIELD field_11584 AGE Lnet/minecraft/class_2758; - FIELD field_11585 gourdBlock Lnet/minecraft/class_2511; - FIELD field_27205 pickBlockItem Ljava/util/function/Supplier; + FIELD field_11585 gourdBlock Lnet/minecraft/class_5321; + FIELD field_27205 pickBlockItem Lnet/minecraft/class_5321; FIELD field_31255 MAX_AGE I - METHOD (Lnet/minecraft/class_2511;Ljava/util/function/Supplier;Lnet/minecraft/class_4970$class_2251;)V - ARG 1 gourdBlock - ARG 2 pickBlockItem - ARG 3 settings - METHOD method_10694 getGourdBlock ()Lnet/minecraft/class_2511; diff --git a/mappings/net/minecraft/block/TorchBlock.mapping b/mappings/net/minecraft/block/TorchBlock.mapping index b427dc33b5..6048d46379 100644 --- a/mappings/net/minecraft/block/TorchBlock.mapping +++ b/mappings/net/minecraft/block/TorchBlock.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_2527 net/minecraft/block/TorchBlock - FIELD field_11618 BOUNDING_SHAPE Lnet/minecraft/class_265; - FIELD field_22155 particle Lnet/minecraft/class_2394; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_2394;)V - ARG 1 settings - ARG 2 particle + FIELD field_22155 particle Lnet/minecraft/class_2400; diff --git a/mappings/net/minecraft/block/TrapdoorBlock.mapping b/mappings/net/minecraft/block/TrapdoorBlock.mapping index 33e6b290df..828f66a5d1 100644 --- a/mappings/net/minecraft/block/TrapdoorBlock.mapping +++ b/mappings/net/minecraft/block/TrapdoorBlock.mapping @@ -10,9 +10,6 @@ CLASS net/minecraft/class_2533 net/minecraft/block/TrapdoorBlock FIELD field_11632 OPEN_BOTTOM_SHAPE Lnet/minecraft/class_265; FIELD field_11633 NORTH_SHAPE Lnet/minecraft/class_265; FIELD field_42779 blockSetType Lnet/minecraft/class_8177; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V - ARG 1 settings - ARG 2 blockSetType METHOD method_10740 playToggleSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V ARG 1 player ARG 2 world diff --git a/mappings/net/minecraft/block/TripwireBlock.mapping b/mappings/net/minecraft/block/TripwireBlock.mapping index 0d786a027b..bd49b69ec3 100644 --- a/mappings/net/minecraft/block/TripwireBlock.mapping +++ b/mappings/net/minecraft/block/TripwireBlock.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2538 net/minecraft/block/TripwireBlock FIELD field_11674 WEST Lnet/minecraft/class_2746; FIELD field_11675 NORTH Lnet/minecraft/class_2746; FIELD field_11676 FACING_PROPERTIES Ljava/util/Map; - FIELD field_11677 hookBlock Lnet/minecraft/class_2537; + FIELD field_11677 hookBlock Lnet/minecraft/class_2248; FIELD field_11678 SOUTH Lnet/minecraft/class_2746; FIELD field_11679 DISARMED Lnet/minecraft/class_2746; FIELD field_11680 POWERED Lnet/minecraft/class_2746; @@ -11,8 +11,7 @@ CLASS net/minecraft/class_2538 net/minecraft/block/TripwireBlock FIELD field_11682 ATTACHED_SHAPE Lnet/minecraft/class_265; FIELD field_11683 ATTACHED Lnet/minecraft/class_2746; FIELD field_31267 SCHEDULED_TICK_DELAY I - METHOD (Lnet/minecraft/class_2537;Lnet/minecraft/class_4970$class_2251;)V - ARG 1 hookBlock + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V ARG 2 settings METHOD method_10778 shouldConnectTo (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z ARG 1 state diff --git a/mappings/net/minecraft/block/TripwireHookBlock.mapping b/mappings/net/minecraft/block/TripwireHookBlock.mapping index 751984d994..50a724d383 100644 --- a/mappings/net/minecraft/block/TripwireHookBlock.mapping +++ b/mappings/net/minecraft/block/TripwireHookBlock.mapping @@ -7,19 +7,9 @@ CLASS net/minecraft/class_2537 net/minecraft/block/TripwireHookBlock FIELD field_11670 EAST_SHAPE Lnet/minecraft/class_265; FIELD field_11671 POWERED Lnet/minecraft/class_2746; FIELD field_31271 SCHEDULED_TICK_DELAY I - METHOD method_10775 updateNeighborsOnAxis (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V + METHOD method_10775 updateNeighborsOnAxis (Lnet/minecraft/class_2248;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V ARG 1 world ARG 2 pos ARG 3 direction METHOD method_10776 update (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;ZZILnet/minecraft/class_2680;)V - ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 beingRemoved METHOD method_10777 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ZZZZ)V - ARG 1 world - ARG 2 pos - ARG 3 attached - ARG 4 on - ARG 5 detached - ARG 6 off diff --git a/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping b/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping index 4c1ac8c4e7..2a4af95d86 100644 --- a/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping +++ b/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2557 net/minecraft/block/WeightedPressurePlateBlock FIELD field_11738 weight I FIELD field_11739 POWER Lnet/minecraft/class_2758; - METHOD (ILnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V + METHOD (ILnet/minecraft/class_8177;Lnet/minecraft/class_4970$class_2251;)V ARG 1 weight - ARG 2 settings - ARG 3 blockSetType diff --git a/mappings/net/minecraft/block/WitherRoseBlock.mapping b/mappings/net/minecraft/block/WitherRoseBlock.mapping index 1300921430..9b07dea32f 100644 --- a/mappings/net/minecraft/block/WitherRoseBlock.mapping +++ b/mappings/net/minecraft/block/WitherRoseBlock.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_2563 net/minecraft/block/WitherRoseBlock - METHOD (Lnet/minecraft/class_1291;Lnet/minecraft/class_4970$class_2251;)V + METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V ARG 1 effect - ARG 2 settings diff --git a/mappings/net/minecraft/block/WoodType.mapping b/mappings/net/minecraft/block/WoodType.mapping index b77ec3431c..e63aae0e30 100644 --- a/mappings/net/minecraft/block/WoodType.mapping +++ b/mappings/net/minecraft/block/WoodType.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_4719 net/minecraft/block/WoodType FIELD field_21679 ACACIA Lnet/minecraft/class_4719; FIELD field_21680 JUNGLE Lnet/minecraft/class_4719; FIELD field_21681 DARK_OAK Lnet/minecraft/class_4719; - FIELD field_21682 VALUES Ljava/util/Set; FIELD field_22183 CRIMSON Lnet/minecraft/class_4719; FIELD field_22184 WARPED Lnet/minecraft/class_4719; FIELD field_37657 MANGROVE Lnet/minecraft/class_4719; diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index 46da25f5f9..c68baada12 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -34,15 +34,15 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT COMMENT COMMENT - FIELD field_27775 EMPTY_CAULDRON_BEHAVIOR Ljava/util/Map; + FIELD field_27775 EMPTY_CAULDRON_BEHAVIOR Lnet/minecraft/class_5620$class_8821; COMMENT The cauldron behaviors for empty cauldrons. COMMENT COMMENT @see #createMap - FIELD field_27776 WATER_CAULDRON_BEHAVIOR Ljava/util/Map; + FIELD field_27776 WATER_CAULDRON_BEHAVIOR Lnet/minecraft/class_5620$class_8821; COMMENT The cauldron behaviors for water cauldrons. COMMENT COMMENT @see #createMap - FIELD field_27777 LAVA_CAULDRON_BEHAVIOR Ljava/util/Map; + FIELD field_27777 LAVA_CAULDRON_BEHAVIOR Lnet/minecraft/class_5620$class_8821; COMMENT The cauldron behaviors for lava cauldrons. COMMENT COMMENT @see #createMap @@ -60,7 +60,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT A behavior that cleans banners with patterns. FIELD field_27782 CLEAN_DYEABLE_ITEM Lnet/minecraft/class_5620; COMMENT A behavior that cleans {@linkplain net.minecraft.item.DyeableItem dyeable items}. - FIELD field_28011 POWDER_SNOW_CAULDRON_BEHAVIOR Ljava/util/Map; + FIELD field_28011 POWDER_SNOW_CAULDRON_BEHAVIOR Lnet/minecraft/class_5620$class_8821; COMMENT The cauldron behaviors for powder snow cauldrons. COMMENT COMMENT @see #createMap @@ -85,7 +85,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT the hand interacting with the cauldron ARG 6 stack COMMENT the stack in the player's hand - METHOD method_32206 createMap ()Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap; + METHOD method_32206 createMap (Ljava/lang/String;)Lnet/minecraft/class_5620$class_8821; COMMENT Creates a mutable map from {@linkplain Item items} to their COMMENT corresponding cauldron behaviors. COMMENT @@ -145,8 +145,6 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT a predicate used to check if the cauldron can be emptied into the output stack ARG 8 soundEvent COMMENT the sound produced by emptying - METHOD method_32211 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V - ARG 0 map METHOD method_32212 registerBehavior ()V COMMENT Registers the vanilla cauldron behaviors. METHOD method_32213 (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping index 96f5a8996e..f369b21b5e 100644 --- a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2619 net/minecraft/block/entity/JukeboxBlockEntity FIELD field_39483 recordStartTick J FIELD field_39484 isPlaying Z FIELD field_42799 SECOND_PER_TICK I - FIELD field_42800 inventory Lnet/minecraft/class_2371; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index 1958caa23a..3d9ed57ee8 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity FIELD field_12087 owner Lcom/mojang/authlib/GameProfile; - FIELD field_12088 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; - FIELD field_12089 userCache Lnet/minecraft/class_3312; + FIELD field_12089 userCache Lcom/google/common/cache/LoadingCache; FIELD field_31363 SKULL_OWNER_KEY Ljava/lang/String; FIELD field_34029 currentExecutor Ljava/util/concurrent/Executor; FIELD field_41315 poweredTicks I @@ -32,17 +31,11 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity ARG 0 runnable METHOD method_52580 fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 0 name - METHOD method_52581 (Ljava/util/Optional;)Ljava/util/Optional; - ARG 0 profile METHOD method_52582 fillSkullOwner (Lnet/minecraft/class_2487;Ljava/lang/String;)V ARG 0 nbt ARG 1 name METHOD method_52583 (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/util/Optional;)V ARG 2 profile - METHOD method_52584 fetchProfileWithTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture; - ARG 0 profile - METHOD method_52585 (Ljava/util/Optional;)Ljava/util/concurrent/CompletionStage; - ARG 0 profile METHOD method_52586 hasTextures (Lcom/mojang/authlib/GameProfile;)Z ARG 0 profile METHOD method_52587 (Ljava/util/Optional;)V diff --git a/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping deleted file mode 100644 index c0616fa660..0000000000 --- a/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2654 net/minecraft/block/sapling/AcaciaSaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/AzaleaSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/AzaleaSaplingGenerator.mapping deleted file mode 100644 index c6ff2e8d72..0000000000 --- a/mappings/net/minecraft/block/sapling/AzaleaSaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6349 net/minecraft/block/sapling/AzaleaSaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping deleted file mode 100644 index cd2a079b63..0000000000 --- a/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2652 net/minecraft/block/sapling/BirchSaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/CherrySaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/CherrySaplingGenerator.mapping deleted file mode 100644 index 165a0427ba..0000000000 --- a/mappings/net/minecraft/block/sapling/CherrySaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_8175 net/minecraft/block/sapling/CherrySaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping deleted file mode 100644 index 852cc36f2b..0000000000 --- a/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2657 net/minecraft/block/sapling/DarkOakSaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping deleted file mode 100644 index f710475db5..0000000000 --- a/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2655 net/minecraft/block/sapling/JungleSaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping deleted file mode 100644 index 87ea9093be..0000000000 --- a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_2650 net/minecraft/block/sapling/LargeTreeSaplingGenerator - METHOD method_11442 canGenerateLargeTree (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;II)Z - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 x - ARG 4 z - METHOD method_11443 getLargeTreeFeature (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5321; - ARG 1 random - METHOD method_11444 generateLargeTree (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;II)Z - ARG 1 world - ARG 2 chunkGenerator - ARG 3 pos - ARG 4 state - ARG 5 random - ARG 6 x - ARG 7 z diff --git a/mappings/net/minecraft/block/sapling/MangroveSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/MangroveSaplingGenerator.mapping deleted file mode 100644 index 0d9db37c53..0000000000 --- a/mappings/net/minecraft/block/sapling/MangroveSaplingGenerator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7382 net/minecraft/block/sapling/MangroveSaplingGenerator - FIELD field_38758 tallChance F - METHOD (F)V - ARG 1 tallChance diff --git a/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping deleted file mode 100644 index 83e05fb0a3..0000000000 --- a/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2662 net/minecraft/block/sapling/OakSaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping deleted file mode 100644 index 24133e374e..0000000000 --- a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator - METHOD method_11430 getTreeFeature (Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_5321; - ARG 1 random - ARG 2 bees - METHOD method_11431 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Z - ARG 1 world - ARG 2 chunkGenerator - ARG 3 pos - ARG 4 state - ARG 5 random - METHOD method_24282 areFlowersNearby (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 pos diff --git a/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping deleted file mode 100644 index e170727c52..0000000000 --- a/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2659 net/minecraft/block/sapling/SpruceSaplingGenerator diff --git a/mappings/net/minecraft/class_8828.mapping b/mappings/net/minecraft/class_8828.mapping new file mode 100644 index 0000000000..6b45ac7ecf --- /dev/null +++ b/mappings/net/minecraft/class_8828.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8828 + METHOD comp_737 string ()Ljava/lang/String; + CLASS net/minecraft/class_necraft/class_2585 LiteralTextContent + FIELD comp_737 string Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 string diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index fdf62df3ef..39ffa4496f 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -306,7 +306,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 spawnChunkRadius METHOD method_18095 getSplashTextLoader ()Lnet/minecraft/class_4008; METHOD method_18096 disconnect (Lnet/minecraft/class_437;)V - ARG 1 screen METHOD method_18097 setWorld (Lnet/minecraft/class_638;)V ARG 1 world METHOD method_18098 reset (Lnet/minecraft/class_437;)V @@ -510,7 +509,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 uuid METHOD method_52702 getSymlinkFinder ()Lnet/minecraft/class_8580; METHOD method_52703 enterReconfiguration (Lnet/minecraft/class_437;)V - ARG 1 screen METHOD method_53462 getGameProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_53465 onFinishedLoading (Lnet/minecraft/class_310$class_8764;)V ARG 1 loadingContext diff --git a/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping b/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping index 596ddaa372..e3a296922f 100644 --- a/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_434 net/minecraft/client/gui/screen/DownloadingTerrainScreen FIELD field_26544 TEXT Lnet/minecraft/class_2561; FIELD field_36365 MIN_LOAD_TIME_MS J - FIELD field_36366 ready Z - FIELD field_36367 closeOnNextTick Z FIELD field_36368 loadStartTime J - METHOD method_40040 setReady ()V diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index b0ec95e094..5fbc13c1c0 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorldScreen FIELD field_25482 LOGGER Lorg/slf4j/Logger; - FIELD field_3232 DIMENSION_COLORS Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_3232 DIMENSION_COLORS Ljava/util/function/ToIntFunction; FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_3234 updater Lnet/minecraft/class_1257; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_2378;)V @@ -18,5 +18,3 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl ARG 2 dataFixer ARG 3 storageSession ARG 4 eraseCache - METHOD method_2747 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenCustomHashMap;)V - ARG 0 colors diff --git a/mappings/net/minecraft/client/realms/dto/RealmsText.mapping b/mappings/net/minecraft/client/realms/dto/RealmsText.mapping index 94d74a3b59..9dec078aa1 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsText.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsText.mapping @@ -2,10 +2,9 @@ CLASS net/minecraft/class_8206 net/minecraft/client/realms/dto/RealmsText FIELD field_43031 TRANSLATION_KEY_KEY Ljava/lang/String; FIELD field_43032 ARGS_KEY Ljava/lang/String; FIELD field_43033 translationKey Ljava/lang/String; - FIELD field_43034 args [Ljava/lang/Object; - METHOD (Ljava/lang/String;[Ljava/lang/Object;)V + FIELD field_43034 args [Ljava/lang/String; + METHOD (Ljava/lang/String;[Ljava/lang/String;)V ARG 1 translationKey - ARG 2 args METHOD method_49582 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8206; ARG 0 json METHOD method_49583 toText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 92e58c235e..e89c1a4376 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -96,18 +96,12 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_49288 shouldLeaveButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server METHOD method_49550 refresh ()V - METHOD method_49551 addNotificationEntry (Lnet/minecraft/class_4325$class_4329;Lnet/minecraft/class_8204;)V - ARG 1 selectionList - ARG 2 notification + METHOD method_49551 addNotificationEntry (Lnet/minecraft/class_8204;)Z METHOD method_49553 request (Lnet/minecraft/class_4325$class_8203;Ljava/util/function/Consumer;)V ARG 0 request ARG 1 resultConsumer METHOD method_49554 (Ljava/lang/Throwable;)Ljava/lang/Void; ARG 0 throwable - METHOD method_49555 (Ljava/util/List;Lnet/minecraft/class_4341;)Ljava/lang/Object; - ARG 1 client - METHOD method_49556 (Ljava/util/List;Ljava/lang/Object;)V - ARG 2 void_ METHOD method_49557 dismissNotification (Ljava/util/UUID;)V ARG 1 notification METHOD method_49558 (Ljava/util/UUID;Lnet/minecraft/class_4341;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping b/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping index 4ea8989ce6..bb4546f81e 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_4413 net/minecraft/client/realms/gui/screen/ResetWorldInfo - FIELD field_20042 seed Ljava/lang/String; - FIELD field_20043 levelType Lnet/minecraft/class_5672; - FIELD field_20044 generateStructures Z + FIELD comp_1976 seed Ljava/lang/String; + FIELD comp_1977 levelType Lnet/minecraft/class_5672; + FIELD comp_1978 generateStructures Z METHOD (Ljava/lang/String;Lnet/minecraft/class_5672;Z)V ARG 1 seed ARG 2 levelType ARG 3 generateStructures - METHOD method_32508 getSeed ()Ljava/lang/String; - METHOD method_32509 getLevelType ()Lnet/minecraft/class_5672; - METHOD method_32510 shouldGenerateStructures ()Z + METHOD comp_1976 seed ()Ljava/lang/String; + METHOD comp_1977 levelType ()Lnet/minecraft/class_5672; + METHOD comp_1978 generateStructures ()Z diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 49d1b6b09e..c15c594b1e 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis ARG 9 z ARG 11 radius ARG 12 opacity - METHOD method_23165 renderFire (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;)V + METHOD method_23165 renderFire (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;Lorg/joml/Quaternionf;)V ARG 1 matrices ARG 2 vertexConsumers ARG 3 entity diff --git a/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping b/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping index faca953c0a..42f78eba46 100644 --- a/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8625 net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix - FIELD field_45088 EMPTY_TEXT_JSON Ljava/lang/String; FIELD field_45089 KEYS_TO_REMOVE [Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping index e42bc2008f..1fff7d10fa 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_1180 net/minecraft/datafixer/fix/ItemLoreToTextFix ARG 2 changesType METHOD method_5005 fixLoreNbt (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; ARG 0 nbt - METHOD method_5012 componentize (Ljava/lang/String;)Ljava/lang/String; - ARG 0 string diff --git a/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping index fe9f22afa3..84d1a3d53c 100644 --- a/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_8221 net/minecraft/datafixer/fix/UpdateSignTextFormatFix FIELD field_45085 FILTERED_CORRECT Ljava/lang/String; FIELD field_45086 DEFAULT_COLOR Ljava/lang/String; - FIELD field_45087 EMPTY_TEXT_JSON Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V ARG 1 outputSchema ARG 2 name diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index df0af19e63..57e9d4f2c4 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -2,29 +2,19 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod FIELD field_23712 LOGGER Lorg/slf4j/Logger; FIELD field_6323 value D FIELD field_6324 operation Lnet/minecraft/class_1322$class_1323; - FIELD field_6326 nameGetter Ljava/util/function/Supplier; FIELD field_6327 uuid Ljava/util/UUID; METHOD (Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V ARG 1 name ARG 2 value ARG 4 operation METHOD (Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V - ARG 1 uuid - ARG 2 name ARG 3 value - ARG 5 operation - METHOD (Ljava/util/UUID;Ljava/util/function/Supplier;DLnet/minecraft/class_1322$class_1323;)V - ARG 1 uuid - ARG 2 nameGetter - ARG 3 value - ARG 5 operation METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_26859 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322; ARG 0 nbt METHOD method_26860 toNbt ()Lnet/minecraft/class_2487; METHOD method_6182 getOperation ()Lnet/minecraft/class_1322$class_1323; - METHOD method_6185 getName ()Ljava/lang/String; METHOD method_6186 getValue ()D METHOD method_6189 getId ()Ljava/util/UUID; CLASS class_1323 Operation diff --git a/mappings/net/minecraft/inventory/SingleStackInventory.mapping b/mappings/net/minecraft/inventory/SingleStackInventory.mapping index e6dc38eb12..638790f501 100644 --- a/mappings/net/minecraft/inventory/SingleStackInventory.mapping +++ b/mappings/net/minecraft/inventory/SingleStackInventory.mapping @@ -1,11 +1,2 @@ CLASS net/minecraft/class_8181 net/minecraft/inventory/SingleStackInventory COMMENT An inventory that holds exactly one {@link ItemStack}, at slot {@code 0}. - METHOD method_49274 getStack ()Lnet/minecraft/class_1799; - COMMENT {@return the stack held by the inventory} - METHOD method_49275 setStack (Lnet/minecraft/class_1799;)V - COMMENT Sets the stack held by the inventory to {@code stack}. - ARG 1 stack - METHOD method_49276 removeStack ()Lnet/minecraft/class_1799; - COMMENT Removes the stack held by the inventory. - COMMENT - COMMENT @return the removed stack diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping index e68e18b10f..5c4738947f 100644 --- a/mappings/net/minecraft/item/ArmorMaterials.mapping +++ b/mappings/net/minecraft/item/ArmorMaterials.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials FIELD field_21978 knockbackResistance F - FIELD field_41941 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_41941 CODEC Lcom/mojang/serialization/Codec; FIELD field_41942 BASE_DURABILITY Ljava/util/EnumMap; FIELD field_41943 protectionAmounts Ljava/util/EnumMap; FIELD field_7883 durabilityMultiplier I diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index 0cf447160b..2fa4b62d2d 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry FIELD field_11109 nextId I FIELD field_25067 keyToEntry Ljava/util/Map; FIELD field_26682 rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList; - FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Reference2IntMap; FIELD field_26731 entryToLifecycle Ljava/util/Map; FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle; FIELD field_36461 valueToEntry Ljava/util/Map; @@ -25,8 +25,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry ARG 1 key ARG 2 lifecycle ARG 3 intrusive - METHOD method_39665 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenCustomHashMap;)V - ARG 0 map METHOD method_40253 getValue (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Object; ARG 0 entry METHOD method_40255 (Lnet/minecraft/class_6885$class_6888;)V diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 0a0e6ff104..20333dbfc3 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -31,19 +31,17 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 dispatcher METHOD method_22271 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_22272 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4524;)V + METHOD method_22272 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4524;Z)V ARG 0 world ARG 1 pos ARG 2 tests - METHOD method_22274 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;Lnet/minecraft/class_2338;)V - ARG 2 pos METHOD method_22275 sendMessage (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_124;)V ARG 0 world ARG 1 message ARG 2 formatting METHOD method_22276 (Lnet/minecraft/class_3222;)Z ARG 0 player - METHOD method_22277 executeRunThis (Lnet/minecraft/class_2168;)I + METHOD method_22277 executeRunThis (Lnet/minecraft/class_2168;Z)I ARG 0 source METHOD method_22278 sendMessage (Lnet/minecraft/class_2168;Ljava/lang/String;)V ARG 0 source @@ -53,7 +51,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22280 onCompletion (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V ARG 0 world ARG 1 tests - METHOD method_22281 executeRunThese (Lnet/minecraft/class_2168;)I + METHOD method_22281 executeRunThese (Lnet/minecraft/class_2168;Z)I ARG 0 source METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index f632aab258..1cda7558b2 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -30,16 +30,10 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa METHOD method_14380 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_14383 getConnectionInfo ()Ljava/lang/String; - METHOD method_40084 (I)Z - ARG 0 c - METHOD method_40085 isValidName (Ljava/lang/String;)Z - ARG 0 name METHOD method_52416 hasPlayerWithId (Lcom/mojang/authlib/GameProfile;)Z ARG 1 profile METHOD method_52417 startVerify (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile - METHOD method_52418 createOfflineProfile (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; - ARG 0 name METHOD method_52419 tickVerify (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile METHOD method_52420 sendSuccessPacket (Lcom/mojang/authlib/GameProfile;)V diff --git a/mappings/net/minecraft/text/ClickEvent.mapping b/mappings/net/minecraft/text/ClickEvent.mapping index 94b3d30fb9..f8cf3b6345 100644 --- a/mappings/net/minecraft/text/ClickEvent.mapping +++ b/mappings/net/minecraft/text/ClickEvent.mapping @@ -10,14 +10,8 @@ CLASS net/minecraft/class_2558 net/minecraft/text/ClickEvent METHOD method_10845 getAction ()Lnet/minecraft/class_2558$class_2559; CLASS class_2559 Action FIELD field_11742 name Ljava/lang/String; - FIELD field_11743 BY_NAME Ljava/util/Map; FIELD field_11744 userDefinable Z METHOD (Ljava/lang/String;ILjava/lang/String;Z)V ARG 3 name ARG 4 userDefinable - METHOD method_10846 getName ()Ljava/lang/String; METHOD method_10847 isUserDefinable ()Z - METHOD method_10848 byName (Ljava/lang/String;)Lnet/minecraft/class_2558$class_2559; - ARG 0 name - METHOD method_10849 (Lnet/minecraft/class_2558$class_2559;)Lnet/minecraft/class_2558$class_2559; - ARG 0 a diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index 11c5767469..a589c6b6e5 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent - FIELD field_11755 contents Ljava/lang/Object; - FIELD field_11756 action Lnet/minecraft/class_2568$class_5247; - FIELD field_24341 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_2568$class_5247;Ljava/lang/Object;)V ARG 1 action ARG 2 contents @@ -10,69 +7,37 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent METHOD method_10891 getValue (Lnet/minecraft/class_2568$class_5247;)Ljava/lang/Object; ARG 1 action METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_5247; - METHOD method_27664 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2568; - ARG 0 json - METHOD method_27665 toJson ()Lcom/google/gson/JsonObject; CLASS class_5247 Action - FIELD field_24345 BY_NAME Ljava/util/Map; FIELD field_24346 name Ljava/lang/String; FIELD field_24347 parsable Z - FIELD field_24348 deserializer Ljava/util/function/Function; - FIELD field_24349 serializer Ljava/util/function/Function; - FIELD field_24350 legacyDeserializer Ljava/util/function/Function; - METHOD (Ljava/lang/String;ZLjava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Function;)V + METHOD (Ljava/lang/String;ZLcom/mojang/serialization/Codec;Ljava/util/function/Function;)V ARG 1 name ARG 2 parsable - ARG 3 deserializer ARG 4 serializer - ARG 5 legacyDeserializer METHOD method_27667 isParsable ()Z - METHOD method_27668 buildHoverEvent (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2568; - ARG 1 contents - METHOD method_27669 contentsToJson (Ljava/lang/Object;)Lcom/google/gson/JsonElement; - ARG 1 contents - METHOD method_27670 byName (Ljava/lang/String;)Lnet/minecraft/class_2568$class_5247; - ARG 0 name - METHOD method_27671 buildHoverEvent (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2568; - ARG 1 value - METHOD method_27672 (Lnet/minecraft/class_2568$class_5247;)Lnet/minecraft/class_2568$class_5247; - ARG 0 action - METHOD method_27674 getName ()Ljava/lang/String; METHOD method_27676 cast (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 o CLASS class_5248 EntityContent FIELD field_24351 entityType Lnet/minecraft/class_1299; FIELD field_24352 uuid Ljava/util/UUID; - FIELD field_24353 name Lnet/minecraft/class_2561; + FIELD field_24353 name Ljava/util/Optional; FIELD field_24354 tooltip Ljava/util/List; - METHOD (Lnet/minecraft/class_1299;Ljava/util/UUID;Lnet/minecraft/class_2561;)V + METHOD (Lnet/minecraft/class_1299;Ljava/util/UUID;Ljava/util/Optional;)V ARG 1 entityType ARG 2 uuid - ARG 3 name METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_27679 toJson ()Lcom/google/gson/JsonElement; - METHOD method_27680 parse (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2568$class_5248; - ARG 0 json - METHOD method_27681 parse (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2568$class_5248; - ARG 0 text METHOD method_27682 asTooltip ()Ljava/util/List; CLASS class_5249 ItemStackContent FIELD field_24355 item Lnet/minecraft/class_1792; FIELD field_24356 count I - FIELD field_24357 nbt Lnet/minecraft/class_2487; + FIELD field_24357 nbt Ljava/util/Optional; FIELD field_24358 stack Lnet/minecraft/class_1799; - METHOD (Lnet/minecraft/class_1792;ILnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_1792;ILjava/util/Optional;)V ARG 1 item ARG 2 count - ARG 3 nbt METHOD (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_27683 asStack ()Lnet/minecraft/class_1799; - METHOD method_27687 toJson ()Lcom/google/gson/JsonElement; - METHOD method_27688 parse (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2568$class_5249; - ARG 0 json - METHOD method_27689 parse (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2568$class_5249; - ARG 0 text diff --git a/mappings/net/minecraft/text/LiteralTextContent.mapping b/mappings/net/minecraft/text/LiteralTextContent.mapping deleted file mode 100644 index fed35de0d0..0000000000 --- a/mappings/net/minecraft/text/LiteralTextContent.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2585 net/minecraft/text/LiteralTextContent - FIELD comp_737 string Ljava/lang/String; - METHOD (Ljava/lang/String;)V - ARG 1 string - METHOD comp_737 string ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index ce7348f12c..ed8b72d09c 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -19,7 +19,6 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style FIELD field_24360 EMPTY Lnet/minecraft/class_2583; COMMENT An empty style. FIELD field_24361 font Lnet/minecraft/class_2960; - FIELD field_39241 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5251;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/class_2558;Lnet/minecraft/class_2568;Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 color ARG 2 bold @@ -144,56 +143,15 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style ARG 1 strikethrough METHOD method_36141 withObfuscated (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; ARG 1 obfuscated - METHOD method_43869 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_43870 of (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2583; + METHOD method_43870 of (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2583; ARG 0 color ARG 1 bold ARG 2 italic ARG 3 underlined ARG 4 strikethrough ARG 5 obfuscated - ARG 6 insertion - ARG 7 font - METHOD method_43871 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style - METHOD method_43872 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style - METHOD method_43873 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style - METHOD method_43874 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style - METHOD method_43875 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style - METHOD method_43876 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style - METHOD method_43877 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style - METHOD method_43878 (Lnet/minecraft/class_2583;)Ljava/util/Optional; - ARG 0 style CLASS class_2584 Serializer COMMENT A JSON serializer for {@link Style}. - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 type - ARG 3 context - METHOD method_27710 getFont (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2960; - ARG 0 root - METHOD method_27711 parseNullableBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; - ARG 0 root - ARG 1 key - METHOD method_27712 getHoverEvent (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2568; - ARG 0 root - METHOD method_27713 getClickEvent (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2558; - ARG 0 root - METHOD method_27714 parseInsertion (Lcom/google/gson/JsonObject;)Ljava/lang/String; - ARG 0 root - METHOD method_27715 parseColor (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_5251; - ARG 0 root - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 style - ARG 2 type - ARG 3 context CLASS class_7418 Writer FIELD field_39012 shouldAppendComma Z METHOD method_43478 appendComma ()V diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index b481c98ead..0e76c3ecca 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -74,10 +74,6 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text FIELD field_11752 JSON_READER_LINE_START Ljava/lang/reflect/Field; FIELD field_11753 JSON_READER_POS Ljava/lang/reflect/Field; FIELD field_11754 GSON Lcom/google/gson/Gson; - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 type - ARG 3 context METHOD method_10867 toJson (Lnet/minecraft/class_2561;)Ljava/lang/String; ARG 0 text METHOD method_10868 toJsonTree (Lnet/minecraft/class_2561;)Lcom/google/gson/JsonElement; @@ -86,31 +82,9 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text ARG 0 json METHOD method_10873 fromLenientJson (Ljava/lang/String;)Lnet/minecraft/class_5250; ARG 0 json - METHOD method_10875 addStyle (Lnet/minecraft/class_2583;Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 style - ARG 2 json - ARG 3 context METHOD method_10877 fromJson (Ljava/lang/String;)Lnet/minecraft/class_5250; ARG 0 json METHOD method_10879 fromJson (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_5250; ARG 0 reader METHOD method_10880 getPosition (Lcom/google/gson/stream/JsonReader;)I ARG 0 reader - METHOD method_36327 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;Lnet/minecraft/class_2561;)V - ARG 3 separator - METHOD method_36328 addSeparator (Lcom/google/gson/JsonSerializationContext;Lcom/google/gson/JsonObject;Ljava/util/Optional;)V - ARG 1 context - ARG 2 json - ARG 3 optionalSeparator - METHOD method_36329 getSeparator (Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Optional; - ARG 1 type - ARG 2 context - ARG 3 json - METHOD method_43474 optimizeArgument (Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 text - METHOD method_43858 toSortedJsonString (Lnet/minecraft/class_2561;)Ljava/lang/String; - ARG 0 text - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 text - ARG 2 type - ARG 3 context diff --git a/mappings/net/minecraft/text/TextColor.mapping b/mappings/net/minecraft/text/TextColor.mapping index 2319f7bd4f..8ffdeb18e6 100644 --- a/mappings/net/minecraft/text/TextColor.mapping +++ b/mappings/net/minecraft/text/TextColor.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor COMMENT Obtains a text color from a formatting. ARG 0 formatting COMMENT the formatting - METHOD method_27719 parse (Ljava/lang/String;)Lnet/minecraft/class_5251; + METHOD method_27719 parse (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; COMMENT Parses a color by its name. ARG 0 name COMMENT the name @@ -41,5 +41,3 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor METHOD method_27722 (Lnet/minecraft/class_124;)Lnet/minecraft/class_5251; ARG 0 formatting METHOD method_27723 getHexCode ()Ljava/lang/String; - METHOD method_43879 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 color diff --git a/mappings/net/minecraft/text/TextContent.mapping b/mappings/net/minecraft/text/TextContent.mapping index a404473c45..2d3e4774e1 100644 --- a/mappings/net/minecraft/text/TextContent.mapping +++ b/mappings/net/minecraft/text/TextContent.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_7417 net/minecraft/text/TextContent COMMENT Represents type-specific content of text. It is stored in each tree node COMMENT in a text tree structure. Its implementations are immutable. - FIELD field_39004 EMPTY Lnet/minecraft/class_7417; - COMMENT An empty text content. METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250; COMMENT Parses this content into a basic mutable text without custom style or COMMENT siblings. The resulting text may or may not have this content. diff --git a/mappings/net/minecraft/util/StringIdentifiable.mapping b/mappings/net/minecraft/util/StringIdentifiable.mapping index 08e0e01667..213ffa02cc 100644 --- a/mappings/net/minecraft/util/StringIdentifiable.mapping +++ b/mappings/net/minecraft/util/StringIdentifiable.mapping @@ -17,42 +17,24 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable ARG 0 values METHOD method_49451 (Ljava/lang/String;)Ljava/lang/String; ARG 0 id - METHOD method_49452 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Enum; - ARG 1 id - METHOD method_49453 (Ljava/util/function/Function;Ljava/lang/Enum;)Ljava/lang/String; - ARG 1 enum_ METHOD method_49454 createCodec (Ljava/util/function/Supplier;Ljava/util/function/Function;)Lnet/minecraft/class_3542$class_7292; COMMENT Creates a codec that serializes an enum implementing this interface either COMMENT using its ordinals (when compressed) or using its {@link #asString()} method COMMENT and a given decode function. ARG 0 enumValues ARG 1 valueNameTransformer - METHOD method_49455 ([Ljava/lang/Enum;Ljava/util/function/Function;Ljava/lang/String;)Ljava/lang/Enum; - ARG 2 id CLASS 1 METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops CLASS class_7292 EnumCodec - FIELD field_38378 base Lcom/mojang/serialization/Codec; FIELD field_38379 idToIdentifiable Ljava/util/function/Function; METHOD ([Ljava/lang/Enum;Ljava/util/function/Function;)V ARG 1 values ARG 2 idToIdentifiable - METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input - METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 input - ARG 2 ops - ARG 3 prefix METHOD method_42632 (Ljava/lang/Object;)I ARG 0 enum_ METHOD method_42633 byId (Ljava/lang/String;)Ljava/lang/Enum; ARG 1 id - METHOD method_42634 ([Ljava/lang/Enum;I)Ljava/lang/Enum; - ARG 1 ordinal - METHOD method_42635 (Ljava/lang/Object;)Ljava/lang/String; - ARG 0 identifiable METHOD method_47920 byId (Ljava/lang/String;Ljava/lang/Enum;)Ljava/lang/Enum; ARG 1 id ARG 2 fallback diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index c3f62fc82e..f8e1a54759 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -277,16 +277,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT @implNote Unlike {@link java.util.List#lastIndexOf}, the returned function will COMMENT return {@code 0} when given values not in the passed list. ARG 0 values - METHOD method_44146 lastIndexGetter (Ljava/util/List;Ljava/util/function/IntFunction;)Ljava/util/function/ToIntFunction; - COMMENT {@return a function that, when given a value in {@code values}, returns the last - COMMENT index of the value in the list} - COMMENT - COMMENT @implNote Unlike {@link java.util.List#lastIndexOf}, the returned function will - COMMENT return {@code 0} when given values not in the passed list. - ARG 0 values - ARG 1 mapCreator - COMMENT a function that, when given the size of {@code values}, - COMMENT returns a map for storing the indices of the values METHOD method_44893 getFormattedCurrentTime ()Ljava/lang/String; COMMENT {@return the current time formatted using {@link #DATE_TIME_FORMATTER}} METHOD method_47526 getResult (Lcom/mojang/serialization/DataResult;Ljava/util/function/Function;)Ljava/lang/Object; @@ -362,10 +352,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT } ARG 0 object ARG 1 initializer - METHOD method_655 identityHashStrategy ()Lit/unimi/dsi/fastutil/Hash$Strategy; - COMMENT {@return the {@link Hash.Strategy} that uses identity comparison} - COMMENT - COMMENT

fastutil's "reference" object types should be used instead in most cases. METHOD method_656 make (Ljava/util/function/Supplier;)Ljava/lang/Object; COMMENT {@return the value supplied from {@code factory}} COMMENT @@ -424,12 +410,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util CLASS 4 METHOD onTermination (Ljava/lang/Throwable;)V ARG 1 throwable - CLASS class_157 IdentityHashStrategy - METHOD equals (Ljava/lang/Object;Ljava/lang/Object;)Z - ARG 1 o - ARG 2 o2 - METHOD hashCode (Ljava/lang/Object;)I - ARG 1 o CLASS class_158 OperatingSystem COMMENT An enum representing the operating system of the current platform. COMMENT This defines the behavior for opening links. diff --git a/mappings/net/minecraft/util/collection/IdList.mapping b/mappings/net/minecraft/util/collection/IdList.mapping index 3e57e98c67..4f994294c4 100644 --- a/mappings/net/minecraft/util/collection/IdList.mapping +++ b/mappings/net/minecraft/util/collection/IdList.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2361 net/minecraft/util/collection/IdList FIELD field_11098 list Ljava/util/List; FIELD field_11099 nextId I - FIELD field_11100 idMap Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_11100 idMap Lit/unimi/dsi/fastutil/objects/Reference2IntMap; METHOD (I)V ARG 1 initialSize METHOD method_10203 set (Ljava/lang/Object;I)V diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index d62b8ad38d..34f30fa954 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -14,7 +14,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_39395 OPTIONAL_OF_LONG_TO_OPTIONAL_LONG Ljava/util/function/Function; FIELD field_39396 OPTIONAL_LONG_TO_OPTIONAL_OF_LONG Ljava/util/function/Function; FIELD field_40721 JSON_ELEMENT Lcom/mojang/serialization/Codec; - FIELD field_40722 TEXT Lcom/mojang/serialization/Codec; FIELD field_40723 VECTOR_3F Lcom/mojang/serialization/Codec; FIELD field_40724 BIT_SET Lcom/mojang/serialization/Codec; FIELD field_40725 GAME_PROFILE_PROPERTY_MAP Lcom/mojang/serialization/Codec; @@ -162,8 +161,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 map METHOD method_46377 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/authlib/properties/PropertyMap; ARG 0 either - METHOD method_46379 (Lcom/mojang/serialization/Dynamic;)Lcom/google/gson/JsonElement; - ARG 0 dynamic METHOD method_46381 (Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/authlib/properties/Property; ARG 0 key ARG 1 value @@ -174,8 +171,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 stream METHOD method_46385 (Lorg/joml/Vector3f;)Ljava/util/List; ARG 0 vec3f - METHOD method_46387 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/Dynamic; - ARG 0 element METHOD method_46388 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_46389 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; @@ -266,17 +261,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 value METHOD method_53052 createRecursive (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 codecFunction - METHOD method_53053 (Ljava/util/function/Function;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 1 json - METHOD method_53054 fromJsonSerializer (Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; - ARG 0 deserializer - ARG 1 serializer METHOD method_53055 (Ljava/util/function/Supplier;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 1 codec - METHOD method_53056 (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult; - ARG 0 text - METHOD method_53057 (Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 value METHOD method_53058 object2BooleanMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 keyCodec METHOD method_53700 formattedTime (Ljava/time/format/DateTimeFormatter;)Lcom/mojang/serialization/Codec; @@ -306,7 +292,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 input ARG 2 ops ARG 3 prefix - CLASS 3 + CLASS 4 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -317,7 +303,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 result METHOD method_39515 (Lcom/mojang/serialization/DataResult;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 2 pair - CLASS 4 + CLASS 5 METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input diff --git a/mappings/net/minecraft/world/gen/feature/util/PlacedFeatureIndexer.mapping b/mappings/net/minecraft/world/gen/feature/util/PlacedFeatureIndexer.mapping index d998bc505a..553950ac88 100644 --- a/mappings/net/minecraft/world/gen/feature/util/PlacedFeatureIndexer.mapping +++ b/mappings/net/minecraft/world/gen/feature/util/PlacedFeatureIndexer.mapping @@ -39,5 +39,3 @@ CLASS net/minecraft/class_7510 net/minecraft/world/gen/feature/util/PlacedFeatur CLASS class_6827 IndexedFeatures METHOD (Ljava/util/List;)V ARG 1 features - METHOD method_44212 (I)Lit/unimi/dsi/fastutil/objects/Object2IntMap; - ARG 0 size diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 9a79f3ca52..141db53088 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; FIELD field_5759 done Z FIELD field_5760 keepUpgradingChunks Z - FIELD field_5762 dimensionProgress Lit/unimi/dsi/fastutil/objects/Object2FloatMap; + FIELD field_5762 dimensionProgress Lit/unimi/dsi/fastutil/objects/Reference2FloatMap; FIELD field_5763 progress F FIELD field_5764 skippedChunkCount I FIELD field_5765 status Lnet/minecraft/class_2561;