Remove loads of duplicate materials (#1013)

GTNewHorizons · Sep 25, 2024 · d38c9d1 · d38c9d1
1 parent 264c8c8
commit d38c9d1
Show file tree

Hide file tree

Showing 55 changed files with 15 additions and 253 deletions.
diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java
@@ -126,10 +126,6 @@ public enum CustomItemList implements IItemContainer {
     IronDualCompressedPlates,
     MeteoricIronDualCompressedPlates,
     LedoxCompressedPlate,
-    LedoxPlate,
-    QuantinumPlate,
-    CallistoIcePlate,
-    MytrylPlate,
     MytrylCrystal,
     CallistoIceCompressedPlate,
     MarshmallowForm,
@@ -331,9 +327,7 @@ public enum CustomItemList implements IItemContainer {
     MedalEngineer,
     MedalWarp,
     MaceratedPlantmass,
-    BedrockiumPlate,
     EngineCore,
-    AlumiteDust,
     nameRemover,
     TwilightCrystal,
     UnfiredClayBrick,
@@ -342,7 +336,6 @@ public enum CustomItemList implements IItemContainer {
     UnfiredSlimeSoulBrick,
     RawLapotronCrystal,
     LapotronDust,
-    SandDust,
     AluminiumIronPlate,
     ReinforcedAluminiumIronPlate,
     IrradiantReinforcedAluminiumPlate,

diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java
@@ -266,10 +266,6 @@ private void registerItems() {
         CustomItemList.MediumFuelCanister.set(ItemList.MediumFuelCanister.getIS());
         CustomItemList.LargeFuelCanister.set(ItemList.LargeFuelCanister.getIS());
         CustomItemList.ExtraLargeFuelCanister.set(ItemList.ExtraLargeFuelCanister.getIS());
-        CustomItemList.LedoxPlate.set(ItemList.LedoxPlate.getIS());
-        CustomItemList.QuantinumPlate.set(ItemList.QuantinumPlate.getIS());
-        CustomItemList.CallistoIcePlate.set(ItemList.CallistoIcePlate.getIS());
-        CustomItemList.MytrylPlate.set(ItemList.MytrylPlate.getIS());
         CustomItemList.MytrylCrystal.set(ItemList.MytrylCrystal.getIS());
         CustomItemList.CallistoIceCompressedPlate.set(ItemList.CallistoIceCompressedPlate.getIS());
         CustomItemList.HeavyDutyRocketEngineTier3.set(ItemList.HeavyDutyRocketEngineTier3.getIS());
@@ -347,17 +343,14 @@ private void registerItems() {
         CustomItemList.MedalWarp.getItem().setMaxStackSize(1);
         CustomItemList.AluminoSilicateWool.set(ItemList.AluminoSilicateWool.getIS());
         CustomItemList.MaceratedPlantmass.set(ItemList.MaceratedPlantmass.getIS());
-        CustomItemList.BedrockiumPlate.set(ItemList.BedrockiumPlate.getIS());
         CustomItemList.EngineCore.set(ItemList.EngineCore.getIS());
-        CustomItemList.AlumiteDust.set(ItemList.AlumiteDust.getIS());
         CustomItemList.TwilightCrystal.set(ItemList.TwilightCrystal.getIS());
         CustomItemList.UnfiredClayBrick.set(ItemList.UnfiredClayBrick.getIS());
         CustomItemList.UnfiredSearedBrick.set(ItemList.UnfiredSearedBrick.getIS());
         CustomItemList.UnfiredCokeOvenBrick.set(ItemList.UnfiredCokeOvenBrick.getIS());
         CustomItemList.UnfiredSlimeSoulBrick.set(ItemList.UnfiredSlimeSoulBrick.getIS());
         CustomItemList.RawLapotronCrystal.set(ItemList.RawLapotronCrystal.getIS());
         CustomItemList.LapotronDust.set(ItemList.LapotronDust.getIS());
-        CustomItemList.SandDust.set(ItemList.SandDust.getIS());
         CustomItemList.AluminiumIronPlate.set(ItemList.AluminiumIronPlate.getIS());
         CustomItemList.ReinforcedAluminiumIronPlate.set(ItemList.ReinforcedAluminiumIronPlate.getIS());
         CustomItemList.IrradiantReinforcedAluminiumPlate.set(ItemList.IrradiantReinforcedAluminiumPlate.getIS());

diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java
@@ -13,7 +13,7 @@ public void run() {
 
     private void registerMaterialRecipes() {
         GTModHandler.addShapelessCraftingRecipe(
-                com.dreammaster.item.ItemList.AlumiteDust.getIS(8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alumite, 8),
                 GTModHandler.RecipeBits.NOT_REMOVABLE,
                 new Object[] { OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium),
                         OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium),

diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java
@@ -56,74 +56,31 @@ public void run() {
                 GTModHandler.getModItem(BiomesOPlenty.ID, "logs4", 1L, 3));
         GTOreDictUnificator.registerOre("cropCarrot", GTModHandler.getModItem(BiomesOPlenty.ID, "food", 1L, 2));
 
-        GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Mytryl, ItemList.MytrylIngot.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.dust, Materials.Mytryl, ItemList.MytrylDust.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Mytryl, ItemList.MytrylPlate.getIS());
         GTOreDictUnificator
                 .registerOre(OrePrefixes.compressed, Materials.Mytryl, ItemList.MytrylCompressedPlate.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.plateDense, Materials.Mytryl, ItemList.MytrylDensePlate.getIS());
         GTOreDictUnificator.registerOre(OrePrefixes.block, Materials.Mytryl, BlockList.Mytryl.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.CallistoIce, ItemList.CallistoIceIngot.getIS());
-        GTOreDictUnificator.registerOre("ingotColdCallistoIce", ItemList.CallistoIceColdIngot.getIS());
         GTOreDictUnificator.registerOre("blockCallistoIce", BlockList.CallistoColdIce.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.dust, Materials.CallistoIce, ItemList.CallistoIceDust.getIS());
-        GTOreDictUnificator.registerOre("plateColdCallistoIce", ItemList.CallistoIcePlate.getIS());
-        GTOreDictUnificator
-                .registerOre(OrePrefixes.plateDense, Materials.CallistoIce, ItemList.CallistoIceDensePlate.getIS());
         GTOreDictUnificator.registerOre(
                 OrePrefixes.compressed,
                 Materials.CallistoIce,
                 ItemList.CallistoIceCompressedPlate.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Ledox, ItemList.LedoxIngot.getIS());
-        GTOreDictUnificator.registerOre("ingotColdLedox", ItemList.LedoxColdIngot.getIS());
         GTOreDictUnificator.registerOre("blockLedox", BlockList.Ledox.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.dust, Materials.Ledox, ItemList.LedoxDust.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Ledox, ItemList.LedoxPlate.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.plateDense, Materials.Ledox, ItemList.LedoxDensePlate.getIS());
         GTOreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Ledox, ItemList.LedoxCompressedPlate.getIS());
         GTOreDictUnificator.registerOre(OrePrefixes.stick, Materials.Stone, ItemList.CobbleStoneRod.getIS());
         GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Stone, ItemList.StonePlate.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Void, ItemList.VoidPlate.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.stick, Materials.Void, ItemList.VoidRod.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.ring, Materials.Void, ItemList.VoidRing.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.foil, Materials.Void, ItemList.VoidFoil.getIS());
         GTOreDictUnificator.registerOre("stickSandstone", ItemList.SandStoneRod.getIS());
         GTOreDictUnificator.registerOre("lensReinforcedGlass", ItemList.ReinforcedGlassLense.getIS());
         GTOreDictUnificator.registerOre("plateReinforcedGlass", ItemList.ReinforcedGlassPlate.getIS());
         GTOreDictUnificator.registerOre("blockQuantium", BlockList.Quantinum.getIS());
         GTOreDictUnificator
                 .registerOre(OrePrefixes.compressed, Materials.Quantium, ItemList.QuantinumCompressedPlate.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.dust, Materials.Quantium, ItemList.QuantinumDust.getIS());
-        GTOreDictUnificator
-                .registerOre(OrePrefixes.plateDense, Materials.Quantium, ItemList.QuantinumDensePlate.getIS());
-        GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Quantium, ItemList.QuantinumPlate.getIS());
         GTOreDictUnificator
                 .registerOre(OrePrefixes.block, Materials.MysteriousCrystal, BlockList.MysteriousCrystal.getIS());
         GTOreDictUnificator.registerOre(
                 OrePrefixes.compressed,
                 Materials.MysteriousCrystal,
                 ItemList.MysteriousCrystalCompressedPlate.getIS());
-        GTOreDictUnificator.registerOre(
-                OrePrefixes.plate,
-                Materials.Bedrockium,
-                com.dreammaster.item.ItemList.BedrockiumPlate.getIS(1));
-        GTOreDictUnificator.registerOre(
-                OrePrefixes.plate,
-                Materials.BlackPlutonium,
-                com.dreammaster.item.ItemList.BlackPlutoniumPlate.getIS(1));
-        GTOreDictUnificator.registerOre(
-                OrePrefixes.plateDense,
-                Materials.BlackPlutonium,
-                com.dreammaster.item.ItemList.BlackPlutoniumDensePlate.getIS(1));
         GTOreDictUnificator.registerOre(OrePrefixes.block, Materials.BlackPlutonium, BlockList.BlackPlutonium.getIS());
-        GTOreDictUnificator.registerOre(
-                OrePrefixes.plate,
-                Materials.Manyullyn,
-                com.dreammaster.item.ItemList.ManyullynPlate.getIS(1));
-        GTOreDictUnificator
-                .registerOre(OrePrefixes.plate, Materials.Ardite, com.dreammaster.item.ItemList.ArditePlate.getIS(1));
-        GTOreDictUnificator.registerOre(OrePrefixes.dust, Materials.Alumite, ItemList.AlumiteDust.getIS());
-        GTOreDictUnificator.registerOre("dustQuartzSand", com.dreammaster.item.ItemList.SandDust.getIS(1));
         GTOreDictUnificator.registerOre(
                 OrePrefixes.dust,
                 Materials.CertusQuartzCharged,

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
@@ -809,7 +809,7 @@ public void run() {
 
         GTValues.RA.stdBuilder()
                 .itemInputs(
-                        GTOreDictUnificator.get(CustomItemList.BedrockiumPlate.get(8L)),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bedrockium, 8),
                         GTUtility.getIntegratedCircuit(8))
                 .itemOutputs(CustomItemList.Casing_UEV.get(1L)).duration(2 * SECONDS + 10 * TICKS).eut(16)
                 .addTo(assemblerRecipes);

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java
@@ -673,7 +673,8 @@ public void run() {
                         GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 5L),
                         GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L),
                         GTUtility.getIntegratedCircuit(2))
-                .itemOutputs(CustomItemList.AlumiteDust.get(9L)).duration(10 * SECONDS).eut(8).addTo(mixerRecipes);
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alumite, 9)).duration(10 * SECONDS)
+                .eut(8).addTo(mixerRecipes);
 
         GTValues.RA.stdBuilder()
                 .itemInputs(