Skip to content

Commit

Permalink
24w33a a bit more stuff (#3947)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shnupbups
Shnupbups authored Aug 18, 2024
1 parent 27c9f3d commit 83ef851
Show file tree
Hide file tree
Showing 16 changed files with 125 additions and 4 deletions.
21 changes: 21 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
METHOD method_54096 createSettingsCodec ()Lcom/mojang/serialization/codecs/RecordCodecBuilder;
METHOD method_55124 onExploded (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1927;Ljava/util/function/BiConsumer;)V
ARG 1 state
ARG 2 world
ARG 3 pos
ARG 4 explosion
ARG 5 stackMerger
Expand Down Expand Up @@ -831,6 +832,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 2 world
ARG 3 pos
ARG 4 sourceBlock
ARG 5 wireOrientation
ARG 6 notify
METHOD method_9615 onBlockAdded (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
COMMENT Called server-side on the new block when the block state is changed. This includes block
Expand Down Expand Up @@ -966,8 +968,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 1 offsetType
METHOD method_49230 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
ARG 0 state
ARG 1 pos
METHOD method_49231 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
ARG 0 state
ARG 1 pos
METHOD method_50012 pistonBehavior (Lnet/minecraft/class_3619;)Lnet/minecraft/class_4970$class_2251;
ARG 1 pistonBehavior
METHOD method_50013 burnable ()Lnet/minecraft/class_4970$class_2251;
Expand Down Expand Up @@ -1040,6 +1044,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
FIELD field_44624 solid Z
FIELD field_44625 instrument Lnet/minecraft/class_2766;
FIELD field_44626 replaceable Z
FIELD field_52639 opaqueFullCube Z
FIELD field_52640 cullingShape Lnet/minecraft/class_265;
FIELD field_52641 cullingFaces [Lnet/minecraft/class_265;
FIELD field_52642 transparent Z
FIELD field_52643 opacity I
FIELD field_52644 DIRECTIONS [Lnet/minecraft/class_2350;
FIELD field_52645 EMPTY_CULLING_FACES [Lnet/minecraft/class_265;
FIELD field_52646 FULL_CULLING_FACES [Lnet/minecraft/class_265;
METHOD <init> (Lnet/minecraft/class_2248;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
ARG 1 block
ARG 2 propertyMap
Expand Down Expand Up @@ -1073,6 +1085,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 2 pos
ARG 3 context
METHOD method_26173 getCullingFace (Lnet/minecraft/class_2350;)Lnet/minecraft/class_265;
ARG 1 direction
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
Expand Down Expand Up @@ -1103,6 +1116,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 1 world
ARG 2 pos
ARG 3 sourceBlock
ARG 4 wireOrientation
ARG 5 notify
METHOD method_26182 onBlockAdded (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
ARG 1 world
Expand Down Expand Up @@ -1228,6 +1242,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 2 pos
METHOD method_26225 isOpaque ()Z
METHOD method_26226 getModelOffset (Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
ARG 1 pos
METHOD method_26227 getFluidState ()Lnet/minecraft/class_3610;
METHOD method_26228 shouldSuffocate (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
ARG 1 world
Expand Down Expand Up @@ -1285,6 +1300,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
METHOD method_54097 matchesKey (Lnet/minecraft/class_5321;)Z
ARG 1 key
METHOD method_55225 onExploded (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1927;Ljava/util/function/BiConsumer;)V
ARG 1 world
ARG 2 pos
ARG 3 explosion
ARG 4 stackMerger
Expand All @@ -1298,6 +1314,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 1 world
ARG 2 player
ARG 3 hit
METHOD method_61765 ([Lnet/minecraft/class_265;)V
ARG 0 direction
METHOD method_61766 ([Lnet/minecraft/class_265;)V
ARG 0 direction
CLASS class_3752 ShapeCache
FIELD field_16559 DIRECTIONS [Lnet/minecraft/class_2350;
FIELD field_17651 exceedsCube Z
Expand Down Expand Up @@ -1329,3 +1349,4 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
CLASS class_8176 Offsetter
METHOD evaluate (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
ARG 1 state
ARG 2 pos
6 changes: 6 additions & 0 deletions mappings/net/minecraft/block/Block.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
COMMENT <p>This method is called on both the logical client and logical server, so take caution
COMMENT when overriding this method. The logical side can be checked using {@link
COMMENT World#isClient}.
ARG 1 world
ARG 2 pos
ARG 3 explosion
METHOD method_9587 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V
Expand All @@ -384,6 +385,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 1 ctx
METHOD method_9607 shouldDrawSide (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z
ARG 0 state
ARG 1 otherState
ARG 2 side
METHOD method_9609 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2586;Lnet/minecraft/class_1297;Lnet/minecraft/class_1799;)Ljava/util/List;
ARG 0 state
ARG 1 world
Expand Down Expand Up @@ -433,3 +436,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 3 facing
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
CLASS class_9894 VoxelShapePair
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/LeverBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ CLASS net/minecraft/class_2401 net/minecraft/block/LeverBlock
ARG 2 pos
ARG 3 alpha
METHOD method_10309 updateNeighbors (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
ARG 1 state
ARG 2 world
ARG 3 pos
METHOD method_21846 togglePower (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
ARG 1 state
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/MapColor.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ CLASS net/minecraft/class_3620 net/minecraft/block/MapColor
ARG 1 id
ARG 2 color
METHOD method_15820 getRenderColor (Lnet/minecraft/class_3620$class_6594;)I
ARG 1 brightness
METHOD method_38479 get (I)Lnet/minecraft/class_3620;
ARG 0 id
METHOD method_38480 getRenderColor (I)I
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/MultifaceGrowthBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ CLASS net/minecraft/class_5778 net/minecraft/block/MultifaceGrowthBlock
METHOD method_33380 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
ARG 0 state
METHOD method_33381 hasAnyDirection (Lnet/minecraft/class_2680;)Z
ARG 0 state
METHOD method_33382 isNotFullBlock (Lnet/minecraft/class_2680;)Z
ARG 0 state
METHOD method_41432 getGrower ()Lnet/minecraft/class_7118;
METHOD method_41437 flagToDirections (B)Ljava/util/Set;
ARG 0 flag
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/ShortPlantBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLASS net/minecraft/class_2526 net/minecraft/block/ShortPlantBlock
FIELD field_11617 SHAPE Lnet/minecraft/class_265;
FIELD field_46470 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_61750 getLargeVariant (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2320;
ARG 0 state
45 changes: 45 additions & 0 deletions mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,49 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior
METHOD method_34850 registerBucketBehavior (Ljava/util/Map;)V
COMMENT Registers the behavior for filled buckets in the specified behavior map.
ARG 0 behavior
METHOD method_62705 isUnderwater (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_62706 tryFillWithWater (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;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 hand
ARG 5 stack
METHOD method_62707 tryFillWithLava (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;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 hand
ARG 5 stack
METHOD method_62708 tryFillWithPowderSnow (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;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 hand
ARG 5 stack
METHOD method_62709 cleanShulkerBox (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;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 hand
ARG 5 stack
METHOD method_62710 cleanBanner (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;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 hand
ARG 5 stack
METHOD method_62711 cleanArmor (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;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 hand
ARG 5 stack
CLASS class_8821 CauldronBehaviorMap
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/gl/PostEffectPipeline.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
CLASS net/minecraft/class_9962 net/minecraft/client/gl/PostEffectPipeline
FIELD field_53111 CODEC Lcom/mojang/serialization/Codec;
CLASS class_9963 CustomSized
FIELD field_53112 CODEC Lcom/mojang/serialization/Codec;
CLASS class_9964 ScreenSized
FIELD field_53113 CODEC Lcom/mojang/serialization/Codec;
CLASS class_9965 Input
METHOD method_62246 getTargetId ()Ljava/util/Set;
CLASS class_9966 Targets
Expand Down
4 changes: 2 additions & 2 deletions ...ructure/DataPackStructureProvider.mapping → .../report/DataPackStructureProvider.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CLASS net/minecraft/class_10107 net/minecraft/data/report/structure/DataPackStructureProvider
CLASS net/minecraft/class_10107 net/minecraft/data/report/DataPackStructureProvider
FIELD field_53697 output Lnet/minecraft/class_7784;
FIELD field_53698 RELOADABLE_REGISTRY Lnet/minecraft/class_10107$class_10109;
FIELD field_53699 RELOADABLE_REGISTRY_WITH_TAGS Lnet/minecraft/class_10107$class_10109;
FIELD field_53700 DYNAIMC_REGISTRY Lnet/minecraft/class_10107$class_10109;
FIELD field_53700 DYNAMIC_REGISTRY Lnet/minecraft/class_10107$class_10109;
FIELD field_53701 STATIC_REGISTRY Lnet/minecraft/class_10107$class_10109;
FIELD field_53702 RELOADABLE_REGISTRIES Ljava/util/Map;
FIELD field_53703 FAKE_REGISTRIES Ljava/util/Map;
Expand Down
3 changes: 2 additions & 1 deletion ...erver/recipe/BundleRecipeProvider.mapping → ...rver/recipe/BundleRecipeGenerator.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CLASS net/minecraft/class_7801 net/minecraft/data/server/recipe/BundleRecipeProvider
CLASS net/minecraft/class_7801 net/minecraft/data/server/recipe/BundleRecipeGenerator
CLASS class_10115 Provider
3 changes: 3 additions & 0 deletions mappings/net/minecraft/entity/TntEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ CLASS net/minecraft/class_1541 net/minecraft/entity/TntEntity
FIELD field_46778 BLOCK_STATE_NBT_KEY Ljava/lang/String;
FIELD field_52317 TELEPORTED_EXPLOSION_BEHAVIOR Lnet/minecraft/class_5362;
FIELD field_52318 teleported Z
FIELD field_52494 DEFAULT_EXPLOSION_POWER F
FIELD field_52495 EXPLOSION_POWER_NBT_KEY Ljava/lang/String;
FIELD field_52496 explosionPower F
FIELD field_7197 FUSE Lnet/minecraft/class_2940;
FIELD field_7198 causingEntity Lnet/minecraft/class_1309;
METHOD <init> (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1309;)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
CLASS net/minecraft/class_1696 net/minecraft/entity/vehicle/FurnaceMinecartEntity
FIELD field_52521 FUEL_PER_ITEM I
FIELD field_52522 MAX_FUEL I
FIELD field_7736 pushZ D
FIELD field_7737 pushX D
FIELD field_7739 fuel I
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
CLASS net/minecraft/class_1701 net/minecraft/entity/vehicle/TntMinecartEntity
FIELD field_30703 PRIME_TNT_STATUS B
FIELD field_52524 EXPLOSION_POWER_NBT_KEY Ljava/lang/String;
FIELD field_52525 DEFAULT_EXPLOSION_POWER F
FIELD field_52526 explosionPower F
FIELD field_7751 fuseTicks I
METHOD <init> (Lnet/minecraft/class_1937;DDD)V
ARG 1 world
Expand Down
18 changes: 18 additions & 0 deletions mappings/net/minecraft/item/ArmorMaterials.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials
FIELD field_7887 CHAIN Lnet/minecraft/class_6880;
METHOD method_24356 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_48405 (Ljava/util/EnumMap;)V
ARG 0 map
METHOD method_48406 (Ljava/util/EnumMap;)V
Expand All @@ -16,6 +18,8 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials
ARG 0 map
METHOD method_48412 (Ljava/util/EnumMap;)V
ARG 0 map
METHOD method_56696 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_56697 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
ARG 0 registry
METHOD method_56698 register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/class_6880;FFLjava/util/function/Predicate;)Lnet/minecraft/class_6880;
Expand All @@ -25,11 +29,25 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials
ARG 3 equipSound
ARG 4 toughness
ARG 5 knockbackResistance
ARG 6 repairIngredient
METHOD method_56699 register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/class_6880;FFLjava/util/function/Predicate;Ljava/util/List;)Lnet/minecraft/class_6880;
ARG 0 id
ARG 1 defense
ARG 2 enchantability
ARG 3 equipSound
ARG 4 toughness
ARG 5 knockbackResistance
ARG 6 repairIngredient
ARG 7 layers
METHOD method_7688 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_7689 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_7690 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_7691 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_7692 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_7693 (Lnet/minecraft/class_1799;)Z
ARG 0 stack
9 changes: 8 additions & 1 deletion mappings/net/minecraft/item/Instruments.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
CLASS net/minecraft/class_7445 net/minecraft/item/Instruments
FIELD field_39124 GOAT_HORN_RANGE I
FIELD field_39125 GOAT_HORN_USE_DURATION F
METHOD method_43713 registerAndGetDefault (Lnet/minecraft/class_7891;)V
METHOD method_43713 bootstrap (Lnet/minecraft/class_7891;)V
ARG 0 registry
METHOD method_43714 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id
METHOD method_61646 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;FF)V
ARG 0 registry
ARG 1 key
ARG 2 sound
ARG 3 useDuration
ARG 4 range
6 changes: 6 additions & 0 deletions mappings/net/minecraft/item/MaceItem.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,25 @@ CLASS net/minecraft/class_9362 net/minecraft/item/MaceItem
FIELD field_49825 ATTACK_SPEED_MODIFIER_VALUE F
FIELD field_49999 KNOCKBACK_RANGE F
FIELD field_50000 KNOCKBACK_POWER F
FIELD field_50141 HEAVY_SMASH_SOUND_FALL_DISTANCE_THRESHOLD F
METHOD method_58409 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)V
ARG 2 entity
METHOD method_58411 knockbackNearbyEntities (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V
ARG 0 world
ARG 1 attacker
ARG 2 attacked
METHOD method_58412 createToolComponent ()Lnet/minecraft/class_9424;
METHOD method_58659 shouldDealAdditionalDamage (Lnet/minecraft/class_1309;)Z
ARG 0 attacker
METHOD method_58660 getKnockbackPredicate (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Ljava/util/function/Predicate;
ARG 0 attacker
ARG 1 attacked
METHOD method_58661 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Z
ARG 2 entity
METHOD method_58662 getKnockback (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;Lnet/minecraft/class_243;)D
ARG 0 attacker
ARG 1 attacked
ARG 2 distance
METHOD method_59532 createAttributeModifiers ()Lnet/minecraft/class_9285;
METHOD method_61658 getCurrentExplosionImpactPos (Lnet/minecraft/class_3222;)Lnet/minecraft/class_243;
ARG 1 player

0 comments on commit 83ef851

Please sign in to comment.