Reformat code

23 files changed, 1244 insertions, 1493 deletions

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
index d0be735248..acb6986ec6 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
@@ -3,8 +3,6 @@ package gregtech.common.items.behaviors;
 import gregtech.api.enums.SubTag;

 import gregtech.api.items.GT_MetaBase_Item;

 import gregtech.api.util.GT_Utility;

-import gregtech.api.util.GT_Utility.GT_EnchantmentHelper;

-import gregtech.api.util.GT_Utility.ItemNBT;

 import gregtech.common.entities.GT_Entity_Arrow;

 import net.minecraft.block.BlockDispenser;

 import net.minecraft.dispenser.IBlockSource;

@@ -13,7 +11,6 @@ import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;

 import net.minecraft.entity.EntityLivingBase;

 import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.entity.player.PlayerCapabilities;

 import net.minecraft.entity.projectile.EntityArrow;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

@@ -21,109 +18,95 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;

 

 public class Behaviour_Arrow

-  extends Behaviour_None

-{

-  public static Behaviour_Arrow DEFAULT_WOODEN = new Behaviour_Arrow(GT_Entity_Arrow.class, 1.0F, 6.0F);

-  public static Behaviour_Arrow DEFAULT_PLASTIC = new Behaviour_Arrow(GT_Entity_Arrow.class, 1.5F, 6.0F);

-  private final int mLevel;

-  private final Enchantment mEnchantment;

-  private final float mSpeedMultiplier;

-  private final float mPrecision;

-  private final Class<? extends GT_Entity_Arrow> mArrow;

-  

-  public Behaviour_Arrow(Class<? extends GT_Entity_Arrow> aArrow, float aSpeed, float aPrecision)

-  {

-    this(aArrow, aSpeed, aPrecision, null, 0);

-  }

-  

-  public Behaviour_Arrow(Class<? extends GT_Entity_Arrow> aArrow, float aSpeed, float aPrecision, Enchantment aEnchantment, int aLevel)

-  {

-    this.mArrow = aArrow;

-    this.mSpeedMultiplier = aSpeed;

-    this.mPrecision = aPrecision;

-    this.mEnchantment = aEnchantment;

-    this.mLevel = aLevel;

-  }

-  

-  public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity)

