From 592fdf4961cbba8a8f374e1754cb79a27e14a6ab Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Tue, 6 Mar 2018 19:17:00 +1000 Subject: $ Fixed duplicate string in Large Extruder Tooltip. --- .../core/handler/COMPAT_IntermodStaging.java | 2 +- .../xmod/Computronics/HANDLER_Computronics.java | 39 ---------------------- .../xmod/computronics/HANDLER_Computronics.java | 39 ++++++++++++++++++++++ .../GregtechMetaTileEntity_IndustrialExtruder.java | 2 +- 4 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java create mode 100644 src/Java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java (limited to 'src') diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java index a615fd6022..740f923c6f 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.handler; -import gtPlusPlus.xmod.Computronics.HANDLER_Computronics; import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; +import gtPlusPlus.xmod.computronics.HANDLER_Computronics; import gtPlusPlus.xmod.forestry.HANDLER_FR; import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.growthcraft.HANDLER_GC; diff --git a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java deleted file mode 100644 index e062d70552..0000000000 --- a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java +++ /dev/null @@ -1,39 +0,0 @@ -package gtPlusPlus.xmod.Computronics; - -import gregtech.GT_Mod; -import gregtech.api.enums.*; -import gregtech.api.util.GT_OreDictUnificator; - -import gtPlusPlus.core.lib.LoadedMods; - -public class HANDLER_Computronics { - - public static void preInit(){ - if (LoadedMods.Computronics){ - - } - - } - - public static void init(){ - if (LoadedMods.Computronics){ - - } - else { - GT_Mod.gregtechproxy.addFluid("Argon", "Argon", Materials.Argon, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), 1000); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L), Materials.Air.getGas(1000L), Materials.Nitrogen.getGas(780L), 1600, 32, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L), Materials.Air.getGas(1000L), Materials.Oxygen.getGas(210L), 1600, 128, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L), Materials.Air.getGas(1000L), Materials.Argon.getGas(5L), 6000, 512, false); - GT_Values.RA.addElectrolyzerRecipe(ItemList.Cell_Air.get(1), null, null, Materials.Air.getGas(2000L), ItemList.Cell_Empty.get(1), null, null, null, null, null, null, 800, 30); - } - } - - public static void postInit(){ - if (LoadedMods.Computronics){ - - } - - } - - -} diff --git a/src/Java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java b/src/Java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java new file mode 100644 index 0000000000..11a991a579 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java @@ -0,0 +1,39 @@ +package gtPlusPlus.xmod.computronics; + +import gregtech.GT_Mod; +import gregtech.api.enums.*; +import gregtech.api.util.GT_OreDictUnificator; + +import gtPlusPlus.core.lib.LoadedMods; + +public class HANDLER_Computronics { + + public static void preInit(){ + if (LoadedMods.Computronics){ + + } + + } + + public static void init(){ + if (LoadedMods.Computronics){ + + } + else { + GT_Mod.gregtechproxy.addFluid("Argon", "Argon", Materials.Argon, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), 1000); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L), Materials.Air.getGas(1000L), Materials.Nitrogen.getGas(780L), 1600, 32, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L), Materials.Air.getGas(1000L), Materials.Oxygen.getGas(210L), 1600, 128, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L), Materials.Air.getGas(1000L), Materials.Argon.getGas(5L), 6000, 512, false); + GT_Values.RA.addElectrolyzerRecipe(ItemList.Cell_Air.get(1), null, null, Materials.Air.getGas(2000L), ItemList.Cell_Empty.get(1), null, null, null, null, null, null, 800, 30); + } + } + + public static void postInit(){ + if (LoadedMods.Computronics){ + + } + + } + + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java index 55c1a13614..f6faba46a8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java @@ -50,7 +50,7 @@ extends GregtechMeta_MultiBlockBase { "Extrusion Shape for recipe goes in the Input Bus", "Each Input Bus can have a different shape!", "You can use several input busses per multiblock", - "Size: 3x3x5 [WxHxL] (Hollow)", "Controller (front centered)", + "Size: 3x3x5 [WxHxL] (Hollow)", "Controller (front centered)", "Busses & Hatches cannot replace edge casings", "1x Input Bus (anywhere)", -- cgit