Fix plank recipes

Glitchfiend · Apr 29, 2024 · 4bb2d13 · 4bb2d13
1 parent 5d69f94
commit 4bb2d13
Show file tree

Hide file tree

Showing 30 changed files with 95 additions and 93 deletions.
diff --git a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
diff --git a/...erated/resources/data/biomesoplenty/advancements/recipes/building_blocks/dead_planks.json b/...erated/resources/data/biomesoplenty/advancements/recipes/building_blocks/dead_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:dead_log"
-            ]
+            "tag": "biomesoplenty:dead_logs"
           }
         ]
       },

diff --git a/...ed/resources/data/biomesoplenty/advancements/recipes/building_blocks/empyreal_planks.json b/...ed/resources/data/biomesoplenty/advancements/recipes/building_blocks/empyreal_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:empyreal_log"
-            ]
+            "tag": "biomesoplenty:empyreal_logs"
           }
         ]
       },

diff --git a/...nerated/resources/data/biomesoplenty/advancements/recipes/building_blocks/fir_planks.json b/...nerated/resources/data/biomesoplenty/advancements/recipes/building_blocks/fir_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:fir_log"
-            ]
+            "tag": "biomesoplenty:fir_logs"
           }
         ]
       },

diff --git a/...ed/resources/data/biomesoplenty/advancements/recipes/building_blocks/hellbark_planks.json b/...ed/resources/data/biomesoplenty/advancements/recipes/building_blocks/hellbark_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:hellbark_log"
-            ]
+            "tag": "biomesoplenty:hellbark_logs"
           }
         ]
       },

diff --git a/...d/resources/data/biomesoplenty/advancements/recipes/building_blocks/jacaranda_planks.json b/...d/resources/data/biomesoplenty/advancements/recipes/building_blocks/jacaranda_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:jacaranda_log"
-            ]
+            "tag": "biomesoplenty:jacaranda_logs"
           }
         ]
       },

diff --git a/...rated/resources/data/biomesoplenty/advancements/recipes/building_blocks/magic_planks.json b/...rated/resources/data/biomesoplenty/advancements/recipes/building_blocks/magic_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:magic_log"
-            ]
+            "tag": "biomesoplenty:magic_logs"
           }
         ]
       },

diff --git a/...ed/resources/data/biomesoplenty/advancements/recipes/building_blocks/mahogany_planks.json b/...ed/resources/data/biomesoplenty/advancements/recipes/building_blocks/mahogany_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:mahogany_log"
-            ]
+            "tag": "biomesoplenty:mahogany_logs"
           }
         ]
       },

diff --git a/...rated/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_planks.json b/...rated/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:maple_log"
-            ]
+            "tag": "biomesoplenty:maple_logs"
           }
         ]
       },

diff --git a/...erated/resources/data/biomesoplenty/advancements/recipes/building_blocks/palm_planks.json b/...erated/resources/data/biomesoplenty/advancements/recipes/building_blocks/palm_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:palm_log"
-            ]
+            "tag": "biomesoplenty:palm_logs"
           }
         ]
       },

diff --git a/...erated/resources/data/biomesoplenty/advancements/recipes/building_blocks/pine_planks.json b/...erated/resources/data/biomesoplenty/advancements/recipes/building_blocks/pine_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:pine_log"
-            ]
+            "tag": "biomesoplenty:pine_logs"
           }
         ]
       },

diff --git a/...ted/resources/data/biomesoplenty/advancements/recipes/building_blocks/redwood_planks.json b/...ted/resources/data/biomesoplenty/advancements/recipes/building_blocks/redwood_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:redwood_log"
-            ]
+            "tag": "biomesoplenty:redwood_logs"
           }
         ]
       },

diff --git a/...ated/resources/data/biomesoplenty/advancements/recipes/building_blocks/umbran_planks.json b/...ated/resources/data/biomesoplenty/advancements/recipes/building_blocks/umbran_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:umbran_log"
-            ]
+            "tag": "biomesoplenty:umbran_logs"
           }
         ]
       },