-  {

-    if ((aEntity instanceof EntityLivingBase))

-    {

-      GT_Utility.GT_EnchantmentHelper.applyBullshitA((EntityLivingBase)aEntity, aPlayer, aStack);

-      GT_Utility.GT_EnchantmentHelper.applyBullshitB(aPlayer, aEntity, aStack);

-      if (!aPlayer.capabilities.isCreativeMode) {

-        aStack.stackSize -= 1;

-      }

-      if (aStack.stackSize <= 0) {

-        aPlayer.destroyCurrentEquippedItem();

-      }

-      return false;

+        extends Behaviour_None {

+    public static Behaviour_Arrow DEFAULT_WOODEN = new Behaviour_Arrow(GT_Entity_Arrow.class, 1.0F, 6.0F);

+    public static Behaviour_Arrow DEFAULT_PLASTIC = new Behaviour_Arrow(GT_Entity_Arrow.class, 1.5F, 6.0F);

+    private final int mLevel;

+    private final Enchantment mEnchantment;

+    private final float mSpeedMultiplier;

+    private final float mPrecision;

+    private final Class<? extends GT_Entity_Arrow> mArrow;

+

+    public Behaviour_Arrow(Class<? extends GT_Entity_Arrow> aArrow, float aSpeed, float aPrecision) {

+        this(aArrow, aSpeed, aPrecision, null, 0);

     }

-    return false;

-  }

-  

-  public boolean isItemStackUsable(GT_MetaBase_Item aItem, ItemStack aStack)

-  {

-    if ((this.mEnchantment != null) && (this.mLevel > 0))

-    {

-      NBTTagCompound tNBT = GT_Utility.ItemNBT.getNBT(aStack);

-      if (!tNBT.getBoolean("GT.HasBeenUpdated"))

-      {

-        tNBT.setBoolean("GT.HasBeenUpdated", true);

-        GT_Utility.ItemNBT.setNBT(aStack, tNBT);

-        GT_Utility.ItemNBT.addEnchantment(aStack, this.mEnchantment, this.mLevel);

-      }

+

+    public Behaviour_Arrow(Class<? extends GT_Entity_Arrow> aArrow, float aSpeed, float aPrecision, Enchantment aEnchantment, int aLevel) {

+        this.mArrow = aArrow;

+        this.mSpeedMultiplier = aSpeed;

+        this.mPrecision = aPrecision;

+        this.mEnchantment = aEnchantment;

+        this.mLevel = aLevel;

     }

-    return true;

-  }

-  

-  public boolean canDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack)

-  {

-    return true;

-  }

-  

-  public ItemStack onDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack)

-  {

-    World aWorld = aSource.getWorld();

-    IPosition tPosition = BlockDispenser.func_149939_a(aSource);

-    EnumFacing tFacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata());

-    GT_Entity_Arrow tEntityArrow = (GT_Entity_Arrow)getProjectile(aItem, SubTag.PROJECTILE_ARROW, aStack, aWorld, tPosition.getX(), tPosition.getY(), tPosition.getZ());

-    if (tEntityArrow != null)

-    {

-      tEntityArrow.setThrowableHeading(tFacing.getFrontOffsetX(), tFacing.getFrontOffsetY() + 0.1F, tFacing.getFrontOffsetZ(), this.mSpeedMultiplier * 1.1F, this.mPrecision);

-      tEntityArrow.setArrowItem(aStack);

-      tEntityArrow.canBePickedUp = 1;

-      aWorld.spawnEntityInWorld(tEntityArrow);

-      if (aStack.stackSize < 100) {

-        aStack.stackSize -= 1;

-      }

-      return aStack;

+

+    public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {

+        if ((aEntity instanceof EntityLivingBase)) {

+            GT_Utility.GT_EnchantmentHelper.applyBullshitA((EntityLivingBase) aEntity, aPlayer, aStack);

+            GT_Utility.GT_EnchantmentHelper.applyBullshitB(aPlayer, aEntity, aStack);

+            if (!aPlayer.capabilities.isCreativeMode) {

+                aStack.stackSize -= 1;

+            }

+            if (aStack.stackSize <= 0) {

+                aPlayer.destroyCurrentEquippedItem();

+            }

+            return false;

+        }

+        return false;

     }

-    return super.onDispense(aItem, aSource, aStack);

-  }

-  

-  public boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack)

-  {

-    return aProjectileType == SubTag.PROJECTILE_ARROW;

-  }

-  

-  public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ)

-  {

-    if (!hasProjectile(aItem, aProjectileType, aStack)) {

-      return null;

+

+    public boolean isItemStackUsable(GT_MetaBase_Item aItem, ItemStack aStack) {

+        if ((this.mEnchantment != null) && (this.mLevel > 0)) {

+            NBTTagCompound tNBT = GT_Utility.ItemNBT.getNBT(aStack);

+            if (!tNBT.getBoolean("GT.HasBeenUpdated")) {

+                tNBT.setBoolean("GT.HasBeenUpdated", true);

+                GT_Utility.ItemNBT.setNBT(aStack, tNBT);

+                GT_Utility.ItemNBT.addEnchantment(aStack, this.mEnchantment, this.mLevel);

+            }

+        }

+        return true;

     }

-    GT_Entity_Arrow rArrow = (GT_Entity_Arrow)GT_Utility.callConstructor(this.mArrow.getName(), -1, null, true, new Object[] { aWorld, Double.valueOf(aX), Double.valueOf(aY), Double.valueOf(aZ) });

-    rArrow.setArrowItem(aStack);

-    return rArrow;

-  }

-  

-  public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed)

-  {

-    if (!hasProjectile(aItem, aProjectileType, aStack)) {

-      return null;

+

+    public boolean canDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) {

+        return true;

+    }

+

+    public ItemStack onDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) {

+        World aWorld = aSource.getWorld();

+        IPosition tPosition = BlockDispenser.func_149939_a(aSource);

+        EnumFacing tFacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata());

