aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java53
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java20
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java16
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java34
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java25
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java14
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java28
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java61
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_AutoCrafter.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java96
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityAnimalFarm.java60
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java41
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java139
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java54
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java26
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java38
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCokeOven.java14
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCuttingMachine.java20
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialMacerator.java22
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java82
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSinter.java22
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java34
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java32
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWireMill.java22
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java56
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java73
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java79
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java52
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java1
47 files changed, 684 insertions, 665 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index e5c9cace94..6de9fa1259 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -6,7 +6,7 @@ import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraftforge.oredict.OreDictionary;
@@ -19,7 +19,7 @@ public class Meta_GT_Proxy {
public static IIconRegister sBlockIcons, sItemIcons;
public Meta_GT_Proxy() {
- Utils.LOG_INFO("GT_PROXY - initialized.");
+ Logger.INFO("GT_PROXY - initialized.");
for (final String tOreName : OreDictionary.getOreNames()) {
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index e57a936697..89b7b728b6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.blocks.fluid;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.base.cell.BaseItemCell;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
@@ -40,14 +41,14 @@ public class GregtechFluidHandler {
if (!LoadedMods.ThermalFoundation){
- Utils.LOG_INFO("Adding in our own GT versions of Thermal Foundation Fluids");
+ Logger.INFO("Adding in our own GT versions of Thermal Foundation Fluids");
FluidUtils.addFluid("cryotheum", "Gelid Cryotheum", GT_Materials.Cryotheum, 4, -1200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
FluidUtils.addFluid("pyrotheum", "Blazing Pyrotheum", GT_Materials.Pyrotheum, 4, 4000, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
FluidUtils.addFluid("ender", "Resonant Ender", GT_Materials.Ender, 4, 4000, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
}
if (LoadedMods.IndustrialCraft2){
- Utils.LOG_INFO("Adding in GT Fluids for various nuclear related content.");
+ Logger.INFO("Adding in GT Fluids for various nuclear related content.");
FluidUtils.addFluid("hydrofluoricAcid", "Industrial Strength Hydrofluoric Acid", GT_Materials.HydrofluoricAcid, 1, 120, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
generateIC2FluidCell("HydrofluoricAcid");
@@ -65,10 +66,10 @@ public class GregtechFluidHandler {
if (!LoadedMods.IHL || (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null)){
if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null){
if (LoadedMods.IHL){
- Utils.LOG_INFO("IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
+ Logger.INFO("IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
}
else {
- Utils.LOG_INFO("No Suitable versions of Hydrogen Chloride available, adding our own.");
+ Logger.INFO("No Suitable versions of Hydrogen Chloride available, adding our own.");
}
FluidUtils.addFluid("hydrogenChloride", "Industrial Strength Hydrogen Chloride", GT_Materials.HydrogenChloride, 4, 75, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
generateIC2FluidCell("HydrogenChloride");
@@ -87,7 +88,7 @@ public class GregtechFluidHandler {
}
private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps){
- Utils.LOG_INFO("Adding a Cell for "+fluidNameWithCaps);
+ Logger.INFO("Adding a Cell for "+fluidNameWithCaps);
if (LoadedMods.IndustrialCraft2){
return Utils.createInternalNameAndFluidCell(fluidNameWithCaps);
}
@@ -95,7 +96,7 @@ public class GregtechFluidHandler {
}
private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps){
- Utils.LOG_INFO("Adding a Cell for "+fluidNameWithCaps);
+ Logger.INFO("Adding a Cell for "+fluidNameWithCaps);
if (LoadedMods.IndustrialCraft2){
return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps);
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index be1ceb2fd7..3795f9815f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -2,8 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures;
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
@@ -23,7 +23,7 @@ public class TexturesGtBlock {
public CustomIcon(final String aIconName) {
this.mIconName = aIconName;
- Utils.LOG_WARNING("Constructing a Custom Texture. " + this.mIconName);
+ Logger.WARNING("Constructing a Custom Texture. " + this.mIconName);
GregTech_API.sGTBlockIconload.add(this);
}
@@ -40,7 +40,7 @@ public class TexturesGtBlock {
@Override
public void run() {
this.mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":" + this.mIconName);
- Utils.LOG_WARNING("FIND ME _ Processing texture: "+this.getTextureFile().getResourcePath());
+ Logger.WARNING("FIND ME _ Processing texture: "+this.getTextureFile().getResourcePath());
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
index 31a95560da..db3812ad92 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
@@ -2,8 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures;
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
@@ -29,7 +29,7 @@ public final class TexturesGtTools {
public CustomIcon(final String aIconName) {
this.mIconName = aIconName;
- Utils.LOG_INFO("Constructing a Custom Texture. " + this.mIconName);
+ Logger.INFO("Constructing a Custom Texture. " + this.mIconName);
GregTech_API.sGTItemIconload.add(this);
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index 35cf3d02e1..210603ec0d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -1,16 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.*;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.array.BlockPos;
import gtPlusPlus.core.util.array.Pair;
@@ -184,20 +181,20 @@ public class ChargingHelper {
if (mEntity == null){
return false;
}
- Utils.LOG_WARNING("trying to map new player");
+ Logger.WARNING("trying to map new player");
if (mValidPlayers.containsKey(mPlayer)){
- Utils.LOG_WARNING("Key contains player already?");
+ Logger.WARNING("Key contains player already?");
return false;
}
else {
- Utils.LOG_WARNING("key not found, adding");
+ Logger.WARNING("key not found, adding");
Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode());
if (mValidPlayers.put(mPlayer, mEntry) == null){
- Utils.LOG_WARNING("Added a Player to the Tick Map.");
+ Logger.WARNING("Added a Player to the Tick Map.");
return true;
}
else {
- Utils.LOG_WARNING("Tried to add player but it was already there?");
+ Logger.WARNING("Tried to add player but it was already there?");
return false;
}
}
@@ -207,21 +204,21 @@ public class ChargingHelper {
if (mEntity == null){
return false;
}
- Utils.LOG_WARNING("trying to remove player from map");
+ Logger.WARNING("trying to remove player from map");
if (mValidPlayers.containsKey(mPlayer)){
- Utils.LOG_WARNING("key found, removing");
+ Logger.WARNING("key found, removing");
Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode());
if (mValidPlayers.remove(mPlayer, mEntry)){
- Utils.LOG_WARNING("Removed a Player to the Tick Map.");
+ Logger.WARNING("Removed a Player to the Tick Map.");
return true;
}
else {
- Utils.LOG_WARNING("Tried to remove player but it was not there?");
+ Logger.WARNING("Tried to remove player but it was not there?");
return false;
}
}
else {
- Utils.LOG_WARNING("Key does not contain player?");
+ Logger.WARNING("Key does not contain player?");
return false;
}
}
@@ -268,17 +265,17 @@ public class ChargingHelper {
for (ItemStack mTemp : mItems){
mItemSlot++;
if (mTemp != null){
- Utils.LOG_WARNING("Slot "+mItemSlot+" contains "+mTemp.getDisplayName());
+ Logger.WARNING("Slot "+mItemSlot+" contains "+mTemp.getDisplayName());
}
//Is item Electrical
if (isItemValid(mTemp)){
- Utils.LOG_WARNING("1");
+ Logger.WARNING("1");
//Transfer Limit
double mItemEuTLimit = ((IElectricItem) mTemp.getItem()).getTransferLimit(mTemp);
//Check if Tile has more or equal EU to what can be transferred into the item.
if (mEuStored >= mItemEuTLimit){
- Utils.LOG_WARNING("2");
+ Logger.WARNING("2");
double mItemMaxCharge = ((IElectricItem) mTemp.getItem()).getMaxCharge(mTemp);
double mitemCurrentCharge = ElectricItem.manager.getCharge(mTemp);
@@ -289,7 +286,7 @@ public class ChargingHelper {
//Try get charge direct from NBT for GT and IC2 stacks
try {
- Utils.LOG_WARNING("3");
+ Logger.WARNING("3");
if (mTemp.getItem() instanceof GT_MetaGenerated_Tool_01
|| mTemp.getItem() instanceof GT_MetaGenerated_Item_01
|| mTemp.getItem() instanceof GT_MetaGenerated_Item_02
@@ -327,7 +324,7 @@ public class ChargingHelper {
mVoltageIncrease = mItemEuTLimit;
}
- Utils.LOG_WARNING("4");
+ Logger.WARNING("4");
int mMulti;
if ((mitemCurrentCharge + (mVoltageIncrease*20)) <= (mItemMaxCharge - (mVoltageIncrease*20))){
@@ -342,15 +339,15 @@ public class ChargingHelper {
else {
mMulti = 1;
}
- Utils.LOG_WARNING("5");
+ Logger.WARNING("5");
int mMultiVoltage = (int) (mMulti*mVoltageIncrease);
if ((mitemCurrentCharge + mMultiVoltage) <= mItemMaxCharge){
- Utils.LOG_WARNING("6");
+ Logger.WARNING("6");
if (GT_ModHandler.chargeElectricItem(mTemp, mMultiVoltage, mTier, true, false) == 0){
- Utils.LOG_WARNING("6.5");
+ Logger.WARNING("6.5");
for (int i=0; i<mMulti;i++){
if (ElectricItem.manager.charge(mTemp, mVoltageIncrease, mTier, false, false) == 0){
continue;
@@ -358,10 +355,10 @@ public class ChargingHelper {
}
}
if (ElectricItem.manager.getCharge(mTemp) > mitemCurrentCharge){
- Utils.LOG_WARNING("7");
- mEntity.setEUVar((long) (mEuStored-(mVoltage*mMulti)));
+ Logger.WARNING("7");
+ mEntity.setEUVar(mEuStored-(mVoltage*mMulti));
mEuStored = mEntity.getEUVar();
- Utils.LOG_WARNING("Charged "+mTemp.getDisplayName()+" | Slot: "+mItemSlot+" | EU Multiplier: "+mMulti+" | EU/t input: "+mVoltageIncrease+" | EU/t consumed by Tile: "+mVoltage+" | Item Max Charge: "+mItemMaxCharge+" | Item Start Charge: "+mitemCurrentCharge+" | Item New Charge"+ElectricItem.manager.getCharge(mTemp));
+ Logger.WARNING("Charged "+mTemp.getDisplayName()+" | Slot: "+mItemSlot+" | EU Multiplier: "+mMulti+" | EU/t input: "+mVoltageIncrease+" | EU/t consumed by Tile: "+mVoltage+" | Item Max Charge: "+mItemMaxCharge+" | Item Start Charge: "+mitemCurrentCharge+" | Item New Charge"+ElectricItem.manager.getCharge(mTemp));
mChargedItems++;
}
}
@@ -371,7 +368,7 @@ public class ChargingHelper {
}
else {
if (mTemp != null){
- Utils.LOG_WARNING("Found Non-Valid item. "+mTemp.getDisplayName());
+ Logger.WARNING("Found Non-Valid item. "+mTemp.getDisplayName());
}
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java
index e3bfc81291..6a69c9f61a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Container;
import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_AutoCrafter;
@@ -23,7 +23,7 @@ public class CraftingHelper{
public final AC_Helper_Container inventory;
public CraftingHelper(GT4Entity_AutoCrafter AC){
- Utils.LOG_INFO("[A-C] Created a crafting helper.");
+ Logger.INFO("[A-C] Created a crafting helper.");
crafter = AC;
AC_Helper_Utils.addCrafter(AC);
//Get some variables.
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 3a0031c5d3..d023307820 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -9,9 +9,9 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.items.GT_MetaGenerated_Tool;
import gregtech.common.items.GT_MetaGenerated_Item_02;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.particles.BlockBreakParticles;
@@ -121,7 +121,7 @@ public class TreeFarmHelper {
}
final BonemealEvent event = new BonemealEvent(player, world, block, intX, intY, intZ);
if (MinecraftForge.EVENT_BUS.post(event)){
- Utils.LOG_MACHINE_INFO("Not sure why this returned false");
+ Logger.MACHINE_INFO("Not sure why this returned false");
return false;
}
if (event.getResult() == Result.ALLOW){
@@ -145,7 +145,7 @@ public class TreeFarmHelper {
}
public static boolean cleanUp(final IGregTechTileEntity aBaseMetaTileEntity){
- Utils.LOG_MACHINE_INFO("called cleanUp()");
+ Logger.MACHINE_INFO("called cleanUp()");
int cleanedUp = 0;
final int xDir = net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 11;
final int zDir = net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 11;
@@ -173,7 +173,7 @@ public class TreeFarmHelper {
)){
if (!testBlock.getUnlocalizedName().toLowerCase().contains("air") || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
- Utils.LOG_INFO("5:"+testBlock.getUnlocalizedName());
+ Logger.WARNING("5:"+testBlock.getUnlocalizedName());
} else {
aBaseMetaTileEntity.getWorld().setBlock(aBaseMetaTileEntity.getXCoord()+xDir+i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir+j, Blocks.bookshelf);
}
@@ -193,14 +193,14 @@ public class TreeFarmHelper {
){
if (!testBlock.getUnlocalizedName().toLowerCase().contains("air") || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
- Utils.LOG_INFO("0:"+testBlock.getUnlocalizedName());
+ Logger.WARNING("0:"+testBlock.getUnlocalizedName());
} else {
aBaseMetaTileEntity.getWorld().setBlock(aBaseMetaTileEntity.getXCoord()+xDir+i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir+j, Blocks.melon_block);
}
if (TreefarmManager.isLeaves(testBlock) || TreefarmManager.isWoodLog(testBlock)){
- Utils.LOG_INFO("1:"+testBlock.getUnlocalizedName());
+ Logger.WARNING("1:"+testBlock.getUnlocalizedName());
int posiX, posiY, posiZ;
posiX = aBaseMetaTileEntity.getXCoord()+xDir+i;
posiY = aBaseMetaTileEntity.getYCoord()+h;
@@ -211,11 +211,11 @@ public class TreeFarmHelper {
new BlockBreakParticles(aBaseMetaTileEntity.getWorld(), posiX, posiY, posiZ, Blocks.dirt);
}
else {
- //Utils.LOG_INFO("2:"+testBlock.getUnlocalizedName());
+ //Utils.LOG_WARNING("2:"+testBlock.getUnlocalizedName());
}
}
else {
- //Utils.LOG_INFO("1");
+ //Utils.LOG_WARNING("1");
}
@@ -223,13 +223,13 @@ public class TreeFarmHelper {
}
}
- Utils.LOG_MACHINE_INFO("cleaning up | "+cleanedUp );
+ Logger.MACHINE_INFO("cleaning up | "+cleanedUp );
return true;
}
public static SAWTOOL isCorrectMachinePart(final ItemStack aStack) {
if (aStack != null){
- //Utils.LOG_INFO("Found "+aStack.getDisplayName()+" in the GUI slot.");
+ //Utils.LOG_WARNING("Found "+aStack.getDisplayName()+" in the GUI slot.");
if ((aStack.getItem() instanceof GT_MetaGenerated_Item_02) || (aStack.getItem() instanceof GT_MetaGenerated_Tool)){
if (OrePrefixes.craftingTool.contains(aStack)){
if (aStack.getDisplayName().toLowerCase().contains("saw") || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.10")){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
index f5b066fdc2..b9a4d861b3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
@@ -1,14 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.helpers.autocrafter;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCraftResult;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.inventory.*;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.world.World;
@@ -69,16 +64,18 @@ public class AC_Helper_Container extends Container
/**
* Callback for when the crafting matrix is changed.
*/
+ @Override
public void onCraftMatrixChanged(IInventory p_75130_1_)
{
this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj));
- Utils.LOG_INFO("Crafted "+this.craftResult.getStackInSlot(0));
+ Logger.INFO("Crafted "+this.craftResult.getStackInSlot(0));