diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration')
40 files changed, 117 insertions, 114 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 61b579b189..19e6379766 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -1,9 +1,9 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.util.GT_Utility; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -39,7 +39,7 @@ public class Gregtech4Content { private static void tesseracts() { // Gregtech 4 Tesseracts - Utils.LOG_INFO("Gregtech 4 Content | Registering Tesseracts."); + Logger.INFO("Gregtech 4 Content | Registering Tesseracts."); GregtechItemList.GT4_Tesseract_Generator .set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4) .getStackForm(1L)); @@ -50,7 +50,7 @@ public class Gregtech4Content { private static void shelves() { // Gregtech 4 Shelves - Utils.LOG_INFO("Gregtech 4 Content | Registering Shelves."); + Logger.INFO("Gregtech 4 Content | Registering Shelves."); GregtechItemList.GT4_Shelf .set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things") .getStackForm(1L)); @@ -69,7 +69,7 @@ public class Gregtech4Content { private static void thermalBoiler() { // Gregtech 4 Thermal Boiler if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler){ - Utils.LOG_INFO("Gregtech 4 Content | Registering Thermal Boiler."); + Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); GregtechItemList.GT4_Thermal_Boiler .set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L)); } @@ -78,7 +78,7 @@ public class Gregtech4Content { private static void multiCrafter() { // Gregtech 4 Multiblock Auto-Crafter - Utils.LOG_INFO("Gregtech 4 Content | Registering Multiblock Crafter."); + Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter."); GregtechItemList.GT4_Multi_Crafter.set( new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Asesembler v1.01").getStackForm(1L)); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java index 0ac4379e7e..b99aed36ec 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java @@ -2,10 +2,10 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.RECIPES_MachineComponents; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.*; @@ -15,7 +15,7 @@ public class GregtechAdvancedBoilers { public static void run() { if (LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Advanced Boilers."); + Logger.INFO("Gregtech5u Content | Registering Advanced Boilers."); run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java index a8c0e45f0b..27e6072f99 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java @@ -7,8 +7,8 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachin import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.Recipe_GT; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class GregtechAdvancedMixer { @@ -25,7 +25,7 @@ public class GregtechAdvancedMixer { GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes; GT_Recipe_Map map = Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes; final Collection<GT_Recipe> x = oldMap.mRecipeList; - Utils.LOG_INFO("Generating " + map.mUnlocalizedName + " Recipes."); + Logger.INFO("Generating " + map.mUnlocalizedName + " Recipes."); for (final GT_Recipe g : x) { Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.add(g); } @@ -34,7 +34,7 @@ public class GregtechAdvancedMixer { return true; } else { - Utils.LOG_INFO("Failed to generate "+ map.mUnlocalizedName +" recipes."); + Logger.INFO("Failed to generate "+ map.mUnlocalizedName +" recipes."); return false; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java index 33e17c8c0e..3f0a826feb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java @@ -8,9 +8,9 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.util.Recipe_GT; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.init.Items; @@ -22,7 +22,7 @@ public class GregtechComponentAssembler { public static void run() { if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - Utils.LOG_INFO("Component Assemblers cannot be created in 5.08.33 during the pre-release. Please wait for 1.7.0 release."); + Logger.INFO("Component Assemblers cannot be created in 5.08.33 during the pre-release. Please wait for 1.7.0 release."); return; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 1d62540a41..a584323cf3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -10,6 +10,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; @@ -51,7 +52,7 @@ public class GregtechConduits { public static void run() { if (Gregtech){ - Utils.LOG_INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes."); + Logger.INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes."); if (CORE.ConfigSwitches.enableCustom_Cables) { run1(); } @@ -111,8 +112,8 @@ public class GregtechConduits { final Materials T = Materials.valueOf(Material); int V = Utils.calculateVoltageTier(Voltage); if (V == -1){ - Utils.LOG_ERROR("Failed to set voltage on "+Material+". Invalid voltage of "+Voltage+"V set."); - Utils.LOG_ERROR(Material+" has defaulted to 8v."); + Logger.ERROR("Failed to set voltage on "+Material+". Invalid voltage of "+Voltage+"V set."); + Logger.ERROR(Material+" has defaulted to 8v."); V=0; } makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false, rgb); @@ -121,7 +122,7 @@ public class GregtechConduits { @SuppressWarnings("deprecation") private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated, final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated, final short[] aRGB) { - Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new material for Wire & Cable."); + Logger.WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new material for Wire & Cable."); GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 0, "wire." + aMaterial.name().toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", 0.125F, aMaterial, aLoss, 1L * aAmperage, aVoltage, false, !aAutoInsulated, aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.wireGt02, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 1, "wire." + aMaterial.name().toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Wire", 0.25F, aMaterial, aLoss, 2L * aAmperage, aVoltage, false, !aAutoInsulated, aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.wireGt04, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 2, "wire." + aMaterial.name().toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Wire", 0.375F, aMaterial, aLoss, 4L * aAmperage, aVoltage, false, !aAutoInsulated, aRGB).getStackForm(1L)); @@ -144,8 +145,8 @@ public class GregtechConduits { private static void customWireFactory(final Material Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps){ int V = Utils.calculateVoltageTier(Voltage); if (V == -1){ - Utils.LOG_ERROR("Failed to set voltage on "+Material+". Invalid voltage of "+Voltage+"V set."); - Utils.LOG_ERROR(Material+" has defaulted to 8v."); + Logger.ERROR("Failed to set voltage on "+Material+". Invalid voltage of "+Voltage+"V set."); + Logger.ERROR(Material+" has defaulted to 8v."); V=0; } makeCustomWires(Material, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); @@ -153,7 +154,7 @@ public class GregtechConduits { private static void makeCustomWires(final Material aMaterial, final int aStartID, final long aLossInsulated, final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated) { - Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.getLocalizedName() +" as a new material for Wire & Cable."); + Logger.WARNING("Gregtech5u Content | Registered "+aMaterial.getLocalizedName() +" as a new material for Wire & Cable."); registerOre(OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 0, "wire." + aMaterial.getLocalizedName().toLowerCase() + ".01", "1x " + aMaterial.getLocalizedName() + " Wire", 0.125F, aLoss, 1L * aAmperage, aVoltage, false, !aAutoInsulated, aMaterial.getRGBA()).getStackForm(1L)); registerOre(OrePrefixes.wireGt02, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 1, "wire." + aMaterial.getLocalizedName().toLowerCase() + ".02", "2x " + aMaterial.getLocalizedName() + " Wire", 0.25F, aLoss, 2L * aAmperage, aVoltage, false, !aAutoInsulated, aMaterial.getRGBA()).getStackForm(1L)); registerOre(OrePrefixes.wireGt04, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 2, "wire." + aMaterial.getLocalizedName().toLowerCase() + ".04", "4x " + aMaterial.getLocalizedName() + " Wire", 0.375F, aLoss, 4L * aAmperage, aVoltage, false, !aAutoInsulated, aMaterial.getRGBA()).getStackForm(1L)); @@ -210,8 +211,8 @@ public class GregtechConduits { V = 9; } else { - Utils.LOG_ERROR("Failed to set voltage on "+Material.name()+". Invalid voltage of "+Voltage+"V set."); - Utils.LOG_ERROR(Material.name()+" has defaulted to 8v."); + Logger.ERROR("Failed to set voltage on "+Material.name()+". Invalid voltage of "+Voltage+"V set."); + Logger.ERROR(Material.name()+" has defaulted to 8v."); V = 0; } //makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false); @@ -268,7 +269,7 @@ public class GregtechConduits { output = "Void"; } - Utils.LOG_INFO("Generating "+output+" pipes & respective recipes."); + Logger.INFO("Generating "+output+" pipes & respective recipes."); ItemStack pipeIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingot"+output, 1); ItemStack pipePlate = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plate"+output, 1); @@ -280,11 +281,11 @@ public class GregtechConduits { } //Check all pipes are not null - Utils.LOG_WARNING("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false)); - Utils.LOG_WARNING("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false)); - Utils.LOG_WARNING("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false)); - Utils.LOG_WARNING("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false)); - Utils.LOG_WARNING("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false)); + Logger.WARNING("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false)); + Logger.WARNING("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false)); + Logger.WARNING("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false)); + Logger.WARNING("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false)); + Logger.WARNING("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false)); int eut = 120; int time; @@ -351,7 +352,7 @@ public class GregtechConduits { pipePlateDouble, "craftingToolWrench", pipePlateDouble, ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1)); } else { - Utils.LOG_INFO("Failed to add a recipe for "+materialName+" Huge pipes. Double plates probably do not exist."); + Logger.INFO("Failed to add a recipe for "+materialName+" Huge pipes. Double plates probably do not exist."); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java index 9b11baa2a0..7c419f5d36 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_Cyclotron; @@ -8,7 +8,7 @@ public class GregtechCyclotron { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering COMET Cyclotron."); + Logger.INFO("Gregtech5u Content | Registering COMET Cyclotron."); run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index af856df84e..0c1cdf9855 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -4,11 +4,11 @@ import gregtech.api.enums.*; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.Recipe_GT; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; public class GregtechDehydrator { public static void run() { if (LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators."); + Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators."); if (CORE.ConfigSwitches.enableMachine_Dehydrators) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index db389e5919..1232106d65 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -2,8 +2,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.creative.GregtechMetaCreativeEnergyBuffer; @@ -18,7 +18,7 @@ public class GregtechEnergyBuffer public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("Gregtech5u Content | Registering Energy Buffer Blocks."); + Logger.INFO("Gregtech5u Content | Registering Energy Buffer Blocks."); if (CORE.ConfigSwitches.enableMachine_RocketEngines) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index 0fbf59a675..bae9396bb0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -2,11 +2,11 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ public class GregtechGeothermalThermalGenerator { public static void run() { if (LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); + Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); if (CORE.ConfigSwitches.enableMachine_GeothermalEngines) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index a241fa7e42..4a76f6a88e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_AlloyBlastSmelter; @@ -9,7 +9,7 @@ public class GregtechIndustrialBlastSmelter { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index bb317487d7..9a595265ac 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialCentrifuge; @@ -9,7 +9,7 @@ public class GregtechIndustrialCentrifuge { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index 4a0b6cff96..4fbcd3ecdb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialCokeOven; @@ -9,7 +9,7 @@ public class GregtechIndustrialCokeOven { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index 8d0760d7dc..fe05c17d1f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialCuttingMachine; @@ -9,7 +9,7 @@ public class GregtechIndustrialCuttingFactory { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index bdcee6be3d..e20d59df0e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialElectrolyzer; @@ -9,7 +9,7 @@ public class GregtechIndustrialElectrolyzer { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index be40f59c06..9099bf8a8c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_Refinery; @@ -9,7 +9,7 @@ public class GregtechIndustrialFuelRefinery { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java index 05988a1fdb..5da9dbfe9f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityGeneratorArray; @@ -8,7 +8,7 @@ public class GregtechIndustrialGeneratorArray { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Generator Array Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Generator Array Multiblock."); //if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // TODO run1(); //} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index ef244020a5..e1083df78d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator; @@ -9,7 +9,7 @@ public class GregtechIndustrialMacerator { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 10caa89f75..dda459f25d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MassFabricator; @@ -9,7 +9,7 @@ public class GregtechIndustrialMassFabricator { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java index 81252f77a9..6e650948e0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MultiTank; @@ -9,7 +9,7 @@ public class GregtechIndustrialMultiTank { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); + Logger.INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); if (CORE.ConfigSwitches.enableMultiblock_MultiTank) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index 3629ebdecc..abff78105d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialPlatePress; @@ -9,7 +9,7 @@ public class GregtechIndustrialPlatePress { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index 62f4209456..55f3f57210 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialSifter; @@ -10,7 +10,7 @@ public class GregtechIndustrialSifter { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // TODO run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index 910dd33576..92cecb0730 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialThermalCentrifuge; @@ -10,7 +10,7 @@ public class GregtechIndustrialThermalCentrifuge { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index 124661a917..84c8441aaf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityTreeFarm; @@ -9,7 +9,7 @@ public class GregtechIndustrialTreeFarm { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index f6fb887b01..fa7c20da1d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialThermalCentrifuge; @@ -11,7 +11,7 @@ public class GregtechIndustrialWashPlant { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index a883ded0dc..1be17c685c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialWireMill; @@ -9,7 +9,7 @@ public class GregtechIndustrialWiremill { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); + Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java index 30f3d49734..10ff50ab52 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IronBlastFurnace; @@ -9,7 +9,7 @@ public class GregtechIronBlastFurnace { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Iron Blast Furnace."); + Logger.INFO("Gregtech5u Content | Registering Iron Blast Furnace."); if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index cb731012b6..6740dc2aca 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMTE_NuclearReactor; @@ -9,7 +9,7 @@ public class GregtechLFTR { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); + Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java index 7f88c49782..a6d9f7e7e1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java @@ -8,8 +8,8 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.Recipe_GT; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.fluid.FluidUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -34,7 +34,7 @@ public class GregtechMiniRaFusion { int mRecipeCount = 0; GT_Recipe_Map r = GT_Recipe.GT_Recipe_Map.sFusionRecipes; final Collection<GT_Recipe> x = r.mRecipeList; - Utils.LOG_INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug."); + Logger.INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug."); for (final GT_Recipe newBo : x) { if (Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes.addRecipe( true, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java index 320d9980c4..582cd542b6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java @@ -20,6 +20,7 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; @@ -33,7 +34,7 @@ public class GregtechNitroDieselFix { @SuppressWarnings("unchecked") public static void run(){ if (CORE.ConfigSwitches.enableNitroFix){ - Utils.LOG_INFO("Gregtech5u Content | Attempting to Fix Nitro-Diesel production."); + Logger.INFO("Gregtech5u Content | Attempting to Fix Nitro-Diesel production."); try { int mSub = Utils.getGregtechSubVersion(); if (mSub != 0){ @@ -42,7 +43,7 @@ public class GregtechNitroDieselFix { Object df = mb.getConstructor(int.class, TextureSet.class, String.class).newInstance(975, TextureSet.SET_FLUID, "Nitro-Diesel [Old]"); if (mb.isInstance(df)){ - Utils.LOG_INFO("[Nitro] Created new instance of Material builder, for Nitro fix."); + Logger.INFO("[Nitro] Created new instance of Material builder, for Nitro fix."); //Get Methods Method addFluid = mb.getDeclaredMethod("addFluid"); @@ -53,7 +54,7 @@ public class GregtechNitroDieselFix { Method setTemp = mb.getDeclaredMethod("setLiquidTemperature", int.class); Method setRGB = mb.getDeclaredMethod("setRGB", int.class, int.class, int.class); Method construct = mb.getDeclaredMethod("constructMaterial"); - Utils.LOG_INFO("[Nitro] Got internal methods for setting fields."); + Logger.INFO("[Nitro] Got internal methods for setting fields."); //Invoke the methods addFluid.invoke(df); @@ -64,10 +65,10 @@ public class GregtechNitroDieselFix { setTemp.invoke(df, 295); setRGB.invoke(df, 200, 255, 0); Materials mNitroFix = (Materials) construct.invoke(df); - Utils.LOG_INFO("[Nitro] Invoked 8 method calls successfully."); + Logger.INFO("[Nitro] Invoked 8 method calls successfully."); GT_Mod.gregtechproxy.addFluid("NitroFuel_Old", "Nitro Diesel [Old]", mNitroFix, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, mNitroFix, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - Utils.LOG_INFO("[Nitro] Added a fluid."); + Logger.INFO("[Nitro] Added a fluid."); /** @@ -101,7 +102,7 @@ public class GregtechNitroDieselFix { } } } - Utils.LOG_INFO("[Nitro] Found "+mIndexSingle+" single block Chemical Reactor recipes to remove."); + Logger.INFO("[Nitro] Found "+mIndexSingle+" single block Chemical Reactor recipes to remove."); //Iterate Multi Block recipes for Nitro production. for (GT_Recipe rnd : xMulti){ @@ -111,7 +112,7 @@ public class GregtechNitroDieselFix { } } } - Utils.LOG_INFO("[Nitro] Found "+mIndexMulti+" multi block Chemical Reactor recipes to remove."); + Logger.INFO("[Nitro] Found "+mIndexMulti+" multi block Chemical Reactor recipes to remove."); //Remove Single Block recipes found. int mRemovedSingle = 0; @@ -121,7 +122,7 @@ public class GregtechNitroDieselFix { mRemovedSingle++; } } - Utils.LOG_INFO("[Nitro] Removed "+mRemovedSingle+" single block Chemical Reactor recipes."); + Logger.INFO("[Nitro] Removed "+mRemovedSingle+" single block Chemical Reactor recipes."); //Remove Multi Block recipes found. for (GT_Recipe multi : toRemoveMulti){ @@ -129,7 +130,7 @@ public class GregtechNitroDieselFix { mRemovedMulti++; } } - Utils.LOG_INFO("[Nitro] Removed "+mRemovedMulti+" multi block Chemical Reactor recipes."); + Logger.INFO("[Nitro] Removed "+mRemovedMulti+" multi block Chemical Reactor recipes."); Materials mGlycerol = Materials.valueOf("Glycerol"); Materials mLightFuel = Materials.valueOf("LightFuel"); @@ -138,34 +139,34 @@ public class GregtechNitroDieselFix { Materials mFuels[] = {mLightFuel, Materials.Fuel}; for (Materials fuel : mFuels){ boolean didAdd[] = new boolean[3]; - Utils.LOG_INFO("[Nitro] Getting ready to add back in the old nitro-diesel recipe to the mixer, using "+fuel.mDefaultLocalName+" as the fuel input."); + Logger.INFO("[Nitro] Getting ready to add back in the old nitro-diesel recipe to the mixer, using "+fuel.mDefaultLocalName+" as the fuel input."); didAdd[0] = GT_Values.RA.addMixerRecipe(getCells(fuel, 4), getCells(mGlycerol, 1), GT_Values.NI, GT_Values.NI, GT_Values.NF, GT_Values.NF, getCells(mNitroFix, 5), 20, 30); didAdd[1] = GT_Values.RA.addMixerRecipe(getCells(fuel, 4), GT_Values.NI, GT_Values.NI, GT_Values.NI, mGlycerol.getFluid(1000L),mNitroFix.getFluid(5000L), ItemList.Cell_Empty.get(4L), 20, 30); didAdd[2] = GT_Values.RA.addMixerRecipe(getCells(mGlycerol, 1), GT_Values.NI,GT_Values.NI,GT_Values.NI, fuel.getFluid(4000L),mNitroFix.getFluid(5000L), ItemList.Cell_Empty.get(1L), 20, 30); - Utils.LOG_INFO("[Nitro] Did the recipes add? 1: "+didAdd[0]+" | 2: "+didAdd[1]+" | 3: "+didAdd[2]); + Logger.INFO("[Nitro] Did the recipes add? 1: "+didAdd[0]+" | 2: "+didAdd[1]+" | 3: "+didAdd[2]); } for (Materials fuel : mFuels){ boolean didAdd[] = new boolean[3]; - Utils.LOG_INFO("[Nitro] Getting ready to add back in the old nitro-diesel recipe to the chemical reactors, using "+fuel.mDefaultLocalName+" as the fuel input."); + Logger.INFO("[Nitro] Getting ready to add back in the old nitro-diesel recipe to the chemical reactors, using "+fuel.mDefaultLocalName+" as the fuel input."); didAdd[0] = GT_Values.RA.addChemicalRecipe(getCells(fuel, 4), getCells(mGlycerol, 1), GT_Values.NF, GT_Values.NF, getCells(mNitroFix, 5), 20); didAdd[1] = GT_Values.RA.addChemicalRecipe(getCells(fuel, 4), GT_Values.NI, mGlycerol.getFluid(1000L),mNitroFix.getFluid(5000L), ItemList.Cell_Empty.get(4L), 20); didAdd[2] = GT_Values.RA.addChemicalRecipe(getCells(mGlycerol, 1), GT_Values.NI, fuel.getFluid(4000L),mNitroFix.getFluid(5000L), ItemList.Cell_Empty.get(1L), 20); - Utils.LOG_INFO("[Nitro] Did the recipes add? 1: "+didAdd[0]+" | 2: "+didAdd[1]+" | 3: "+didAdd[2]); + Logger.INFO("[Nitro] Did the recipes add? 1: "+didAdd[0]+" | 2: "+didAdd[1]+" | 3: "+didAdd[2]); } - Utils.LOG_INFO("[Nitro] Getting ready to add back in the old glycerol recipe!"); + Logger.INFO("[Nitro] Getting ready to add back in the old glycerol recipe!"); GT_Values.RA.addChemicalRecipe(getCells(Materials.Nitrogen, 1), getDust(Materials.Carbon, 1), Materials.Water.getFluid(2000L), mGlycerol.getFluid(3000L), ItemList.Cell_Empty.get(1), 3000); - Utils.LOG_INFO("[Nitro] Added recipes."); + Logger.INFO("[Nitro] Added recipes."); } } } } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - Utils.LOG_INFO("[Nitro] ================ Error ================"); + Logger.INFO("[Nitro] ================ Error ================"); e.printStackTrace(); - Utils.LOG_INFO("[Nitro] ================ Error ================"); + Logger.INFO("[Nitro] ================ Error ================"); } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index cec8dc1810..9e006ba59e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.*; @@ -9,7 +9,7 @@ public class GregtechPollutionDevices { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Anti-Pollution Devices."); + Logger.INFO("Gregtech5u Content | Registering Anti-Pollution Devices."); if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index 6a2e55f3c9..3abf673930 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -4,9 +4,9 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.OreDictNames; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery; @@ -16,7 +16,7 @@ public class GregtechPowerSubStation { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Power Substation Node."); + Logger.INFO("Gregtech5u Content | Registering Power Substation Node."); if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java index 954f652b40..a7332657ce 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntity_RTG; @@ -8,7 +8,7 @@ public class GregtechRTG { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering RTG."); + Logger.INFO("Gregtech5u Content | Registering RTG."); run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 35334f3e34..b929b1e673 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -2,11 +2,11 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ public class GregtechRocketFuelGenerator { public static void run() { if (LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); + Logger.INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); if (CORE.ConfigSwitches.enableMachine_RocketEngines) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java index 282e08de30..cc7e43cbe8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java @@ -2,15 +2,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock; public class GregtechSafeBlock { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Lockable Safe Blocks."); + Logger.INFO("Gregtech5u Content | Registering Lockable Safe Blocks."); if (CORE.ConfigSwitches.enableMachine_Safes) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java index 77a8f8e517..45f78d660b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java @@ -1,16 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; public class GregtechSolarGenerators { public static void run() { if (LoadedMods.Gregtech && ConfigSwitches.enableMachine_SolarGenerators) { - Utils.LOG_INFO("Gregtech5u Content | Registering Solar Generator Blocks."); + Logger.INFO("Gregtech5u Content | Registering Solar Generator Blocks."); if (CORE.ConfigSwitches.enableMachine_SolarGenerators) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java index ec7f55a210..60e6b31936 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaCondensor; @@ -9,7 +9,7 @@ public class GregtechSteamCondenser { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Steam Condensor."); + Logger.INFO("Gregtech5u Content | Registering Steam Condensor."); if (CORE.ConfigSwitches.enableMachine_SteamConverter) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index d30007eb22..5cf3c346ae 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java @@ -1,15 +1,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank; public class GregtechTieredFluidTanks { public static void run() { if (LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); + Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); if (CORE.ConfigSwitches.enableMachine_FluidTanks) { run1(); } @@ -19,9 +19,9 @@ public class GregtechTieredFluidTanks { private static void run1() { int ID = 817; - Utils.LOG_INFO("Is New Horizons Loaded? " + CORE.GTNH); + Logger.INFO("Is New Horizons Loaded? " + CORE.GTNH); if (CORE.GTNH) { - Utils.LOG_INFO("Only loading ULV-IV tier tanks for New Horizons Modpack."); + Logger.INFO("Only loading ULV-IV tier tanks for New Horizons Modpack."); } GregtechItemList.GT_FluidTank_ULV .set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.00", "Ultra Low Voltage Fluid Tank", 0) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index 8dede46019..07139da024 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java @@ -1,14 +1,14 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaTreeFarmerStructural; public class GregtechTreeFarmerTE { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); + Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { run1(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java index 6e7e71e5b9..a6fef4dddd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; @@ -12,7 +13,7 @@ public class GregtechWirelessChargers { public static void run(){ if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Utils.LOG_INFO("Gregtech5u Content | Registering Wireless Chargers."); + Logger.INFO("Gregtech5u Content | Registering Wireless Chargers."); long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java index d6925035b0..289ea342f5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java @@ -2,11 +2,11 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator; @@ -16,7 +16,7 @@ public class NewHorizonsAccelerator { public static void run() { if (LoadedMods.Gregtech && !CORE.GTNH) { - Utils.LOG_INFO("New Horizons Content | Registering World Accelerators."); + Logger.INFO("New Horizons Content | Registering World Accelerators."); if (CORE.ConfigSwitches.enableMachine_WorldAccelerators) { run1(); } |