diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 4af8a0c5d..35e9b840d 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -274,38 +274,38 @@ public void run() { bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_HV, 'G', ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.HV), 'P', - OrePrefixes.plateQuintuple.get(Materials.Aluminium) }); + OrePrefixes.plateDense.get(Materials.Aluminium) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_EV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_EV, 'G', ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.EV), 'P', - OrePrefixes.plateQuintuple.get(Materials.StainlessSteel) }); + OrePrefixes.plateTriple.get(Materials.StainlessSteel) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_IV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_IV, 'G', ItemList.Field_Generator_HV, 'D', OrePrefixes.circuit.get(Materials.IV), 'P', - OrePrefixes.plateQuadruple.get(Materials.Titanium) }); + OrePrefixes.plateTriple.get(Materials.Titanium) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_LV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_LuV, 'G', ItemList.Field_Generator_EV, 'D', OrePrefixes.circuit.get(Materials.LuV), 'P', - OrePrefixes.plateQuadruple.get(Materials.TungstenSteel) }); + OrePrefixes.plateTriple.get(Materials.TungstenSteel) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_MV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_ZPM, 'G', ItemList.Field_Generator_IV, 'D', OrePrefixes.circuit.get(Materials.ZPM), 'P', - OrePrefixes.plateTriple.get(Materials.HSSG) }); + OrePrefixes.plateDouble.get(Materials.HSSG) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_HV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UV, 'G', ItemList.Field_Generator_LuV, 'D', OrePrefixes.circuit.get(Materials.UV), 'P', - OrePrefixes.plateTriple.get(Materials.HSSS) }); + OrePrefixes.plateDouble.get(Materials.HSSS) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_EV.get(1L), bits, diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java index 74e3c27f2..ccdb026ed 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java @@ -3025,7 +3025,7 @@ private void registerArcFurnace() { ItemList.ArcFurnaceUEV.get(1L), bitsd, new Object[] { "WGW", "CMC", "PPP", 'M', ItemList.Hull_UEV, 'P', - OrePrefixes.plateQuadruple.get(Materials.Osmium), 'C', + OrePrefixes.plateDouble.get(Materials.Osmiridium), 'C', GT_CustomLoader.AdvancedGTMaterials.UEV.getCircuit(), 'W', GT_CustomLoader.AdvancedGTMaterials.UEV.getCable4(), 'G', OrePrefixes.cell.get(Materials.Graphite) }, @@ -3035,7 +3035,7 @@ private void registerArcFurnace() { ItemList.ArcFurnaceUIV.get(1L), bitsd, new Object[] { "WGW", "CMC", "PPP", 'M', ItemList.Hull_UIV, 'P', - OrePrefixes.plateDouble.get(Materials.Osmiridium), 'C', + OrePrefixes.plateTriple.get(Materials.Osmiridium), 'C', GT_CustomLoader.AdvancedGTMaterials.UIV.getCircuit(), 'W', GT_CustomLoader.AdvancedGTMaterials.UIV.getCable4(), 'G', OrePrefixes.cell.get(Materials.Graphite) }, @@ -3045,7 +3045,7 @@ private void registerArcFurnace() { ItemList.ArcFurnaceUMV.get(1L), bitsd, new Object[] { "WGW", "CMC", "PPP", 'M', ItemList.Hull_UMV, 'P', - OrePrefixes.plateQuadruple.get(Materials.Osmiridium), 'C', + OrePrefixes.plateDouble.get(Materials.Infinity), 'C', GT_CustomLoader.AdvancedGTMaterials.UMV.getCircuit(), 'W', GT_CustomLoader.AdvancedGTMaterials.UMV.getCable4(), 'G', OrePrefixes.cell.get(Materials.Graphite) }, @@ -3158,7 +3158,7 @@ private void registerPlasmaArcFurnace() { ItemList.PlasmaArcFurnaceUEV.get(1L), bitsd, new Object[] { "WGW", "CMC", "TPT", 'M', ItemList.Hull_UEV, 'P', - OrePrefixes.plateQuadruple.get(Materials.Osmium), 'C', + OrePrefixes.plateDouble.get(Materials.Osmiridium), 'C', GT_CustomLoader.AdvancedGTMaterials.UEV.getCircuit(), 'W', GT_CustomLoader.AdvancedGTMaterials.UEV.getCable4(), 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G', OrePrefixes.cell.get(Materials.Graphite) }, @@ -3168,7 +3168,7 @@ private void registerPlasmaArcFurnace() { ItemList.PlasmaArcFurnaceUIV.get(1L), bitsd, new Object[] { "WGW", "CMC", "TPT", 'M', ItemList.Hull_UIV, 'P', - OrePrefixes.plateDouble.get(Materials.Osmiridium), 'C', + OrePrefixes.plateTriple.get(Materials.Osmiridium), 'C', GT_CustomLoader.AdvancedGTMaterials.UIV.getCircuit(), 'W', GT_CustomLoader.AdvancedGTMaterials.UIV.getCable4(), 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G', OrePrefixes.cell.get(Materials.Graphite) }, @@ -3178,7 +3178,7 @@ private void registerPlasmaArcFurnace() { ItemList.PlasmaArcFurnaceUMV.get(1L), bitsd, new Object[] { "WGW", "CMC", "TPT", 'M', ItemList.Hull_UMV, 'P', - OrePrefixes.plateQuadruple.get(Materials.Osmiridium), 'C', + OrePrefixes.plateDouble.get(Materials.Infinity), 'C', GT_CustomLoader.AdvancedGTMaterials.UMV.getCircuit(), 'W', GT_CustomLoader.AdvancedGTMaterials.UMV.getCable4(), 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G', OrePrefixes.cell.get(Materials.Graphite) }, diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 9d5f11733..f63f6e2fd 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2019,7 +2019,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 4), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Titanium, 3), + GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Titanium, 3), ItemList.Field_Generator_HV.get(1), ItemList.Automation_ChestBuffer_IV.get(1)) .itemOutputs(ItemList.Super_Chest_IV.get(1L)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java index 5f5bca731..33342a800 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java @@ -32,8 +32,8 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Steel, 1L), - ItemList.Circuit_Integrated.getWithDamage(0, 1)) + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 2L), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Shape_Empty.get(1L)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(benderRecipes); diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java index d3bbdec45..25db69318 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java @@ -1257,7 +1257,7 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( CustomItemList.ReinforcedTungstenSteelIronPlate.get(1L), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Sunnarium, 1L), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Sunnarium, 2L), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Plutonium, 1L), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Knightmetal, 2L), GTOreDictUnificator.get(OrePrefixes.screw, Materials.RedAlloy, 4L)) diff --git a/src/main/java/com/dreammaster/scripts/ScriptGendustry.java b/src/main/java/com/dreammaster/scripts/ScriptGendustry.java index 4ba983af2..1e606a55a 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGendustry.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGendustry.java @@ -239,11 +239,11 @@ public void loadRecipes() { "-aaaaaaa-", "---------", 'a', - GTOreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Europium, 1L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 1L), 'b', getModItem(Gendustry.ID, "Replicator", 1, 0, missing), 'c', - GTOreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Naquadria, 1L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Naquadria, 1L), 'd', getModItem(Gendustry.ID, "Liquifier", 1, 0, missing), 'e', diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java index 50cc4b673..9797ec234 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java @@ -718,7 +718,7 @@ public void loadRecipes() { 'd', CustomItemList.IrradiantReinforcedChromePlate.get(1L), 'e', - "plateQuadrupleSiliconSolarGrade", + "plateTripleSiliconSolarGrade", 'f', ItemList.Circuit_Silicon_Wafer3.get(1L), 'g', @@ -749,7 +749,7 @@ public void loadRecipes() { 'e', getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1, 8, missing), 'f', - "plateQuintupleSiliconSolarGrade", + "plateDenseSiliconSolarGrade", 'g', ItemList.Circuit_Silicon_Wafer4.get(1L), 'h', @@ -788,7 +788,7 @@ public void loadRecipes() { 'h', ItemList.Circuit_Silicon_Wafer5.get(1L), 'i', - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Polybenzimidazole, 1L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Polybenzimidazole, 1L), 'j', "circuitSuperconductor", 'k', diff --git a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java index 1e48f9828..1757eb081 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java +++ b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java @@ -2066,7 +2066,7 @@ private void recipes1() { .duration(15 * SECONDS).eut(64).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Paper, 1L), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 2L), GTUtility.getIntegratedCircuit(1)) .itemOutputs(getModItem(ProjectRedCore.ID, "projectred.core.datacard", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.redstone", 288)).duration(10 * SECONDS).eut(16) diff --git a/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java b/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java index 16483326d..75658fbc0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java @@ -858,7 +858,7 @@ public void loadRecipes() { .add(Aspect.getAspect("tenebrae"), 32).add(Aspect.getAspect("alienis"), 32) .add(Aspect.getAspect("tutamen"), 32).add(Aspect.getAspect("ignis"), 32) .add(Aspect.getAspect("fames"), 32), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Thaumium, 1L), + GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Thaumium, 1L), new ItemStack[] { getModItem(TaintedMagic.ID, "ItemMaterial", 1, 2, missing), getModItem(TaintedMagic.ID, "ItemMaterial", 1, 7, missing), GTOreDictUnificator.get(OrePrefixes.screw, Materials.FierySteel, 1L), @@ -2101,15 +2101,13 @@ public void loadRecipes() { getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "WandCap", 1, 7, missing), getModItem(TaintedMagic.ID, "ItemMaterial", 1, 3, missing), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Shadow, 1L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Shadow, 1L), GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Shadow, 1L), getModItem(TaintedMagic.ID, "ItemMaterial", 1, 3, missing), GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Tanzanite, 1L), getModItem(TaintedMagic.ID, "ItemMaterial", 1, 3, missing), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Shadow, 1L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Shadow, 1L), GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Shadow, 1L), getModItem(TaintedMagic.ID, "ItemMaterial", 1, 3, missing), }); TCHelper.addResearchPage( "CAP_shadowmetal",