fix: add raw tin/silver to raw_materials tag

MrTJP · Mar 23, 2024 · 911ada0 · 911ada0
1 parent ee1606a
commit 911ada0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreTags.java b/core/src/main/java/mrtjp/projectred/core/init/CoreTags.java
@@ -17,6 +17,9 @@ public class CoreTags {
     public static final TagKey<Item> RED_ALLOY_INGOT_TAG = ItemTags.create(new ResourceLocation("forge:ingots/red_alloy"));
     public static final TagKey<Item> ELECTROTINE_ALLOY_INGOT_TAG = ItemTags.create(new ResourceLocation("forge:ingots/electrotine_alloy"));
 
+    public static final TagKey<Item> RAW_TIN_TAG = ItemTags.create(new ResourceLocation("forge:raw_materials/tin"));
+    public static final TagKey<Item> RAW_SILVER_TAG = ItemTags.create(new ResourceLocation("forge:raw_materials/silver"));
+
     public static final TagKey<Item> RUBY_GEM_TAG = ItemTags.create(new ResourceLocation("forge:gems/ruby"));
     public static final TagKey<Item> SAPPHIRE_GEM_TAG = ItemTags.create(new ResourceLocation("forge:gems/sapphire"));
     public static final TagKey<Item> PERIDOT_GEM_TAG = ItemTags.create(new ResourceLocation("forge:gems/peridot"));

diff --git a/exploration/src/main/generated/data/forge/tags/items/raw_materials.json b/exploration/src/main/generated/data/forge/tags/items/raw_materials.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#forge:raw_materials/tin",
+    "#forge:raw_materials/silver"
+  ]
+}
diff --git a/exploration/src/main/generated/data/forge/tags/items/raw_materials/silver.json b/exploration/src/main/generated/data/forge/tags/items/raw_materials/silver.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "projectred_exploration:raw_silver"
+  ]
+}
diff --git a/exploration/src/main/generated/data/forge/tags/items/raw_materials/tin.json b/exploration/src/main/generated/data/forge/tags/items/raw_materials/tin.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "projectred_exploration:raw_tin"
+  ]
+}
diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java
@@ -8,8 +8,7 @@
 
 import javax.annotation.Nullable;
 
-import static mrtjp.projectred.core.init.CoreTags.SILVER_INGOT_TAG;
-import static mrtjp.projectred.core.init.CoreTags.TIN_INGOT_TAG;
+import static mrtjp.projectred.core.init.CoreTags.*;
 import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID;
 import static mrtjp.projectred.exploration.init.ExplorationBlocks.*;
 import static mrtjp.projectred.exploration.init.ExplorationItems.*;
@@ -31,6 +30,11 @@ protected void addTags() {
                 .addTag(TIN_INGOT_TAG)
                 .addTag(SILVER_INGOT_TAG);
 
+        tag(Tags.Items.RAW_MATERIALS)
+                //Note: Defined in Core
+                .addTag(RAW_TIN_TAG)
+                .addTag(RAW_SILVER_TAG);
+
         tag(Tags.Items.ORES)
                 .addTag(RUBY_ORES_BLOCK_ITEM_TAG)
                 .addTag(SAPPHIRE_ORES_BLOCK_ITEM_TAG)
@@ -75,6 +79,8 @@ protected void addTags() {
         //Note: Defined in Core
         tag(TIN_INGOT_TAG).add(TIN_INGOT_ITEM.get());
         tag(SILVER_INGOT_TAG).add(SILVER_INGOT_ITEM.get());
+        tag(RAW_TIN_TAG).add(RAW_TIN_ITEM.get());
+        tag(RAW_SILVER_TAG).add(RAW_SILVER_ITEM.get());
 
         tag(RUBY_ORES_BLOCK_ITEM_TAG).add(RUBY_ORE_BLOCK.get().asItem()).add(DEEPSLATE_RUBY_ORE_BLOCK.get().asItem());
         tag(SAPPHIRE_ORES_BLOCK_ITEM_TAG).add(SAPPHIRE_ORE_BLOCK.get().asItem()).add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get().asItem());