+        GT_Entity_Arrow tEntityArrow = (GT_Entity_Arrow) getProjectile(aItem, SubTag.PROJECTILE_ARROW, aStack, aWorld, tPosition.getX(), tPosition.getY(), tPosition.getZ());

+        if (tEntityArrow != null) {

+            tEntityArrow.setThrowableHeading(tFacing.getFrontOffsetX(), tFacing.getFrontOffsetY() + 0.1F, tFacing.getFrontOffsetZ(), this.mSpeedMultiplier * 1.1F, this.mPrecision);

+            tEntityArrow.setArrowItem(aStack);

+            tEntityArrow.canBePickedUp = 1;

+            aWorld.spawnEntityInWorld(tEntityArrow);

+            if (aStack.stackSize < 100) {

+                aStack.stackSize -= 1;

+            }

+            return aStack;

+        }

+        return super.onDispense(aItem, aSource, aStack);

+    }

+

+    public boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack) {

+        return aProjectileType == SubTag.PROJECTILE_ARROW;

+    }

+

+    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ) {

+        if (!hasProjectile(aItem, aProjectileType, aStack)) {

+            return null;

+        }

+        GT_Entity_Arrow rArrow = (GT_Entity_Arrow) GT_Utility.callConstructor(this.mArrow.getName(), -1, null, true, new Object[]{aWorld, Double.valueOf(aX), Double.valueOf(aY), Double.valueOf(aZ)});

+        rArrow.setArrowItem(aStack);

+        return rArrow;

+    }

+

+    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed) {

+        if (!hasProjectile(aItem, aProjectileType, aStack)) {

+            return null;

+        }

+        GT_Entity_Arrow rArrow = (GT_Entity_Arrow) GT_Utility.callConstructor(this.mArrow.getName(), -1, null, true, new Object[]{aWorld, aEntity, Float.valueOf(this.mSpeedMultiplier * aSpeed)});

+        rArrow.setArrowItem(aStack);

+        return rArrow;

     }

-    GT_Entity_Arrow rArrow = (GT_Entity_Arrow)GT_Utility.callConstructor(this.mArrow.getName(), -1, null, true, new Object[] { aWorld, aEntity, Float.valueOf(this.mSpeedMultiplier * aSpeed) });

-    rArrow.setArrowItem(aStack);

-    return rArrow;

-  }

 }

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java
index 98c099e4ed..80a646bde4 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java
@@ -3,7 +3,6 @@ package gregtech.common.items.behaviors;
 import gregtech.api.enums.SubTag;

 import gregtech.api.items.GT_MetaBase_Item;

 import gregtech.common.entities.GT_Entity_Arrow_Potion;

-import java.util.Random;

 import net.minecraft.enchantment.Enchantment;

 import net.minecraft.entity.Entity;

 import net.minecraft.entity.EntityLivingBase;

@@ -14,53 +13,47 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;

 

 public class Behaviour_Arrow_Potion

-  extends Behaviour_Arrow

-{

-  private final int[] mPotions;

-  

-  public Behaviour_Arrow_Potion(float aSpeed, float aPrecision, int... aPotions)

-  {

-    super(GT_Entity_Arrow_Potion.class, aSpeed, aPrecision);

-    this.mPotions = aPotions;

-  }

-  

-  public Behaviour_Arrow_Potion(float aSpeed, float aPrecision, Enchantment aEnchantment, int aLevel, int... aPotions)

-  {

-    super(GT_Entity_Arrow_Potion.class, aSpeed, aPrecision, aEnchantment, aLevel);

-    this.mPotions = aPotions;

-  }

-  

-  public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity)

