diff --git a/src/main/java/com/newmaa/othtech/recipe/RecipesMAXs.java b/src/main/java/com/newmaa/othtech/recipe/RecipesMAXs.java index 21c6894..1692d06 100644 --- a/src/main/java/com/newmaa/othtech/recipe/RecipesMAXs.java +++ b/src/main/java/com/newmaa/othtech/recipe/RecipesMAXs.java @@ -107,7 +107,7 @@ public void loadRecipes() { GTModHandler.getModItem("GoodGenerator", "compactFusionCoil", 16, 2), GTModHandler.getModItem("gregtech", "gt.blockmachines", 1, 15300), GTModHandler.getModItem("tectech", "gt.blockcasingsTT", 16), getUN(64, OrePrefixes.wireFine), - getMC(4, OrePrefixes.plateDense), new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 }, + getMC(4, OrePrefixes.plateDense), new Object[] { OrePrefixes.circuit.get(Materials.MAX), 16 }, getNanites(4, Materials.Eternity), ItemList.Circuit_Chip_QPIC.get(32), ItemList.UHV_Coil.get(64), ItemList.Electric_Pump_MAX.get(1), ItemList.Reactor_Coolant_Sp_6.get(1), ItemList.Reactor_Coolant_Sp_6.get(1), ItemList.Reactor_Coolant_Sp_6.get(1), @@ -301,9 +301,9 @@ public void loadRecipes() { GTModHandler.getModItem("tectech", "gt.time_acceleration_field_generator", 2, 8), GTModHandler.getModItem("tectech", "gt.stabilisation_field_generator", 2, 8), ItemList.Electric_Motor_MAX.get(2), ItemList.Electric_Piston_MAX.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.MAX), 2 }, new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.MAX), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 8 }, GTModHandler.getModItem("gregtech", "gt.blockcasings5", 8, 13), GTModHandler.getModItem("gregtech", "gt.metaitem.03", 4, 4139), GTModHandler.getModItem("gregtech", "gt.metaitem.03", 4, 4585), @@ -330,7 +330,7 @@ public void loadRecipes() { ItemList.Electric_Motor_MAX.get(1), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 16, 17143), GTModHandler.getModItem("tectech", "gt.stabilisation_field_generator", 2, 8), OTHItemList.glassSingularityM.get(4), GTModHandler.getModItem("dreamcraft", "ChromaticLens", 64), - new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.MAX), 4 }, GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29139), @@ -361,7 +361,7 @@ public void loadRecipes() { ItemList.Electric_Motor_MAX.get(1), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 16, 23143), GTModHandler.getModItem("tectech", "gt.stabilisation_field_generator", 2, 8), OTHItemList.glassSingularityM.get(4), GTModHandler.getModItem("dreamcraft", "ChromaticLens", 64), - new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.MAX), 4 }, GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29139), @@ -392,7 +392,7 @@ public void loadRecipes() { getAstralArray(1), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 12, 17143), OTHItemList.machineSingularityM.get(4), OTHItemList.glassSingularityM.get(4), GTModHandler.getModItem("eternalsingularity", "eternal_singularity", 4), ItemList.Emitter_MAX.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.MAX), 8 }, GTModHandler.getModItem("gregtech", "gt.metaitem.02", 64, 19143), GTModHandler.getModItem("gregtech", "gt.metaitem.02", 64, 19143), GTModHandler.getModItem("gregtech", "gt.metaitem.02", 64, 19143), diff --git a/src/main/java/com/newmaa/othtech/recipe/RecipesMain.java b/src/main/java/com/newmaa/othtech/recipe/RecipesMain.java index 4379c26..ddb9ed5 100644 --- a/src/main/java/com/newmaa/othtech/recipe/RecipesMain.java +++ b/src/main/java/com/newmaa/othtech/recipe/RecipesMain.java @@ -157,7 +157,7 @@ public void loadRecipes() { .itemInputs( GTModHandler.getModItem("miscutils", "MU-metaitem.01", 0, 32140), getGM(31027, 64), - getGM(31028, 64), + getGM(15560, 64), getNanites(4, Materials.WhiteDwarfMatter), getNanites(4, Materials.BlackDwarfMatter), getNanites(4, Materials.Universium)) @@ -210,7 +210,7 @@ public void loadRecipes() { .itemInputs( OTHItemList.SteamNeinInOne.get(64), getGM(31027, 64), - getGM(31028, 64), + getGM(15560, 64), getGM(995, 64), ItemList.Robot_Arm_LuV.get(16), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 64)) @@ -391,8 +391,8 @@ public void loadRecipes() { new Object[] { getGM(23520, 64), getGM(23527, 64), getGM(23528, 64), getGM(10886, 64), OTHItemList.itemEnqingM.get(64), OTHItemList.itemEnqingM.get(64), OTHItemList.itemEnqingM.get(64), OTHItemList.itemEnqingM.get(64), ItemList.Robot_Arm_UMV.get(64), - new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 }, - new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 }, ItemList.Field_Generator_UMV.get(64), + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 64 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 64 }, ItemList.Field_Generator_UMV.get(64), new ItemStack(Items.bread, 64), new ItemStack(Items.nether_star, 64), getGM(15297, 64), getGM(15197, 64), @@ -596,9 +596,9 @@ public void loadRecipes() { RecipeBuilder.builder() .itemInputs( GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 31027), - GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 31028), + GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 15560), GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 995), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MAX, 64)) + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 64)) .itemOutputs(GTModHandler.getModItem("gregtech", "gt.blockmachines", 1, IDs + 24)) .fluidInputs(FluidRegistry.getFluidStack("advancedglue", 262144)) .duration(114514) @@ -1116,9 +1116,9 @@ public void loadRecipes() { ItemList.EnergisedTesseract.get(16), OTHItemList.UEVA.get(4), OTHItemList.UEVB.get(4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MAX, 64), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 64), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 64), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 64), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 64), GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64)) .fluidInputs( Materials.SuperCoolant.getFluid(123123), @@ -1256,8 +1256,8 @@ public void loadRecipes() { .itemInputs( GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12735), OTHItemList.LCA.get(64), - new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 }, - new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 64 }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 64 }, ItemList.Robot_Arm_UV.get(16), ItemList.Electric_Motor_UV.get(64), ItemList.Electric_Pump_UV.get(32), diff --git a/src/main/java/com/newmaa/othtech/recipe/RecipesMegaISAForge.java b/src/main/java/com/newmaa/othtech/recipe/RecipesMegaISAForge.java index 82aafbd..1e438fe 100644 --- a/src/main/java/com/newmaa/othtech/recipe/RecipesMegaISAForge.java +++ b/src/main/java/com/newmaa/othtech/recipe/RecipesMegaISAForge.java @@ -185,7 +185,7 @@ public void loadRecipes() { .addTo(ISA); GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 31028), + GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 15560), OTHItemList.beeISAM.get(1), GTModHandler.getModItem("gregtech", "gt.metaitem.03", 16, 4139), ItemList.Field_Generator_UMV.get(4)) @@ -265,9 +265,9 @@ public void loadRecipes() { .itemInputs( GTUtility.getIntegratedCircuit(13), GTModHandler.getModItem("eternalsingularity", "eternal_singularity", 0), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 64), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 64), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 64), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 64), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MAX, 64), ItemList.Robot_Arm_UIV.get(64), ItemList.Robot_Arm_UEV.get(64), ItemList.Robot_Arm_UHV.get(64)) diff --git a/src/main/java/com/newmaa/othtech/recipe/RecipesQFTRecipes.java b/src/main/java/com/newmaa/othtech/recipe/RecipesQFTRecipes.java index a09b5bd..b812614 100644 --- a/src/main/java/com/newmaa/othtech/recipe/RecipesQFTRecipes.java +++ b/src/main/java/com/newmaa/othtech/recipe/RecipesQFTRecipes.java @@ -33,7 +33,7 @@ public void loadRecipes() { .metadata(QFT_FOCUS_TIER, 2) .itemInputs( GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 31027), - GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 31028)) + GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 15560)) .fluidInputs(new FluidStack(songyou, 123), new FluidStack(laoda, 24)) .itemOutputs( GTModHandler.getModItem("miscutils", "itemDustRhenium", 16),