aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/base
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
commit5715a32d2901922503fd850f3a68503fb77467c3 (patch)
tree7e12520fbc23844e99493d55af4410a785538e35 /src/Java/gtPlusPlus/core/item/base
parent2a4795f65d98ff60a177d7d6a5552fd687d9f6e8 (diff)
downloadGT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.gz
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.bz2
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.zip
- Disabled some logging.
% Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/base/CoreItem.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java34
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java12
-rw-r--r--src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java3
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java8
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java3
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java8
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java4
14 files changed, 52 insertions, 52 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java
index c85eea4bed..8ae28fc343 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java
@@ -5,8 +5,8 @@ import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -159,7 +159,7 @@ public class BaseItemDamageable extends Item {
@Override
public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) {
- Utils.LOG_INFO("Does Leave Table? "+stack.getDisplayName());
+ Logger.INFO("Does Leave Table? "+stack.getDisplayName());
return true;
}
@@ -175,7 +175,7 @@ public class BaseItemDamageable extends Item {
@Override
public boolean hasContainerItem(ItemStack stack) {
- Utils.LOG_INFO("hasContainerItem? "+stack.getDisplayName());
+ Logger.INFO("hasContainerItem? "+stack.getDisplayName());
return true;
}
diff --git a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
index 4bff33493e..04bb1d59d8 100644
--- a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
+++ b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
@@ -5,8 +5,8 @@ import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -44,7 +44,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer
this.entityMODID = MODID;
// DEBUG
- Utils.LOG_WARNING("Spawn egg constructor for "+this.entityToSpawnName);
+ Logger.WARNING("Spawn egg constructor for "+this.entityToSpawnName);
}
/**
@@ -174,7 +174,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer
else
{
//DEBUG
- Utils.LOG_WARNING("Entity not found "+this.entityToSpawnName);
+ Logger.WARNING("Entity not found "+this.entityToSpawnName);
}
}
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 951d2050f5..8baf909af7 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -5,8 +5,8 @@ import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -175,7 +175,7 @@ public class CoreItem extends Item
if (this.turnsInto != null){
if (entityHolding instanceof EntityPlayer){
- Utils.LOG_INFO("Replacing "+iStack.getDisplayName()+" with "+this.turnsInto.getDisplayName()+".");
+ Logger.INFO("Replacing "+iStack.getDisplayName()+" with "+this.turnsInto.getDisplayName()+".");
final ItemStack tempTransform = this.turnsInto;
if (iStack.stackSize == 64){
tempTransform.stackSize=64;
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 6aa1f54cc8..e75d2a69e8 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -8,9 +8,9 @@ import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.entity.EntityUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
@@ -48,25 +48,25 @@ public class BaseItemDust extends Item{
GameRegistry.registerItem(this, unlocalizedName);
String temp = "";
- Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
+ Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
if (this.getUnlocalizedName().contains("item.")){
temp = this.getUnlocalizedName().replace("item.", "");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
else {
temp = this.getUnlocalizedName();
}
if (temp.contains("DustTiny")){
temp = temp.replace("itemD", "d");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
else if (temp.contains("DustSmall")){
temp = temp.replace("itemD", "d");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
else {
temp = temp.replace("itemD", "d");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
if ((temp != null) && !temp.equals("")){
GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
@@ -157,7 +157,7 @@ public class BaseItemDust extends Item{
}
private void addMacerationRecipe(){
- Utils.LOG_WARNING("Adding recipe for "+this.materialName+" Dusts");
+ Logger.WARNING("Adding recipe for "+this.materialName+" Dusts");
String tempIngot = this.getUnlocalizedName().replace("item.itemDust", "ingot");
final String tempDust = this.getUnlocalizedName().replace("item.itemDust", "dust");
@@ -168,17 +168,17 @@ public class BaseItemDust extends Item{
return;
}
- Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
+ Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
if (this.getUnlocalizedName().contains("item.")){
tempIngot = this.getUnlocalizedName().replace("item.", "");
- Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot);
+ Logger.WARNING("Generating OreDict Name: "+tempIngot);
}
else {
tempIngot = this.getUnlocalizedName();
}
tempIngot = tempIngot.replace("itemDust", "ingot");
- Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot);
+ Logger.WARNING("Generating OreDict Name: "+tempIngot);
final ItemStack[] outputStacks = {this.dustInfo.getDust(1)};
if ((tempIngot != null) && !tempIngot.equals("")){
tempInputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1);
@@ -224,30 +224,30 @@ public class BaseItemDust extends Item{
if ((temp != null) && !temp.equals("")){
if (this.dustInfo.requiresBlastFurnace()){
- Utils.LOG_WARNING("Adding recipe for Hot "+this.materialName+" Ingots in a Blast furnace.");
+ Logger.WARNING("Adding recipe for Hot "+this.materialName+" Ingots in a Blast furnace.");
final String tempIngot = temp.replace("ingot", "ingotHot");
final ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1);
if (null != tempOutputStack){
- Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot);
+ Logger.WARNING("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot);
this.addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*this.mTier);
}
return;
}
- Utils.LOG_WARNING("Adding recipe for "+this.materialName+" Ingots in a furnace.");
+ Logger.WARNING("Adding recipe for "+this.materialName+" Ingots in a furnace.");
final ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
//Utils.LOG_WARNING("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp);
if (null != tempOutputStack){
if ((this.mTier < 5) || !this.dustInfo.requiresBlastFurnace()){
if (CORE.GT_Recipe.addSmeltingAndAlloySmeltingRecipe(ItemUtils.getSimpleStack(this), tempOutputStack)){
- Utils.LOG_WARNING("Successfully added a furnace recipe for "+this.materialName);
+ Logger.WARNING("Successfully added a furnace recipe for "+this.materialName);
}
else {
- Utils.LOG_WARNING("Failed to add a furnace recipe for "+this.materialName);
+ Logger.WARNING("Failed to add a furnace recipe for "+this.materialName);
}
}
else if ((this.mTier >= 5) || this.dustInfo.requiresBlastFurnace()){
- Utils.LOG_WARNING("Adding recipe for "+this.materialName+" Ingots in a Blast furnace.");
- Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName());
+ Logger.WARNING("Adding recipe for "+this.materialName+" Ingots in a Blast furnace.");
+ Logger.WARNING("This will produce "+tempOutputStack.getDisplayName());
if (null != tempOutputStack){
this.addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*this.mTier);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index f19aaff4b3..2c32c0c8af 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -6,9 +6,9 @@ import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.StringUtils;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
import net.minecraft.entity.player.EntityPlayer;
@@ -54,25 +54,25 @@ public class BaseItemDustUnique extends Item{
}
String temp = "";
- Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
+ Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
if (this.getUnlocalizedName().contains("item.")){
temp = this.getUnlocalizedName().replace("item.", "");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
else {
temp = this.getUnlocalizedName();
}
if (temp.contains("DustTiny")){
temp = temp.replace("itemD", "d");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
else if (temp.contains("DustSmall")){
temp = temp.replace("itemD", "d");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
else {
temp = temp.replace("itemD", "d");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
if ((temp != null) && !temp.equals("")){
GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
index 0467d2647e..5f737b47a0 100644
--- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
+++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.item.base.foods;
import java.util.List;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
@@ -40,7 +41,7 @@ public class BaseItemHotFood extends BaseItemFood{
if (!world.isRemote){
if(iStack.getItemDamage() == this.cooldownTime) {
if (entityHolding instanceof EntityPlayer){
- Utils.LOG_INFO("Foods Done.");
+ Logger.INFO("Foods Done.");
((EntityPlayer) entityHolding).inventory.addItemStackToInventory(ItemUtils.getSimpleStack(this.output));
((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index 0933790de1..26b3ff2ce7 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -1,9 +1,9 @@
package gtPlusPlus.core.item.base.ingots;
import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
@@ -28,13 +28,13 @@ public class BaseItemIngot extends BaseItemComponent{
final ItemStack tempStack = ItemUtils.getSimpleStack(this, 9);
ItemStack tempOutput = null;
String temp = this.getUnlocalizedName().replace("item.itemIngot", "block");
- Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
+ Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
if (this.getUnlocalizedName().contains("item.")){
temp = this.getUnlocalizedName().replace("item.", "");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
temp = temp.replace("itemIngot", "block");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
if ((temp != null) && !temp.equals("")){
tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
if (tempOutput != null){
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index b6f139b74a..329fae509a 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.item.base.ingots;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
@@ -44,7 +45,7 @@ public class BaseItemIngotHot extends BaseItemIngot{
}
private void generateRecipe(){
- Utils.LOG_WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+this.materialName+".");
+ Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+this.materialName+".");
GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getSimpleStack(this), this.outputIngot.copy(), 60*this.mTier);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
index e821258d8e..8534172bbb 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
@@ -3,9 +3,9 @@ package gtPlusPlus.core.item.base.ingots;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.entity.EntityUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
@@ -67,13 +67,13 @@ public class BaseItemIngot_OLD extends Item{
final ItemStack tempStack = ItemUtils.getSimpleStack(this, 9);
ItemStack tempOutput = null;
String temp = this.getUnlocalizedName().replace("item.itemIngot", "block");
- Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
+ Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
if (this.getUnlocalizedName().contains("item.")){
temp = this.getUnlocalizedName().replace("item.", "");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
}
temp = temp.replace("itemIngot", "block");
- Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+ Logger.WARNING("Generating OreDict Name: "+temp);
if ((temp != null) && !temp.equals("")){
tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
if (tempOutput != null){
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java
index 44ec66c47b..4ac7c7f5ff 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java
@@ -1,8 +1,8 @@
package gtPlusPlus.core.item.base.itemblock;
import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.player.PlayerUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
@@ -73,7 +73,7 @@ public class ItemBlockNBT extends ItemBlock {
TileEntityBase tTileEntity = (TileEntityBase) aWorld.getTileEntity(aX, aY, aZ);
if (tTileEntity != null && aPlayer != null) {
if (tTileEntity.isServerSide()){
- Utils.LOG_INFO("Setting Tile Entity information");
+ Logger.INFO("Setting Tile Entity information");
NBTTagCompound aNBT = GT_Utility.ItemNBT.getNBT(aStack);
tTileEntity.setOwnerInformation(aNBT.getString("mOwner"), aNBT.getString("mUUID"), aNBT.getBoolean("mOP"));
}
diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
index 27059e8fde..96dd2c5a16 100644
--- a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
+++ b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
@@ -9,11 +9,8 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.entity.EntityUtils;
import gtPlusPlus.core.util.item.ItemUtils;
-import gtPlusPlus.core.util.math.MathUtils;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -80,6 +77,7 @@ public class BaseItemMisc extends Item{
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
+ @Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
if (this.miscType == MiscTypes.DROP && LoadedMods.Forestry){
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index 5fe7ca6424..0259a6c6f3 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -1,9 +1,9 @@
package gtPlusPlus.core.item.base.rods;
import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.item.ItemStack;
public class BaseItemRod extends BaseItemComponent{
@@ -15,7 +15,7 @@ public class BaseItemRod extends BaseItemComponent{
private void addExtruderRecipe(){
- Utils.LOG_WARNING("Adding cutter recipe for "+this.materialName+" Rods");
+ Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods");
final ItemStack stackStick = this.componentMaterial.getRod(1);
final ItemStack stackBolt = this.componentMaterial.getBolt(4);
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
index 84d7d00472..1ac307d68c 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
@@ -1,9 +1,9 @@
package gtPlusPlus.core.item.base.rods;
import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
@@ -20,7 +20,7 @@ public class BaseItemRodLong extends BaseItemComponent{
}
private void addExtruderRecipe(){
- Utils.LOG_WARNING("Adding recipe for Long "+this.materialName+" Rods");
+ Logger.WARNING("Adding recipe for Long "+this.materialName+" Rods");
final String tempStick = this.unlocalName.replace("itemRodLong", "stick");
final String tempStickLong = this.unlocalName.replace("itemRodLong", "stickLong");
diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index f35e4834cc..733a8aa9d7 100644
--- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -1,9 +1,9 @@
package gtPlusPlus.core.item.base.screws;
import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;
@@ -15,7 +15,7 @@ public class BaseItemScrew extends BaseItemComponent{
}
private void addLatheRecipe(){
- Utils.LOG_WARNING("Adding recipe for "+this.materialName+" Screws");
+ Logger.WARNING("Adding recipe for "+this.materialName+" Screws");
final ItemStack boltStack = ItemUtils.getItemStackOfAmountFromOreDict(this.unlocalName.replace("itemScrew", "bolt"), 1);
if (null != boltStack){
GT_Values.RA.addLatheRecipe(