-  {

-    if ((aEntity instanceof EntityLivingBase)) {

-      for (int i = 3; i < this.mPotions.length; i += 4) {

-        if (aEntity.worldObj.rand.nextInt(100) < this.mPotions[i]) {

-          ((EntityLivingBase)aEntity).addPotionEffect(new PotionEffect(this.mPotions[(i - 3)], this.mPotions[(i - 2)], this.mPotions[(i - 1)], false));

+        extends Behaviour_Arrow {

+    private final int[] mPotions;

+

+    public Behaviour_Arrow_Potion(float aSpeed, float aPrecision, int... aPotions) {

+        super(GT_Entity_Arrow_Potion.class, aSpeed, aPrecision);

+        this.mPotions = aPotions;

+    }

+

+    public Behaviour_Arrow_Potion(float aSpeed, float aPrecision, Enchantment aEnchantment, int aLevel, int... aPotions) {

+        super(GT_Entity_Arrow_Potion.class, aSpeed, aPrecision, aEnchantment, aLevel);

+        this.mPotions = aPotions;

+    }

+

+    public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {

+        if ((aEntity instanceof EntityLivingBase)) {

+            for (int i = 3; i < this.mPotions.length; i += 4) {

+                if (aEntity.worldObj.rand.nextInt(100) < this.mPotions[i]) {

+                    ((EntityLivingBase) aEntity).addPotionEffect(new PotionEffect(this.mPotions[(i - 3)], this.mPotions[(i - 2)], this.mPotions[(i - 1)], false));

+                }

+            }

         }

-      }

+        return super.onLeftClickEntity(aItem, aStack, aPlayer, aEntity);

     }

-    return super.onLeftClickEntity(aItem, aStack, aPlayer, aEntity);

-  }

-  

-  public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ)

-  {

-    if (!hasProjectile(aItem, aProjectileType, aStack)) {

-      return null;

+

+    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ) {

+        if (!hasProjectile(aItem, aProjectileType, aStack)) {

+            return null;

+        }

+        GT_Entity_Arrow_Potion rArrow = new GT_Entity_Arrow_Potion(aWorld, aX, aY, aZ);

+        rArrow.setArrowItem(aStack);

+        rArrow.setPotions(this.mPotions);

+        return rArrow;

     }

-    GT_Entity_Arrow_Potion rArrow = new GT_Entity_Arrow_Potion(aWorld, aX, aY, aZ);

-    rArrow.setArrowItem(aStack);

-    rArrow.setPotions(this.mPotions);

-    return rArrow;

-  }

-  

-  public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed)

-  {

-    if (!hasProjectile(aItem, aProjectileType, aStack)) {

-      return null;

+

+    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed) {

+        if (!hasProjectile(aItem, aProjectileType, aStack)) {

+            return null;

+        }

+        GT_Entity_Arrow_Potion rArrow = new GT_Entity_Arrow_Potion(aWorld, aEntity, aSpeed);

+        rArrow.setArrowItem(aStack);

+        rArrow.setPotions(this.mPotions);

+        return rArrow;

     }

-    GT_Entity_Arrow_Potion rArrow = new GT_Entity_Arrow_Potion(aWorld, aEntity, aSpeed);

-    rArrow.setArrowItem(aStack);

-    rArrow.setPotions(this.mPotions);

-    return rArrow;

-  }

 }

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java
index 827239a64e..8524f7ca17 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java
@@ -4,7 +4,6 @@ import gregtech.api.GregTech_API;
 import gregtech.api.items.GT_MetaBase_Item;

 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_Utility;

-import java.util.Map;

 import net.minecraft.block.Block;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.init.Blocks;

@@ -12,52 +11,45 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

 

 public class Behaviour_Crowbar

-  extends Behaviour_None

-{

-  private final int mVanillaCosts;

-  private final int mEUCosts;

-  

-  public Behaviour_Crowbar(int aVanillaCosts, int aEUCosts)

-  {

-    this.mVanillaCosts = aVanillaCosts;

-    this.mEUCosts = aEUCosts;

-  }

-  

-  public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ)

-  {

-    if (aWorld.isRemote) {

-      return false;

-    }

-    if (GT_ModHandler.getModItem("Railcraft", "fluid.creosote.bucket", 1L) != null) {

-      return false;

-    }

-    Block aBlock = aWorld.getBlock(aX, aY, aZ);

-    if (aBlock == null) {

-      return false;

-    }

-    byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ);

