diff options
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java | 12 | ||||
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java | 21 |
2 files changed, 16 insertions, 17 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java index 2f96dabbe1..11c93d05ac 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java @@ -1,6 +1,7 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; import static gregtech.api.enums.Mods.GalactiGreg; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -11,10 +12,7 @@ import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.BW_Util; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; public class AssemblyLine implements Runnable { @@ -42,7 +40,7 @@ public class AssemblyLine implements Runnable { if (GalactiGreg.isModLoaded()) { GT_Values.RA.addAssemblylineRecipe( ItemList.OreDrill4.get(1L), - BW_Util.getMachineVoltageFromTier(6), + (int) TierEU.LuV, new Object[] { ItemList.OreDrill4.get(1L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 9L), Materials.Europium.getPlates(3), ItemList.Electric_Motor_LuV.get(9L), @@ -51,8 +49,8 @@ public class AssemblyLine implements Runnable { new FluidStack[] { new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Neon.getFluidOrGas(20000), }, ItemRegistry.voidminer[0].copy(), - 108000, - BW_Util.getMachineVoltageFromTier(6)); + 5 * MINUTES, + (int) TierEU.LuV); } GT_Values.RA.addAssemblylineRecipe( diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java index 16b40531c5..4d8298bb05 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java @@ -14,6 +14,7 @@ package com.github.bartimaeusnek.crossmod.tectech; import static gregtech.api.enums.Mods.GalactiGreg; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -21,12 +22,12 @@ import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.technus.tectech.recipe.TT_recipeAdder; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; public class TecTechResearchLoader { @@ -42,7 +43,7 @@ public class TecTechResearchLoader { ItemRegistry.voidminer[0].copy(), 1024000, 256, - BW_Util.getMachineVoltageFromTier(7), + (int) TierEU.RECIPE_ZPM, 24, new Object[] { ItemRegistry.voidminer[0].copy(), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 9L), @@ -52,14 +53,14 @@ public class TecTechResearchLoader { new FluidStack[] { new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Krypton.getFluidOrGas(20000) }, ItemRegistry.voidminer[1].copy(), - 216000, - BW_Util.getMachineVoltageFromTier(7)); + 5 * MINUTES, + (int) TierEU.RECIPE_ZPM); TT_recipeAdder.addResearchableAssemblylineRecipe( ItemRegistry.voidminer[1].copy(), 8192000, 512, - BW_Util.getMachineVoltageFromTier(8), + (int) TierEU.RECIPE_UV, 64, new Object[] { ItemRegistry.voidminer[1].copy(), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 9L), @@ -69,15 +70,15 @@ public class TecTechResearchLoader { new FluidStack[] { new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Oganesson.getFluidOrGas(20000) }, ItemRegistry.voidminer[2].copy(), - 432000, - BW_Util.getMachineVoltageFromTier(8)); + 5 * MINUTES, + (int) TierEU.RECIPE_UV); } TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Machine_Multi_ImplosionCompressor.get(1L), 64000, 48, - BW_Util.getMachineVoltageFromTier(8), + (int) TierEU.UV, 8, new Object[] { ItemList.Machine_Multi_ImplosionCompressor.get(1L), Materials.Neutronium.getBlocks(5), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmium, 64), @@ -87,8 +88,8 @@ public class TecTechResearchLoader { new FluidStack[] { new FluidStack(solderIndalloy, 1440), Materials.Osmium.getMolten(1440), Materials.Neutronium.getMolten(1440) }, ItemRegistry.eic.copy(), - 240000, - BW_Util.getMachineVoltageFromTier(8)); + 5 * MINUTES, + (int) TierEU.UV); } } |