diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/helpers')
6 files changed, 76 insertions, 70 deletions
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 ed11baa5ed..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")){ @@ -239,6 +239,15 @@ public class TreeFarmHelper { else if (aStack.getItemDamage() == 140 || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.140")){ return SAWTOOL.BUZZSAW; } + else if (aStack.getItemDamage() == 110 || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.110")){ + return SAWTOOL.CHAINSAW; + } + else if (aStack.getItemDamage() == 112 || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.112")){ + return SAWTOOL.CHAINSAW; + } + else if (aStack.getItemDamage() == 114 || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.114")){ + return SAWTOOL.CHAINSAW; + } else { return SAWTOOL.NONE; } 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)); } /** * Called when the container is closed. */ + @Override public void onContainerClosed(EntityPlayer p_75134_1_) { super.onContainerClosed(p_75134_1_); @@ -97,6 +94,7 @@ public class AC_Helper_Container extends Container } } + @Override public boolean canInteractWith(EntityPlayer p_75145_1_) { return true; @@ -105,11 +103,13 @@ public class AC_Helper_Container extends Container /** * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that. */ + @Override public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_){ ItemStack itemstack = null; return itemstack; } + @Override public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_) { return p_94530_2_.inventory != this.craftResult && super.func_94530_a(p_94530_1_, p_94530_2_); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java index 052b611250..84cf6067d1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_AutoCrafter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -26,11 +26,11 @@ public class AC_Helper_Utils { if (!sAutocrafterMap.containsValue(AC)){ int increase = sAutocrafterMap.size()+1; sAutocrafterMap.put(increase, AC); - Utils.LOG_INFO("[A-C] "+"Added Auto-Crafter to index on position "+increase+"."); + Logger.INFO("[A-C] "+"Added Auto-Crafter to index on position "+increase+"."); return increase; } else { - Utils.LOG_INFO("[A-C] Tried adding an Auto-Crafter to Index, but found one already there."); + Logger.INFO("[A-C] Tried adding an Auto-Crafter to Index, but found one already there."); } return 0; } @@ -68,7 +68,7 @@ public class AC_Helper_Utils { } } } - Utils.LOG_WARNING("Failed. [getCrafterByID]"); + Logger.WARNING("Failed. [getCrafterByID]"); return null; } @@ -83,7 +83,7 @@ public class AC_Helper_Utils { } } } - Utils.LOG_WARNING("Failed. [getIDByCrafter]"); + Logger.WARNING("Failed. [getIDByCrafter]"); return 0; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java index 2773bea825..cbf6445559 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java @@ -10,7 +10,7 @@ import java.util.Map.Entry; import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap; import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; import net.minecraft.entity.player.EntityPlayer; @@ -28,7 +28,7 @@ public class TesseractHelper { public final static boolean isGeneratorOwnedByPlayer(EntityPlayer player, GT_MetaTileEntity_TesseractGenerator generator) { if (player == null){ - Utils.LOG_WARNING("Failed. [isGeneratorOwnedByPlayer]"); + Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]"); return false; } //Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 1"); @@ -47,7 +47,7 @@ public class TesseractHelper { } } } - Utils.LOG_WARNING("Failed. [isGeneratorOwnedByPlayer]"); + Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]"); return false; } @@ -58,7 +58,7 @@ public class TesseractHelper { return false; } UUID playerIdentifier = player.getUniqueID(); - Utils.LOG_WARNING("Setting Generator on "+freq+" for "+player.getDisplayName()+"."); + Logger.WARNING("Setting Generator on "+freq+" for "+player.getDisplayName()+"."); if (playerIdentifier != null) { Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap .get(playerIdentifier); @@ -66,7 +66,7 @@ public class TesseractHelper { Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractGenerator>(); newOwnershipMap.put(freq, generator); sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap); - Utils.LOG_WARNING("Success! [Empty Map]"); + Logger.WARNING("Success! [Empty Map]"); return true; } else if (sTesseractGeneratorOwnershipMap.containsKey(playerIdentifier)) { Map<Integer, GT_MetaTileEntity_TesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap @@ -76,11 +76,11 @@ public class TesseractHelper { } ownershipMap.put(freq, generator); sTesseractGeneratorOwnershipMap.put(playerIdentifier, ownershipMap); - Utils.LOG_WARNING("Success!"); + Logger.WARNING("Success!"); return true; } } - Utils.LOG_WARNING("Failed. [setGeneratorOwnershipByPlayer]"); + Logger.WARNING("Failed. [setGeneratorOwnershipByPlayer]"); return false; } @@ -91,7 +91,7 @@ public class TesseractHelper { return null; } UUID playerIdentifier = player.getUniqueID(); - Utils.LOG_WARNING("Getting Generator on "+freq+" for "+player.getDisplayName()+"."); + Logger.WARNING("Getting Generator on "+freq+" for "+player.getDisplayName()+"."); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { //Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 1"); Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player); @@ -102,12 +102,12 @@ public class TesseractHelper { Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current = i.next(); if (current.getKey().equals(freq)) { //Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 3"); - Utils.LOG_WARNING("Success!"); + Logger.WARNING("Success!"); return current.getValue(); } } } - Utils.LOG_WARNING("Failed. [getGeneratorByFrequency]"); + Logger.WARNING("Failed. [getGeneratorByFrequency]"); return null; } @@ -161,14 +161,14 @@ public class TesseractHelper { } UUID playerIdentifier = player.getUniqueID(); if (playerIdentifier != null) { - Utils.LOG_WARNING("Setting Terminal on "+freq+" for "+player.getDisplayName()+"."); + Logger.WARNING("Setting Terminal on "+freq+" for "+player.getDisplayName()+"."); Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap .get(playerIdentifier); if (playerOwned == null || playerOwned.isEmpty()) { Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractTerminal>(); newOwnershipMap.put(freq, generator); sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap); - Utils.LOG_WARNING("Success! [Empty Map]"); + Logger.WARNING("Success! [Empty Map]"); return true; } else if (sTesseractTerminalOwnershipMap.containsKey(playerIdentifier)) { Map<Integer, GT_MetaTileEntity_TesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap @@ -177,11 +177,11 @@ public class TesseractHelper { ownershipMap.put(freq, generator); } sTesseractTerminalOwnershipMap.put(playerIdentifier, ownershipMap); - Utils.LOG_WARNING("Success!"); + Logger.WARNING("Success!"); return true; } } - Utils.LOG_WARNING("Failed. [setTerminalOwnershipByPlayer]"); + Logger.WARNING("Failed. [setTerminalOwnershipByPlayer]"); return false; } @@ -192,7 +192,7 @@ public class TesseractHelper { return null; } UUID playerIdentifier = player.getUniqueID(); - Utils.LOG_WARNING("Getting Terminal on "+freq+" for "+player.getDisplayName()+"."); + Logger.WARNING("Getting Terminal on "+freq+" for "+player.getDisplayName()+"."); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player); Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet(); @@ -200,12 +200,12 @@ public class TesseractHelper { while (i.hasNext()) { Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current = i.next(); if (current.getKey().equals(freq)) { - Utils.LOG_WARNING("Success!"); + Logger.WARNING("Success!"); return current.getValue(); } } } - Utils.LOG_WARNING("Failed. [getTerminalByFrequency]"); + Logger.WARNING("Failed. [getTerminalByFrequency]"); return null; } |