From 946a35fc5471b6c68c0e50232a69d369cbd34f60 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 19 Sep 2024 02:11:58 +1000 Subject: [PATCH] 24w38a a bit more stuff --- mappings/net/minecraft/block/AbstractBlock.mapping | 14 ++++++++++++++ ...entBlock.mapping => AbstractCoralBlock.mapping} | 6 +++++- .../minecraft/block/AbstractPlantPartBlock.mapping | 1 + mappings/net/minecraft/block/FireBlock.mapping | 1 + mappings/net/minecraft/block/NoteBlock.mapping | 1 + mappings/net/minecraft/block/ObserverBlock.mapping | 3 +++ mappings/net/minecraft/entity/Entity.mapping | 1 + .../entity/vehicle/AbstractMinecartEntity.mapping | 1 + mappings/net/minecraft/item/BundleItem.mapping | 5 +++++ mappings/net/minecraft/test/GameTestState.mapping | 1 + 10 files changed, 33 insertions(+), 1 deletion(-) rename mappings/net/minecraft/block/{CoralParentBlock.mapping => AbstractCoralBlock.mapping} (77%) diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 9f0850ec4e..ade39e0f12 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -642,12 +642,16 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state COMMENT the state of this block ARG 2 world + COMMENT the world ARG 3 tickView ARG 4 pos + COMMENT the position of this block ARG 5 direction + COMMENT the direction from this block to the neighbor ARG 6 neighborPos COMMENT the position of the neighbor block ARG 7 neighborState + COMMENT the state of the updated neighbor block ARG 8 random METHOD method_9560 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_8567$class_8568;)Ljava/util/List; COMMENT {@return the block's dropped item stacks} @@ -1162,8 +1166,18 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT Gets the possibly updated block state of this block when a neighboring block is updated. COMMENT COMMENT @return the new state of this block + ARG 1 world + COMMENT the world + ARG 2 tickView + ARG 3 pos + COMMENT the position of this block + ARG 4 direction + COMMENT the direction from this block to the neighbor ARG 5 neighborPos COMMENT the position of the neighbor block + ARG 6 neighborState + COMMENT the state of the updated neighbor block + ARG 7 random METHOD method_26192 scheduledTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/CoralParentBlock.mapping b/mappings/net/minecraft/block/AbstractCoralBlock.mapping similarity index 77% rename from mappings/net/minecraft/block/CoralParentBlock.mapping rename to mappings/net/minecraft/block/AbstractCoralBlock.mapping index 963fa443ab..9f7ff6125a 100644 --- a/mappings/net/minecraft/block/CoralParentBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCoralBlock.mapping @@ -1,8 +1,12 @@ -CLASS net/minecraft/class_2230 net/minecraft/block/CoralParentBlock +CLASS net/minecraft/class_2230 net/minecraft/block/AbstractCoralBlock FIELD field_9939 SHAPE Lnet/minecraft/class_265; FIELD field_9940 WATERLOGGED Lnet/minecraft/class_2746; METHOD method_9430 checkLivingConditions (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_10225;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V ARG 1 state + ARG 2 world + ARG 3 tickView + ARG 4 random + ARG 5 pos METHOD method_9431 isInWater (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping index 0361668f74..9dbea812ea 100644 --- a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_4863 net/minecraft/block/AbstractPlantPartBlock METHOD method_24947 canAttachTo (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_24948 getRandomGrowthState (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680; + ARG 1 random diff --git a/mappings/net/minecraft/block/FireBlock.mapping b/mappings/net/minecraft/block/FireBlock.mapping index f6ac7b3915..30cd143c51 100644 --- a/mappings/net/minecraft/block/FireBlock.mapping +++ b/mappings/net/minecraft/block/FireBlock.mapping @@ -45,6 +45,7 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock ARG 2 pos METHOD method_10199 registerDefaultFlammables ()V METHOD method_24855 getStateWithAge (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_2680; + ARG 1 world ARG 2 pos ARG 3 age METHOD method_26155 getFireTickDelay (Lnet/minecraft/class_5819;)I diff --git a/mappings/net/minecraft/block/NoteBlock.mapping b/mappings/net/minecraft/block/NoteBlock.mapping index 01248d1108..b32e31c769 100644 --- a/mappings/net/minecraft/block/NoteBlock.mapping +++ b/mappings/net/minecraft/block/NoteBlock.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2428 net/minecraft/block/NoteBlock ARG 3 world ARG 4 pos METHOD method_47583 getStateWithInstrument (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 world ARG 2 pos ARG 3 state METHOD method_47886 getCustomSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/block/ObserverBlock.mapping b/mappings/net/minecraft/block/ObserverBlock.mapping index eb3cb41ada..bdfb270422 100644 --- a/mappings/net/minecraft/block/ObserverBlock.mapping +++ b/mappings/net/minecraft/block/ObserverBlock.mapping @@ -6,3 +6,6 @@ CLASS net/minecraft/class_2426 net/minecraft/block/ObserverBlock ARG 2 pos ARG 3 state METHOD method_10366 scheduleTick (Lnet/minecraft/class_4538;Lnet/minecraft/class_10225;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 tickView + ARG 3 pos diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index a65266961a..4ca6baf145 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -2301,6 +2301,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_64168 checkBlockCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V ARG 1 oldPos ARG 2 newPos + METHOD method_64270 shouldPlayBurnSoundInLava ()Z METHOD method_7325 isSpectator ()Z COMMENT {@return whether the entity is a spectator} COMMENT diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 37a98f370c..13817a9829 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti METHOD method_61571 isYawFlipped ()Z METHOD method_62824 isFirstUpdate ()Z METHOD method_62825 getRailOrMinecartPos ()Lnet/minecraft/class_2338; + METHOD method_64272 isRideable ()Z METHOD method_64274 pushAwayFromMinecart (Lnet/minecraft/class_1688;DD)V ARG 1 entity ARG 2 xDiff diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping index d95b819769..9da8b4b704 100644 --- a/mappings/net/minecraft/item/BundleItem.mapping +++ b/mappings/net/minecraft/item/BundleItem.mapping @@ -44,3 +44,8 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem ARG 2 contents METHOD method_63677 getOpenFrontTexture ()Lnet/minecraft/class_2960; METHOD method_63678 getOpenBackTexture ()Lnet/minecraft/class_2960; + METHOD method_64277 getBundle (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 color + METHOD method_64278 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5537; + ARG 0 item + METHOD method_64279 getBundles ()Ljava/util/List; diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index aa4d8ff593..e92544d066 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -88,3 +88,4 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_56214 setBoxMinPos (Lnet/minecraft/class_2338;)V ARG 1 boxMinPos METHOD method_56215 getTestAttemptConfig ()Lnet/minecraft/class_9118; + METHOD method_64385 getStructureBlockPos ()Lnet/minecraft/class_2338;