diff --git a/...ated/resources/data/biomesoplenty/advancements/recipes/building_blocks/willow_planks.json b/...ated/resources/data/biomesoplenty/advancements/recipes/building_blocks/willow_planks.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "biomesoplenty:willow_log"
-            ]
+            "tag": "biomesoplenty:willow_logs"
           }
         ]
       },

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/dead_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/dead_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:dead_log"
+      "tag": "biomesoplenty:dead_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/empyreal_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/empyreal_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:empyreal_log"
+      "tag": "biomesoplenty:empyreal_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/fir_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/fir_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:fir_log"
+      "tag": "biomesoplenty:fir_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/hellbark_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/hellbark_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:hellbark_log"
+      "tag": "biomesoplenty:hellbark_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/jacaranda_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/jacaranda_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:jacaranda_log"
+      "tag": "biomesoplenty:jacaranda_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/magic_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/magic_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:magic_log"
+      "tag": "biomesoplenty:magic_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/mahogany_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/mahogany_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:mahogany_log"
+      "tag": "biomesoplenty:mahogany_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/maple_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/maple_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:maple_log"
+      "tag": "biomesoplenty:maple_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/palm_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/palm_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:palm_log"
+      "tag": "biomesoplenty:palm_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/pine_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/pine_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:pine_log"
+      "tag": "biomesoplenty:pine_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/redwood_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/redwood_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:redwood_log"
+      "tag": "biomesoplenty:redwood_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/umbran_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/umbran_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:umbran_log"
+      "tag": "biomesoplenty:umbran_logs"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/biomesoplenty/recipes/willow_planks.json b/common/src/generated/resources/data/biomesoplenty/recipes/willow_planks.json
@@ -4,7 +4,7 @@
   "group": "planks",
   "ingredients": [
     {
-      "item": "biomesoplenty:willow_log"
+      "tag": "biomesoplenty:willow_logs"
     }
   ],
   "result": {

diff --git a/common/src/main/java/biomesoplenty/init/ModTags.java b/common/src/main/java/biomesoplenty/init/ModTags.java
@@ -25,6 +25,20 @@ public static class Blocks
     {
         private static void setup() {}
 
+        public static final TagKey<Block> FIR_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "fir_logs"));
+        public static final TagKey<Block> PINE_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "pine_logs"));
+        public static final TagKey<Block> MAPLE_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "maple_logs"));
+        public static final TagKey<Block> REDWOOD_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "redwood_logs"));
+        public static final TagKey<Block> MAHOGANY_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "mahogany_logs"));
+        public static final TagKey<Block> JACARANDA_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "jacaranda_logs"));
+        public static final TagKey<Block> PALM_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "palm_logs"));
+        public static final TagKey<Block> WILLOW_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "willow_logs"));
+        public static final TagKey<Block> DEAD_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "dead_logs"));
+        public static final TagKey<Block> MAGIC_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "magic_logs"));
+        public static final TagKey<Block> UMBRAN_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "umbran_logs"));
+        public static final TagKey<Block> HELLBARK_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "hellbark_logs"));
+        public static final TagKey<Block> EMPYREAL_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "empyreal_logs"));
+
         public static final TagKey<Block> BLACKSTONE_DECORATION_PLACEABLE = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "blackstone_decoration_placeable"));
         public static final TagKey<Block> BRIMSTONE_DECORATION_PLACEABLE = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "brimstone_decoration_placeable"));
         public static final TagKey<Block> DEAD_CORALS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "dead_corals"));
@@ -46,6 +60,20 @@ public static class Items
     {
         private static void setup() {}
 
+        public static final TagKey<Item> FIR_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "fir_logs"));
+        public static final TagKey<Item> PINE_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "pine_logs"));
+        public static final TagKey<Item> MAPLE_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "maple_logs"));
+        public static final TagKey<Item> REDWOOD_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "redwood_logs"));
+        public static final TagKey<Item> MAHOGANY_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "mahogany_logs"));
+        public static final TagKey<Item> JACARANDA_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "jacaranda_logs"));
+        public static final TagKey<Item> PALM_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "palm_logs"));
+        public static final TagKey<Item> WILLOW_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "willow_logs"));
+        public static final TagKey<Item> DEAD_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "dead_logs"));
+        public static final TagKey<Item> MAGIC_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "magic_logs"));
+        public static final TagKey<Item> UMBRAN_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "umbran_logs"));
+        public static final TagKey<Item> HELLBARK_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "hellbark_logs"));
+        public static final TagKey<Item> EMPYREAL_LOGS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "empyreal_logs"));
+
         public static final TagKey<Item> SHEARS = create(new ResourceLocation(BiomesOPlenty.MOD_ID, "shears"));
 
         public static TagKey<Item> create(ResourceLocation name)

