From 9feccd65cba4a3b6bd33ff8431246b0991676a9e Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Mon, 1 Apr 2024 15:31:32 +0300 Subject: [PATCH] Map some simple blocks and most of the potato refinery (#3829) --- .../net/minecraft/block/AbstractBlock.mapping | 2 + .../net/minecraft/block/BigBrainBlock.mapping | 7 +++ mappings/net/minecraft/block/Blocks.mapping | 1 + .../block/CorruptedPotatoPeelsBlock.mapping | 4 ++ .../net/minecraft/block/PotatoBattery.mapping | 4 ++ .../minecraft/block/PotatoPeelsBlock.mapping | 10 ++++ .../block/PotatoRefineryBlock.mapping | 12 +++++ .../block/entity/BigBrainBlockEntity.mapping | 17 ++++++ .../entity/PotatoRefineryBlockEntity.mapping | 54 +++++++++++++++++++ .../entity/damage/DamageSources.mapping | 4 ++ .../entity/damage/DamageTypes.mapping | 2 + .../recipe/PotatoRefinementRecipe.mapping | 31 +++++++++++ 12 files changed, 148 insertions(+) create mode 100644 mappings/net/minecraft/block/BigBrainBlock.mapping create mode 100644 mappings/net/minecraft/block/CorruptedPotatoPeelsBlock.mapping create mode 100644 mappings/net/minecraft/block/PotatoBattery.mapping create mode 100644 mappings/net/minecraft/block/PotatoPeelsBlock.mapping create mode 100644 mappings/net/minecraft/block/PotatoRefineryBlock.mapping create mode 100644 mappings/net/minecraft/block/entity/BigBrainBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/entity/PotatoRefineryBlockEntity.mapping create mode 100644 mappings/net/minecraft/recipe/PotatoRefinementRecipe.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 85a1820e6c..ac4dc0d1c1 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -267,6 +267,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT The set of {@link net.minecraft.resource.featuretoggle.FeatureFlag FeatureFlags} that are required for this block to work correctly. COMMENT COMMENT @see net.minecraft.resource.featuretoggle.FeatureFlags + METHOD (Lnet/minecraft/class_4970$class_2251;)V + ARG 1 settings METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; COMMENT {@return the screen handler factory or {@code null} if screen handler cannot be created} COMMENT diff --git a/mappings/net/minecraft/block/BigBrainBlock.mapping b/mappings/net/minecraft/block/BigBrainBlock.mapping new file mode 100644 index 0000000000..64a02f6fb9 --- /dev/null +++ b/mappings/net/minecraft/block/BigBrainBlock.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9551 net/minecraft/block/BigBrainBlock + FIELD field_50754 FACING Lnet/minecraft/class_2753; + FIELD field_50755 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_50756 XP_PACKET_SIZE I + FIELD field_50757 SHAPE Lnet/minecraft/class_265; + METHOD method_59109 (Lnet/minecraft/class_1303;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_9571;)V + ARG 3 blockEntity diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 269d1bcede..4692aaf703 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks FIELD field_46286 PUMPKIN_STEM Lnet/minecraft/class_2248; FIELD field_46287 MELON_STEM Lnet/minecraft/class_2248; FIELD field_46288 SHULKER_BOX_SUFFOCATES_PREDICATE Lnet/minecraft/class_4970$class_4973; + FIELD field_50829 POTATO_PEEL_BLOCKS Ljava/util/Map; METHOD method_24419 (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_26104 (Lnet/minecraft/class_2680;)I diff --git a/mappings/net/minecraft/block/CorruptedPotatoPeelsBlock.mapping b/mappings/net/minecraft/block/CorruptedPotatoPeelsBlock.mapping new file mode 100644 index 0000000000..76ee355f3c --- /dev/null +++ b/mappings/net/minecraft/block/CorruptedPotatoPeelsBlock.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9552 net/minecraft/block/CorruptedPotatoPeelsBlock + FIELD field_50839 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_59124 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/block/PotatoBattery.mapping b/mappings/net/minecraft/block/PotatoBattery.mapping new file mode 100644 index 0000000000..89f1e420be --- /dev/null +++ b/mappings/net/minecraft/block/PotatoBattery.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9559 net/minecraft/block/PotatoBattery + FIELD field_50863 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_50864 INVERTED Lnet/minecraft/class_2746; + FIELD field_50865 SHAPE Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/PotatoPeelsBlock.mapping b/mappings/net/minecraft/block/PotatoPeelsBlock.mapping new file mode 100644 index 0000000000..afb5a0d445 --- /dev/null +++ b/mappings/net/minecraft/block/PotatoPeelsBlock.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_9560 net/minecraft/block/PotatoPeelsBlock + FIELD field_50867 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_50868 color Lnet/minecraft/class_1767; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_1767;)V + ARG 1 settings + ARG 2 color + METHOD method_59138 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_59140 getColor ()Lnet/minecraft/class_1767; + METHOD method_59141 getItem ()Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/block/PotatoRefineryBlock.mapping b/mappings/net/minecraft/block/PotatoRefineryBlock.mapping new file mode 100644 index 0000000000..6b80a28eb8 --- /dev/null +++ b/mappings/net/minecraft/block/PotatoRefineryBlock.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_9562 net/minecraft/block/PotatoRefineryBlock + FIELD field_50871 FACING Lnet/minecraft/class_2753; + FIELD field_50872 LIT Lnet/minecraft/class_2746; + FIELD field_50873 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_59142 getFurnaceTicker (Lnet/minecraft/class_1937;Lnet/minecraft/class_2591;Lnet/minecraft/class_2591;)Lnet/minecraft/class_5558; + ARG 0 world + ARG 1 type + ARG 2 furnaceType + METHOD method_59143 activate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V + ARG 1 world + ARG 2 pos + ARG 3 player diff --git a/mappings/net/minecraft/block/entity/BigBrainBlockEntity.mapping b/mappings/net/minecraft/block/entity/BigBrainBlockEntity.mapping new file mode 100644 index 0000000000..36a253bab8 --- /dev/null +++ b/mappings/net/minecraft/block/entity/BigBrainBlockEntity.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_9571 net/minecraft/block/entity/BigBrainBlockEntity + FIELD field_50903 AMOUNT_KEY Ljava/lang/String; + FIELD field_50905 DEFAULT_DELAY I + FIELD field_50906 DELAY_KEY Ljava/lang/String; + FIELD field_50907 delay I + FIELD field_50908 amount I + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_59162 setAmount (I)V + ARG 1 amount + METHOD method_59164 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9571;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 blockEntity + METHOD method_59165 getAmount ()I diff --git a/mappings/net/minecraft/block/entity/PotatoRefineryBlockEntity.mapping b/mappings/net/minecraft/block/entity/PotatoRefineryBlockEntity.mapping new file mode 100644 index 0000000000..65d56606c0 --- /dev/null +++ b/mappings/net/minecraft/block/entity/PotatoRefineryBlockEntity.mapping @@ -0,0 +1,54 @@ +CLASS net/minecraft/class_9578 net/minecraft/block/entity/PotatoRefineryBlockEntity + FIELD field_50961 recipeMapper Lnet/minecraft/class_8105; + FIELD field_50973 inventory Lnet/minecraft/class_2371; + FIELD field_50974 propertyDelegate Lnet/minecraft/class_3913; + FIELD field_50975 TOP_SLOTS [I + FIELD field_50976 BOTTOM_SLOTS [I + FIELD field_50977 SIDE_SLOTS [I + FIELD field_50978 burnTime I + FIELD field_50979 fuelTime I + FIELD field_50980 cookTime I + FIELD field_50981 cookTimeTotal I + FIELD field_50982 recipesUsed Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; + FIELD field_50983 storedExperience F + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_59195 (Lnet/minecraft/class_1863$class_7266;Lnet/minecraft/class_9578$class_9581;)Lnet/minecraft/class_9578$class_9582; + ARG 2 context + METHOD method_59196 getRefinementTime (Lnet/minecraft/class_1937;Lnet/minecraft/class_9578;)I + ARG 0 world + ARG 1 blockEntity + METHOD method_59197 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9578;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 blockEntity + METHOD method_59198 canCraft (Lnet/minecraft/class_5455;Lnet/minecraft/class_9578$class_9582;Lnet/minecraft/class_2371;I)Z + ARG 0 registryManager + ARG 1 recipe + ARG 2 inventory + METHOD method_59199 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;Ljava/lang/Integer;)V + ARG 1 recipe + ARG 2 count + METHOD method_59200 getFuelTime (Lnet/minecraft/class_1799;)I + ARG 1 stack + METHOD method_59201 getRecipe (Lnet/minecraft/class_1937;)Lnet/minecraft/class_9578$class_9582; + ARG 1 world + METHOD method_59202 tryCraft (Lnet/minecraft/class_5455;Lnet/minecraft/class_9578$class_9582;Lnet/minecraft/class_2371;I)Z + ARG 0 registryManager + ARG 1 recipe + ARG 2 inventory + METHOD method_59203 isFuel (Lnet/minecraft/class_1799;)Z + ARG 0 stack + METHOD method_59204 createFuelTimeMap ()Ljava/util/Map; + METHOD method_59205 clearStoredExperience ()F + METHOD method_59206 isActive ()Z + METHOD method_59207 hasItems ()Z + CLASS class_9579 LubricationRecipe + CLASS class_9580 JsonRecipe + CLASS class_9581 RecipeContext + CLASS class_9582 Recipe + METHOD method_59208 getRefinementTIme ()I + METHOD method_59209 craft (Lnet/minecraft/class_5455;)Lnet/minecraft/class_1799; + ARG 1 registryManager diff --git a/mappings/net/minecraft/entity/damage/DamageSources.mapping b/mappings/net/minecraft/entity/damage/DamageSources.mapping index d9c7e7d495..ac0feba012 100644 --- a/mappings/net/minecraft/entity/damage/DamageSources.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSources.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_8109 net/minecraft/entity/damage/DamageSources FIELD field_42317 stalagmite Lnet/minecraft/class_1282; FIELD field_44866 outsideBorder Lnet/minecraft/class_1282; FIELD field_44867 genericKill Lnet/minecraft/class_1282; + FIELD field_50380 potatoHeat Lnet/minecraft/class_1282; + FIELD field_50381 potatoMagic Lnet/minecraft/class_1282; METHOD (Lnet/minecraft/class_5455;)V ARG 1 registryManager METHOD method_48794 inFire ()Lnet/minecraft/class_1282; @@ -112,3 +114,5 @@ CLASS net/minecraft/class_8109 net/minecraft/entity/damage/DamageSources METHOD method_55648 windCharge (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; ARG 1 source ARG 2 attacker + METHOD method_58821 potatoHeat ()Lnet/minecraft/class_1282; + METHOD method_58822 potatoMagic ()Lnet/minecraft/class_1282; diff --git a/mappings/net/minecraft/entity/damage/DamageTypes.mapping b/mappings/net/minecraft/entity/damage/DamageTypes.mapping index 1aa5f727ee..842812b0ba 100644 --- a/mappings/net/minecraft/entity/damage/DamageTypes.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTypes.mapping @@ -45,5 +45,7 @@ CLASS net/minecraft/class_8111 net/minecraft/entity/damage/DamageTypes FIELD field_44869 GENERIC_KILL Lnet/minecraft/class_5321; FIELD field_47736 SPIT Lnet/minecraft/class_5321; FIELD field_47737 WIND_CHARGE Lnet/minecraft/class_5321; + FIELD field_50382 POTATO_MAGIC Lnet/minecraft/class_5321; + FIELD field_50383 POTATO_HEAT Lnet/minecraft/class_5321; METHOD method_48839 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 damageTypeRegisterable diff --git a/mappings/net/minecraft/recipe/PotatoRefinementRecipe.mapping b/mappings/net/minecraft/recipe/PotatoRefinementRecipe.mapping new file mode 100644 index 0000000000..6b2b7d9ce7 --- /dev/null +++ b/mappings/net/minecraft/recipe/PotatoRefinementRecipe.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_9542 net/minecraft/recipe/PotatoRefinementRecipe + FIELD field_50718 refinementTime I + FIELD field_50719 TYPE Lnet/minecraft/class_3956; + FIELD field_50721 category Lnet/minecraft/class_7709; + FIELD field_50722 ingredient Lnet/minecraft/class_1856; + FIELD field_50723 bottleIngredient Lnet/minecraft/class_1856; + FIELD field_50724 result Lnet/minecraft/class_1799; + FIELD field_50725 experience F + METHOD (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V + ARG 2 category + ARG 3 ingredient + ARG 4 bottleIngredient + ARG 5 result + ARG 6 experience + ARG 7 refinementTime + METHOD (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V + ARG 1 ingredient + ARG 2 bottleIngredient + ARG 3 result + ARG 4 experience + ARG 5 refinementTime + METHOD method_59069 getRefinementTime ()I + CLASS class_9543 Serializer + FIELD field_50726 CODEC Lcom/mojang/serialization/Codec; + FIELD field_50727 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_59070 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_59072 fromPacket (Lnet/minecraft/class_9129;)Lnet/minecraft/class_9542; + ARG 0 buf + METHOD method_59073 toPacket (Lnet/minecraft/class_9129;Lnet/minecraft/class_9542;)V + ARG 1 buf