diff --git a/build.gradle b/build.gradle index e925b3427e..be4d611567 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.4" +def minecraft_version = "23w51a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index da053704c6..8ff7a65557 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -472,24 +472,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos ARG 4 context - METHOD method_9534 onUse (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; - COMMENT Called when this block is used by a player. - COMMENT This, by default, is bound to using the right mouse button. - COMMENT - COMMENT

This method is called on both the logical client and logical server, so take caution when overriding this method. - COMMENT The logical side can be checked using {@link net.minecraft.world.World#isClient() world.isClient()}. - COMMENT - COMMENT

If the action result is successful on a logical client, then the action will be sent to the logical server for processing. - COMMENT - COMMENT @return an action result that specifies if using the block was successful. - COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onUse} instead. See why these methods are deprecated. - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 player - ARG 5 hand - ARG 6 hit METHOD method_9535 getRenderingSeed (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)J COMMENT {@return the seed value for rendering} COMMENT @@ -1081,11 +1063,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 pos ARG 3 direction - METHOD method_26174 onUse (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; - ARG 1 world - ARG 2 player - ARG 3 hand - ARG 4 hit METHOD method_26175 onProjectileHit (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_3965;Lnet/minecraft/class_1676;)V ARG 1 world ARG 2 state diff --git a/mappings/net/minecraft/block/AbstractSignBlock.mapping b/mappings/net/minecraft/block/AbstractSignBlock.mapping index d609abc798..85efdb6024 100644 --- a/mappings/net/minecraft/block/AbstractSignBlock.mapping +++ b/mappings/net/minecraft/block/AbstractSignBlock.mapping @@ -25,5 +25,3 @@ CLASS net/minecraft/class_2478 net/minecraft/block/AbstractSignBlock ARG 1 player ARG 2 blockEntity ARG 3 front - METHOD method_52576 getActionResult (Z)Lnet/minecraft/class_1269; - ARG 1 usedSignChanger diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 5fef66eeea..83b6b05f79 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock METHOD method_18476 getDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; ARG 0 world ARG 1 pos - METHOD method_19283 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657$class_1658;)V - ARG 1 reason METHOD method_21838 bounceEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_22357 wakeVillager (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 13467c8021..079847d702 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock FIELD field_31011 FULL_HONEY_LEVEL I FIELD field_31012 DROPPED_HONEYCOMB_COUNT I FIELD field_46274 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_21839 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_21840 addHoneyParticle (Lnet/minecraft/class_1937;DDDDD)V ARG 1 world ARG 2 minX diff --git a/mappings/net/minecraft/block/CandleCakeBlock.mapping b/mappings/net/minecraft/block/CandleCakeBlock.mapping index 1f299e9fad..033f418616 100644 --- a/mappings/net/minecraft/block/CandleCakeBlock.mapping +++ b/mappings/net/minecraft/block/CandleCakeBlock.mapping @@ -6,12 +6,11 @@ CLASS net/minecraft/class_5545 net/minecraft/block/CandleCakeBlock FIELD field_27187 CANDLES_TO_CANDLE_CAKES Ljava/util/Map; FIELD field_27188 PARTICLE_OFFSETS Ljava/lang/Iterable; FIELD field_46299 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_46300 candle Lnet/minecraft/class_2248; + FIELD field_46300 candle Lnet/minecraft/class_5544; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V ARG 1 candle ARG 2 settings - METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; - ARG 0 candle + METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_5544;)Lnet/minecraft/class_2680; METHOD method_31633 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_4971;)Z ARG 1 statex METHOD method_31634 isHittingCandle (Lnet/minecraft/class_3965;)Z diff --git a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping index 1197511256..55f1c76916 100644 --- a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping +++ b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping @@ -23,5 +23,4 @@ CLASS net/minecraft/class_7714 net/minecraft/block/ChiseledBookshelfBlock METHOD method_47579 getHitPos (Lnet/minecraft/class_3965;Lnet/minecraft/class_2350;)Ljava/util/Optional; ARG 0 hit ARG 1 facing - METHOD method_47580 getSlotForHitPos (Lnet/minecraft/class_241;)I - ARG 0 hitPos + METHOD method_47580 getSlotForHitPos (Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;)Ljava/util/OptionalInt; diff --git a/mappings/net/minecraft/block/EnderChestBlock.mapping b/mappings/net/minecraft/block/EnderChestBlock.mapping index aee02d000e..b6411570d0 100644 --- a/mappings/net/minecraft/block/EnderChestBlock.mapping +++ b/mappings/net/minecraft/block/EnderChestBlock.mapping @@ -4,7 +4,3 @@ CLASS net/minecraft/class_2336 net/minecraft/block/EnderChestBlock FIELD field_10968 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_17363 CONTAINER_NAME Lnet/minecraft/class_2561; FIELD field_46347 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_17468 (Lnet/minecraft/class_1730;ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; - ARG 1 syncId - ARG 2 inventory - ARG 3 playerx diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 69f2fd1871..3c1a17f95a 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -6,12 +6,10 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock METHOD (Ljava/util/List;Lnet/minecraft/class_4970$class_2251;)V ARG 1 stewEffects ARG 2 settings - METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V - ARG 1 stewEffect + METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V ARG 2 duration ARG 3 settings - METHOD method_54015 createStewEffectList (Lnet/minecraft/class_1291;I)Ljava/util/List; - ARG 0 stewEffect + METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Ljava/util/List; ARG 1 duration METHOD method_54016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping index 85dfc27cc8..35e3e063f0 100644 --- a/mappings/net/minecraft/block/PumpkinBlock.mapping +++ b/mappings/net/minecraft/block/PumpkinBlock.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_2445 net/minecraft/block/PumpkinBlock FIELD field_46419 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_20291 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index 519867477c..ad7640a0b8 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos - METHOD method_20292 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx diff --git a/mappings/net/minecraft/block/WitherRoseBlock.mapping b/mappings/net/minecraft/block/WitherRoseBlock.mapping index 605c1aa260..5808b5b513 100644 --- a/mappings/net/minecraft/block/WitherRoseBlock.mapping +++ b/mappings/net/minecraft/block/WitherRoseBlock.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_2563 net/minecraft/block/WitherRoseBlock FIELD field_46503 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V - ARG 1 effect METHOD method_54075 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index 2c18504986..b69d5487d3 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -70,7 +70,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT @see #fillCauldron FIELD field_46589 BEHAVIOR_MAPS Ljava/util/Map; FIELD field_46590 CODEC Lcom/mojang/serialization/Codec; - METHOD interact (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD interact (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; COMMENT Called when a player interacts with a cauldron. COMMENT COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if this behavior succeeds, @@ -96,7 +96,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT COMMENT @return the created map ARG 0 name - METHOD method_32207 fillCauldron (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; + METHOD method_32207 fillCauldron (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)Lnet/minecraft/class_9062; COMMENT Fills a cauldron from a bucket stack. COMMENT COMMENT

The filled bucket stack will be replaced by an empty bucket in the player's @@ -119,14 +119,14 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT the sound produced by filling METHOD method_32208 (Lnet/minecraft/class_2680;)Z ARG 0 statex - METHOD method_32209 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32209 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; + METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_9062; COMMENT Empties a cauldron if it's full. COMMENT COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if emptied, {@link ActionResult#PASS} otherwise @@ -152,70 +152,70 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT Registers the vanilla cauldron behaviors. METHOD method_32213 (Lnet/minecraft/class_2680;)Z ARG 0 statex - METHOD method_32214 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32214 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32215 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32215 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32216 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32216 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32217 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32217 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32218 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32218 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32219 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32219 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32220 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32220 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32221 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32221 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32222 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32222 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32223 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32223 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos @@ -224,14 +224,14 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior ARG 5 stack METHOD method_32696 (Lnet/minecraft/class_2680;)Z ARG 0 statex - METHOD method_32697 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32697 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32698 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32698 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index b41c4c5846..46fce801ba 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -39,22 +39,22 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 3 filledBottleStack METHOD method_27900 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state - CLASS 20 + CLASS 21 FIELD field_38001 fallback Lnet/minecraft/class_2347; - CLASS 22 + CLASS 23 METHOD method_17199 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1681;)V ARG 1 entity - CLASS 23 + CLASS 24 METHOD method_17200 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1680;)V ARG 1 entity - CLASS 24 + CLASS 25 METHOD method_17201 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1683;)V ARG 1 entity - CLASS 25 + CLASS 26 CLASS 1 METHOD method_17203 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity - CLASS 26 + CLASS 27 CLASS 1 METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index ef641bf10f..1f1781fa95 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity FIELD field_11793 customName Lnet/minecraft/class_2561; - FIELD field_11795 primary Lnet/minecraft/class_1291; + FIELD field_11795 primary Lnet/minecraft/class_6880; FIELD field_11798 EFFECTS Ljava/util/Set; - FIELD field_11799 secondary Lnet/minecraft/class_1291; - FIELD field_11801 EFFECTS_BY_LEVEL [[Lnet/minecraft/class_1291; + FIELD field_11799 secondary Lnet/minecraft/class_6880; + FIELD field_11801 EFFECTS_BY_LEVEL Ljava/util/List; FIELD field_11803 level I FIELD field_17377 lock Lnet/minecraft/class_1273; FIELD field_17378 propertyDelegate Lnet/minecraft/class_3913; @@ -26,12 +26,10 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 0 world ARG 1 pos ARG 2 sound - METHOD method_10940 applyPlayerEffects (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_1291;Lnet/minecraft/class_1291;)V + METHOD method_10940 applyPlayerEffects (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 0 world ARG 1 pos ARG 2 beaconLevel - ARG 3 primaryEffect - ARG 4 secondaryEffect METHOD method_16896 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2580;)V ARG 0 world ARG 1 pos @@ -42,15 +40,13 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 1 x ARG 2 y ARG 3 z - METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; - ARG 0 effect - METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_1291; + METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 nbt ARG 1 key - METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_1291;)V + METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_6880;)V ARG 0 nbt ARG 1 key - ARG 2 effect CLASS class_2581 BeamSegment FIELD field_11804 height I FIELD field_11805 color [F diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index e35e09c88f..b1b6763225 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1782 cursorYSmoother Lnet/minecraft/class_3540; FIELD field_1783 cursorLocked Z FIELD field_1784 hasResolutionChanged Z - FIELD field_1785 lastMouseUpdateTime D FIELD field_1787 cursorDeltaY D FIELD field_1788 rightButtonClicked Z FIELD field_1789 cursorDeltaX D @@ -39,7 +38,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse ARG 5 mods METHOD method_1603 getX ()D METHOD method_1604 getY ()D - METHOD method_1606 updateMouse ()V + METHOD method_1606 updateMouse (D)V METHOD method_1607 setup (J)V ARG 1 window METHOD method_1608 wasLeftButtonClicked ()Z diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 12932a6c68..013b6b876a 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -12,7 +12,6 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet METHOD method_1796 render (Lnet/minecraft/class_332;)V - ARG 1 context METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z METHOD method_1799 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;)V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index b3f50636c0..3723da8798 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 scroll METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V ARG 1 message - METHOD method_1805 render (Lnet/minecraft/class_332;III)V + METHOD method_1805 render (Lnet/minecraft/class_332;IIIZ)V ARG 1 context ARG 2 currentTick ARG 3 mouseX diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 404027211f..6230d4918e 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud COMMENT COMMENT

The current instance used by the client can be obtained by {@link COMMENT MinecraftClient#inGameHud MinecraftClient.getInstance().inGameHud}. - FIELD field_2011 scaledWidth I FIELD field_2012 lastHealthCheckTime J FIELD field_2013 vignetteDarkness F FIELD field_2014 lastHealthValue I @@ -15,11 +14,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2020 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2021 chatHud Lnet/minecraft/class_338; FIELD field_2023 titleRemainTicks I - FIELD field_2024 itemRenderer Lnet/minecraft/class_918; FIELD field_2025 spectatorHud Lnet/minecraft/class_365; FIELD field_2026 debugHud Lnet/minecraft/class_340; FIELD field_2027 subtitlesHud Lnet/minecraft/class_359; - FIELD field_2029 scaledHeight I FIELD field_2030 bossBarHud Lnet/minecraft/class_337; FIELD field_2031 currentStack Lnet/minecraft/class_1799; FIELD field_2032 heartJumpEndTick J @@ -75,9 +72,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_45327 FOOD_EMPTY_TEXTURE Lnet/minecraft/class_2960; FIELD field_45328 FOOD_HALF_TEXTURE Lnet/minecraft/class_2960; FIELD field_47550 SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_918;)V + METHOD (Lnet/minecraft/class_310;)V ARG 1 client - ARG 2 itemRenderer METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_1732 setRecordPlayingOverlay (Lnet/minecraft/class_2561;)V @@ -88,7 +84,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_332;Lnet/minecraft/class_1297;)V ARG 1 context ARG 2 entity - METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;)V + METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;F)V ARG 1 context METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I @@ -130,9 +126,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 tinted - METHOD method_1759 renderHotbar (FLnet/minecraft/class_332;)V - ARG 1 tickDelta - ARG 2 context + METHOD method_1759 renderHotbar (Lnet/minecraft/class_332;F)V METHOD method_1760 renderStatusBars (Lnet/minecraft/class_332;)V COMMENT Renders the armor, health, air, and hunger bars. ARG 1 context @@ -144,9 +138,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 5 player ARG 6 stack ARG 7 seed - METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;)V + METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;F)V ARG 1 context - METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;)V + METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;F)V ARG 1 context METHOD method_19346 drawTextBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_327;III)V ARG 1 context @@ -192,7 +186,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 7 half METHOD method_39191 tick (Z)V ARG 1 paused - METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;)V + METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;F)V ARG 1 context METHOD method_39193 tickAutosaveIndicator ()V METHOD method_44353 shouldShowChatDisabledScreen ()Z diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index cae9e2f83d..8a468990f3 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -27,6 +27,6 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen METHOD method_44054 normalize (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces} ARG 1 chatText - METHOD method_44056 sendMessage (Ljava/lang/String;Z)Z + METHOD method_44056 sendMessage (Ljava/lang/String;Z)V ARG 1 chatText ARG 2 addToHistory diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index a97e573c88..b381a8bd18 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -24,8 +24,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen ARG 1 button METHOD method_19858 (ZLnet/minecraft/class_4185;)V ARG 2 button - METHOD method_19859 onRealmsButtonPress (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_19860 onMultiplayerButtonPressed (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19861 (Lnet/minecraft/class_4185;)V @@ -46,7 +44,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen METHOD method_2251 initWidgetsDemo (II)V ARG 1 y ARG 2 spacingY - METHOD method_2252 switchToRealms ()V METHOD method_2253 isRealmsNotificationsGuiDisplayed ()Z METHOD method_31129 canReadDemoWorldData ()Z METHOD method_41198 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 1c8404c1ce..59a7f4e041 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScreen - FIELD field_17412 primaryEffect Lnet/minecraft/class_1291; - FIELD field_17413 secondaryEffect Lnet/minecraft/class_1291; + FIELD field_17412 primaryEffect Lnet/minecraft/class_6880; + FIELD field_17413 secondaryEffect Lnet/minecraft/class_6880; FIELD field_26560 PRIMARY_POWER_TEXT Lnet/minecraft/class_2561; FIELD field_26561 SECONDARY_POWER_TEXT Lnet/minecraft/class_2561; FIELD field_2808 TEXTURE Lnet/minecraft/class_2960; @@ -31,18 +31,15 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree CLASS class_469 EffectButtonWidget FIELD field_17416 primary Z FIELD field_18223 sprite Lnet/minecraft/class_1058; - FIELD field_2813 effect Lnet/minecraft/class_1291; + FIELD field_2813 effect Lnet/minecraft/class_6880; FIELD field_33833 level I - METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_1291;ZI)V + METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;ZI)V ARG 2 x ARG 3 y - ARG 4 statusEffect ARG 5 primary ARG 6 level - METHOD method_37081 init (Lnet/minecraft/class_1291;)V - ARG 1 statusEffect - METHOD method_37082 getEffectName (Lnet/minecraft/class_1291;)Lnet/minecraft/class_5250; - ARG 1 statusEffect + METHOD method_37081 init (Lnet/minecraft/class_6880;)V + METHOD method_37082 getEffectName (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5250; CLASS class_470 BaseButtonWidget FIELD field_2815 disabled Z METHOD (II)V @@ -68,7 +65,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_37080 tick (I)V ARG 1 level CLASS class_6393 LevelTwoEffectButtonWidget - METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_1291;)V + METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;)V ARG 2 x ARG 3 y - ARG 4 statusEffect diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index 45dcff9223..6bf3e0dd50 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip FIELD field_3037 serverListPinger Lnet/minecraft/class_644; FIELD field_3040 serverList Lnet/minecraft/class_641; FIELD field_3041 buttonEdit Lnet/minecraft/class_4185; - FIELD field_3042 multiplayerScreenTooltip Ljava/util/List; FIELD field_3043 serverListWidget Lnet/minecraft/class_4267; FIELD field_3044 LOGGER Lorg/slf4j/Logger; FIELD field_3045 lanServerDetector Lnet/minecraft/class_1134$class_1135; @@ -37,8 +36,6 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip ARG 1 confirmedAction METHOD method_20380 directConnect (Z)V ARG 1 confirmedAction - METHOD method_2528 setMultiplayerScreenTooltip (Ljava/util/List;)V - ARG 1 tooltip METHOD method_2529 getServerList ()Lnet/minecraft/class_641; METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 8e8847b810..447a8392f0 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -84,7 +84,5 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 1 i ARG 2 j METHOD method_29978 saveFile ()V - METHOD method_48274 pinged ()Z - METHOD method_48275 protocolVersionMatches ()Z METHOD method_49300 uploadFavicon ([B)Z ARG 1 bytes diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 61f8d28fe6..c0fbb81c1f 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -38,7 +38,6 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 2 direction METHOD method_2903 copyAbilities (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_2904 getReachDistance ()F METHOD method_2905 interactEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 entity @@ -87,7 +86,6 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_2923 isBreakingBlock ()Z METHOD method_2924 hasLimitedAttackSpeed ()Z METHOD method_2925 cancelBlockBreaking ()V - METHOD method_2926 hasExtendedReach ()Z METHOD method_2927 tick ()V METHOD method_2928 isFlyingLocked ()Z METHOD method_29357 createPlayer (Lnet/minecraft/class_638;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;)Lnet/minecraft/class_746; diff --git a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping index d3794cc197..93e83cbb4d 100644 --- a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping +++ b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerList ARG 1 socketAddress ARG 2 address ARG 3 serverInfo - METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;)V + METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 entry ARG 2 saver METHOD method_3004 cancel ()V diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 8523941f66..5e3a9361fa 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo COMMENT @see net.minecraft.client.option.ServerList FIELD field_3752 name Ljava/lang/String; FIELD field_3753 playerCountLabel Lnet/minecraft/class_2561; - FIELD field_3754 online Z FIELD field_3755 resourcePackPolicy Lnet/minecraft/class_642$class_643; FIELD field_3756 protocolVersion I FIELD field_3757 label Lnet/minecraft/class_2561; @@ -24,7 +23,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_45608 serverType Lnet/minecraft/class_642$class_8678; FIELD field_46206 MAX_FAVICON_SIZE I METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_642$class_8678;)V - ARG 1 name ARG 2 address ARG 3 serverType METHOD method_2990 getResourcePackPolicy ()Lnet/minecraft/class_642$class_643; diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping index 4d1d1ffd8a..025c8126ff 100644 --- a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -42,7 +42,7 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer METHOD (Lnet/minecraft/class_758$class_4596;)V ARG 1 fogType CLASS class_7286 StatusEffectFogModifier - METHOD method_42590 getStatusEffect ()Lnet/minecraft/class_1291; + METHOD method_42590 getStatusEffect ()Lnet/minecraft/class_6880; METHOD method_42591 applyStartEndModifier (Lnet/minecraft/class_758$class_7285;Lnet/minecraft/class_1309;Lnet/minecraft/class_1293;FF)V ARG 1 fogData ARG 2 entity diff --git a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping index f45af3b242..bf6a5f25cf 100644 --- a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_8986 net/minecraft/client/render/entity/BreezeEntityRenderer FIELD field_47475 TEXTURE Lnet/minecraft/class_2960; - FIELD field_47476 WIND_TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 628b3facfb..3822579746 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer COMMENT COMMENT

Checks for a custom nametag on living entities, and for teams/team visibilities for players. ARG 1 entity - METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IF)V ARG 1 entity ARG 2 text ARG 3 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping index 2892c74acd..f33a7b465c 100644 --- a/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping @@ -1,7 +1 @@ CLASS net/minecraft/class_8988 net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer - FIELD field_47479 texture Lnet/minecraft/class_2960; - FIELD field_47480 model Lnet/minecraft/class_8973; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_2960;)V - ARG 1 breezeModel - ARG 2 entityModelLoader - ARG 3 texture diff --git a/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping index 8d66487e22..7514568a78 100644 --- a/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_8989 net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer FIELD field_47484 texture Lnet/minecraft/class_2960; FIELD field_47485 model Lnet/minecraft/class_8973; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_3883;)V ARG 1 breezeModel - ARG 2 entityModelLoader - ARG 3 texture METHOD method_55273 getXOffset (F)F ARG 1 tickDelta diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index f50f2ba7b0..0cb03fe9b6 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/FeatureRenderer FIELD field_17155 context Lnet/minecraft/class_3883; - METHOD (Lnet/minecraft/class_3883;)V - ARG 1 context METHOD method_17165 getContextModel ()Lnet/minecraft/class_583; METHOD method_23194 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping index 4e9116b138..6ddcb9d23c 100644 --- a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping @@ -1,16 +1,8 @@ CLASS net/minecraft/class_8973 net/minecraft/client/render/entity/model/BreezeEntityModel FIELD field_47434 root Lnet/minecraft/class_630; FIELD field_47435 head Lnet/minecraft/class_630; - FIELD field_47436 windBody Lnet/minecraft/class_630; FIELD field_47437 windTop Lnet/minecraft/class_630; FIELD field_47438 windMid Lnet/minecraft/class_630; FIELD field_47439 windBottom Lnet/minecraft/class_630; FIELD field_47440 rods Lnet/minecraft/class_630; - METHOD (Lnet/minecraft/class_630;)V - ARG 1 root - METHOD method_55233 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_55234 getEyesTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_55235 getWindTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_55236 getWindTop ()Lnet/minecraft/class_630; - METHOD method_55237 getWindMid ()Lnet/minecraft/class_630; - METHOD method_55238 getWindBottom ()Lnet/minecraft/class_630; + METHOD method_55233 getTexturedModelData (II)Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping index 3ebdee1aaf..863e9f7390 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping @@ -44,8 +44,6 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo FIELD field_27697 CONDUIT_WIND Lnet/minecraft/class_5601; FIELD field_27700 CREEPER_ARMOR Lnet/minecraft/class_5601; FIELD field_32582 MAIN Ljava/lang/String; - FIELD field_47444 BREEZE_WIND Lnet/minecraft/class_5601; - FIELD field_47445 BREEZE_EYES Lnet/minecraft/class_5601; METHOD method_32076 getLayers ()Ljava/util/stream/Stream; METHOD method_32077 createBoat (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601; ARG 0 type diff --git a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping index 66b3cf5417..f4ce02701f 100644 --- a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping @@ -19,4 +19,4 @@ CLASS net/minecraft/class_624 net/minecraft/client/render/entity/model/WolfEntit FIELD field_3623 torso Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_32068 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_32068 getTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; diff --git a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping index 915a55ae34..0eb80ead7b 100644 --- a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping +++ b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4074 net/minecraft/client/texture/StatusEffectSpriteManager METHOD (Lnet/minecraft/class_1060;)V ARG 1 textureManager - METHOD method_18663 getSprite (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1058; - ARG 1 effect + METHOD method_18663 getSprite (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1058; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index eac721a5ee..77607d08ad 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_35432 BLOCK_MARKER_ITEMS Ljava/util/Set; FIELD field_3727 networkHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; - FIELD field_3733 scoreboard Lnet/minecraft/class_269; FIELD field_37951 pendingUpdateManager Lnet/minecraft/class_7202; FIELD field_37952 LOGGER Lorg/slf4j/Logger; FIELD field_47129 tickManager Lnet/minecraft/class_8921; @@ -97,8 +96,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 5 random ARG 6 block ARG 7 pos - METHOD method_2944 setScoreboard (Lnet/minecraft/class_269;)V - ARG 1 scoreboard METHOD method_2945 removeEntity (ILnet/minecraft/class_1297$class_5529;)V ARG 1 entityId ARG 2 removalReason diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping index 4cfbb297d5..91e79c3ecb 100644 --- a/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_5746 net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider - FIELD field_38363 BASIC_GAME_EVENTS [Lnet/minecraft/class_5712; + FIELD field_38363 BASIC_GAME_EVENTS Ljava/util/List; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture - METHOD method_46826 (Lnet/minecraft/class_5712;)Lnet/minecraft/class_5321; - ARG 0 gameEvent diff --git a/mappings/net/minecraft/datafixer/fix/JigsawBlockNameFix.mapping b/mappings/net/minecraft/datafixer/fix/JigsawBlockNameFix.mapping deleted file mode 100644 index 0475503710..0000000000 --- a/mappings/net/minecraft/datafixer/fix/JigsawBlockNameFix.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_5527 net/minecraft/datafixer/fix/JigsawBlockNameFix - COMMENT A block (re)name fix that updates the block references within Jigsaw - COMMENT block entities. Used by blocks that are generated by jigsaws. - FIELD field_26991 name Ljava/lang/String; - METHOD method_31446 create (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; - ARG 0 oldSchema - ARG 1 name - ARG 2 rename diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index fa117895c9..d5c9cfaf51 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity FIELD field_5930 radiusGrowth F FIELD field_5931 PARTICLE_ID Lnet/minecraft/class_2940; FIELD field_5932 durationOnUse I - FIELD field_5933 potion Lnet/minecraft/class_1842; + FIELD field_5933 potion Lnet/minecraft/class_6880; FIELD field_5934 effects Ljava/util/List; FIELD field_5935 LOGGER Lorg/slf4j/Logger; FIELD field_5936 COLOR Lnet/minecraft/class_2940; @@ -31,7 +31,7 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_35045 getRadiusGrowth ()F METHOD method_35046 getDurationOnUse ()I METHOD method_35047 getWaitTime ()I - METHOD method_35048 getPotion ()Lnet/minecraft/class_1842; + METHOD method_35048 getPotion ()Lnet/minecraft/class_6880; METHOD method_5595 setWaitTime (I)V ARG 1 waitTime METHOD method_5596 setRadiusGrowth (F)V @@ -58,5 +58,4 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_5610 addEffect (Lnet/minecraft/class_1293;)V ARG 1 effect METHOD method_5611 isWaiting ()Z - METHOD method_5612 setPotion (Lnet/minecraft/class_1842;)V - ARG 1 potion + METHOD method_5612 setPotion (Lnet/minecraft/class_6880;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 28a8bff722..e97efdc5a5 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -144,7 +144,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_33758 hasVisualFire Z FIELD field_34927 collidedSoftly Z FIELD field_35101 chunkPos Lnet/minecraft/class_1923; - FIELD field_35588 blockStateAtPos Lnet/minecraft/class_2680; FIELD field_36331 groundCollision Z FIELD field_38931 trackedPosition Lnet/minecraft/class_7422; FIELD field_44784 supportingBlockPos Ljava/util/Optional; @@ -202,7 +201,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6009 invulnerable Z FIELD field_6011 dataTracker Lnet/minecraft/class_2945; FIELD field_6012 age I - FIELD field_6013 stepHeight F FIELD field_6014 prevX D FIELD field_6017 fallDistance F FIELD field_6018 portalCooldown I @@ -254,9 +252,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getWidth COMMENT @see #getHeight ARG 1 pose - METHOD method_18378 getEyeHeight (Lnet/minecraft/class_4050;Lnet/minecraft/class_4048;)F - ARG 1 pose - ARG 2 dimensions METHOD method_18379 tickPortal ()V METHOD method_18380 setPose (Lnet/minecraft/class_4050;)V ARG 1 pose @@ -681,7 +676,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT the mapped index as given by the item slot argument METHOD method_32319 setInPowderSnow (Z)V ARG 1 inPowderSnow - METHOD method_32875 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)V + METHOD method_32875 emitGameEvent (Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;)V COMMENT Emits a game event originating from another entity at this entity's position. COMMENT COMMENT

A common example is a game event called in {@link #interact}, where the player @@ -691,7 +686,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 event ARG 2 entity COMMENT the entity that emitted the game event, or {@code null} if there is none - METHOD method_32876 emitGameEvent (Lnet/minecraft/class_5712;)V + METHOD method_32876 emitGameEvent (Lnet/minecraft/class_6880;)V COMMENT Emits a game event originating from this entity at this entity's position. COMMENT COMMENT @see #emitGameEvent(GameEvent, Entity) @@ -770,14 +765,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 yaw METHOD method_36457 setPitch (F)V ARG 1 pitch - METHOD method_36601 getBlockStateAtPos ()Lnet/minecraft/class_2680; - COMMENT {@return the block state at the entity's position} - COMMENT - COMMENT

The result is cached. - COMMENT - COMMENT @see #getBlockPos - COMMENT @see #getLandingBlockState - COMMENT @see #getSteppingBlockState METHOD method_36971 canModifyAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z COMMENT {@return whether the entity can modify the world at {@code pos}} COMMENT @@ -937,8 +924,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_48923 getDamageSources ()Lnet/minecraft/class_8109; METHOD method_49108 canBeHitByProjectile ()Z METHOD method_49476 getStepHeight ()F - METHOD method_49477 setStepHeight (F)V - ARG 1 stepHeight METHOD method_49693 shouldDismountUnderwater ()Z COMMENT {@return whether this vehicle should dismount the passenger if submerged underwater} METHOD method_49694 getControllingVehicle ()Lnet/minecraft/class_1297; @@ -956,7 +941,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_49790 shouldPlayAmethystChimeSound (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_49792 teleportPassengers ()V - METHOD method_51152 getNameLabelHeight ()F METHOD method_51295 playSwimSound ()V METHOD method_51296 playSecondaryStepSound (Lnet/minecraft/class_2680;)V ARG 1 state @@ -992,16 +976,12 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 6 z ARG 8 yaw ARG 10 pitch - METHOD method_52533 getPassengerAttachmentPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_4048;F)Lorg/joml/Vector3f; + METHOD method_52533 getPassengerAttachmentPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_4048;F)Lnet/minecraft/class_243; ARG 1 passenger ARG 2 dimensions ARG 3 scaleFactor METHOD method_52534 shouldControlVehicles ()Z METHOD method_52535 isInFluid ()Z - METHOD method_52536 getRidingOffset (Lnet/minecraft/class_1297;)F - ARG 1 vehicle - METHOD method_52537 getUnscaledRidingOffset (Lnet/minecraft/class_1297;)F - ARG 1 vehicle METHOD method_52538 getPassengerRidingPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; ARG 1 passenger METHOD method_53827 getLerpTargetY ()D @@ -2216,8 +2196,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT the player crosshair} METHOD method_5864 getType ()Lnet/minecraft/class_1299; METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V - ARG 1 passenger - ARG 2 positionUpdater METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5869 isSubmergedInWater ()Z COMMENT {@return whether this entity's hitbox is fully submerged in water} diff --git a/mappings/net/minecraft/entity/EntityDimensions.mapping b/mappings/net/minecraft/entity/EntityDimensions.mapping index 0dcea3688a..6a18c5c7e4 100644 --- a/mappings/net/minecraft/entity/EntityDimensions.mapping +++ b/mappings/net/minecraft/entity/EntityDimensions.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_4048 net/minecraft/entity/EntityDimensions - FIELD field_18067 width F - FIELD field_18068 height F - FIELD field_18069 fixed Z + FIELD comp_2185 width F + FIELD comp_2186 height F + FIELD comp_2189 fixed Z METHOD (FFZ)V ARG 1 width ARG 2 height ARG 3 fixed + METHOD comp_2185 width ()F + METHOD comp_2186 height ()F + METHOD comp_2189 fixed ()Z METHOD method_18383 scaled (F)Lnet/minecraft/class_4048; ARG 1 ratio METHOD method_18384 changing (FF)Lnet/minecraft/class_4048; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 10ddea31ae..5beff11a7f 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -108,9 +108,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 pos METHOD method_18393 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_18394 getActiveEyeHeight (Lnet/minecraft/class_4050;Lnet/minecraft/class_4048;)F - ARG 1 pose - ARG 2 dimensions METHOD method_18395 canTarget (Lnet/minecraft/class_1309;)Z ARG 1 target METHOD method_18396 getArmorVisibility ()F @@ -229,10 +226,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 2 slipperiness METHOD method_26319 canWalkOnFluid (Lnet/minecraft/class_3610;)Z ARG 1 state - METHOD method_26825 getAttributeValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute - METHOD method_26826 getAttributeBaseValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute METHOD method_26827 createLivingAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_27071 shouldDropLoot ()Z METHOD method_27302 shouldDisplaySoulSpeedEffects ()Z @@ -355,8 +348,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_51851 getLootTableSeed ()J METHOD method_52197 sendEffectToControllingPlayer (Lnet/minecraft/class_1293;)V ARG 1 effect - METHOD method_52540 updateAttribute (Lnet/minecraft/class_1320;)V - ARG 1 attribute + METHOD method_52540 updateAttribute (Lnet/minecraft/class_6880;)V METHOD method_52541 getMaxAbsorption ()F METHOD method_52542 wouldNotSuffocateInPose (Lnet/minecraft/class_4050;)Z ARG 1 pose @@ -372,8 +364,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; - METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute + METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; METHOD method_5997 attackLivingEntity (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_5998 getStackInHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1799; @@ -405,7 +396,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6014 getItemUseTimeLeft ()I METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V ARG 1 attacker - METHOD method_6016 removeStatusEffect (Lnet/minecraft/class_1291;)Z + METHOD method_6016 removeStatusEffect (Lnet/minecraft/class_6880;)Z COMMENT Removes a status effect from this entity. COMMENT COMMENT

Calling this method will call cleanup methods on the status effect and trigger synchronization of effect particles with watching clients. If this entity is a player, @@ -413,7 +404,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT COMMENT @return whether the active status effects on this entity has been changed by COMMENT this call - ARG 1 type METHOD method_6017 getSoundPitch ()F METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand @@ -497,8 +487,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6057 canSee (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_6058 getActiveHand ()Lnet/minecraft/class_1268; - METHOD method_6059 hasStatusEffect (Lnet/minecraft/class_1291;)Z - ARG 1 effect + METHOD method_6059 hasStatusEffect (Lnet/minecraft/class_6880;)Z METHOD method_6060 knockback (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_6061 blockedByShield (Lnet/minecraft/class_1282;)Z @@ -608,16 +597,14 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see #dropXp() COMMENT @see #shouldAlwaysDropXp() COMMENT @see #shouldDropXp() - METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; + METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1293; COMMENT Removes a status effect from this entity without calling any listener. COMMENT COMMENT

This method does not perform any cleanup or synchronization operation. COMMENT Under most circumstances, calling {@link #removeStatusEffect(StatusEffect)} is highly preferable. COMMENT COMMENT @return the status effect removed - ARG 1 type - METHOD method_6112 getStatusEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; - ARG 1 effect + METHOD method_6112 getStatusEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1293; METHOD method_6113 isSleeping ()Z METHOD method_6114 onAttacking (Lnet/minecraft/class_1297;)V ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping index cb3f6b8d71..645075a628 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_8952 net/minecraft/entity/ai/brain/task/BreezeJumpTask FIELD field_47289 REQUIRED_SPACE_ABOVE I - FIELD field_47290 MAX_JUMP_DISTANCE D FIELD field_47291 JUMP_COOLDOWN_EXPIRY I FIELD field_47292 JUMP_COOLDOWN_EXPIRY_WHEN_HURT I FIELD field_47293 JUMP_INHALING_EXPIRY I FIELD field_47294 MAX_JUMP_VELOCITY F FIELD field_47295 POSSIBLE_JUMP_ANGLES Lit/unimi/dsi/fastutil/objects/ObjectArrayList; - METHOD method_55022 getRandomPosBehindTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; - ARG 0 target - ARG 1 random METHOD method_55023 getPosToJumpTo (Lnet/minecraft/class_1309;Lnet/minecraft/class_243;)Lnet/minecraft/class_2338; ARG 0 breeze ARG 1 pos @@ -21,9 +17,6 @@ CLASS net/minecraft/class_8952 net/minecraft/entity/ai/brain/task/BreezeJumpTask METHOD method_55026 isTargetOutOfRange (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z ARG 0 breeze ARG 1 target - METHOD method_55027 canJumpTo (Lnet/minecraft/class_8949;Lnet/minecraft/class_243;)Z - ARG 0 breeze - ARG 1 jumpPos METHOD method_55028 (Lnet/minecraft/class_8949;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 1 jumpTarget METHOD method_55029 hasRoomToJump (Lnet/minecraft/class_3218;Lnet/minecraft/class_8949;)Z diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index 0f9031704c..5fa269e39d 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -15,15 +15,10 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector FIELD field_6461 goals Ljava/util/Set; FIELD field_6462 disabledControls Ljava/util/EnumSet; FIELD field_6463 profiler Ljava/util/function/Supplier; - FIELD field_6464 timeInterval I - FIELD field_6466 LOGGER Lorg/slf4j/Logger; METHOD (Ljava/util/function/Supplier;)V ARG 1 profiler - METHOD method_19048 getRunningGoals ()Ljava/util/stream/Stream; METHOD method_35113 clear (Ljava/util/function/Predicate;)V ARG 1 predicate - METHOD method_35114 setTimeInterval (I)V - ARG 1 timeInterval METHOD method_35115 getGoals ()Ljava/util/Set; METHOD method_38063 usesAny (Lnet/minecraft/class_4135;Ljava/util/EnumSet;)Z ARG 0 goal @@ -49,4 +44,3 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector ARG 1 priority ARG 2 goal METHOD method_6280 remove (Lnet/minecraft/class_1352;)V - ARG 1 goal diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index b66d86ce4d..3a6098a5c4 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -6,13 +6,9 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD (Lnet/minecraft/class_5132;)V ARG 1 defaultAttributes METHOD method_26841 getTracked ()Ljava/util/Set; - METHOD method_26842 getCustomInstance (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute - METHOD method_26843 (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;)V - ARG 1 attribute + METHOD method_26843 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V ARG 2 attributeModifier - METHOD method_26844 (Lnet/minecraft/class_1320;Ljava/util/Collection;)V - ARG 1 attribute + METHOD method_26844 (Lnet/minecraft/class_6880;Ljava/util/Collection;)V ARG 2 modifiers METHOD method_26845 updateTrackedStatus (Lnet/minecraft/class_1324;)V ARG 1 instance @@ -20,32 +16,18 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 other METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers - METHOD method_26849 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1320;)V - ARG 2 attribute METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V ARG 1 nbt METHOD method_26851 getAttributesToSend ()Ljava/util/Collection; - METHOD method_26852 getValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute + METHOD method_26852 getValue (Lnet/minecraft/class_6880;)D METHOD method_26853 (Lnet/minecraft/class_1324;)V ARG 1 attributeInstance METHOD method_26854 addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers METHOD method_26855 toNbt ()Lnet/minecraft/class_2499; - METHOD method_26856 getBaseValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute + METHOD method_26856 getBaseValue (Lnet/minecraft/class_6880;)D METHOD method_26857 (Lnet/minecraft/class_1324;)Z ARG 0 attribute - METHOD method_26858 (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attributex - METHOD method_27305 hasModifierForAttribute (Lnet/minecraft/class_1320;Ljava/util/UUID;)Z - ARG 1 attribute - ARG 2 uuid - METHOD method_27306 hasAttribute (Lnet/minecraft/class_1320;)Z - ARG 1 attribute - METHOD method_27307 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D - ARG 1 attribute - ARG 2 uuid METHOD method_45329 getCustomInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 attribute METHOD method_45330 hasModifierForAttribute (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z diff --git a/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping b/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping deleted file mode 100644 index 98806f9178..0000000000 --- a/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_8630 net/minecraft/entity/attribute/AttributeModifierCreator - METHOD method_52521 getUuid ()Ljava/util/UUID; - METHOD method_52522 createAttributeModifier (I)Lnet/minecraft/class_1322; - ARG 1 amplifier diff --git a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping index 76b3d4c11c..f58cfd4f48 100644 --- a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping @@ -3,33 +3,23 @@ CLASS net/minecraft/class_5132 net/minecraft/entity/attribute/DefaultAttributeCo METHOD (Ljava/util/Map;)V ARG 1 instances METHOD method_26861 builder ()Lnet/minecraft/class_5132$class_5133; - METHOD method_26862 getValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute - METHOD method_26863 createOverride (Ljava/util/function/Consumer;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; + METHOD method_26862 getValue (Lnet/minecraft/class_6880;)D + METHOD method_26863 createOverride (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 updateCallback - ARG 2 attribute - METHOD method_26864 getBaseValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute - METHOD method_26865 require (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute - METHOD method_27308 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D - ARG 1 attribute + METHOD method_26864 getBaseValue (Lnet/minecraft/class_6880;)D + METHOD method_26865 require (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + METHOD method_27308 getModifierValue (Lnet/minecraft/class_6880;Ljava/util/UUID;)D ARG 2 uuid - METHOD method_27309 hasModifier (Lnet/minecraft/class_1320;Ljava/util/UUID;)Z - ARG 1 type + METHOD method_27309 hasModifier (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z ARG 2 uuid - METHOD method_27310 has (Lnet/minecraft/class_1320;)Z - ARG 1 type + METHOD method_27310 has (Lnet/minecraft/class_6880;)Z CLASS class_5133 Builder - FIELD field_23714 instances Ljava/util/Map; + FIELD field_23714 instances Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_23715 unmodifiable Z METHOD method_26866 build ()Lnet/minecraft/class_5132; - METHOD method_26867 add (Lnet/minecraft/class_1320;)Lnet/minecraft/class_5132$class_5133; - ARG 1 attribute - METHOD method_26868 add (Lnet/minecraft/class_1320;D)Lnet/minecraft/class_5132$class_5133; - ARG 1 attribute + METHOD method_26867 add (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5132$class_5133; + METHOD method_26868 add (Lnet/minecraft/class_6880;D)Lnet/minecraft/class_5132$class_5133; ARG 2 baseValue - METHOD method_26869 (Lnet/minecraft/class_1320;Lnet/minecraft/class_1324;)V + METHOD method_26869 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1324;)V ARG 2 attributex - METHOD method_26870 checkedAdd (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute + METHOD method_26870 checkedAdd (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index f2f0ca258f..debd4db198 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeInstance COMMENT A double-valued attribute. - FIELD field_23700 type Lnet/minecraft/class_1320; + FIELD field_23700 type Lnet/minecraft/class_6880; FIELD field_23701 operationToModifiers Ljava/util/Map; FIELD field_23702 idToModifiers Ljava/util/Map; FIELD field_23703 persistentModifiers Ljava/util/Set; @@ -8,8 +8,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns FIELD field_23705 dirty Z FIELD field_23706 value D FIELD field_23707 updateCallback Ljava/util/function/Consumer; - METHOD (Lnet/minecraft/class_1320;Ljava/util/function/Consumer;)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;Ljava/util/function/Consumer;)V ARG 2 updateCallback METHOD method_26831 setFrom (Lnet/minecraft/class_1324;)V COMMENT Copies the values of an attribute to this attribute. @@ -53,7 +52,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns ARG 1 modifier METHOD method_6197 addModifier (Lnet/minecraft/class_1322;)V ARG 1 modifier - METHOD method_6198 getAttribute ()Lnet/minecraft/class_1320; + METHOD method_6198 getAttribute ()Lnet/minecraft/class_6880; METHOD method_6199 getModifier (Ljava/util/UUID;)Lnet/minecraft/class_1322; ARG 1 uuid METHOD method_6200 removeModifier (Ljava/util/UUID;)V diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping index 8e6fc6bba8..165c190239 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5134 net/minecraft/entity/attribute/EntityAttributes - FIELD field_45124 GENERIC_MAX_ABSORPTION Lnet/minecraft/class_1320; - METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1320; + FIELD field_45124 GENERIC_MAX_ABSORPTION Lnet/minecraft/class_6880; + METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 attribute diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 27668e3c6a..93eac25f51 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_18270 category Lnet/minecraft/class_4081; - FIELD field_38083 factorCalculationDataSupplier Ljava/util/function/Supplier; - FIELD field_45729 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I @@ -9,13 +7,9 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 1 category ARG 2 color METHOD method_18792 getCategory ()Lnet/minecraft/class_4081; - METHOD method_42126 setFactorCalculationDataSupplier (Ljava/util/function/Supplier;)Lnet/minecraft/class_1291; - ARG 1 factorCalculationDataSupplier - METHOD method_42127 getFactorCalculationDataSupplier ()Ljava/util/Optional; METHOD method_52520 onApplied (Lnet/minecraft/class_1309;I)V ARG 1 entity ARG 2 amplifier - METHOD method_53123 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_5552 canApplyUpdateEffect (II)Z ARG 1 duration ARG 2 amplifier @@ -34,22 +28,20 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 3 target ARG 4 amplifier ARG 5 proximity - METHOD method_5565 getAttributeModifiers ()Ljava/util/Map; - METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_1320;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; - ARG 1 attribute + METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_6880;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; ARG 2 uuid ARG 3 amount ARG 5 operation METHOD method_5567 getTranslationKey ()Ljava/lang/String; - METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V + METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)Z ARG 1 entity ARG 2 amplifier METHOD method_5573 isBeneficial ()Z CLASS class_8634 EffectAttributeModifierCreator - FIELD field_45105 uuid Ljava/util/UUID; - FIELD field_45106 baseValue D - FIELD field_45107 operation Lnet/minecraft/class_1322$class_1323; - METHOD (Lnet/minecraft/class_1291;Ljava/util/UUID;DLnet/minecraft/class_1322$class_1323;)V - ARG 2 uuid - ARG 3 baseValue - ARG 5 operation + FIELD comp_2182 uuid Ljava/util/UUID; + FIELD comp_2183 baseValue D + FIELD comp_2184 operation Lnet/minecraft/class_1322$class_1323; + METHOD comp_2182 uuid ()Ljava/util/UUID; + METHOD comp_2183 baseValue ()D + METHOD comp_2184 operation ()Lnet/minecraft/class_1322$class_1323; + METHOD method_52522 createAttributeModifier (Ljava/lang/String;I)Lnet/minecraft/class_1322; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index a6b1f7a584..c630ddb5ec 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance COMMENT COMMENT

This exists so that long-duration low-amplifier effects reappears COMMENT after short-duration high-amplifier effects run out. - FIELD field_38084 factorCalculationData Ljava/util/Optional; FIELD field_42106 INFINITE I FIELD field_45730 ID_NBT_KEY Ljava/lang/String; FIELD field_45731 AMBIENT_NBT_KEY Ljava/lang/String; @@ -14,65 +13,48 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_45734 DURATION_NBT_KEY Ljava/lang/String; FIELD field_45735 SHOW_PARTICLES_NBT_KEY Ljava/lang/String; FIELD field_45736 SHOW_ICON_NBT_KEY Ljava/lang/String; - FIELD field_45737 FACTOR_CALCULATION_DATA_NBT_KEY Ljava/lang/String; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z FIELD field_5892 ambient Z FIELD field_5893 amplifier I FIELD field_5895 duration I - FIELD field_5896 type Lnet/minecraft/class_1291; + FIELD field_5896 type Lnet/minecraft/class_6880; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type - METHOD (Lnet/minecraft/class_1291;I)V - ARG 1 type + METHOD (Lnet/minecraft/class_1293;)V + ARG 1 instance + METHOD (Lnet/minecraft/class_6880;I)V ARG 2 duration - METHOD (Lnet/minecraft/class_1291;II)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;II)V ARG 2 duration ARG 3 amplifier - METHOD (Lnet/minecraft/class_1291;IIZZ)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;IIZZ)V ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 visible - METHOD (Lnet/minecraft/class_1291;IIZZZ)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;IIZZZ)V ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 showParticles ARG 6 showIcon - METHOD (Lnet/minecraft/class_1291;IIZZZLnet/minecraft/class_1293;Ljava/util/Optional;)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;IIZZZLnet/minecraft/class_1293;)V ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 showParticles ARG 6 showIcon ARG 7 hiddenEffect - ARG 8 factorCalculationData - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_24275 fromNbt (Lnet/minecraft/class_1291;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; - ARG 0 type + METHOD method_24275 fromNbt (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; ARG 1 nbt METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V ARG 1 that METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_42129 getFactorCalculationData ()Ljava/util/Optional; - METHOD method_42131 (Lnet/minecraft/class_1293$class_7247;)V - ARG 1 factorCalculationData - METHOD method_42132 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1293$class_7247;)V - ARG 1 factorCalculationData - METHOD method_42133 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V - ARG 1 factorCalculationDataNbt METHOD method_48557 isDurationBelow (I)Z ARG 1 duration METHOD method_48558 mapDuration (Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)I @@ -87,7 +69,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_52523 onApplied (Lnet/minecraft/class_1309;)V ARG 1 entity METHOD method_5578 getAmplifier ()I - METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291; + METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880; METHOD method_5581 shouldShowParticles ()Z METHOD method_5582 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt @@ -103,43 +85,3 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 that METHOD method_5591 isAmbient ()Z METHOD method_5592 shouldShowIcon ()Z - CLASS class_7247 FactorCalculationData - FIELD field_38085 CODEC Lcom/mojang/serialization/Codec; - FIELD field_38086 paddingDuration I - FIELD field_38087 factorTarget F - FIELD field_38088 factorCurrent F - FIELD field_38090 factorPreviousFrame F - FIELD field_38091 hadEffectLastTick Z - FIELD field_39111 factorStart F - FIELD field_42107 effectChangedTimestamp I - METHOD (I)V - ARG 1 paddingDuration - METHOD (IFFFIFZ)V - ARG 1 paddingDuration - ARG 2 factorStart - ARG 3 factorTarget - ARG 4 factorCurrent - ARG 5 effectChangedTimestamp - ARG 6 factorPreviousFrame - ARG 7 hadEffectLastTick - METHOD method_42134 lerp (Lnet/minecraft/class_1309;F)F - ARG 1 entity - ARG 2 tickDelta - METHOD method_42135 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Boolean; - ARG 0 data - METHOD method_42136 update (Lnet/minecraft/class_1293;)V - ARG 1 effect - METHOD method_42137 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_42138 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data - METHOD method_42139 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Integer; - ARG 0 data - METHOD method_42140 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data - METHOD method_42141 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data - METHOD method_42142 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Integer; - ARG 0 data - METHOD method_43685 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data diff --git a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping index 496daec456..a76cdc4639 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil ARG 6 duration METHOD method_42144 (Lnet/minecraft/class_1293;Lnet/minecraft/class_1297;Lnet/minecraft/class_3222;)V ARG 2 player - METHOD method_42145 (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;DLnet/minecraft/class_1291;Lnet/minecraft/class_1293;ILnet/minecraft/class_3222;)Z + METHOD method_42145 (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;DLnet/minecraft/class_6880;Lnet/minecraft/class_1293;ILnet/minecraft/class_3222;)Z ARG 7 player METHOD method_5574 hasWaterBreathing (Lnet/minecraft/class_1309;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index 0887324744..e920b53092 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects FIELD field_38093 DARKNESS_PADDING_DURATION I - METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; + METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 statusEffect diff --git a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping index 996f7759b8..9440d67659 100644 --- a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_5418 net/minecraft/entity/mob/AbstractPiglinEntity FIELD field_25758 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940; FIELD field_25759 timeInOverworld I FIELD field_30547 TIME_TO_ZOMBIFY I - FIELD field_41030 EYE_HEIGHT F METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_24705 getActivity ()Lnet/minecraft/class_4837; diff --git a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping index 4741929992..1a2ae7b1da 100644 --- a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_8950 net/minecraft/entity/mob/BreezeBrain FIELD field_47288 MEMORY_MODULES Ljava/util/List; METHOD method_55016 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain - METHOD method_55017 (Lnet/minecraft/class_8949;)Ljava/util/Optional; - ARG 0 breeze METHOD method_55018 addCoreTasks (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_55019 addFightTasks (Lnet/minecraft/class_4095;)V diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 6b5706cf0b..05004f229f 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -9,10 +9,6 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity METHOD method_55008 addLongJumpingParticles ()V METHOD method_55009 getChargeY ()D METHOD method_55010 stopAnimations ()V - METHOD method_55011 isWithinLargeRange (Lnet/minecraft/class_243;)Z - ARG 1 pos - METHOD method_55012 isWithinMediumRange (Lnet/minecraft/class_243;)Z - ARG 1 pos METHOD method_55013 isWithinShortRange (Lnet/minecraft/class_243;)Z ARG 1 pos METHOD method_55014 createBreezeAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping index b3cfc40c64..4b4f61e2f1 100644 --- a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_1314 net/minecraft/entity/mob/PathAwareEntity FIELD field_35670 DEFAULT_PATHFINDING_FAVOR F METHOD method_43689 shouldFollowLeash ()Z - METHOD method_52545 (Lnet/minecraft/class_4135;)Z - ARG 0 goal METHOD method_52546 isPanicking ()Z METHOD method_6142 updateForLeashLength (F)V ARG 1 leashLength diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping index bd93733651..d1033f6ac6 100644 --- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1628 net/minecraft/entity/mob/SpiderEntity METHOD (Lnet/minecraft/class_1628;)V ARG 1 spider CLASS class_1630 SpiderData - FIELD field_7404 effect Lnet/minecraft/class_1291; + FIELD field_7404 effect Lnet/minecraft/class_6880; METHOD method_7168 setEffect (Lnet/minecraft/class_5819;)V ARG 1 random CLASS class_1631 TargetGoal diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index e2ecaf0361..4e87c42e61 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019; FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; - FIELD field_41029 EYE_HEIGHT F - FIELD field_41598 BABY_EYE_HEIGHT_OFFSET F FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 59b74802e8..2609eb7a2a 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -65,10 +65,9 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 4 min ARG 6 max ARG 8 random - METHOD method_49124 setChildAttribute (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;Lnet/minecraft/class_1320;DD)V + METHOD method_49124 setChildAttribute (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;Lnet/minecraft/class_6880;DD)V ARG 1 other ARG 2 child - ARG 3 attribute ARG 4 min ARG 6 max METHOD method_49129 (I)I @@ -79,9 +78,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 controllingPassenger METHOD method_49996 isWooden (Lnet/minecraft/class_2498;)Z ARG 1 soundGroup - METHOD method_52550 getPassengerAttachmentY (Lnet/minecraft/class_4048;F)F - ARG 1 dimensions - ARG 2 scaleFactor METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_6721 onChestedStatusChanged ()V diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index 7a48047738..faa39214b0 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity FIELD field_30373 HAS_PUMPKIN_FLAG B - FIELD field_30374 EYE_HEIGHT F FIELD field_6873 SNOW_GOLEM_FLAGS Lnet/minecraft/class_2940; METHOD method_18443 (Lnet/minecraft/class_1309;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 1e7cb2b261..ec44bdaa45 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -138,8 +138,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 c METHOD method_53968 isUsernameValid (Ljava/lang/String;)Z ARG 0 name - METHOD method_54292 getReachDistance (Z)F - ARG 0 creative METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index 80c18c5502..73ada4f338 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity FIELD field_46971 DEFAULT_STACK Lnet/minecraft/class_1799; FIELD field_7595 COLOR Lnet/minecraft/class_2940; FIELD field_7596 colorSet Z - FIELD field_7597 potion Lnet/minecraft/class_1842; + FIELD field_7597 potion Lnet/minecraft/class_6880; FIELD field_7598 effects Ljava/util/Set; METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index 2219ab00b8..c4471b7982 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -44,7 +44,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject COMMENT

This is the original stack used to spawn the projectile. {@link #asItemStack} COMMENT returns a copy of that stack which can be safely changed. Additionally, COMMENT {@link #asItemStack} reflects changes to the entity data, such as custom potion ID. - METHOD method_55052 deflect ()V + METHOD method_55052 deflect (Lnet/minecraft/class_1297;)V METHOD method_7433 setNoClip (Z)V ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index 2ab0e162e3..e3518978a6 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -10,9 +10,8 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti ARG 2 owner METHOD method_46401 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)V + METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V ARG 1 stack - ARG 2 potion METHOD method_7498 applySplashPotion (Ljava/util/List;Lnet/minecraft/class_1297;)V ARG 1 statusEffects ARG 2 entity diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 192c3d3fbf..fe63b8ebeb 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti FIELD field_45139 clientYaw D FIELD field_45140 clientPitch D FIELD field_45141 clientVelocity Lnet/minecraft/class_243; - FIELD field_46214 PASSENGER_ATTACHMENT_Y_OFFSET F - FIELD field_46219 VILLAGER_PASSENGER_ATTACHMENT_Y_OFFSET F FIELD field_7660 yawFlipped Z FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940; FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map; diff --git a/mappings/net/minecraft/item/HorseArmorItem.mapping b/mappings/net/minecraft/item/HorseArmorItem.mapping index 2937b20e83..56b8fd39ff 100644 --- a/mappings/net/minecraft/item/HorseArmorItem.mapping +++ b/mappings/net/minecraft/item/HorseArmorItem.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_4059 net/minecraft/item/HorseArmorItem FIELD field_18136 bonus I - FIELD field_18137 entityTexture Ljava/lang/String; - FIELD field_30886 ENTITY_TEXTURE_PREFIX Ljava/lang/String; - METHOD (ILjava/lang/String;Lnet/minecraft/class_1792$class_1793;)V + METHOD (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V ARG 1 bonus - ARG 2 name - ARG 3 settings METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; METHOD method_18455 getBonus ()I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1185fd18e3..1f9f628a3a 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -285,11 +285,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see Item Stack NBT Operations ARG 0 nbt - METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V + METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V COMMENT Adds an attribute modifier to this stack. COMMENT COMMENT @see #getAttributeModifiers - ARG 1 attribute ARG 2 modifier ARG 3 slot METHOD method_7917 inventoryTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V diff --git a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping index 06c57d2de6..17cc5c53f0 100644 --- a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping @@ -4,9 +4,8 @@ CLASS net/minecraft/class_6662 net/minecraft/loot/function/SetPotionLootFunction METHOD (Ljava/util/List;Lnet/minecraft/class_6880;)V ARG 1 conditions ARG 2 potion - METHOD method_38927 builder (Lnet/minecraft/class_1842;)Lnet/minecraft/class_120$class_121; - ARG 0 potion - METHOD method_38928 (Lnet/minecraft/class_1842;Ljava/util/List;)Lnet/minecraft/class_117; + METHOD method_38927 builder (Lnet/minecraft/class_6880;)Lnet/minecraft/class_120$class_121; + METHOD method_38928 (Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_53393 (Lnet/minecraft/class_6662;)Lnet/minecraft/class_6880; ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 993ae07607..0c2a6828c2 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -16,8 +16,7 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunct METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; CLASS class_153 Builder FIELD field_1123 map Lcom/google/common/collect/ImmutableList$Builder; - METHOD method_640 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; - ARG 1 effect + METHOD method_640 withEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; ARG 2 durationRange CLASS class_8754 StewEffect FIELD field_45854 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 286249aa8f..7a690bff13 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,20 +1,18 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket - FIELD field_13049 secondaryEffectId Ljava/util/Optional; - FIELD field_13050 primaryEffectId Ljava/util/Optional; + FIELD comp_2180 primaryEffectId Ljava/util/Optional; + FIELD comp_2181 secondaryEffectId Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 primaryEffectId ARG 2 secondaryEffectId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12435 getSecondaryEffectId ()Ljava/util/Optional; - METHOD method_12436 getPrimaryEffectId ()Ljava/util/Optional; - METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + METHOD comp_2180 primaryEffectId ()Ljava/util/Optional; + METHOD comp_2181 secondaryEffectId ()Ljava/util/Optional; + METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 - ARG 1 secondaryEffectId - METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 - METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 - ARG 1 primaryEffectId - METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index 68359fc5ab..93a3a6d8c6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -19,13 +19,12 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri METHOD method_34202 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1322; ARG 0 modifiers CLASS class_2782 Entry - FIELD field_12722 baseValue D - FIELD field_12723 modifiers Ljava/util/Collection; - FIELD field_12724 attribute Lnet/minecraft/class_1320; - METHOD (Lnet/minecraft/class_1320;DLjava/util/Collection;)V - ARG 1 attribute + FIELD comp_2177 attribute Lnet/minecraft/class_6880; + FIELD comp_2178 baseValue D + FIELD comp_2179 modifiers Ljava/util/Collection; + METHOD (Lnet/minecraft/class_6880;DLjava/util/Collection;)V ARG 2 baseValue ARG 4 modifiers - METHOD method_11939 getModifiers ()Ljava/util/Collection; - METHOD method_11940 getAttribute ()Lnet/minecraft/class_1320; - METHOD method_11941 getBaseValue ()D + METHOD comp_2177 attribute ()Lnet/minecraft/class_6880; + METHOD comp_2178 baseValue ()D + METHOD comp_2179 modifiers ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 3155f481de..a8a7cf58a8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket - FIELD field_12725 effectId Lnet/minecraft/class_1291; + FIELD field_12725 effectId Lnet/minecraft/class_6880; FIELD field_12726 duration I FIELD field_12727 entityId I FIELD field_12728 flags B @@ -7,8 +7,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu FIELD field_33356 AMBIENT_MASK I FIELD field_33357 SHOW_PARTICLES_MASK I FIELD field_33358 SHOW_ICON_MASK I - FIELD field_38364 factorCalculationData Lnet/minecraft/class_1293$class_7247; - METHOD (ILnet/minecraft/class_1293;)V + METHOD (ILnet/minecraft/class_1293;Z)V ARG 1 entityId ARG 2 effect METHOD (Lnet/minecraft/class_2540;)V @@ -17,12 +16,6 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11943 getEntityId ()I METHOD method_11944 getDuration ()I METHOD method_11945 getAmplifier ()B - METHOD method_11946 getEffectId ()Lnet/minecraft/class_1291; + METHOD method_11946 getEffectId ()Lnet/minecraft/class_6880; METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z - METHOD method_42625 getFactorCalculationData ()Lnet/minecraft/class_1293$class_7247; - METHOD method_43891 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1293$class_7247;)V - ARG 0 buf2 - ARG 1 factorCalculationData - METHOD method_43892 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1293$class_7247; - ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index 40de634589..26aca9e7f4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket - FIELD field_12424 entityId I - FIELD field_12425 effectType Lnet/minecraft/class_1291; - METHOD (ILnet/minecraft/class_1291;)V + FIELD comp_2175 entityId I + FIELD comp_2176 effectType Lnet/minecraft/class_6880; + METHOD (ILnet/minecraft/class_6880;)V ARG 1 entityId - ARG 2 effectType METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD comp_2175 entityId ()I + METHOD comp_2176 effectType ()Lnet/minecraft/class_6880; METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world - METHOD method_11768 getEffectType ()Lnet/minecraft/class_1291; diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index f84eef3cd9..252c176785 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion - FIELD field_45767 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_8954 baseName Ljava/lang/String; - FIELD field_8955 effects Lcom/google/common/collect/ImmutableList; + FIELD field_8955 effects Ljava/util/List; METHOD (Ljava/lang/String;[Lnet/minecraft/class_1293;)V ARG 1 baseName ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects - METHOD method_53211 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; - METHOD method_8048 byId (Ljava/lang/String;)Lnet/minecraft/class_1842; + METHOD method_8048 byId (Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 id METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z - METHOD method_8051 finishTranslationKey (Ljava/lang/String;)Ljava/lang/String; - ARG 1 prefix + METHOD method_8051 finishTranslationKey (Lnet/minecraft/class_6880;Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index f549803bf9..0747c29bef 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -14,22 +14,19 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 effects - METHOD method_8057 getPotion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1842; + METHOD method_8057 getPotion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_6880; ARG 0 compound METHOD method_8058 getCustomPotionEffects (Lnet/minecraft/class_2487;Ljava/util/List;)V ARG 0 nbt ARG 1 list - METHOD method_8059 getPotionEffects (Lnet/minecraft/class_1842;Ljava/util/Collection;)Ljava/util/List; - ARG 0 potion + METHOD method_8059 getPotionEffects (Lnet/minecraft/class_6880;Ljava/util/Collection;)Ljava/util/List; ARG 1 custom METHOD method_8060 getCustomPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; ARG 0 nbt - METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; + METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 stack - ARG 1 potion - METHOD method_8062 getColor (Lnet/minecraft/class_1842;)I - ARG 0 potion - METHOD method_8063 getPotion (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1842; + METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I + METHOD method_8063 getPotion (Lnet/minecraft/class_1799;)Lnet/minecraft/class_6880; ARG 0 stack METHOD method_8064 getColor (Lnet/minecraft/class_1799;)I ARG 0 stack diff --git a/mappings/net/minecraft/potion/Potions.mapping b/mappings/net/minecraft/potion/Potions.mapping index c03dea78d9..47270cc0b7 100644 --- a/mappings/net/minecraft/potion/Potions.mapping +++ b/mappings/net/minecraft/potion/Potions.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_1847 net/minecraft/potion/Potions FIELD field_42473 EMPTY_KEY Lnet/minecraft/class_5321; - FIELD field_8984 EMPTY Lnet/minecraft/class_1842; - METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1842; + FIELD field_8984 EMPTY Lnet/minecraft/class_6880; + METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 key ARG 1 potion - METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1842; + METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 name ARG 1 potion diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index 492e18e01c..f627b6c58a 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -28,9 +28,7 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic CLASS class_8748 Builder FIELD field_45765 EFFECTS Lcom/google/common/collect/ImmutableMap$Builder; METHOD method_53200 create ()Lnet/minecraft/class_2102$class_8748; - METHOD method_53201 addEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_2102$class_8748; - ARG 1 effect - METHOD method_53202 addEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102$class_8748; - ARG 1 effect + METHOD method_53201 addEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2102$class_8748; + METHOD method_53202 addEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102$class_8748; ARG 2 effectData METHOD method_53203 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 09b84e98b7..3c1d81c4e5 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -21,8 +21,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_9654 nbt Ljava/util/Optional; METHOD method_20399 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; ARG 1 nbt - METHOD method_35232 potion (Lnet/minecraft/class_1842;)Lnet/minecraft/class_2073$class_2074; - ARG 1 potion + METHOD method_35232 potion (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2073$class_2074; METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count METHOD method_35234 storedEnchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index 77841e347a..6f8d05c1a3 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry FIELD field_8957 POTION_TYPES Ljava/util/List; FIELD field_8958 POTION_TYPE_PREDICATE Ljava/util/function/Predicate; FIELD field_8959 ITEM_RECIPES Ljava/util/List; - METHOD method_20361 isBrewable (Lnet/minecraft/class_1842;)Z - ARG 0 potion + METHOD method_20361 isBrewable (Lnet/minecraft/class_6880;)Z METHOD method_8069 isPotionRecipeIngredient (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8070 hasItemRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z @@ -19,10 +18,8 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry ARG 1 ingredient METHOD method_8073 (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_8074 registerPotionRecipe (Lnet/minecraft/class_1842;Lnet/minecraft/class_1792;Lnet/minecraft/class_1842;)V - ARG 0 input + METHOD method_8074 registerPotionRecipe (Lnet/minecraft/class_6880;Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)V ARG 1 item - ARG 2 output METHOD method_8075 hasPotionRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 input ARG 1 ingredient @@ -37,10 +34,11 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry METHOD method_8080 registerPotionType (Lnet/minecraft/class_1792;)V ARG 0 item CLASS class_1846 Recipe - FIELD field_8960 ingredient Lnet/minecraft/class_1856; - FIELD field_8961 output Ljava/lang/Object; - FIELD field_8962 input Ljava/lang/Object; - METHOD (Ljava/lang/Object;Lnet/minecraft/class_1856;Ljava/lang/Object;)V - ARG 1 input + FIELD comp_2190 input Lnet/minecraft/class_6880; + FIELD comp_2191 ingredient Lnet/minecraft/class_1856; + FIELD comp_2192 output Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V ARG 2 ingredient - ARG 3 output + METHOD comp_2190 input ()Lnet/minecraft/class_6880; + METHOD comp_2191 ingredient ()Lnet/minecraft/class_1856; + METHOD comp_2192 output ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 8eb3b9e849..cf8b292472 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -73,57 +73,51 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_46912 POOL_ALIAS_BINDING Lnet/minecraft/class_2378; FIELD field_47496 CRITERION Lnet/minecraft/class_2378; FIELD field_47555 NUMBER_FORMAT_TYPE Lnet/minecraft/class_2378; - METHOD method_47450 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4168; + METHOD method_47450 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47451 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4170; + METHOD method_47451 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47452 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4149; + METHOD method_47452 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47453 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4140; + METHOD method_47453 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47454 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3852; + METHOD method_47454 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47455 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3854; + METHOD method_47455 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47456 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3448; + METHOD method_47456 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47457 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5717; + METHOD method_47457 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47458 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1320; + METHOD method_47459 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47459 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1865; + METHOD method_47460 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47460 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3956; + METHOD method_47461 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47461 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3917; + METHOD method_47462 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47462 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4996; + METHOD method_47463 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47463 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3827; + METHOD method_47464 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47464 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2806; + METHOD method_47465 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47465 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2960; + METHOD method_47466 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47466 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2591; + METHOD method_47467 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47467 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2396; + METHOD method_47469 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47468 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1842; + METHOD method_47470 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47469 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1792; + METHOD method_47471 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47470 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1299; + METHOD method_47472 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47471 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1887; + METHOD method_47474 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47472 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2248; - ARG 0 registry - METHOD method_47473 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1291; - ARG 0 registry - METHOD method_47474 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3611; - ARG 0 registry - METHOD method_47475 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3414; + METHOD method_47475 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47476 bootstrap ()V METHOD method_47477 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; @@ -154,8 +148,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries ARG 0 registries METHOD method_47484 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V ARG 1 registry - METHOD method_47486 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5712; - ARG 0 registry METHOD method_47487 init ()V METHOD method_47488 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; ARG 0 key @@ -166,58 +158,58 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries ARG 0 key ARG 1 defaultId ARG 2 initializer - METHOD method_47490 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7106; + METHOD method_47490 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47491 freezeRegistries ()V - METHOD method_47492 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3816; + METHOD method_47492 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47493 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3828; + METHOD method_47493 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47494 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5202; + METHOD method_47494 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47495 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4663; + METHOD method_47495 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47496 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7388; + METHOD method_47496 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47497 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5142; + METHOD method_47497 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47498 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4648; + METHOD method_47498 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47499 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4652; + METHOD method_47499 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47500 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6798; + METHOD method_47500 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47501 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7151; + METHOD method_47501 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47502 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3773; + METHOD method_47502 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47503 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6875; + METHOD method_47503 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47504 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3031; + METHOD method_47504 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47505 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2939; + METHOD method_47505 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47506 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6647; + METHOD method_47506 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47507 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6123; + METHOD method_47507 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47508 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6018; + METHOD method_47508 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47509 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5864; + METHOD method_47509 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47510 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5669; + METHOD method_47510 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47511 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5650; + METHOD method_47511 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47512 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5657; + METHOD method_47512 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47513 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5342; + METHOD method_47513 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47514 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5339; + METHOD method_47514 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47515 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5338; + METHOD method_47515 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_49927 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_8249; + METHOD method_49927 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_53495 createIntrusive (Lnet/minecraft/class_5321;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; ARG 0 key diff --git a/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping b/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping index 7566ec249a..97a00f6de7 100644 --- a/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_3505 net/minecraft/registry/tag/TagManagerLoader ARG 2 prepareExecutor ARG 3 requirement METHOD method_40096 getRegistryTags ()Ljava/util/List; - METHOD method_40097 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Ljava/util/Optional; - ARG 2 id METHOD method_40098 (Ljava/util/List;Ljava/lang/Void;)V ARG 2 void_ METHOD method_40099 getPath (Lnet/minecraft/class_5321;)Ljava/lang/String; diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index fe8260ff73..3cf8608cfe 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -22,12 +22,11 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler ARG 1 primary ARG 2 secondary METHOD method_17373 getProperties ()I - METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_1291; - METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_1291; + METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_6880; + METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_6880; METHOD method_17376 hasPayment ()Z - METHOD method_53173 getRawIdForStatusEffect (Lnet/minecraft/class_1291;)I - ARG 0 statusEffect - METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_1291; + METHOD method_53173 getRawIdForStatusEffect (Lnet/minecraft/class_6880;)I + METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_6880; ARG 0 id CLASS class_1705 PaymentSlot METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1263;III)V diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index c540f1f398..7caaedad90 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -102,7 +102,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 2 permissionLevel METHOD method_14597 disconnectAllPlayers ()V METHOD method_14599 reloadWhitelist ()V - METHOD method_14600 loadPlayerData (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2487; + METHOD method_14600 loadPlayerData (Lnet/minecraft/class_3222;)Ljava/util/Optional; ARG 1 player METHOD method_14601 updatePlayerLatency ()V METHOD method_14602 getPlayer (Ljava/util/UUID;)Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 349fd22e96..8354efa36d 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -63,8 +63,6 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 1 predicate METHOD method_43917 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_45147 getKeyString (Lcom/mojang/datafixers/util/Pair;)Ljava/lang/String; - ARG 0 result METHOD method_45148 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/time/Duration;)I ARG 0 source ARG 1 predicate @@ -85,5 +83,3 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 2 tag METHOD method_45151 (Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_6880$class_6883;)Ljava/lang/String; ARG 1 entry - METHOD method_45152 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index ef59bf4589..8a09141a39 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -2,10 +2,9 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD comp_1994 id ()Lnet/minecraft/class_2960; METHOD method_52592 continuesToNextLine (Ljava/lang/CharSequence;)Z ARG 0 string - METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;Ljava/lang/Object;)Lnet/minecraft/class_8868; + METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;)Lnet/minecraft/class_8868; ARG 1 arguments ARG 2 dispatcher - ARG 3 source METHOD method_54417 parse (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_8856; ARG 0 dispatcher ARG 1 source diff --git a/mappings/net/minecraft/server/function/FunctionBuilder.mapping b/mappings/net/minecraft/server/function/FunctionBuilder.mapping index f65c6625fc..29b81cb1bf 100644 --- a/mappings/net/minecraft/server/function/FunctionBuilder.mapping +++ b/mappings/net/minecraft/server/function/FunctionBuilder.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_8867 net/minecraft/server/function/FunctionBuilder ARG 1 action METHOD method_54420 indexOfVariable (Ljava/lang/String;)I ARG 1 variable - METHOD method_54421 addMacroCommand (Ljava/lang/String;I)V + METHOD method_54421 addMacroCommand (Ljava/lang/String;ILnet/minecraft/class_8839;)V ARG 1 command ARG 2 lineNum METHOD method_54422 indicesOfVariables (Ljava/util/List;)Lit/unimi/dsi/fastutil/ints/IntList; diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/Macro.mapping index 252a9fbd0a..cc1c3ce943 100644 --- a/mappings/net/minecraft/server/function/Macro.mapping +++ b/mappings/net/minecraft/server/function/Macro.mapping @@ -9,11 +9,10 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro ARG 1 id ARG 2 lines ARG 3 varNames - METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8868; + METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;)Lnet/minecraft/class_8868; ARG 1 varNames ARG 2 arguments ARG 3 dispatcher - ARG 4 source METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String; ARG 0 nbt METHOD method_54423 (Ljava/text/DecimalFormat;)V @@ -28,15 +27,13 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro ARG 2 index CLASS class_8869 Line METHOD method_54428 getDependentVariables ()Lit/unimi/dsi/fastutil/ints/IntList; - METHOD method_54429 instantiate (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Ljava/lang/Object;Lnet/minecraft/class_2960;)Lnet/minecraft/class_8856; + METHOD method_54429 instantiate (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2960;)Lnet/minecraft/class_8856; ARG 1 args ARG 2 dispatcher - ARG 3 source - ARG 4 id CLASS class_8870 VariableLine FIELD field_46760 invocation Lnet/minecraft/class_8873; FIELD field_46761 variableIndices Lit/unimi/dsi/fastutil/ints/IntList; - METHOD (Lnet/minecraft/class_8873;Lit/unimi/dsi/fastutil/ints/IntList;)V + METHOD (Lnet/minecraft/class_8873;Lit/unimi/dsi/fastutil/ints/IntList;Lnet/minecraft/class_8839;)V ARG 1 invocation ARG 2 variableIndices CLASS class_8871 FixedLine diff --git a/mappings/net/minecraft/server/network/DebugInfoSender.mapping b/mappings/net/minecraft/server/network/DebugInfoSender.mapping index 9b99dd511e..b805dd74d1 100644 --- a/mappings/net/minecraft/server/network/DebugInfoSender.mapping +++ b/mappings/net/minecraft/server/network/DebugInfoSender.mapping @@ -53,7 +53,7 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender METHOD method_24819 sendPoi (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos - METHOD method_33139 sendGameEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V + METHOD method_33139 sendGameEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_6880;Lnet/minecraft/class_243;)V ARG 0 world ARG 1 event ARG 2 pos diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index bb3ca0985b..4254c1ff2c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -26,7 +26,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14145 updatedX D FIELD field_14146 lastTickY D FIELD field_14147 topmostRiddenEntity Lnet/minecraft/class_1297; - FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D FIELD field_37281 DEFAULT_SEQUENCE I FIELD field_37282 sequence I FIELD field_39805 messageUnpacker Lnet/minecraft/class_7610$class_7611; diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index c8d7443b1d..f0f37da5c0 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -374,9 +374,8 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 direction ARG 3 powerPredicate ARG 4 errorMessage - METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_1291;I)V + METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;I)V ARG 1 entity - ARG 2 effect ARG 3 amplifier METHOD method_54143 expectItem (Lnet/minecraft/class_1792;)V ARG 1 item diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9074.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9074.mapping new file mode 100644 index 0000000000..13fa1fb80d --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9074.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9074 net/minecraft/unused/packageinfo/PackageInfo9074 diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 56863c78c5..6a0f51eb0e 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -31,8 +31,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers METHOD method_52551 createMasterLibrarianTradeFactory ()Lnet/minecraft/class_3853$class_1652; METHOD method_52552 createLibrarianTradeFactory (I)Lnet/minecraft/class_3853$class_1652; ARG 0 experience - METHOD method_52553 createPotionStack (Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; - ARG 0 potion + METHOD method_52553 createPotionStack (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; METHOD method_53832 enchant (Lnet/minecraft/class_1792;Lnet/minecraft/class_1887;I)Lnet/minecraft/class_1799; ARG 0 item ARG 1 enchantment @@ -218,8 +217,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 1 stewEffects ARG 2 experience ARG 3 multiplier - METHOD (Lnet/minecraft/class_1291;II)V - ARG 1 effect + METHOD (Lnet/minecraft/class_6880;II)V ARG 2 duration ARG 3 experience CLASS class_4167 SellPotionHoldingItemFactory @@ -239,8 +237,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 5 price ARG 6 maxUses ARG 7 experience - METHOD method_19203 (Lnet/minecraft/class_1842;)Z - ARG 0 potion CLASS class_8640 TypedWrapperFactory FIELD comp_1962 typeToFactory Ljava/util/Map; METHOD comp_1962 typeToFactory ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index 4abb6164dc..f7fd23c5b0 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -3,12 +3,12 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 1 eventId ARG 2 pos ARG 3 data - METHOD method_32888 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V + METHOD method_32888 emitGameEvent (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V COMMENT Emits a game event. ARG 1 event ARG 2 emitterPos ARG 3 emitter - METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V + METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)V ARG 1 entity ARG 2 event ARG 3 pos @@ -47,11 +47,11 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 4 neighborPos ARG 5 flags ARG 6 maxUpdateDepth - METHOD method_43275 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V + METHOD method_43275 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Lnet/minecraft/class_243;)V ARG 1 entity ARG 2 event ARG 3 pos - METHOD method_43276 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712$class_7397;)V + METHOD method_43276 emitGameEvent (Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712$class_7397;)V ARG 1 event ARG 2 pos ARG 3 emitter diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 26e09cf9c6..9665238f15 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -167,14 +167,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT A spawner spawns a mob. COMMENT
Spawns smoke and flame particles. COMMENT

Called by {@link net.minecraft.block.spawner.MobSpawnerLogic#serverTick(net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos) MobSpawnerLogic#serverTick} - FIELD field_31148 PLANT_FERTILIZED I - COMMENT A plant is fertilized with bone meal or by a bee, or a turtle egg is placed. - COMMENT
Spawns happy villager particles. - COMMENT

Called by {@link net.minecraft.entity.passive.BeeEntity.GrowCropsGoal#tick() BeeEntity.GrowCropsGoal#tick}, - COMMENT {@link net.minecraft.item.BoneMealItem#useOnBlock(net.minecraft.item.ItemUsageContext) BoneMealItem#useOnBlock}, - COMMENT {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning}, - COMMENT {@link net.minecraft.block.dispenser.DispenserBehavior DispenserBehavior}, - COMMENT and {@link net.minecraft.block.TurtleEggBlock#onBlockAdded(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, boolean) TurtleEggBlock#onBlockAdded} FIELD field_31149 DRAGON_BREATH_CLOUD_SPAWNS I COMMENT A dragon breath cloud spawns. COMMENT
Plays the dragon fireball explode sound event and spawns dragon breath particles. diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping index 38b9b7e7b0..a46ed33391 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V ARG 1 session ARG 2 dataFixer - METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_2487; + METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;Ljava/lang/String;)Ljava/util/Optional; ARG 1 player METHOD method_262 savePlayerData (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_263 getSavedPlayerIds ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 134143571f..59e32a24ff 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -1,18 +1,14 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent - FIELD field_28154 range I + FIELD comp_2193 range I FIELD field_31449 DEFAULT_RANGE I - FIELD field_36412 registryEntry Lnet/minecraft/class_6880$class_6883; METHOD (I)V ARG 1 range - METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_5712; + METHOD comp_2193 range ()I + METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; ARG 0 id - METHOD method_32940 register (Ljava/lang/String;I)Lnet/minecraft/class_5712; + METHOD method_32940 register (Ljava/lang/String;I)Lnet/minecraft/class_6880$class_6883; ARG 0 id ARG 1 range - METHOD method_32941 getRange ()I - METHOD method_40156 isIn (Lnet/minecraft/class_6862;)Z - ARG 1 tag - METHOD method_40157 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; CLASS class_7397 Emitter METHOD method_43285 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5712$class_7397; ARG 0 sourceEntity @@ -22,12 +18,12 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent METHOD method_43287 of (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5712$class_7397; ARG 0 affectedState CLASS class_7447 Message - FIELD field_39177 event Lnet/minecraft/class_5712; + FIELD field_39177 event Lnet/minecraft/class_6880; FIELD field_39178 emitterPos Lnet/minecraft/class_243; FIELD field_39179 emitter Lnet/minecraft/class_5712$class_7397; FIELD field_39180 listener Lnet/minecraft/class_5714; FIELD field_39181 distanceTraveled D - METHOD (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V ARG 1 event ARG 2 emitterPos ARG 3 emitter @@ -35,7 +31,7 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent ARG 5 listenerPos METHOD compareTo (Ljava/lang/Object;)I ARG 1 other - METHOD method_43724 getEvent ()Lnet/minecraft/class_5712; + METHOD method_43724 getEvent ()Lnet/minecraft/class_6880; METHOD method_43726 getEmitterPos ()Lnet/minecraft/class_243; METHOD method_43727 getEmitter ()Lnet/minecraft/class_5712$class_7397; METHOD method_43728 getListener ()Lnet/minecraft/class_5714; diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping index 1d59e4dcf0..0944f46130 100644 --- a/mappings/net/minecraft/world/event/Vibrations.mapping +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -1,19 +1,16 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations - FIELD field_44638 RESONATIONS [Lnet/minecraft/class_5712; + FIELD field_44638 RESONATIONS Ljava/util/List; FIELD field_44639 FREQUENCIES Ljava/util/function/ToIntFunction; METHOD method_51298 getVibrationListenerData ()Lnet/minecraft/class_8514$class_8515; METHOD method_51299 getVibrationCallback ()Lnet/minecraft/class_8514$class_5719; - METHOD method_51383 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V - ARG 0 frequencies METHOD method_51384 getSignalStrength (FI)I ARG 0 distance ARG 1 range - METHOD method_51385 getFrequency (Lnet/minecraft/class_5712;)I - ARG 0 event - METHOD method_51386 getResonation (I)Lnet/minecraft/class_5712; + METHOD method_51385 getFrequency (Lnet/minecraft/class_5321;)I + METHOD method_51386 getResonation (I)Lnet/minecraft/class_5321; ARG 0 frequency CLASS class_5719 Callback - METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V + METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V COMMENT Accepts a game event after delay. ARG 1 world ARG 2 pos @@ -21,14 +18,14 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations ARG 4 sourceEntity ARG 5 entity ARG 6 distance - METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;)Z COMMENT Returns whether the callback wants to accept this event. ARG 1 world ARG 2 pos ARG 3 event ARG 4 emitter METHOD method_42210 getTag ()Lnet/minecraft/class_6862; - METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + METHOD method_42324 canAccept (Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;)Z ARG 1 gameEvent ARG 2 emitter METHOD method_42672 onListen ()V @@ -73,9 +70,9 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations FIELD field_44646 receiver Lnet/minecraft/class_8514; METHOD (Lnet/minecraft/class_8514;)V ARG 1 receiver - METHOD method_51398 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + METHOD method_51398 (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V ARG 5 pos - METHOD method_51399 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + METHOD method_51399 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V ARG 1 world ARG 2 listenerData ARG 3 event @@ -91,7 +88,7 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations METHOD method_51402 getTravelDelay (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)F ARG 0 emitterPos ARG 1 listenerPos - METHOD method_51403 forceListen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)V + METHOD method_51403 forceListen (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)V ARG 1 world ARG 2 event ARG 3 emitter diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping index 0dddbc8053..527c7200a7 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping @@ -4,12 +4,12 @@ CLASS net/minecraft/class_7719 net/minecraft/world/event/listener/GameEventDispa FIELD field_40352 world Lnet/minecraft/class_3218; METHOD (Lnet/minecraft/class_3218;)V ARG 1 world - METHOD method_45490 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V + METHOD method_45490 dispatch (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V ARG 1 event ARG 2 emitterPos ARG 3 emitter METHOD method_45491 dispatchListenersByDistance (Ljava/util/List;)V ARG 1 messages - METHOD method_45492 (Ljava/util/List;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V + METHOD method_45492 (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V ARG 5 listener ARG 6 listenerPos diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping index c92e5d9b6c..5a376aa78c 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT An unmodifiable, empty (non-operative) dispatcher. METHOD method_32942 isEmpty ()Z COMMENT Returns whether this dispatcher has no listeners. - METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5713$class_7721;)Z + METHOD method_32943 dispatch (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5713$class_7721;)Z COMMENT Dispatches an event to all the listeners in this dispatcher. ARG 1 event COMMENT the event diff --git a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping index d1ad1b40e6..61abb86bbe 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe COMMENT A game event listener listens to game events from {@link GameEventDispatcher}s. METHOD method_32946 getPositionSource ()Lnet/minecraft/class_5716; COMMENT Returns the position source of this listener. - METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z + METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z COMMENT Listens to an incoming game event. COMMENT COMMENT @return {@code true} if the game event has been accepted by this listener diff --git a/mappings/net/minecraft/world/event/listener/Vibration.mapping b/mappings/net/minecraft/world/event/listener/Vibration.mapping index c3159cfb6d..2866a36fda 100644 --- a/mappings/net/minecraft/world/event/listener/Vibration.mapping +++ b/mappings/net/minecraft/world/event/listener/Vibration.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_7269 net/minecraft/world/event/listener/Vibration FIELD field_38245 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V + METHOD (Lnet/minecraft/class_6880;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V ARG 1 gameEvent ARG 2 distance ARG 3 pos ARG 4 uuid ARG 5 projectileOwnerUuid - METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V + METHOD (Lnet/minecraft/class_6880;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V ARG 1 gameEvent ARG 2 distance ARG 3 pos @@ -17,7 +17,7 @@ CLASS net/minecraft/class_7269 net/minecraft/world/event/listener/Vibration ARG 0 instance METHOD method_42684 getOwnerUuid (Lnet/minecraft/class_1297;)Ljava/util/UUID; ARG 0 entity - METHOD method_42685 (Lnet/minecraft/class_5712;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_7269; + METHOD method_42685 (Lnet/minecraft/class_6880;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_7269; ARG 0 event ARG 1 distance ARG 2 pos diff --git a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping index 079124f1b1..1574a76970 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping @@ -51,5 +51,3 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet ARG 1 pos METHOD method_35157 getFreeTickets (Lnet/minecraft/class_2338;)I ARG 1 pos - METHOD method_43986 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key