diff --git a/forge/src/main/java/biomesoplenty/forge/datagen/BOPBlockLoot.java b/forge/src/main/java/biomesoplenty/forge/datagen/BOPBlockLoot.java
@@ -94,7 +94,6 @@ protected void generate()
         // Flesh Blocks
         this.dropSelf(BOPBlocks.FLESH);
         this.dropSelf(BOPBlocks.POROUS_FLESH);
-
         this.addStrandPlantDropTable(BOPBlocks.FLESH_TENDONS, BOPBlocks.FLESH_TENDONS_STRAND);
         this.add(BOPBlocks.EYEBULB, (p_250741_) -> { return this.createSinglePropConditionTable(p_250741_, DoublePlantBlock.HALF, DoubleBlockHalf.LOWER); });
         this.add(BOPBlocks.HAIR, (p_251652_) -> { return createShearsOnlyDrop(p_251652_); });

diff --git a/forge/src/main/java/biomesoplenty/forge/datagen/provider/BOPRecipeProvider.java b/forge/src/main/java/biomesoplenty/forge/datagen/provider/BOPRecipeProvider.java
@@ -8,6 +8,7 @@
 import biomesoplenty.api.item.BOPItems;
 import biomesoplenty.core.BiomesOPlenty;
 import biomesoplenty.forge.datagen.BOPBlockFamilies;
+import biomesoplenty.init.ModTags;
 import net.minecraft.data.BlockFamily;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.*;
@@ -33,19 +34,19 @@ protected void buildRecipes(RecipeOutput output)
         generateForEnabledBlockFamilies(output, FeatureFlagSet.of(FeatureFlags.VANILLA));
 
         // Planks from Logs
-        planksFromLogs(output, BOPBlocks.FIR_PLANKS, BOPBlocks.FIR_LOG, 4);
-        planksFromLogs(output, BOPBlocks.PINE_PLANKS, BOPBlocks.PINE_LOG, 4);
-        planksFromLogs(output, BOPBlocks.MAPLE_PLANKS, BOPBlocks.MAPLE_LOG, 4);
-        planksFromLogs(output, BOPBlocks.REDWOOD_PLANKS, BOPBlocks.REDWOOD_LOG, 4);
-        planksFromLogs(output, BOPBlocks.MAHOGANY_PLANKS, BOPBlocks.MAHOGANY_LOG, 4);
-        planksFromLogs(output, BOPBlocks.JACARANDA_PLANKS, BOPBlocks.JACARANDA_LOG, 4);
-        planksFromLogs(output, BOPBlocks.PALM_PLANKS, BOPBlocks.PALM_LOG, 4);
-        planksFromLogs(output, BOPBlocks.WILLOW_PLANKS, BOPBlocks.WILLOW_LOG, 4);
-        planksFromLogs(output, BOPBlocks.DEAD_PLANKS, BOPBlocks.DEAD_LOG, 4);
-        planksFromLogs(output, BOPBlocks.MAGIC_PLANKS, BOPBlocks.MAGIC_LOG, 4);
-        planksFromLogs(output, BOPBlocks.UMBRAN_PLANKS, BOPBlocks.UMBRAN_LOG, 4);
-        planksFromLogs(output, BOPBlocks.HELLBARK_PLANKS, BOPBlocks.HELLBARK_LOG, 4);
-        planksFromLogs(output, BOPBlocks.EMPYREAL_PLANKS, BOPBlocks.EMPYREAL_LOG, 4);
+        planksFromLogs(output, BOPBlocks.FIR_PLANKS, ModTags.Items.FIR_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.PINE_PLANKS, ModTags.Items.PINE_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.MAPLE_PLANKS, ModTags.Items.MAPLE_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.REDWOOD_PLANKS, ModTags.Items.REDWOOD_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.MAHOGANY_PLANKS, ModTags.Items.MAHOGANY_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.JACARANDA_PLANKS, ModTags.Items.JACARANDA_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.PALM_PLANKS, ModTags.Items.PALM_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.WILLOW_PLANKS, ModTags.Items.WILLOW_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.DEAD_PLANKS, ModTags.Items.DEAD_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.MAGIC_PLANKS, ModTags.Items.MAGIC_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.UMBRAN_PLANKS, ModTags.Items.UMBRAN_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.HELLBARK_PLANKS, ModTags.Items.HELLBARK_LOGS, 4);
+        planksFromLogs(output, BOPBlocks.EMPYREAL_PLANKS, ModTags.Items.EMPYREAL_LOGS, 4);
 
         // Wood from Logs
         woodFromLogs(output, BOPBlocks.FIR_WOOD, BOPBlocks.FIR_LOG);