-    if (aBlock == Blocks.rail)

-    {

-      if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer))

-      {

-        aWorld.isRemote = true;

-        aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 1) % 10, 0);

-        aWorld.isRemote = false;

-        GT_Utility.sendSoundToPlayers(aWorld, (String)GregTech_API.sSoundList.get(Integer.valueOf(0)), 1.0F, -1.0F, aX, aY, aZ);

-      }

-      return true;

+        extends Behaviour_None {

+    private final int mVanillaCosts;

+    private final int mEUCosts;

+

+    public Behaviour_Crowbar(int aVanillaCosts, int aEUCosts) {

+        this.mVanillaCosts = aVanillaCosts;

+        this.mEUCosts = aEUCosts;

     }

-    if ((aBlock == Blocks.detector_rail) || (aBlock == Blocks.activator_rail) || (aBlock == Blocks.golden_rail))

-    {

-      if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer))

-      {

-        aWorld.isRemote = true;

-        aWorld.setBlock(aX, aY, aZ, aBlock, aMeta / 8 * 8 + (aMeta % 8 + 1) % 6, 0);

-        aWorld.isRemote = false;

-        GT_Utility.sendSoundToPlayers(aWorld, (String)GregTech_API.sSoundList.get(Integer.valueOf(0)), 1.0F, -1.0F, aX, aY, aZ);

-      }

-      return true;

+

+    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {

+        if (aWorld.isRemote) {

+            return false;

+        }

+        if (GT_ModHandler.getModItem("Railcraft", "fluid.creosote.bucket", 1L) != null) {

+            return false;

+        }

+        Block aBlock = aWorld.getBlock(aX, aY, aZ);

+        if (aBlock == null) {

+            return false;

+        }

+        byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);

+        if (aBlock == Blocks.rail) {

+            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {

+                aWorld.isRemote = true;

+                aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 1) % 10, 0);

+                aWorld.isRemote = false;

+                GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(0)), 1.0F, -1.0F, aX, aY, aZ);

+            }

+            return true;

+        }

+        if ((aBlock == Blocks.detector_rail) || (aBlock == Blocks.activator_rail) || (aBlock == Blocks.golden_rail)) {

+            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {

+                aWorld.isRemote = true;

+                aWorld.setBlock(aX, aY, aZ, aBlock, aMeta / 8 * 8 + (aMeta % 8 + 1) % 6, 0);

+                aWorld.isRemote = false;

+                GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(0)), 1.0F, -1.0F, aX, aY, aZ);

+            }

+            return true;

+        }

+        return false;

     }

-    return false;

-  }

 }

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java
index b09b23cc2f..995a438ff4 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java
@@ -2,114 +2,102 @@ package gregtech.common.items.behaviors;
 

 import gregtech.api.items.GT_MetaBase_Item;

 import gregtech.api.util.GT_Utility;

-import java.util.List;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.nbt.NBTTagList;

 

+import java.util.List;

+

 public class Behaviour_DataOrb

-  extends Behaviour_None

-{

-  public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack)

