diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
4 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 8f3bff8a8b..1a2da7c060 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -864,7 +864,7 @@ public class GenericChem extends ItemPackage { GT_ModHandler.addShapelessCraftingRecipe( GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 0L), 0, - new Object[] { OrePrefixes.circuit.get(Materials.Advanced) }); + new Object[] { OrePrefixes.circuit.get(Materials.HV) }); long bits = 0; BioRecipes.addCraftingRecipe( diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 80cd053ff4..fd62f57d59 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -549,8 +549,8 @@ public class RECIPES_GREGTECH { GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), ItemList.UV_Coil.get(16L, new Object() {}), ItemList.Conveyor_Module_UV.get(4L, new Object() {}), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 16 }, ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), ALLOY.PIKYONIUM.getPlate(16), ALLOY.CINOBITE.getScrew(32)) diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 075b8978f6..e23678b3ae 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -950,8 +950,8 @@ public class RECIPES_Machines { ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)), ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV, - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2)) + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer)) .fluidInputs(ELEMENT.getInstance().IRON.getFluidStack(144 * 4)) .duration(30 * SECONDS) @@ -985,7 +985,7 @@ public class RECIPES_Machines { GT_Values.RA.stdBuilder() .itemInputs( CI.machineHull_LV, - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8), ItemUtils.getSimpleStack(Blocks.jukebox)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox)) @@ -1733,7 +1733,7 @@ public class RECIPES_Machines { 16, new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1), GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 }, ItemList.Electric_Pump_UEV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8 }, ItemList.Electric_Pump_UEV.get(4), ItemList.Field_Generator_UEV.get(4), GregtechItemList.Laser_Lens_Special.get(1) }, new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), ALLOY.PIKYONIUM.getFluidStack(144 * 32) }, @@ -2420,7 +2420,7 @@ public class RECIPES_Machines { GregtechItemList.Controller_LargeSemifluidGenerator.get(1L), CI.bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', - ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) }); if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { @@ -2744,7 +2744,7 @@ public class RECIPES_Machines { GregtechItemList.Casing_Adv_BlastFurnace.get(1), ALLOY.MARAGING250.getPlate(4), ALLOY.MARAGING300.getGear(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Hatch_Input_Pyrotheum.get(1L)) .duration(2 * SECONDS + 10 * TICKS) diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index e7119430e6..a26887ad1f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -431,8 +431,8 @@ public class CI { Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.SuperconductorUHV, }; private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.ULV, Materials.LV, Materials.MV, - Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM, Materials.SuperconductorUHV, - Materials.UHV, Materials.UEV, }; + Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM, Materials.UV, Materials.UHV, + Materials.UEV, }; private static final Material[][] aMaster = new Material[][] { aMaterial_Main, aMaterial_Secondary, aMaterial_Tertiary }; |