From aa1790fe7982c922641f14f1ab96f48de4811bbd Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Tue, 4 Apr 2023 18:04:42 +0300 Subject: [PATCH] Vote Update: Map blocks and items (#3532) * Map blocks and items * Fix typos * Fix spelling of behavior Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com> --------- Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com> --- .../net/minecraft/block/AbstractBlock.mapping | 6 +++++ .../net/minecraft/block/CheeseBlock.mapping | 19 +++++++++++++ .../minecraft/block/CopperSinkBlock.mapping | 1 + .../block/CopperSpleavesBlock.mapping | 3 +++ .../block/FilledCopperSinkBlock.mapping | 1 + .../minecraft/block/PackedAirBlock.mapping | 24 +++++++++++++++++ .../net/minecraft/block/PickaxeBlock.mapping | 1 + .../net/minecraft/block/PlaceBlock.mapping | 23 ++++++++++++++++ .../block/WorldModifyingBlock.mapping | 5 ++++ .../block/cauldron/CauldronBehavior.mapping | 27 +++++++++++++++++++ .../net/minecraft/item/DupeHackItem.mapping | 1 + mappings/net/minecraft/item/Items.mapping | 6 +++++ mappings/net/minecraft/item/NbtItem.mapping | 12 +++++++++ .../net/minecraft/item/NbtNameItem.mapping | 7 +++++ .../PlaceBlockItemPlacementContext.mapping | 11 ++++++++ mappings/net/minecraft/world/World.mapping | 1 + 16 files changed, 148 insertions(+) create mode 100644 mappings/net/minecraft/block/CheeseBlock.mapping create mode 100644 mappings/net/minecraft/block/CopperSinkBlock.mapping create mode 100644 mappings/net/minecraft/block/CopperSpleavesBlock.mapping create mode 100644 mappings/net/minecraft/block/FilledCopperSinkBlock.mapping create mode 100644 mappings/net/minecraft/block/PackedAirBlock.mapping create mode 100644 mappings/net/minecraft/block/PickaxeBlock.mapping create mode 100644 mappings/net/minecraft/block/PlaceBlock.mapping create mode 100644 mappings/net/minecraft/block/WorldModifyingBlock.mapping create mode 100644 mappings/net/minecraft/item/DupeHackItem.mapping create mode 100644 mappings/net/minecraft/item/NbtItem.mapping create mode 100644 mappings/net/minecraft/item/NbtNameItem.mapping create mode 100644 mappings/net/minecraft/item/PlaceBlockItemPlacementContext.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 3e8335d880..86ff9510f7 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -330,6 +330,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state ARG 2 world ARG 3 pos + METHOD method_50846 shouldLetAirThrough (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 direction METHOD method_8389 asItem ()Lnet/minecraft/class_1792; COMMENT {@return the block's corresponding item} COMMENT @@ -1274,6 +1279,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 3 offsetter METHOD method_49228 hasModelOffset ()Z METHOD method_50011 isBurnable ()Z + METHOD method_50892 shouldLetAirThrough (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z CLASS class_3752 ShapeCache FIELD field_16555 lightSubtracted I FIELD field_16556 transparent Z diff --git a/mappings/net/minecraft/block/CheeseBlock.mapping b/mappings/net/minecraft/block/CheeseBlock.mapping new file mode 100644 index 0000000000..d530cff7d8 --- /dev/null +++ b/mappings/net/minecraft/block/CheeseBlock.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_8425 net/minecraft/block/CheeseBlock + FIELD field_44224 SLICES Lnet/minecraft/class_2758; + FIELD field_44225 CORNER_SHAPES [Lnet/minecraft/class_265; + FIELD field_44226 SHAPES [Lnet/minecraft/class_265; + METHOD method_50856 hasCorner (II)Z + ARG 0 flags + ARG 1 corner + METHOD method_50857 getClosestSlice (Lnet/minecraft/class_2680;Lnet/minecraft/class_243;)I + ARG 0 state + ARG 1 pos + METHOD method_50859 createFlag (I)I + ARG 0 corner + METHOD method_50860 removeCorner (II)I + ARG 0 flags + ARG 1 corner + METHOD method_50861 ([Lnet/minecraft/class_265;)V + ARG 0 cornerShapes + METHOD method_50862 isFull (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/CopperSinkBlock.mapping b/mappings/net/minecraft/block/CopperSinkBlock.mapping new file mode 100644 index 0000000000..c7962b68af --- /dev/null +++ b/mappings/net/minecraft/block/CopperSinkBlock.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8426 net/minecraft/block/CopperSinkBlock diff --git a/mappings/net/minecraft/block/CopperSpleavesBlock.mapping b/mappings/net/minecraft/block/CopperSpleavesBlock.mapping new file mode 100644 index 0000000000..9f1432c88d --- /dev/null +++ b/mappings/net/minecraft/block/CopperSpleavesBlock.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8432 net/minecraft/block/CopperSpleavesBlock + FIELD field_44240 SHAPE Lnet/minecraft/class_265; + FIELD field_44241 FALLING Lnet/minecraft/class_2769; diff --git a/mappings/net/minecraft/block/FilledCopperSinkBlock.mapping b/mappings/net/minecraft/block/FilledCopperSinkBlock.mapping new file mode 100644 index 0000000000..f1e2736c3d --- /dev/null +++ b/mappings/net/minecraft/block/FilledCopperSinkBlock.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8428 net/minecraft/block/FilledCopperSinkBlock diff --git a/mappings/net/minecraft/block/PackedAirBlock.mapping b/mappings/net/minecraft/block/PackedAirBlock.mapping new file mode 100644 index 0000000000..8867dec4db --- /dev/null +++ b/mappings/net/minecraft/block/PackedAirBlock.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8429 net/minecraft/block/PackedAirBlock + FIELD field_44237 IS_DISSIPATING Ljava/lang/ThreadLocal; + FIELD field_44238 TICK_DELAY I + FIELD field_44239 DIRECTIONS [Lnet/minecraft/class_2350; + METHOD method_50865 tryDissipate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 originPos + METHOD method_50866 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Set;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;)Z + ARG 4 pos + METHOD method_50867 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/function/Consumer;)V + ARG 1 pos + ARG 2 consumer + METHOD method_50868 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Ljava/util/function/Predicate;)Ljava/util/Set; + ARG 2 predicate + METHOD method_50869 (Ljava/util/concurrent/atomic/AtomicInteger;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 3 pos + METHOD method_50871 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 2 pos + METHOD method_50872 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 2 pos + METHOD method_50873 (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_50874 (Lnet/minecraft/class_2680;)Z + ARG 1 state diff --git a/mappings/net/minecraft/block/PickaxeBlock.mapping b/mappings/net/minecraft/block/PickaxeBlock.mapping new file mode 100644 index 0000000000..99d85fc12d --- /dev/null +++ b/mappings/net/minecraft/block/PickaxeBlock.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8430 net/minecraft/block/PickaxeBlock diff --git a/mappings/net/minecraft/block/PlaceBlock.mapping b/mappings/net/minecraft/block/PlaceBlock.mapping new file mode 100644 index 0000000000..c1a8dae318 --- /dev/null +++ b/mappings/net/minecraft/block/PlaceBlock.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_8431 net/minecraft/block/PlaceBlock + METHOD method_50875 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;)Ljava/lang/Boolean; + ARG 3 stack + METHOD method_50876 (Lnet/minecraft/class_1263;Ljava/util/function/Function;I)Z + ARG 2 slot + METHOD method_50877 findInventories (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Ljava/util/List; + ARG 0 world + ARG 1 pos + METHOD method_50878 placeBlock (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/function/Function;)Z + ARG 0 world + ARG 1 pos + ARG 2 side + ARG 3 placer + METHOD method_50879 createSearchBox (Lnet/minecraft/class_2338;)Lnet/minecraft/class_238; + ARG 0 pos + METHOD method_50880 findItemEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1542; + ARG 0 world + ARG 1 pos + METHOD method_50881 insertItem (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;)Z + ARG 0 world + ARG 1 pos + ARG 2 side + ARG 3 stack diff --git a/mappings/net/minecraft/block/WorldModifyingBlock.mapping b/mappings/net/minecraft/block/WorldModifyingBlock.mapping new file mode 100644 index 0000000000..3bbc7d710c --- /dev/null +++ b/mappings/net/minecraft/block/WorldModifyingBlock.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8427 net/minecraft/block/WorldModifyingBlock + FIELD field_44230 FACING Lnet/minecraft/class_2753; + FIELD field_44231 TRIGGERED Lnet/minecraft/class_2746; + FIELD field_44232 TICK_DELAY I + METHOD method_50863 getTickPriority ()Lnet/minecraft/class_1953; diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index 4eebc8764d..3d97501c1b 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -68,6 +68,8 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT A behavior that fills cauldrons with powder snow. COMMENT COMMENT @see #fillCauldron + FIELD field_44440 EMPTY_COPPER_SINK_BEHAVIOR Ljava/util/Map; + FIELD field_44441 FILLED_COPPER_SINK_BEHAVIOR Ljava/util/Map; 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; COMMENT Called when a player interacts with a cauldron. COMMENT @@ -240,3 +242,28 @@ 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_51087 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_2680;)Lnet/minecraft/class_1269; + ARG 0 state + ARG 1 world + ARG 2 pos + ARG 3 player + ARG 4 hand + ARG 5 stack + ARG 6 output + ARG 7 predicate + ARG 8 soundEvent + ARG 9 resultState + METHOD method_51089 (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_51090 (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 diff --git a/mappings/net/minecraft/item/DupeHackItem.mapping b/mappings/net/minecraft/item/DupeHackItem.mapping new file mode 100644 index 0000000000..927f7967b2 --- /dev/null +++ b/mappings/net/minecraft/item/DupeHackItem.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8416 net/minecraft/item/DupeHackItem diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 11648787c7..4039123f04 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -361,6 +361,12 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_43192 PITCHER_PLANT Lnet/minecraft/class_1792; FIELD field_43193 SNIFFER_EGG Lnet/minecraft/class_1792; FIELD field_43194 CALIBRATED_SCULK_SENSOR Lnet/minecraft/class_1792; + FIELD field_44158 COPPER_SPLEAVES Lnet/minecraft/class_1792; + FIELD field_44159 PICKAXE_BLOCK Lnet/minecraft/class_1792; + FIELD field_44160 PLACE_BLOCK Lnet/minecraft/class_1792; + FIELD field_44163 PACKED_AIR Lnet/minecraft/class_1792; + FIELD field_44167 COPPER_SINK Lnet/minecraft/class_1792; + FIELD field_44184 CHEESE Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/item/NbtItem.mapping b/mappings/net/minecraft/item/NbtItem.mapping new file mode 100644 index 0000000000..d7b5d87f2d --- /dev/null +++ b/mappings/net/minecraft/item/NbtItem.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8420 net/minecraft/item/NbtItem + FIELD field_44192 VALUE_KEY Ljava/lang/String; + FIELD field_44193 type Lnet/minecraft/class_4614; + METHOD (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_4614;)V + ARG 1 settings + ARG 2 type + METHOD method_50803 setValue (Lnet/minecraft/class_1799;Lnet/minecraft/class_2520;)V + ARG 1 stack + ARG 2 nbt + METHOD method_50804 getValue (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2520; + ARG 1 stack + METHOD method_50805 getType ()Lnet/minecraft/class_4614; diff --git a/mappings/net/minecraft/item/NbtNameItem.mapping b/mappings/net/minecraft/item/NbtNameItem.mapping new file mode 100644 index 0000000000..d5a2fcc946 --- /dev/null +++ b/mappings/net/minecraft/item/NbtNameItem.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8418 net/minecraft/item/NbtNameItem + FIELD field_44191 VALUE_KEY Ljava/lang/String; + METHOD method_50801 setValue (Lnet/minecraft/class_1799;Ljava/lang/String;)V + ARG 0 stack + ARG 1 value + METHOD method_50802 getValue (Lnet/minecraft/class_1799;)Ljava/lang/String; + ARG 0 stack diff --git a/mappings/net/minecraft/item/PlaceBlockItemPlacementContext.mapping b/mappings/net/minecraft/item/PlaceBlockItemPlacementContext.mapping new file mode 100644 index 0000000000..e85445a357 --- /dev/null +++ b/mappings/net/minecraft/item/PlaceBlockItemPlacementContext.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8421 net/minecraft/item/PlaceBlockItemPlacementContext + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_3965;)V + ARG 1 world + ARG 2 hand + ARG 3 stack + ARG 4 hitResult + METHOD method_50806 of (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;)Lnet/minecraft/class_8421; + ARG 0 world + ARG 1 pos + ARG 2 direction + ARG 3 stack diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 4cbcb189cc..1b5aabc593 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -231,6 +231,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 entity ARG 2 damageSource METHOD method_48963 getDamageSources ()Lnet/minecraft/class_8109; + METHOD method_50837 isMoon ()Z METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState