Cleanup some doubled mysterious crystal items (#923)

* mysterious crystal clean up * make it not crash
GTNewHorizons · Aug 8, 2024 · 5ee5367 · 5ee5367
1 parent 54c0e7e
commit 5ee5367
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 32 deletions.
diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java
@@ -557,7 +557,6 @@ public enum CustomItemList implements IItemContainer {
     IronDualCompressedPlates,
     MeteoricIronDualCompressedPlates,
     LedoxCompressedPlate,
-    MysteriousCrystalPlate,
     LedoxPlate,
     QuantinumPlate,
     CallistoIcePlate,
@@ -738,7 +737,6 @@ public enum CustomItemList implements IItemContainer {
     VegaBStoneDust,
     BarnardaEStoneDust,
     BarnardaFStoneDust,
-    MysteriousCrystalDust,
     TCetiEStoneDust,
     MirandaStoneDust,
     WaferTier3,

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,7 +266,6 @@ private void registerItems() {
         CustomItemList.MediumFuelCanister.set(ItemList.MediumFuelCanister.getIS());
         CustomItemList.LargeFuelCanister.set(ItemList.LargeFuelCanister.getIS());
         CustomItemList.ExtraLargeFuelCanister.set(ItemList.ExtraLargeFuelCanister.getIS());
-        CustomItemList.MysteriousCrystalPlate.set(ItemList.MysteriousCrystalPlate.getIS());
         CustomItemList.LedoxPlate.set(ItemList.LedoxPlate.getIS());
         CustomItemList.QuantinumPlate.set(ItemList.QuantinumPlate.getIS());
         CustomItemList.CallistoIcePlate.set(ItemList.CallistoIcePlate.getIS());
@@ -318,7 +317,6 @@ private void registerItems() {
         CustomItemList.VegaBStoneDust.set(ItemList.VegaBStoneDust.getIS());
         CustomItemList.BarnardaEStoneDust.set(ItemList.BarnardaEStoneDust.getIS());
         CustomItemList.BarnardaFStoneDust.set(ItemList.BarnardaFStoneDust.getIS());
-        CustomItemList.MysteriousCrystalDust.set(ItemList.MysteriousCrystalDust.getIS());
         CustomItemList.IndustryFrame.set(ItemList.IndustryFrame.getIS());
         CustomItemList.TCetiEStoneDust.set(ItemList.TCetiEStoneDust.getIS());
         CustomItemList.AdsorptionFilterCasing.set(ItemList.AdsorptionFilterCasing.getIS());

diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java
@@ -105,25 +105,14 @@ public void run() {
         GT_OreDictUnificator
                 .registerOre(OrePrefixes.plateDense, Materials.Quantium, ItemList.QuantinumDensePlate.getIS());
         GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Quantium, ItemList.QuantinumPlate.getIS());
-        GT_OreDictUnificator
-                .registerOre(OrePrefixes.ingot, Materials.MysteriousCrystal, ItemList.MysteriousCrystalIngot.getIS());
-        GT_OreDictUnificator.registerOre("ingotColdMysteriousCrystal", ItemList.MysteriousCrystalColdIngot.getIS());
         GT_OreDictUnificator.registerOre(
                 OrePrefixes.block,
                 Materials.MysteriousCrystal,
                 GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.MysteriousCrystal", 1L, 0));
-        GT_OreDictUnificator
-                .registerOre(OrePrefixes.dust, Materials.MysteriousCrystal, ItemList.MysteriousCrystalDust.getIS());
-        GT_OreDictUnificator
-                .registerOre(OrePrefixes.plate, Materials.MysteriousCrystal, ItemList.MysteriousCrystalPlate.getIS());
         GT_OreDictUnificator.registerOre(
                 OrePrefixes.compressed,
                 Materials.MysteriousCrystal,
                 ItemList.MysteriousCrystalCompressedPlate.getIS());
-        GT_OreDictUnificator.registerOre(
-                OrePrefixes.plateDense,
-                Materials.MysteriousCrystal,
-                ItemList.MysteriousCrystalDensePlate.getIS());
         GT_OreDictUnificator.registerOre(
                 OrePrefixes.plate,
                 Materials.Bedrockium,

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
@@ -1000,7 +1000,7 @@ public void run() {
                             GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 8),
                             GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 64))
                     .fluidInputs(
-                            Materials.SuperconductorUHV.getMolten(64 * 144),
+                            Materials.Longasssuperconductornameforuhvwire.getMolten(64 * 144),
                             Materials.Infinity.getMolten(64 * 144),
                             new FluidStack(solderUEV, 64 * 144),
                             Materials.Lubricant.getFluid(128000))

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CentrifugeRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CentrifugeRecipes.java
@@ -255,7 +255,7 @@ public void run() {
 
         GT_Values.RA.stdBuilder().itemInputs(CustomItemList.EnceladusIceDust.get(36L))
                 .itemOutputs(
-                        CustomItemList.MysteriousCrystalDust.get(9L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MysteriousCrystal, 9L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 9L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 9L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ledox, 4L),

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java
@@ -46,14 +46,14 @@ public void run() {
 
         GT_Values.RA.stdBuilder()
                 .itemInputs(
-                        CustomItemList.MysteriousCrystalPlate.get(9),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MysteriousCrystal, 9L),
                         GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)))
                 .itemOutputs(CustomItemList.MysteriousCrystal.get(1L)).requiresCleanRoom().duration(60 * SECONDS)
                 .eut(TierEU.RECIPE_HV).addTo(laserEngraverRecipes);
 
         GT_Values.RA.stdBuilder()
                 .itemInputs(
-                        CustomItemList.MysteriousCrystalPlate.get(9),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MysteriousCrystal, 9L),
                         GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1)))
                 .itemOutputs(CustomItemList.MysteriousCrystal.get(1L)).requiresCleanRoom().duration(60 * SECONDS)
                 .eut(TierEU.RECIPE_HV).addTo(laserEngraverRecipes);

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java
@@ -534,7 +534,7 @@ public void run() {
             GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "enceladusblocks", 1L, 0))
                     .itemOutputs(
                             CustomItemList.EnceladusIceDust.get(1L),
-                            CustomItemList.MysteriousCrystalDust.get(1L),
+                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MysteriousCrystal, 1L),
                             GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
                             GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1))
                     .outputChances(10000, 1500, 500, 250).duration(20 * SECONDS).eut(TierEU.RECIPE_HV)