-  {

-    if (!getDataTitle(aStack).equals(""))

-    {

-      aList.add(getDataTitle(aStack));

-      aList.add(getDataName(aStack));

+        extends Behaviour_None {

+    public static void copyInventory(ItemStack[] aInventory, ItemStack[] aNewContent, int aIndexlength) {

+        for (int i = 0; i < aIndexlength; i++) {

+            if (aNewContent[i] == null) {

+                aInventory[i] = null;

+            } else {

+                aInventory[i] = GT_Utility.copy(new Object[]{aNewContent[i]});

+            }

+        }

     }

-    return aList;

-  }

-  

-  public static void copyInventory(ItemStack[] aInventory, ItemStack[] aNewContent, int aIndexlength)

-  {

-    for (int i = 0; i < aIndexlength; i++) {

-      if (aNewContent[i] == null) {

-        aInventory[i] = null;

-      } else {

-        aInventory[i] = GT_Utility.copy(new Object[] { aNewContent[i] });

-      }

-    }

-  }

-  

-  public static String getDataName(ItemStack aStack)

-  {

-    NBTTagCompound tNBT = aStack.getTagCompound();

-    if (tNBT == null) {

-      return "";

-    }

-    return tNBT.getString("mDataName");

-  }

-  

-  public static String getDataTitle(ItemStack aStack)

-  {

-    NBTTagCompound tNBT = aStack.getTagCompound();

-    if (tNBT == null) {

-      return "";

+

+    public static String getDataName(ItemStack aStack) {

+        NBTTagCompound tNBT = aStack.getTagCompound();

+        if (tNBT == null) {

+            return "";

+        }

+        return tNBT.getString("mDataName");

     }

-    return tNBT.getString("mDataTitle");

-  }

-  

-  public static NBTTagCompound setDataName(ItemStack aStack, String aDataName)

-  {

-    NBTTagCompound tNBT = aStack.getTagCompound();

-    if (tNBT == null) {

-      tNBT = new NBTTagCompound();

+

+    public static String getDataTitle(ItemStack aStack) {

+        NBTTagCompound tNBT = aStack.getTagCompound();

+        if (tNBT == null) {

+            return "";

+        }

+        return tNBT.getString("mDataTitle");

     }

-    tNBT.setString("mDataName", aDataName);

-    aStack.setTagCompound(tNBT);

-    return tNBT;

-  }

-  

-  public static NBTTagCompound setDataTitle(ItemStack aStack, String aDataTitle)

-  {

-    NBTTagCompound tNBT = aStack.getTagCompound();

-    if (tNBT == null) {

-      tNBT = new NBTTagCompound();

+

+    public static NBTTagCompound setDataName(ItemStack aStack, String aDataName) {

+        NBTTagCompound tNBT = aStack.getTagCompound();

+        if (tNBT == null) {

+            tNBT = new NBTTagCompound();

+        }

+        tNBT.setString("mDataName", aDataName);

+        aStack.setTagCompound(tNBT);

+        return tNBT;

     }

-    tNBT.setString("mDataTitle", aDataTitle);

-    aStack.setTagCompound(tNBT);

-    return tNBT;

-  }

-  

-  public static ItemStack[] getNBTInventory(ItemStack aStack)

-  {

-    ItemStack[] tInventory = new ItemStack[256];

-    NBTTagCompound tNBT = aStack.getTagCompound();

-    if (tNBT == null) {

-      return tInventory;

+

+    public static NBTTagCompound setDataTitle(ItemStack aStack, String aDataTitle) {

+        NBTTagCompound tNBT = aStack.getTagCompound();

+        if (tNBT == null) {

+            tNBT = new NBTTagCompound();

+        }

+        tNBT.setString("mDataTitle", aDataTitle);

+        aStack.setTagCompound(tNBT);

+        return tNBT;

     }

-    NBTTagList tNBT_ItemList = tNBT.getTagList("Inventory", 10);

-    for (int i = 0; i < tNBT_ItemList.tagCount(); i++)

-    {

-      NBTTagCompound tag = tNBT_ItemList.getCompoundTagAt(i);

-      byte slot = tag.getByte("Slot");

-      if ((slot >= 0) && (slot < tInventory.length)) {

-        tInventory[slot] = GT_Utility.loadItem(tag);

-      }

+

+    public static ItemStack[] getNBTInventory(ItemStack aStack) {

+        ItemStack[] tInventory = new ItemStack[256];

+        NBTTagCompound tNBT = aStack.getTagCompound();

+        if (tNBT == null) {

+            return tInventory;

+        }

+        NBTTagList tNBT_ItemList = tNBT.getTagList("Inventory", 10);

+        for (int i = 0; i < tNBT_ItemList.tagCount(); i++) {

+            NBTTagCompound tag = tNBT_ItemList.getCompoundTagAt(i);

+            byte slot = tag.getByte("Slot");

+            if ((slot >= 0) && (slot < tInventory.length)) {

+                tInventory[slot] = GT_Utility.loadItem(tag);

+            }

+        }

+        return tInventory;

     }

-    return tInventory;

-  }

-  

-  public static NBTTagCompound setNBTInventory(ItemStack aStack, ItemStack[] aInventory)

-  {

-    NBTTagCompound tNBT = aStack.getTagCompound();

-    if (tNBT == null) {

-      tNBT = new NBTTagCompound();

+

+    public static NBTTagCompound setNBTInventory(ItemStack aStack, ItemStack[] aInventory) {

+        NBTTagCompound tNBT = aStack.getTagCompound();

+        if (tNBT == null) {

+            tNBT = new NBTTagCompound();

+        }

+        NBTTagList tNBT_ItemList = new NBTTagList();

+        for (int i = 0; i < aInventory.length; i++) {

+            ItemStack stack = aInventory[i];

+            if (stack != null) {

+                NBTTagCompound tag = new NBTTagCompound();

+                tag.setByte("Slot", (byte) i);

+                stack.writeToNBT(tag);

+                tNBT_ItemList.appendTag(tag);

+            }

+        }

+        tNBT.setTag("Inventory", tNBT_ItemList);

+        aStack.setTagCompound(tNBT);

+        return tNBT;

     }

-    NBTTagList tNBT_ItemList = new NBTTagList();

-    for (int i = 0; i < aInventory.length; i++)

-    {

-      ItemStack stack = aInventory[i];

-      if (stack != null)

-      {

-        NBTTagCompound tag = new NBTTagCompound();

-        tag.setByte("Slot", (byte)i);

-        stack.writeToNBT(tag);

-        tNBT_ItemList.appendTag(tag);

-      }

+

+    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {

+        if (!getDataTitle(aStack).equals("")) {

+            aList.add(getDataTitle(aStack));

+            aList.add(getDataName(aStack));

+        }

+        return aList;

     }

-    tNBT.setTag("Inventory", tNBT_ItemList);

-    aStack.setTagCompound(tNBT);

-    return tNBT;

-  }

 }

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
index 8d0809f279..105c39022a 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
@@ -2,36 +2,33 @@ package gregtech.common.items.behaviors;
 

 import gregtech.api.items.GT_MetaBase_Item;

 import gregtech.api.util.GT_Utility;

-import gregtech.api.util.GT_Utility.ItemNBT;

-import java.util.List;

 import net.minecraft.item.ItemStack;

 

+import java.util.List;

+

 public class Behaviour_DataStick

-  extends Behaviour_None

-{

-  public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack)

-  {

-    String tString = GT_Utility.ItemNBT.getBookTitle(aStack);

-    if (GT_Utility.isStringValid(tString)) {

-      aList.add(tString);

-    }

-    tString = GT_Utility.ItemNBT.getBookAuthor(aStack);

-    if (GT_Utility.isStringValid(tString)) {

-      aList.add("by " + tString);

-    }

-    short tMapID = GT_Utility.ItemNBT.getMapID(aStack);

-    if (tMapID >= 0) {

-      aList.add("Map ID: " + tMapID);

-    }

-    tString = GT_Utility.ItemNBT.getPunchCardData(aStack);

-    if (GT_Utility.isStringValid(tString))

-    {

-      aList.add("Punch Card Data");

-      int i = 0;

-      for (int j = tString.length(); i < j; i += 64) {

-        aList.add(tString.substring(i, Math.min(i + 64, j)));

-      }

+        extends Behaviour_None {

+    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {

+        String tString = GT_Utility.ItemNBT.getBookTitle(aStack);

+        if (GT_Utility.isStringValid(tString)) {

+            aList.add(tString);

+        }

+        tString = GT_Utility.ItemNBT.getBookAuthor(aStack);

+        if (GT_Utility.isStringValid(tString)) {

+            aList.add("by " + tString);

+        }

+        short tMapID = GT_Utility.ItemNBT.getMapID(aStack);

+        if (tMapID >= 0) {

+            aList.add("Map ID: " + tMapID);

+        }

+        tString = GT_Utility.ItemNBT.getPunchCardData(aStack);

+        if (GT_Utility.isStringValid(tString)) {

+