feat: add deepslate ores

core/src/main/generated/assets/projectred_core/lang/en_us.json

@@ -9,7 +9,6 @@
   "item.projectred_core.cathode": "Cathode",
   "item.projectred_core.conductive_plate": "Conductive Plate",
   "item.projectred_core.copper_coil": "Copper Coil",
-  "item.projectred_core.copper_ingot": "Copper Ingot",
   "item.projectred_core.cyan_illumar": "Cyan Illumar",
   "item.projectred_core.draw_plate": "Draw Plate",
   "item.projectred_core.electrotine_dust": "Electrotine Dust",
@@ -49,8 +48,6 @@
   "item.projectred_core.screwdriver": "Screwdriver",
   "item.projectred_core.silicon": "Silicon",
   "item.projectred_core.silicon_chip": "Silicon Chip",
-  "item.projectred_core.silver_ingot": "Silver Ingot",
-  "item.projectred_core.tin_ingot": "Tin Ingot",
   "item.projectred_core.white_illumar": "White Illumar",
   "item.projectred_core.wired_plate": "Wired Plate",
   "item.projectred_core.woven_cloth": "Woven Cloth",

core/src/main/generated/data/forge/tags/items/ingots.json

@@ -1,9 +1,6 @@
 {
   "replace": false,
   "values": [
-    "#forge:ingots/copper",
-    "#forge:ingots/tin",
-    "#forge:ingots/silver",
     "#forge:ingots/red_alloy",
     "#forge:ingots/electrotine_alloy"
   ]

core/src/main/java/mrtjp/projectred/core/Configurator.java

@@ -32,8 +32,6 @@ public class Configurator {
     public static int gen_SapphireVeinSize = 8;
     public static boolean gen_Peridot = true;
     public static int gen_PeridotVeinSize = 10;
-    public static boolean gen_Copper = true;
-    public static int gen_CopperVeinSize = 8;
     public static boolean gen_Tin = true;
     public static int gen_TinVeinSize = 8;
     public static boolean gen_Silver = true;
@@ -78,8 +76,6 @@ private static void loadValues(ConfigCategory config) {
         gen_SapphireVeinSize    = gen.getValue("sapphire_ore_vein_size").setDefaultInt(gen_SapphireVeinSize).setComment("Sapphire Ore vein size").getInt();
         gen_Peridot             = gen.getValue("peridot_ore").setDefaultBoolean(gen_Peridot).setComment("Enable Peridot Ore generation").getBoolean();
         gen_PeridotVeinSize     = gen.getValue("peridot_ore_vein_size").setDefaultInt(gen_PeridotVeinSize).setComment("Peridot Ore vein size").getInt();
-        gen_Copper              = gen.getValue("copper_ore").setDefaultBoolean(gen_Copper).setComment("Enable Copper Ore generation").getBoolean();
-        gen_CopperVeinSize      = gen.getValue("copper_ore_vein_size").setDefaultInt(gen_CopperVeinSize).setComment("Copper Ore vein size").getInt();
         gen_Tin                 = gen.getValue("tin_ore").setDefaultBoolean(gen_Tin).setComment("Enable Tin Ore generation").getBoolean();
         gen_TinVeinSize         = gen.getValue("tin_ore_vein_size").setDefaultInt(gen_TinVeinSize).setComment("Tin Ore vein size").getInt();
         gen_Silver              = gen.getValue("silver_ore").setDefaultBoolean(gen_Silver).setComment("Enable Silver Ore generation").getBoolean();
@@ -122,8 +118,6 @@ private static void loadAndDeleteLegacyValues(ConfigCategory config) {
         gen_SapphireVeinSize    = gen.getValue("Sapphire Ore vein size").setDefaultInt(gen_SapphireVeinSize).getInt();
         gen_Peridot             = gen.getValue("Peridot Ore").setDefaultBoolean(gen_Peridot).getBoolean();
         gen_PeridotVeinSize     = gen.getValue("Peridot Ore vein size").setDefaultInt(gen_PeridotVeinSize).getInt();
-        gen_Copper              = gen.getValue("Copper Ore").setDefaultBoolean(gen_Copper).getBoolean();
-        gen_CopperVeinSize      = gen.getValue("Copper Ore vein size").setDefaultInt(gen_CopperVeinSize).getInt();
         gen_Tin                 = gen.getValue("Tin Ore").setDefaultBoolean(gen_Tin).getBoolean();
         gen_TinVeinSize         = gen.getValue("Tin Ore vein size").setDefaultInt(gen_TinVeinSize).getInt();
         gen_Silver              = gen.getValue("Silver Ore").setDefaultBoolean(gen_Silver).getBoolean();

core/src/main/java/mrtjp/projectred/core/data/CoreItemModelProvider.java

@@ -32,9 +32,6 @@ protected void registerModels() {
         generated(POINTER_ITEM);
         generated(SILICON_CHIP_ITEM);
         generated(ENERGIZED_SILICON_CHIP_ITEM);
-        generated(COPPER_INGOT_ITEM);
-        generated(TIN_INGOT_ITEM);
-        generated(SILVER_INGOT_ITEM);
         generated(RED_ALLOY_INGOT_ITEM);
         generated(ELECTROTINE_ALLOY_INGOT_ITEM);
         generated(ELECTROTINE_DUST_ITEM);

core/src/main/java/mrtjp/projectred/core/data/CoreItemTagsProvider.java

@@ -27,9 +27,6 @@ public String getName() {
     protected void addTags() {
 
         tag(Tags.Items.INGOTS)
-                .addTag(COPPER_INGOT_TAG)
-                .addTag(TIN_INGOT_TAG)
-                .addTag(SILVER_INGOT_TAG)
                 .addTag(RED_ALLOY_INGOT_TAG)
                 .addTag(ELECTROTINE_ALLOY_INGOT_TAG);
 
@@ -41,9 +38,6 @@ protected void addTags() {
         tag(Tags.Items.DUSTS)
                 .addTag(ELECTROTINE_DUST_TAG);
 
-        tag(COPPER_INGOT_TAG).add(COPPER_INGOT_ITEM);
-        tag(TIN_INGOT_TAG).add(TIN_INGOT_ITEM);
-        tag(SILVER_INGOT_TAG).add(SILVER_INGOT_ITEM);
         tag(RED_ALLOY_INGOT_TAG).add(RED_ALLOY_INGOT_ITEM);
         tag(ELECTROTINE_ALLOY_INGOT_TAG).add(ELECTROTINE_ALLOY_INGOT_ITEM);
         tag(RUBY_GEM_TAG).add(RUBY_ITEM);

core/src/main/java/mrtjp/projectred/core/data/CoreLanguageProvider.java

@@ -37,9 +37,6 @@ protected void addTranslations() {
         add(POINTER_ITEM, "Pointer");
         add(SILICON_CHIP_ITEM, "Silicon Chip");
         add(ENERGIZED_SILICON_CHIP_ITEM, "Energized Silicon Chip");
-        add(COPPER_INGOT_ITEM, "Copper Ingot");
-        add(TIN_INGOT_ITEM, "Tin Ingot");
-        add(SILVER_INGOT_ITEM, "Silver Ingot");
         add(RED_ALLOY_INGOT_ITEM, "Red Alloy Ingot");
         add(ELECTROTINE_ALLOY_INGOT_ITEM, "Electrotine Alloy Ingot");
         add(ELECTROTINE_DUST_ITEM, "Electrotine Dust");

core/src/main/java/mrtjp/projectred/core/data/CoreRecipeProvider.java

@@ -177,7 +177,7 @@ protected void registerRecipes() {
                 .patternLine("EEE");
 
         shapedRecipe(COPPER_COIL_ITEM)
-                .key('C', COPPER_INGOT_TAG)
+                .key('C', INGOTS_COPPER)
                 .key('D', DRAW_PLATE_ITEM)
                 .patternLine("CD");
 

core/src/main/java/mrtjp/projectred/core/init/CoreItems.java

@@ -22,9 +22,6 @@ public class CoreItems {
     public static final String ID_POINTER = "pointer";
     public static final String ID_SILICON_CHIP = "silicon_chip";
     public static final String ID_ENERGIZED_SILICON_CHIP = "energized_silicon_chip";
-    public static final String ID_COPPER_INGOT = "copper_ingot";
-    public static final String ID_TIN_INGOT = "tin_ingot";
-    public static final String ID_SILVER_INGOT = "silver_ingot";
     public static final String ID_RED_ALLOY_INGOT = "red_ingot";
     public static final String ID_ELECTROTINE_ALLOY_INGOT = "electrotine_ingot";
     public static final String ID_ELECTROTINE_DUST = "electrotine_dust";
@@ -72,9 +69,6 @@ public class CoreItems {
     public static void register() {
 
         // Ingots/dusts/gems
-        ITEMS.register(ID_COPPER_INGOT, createSimpleItemSupplier());
-        ITEMS.register(ID_TIN_INGOT, createSimpleItemSupplier());
-        ITEMS.register(ID_SILVER_INGOT, createSimpleItemSupplier());
         ITEMS.register(ID_RED_ALLOY_INGOT, createSimpleItemSupplier());
         ITEMS.register(ID_ELECTROTINE_ALLOY_INGOT, createSimpleItemSupplier());
         ITEMS.register(ID_ELECTROTINE_DUST, createSimpleItemSupplier());

core/src/main/java/mrtjp/projectred/core/init/CoreReferences.java

@@ -48,12 +48,6 @@ public class CoreReferences {
     public static Item SILICON_CHIP_ITEM;
     @ObjectHolder(ID_ENERGIZED_SILICON_CHIP)
     public static Item ENERGIZED_SILICON_CHIP_ITEM;
-    @ObjectHolder(ID_COPPER_INGOT)
-    public static Item COPPER_INGOT_ITEM;
-    @ObjectHolder(ID_TIN_INGOT)
-    public static Item TIN_INGOT_ITEM;
-    @ObjectHolder(ID_SILVER_INGOT)
-    public static Item SILVER_INGOT_ITEM;
     @ObjectHolder(ID_RED_ALLOY_INGOT)
     public static Item RED_ALLOY_INGOT_ITEM;
     @ObjectHolder(ID_ELECTROTINE_ALLOY_INGOT)

core/src/main/java/mrtjp/projectred/core/init/CoreTags.java

@@ -12,7 +12,6 @@ public class CoreTags {
     /* Block Tags */
 
     /* Item Tags */
-    public static final TagKey<Item> COPPER_INGOT_TAG = ItemTags.create(new ResourceLocation("forge:ingots/copper"));
     public static final TagKey<Item> TIN_INGOT_TAG = ItemTags.create(new ResourceLocation("forge:ingots/tin"));
     public static final TagKey<Item> SILVER_INGOT_TAG = ItemTags.create(new ResourceLocation("forge:ingots/silver"));
     public static final TagKey<Item> RED_ALLOY_INGOT_TAG = ItemTags.create(new ResourceLocation("forge:ingots/red_alloy"));

core/src/main/resources/META-INF/accesstransformer.cfg

@@ -1,12 +1,7 @@
-# CBMultipart Access Transformer
-# Copied from CCL
-public net.minecraft.client.renderer.RenderState * # Everything.
-public net.minecraft.world.lighting.WorldLightManager field_215576_a # blockLight
-public net.minecraft.world.lighting.WorldLightManager field_215577_b # skyLight
-public net.minecraft.client.world.ClientWorld field_217430_d # worldRenderer
-public net.minecraft.client.particle.Particle * # Everything
-public-f net.minecraft.entity.item.ItemEntity field_70290_d # hoverStart
-public net.minecraft.inventory.container.Container field_75149_d # listeners
-public net.minecraft.block.RedstoneWireBlock field_150181_a # canProvidePower
-public net.minecraft.client.gui.AbstractGui func_238468_a_(Lcom/mojang/blaze3d/matrix/MatrixStack;IIIIII)V # fillGradient
+public net.minecraft.client.renderer.RenderStateShard * # Everything.
+public net.minecraft.client.renderer.RenderType *() # All Methods
+public net.minecraft.client.renderer.RenderType * # All Fields.
 
+public net.minecraft.world.level.block.RedStoneWireBlock f_55508_ # shouldSignal
+
+public net.minecraft.world.inventory.AbstractContainerMenu m_182420_(II)V # updateDataSlotListeners

expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionRecipeProvider.java

@@ -10,6 +10,7 @@
 import static mrtjp.projectred.core.init.CoreReferences.COPPER_COIL_ITEM;
 import static mrtjp.projectred.core.init.CoreTags.*;
 import static mrtjp.projectred.expansion.init.ExpansionReferences.*;
+import static net.minecraftforge.common.Tags.Items.INGOTS_COPPER;
 
 public class ExpansionRecipeProvider extends RecipeProvider {
 
@@ -79,7 +80,7 @@ protected void registerRecipes() {
         shapedRecipe(BATTERY_ITEM, 1)
                 .key('E', ELECTROTINE_DUST_TAG)
                 .key('T', TIN_INGOT_TAG)
-                .key('C', COPPER_INGOT_TAG)
+                .key('C', INGOTS_COPPER)
                 .patternLine("ETE")
                 .patternLine("ECE")
                 .patternLine("ETE");

exploration/src/main/generated/assets/projectred_exploration/blockstates/deepslate_electrotine_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/deepslate_electrotine_ore"
+    }
+  }
+}

exploration/src/main/generated/assets/projectred_exploration/blockstates/deepslate_peridot_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/deepslate_peridot_ore"
+    }
+  }
+}

exploration/src/main/generated/assets/projectred_exploration/blockstates/deepslate_ruby_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/deepslate_ruby_ore"
+    }
+  }
+}

exploration/src/main/generated/assets/projectred_exploration/blockstates/deepslate_sapphire_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/deepslate_sapphire_ore"
+    }
+  }
+}

exploration/src/main/generated/assets/projectred_exploration/blockstates/deepslate_silver_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/deepslate_silver_ore"
+    }
+  }
+}

exploration/src/main/generated/assets/projectred_exploration/blockstates/deepslate_tin_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/deepslate_tin_ore"
+    }
+  }
+}

exploration/src/main/generated/assets/projectred_exploration/blockstates/raw_silver_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/raw_silver_block"
+    }
+  }
+}

exploration/src/main/generated/assets/projectred_exploration/blockstates/raw_tin_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectred_exploration:block/raw_tin_block"
+    }
+  }
+}