@@ -552,7 +552,7 @@ public void run() {
             GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "enceladusblocks", 1L, 3))
                     .itemOutputs(
                             CustomItemList.EnceladusIceDust.get(1L),
-                            CustomItemList.MysteriousCrystalDust.get(1L),
+                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MysteriousCrystal, 1L),
                             GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
                             GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1))
                     .outputChances(10000, 1500, 500, 250).duration(20 * SECONDS).eut(TierEU.RECIPE_HV)

diff --git a/src/main/java/com/dreammaster/item/ItemList.java b/src/main/java/com/dreammaster/item/ItemList.java
@@ -365,14 +365,9 @@ public enum ItemList {
     MushroomPowder(new ModSimpleBaseItem("MushroomPowder", ModTabList.ModGenericTab)),
     MutatedEgg(new ModSimpleBaseItem("MutatedEgg", ModTabList.ModGenericTab)),
     MysteriousCrystal(new ModSimpleBaseItem("MysteriousCrystal", ModTabList.ModSpaceTab)),
-    MysteriousCrystalDust(new ModSimpleBaseItem("MysteriousCrystalDust", ModTabList.ModSpaceTab)),
-    MysteriousCrystalIngot(new ModSimpleBaseItem("MysteriousCrystalIngot", ModTabList.ModSpaceTab)),
-    MysteriousCrystalColdIngot(new ModSimpleBaseItem("MysteriousCrystalColdIngot", ModTabList.ModSpaceTab)),
     MysteriousCrystalGemExquisite(new ModSimpleBaseItem("MysteriousCrystalGemExquisite", ModTabList.ModSpaceTab)),
     MysteriousCrystalGemFlawless(new ModSimpleBaseItem("MysteriousCrystalGemFlawless", ModTabList.ModSpaceTab)),
     MysteriousCrystalLens(new ModSimpleBaseItem("MysteriousCrystalLens", ModTabList.ModSpaceTab)),
-    MysteriousCrystalPlate(new ModSimpleBaseItem("MysteriousCrystalPlate", ModTabList.ModSpaceTab)),
-    MysteriousCrystalDensePlate(new ModSimpleBaseItem("MysteriousCrystalDensePlate", ModTabList.ModSpaceTab)),
     MysteriousCrystalCompressedPlate(new ModSimpleBaseItem("MysteriousCrystalCompressedPlate", ModTabList.ModSpaceTab)),
     MysteriousCrystalDualCompressedPlates(
             new ModSimpleBaseItem("MysteriousCrystalDualCompressedPlates", ModTabList.ModSpaceTab)),

diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java
@@ -1295,7 +1295,7 @@ public void loadRecipes() {
         GT_Values.RA.stdBuilder().itemInputs(
                 CustomItemList.ReinforcedNeutroniumIronPlate.get(1L),
                 getModItem(NewHorizonsCoreMod.ID, "item.EnrichedNaquadriaNeutroniumSunnariumAlloy", 1, 0, missing),
-                getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalPlate", 1, 0, missing),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MysteriousCrystal, 1L),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 2L),
                 GT_OreDictUnificator.get(OrePrefixes.screw, Materials.RedAlloy, 4L))
                 .itemOutputs(CustomItemList.IrradiantReinforcedNeutroniumPlate.get(1L))

diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang
@@ -148,11 +148,6 @@ item.LedoxPlate.name=Ledox Plate
 item.LedoxDensePlate.name=Dense Ledox Plate
 item.LedoxCompressedPlate.name=Compressed Ledox Plate
 item.MysteriousCrystal.name=Mysterious Crystal
-item.MysteriousCrystalDust.name=Mysterious Crystal Dust
-item.MysteriousCrystalIngot.name=Mysterious Crystal Ingot
-item.MysteriousCrystalColdIngot.name=Cold Mysterious Crystal Ingot
-item.MysteriousCrystalPlate.name=Mysterious Crystal Plate
-item.MysteriousCrystalDensePlate.name=Dense Mysterious Crystal Plate
 item.MysteriousCrystalCompressedPlate.name=Compressed Mysterious Crystal Plate
 item.MysteriousCrystalGemExquisite.name=Exquisite Probable Crystal
 item.MysteriousCrystalLens.name=Quite Certain Crystal Lens

diff --git a/...n/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalColdIngot.png b/...n/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalColdIngot.png
diff --git a/.../resources/assets/dreamcraft/textures/items/itemMysteriousCrystalDensePlate.png b/.../resources/assets/dreamcraft/textures/items/itemMysteriousCrystalDensePlate.png
diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalDust.png b/src/main/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalDust.png
diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalIngot.png b/src/main/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalIngot.png
diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalPlate.png b/src/main/resources/assets/dreamcraft/textures/items/itemMysteriousCrystalPlate.png