diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 12:58:47 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 12:58:47 +1000 |
commit | ae21012d216df71f31aed6fbc9d76215fc24ceed (patch) | |
tree | cc89accbe6ce5c04b72ed3c5e46b2a185f88be6a /src/Java/gtPlusPlus/core/item/base | |
parent | ba89972a22a316030f8c3bd99974f915b1d7aefc (diff) | |
download | GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.gz GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.bz2 GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.zip |
+ New texture for the slow builders ring.
+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
39 files changed, 1445 insertions, 1264 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java index 21e09d2d19..8f8d0eed72 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -2,8 +2,15 @@ package gtPlusPlus.core.item.base; import static gregtech.api.enums.GT_Values.D1; import static gregtech.api.enums.GT_Values.V; + +import java.util.*; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.IItemContainer; @@ -13,9 +20,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.array.Pair; import ic2.api.item.*; - -import java.util.*; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -25,272 +29,318 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricItemManager { /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - private final HashMap<Short, ArrayList<IItemBehaviour<BaseEuItem>>> mItemBehaviors = new HashMap<Short, ArrayList<IItemBehaviour<BaseEuItem>>>(); + private final HashMap<Short, ArrayList<IItemBehaviour<BaseEuItem>>> mItemBehaviors = new HashMap<>(); public final short mOffset, mItemAmount; public final BitSet mEnabledItems; public final BitSet mVisibleItems; public final IIcon[][] mIconList; - /** The unlocalized name of this item. */ - private String unlocalizedName; - - private ArrayList<Pair<Integer, EnumRarity>> rarity = new ArrayList<Pair<Integer, EnumRarity>>(); - private ArrayList<Pair<Integer, EnumChatFormatting>> descColour = new ArrayList<Pair<Integer, EnumChatFormatting>>(); - private ArrayList<Pair<Integer, String>> itemName = new ArrayList<Pair<Integer, String>>(); - private ArrayList<Pair<Integer, String>> itemDescription = new ArrayList<Pair<Integer, String>>(); - private ArrayList<Pair<Integer, Boolean>> hasEffect = new ArrayList<Pair<Integer, Boolean>>(); - - public final HashMap<Short, Long[]> mElectricStats = new HashMap<Short, Long[]>(); - public final HashMap<Short, Short> mBurnValues = new HashMap<Short, Short>(); + /** The unlocalized name of this item. */ + private String unlocalizedName; + + private final ArrayList<Pair<Integer, EnumRarity>> rarity = new ArrayList<>(); + private final ArrayList<Pair<Integer, EnumChatFormatting>> descColour = new ArrayList<>(); + private final ArrayList<Pair<Integer, String>> itemName = new ArrayList<>(); + private final ArrayList<Pair<Integer, String>> itemDescription = new ArrayList<>(); + private final ArrayList<Pair<Integer, Boolean>> hasEffect = new ArrayList<>(); + + public final HashMap<Short, Long[]> mElectricStats = new HashMap<>(); + public final HashMap<Short, Short> mBurnValues = new HashMap<>(); public BaseEuItem() { - this("MU-metaitem.02", AddToCreativeTab.tabOther, (short) 1000, (short) 31766); - } - - public BaseEuItem(String unlocalizedName, CreativeTabs creativeTab, short aOffset, short aItemAmount) { - mEnabledItems = new BitSet(aItemAmount); - mVisibleItems = new BitSet(aItemAmount); - mOffset = (short) Math.min(32766, aOffset); - mItemAmount = (short) Math.min(aItemAmount, 32766 - mOffset); - mIconList = new IIcon[aItemAmount][1]; - setHasSubtypes(true); - setMaxDamage(0); - setUnlocalizedName(unlocalizedName); - setCreativeTab(creativeTab); - setMaxStackSize(1); + this("MU-metaitem.02", AddToCreativeTab.tabOther, (short) 1000, (short) 31766); + } + + public BaseEuItem(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset, final short aItemAmount) { + this.mEnabledItems = new BitSet(aItemAmount); + this.mVisibleItems = new BitSet(aItemAmount); + this.mOffset = (short) Math.min(32766, aOffset); + this.mItemAmount = (short) Math.min(aItemAmount, 32766 - this.mOffset); + this.mIconList = new IIcon[aItemAmount][1]; + this.setHasSubtypes(true); + this.setMaxDamage(0); + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(creativeTab); + this.setMaxStackSize(1); GameRegistry.registerItem(this, unlocalizedName); - } - - - public void registerItem(int id, String localizedName, long euStorage, int tier, String description) { - registerItem(id, localizedName, euStorage, (short) tier, description, EnumRarity.common, EnumChatFormatting.GRAY, false); - } - - public void registerItem(int id, String localizedName, long euStorage, int tier, String description, int burnTime) { - registerItem(id, localizedName, euStorage, (short) tier, description, EnumRarity.common, EnumChatFormatting.GRAY, false); - setBurnValue(id, burnTime); - } - - - public void registerItem(int id, String localizedName, long euStorage, short tier, String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect) { - addItem(id, localizedName, EnumChatFormatting.YELLOW+"Electric", new Object[]{}); - setElectricStats(mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true); - this.rarity.add(new Pair<Integer, EnumRarity>(id, regRarity)); - this.itemName.add(new Pair<Integer, String>(id, localizedName)); - this.itemDescription.add(new Pair<Integer, String>(id, description)); - this.descColour.add(new Pair<Integer, EnumChatFormatting>(id, colour)); - this.hasEffect.add(new Pair<Integer, Boolean>(id, Effect)); - } + } + + + public void registerItem(final int id, final String localizedName, final long euStorage, final int tier, final String description) { + this.registerItem(id, localizedName, euStorage, (short) tier, description, EnumRarity.common, EnumChatFormatting.GRAY, false); + } + + public void registerItem(final int id, final String localizedName, final long euStorage, final int tier, final String description, final int burnTime) { + this.registerItem(id, localizedName, euStorage, (short) tier, description, EnumRarity.common, EnumChatFormatting.GRAY, false); + this.setBurnValue(id, burnTime); + } + + + public void registerItem(final int id, final String localizedName, final long euStorage, final short tier, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect) { + this.addItem(id, localizedName, EnumChatFormatting.YELLOW+"Electric", new Object[]{}); + this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true); + this.rarity.add(new Pair<>(id, regRarity)); + this.itemName.add(new Pair<>(id, localizedName)); + this.itemDescription.add(new Pair<>(id, description)); + this.descColour.add(new Pair<>(id, colour)); + this.hasEffect.add(new Pair<>(id, Effect)); + } @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ - if (rarity.get(par1ItemStack.getItemDamage()-mOffset) != null) - return rarity.get(par1ItemStack.getItemDamage()-mOffset).getValue(); + public EnumRarity getRarity(final ItemStack par1ItemStack){ + if (this.rarity.get(par1ItemStack.getItemDamage()-this.mOffset) != null) { + return this.rarity.get(par1ItemStack.getItemDamage()-this.mOffset).getValue(); + } return EnumRarity.common; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ - if (hasEffect.get(par1ItemStack.getItemDamage()-mOffset) != null) - return hasEffect.get(par1ItemStack.getItemDamage()-mOffset).getValue(); + public boolean hasEffect(final ItemStack par1ItemStack){ + if (this.hasEffect.get(par1ItemStack.getItemDamage()-this.mOffset) != null) { + return this.hasEffect.get(par1ItemStack.getItemDamage()-this.mOffset).getValue(); + } return false; } - + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public final void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) { //aList.add("Meta: "+(aStack.getItemDamage()-mOffset)); - if (descColour.get(aStack.getItemDamage()-mOffset) != null && itemDescription.get(aStack.getItemDamage()-mOffset) != null) - aList.add(descColour.get(aStack.getItemDamage()-mOffset).getValue()+itemDescription.get(aStack.getItemDamage()-mOffset).getValue()); - String tKey = getUnlocalizedName(aStack) + ".tooltip", tString = GT_LanguageManager.getTranslation(tKey); - if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) aList.add(tString); - Long[] tStats = getElectricStats(aStack); - if (tStats != null) { - if (tStats[3] > 0) { - aList.add(EnumChatFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU Tier: " + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY); - } else { - long tCharge = getRealCharge(aStack); - if (tStats[3] == -2 && tCharge <= 0) { - aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY); - } else { - aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + EnumChatFormatting.GRAY); - } - } - } - ArrayList<IItemBehaviour<BaseEuItem>> tList = mItemBehaviors.get((short) getDamage(aStack)); - if (tList != null) for (IItemBehaviour<BaseEuItem> tBehavior : tList) - aList = tBehavior.getAdditionalToolTips(this, aList, aStack); - } - - + if ((this.descColour.get(aStack.getItemDamage()-this.mOffset) != null) && (this.itemDescription.get(aStack.getItemDamage()-this.mOffset) != null)) { + aList.add(this.descColour.get(aStack.getItemDamage()-this.mOffset).getValue()+this.itemDescription.get(aStack.getItemDamage()-this.mOffset).getValue()); + } + final String tKey = this.getUnlocalizedName(aStack) + ".tooltip", tString = GT_LanguageManager.getTranslation(tKey); + if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) { + aList.add(tString); + } + final Long[] tStats = this.getElectricStats(aStack); + if (tStats != null) { + if (tStats[3] > 0) { + aList.add(EnumChatFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU Tier: " + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY); + } else { + final long tCharge = this.getRealCharge(aStack); + if ((tStats[3] == -2) && (tCharge <= 0)) { + aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY); + } else { + aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + EnumChatFormatting.GRAY); + } + } + } + final ArrayList<IItemBehaviour<BaseEuItem>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + if (tList != null) { + for (final IItemBehaviour<BaseEuItem> tBehavior : tList) { + aList = tBehavior.getAdditionalToolTips(this, aList, aStack); + } + } + } + + @Override - public final Item getChargedItem(ItemStack itemStack) { + public final Item getChargedItem(final ItemStack itemStack) { return this; } @Override - public final Item getEmptyItem(ItemStack itemStack) { + public final Item getEmptyItem(final ItemStack itemStack) { return this; } @Override - public final double getMaxCharge(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null) return 0; + public final double getMaxCharge(final ItemStack aStack) { + final Long[] tStats = this.getElectricStats(aStack); + if (tStats == null) { + return 0; + } return Math.abs(tStats[0]); } @Override - public final double getTransferLimit(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null) return 0; + public final double getTransferLimit(final ItemStack aStack) { + final Long[] tStats = this.getElectricStats(aStack); + if (tStats == null) { + return 0; + } return Math.max(tStats[1], tStats[3]); } @Override - public final int getTier(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); + public final int getTier(final ItemStack aStack) { + final Long[] tStats = this.getElectricStats(aStack); return (int) (tStats == null ? Integer.MAX_VALUE : tStats[2]); } @Override - public final double charge(ItemStack aStack, double aCharge, int aTier, boolean aIgnoreTransferLimit, boolean aSimulate) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null || tStats[2] > aTier || !(tStats[3] == -1 || tStats[3] == -3 || (tStats[3] < 0 && aCharge == Integer.MAX_VALUE)) || aStack.stackSize != 1) + public final double charge(final ItemStack aStack, final double aCharge, final int aTier, final boolean aIgnoreTransferLimit, final boolean aSimulate) { + final Long[] tStats = this.getElectricStats(aStack); + if ((tStats == null) || (tStats[2] > aTier) || !((tStats[3] == -1) || (tStats[3] == -3) || ((tStats[3] < 0) && (aCharge == Integer.MAX_VALUE))) || (aStack.stackSize != 1)) { return 0; - long tChargeBefore = getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE ? Long.MAX_VALUE : Math.min(Math.abs(tStats[0]), tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); - if (!aSimulate) setCharge(aStack, tNewCharge); + } + final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE ? Long.MAX_VALUE : Math.min(Math.abs(tStats[0]), tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); + if (!aSimulate) { + this.setCharge(aStack, tNewCharge); + } return tNewCharge - tChargeBefore; } @Override - public final double discharge(ItemStack aStack, double aCharge, int aTier, boolean aIgnoreTransferLimit, boolean aBatteryAlike, boolean aSimulate) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null || tStats[2] > aTier) return 0; - if (aBatteryAlike && !canProvideEnergy(aStack)) return 0; + public final double discharge(final ItemStack aStack, final double aCharge, final int aTier, final boolean aIgnoreTransferLimit, final boolean aBatteryAlike, final boolean aSimulate) { + final Long[] tStats = this.getElectricStats(aStack); + if ((tStats == null) || (tStats[2] > aTier)) { + return 0; + } + if (aBatteryAlike && !this.canProvideEnergy(aStack)) { + return 0; + } if (tStats[3] > 0) { - if (aCharge < tStats[3] || aStack.stackSize < 1) return 0; - if (!aSimulate) aStack.stackSize--; + if ((aCharge < tStats[3]) || (aStack.stackSize < 1)) { + return 0; + } + if (!aSimulate) { + aStack.stackSize--; + } return tStats[3]; } - long tChargeBefore = getRealCharge(aStack), tNewCharge = Math.max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); - if (!aSimulate) setCharge(aStack, tNewCharge); + final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = Math.max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); + if (!aSimulate) { + this.setCharge(aStack, tNewCharge); + } return tChargeBefore - tNewCharge; } @Override - public final double getCharge(ItemStack aStack) { - return getRealCharge(aStack); + public final double getCharge(final ItemStack aStack) { + return this.getRealCharge(aStack); } @Override - public final boolean canUse(ItemStack aStack, double aAmount) { - return getRealCharge(aStack) >= aAmount; + public final boolean canUse(final ItemStack aStack, final double aAmount) { + return this.getRealCharge(aStack) >= aAmount; } @Override - public final boolean use(ItemStack aStack, double aAmount, EntityLivingBase aPlayer) { - chargeFromArmor(aStack, aPlayer); - if (aPlayer instanceof EntityPlayer && ((EntityPlayer) aPlayer).capabilities.isCreativeMode) return true; - double tTransfer = discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, true); + public final boolean use(final ItemStack aStack, final double aAmount, final EntityLivingBase aPlayer) { + this.chargeFromArmor(aStack, aPlayer); + if ((aPlayer instanceof EntityPlayer) && ((EntityPlayer) aPlayer).capabilities.isCreativeMode) { + return true; + } + final double tTransfer = this.discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, true); if (tTransfer == aAmount) { - discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); - chargeFromArmor(aStack, aPlayer); + this.discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); + this.chargeFromArmor(aStack, aPlayer); return true; } - discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); - chargeFromArmor(aStack, aPlayer); + this.discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); + this.chargeFromArmor(aStack, aPlayer); return false; } @Override - public final boolean canProvideEnergy(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null) return false; - return tStats[3] > 0 || (aStack.stackSize == 1 && (tStats[3] == -2 || tStats[3] == -3)); + public final boolean canProvideEnergy(final ItemStack aStack) { + final Long[] tStats = this.getElectricStats(aStack); + if (tStats == null) { + return false; + } + return (tStats[3] > 0) || ((aStack.stackSize == 1) && ((tStats[3] == -2) || (tStats[3] == -3))); } @Override - public final void chargeFromArmor(ItemStack aStack, EntityLivingBase aPlayer) { - if (aPlayer == null || aPlayer.worldObj.isRemote) return; + public final void chargeFromArmor(final ItemStack aStack, final EntityLivingBase aPlayer) { + if ((aPlayer == null) || aPlayer.worldObj.isRemote) { + return; + } for (int i = 1; i < 5; i++) { - ItemStack tArmor = aPlayer.getEquipmentInSlot(i); + final ItemStack tArmor = aPlayer.getEquipmentInSlot(i); if (GT_ModHandler.isElectricItem(tArmor)) { - IElectricItem tArmorItem = (IElectricItem) tArmor.getItem(); - if (tArmorItem.canProvideEnergy(tArmor) && tArmorItem.getTier(tArmor) >= getTier(aStack)) { - double tCharge = ElectricItem.manager.discharge(tArmor, charge(aStack, Integer.MAX_VALUE - 1, Integer.MAX_VALUE, true, true), Integer.MAX_VALUE, true, true, false); + final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem(); + if (tArmorItem.canProvideEnergy(tArmor) && (tArmorItem.getTier(tArmor) >= this.getTier(aStack))) { + final double tCharge = ElectricItem.manager.discharge(tArmor, this.charge(aStack, Integer.MAX_VALUE - 1, Integer.MAX_VALUE, true, true), Integer.MAX_VALUE, true, true, false); if (tCharge > 0) { - charge(aStack, tCharge, Integer.MAX_VALUE, true, false); + this.charge(aStack, tCharge, Integer.MAX_VALUE, true, false); if (aPlayer instanceof EntityPlayer) { - Container tContainer = ((EntityPlayer) aPlayer).openContainer; - if (tContainer != null) tContainer.detectAndSendChanges(); + final Container tContainer = ((EntityPlayer) aPlayer).openContainer; + if (tContainer != null) { + tContainer.detectAndSendChanges(); + } } } } } } - } + } - public final long getRealCharge(ItemStack aStack) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null) return 0; - if (tStats[3] > 0) return (int) (long) tStats[3]; - NBTTagCompound tNBT = aStack.getTagCompound(); + public final long getRealCharge(final ItemStack aStack) { + final Long[] tStats = this.getElectricStats(aStack); + if (tStats == null) { + return 0; + } + if (tStats[3] > 0) { + return (int) (long) tStats[3]; + } + final NBTTagCompound tNBT = aStack.getTagCompound(); return tNBT == null ? 0 : tNBT.getLong("GT.ItemCharge"); - } + } - public final boolean setCharge(ItemStack aStack, long aCharge) { - Long[] tStats = getElectricStats(aStack); - if (tStats == null || tStats[3] > 0) return false; + public final boolean setCharge(final ItemStack aStack, long aCharge) { + final Long[] tStats = this.getElectricStats(aStack); + if ((tStats == null) || (tStats[3] > 0)) { + return false; + } NBTTagCompound tNBT = aStack.getTagCompound(); - if (tNBT == null) tNBT = new NBTTagCompound(); + if (tNBT == null) { + tNBT = new NBTTagCompound(); + } tNBT.removeTag("GT.ItemCharge"); aCharge = Math.min(tStats[0] < 0 ? Math.abs(tStats[0] / 2) : aCharge, Math.abs(tStats[0])); if (aCharge > 0) { - aStack.setItemDamage(getChargedMetaData(aStack)); + aStack.setItemDamage(this.getChargedMetaData(aStack)); tNBT.setLong("GT.ItemCharge", aCharge); } else { - aStack.setItemDamage(getEmptyMetaData(aStack)); + aStack.setItemDamage(this.getEmptyMetaData(aStack)); + } + if (tNBT.hasNoTags()) { + aStack.setTagCompound(null); + } else { + aStack.setTagCompound(tNBT); } - if (tNBT.hasNoTags()) aStack.setTagCompound(null); - else aStack.setTagCompound(tNBT); - isItemStackUsable(aStack); + this.isItemStackUsable(aStack); return true; } @SuppressWarnings("static-method") - public short getChargedMetaData(ItemStack aStack) { + public short getChargedMetaData(final ItemStack aStack) { return (short) aStack.getItemDamage(); } @SuppressWarnings("static-method") - public short getEmptyMetaData(ItemStack aStack) { + public short getEmptyMetaData(final ItemStack aStack) { return (short) aStack.getItemDamage(); } - public boolean isItemStackUsable(ItemStack aStack) { - ArrayList<IItemBehaviour<BaseEuItem>> tList = mItemBehaviors.get((short) getDamage(aStack)); - if (tList != null) for (IItemBehaviour<BaseEuItem> tBehavior : tList) - if (!tBehavior.isItemStackUsable(this, aStack)) return false; + public boolean isItemStackUsable(final ItemStack aStack) { + final ArrayList<IItemBehaviour<BaseEuItem>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + if (tList != null) { + for (final IItemBehaviour<BaseEuItem> tBehavior : tList) { + if (!tBehavior.isItemStackUsable(this, aStack)) { + return false; + } + } + } return true; } @Override - public final String getToolTip(ItemStack aStack) { + public final String getToolTip(final ItemStack aStack) { return null; } // This has its own ToolTip Handler, no need to let the IC2 Handler screw us up at this Point @Override - public final IElectricItemManager getManager(ItemStack aStack) { + public final IElectricItemManager getManager(final ItemStack aStack) { return this; } // We are our own Manager @@ -301,10 +351,15 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI * @param aValue 200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU) * @return the Item itself for convenience in constructing. */ - public final BaseEuItem setBurnValue(int aMetaValue, int aValue) { - if (aMetaValue < 0 || aValue < 0) return this; - if (aValue == 0) mBurnValues.remove((short) aMetaValue); - else mBurnValues.put((short) aMetaValue, aValue > Short.MAX_VALUE ? Short.MAX_VALUE : (short) aValue); + public final BaseEuItem setBurnValue(final int aMetaValue, final int aValue) { + if ((aMetaValue < 0) || (aValue < 0)) { + return this; + } + if (aValue == 0) { + this.mBurnValues.remove((short) aMetaValue); + } else { + this.mBurnValues.put((short) aMetaValue, aValue > Short.MAX_VALUE ? Short.MAX_VALUE : (short) aValue); + } return this; } @@ -319,11 +374,14 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI * Use -3 if you want to make this Battery charge/discharge-able. * @return the Item itself for convenience in constructing. */ - public final BaseEuItem setElectricStats(int aMetaValue, long aMaxCharge, long aTransferLimit, long aTier, long aSpecialData, boolean aUseAnimations) { - if (aMetaValue < 0) return this; - if (aMaxCharge == 0) mElectricStats.remove((short) aMetaValue); - else { - mElectricStats.put((short) aMetaValue, new Long[]{aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData}); + public final BaseEuItem setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) { + if (aMetaValue < 0) { + return this; + } + if (aMaxCharge == 0) { + this.mElectricStats.remove((short) aMetaValue); + } else { + this.mElectricStats.put((short) aMetaValue, new Long[]{aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData}); } return this; } @@ -332,174 +390,187 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { - for (int i = 0, j = mEnabledItems.length(); i < j; i++) - if (mVisibleItems.get(i) || (D1 && mEnabledItems.get(i))) { - Long[] tStats = mElectricStats.get((short) (mOffset + i)); - if (tStats != null && tStats[3] < 0) { - ItemStack tStack = new ItemStack(this, 1, mOffset + i); - setCharge(tStack, Math.abs(tStats[0])); - isItemStackUsable(tStack); + public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) { + for (int i = 0, j = this.mEnabledItems.length(); i < j; i++) { + if (this.mVisibleItems.get(i) || (D1 && this.mEnabledItems.get(i))) { + final Long[] tStats = this.mElectricStats.get((short) (this.mOffset + i)); + if ((tStats != null) && (tStats[3] < 0)) { + final ItemStack tStack = new ItemStack(this, 1, this.mOffset + i); + this.setCharge(tStack, Math.abs(tStats[0])); + this.isItemStackUsable(tStack); aList.add(tStack); } - if (tStats == null || tStats[3] != -2) { - ItemStack tStack = new ItemStack(this, 1, mOffset + i); - isItemStackUsable(tStack); + if ((tStats == null) || (tStats[3] != -2)) { + final ItemStack tStack = new ItemStack(this, 1, this.mOffset + i); + this.isItemStackUsable(tStack); aList.add(tStack); } } + } } @Override @SideOnly(Side.CLIENT) - public final void registerIcons(IIconRegister aIconRegister) { - for (short i = 0, j = (short) mEnabledItems.length(); i < j; i++) - if (mEnabledItems.get(i)) { - for (byte k = 1; k < mIconList[i].length; k++) { - mIconList[i][k] = aIconRegister.registerIcon(CORE.MODID+":" + (getUnlocalizedName() + "/" + i + "/" + k)); + public final void registerIcons(final IIconRegister aIconRegister) { + for (short i = 0, j = (short) this.mEnabledItems.length(); i < j; i++) { + if (this.mEnabledItems.get(i)) { + for (byte k = 1; k < this.mIconList[i].length; k++) { + this.mIconList[i][k] = aIconRegister.registerIcon(CORE.MODID+":" + (this.getUnlocalizedName() + "/" + i + "/" + k)); } - mIconList[i][0] = aIconRegister.registerIcon(CORE.MODID+":" + (getUnlocalizedName() + "/" + i)); + this.mIconList[i][0] = aIconRegister.registerIcon(CORE.MODID+":" + (this.getUnlocalizedName() + "/" + i)); } + } + } + + + @Override + public final IIcon getIconFromDamage(final int aMetaData) { + if (aMetaData < 0) { + return null; + } + return (aMetaData - this.mOffset) < this.mIconList.length ? this.mIconList[aMetaData - this.mOffset][0] : null; } - - - @Override - public final IIcon getIconFromDamage(int aMetaData) { - if (aMetaData < 0) return null; - return aMetaData - mOffset < mIconList.length ? mIconList[aMetaData - mOffset][0] : null; - } - + /** - * Sets the unlocalized name of this item to the string passed as the parameter" - */ - @Override - public Item setUnlocalizedName(String p_77655_1_){ - this.unlocalizedName = p_77655_1_; - super.setUnlocalizedName(p_77655_1_); - return this; - } - + * Sets the unlocalized name of this item to the string passed as the parameter" + */ + @Override + public Item setUnlocalizedName(final String p_77655_1_){ + this.unlocalizedName = p_77655_1_; + super.setUnlocalizedName(p_77655_1_); + return this; + } + /** - * Returns the unlocalized name of this item. - */ - @Override + * Returns the unlocalized name of this item. + */ + @Override public String getUnlocalizedName() - { - return this.unlocalizedName; - } + { + return this.unlocalizedName; + } + + public final Long[] getElectricStats(final ItemStack aStack) { + return this.mElectricStats.get((short) aStack.getItemDamage()); + } + + @Override + public int getItemEnchantability() { + return 0; + } - public final Long[] getElectricStats(ItemStack aStack) { - return mElectricStats.get((short) aStack.getItemDamage()); + @Override + public boolean isBookEnchantable(final ItemStack aStack, final ItemStack aBook) { + return false; } - + @Override - public int getItemEnchantability() { - return 0; - } - - @Override - public boolean isBookEnchantable(ItemStack aStack, ItemStack aBook) { - return false; - } - - @Override - public boolean getIsRepairable(ItemStack aStack, ItemStack aMaterial) { - return false; - } - - - /** - * Adds a special Item Behaviour to the Item. - * <p/> - * Note: the boolean Behaviours sometimes won't be executed if another boolean Behaviour returned true before. - * - * @param aMetaValue the Meta Value of the Item you want to add it to. [0 - 32765] - * @param aBehavior the Click Behavior you want to add. - * @return the Item itself for convenience in constructing. - */ - public final BaseEuItem addItemBehavior(int aMetaValue, IItemBehaviour<BaseEuItem> aBehavior) { - if (aMetaValue < 0 || aMetaValue >= 32766 || aBehavior == null) return this; - ArrayList<IItemBehaviour<BaseEuItem>> tList = mItemBehaviors.get((short) aMetaValue); - if (tList == null) { - tList = new ArrayList<IItemBehaviour<BaseEuItem>>(1); - mItemBehaviors.put((short) aMetaValue, tList); - } - tList.add(aBehavior); - return this; - } - - /** - * This adds a Custom Item to the ending Range. - * - * @param aID The Id of the assigned Item [0 - mItemAmount] (The MetaData gets auto-shifted by +mOffset) - * @param aEnglish The Default Localized Name of the created Item - * @param aToolTip The Default ToolTip of the created Item, you can also insert null for having no ToolTip - * @param aFoodBehavior The Food Value of this Item. Can be null aswell. Just a convenience thing. - * @param aRandomData The OreDict Names you want to give the Item. Also used for TC Aspects and some other things. - * @return An ItemStack containing the newly created Item. - */ - @SuppressWarnings("unchecked") - public final ItemStack addItem(int aID, String aEnglish, String aToolTip, Object... aRandomData) { - if (aToolTip == null) aToolTip = ""; - if (aID >= 0 && aID < mItemAmount) { - ItemStack rStack = new ItemStack(this, 1, mOffset + aID); - mEnabledItems.set(aID); - mVisibleItems.set(aID); - GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".name", aEnglish); - GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".tooltip", aToolTip); - List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>(); - // Important Stuff to do first - for (Object tRandomData : aRandomData) - if (tRandomData instanceof SubTag) { - if (tRandomData == SubTag.INVISIBLE) { - mVisibleItems.set(aID, false); - continue; - } - if (tRandomData == SubTag.NO_UNIFICATION) { - GT_OreDictUnificator.addToBlacklist(rStack); - continue; - } - } - // now check for the rest - for (Object tRandomData : aRandomData) - if (tRandomData != null) { - boolean tUseOreDict = true; - if (tRandomData instanceof IItemBehaviour) { - addItemBehavior(mOffset + aID, (IItemBehaviour<BaseEuItem>) tRandomData); - tUseOreDict = false; - } - if (tRandomData instanceof IItemContainer) { - ((IItemContainer) tRandomData).set(rStack); - tUseOreDict = false; - } - if (tRandomData instanceof SubTag) { - continue; - } - if (tRandomData instanceof TC_AspectStack) { - ((TC_AspectStack) tRandomData).addToAspectList(tAspects); - continue; - } - if (tRandomData instanceof ItemData) { - if (GT_Utility.isStringValid(tRandomData)) - GT_OreDictUnificator.registerOre(tRandomData, rStack); - else GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData); - continue; - } - if (tUseOreDict) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); - continue; - } - } - if (GregTech_API.sThaumcraftCompat != null) - GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); - return rStack; - } - return null; - } + public boolean getIsRepairable(final ItemStack aStack, final ItemStack aMaterial) { + return false; + } + + + /** + * Adds a special Item Behaviour to the Item. + * <p/> + * Note: the boolean Behaviours sometimes won't be executed if another boolean Behaviour returned true before. + * + * @param aMetaValue the Meta Value of the Item you want to add it to. [0 - 32765] + * @param aBehavior the Click Behavior you want to add. + * @return the Item itself for convenience in constructing. + */ + public final BaseEuItem addItemBehavior(final int aMetaValue, final IItemBehaviour<BaseEuItem> aBehavior) { + if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { + return this; + } + ArrayList<IItemBehaviour<BaseEuItem>> tList = this.mItemBehaviors.get((short) aMetaValue); + if (tList == null) { + tList = new ArrayList<>(1); + this.mItemBehaviors.put((short) aMetaValue, tList); + } + tList.add(aBehavior); + return this; + } + + /** + * This adds a Custom Item to the ending Range. + * + * @param aID The Id of the assigned Item [0 - mItemAmount] (The MetaData gets auto-shifted by +mOffset) + * @param aEnglish The Default Localized Name of the created Item + * @param aToolTip The Default ToolTip of the created Item, you can also insert null for having no ToolTip + * @param aFoodBehavior The Food Value of this Item. Can be null aswell. Just a convenience thing. + * @param aRandomData The OreDict Names you want to give the Item. Also used for TC Aspects and some other things. + * @return An ItemStack containing the newly created Item. + */ + @SuppressWarnings("unchecked") + public final ItemStack addItem(final int aID, final String aEnglish, String aToolTip, final Object... aRandomData) { + if (aToolTip == null) { + aToolTip = ""; + } + if ((aID >= 0) && (aID < this.mItemAmount)) { + final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID); + this.mEnabledItems.set(aID); + this.mVisibleItems.set(aID); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip); + final List<TC_AspectStack> tAspects = new ArrayList<>(); + // Important Stuff to do first + for (final Object tRandomData : aRandomData) { + if (tRandomData instanceof SubTag) { + if (tRandomData == SubTag.INVISIBLE) { + this.mVisibleItems.set(aID, false); + continue; + } + if (tRandomData == SubTag.NO_UNIFICATION) { + GT_OreDictUnificator.addToBlacklist(rStack); + continue; + } + } + } + // now check for the rest + for (final Object tRandomData : aRandomData) { + if (tRandomData != null) { + boolean tUseOreDict = true; + if (tRandomData instanceof IItemBehaviour) { + this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<BaseEuItem>) tRandomData); + tUseOreDict = false; + } + if (tRandomData instanceof IItemContainer) { + ((IItemContainer) tRandomData).set(rStack); + tUseOreDict = false; + } + if (tRandomData instanceof SubTag) { + continue; + } + if (tRandomData instanceof TC_AspectStack) { + ((TC_AspectStack) tRandomData).addToAspectList(tAspects); + continue; + } + if (tRandomData instanceof ItemData) { + if (GT_Utility.isStringValid(tRandomData)) { + GT_OreDictUnificator.registerOre(tRandomData, rStack); + } else { + GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData); + } + continue; + } + if (tUseOreDict) { + GT_OreDictUnificator.registerOre(tRandomData, rStack); + continue; + } + } + } + if (GregTech_API.sThaumcraftCompat != null) { + GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); + } + return rStack; + } + return null; + } @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { - return itemName.get(par1ItemStack.getItemDamage()-mOffset).getValue(); + public String getItemStackDisplayName(final ItemStack par1ItemStack) { + return this.itemName.get(par1ItemStack.getItemDamage()-this.mOffset).getValue(); } } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java index 391f7bb986..a878ab5254 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -12,35 +15,32 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BaseItemBackpack extends Item{ - + protected final int colourValue; protected final String unlocalName; - - - public BaseItemBackpack(String unlocalizedName, int colour){ - this.unlocalName = unlocalizedName; - this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + "itemBackpack"); - this.colourValue = colour; - GameRegistry.registerItem(this, unlocalizedName); - GT_OreDictUnificator.registerOre("storageBackpack", ItemUtils.getSimpleStack(this)); - setMaxStackSize(1); - setCreativeTab(AddToCreativeTab.tabOther); + + + public BaseItemBackpack(final String unlocalizedName, final int colour){ + this.unlocalName = unlocalizedName; + this.setUnlocalizedName(unlocalizedName); + this.setTextureName(CORE.MODID + ":" + "itemBackpack"); + this.colourValue = colour; + GameRegistry.registerItem(this, unlocalizedName); + GT_OreDictUnificator.registerOre("storageBackpack", ItemUtils.getSimpleStack(this)); + this.setMaxStackSize(1); + this.setCreativeTab(AddToCreativeTab.tabOther); } // Without this method, your inventory will NOT work!!! @Override - public int getMaxItemUseDuration(ItemStack stack) { + public int getMaxItemUseDuration(final ItemStack stack) { return 1; // return any value greater than zero } - - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) + + @Override + public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) { if (!world.isRemote) { @@ -48,41 +48,41 @@ public class BaseItemBackpack extends Item{ if (!player.isSneaking()) { player.openGui(GTplusplus.instance, GuiHandler.GUI3, world, 0, 0, 0); } - + // Otherwise, stealthily place some diamonds in there for a nice surprise next time you open it up :) else { - // Utils.LOG_INFO("Player is Sneaking, giving them sneaky diamonds."); - // new BaseInventoryBackpack(player.getHeldItem()).setInventorySlotContents(0, new ItemStack(Items.diamond,4)); + // Utils.LOG_INFO("Player is Sneaking, giving them sneaky diamonds."); + // new BaseInventoryBackpack(player.getHeldItem()).setInventorySlotContents(0, new ItemStack(Items.diamond,4)); } } - + return itemstack; } - - @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - if (colourValue == 0){ - return MathUtils.generateSingularRandomHexValue(); - } - return colourValue; - } - - @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - //Name Formatting. - String temp = unlocalName.replace("backpack", ""); - //Lets find the colour. - if (temp.toLowerCase().contains("dark")){ - temp = unlocalName.substring(12, unlocalName.length()); - temp = "Dark "+ temp; - } - return (temp+" Backpack"); - } + @Override + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + if (this.colourValue == 0){ + return MathUtils.generateSingularRandomHexValue(); + } + return this.colourValue; + + } + + @Override + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + //Name Formatting. + String temp = this.unlocalName.replace("backpack", ""); + //Lets find the colour. + if (temp.toLowerCase().contains("dark")){ + temp = this.unlocalName.substring(12, this.unlocalName.length()); + temp = "Dark "+ temp; + } + return (temp+" Backpack"); + } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) + public void registerIcons(final IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemBackpack"); } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java index 86cd1c8046..2521671223 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java @@ -2,18 +2,18 @@ package gtPlusPlus.core.item.base; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /* - * - * + * + * Key Point: You can access the NBT compound data from the Item class (in those methods that pass an ItemStack), but the NBT compound can only be set on an ItemStack. The steps to add NBT data to an ItemStack: @@ -21,25 +21,25 @@ import cpw.mods.fml.relauncher.SideOnly; Create an NBTTagCompound and fill it with the appropriate data Call ItemStack#setTagCompound() method to set it. - * + * */ public class BaseItemBrain extends Item{ // This is an array of all the types I am going to be adding. String[] brainTypes = { "dead", "preserved", "fresh", "tasty" }; - // This method allows us to have different language translation keys for + // This method allows us to have different language translation keys for // each item we add. @Override - public String getUnlocalizedName(ItemStack stack) + public String getUnlocalizedName(final ItemStack stack) { - // This makes sure that the stack has a tag compound. This is how data + // This makes sure that the stack has a tag compound. This is how data // is stored on items. - if (stack.hasTagCompound()) + if (stack.hasTagCompound()) { // This is the object holding all of the item data. - NBTTagCompound itemData = stack.getTagCompound(); - // This checks to see if the item has data stored under the + final NBTTagCompound itemData = stack.getTagCompound(); + // This checks to see if the item has data stored under the // brainType key. if (itemData.hasKey("brainType")) { @@ -54,48 +54,48 @@ public class BaseItemBrain extends Item{ // This is a fun method which allows us to run some code when our item is - // shown in a creative tab. I am going to use it to add all the brain + // shown in a creative tab. I am going to use it to add all the brain // types. @SuppressWarnings("unchecked") @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List itemList) + public void getSubItems(final Item item, final CreativeTabs tab, final List itemList) { // This creates a loop with a counter. It will go through once for - // every listing in brainTypes, and gives us a number associated + // every listing in brainTypes, and gives us a number associated // with each listing. - for (int pos = 0; pos < brainTypes.length; pos++) + for (int pos = 0; pos < this.brainTypes.length; pos++) { - // This creates a new ItemStack instance. The item parameter + // This creates a new ItemStack instance. The item parameter // supplied is this item. - ItemStack brainStack = new ItemStack(item); - // By default, a new ItemStack does not have any nbt compound data. + final ItemStack brainStack = new ItemStack(item); + // By default, a new ItemStack does not have any nbt compound data. // We need to give it some. brainStack.setTagCompound(new NBTTagCompound()); - // Now we set the type of the item, brainType is the key, and + // Now we set the type of the item, brainType is the key, and // brainTypes[pos] is grabbing a // entry from the brainTypes array. - brainStack.getTagCompound().setString("brainType", - brainTypes[pos]); + brainStack.getTagCompound().setString("brainType", + this.brainTypes[pos]); // And this adds it to the itemList, which is a list of all items // in the creative tab. itemList.add(brainStack); } } - // This code will allow us to tell the items apart in game. You can change + // This code will allow us to tell the items apart in game. You can change @SuppressWarnings("unchecked") // texture based on nbt data, but I won't be covering that. @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean isAdvanced){ - if ( stack.hasTagCompound() + public void addInformation(final ItemStack stack, final EntityPlayer player, final List tooltip, final boolean isAdvanced){ + if ( stack.hasTagCompound() && stack.getTagCompound().hasKey("brainType")) { // StatCollector is a class which allows us to handle string // language translation. This requires that you fill out the // translation in you language class. - tooltip.add(StatCollector.translateToLocal("tooltip.yourmod." + tooltip.add(StatCollector.translateToLocal("tooltip.yourmod." + stack.getTagCompound().getString("brainType") + ".desc")); } else // If the brain does not have valid tag data, a default message diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 8903360943..8c6dc9a0c9 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base; +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; @@ -8,16 +11,12 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; public class BaseItemComponent extends Item{ @@ -28,22 +27,22 @@ public class BaseItemComponent extends Item{ public final int componentColour; public Object extraData; - public BaseItemComponent(Material material, ComponentTypes componentType) { + public BaseItemComponent(final Material material, final ComponentTypes componentType) { this.componentMaterial = material; this.unlocalName = "item"+componentType.COMPONENT_NAME+material.getUnlocalizedName(); this.materialName = material.getLocalizedName(); this.componentType = componentType; this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName(unlocalName); + this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(64); - this.setTextureName(getCorrectTextures()); + this.setTextureName(this.getCorrectTextures()); this.componentColour = material.getRgbAsHex(); - GameRegistry.registerItem(this, unlocalName); + GameRegistry.registerItem(this, this.unlocalName); GT_OreDictUnificator.registerOre(componentType.getOreDictName()+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } //For Cell Generation - public BaseItemComponent(String unlocalName, String localName, short[] RGBA) { + public BaseItemComponent(final String unlocalName, final String localName, final short[] RGBA) { this.componentMaterial = null; this.unlocalName = "itemCell"+unlocalName; this.materialName = localName; @@ -60,90 +59,90 @@ public class BaseItemComponent extends Item{ public String getCorrectTextures(){ if (!CORE.configSwitches.useGregtechTextures){ - return CORE.MODID + ":" + "item"+componentType.COMPONENT_NAME; + return CORE.MODID + ":" + "item"+this.componentType.COMPONENT_NAME; } - if (componentType == ComponentTypes.GEAR){ + if (this.componentType == ComponentTypes.GEAR){ return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGt"; } - else if (componentType == ComponentTypes.ROD){ + else if (this.componentType == ComponentTypes.ROD){ return "gregtech" + ":" + "materialicons/METALLIC/" + "stick"; } - else if (componentType == ComponentTypes.RODLONG){ + else if (this.componentType == ComponentTypes.RODLONG){ return "gregtech" + ":" + "materialicons/METALLIC/" + "stickLong"; } - else if (componentType == ComponentTypes.PLATEDOUBLE){ + else if (this.componentType == ComponentTypes.PLATEDOUBLE){ return "gregtech" + ":" + "materialicons/METALLIC/" + "plateDouble"; } - return "gregtech" + ":" + "materialicons/METALLIC/" + componentType.COMPONENT_NAME.toLowerCase(); + return "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME.toLowerCase(); } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { - if (componentMaterial != null) { - return (componentMaterial.getLocalizedName()+componentType.DISPLAY_NAME); + if (this.componentMaterial != null) { + return (this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME); } - return materialName+" Cell"; + return this.materialName+" Cell"; } public final String getMaterialName() { - return materialName; + return this.materialName; } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public final void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - if (materialName != null && materialName != "" && !materialName.equals("") && componentMaterial != null){ + if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){ - if (componentType == ComponentTypes.DUST){ + if (this.componentType == ComponentTypes.DUST){ //list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust."); } - if (componentType == ComponentTypes.INGOT){ - //list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + "."); - if (materialName != null && materialName != "" && !materialName.equals("") && unlocalName.toLowerCase().contains("ingothot")){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling.."); + if (this.componentType == ComponentTypes.INGOT){ + //list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + "."); + if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && this.unlocalName.toLowerCase().contains("ingothot")){ + list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling.."); } } - if (componentType == ComponentTypes.PLATE){ - //list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + "."); + if (this.componentType == ComponentTypes.PLATE){ + //list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + "."); } - if (componentType == ComponentTypes.PLATEDOUBLE){ - //list.add(EnumChatFormatting.GRAY+"A double plate of " + materialName + "."); + if (this.componentType == ComponentTypes.PLATEDOUBLE){ + //list.add(EnumChatFormatting.GRAY+"A double plate of " + materialName + "."); } - if (componentType == ComponentTypes.ROD){ - //list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + "."); + if (this.componentType == ComponentTypes.ROD){ + //list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + "."); } - if (componentType == ComponentTypes.RODLONG){ + if (this.componentType == ComponentTypes.RODLONG){ //list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + "."); } - if (componentType == ComponentTypes.ROTOR){ - //list.add(EnumChatFormatting.GRAY+"A Rotor made out of " + materialName + ". "); + if (this.componentType == ComponentTypes.ROTOR){ + //list.add(EnumChatFormatting.GRAY+"A Rotor made out of " + materialName + ". "); } - if (componentType == ComponentTypes.BOLT){ - //list.add(EnumChatFormatting.GRAY+"A small Bolt, constructed from " + materialName + "."); + if (this.componentType == ComponentTypes.BOLT){ + //list.add(EnumChatFormatting.GRAY+"A small Bolt, constructed from " + materialName + "."); } - if (componentType == ComponentTypes.SCREW){ - //list.add(EnumChatFormatting.GRAY+"A 8mm Screw, fabricated out of some " + materialName + "."); + if (this.componentType == ComponentTypes.SCREW){ + //list.add(EnumChatFormatting.GRAY+"A 8mm Screw, fabricated out of some " + materialName + "."); } - if (componentType == ComponentTypes.GEAR){ + if (this.componentType == ComponentTypes.GEAR){ //list.add(EnumChatFormatting.GRAY+"A large Gear, constructed from " + materialName + "."); } - if (componentType == ComponentTypes.RING){ + if (this.componentType == ComponentTypes.RING){ //list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring."); - } - if (componentMaterial != null){ - if (!componentMaterial.vChemicalFormula.equals("??") && !componentMaterial.vChemicalFormula.equals("?")) { - if (componentType != ComponentTypes.CELL || componentType != ComponentTypes.PLASMACELL){ - list.add(Utils.sanitizeString(componentMaterial.vChemicalFormula)); + } + if (this.componentMaterial != null){ + if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?")) { + if ((this.componentType != ComponentTypes.CELL) || (this.componentType != ComponentTypes.PLASMACELL)){ + list.add(Utils.sanitizeString(this.componentMaterial.vChemicalFormula)); } else { - list.add(Utils.sanitizeString(componentMaterial.vChemicalFormula)); + list.add(Utils.sanitizeString(this.componentMaterial.vChemicalFormula)); } } - if (componentMaterial.isRadioactive){ + if (this.componentMaterial.isRadioactive){ list.add(CORE.GT_Tooltip_Radioactive); } } @@ -155,14 +154,14 @@ public class BaseItemComponent extends Item{ @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - return componentColour; + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + return this.componentColour; } @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (componentMaterial != null){ - EntityUtils.applyRadiationDamageToEntity(componentMaterial.vRadioationLevel, world, entityHolding); + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + if (this.componentMaterial != null){ + EntityUtils.applyRadiationDamageToEntity(this.componentMaterial.vRadioationLevel, world, entityHolding); } } @@ -185,30 +184,30 @@ public class BaseItemComponent extends Item{ SCREW("Screw", " Screw", "screw"), BOLT("Bolt", " Bolt", "bolt"), ROTOR("Rotor", " Rotor", "rotor"), - RING("Ring", " Ring", "ring"), - PLASMACELL("CellPlasma", " Plasma Cell", "cellPlasma"), - CELL("Cell", " Cell", "cell"), - NUGGET("Nugget", " Nugget", "nugget"); + RING("Ring", " Ring", "ring"), + PLASMACELL("CellPlasma", " Plasma Cell", "cellPlasma"), + CELL("Cell", " Cell", "cell"), + NUGGET("Nugget", " Nugget", "nugget"); private String COMPONENT_NAME; private String DISPLAY_NAME; private String OREDICT_NAME; - private ComponentTypes (final String LocalName, String DisplayName, String OreDictName){ + private ComponentTypes (final String LocalName, final String DisplayName, final String OreDictName){ this.COMPONENT_NAME = LocalName; this.DISPLAY_NAME = DisplayName; this.OREDICT_NAME = OreDictName; } public String getComponent(){ - return COMPONENT_NAME; - } + return this.COMPONENT_NAME; + } public String getName(){ - return DISPLAY_NAME; + return this.DISPLAY_NAME; } public String getOreDictName(){ - return OREDICT_NAME; + return this.OREDICT_NAME; } } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java b/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java index 431f93b3e6..3c55f066da 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java @@ -1,9 +1,8 @@ package gtPlusPlus.core.item.base; -import gtPlusPlus.core.lib.CORE; - import java.util.List; +import gtPlusPlus.core.lib.CORE; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,18 +10,18 @@ import net.minecraft.item.ItemStack; public class BaseItemGeneric extends Item { - public BaseItemGeneric(String unlocalizedName, CreativeTabs c, int stackSize, int maxDmg) + public BaseItemGeneric(final String unlocalizedName, final CreativeTabs c, final int stackSize, final int maxDmg) { - setUnlocalizedName(CORE.MODID + "_" + unlocalizedName); - setTextureName(CORE.MODID + ":" + unlocalizedName); - setCreativeTab(c); - setMaxStackSize(stackSize); - setMaxDamage(maxDmg); + this.setUnlocalizedName(CORE.MODID + "_" + unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(c); + this.setMaxStackSize(stackSize); + this.setMaxDamage(maxDmg); } - + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { super.addInformation(stack, aPlayer, list, bool); - } + } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java index ed87677970..1c92fd8455 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java @@ -1,13 +1,12 @@ package gtPlusPlus.core.item.base; +import java.util.List; + import gregtech.api.enums.Materials; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Quality; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,51 +21,51 @@ public class BaseItemLoot extends Item{ private Quality lootQuality; private final Materials lootMaterial; - public BaseItemLoot(LootTypes lootType, Materials material) { + public BaseItemLoot(final LootTypes lootType, final Materials material) { this.lootTypes = lootType; this.lootMaterial = material; - this.materialName = material.mDefaultLocalName; - this.unlocalName = "item"+lootType.LOOT_TYPE+this.materialName; - this.setUnlocalizedName(unlocalName); + this.materialName = material.mDefaultLocalName; + this.unlocalName = "item"+lootType.LOOT_TYPE+this.materialName; + this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(1); this.setTextureName(CORE.MODID + ":" + "item"+lootType.LOOT_TYPE); } - + public ItemStack generateLootStack(){ - lootQuality = Quality.getRandomQuality(); + this.lootQuality = Quality.getRandomQuality(); return ItemUtils.getSimpleStack(this, 1); } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - return (materialName+lootTypes.DISPLAY_SUFFIX); + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + return (this.materialName+this.lootTypes.DISPLAY_SUFFIX); } public final String getMaterialName() { - return materialName; + return this.materialName; } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add(lootQuality.getQuality()); - + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + list.add(this.lootQuality.getQuality()); + /*if (componentMaterial.isRadioactive){ list.add(CORE.GT_Tooltip_Radioactive); - }*/ + }*/ super.addInformation(stack, aPlayer, list, bool); } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - short[] temp = lootMaterial.mRGBa; + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + final short[] temp = this.lootMaterial.mRGBa; return Utils.rgbtoHexValue(temp[0], temp[1], temp[2]); } @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { //EntityUtils.applyRadiationDamageToEntity(lootQuality.vRadioationLevel, world, entityHolding); } @@ -83,7 +82,7 @@ public class BaseItemLoot extends Item{ Helmet("Helmet", " Medium Helm", "helmet"), Chestplate("Platebody", " Chestplate", "platebody"), Leggings("Platelegs", " Platelegs", "platelegs"), - Boots("Boots", " Boots", "boots"); + Boots("Boots", " Boots", "boots"); private String LOOT_TYPE; private String DISPLAY_SUFFIX; private String OREDICT_NAME; @@ -93,13 +92,13 @@ public class BaseItemLoot extends Item{ this.OREDICT_NAME = OreDictName; } public String getLootType(){ - return LOOT_TYPE; - } + return this.LOOT_TYPE; + } public String getName(){ - return DISPLAY_SUFFIX; + return this.DISPLAY_SUFFIX; } public String getOreDictName(){ - return OREDICT_NAME; + return this.OREDICT_NAME; } } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java index a8c51df7c4..7eff231e86 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java @@ -1,20 +1,19 @@ package gtPlusPlus.core.item.base; +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; public class BaseItemTCShard extends Item{ @@ -23,54 +22,54 @@ public class BaseItemTCShard extends Item{ public final String descriptionString; public final String descriptionString2; public final int itemColour; - - public BaseItemTCShard(String DisplayName, int colour) { + + public BaseItemTCShard(final String DisplayName, final int colour) { this(DisplayName, colour, ""); } - - public BaseItemTCShard(String DisplayName, int colour, String Description) { + + public BaseItemTCShard(final String DisplayName, final int colour, final String Description) { this(DisplayName, colour, "", Description); } - public BaseItemTCShard(String DisplayName, int colour, String Description, String Description2) { + public BaseItemTCShard(final String DisplayName, final int colour, final String Description, final String Description2) { this.unlocalName = "item"+Utils.sanitizeString(DisplayName); this.displayName = DisplayName; this.itemColour = colour; this.descriptionString = Description; this.descriptionString2 = Description2; this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName(unlocalName); + this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(64); this.setTextureName(CORE.MODID + ":" + "itemShard"); - GameRegistry.registerItem(this, unlocalName); + GameRegistry.registerItem(this, this.unlocalName); GT_OreDictUnificator.registerOre("shard"+DisplayName, ItemUtils.getSimpleStack(this)); GT_OreDictUnificator.registerOre("gemInfused"+DisplayName, ItemUtils.getSimpleStack(this)); } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { return (this.displayName+" Shard"); } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - if (descriptionString != "" || !descriptionString.equals("")){ - list.add(EnumChatFormatting.GRAY+descriptionString); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if ((this.descriptionString != "") || !this.descriptionString.equals("")){ + list.add(EnumChatFormatting.GRAY+this.descriptionString); } - if (descriptionString2 != "" || !descriptionString2.equals("")){ - list.add(EnumChatFormatting.GRAY+descriptionString2); + if ((this.descriptionString2 != "") || !this.descriptionString2.equals("")){ + list.add(EnumChatFormatting.GRAY+this.descriptionString2); } } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - return itemColour; + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + return this.itemColour; } @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java index c793776e37..38c0ee567f 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java @@ -1,10 +1,9 @@ package gtPlusPlus.core.item.base; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; - import java.util.List; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,55 +16,55 @@ public class BaseItemWithCharge extends Item{ public int int_Charge = 0; public int int_Max_Charge = 0; - - public BaseItemWithCharge(String unlocalizedName, int constructor_Charge, int constructor_Max_Charge) { + + public BaseItemWithCharge(final String unlocalizedName, final int constructor_Charge, final int constructor_Max_Charge) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); - this.setMaxStackSize(1); + this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); this.int_Charge = constructor_Charge; this.int_Max_Charge = constructor_Max_Charge; } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - int NBT_Charge = int_Charge; - int NBT_Max_Charge = int_Max_Charge; + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + int NBT_Charge = this.int_Charge; + int NBT_Max_Charge = this.int_Max_Charge; if (stack.stackTagCompound != null) { NBT_Charge = stack.stackTagCompound.getInteger("charge_Current"); NBT_Max_Charge = stack.stackTagCompound.getInteger("charge_Max"); - String tempX = String.valueOf(NBT_Charge); - String tempY = String.valueOf(NBT_Max_Charge); - String formattedX = EnumChatFormatting.RED+tempX+EnumChatFormatting.GRAY; - String formattedY = EnumChatFormatting.DARK_RED+tempY+EnumChatFormatting.GRAY; - list.add(EnumChatFormatting.GRAY+"Charge:"+formattedX+"/"+formattedY+"."); - super.addInformation(stack, aPlayer, list, bool); - } + final String tempX = String.valueOf(NBT_Charge); + final String tempY = String.valueOf(NBT_Max_Charge); + final String formattedX = EnumChatFormatting.RED+tempX+EnumChatFormatting.GRAY; + final String formattedY = EnumChatFormatting.DARK_RED+tempY+EnumChatFormatting.GRAY; + list.add(EnumChatFormatting.GRAY+"Charge:"+formattedX+"/"+formattedY+"."); + super.addInformation(stack, aPlayer, list, bool); + } } //Ticking and NBT Handling /* Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and * update it's contents. - * + * * public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = ""; public float heat = 0; public float maxHeat = 5000; - * + * */ @Override - public void onCreated(ItemStack itemStack, World world, EntityPlayer player) { + public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) { } @Override - public void onUpdate(ItemStack itemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - + public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4, final boolean par5) { + } @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer par3Entity) { + public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer par3Entity) { itemStack.stackTagCompound = new NBTTagCompound(); return super.onItemRightClick(itemStack, world, par3Entity); } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java b/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java index ec052ef1f9..4c9ad1e486 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java @@ -1,29 +1,28 @@ package gtPlusPlus.core.item.base; -import gtPlusPlus.core.lib.CORE; - import java.util.List; +import gtPlusPlus.core.lib.CORE; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; public class BaseItemWithDamageValue extends Item{ - public BaseItemWithDamageValue(String unlocalizedName) { + public BaseItemWithDamageValue(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(100); } @Override - public void setDamage(ItemStack stack, int damage) { + public void setDamage(final ItemStack stack, final int damage) { super.setDamage(stack, damage); - } + } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add(EnumChatFormatting.GOLD+""); super.addInformation(stack, aPlayer, list, bool); - } + } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index a782e8da00..f856185cdb 100644 --- a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.item.base; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.util.Utils; - import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +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; @@ -15,236 +16,234 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BasicSpawnEgg extends ItemMonsterPlacer { - @SideOnly(Side.CLIENT) - private IIcon theIcon; - protected int colorBase = 0x000000; - protected int colorSpots = 0xFFFFFF; - protected String entityMODID = ""; - protected String entityToSpawnName = ""; - protected String entityToSpawnNameFull = ""; - protected EntityLiving entityToSpawn = null; - - public BasicSpawnEgg(){ - super(); - } - - public BasicSpawnEgg(String MODID, String parEntityToSpawnName, int parPrimaryColor, int parSecondaryColor){ - setHasSubtypes(false); - maxStackSize = 64; - setCreativeTab(AddToCreativeTab.tabOther); - setEntityToSpawnName(parEntityToSpawnName); - colorBase = parPrimaryColor; - colorSpots = parSecondaryColor; - entityMODID = MODID; - - // DEBUG - Utils.LOG_WARNING("Spawn egg constructor for "+entityToSpawnName); - } - - /** - * Callback for item usage. If the item does something special on right clicking, - - * he will have one of those. Return - * True if something happen and false if it don't. This is for ITEMS, not BLOCKS - */ - @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10){ - if (par3World.isRemote) - { - return true; - } - Block block = par3World.getBlock(par4, par5, par6); + @SideOnly(Side.CLIENT) + private IIcon theIcon; + protected int colorBase = 0x000000; + protected int colorSpots = 0xFFFFFF; + protected String entityMODID = ""; + protected String entityToSpawnName = ""; + protected String entityToSpawnNameFull = ""; + protected EntityLiving entityToSpawn = null; + + public BasicSpawnEgg(){ + super(); + } + + public BasicSpawnEgg(final String MODID, final String parEntityToSpawnName, final int parPrimaryColor, final int parSecondaryColor){ + this.setHasSubtypes(false); + this.maxStackSize = 64; + this.setCreativeTab(AddToCreativeTab.tabOther); + this.setEntityToSpawnName(parEntityToSpawnName); + this.colorBase = parPrimaryColor; + this.colorSpots = parSecondaryColor; + this.entityMODID = MODID; + + // DEBUG + Utils.LOG_WARNING("Spawn egg constructor for "+this.entityToSpawnName); + } + + /** + * Callback for item usage. If the item does something special on right clicking, + + * he will have one of those. Return + * True if something happen and false if it don't. This is for ITEMS, not BLOCKS + */ + @Override + public boolean onItemUse(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final World par3World, int par4, int par5, int par6, final int par7, final float par8, final float par9, final float par10){ + if (par3World.isRemote) + { + return true; + } + final Block block = par3World.getBlock(par4, par5, par6); par4 += Facing.offsetsXForSide[par7]; par5 += Facing.offsetsYForSide[par7]; par6 += Facing.offsetsZForSide[par7]; double d0 = 0.0D; - if (par7 == 1 && block.getRenderType() == 11) + if ((par7 == 1) && (block.getRenderType() == 11)) { - d0 = 0.5D; + d0 = 0.5D; } - Entity entity = spawnEntity(par3World, par4 + 0.5D, par5 + d0, par6 + 0.5D); + final Entity entity = this.spawnEntity(par3World, par4 + 0.5D, par5 + d0, par6 + 0.5D); if (entity != null) { - if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) - { - ((EntityLiving)entity).setCustomNameTag(par1ItemStack.getDisplayName()); - } - - if (!par2EntityPlayer.capabilities.isCreativeMode) - { - --par1ItemStack.stackSize; - } + if ((entity instanceof EntityLivingBase) && par1ItemStack.hasDisplayName()) + { + ((EntityLiving)entity).setCustomNameTag(par1ItemStack.getDisplayName()); + } + + if (!par2EntityPlayer.capabilities.isCreativeMode) + { + --par1ItemStack.stackSize; + } } return true; - } + } - /** - * Called whenever this item is equipped and the right mouse button is pressed. + /** + * Called whenever this item is equipped and the right mouse button is pressed. - *Args: itemStack, world, entityPlayer - */ - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer){ - if (par2World.isRemote) - { - return par1ItemStack; - } - MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); + *Args: itemStack, world, entityPlayer + */ + @Override + public ItemStack onItemRightClick(final ItemStack par1ItemStack, final World par2World, final EntityPlayer par3EntityPlayer){ + if (par2World.isRemote) + { + return par1ItemStack; + } + final MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); if (movingobjectposition == null) { - return par1ItemStack; + return par1ItemStack; } if (movingobjectposition.typeOfHit == MovingObjectPosition - .MovingObjectType.BLOCK) + .MovingObjectType.BLOCK) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - - if (!par2World.canMineBlock(par3EntityPlayer, i, j, k)) - { - return par1ItemStack; - } - - if (!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack)) - { - return par1ItemStack; - } - - if (par2World.getBlock(i, j, k) instanceof BlockLiquid) - { - Entity entity = spawnEntity(par2World, i, j, k); - - if (entity != null) - { - if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) - { - ((EntityLiving)entity).setCustomNameTag(par1ItemStack.getDisplayName()); - } - - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - --par1ItemStack.stackSize; - } - } - } + final int i = movingobjectposition.blockX; + final int j = movingobjectposition.blockY; + final int k = movingobjectposition.blockZ; + + if (!par2World.canMineBlock(par3EntityPlayer, i, j, k)) + { + return par1ItemStack; + } + + if (!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack)) + { + return par1ItemStack; + } + + if (par2World.getBlock(i, j, k) instanceof BlockLiquid) + { + final Entity entity = this.spawnEntity(par2World, i, j, k); + + if (entity != null) + { + if ((entity instanceof EntityLivingBase) && par1ItemStack.hasDisplayName()) + { + ((EntityLiving)entity).setCustomNameTag(par1ItemStack.getDisplayName()); + } + + if (!par3EntityPlayer.capabilities.isCreativeMode) + { + --par1ItemStack.stackSize; + } + } + } } return par1ItemStack; - } - - /** - * Spawns the creature specified by the egg's type in the location specified by - - * the last three parameters. - * Parameters: world, entityID, x, y, z. - */ - public Entity spawnEntity(World parWorld, double parX, double parY, double parZ){ - - if (!parWorld.isRemote) // never spawn entity on client side - { - entityToSpawnNameFull = entityMODID+"."+entityToSpawnName; - if (EntityList.stringToClassMapping.containsKey(entityToSpawnNameFull)) - { - entityToSpawn = (EntityLiving) EntityList - - .createEntityByName(entityToSpawnNameFull, parWorld); - entityToSpawn.setLocationAndAngles(parX, parY, parZ, - - MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() - - * 360.0F), 0.0F); - parWorld.spawnEntityInWorld(entityToSpawn); - entityToSpawn.onSpawnWithEgg((IEntityLivingData)null); - entityToSpawn.playLivingSound(); - } - else - { - //DEBUG - Utils.LOG_WARNING("Entity not found "+entityToSpawnName); - } - } - - return entityToSpawn; - } - - - /** - * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) - */ - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item parItem, CreativeTabs parTab, List parList){ - parList.add(new ItemStack(parItem, 1, 0)); - } - - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int parColorType){ - return (parColorType == 0) ? colorBase : colorSpots; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses(){ - return true; - } - - @Override - // Doing this override means that there is no localization for language - // unless you specifically check for localization here and convert - public String getItemStackDisplayName(ItemStack par1ItemStack){ - return "Spawn "+entityToSpawnName; - } - - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister){ - super.registerIcons(par1IconRegister); - theIcon = par1IconRegister.registerIcon(getIconString() + "_overlay"); - } - - /** - * Gets an icon index based on an item's damage value and the given render pass - */ - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int parDamageVal, int parRenderPass){ - return parRenderPass > 0 ? theIcon : super.getIconFromDamageForRenderPass(parDamageVal, parRenderPass); - } - - public void setColors(int parColorBase, int parColorSpots){ - colorBase = parColorBase; - colorSpots = parColorSpots; - } - - public int getColorBase(){ - return colorBase; - } - - public int getColorSpots(){ - return colorSpots; - } - - public void setEntityToSpawnName(String parEntityToSpawnName){ - entityToSpawnName = parEntityToSpawnName; - entityToSpawnNameFull = entityMODID+"."+entityToSpawnName; - } + } + + /** + * Spawns the creature specified by the egg's type in the location specified by + + * the last three parameters. + * Parameters: world, entityID, x, y, z. + */ + public Entity spawnEntity(final World parWorld, final double parX, final double parY, final double parZ){ + + if (!parWorld.isRemote) // never spawn entity on client side + { + this.entityToSpawnNameFull = this.entityMODID+"."+this.entityToSpawnName; + if (EntityList.stringToClassMapping.containsKey(this.entityToSpawnNameFull)) + { + this.entityToSpawn = (EntityLiving) EntityList + + .createEntityByName(this.entityToSpawnNameFull, parWorld); + this.entityToSpawn.setLocationAndAngles(parX, parY, parZ, + + MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() + + * 360.0F), 0.0F); + parWorld.spawnEntityInWorld(this.entityToSpawn); + this.entityToSpawn.onSpawnWithEgg((IEntityLivingData)null); + this.entityToSpawn.playLivingSound(); + } + else + { + //DEBUG + Utils.LOG_WARNING("Entity not found "+this.entityToSpawnName); + } + } + + return this.entityToSpawn; + } + + + /** + * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) + */ + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(final Item parItem, final CreativeTabs parTab, final List parList){ + parList.add(new ItemStack(parItem, 1, 0)); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(final ItemStack par1ItemStack, final int parColorType){ + return (parColorType == 0) ? this.colorBase : this.colorSpots; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses(){ + return true; + } + + @Override + // Doing this override means that there is no localization for language + // unless you specifically check for localization here and convert + public String getItemStackDisplayName(final ItemStack par1ItemStack){ + return "Spawn "+this.entityToSpawnName; + } + + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(final IIconRegister par1IconRegister){ + super.registerIcons(par1IconRegister); + this.theIcon = par1IconRegister.registerIcon(this.getIconString() + "_overlay"); + } + + /** + * Gets an icon index based on an item's damage value and the given render pass + */ + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamageForRenderPass(final int parDamageVal, final int parRenderPass){ + return parRenderPass > 0 ? this.theIcon : super.getIconFromDamageForRenderPass(parDamageVal, parRenderPass); + } + + public void setColors(final int parColorBase, final int parColorSpots){ + this.colorBase = parColorBase; + this.colorSpots = parColorSpots; + } + + public int getColorBase(){ + return this.colorBase; + } + + public int getColorSpots(){ + return this.colorSpots; + } + + public void setEntityToSpawnName(final String parEntityToSpawnName){ + this.entityToSpawnName = parEntityToSpawnName; + this.entityToSpawnNameFull = this.entityMODID+"."+this.entityToSpawnName; + } } diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java index 9c7b14f648..a5f1f7f705 100644 --- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java @@ -1,19 +1,18 @@ package gtPlusPlus.core.item.base; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; - 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.core.lib.CORE; +import gtPlusPlus.core.util.Utils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class CoreItem extends Item { @@ -31,7 +30,7 @@ public class CoreItem extends Item /* * Name, Tab - 64 Stack, 0 Dmg */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab) { this(unlocalizedName, creativeTab, 64, 0); //Calls 3 } @@ -40,35 +39,35 @@ public class CoreItem extends Item /* * Name, Tab - 64 Stack, 0 Dmg */ - public CoreItem(String unlocalizedName, String displayName, CreativeTabs creativeTab) + public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab) { this(unlocalizedName, creativeTab, 64, 0); //Calls 3 - itemName = displayName; + this.itemName = displayName; } //0.1 - /* - * Name, Tab - 64 Stack, 0 Dmg - */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, ItemStack OverrideItem) - { - this(unlocalizedName, creativeTab, 64, 0, "This item will be replaced by another when helf by a player, it is old and should not be used in recipes.", EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5 - } + /* + * Name, Tab - 64 Stack, 0 Dmg + */ + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final ItemStack OverrideItem) + { + this(unlocalizedName, creativeTab, 64, 0, "This item will be replaced by another when helf by a player, it is old and should not be used in recipes.", EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5 + } //0.1 /* * Name, Tab - 64 Stack, 0 Dmg */ - public CoreItem(String unlocalizedName, String displayName, CreativeTabs creativeTab, ItemStack OverrideItem) + public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final ItemStack OverrideItem) { this(unlocalizedName, creativeTab, 64, 0, "This item will be replaced by another when helf by a player, it is old and should not be used in recipes.", EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5 - itemName = displayName; + this.itemName = displayName; } //1 /* * Name, Tab, Stack - 0 Dmg */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize) { this(unlocalizedName, creativeTab, stackSize, 0); //Calls 3 } @@ -76,15 +75,15 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Description - 0 Dmg */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, String description) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final String description) { this(unlocalizedName, creativeTab, stackSize, 0, description); //Calls 4 - } + } //3 /* * Name, Tab, Stack, Dmg - Description */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg) { this(unlocalizedName, creativeTab, stackSize, maxDmg, ""); //Calls 4 } @@ -92,7 +91,7 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg, Description */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, EnumChatFormatting.GRAY, false, null); //Calls 4.5 } @@ -100,7 +99,7 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg, Description, Text Colour - Common */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumChatFormatting colour) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumChatFormatting colour) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, colour, false, null); //Calls 5 } @@ -109,22 +108,22 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg, Description, Rarity - Gray text */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumRarity rarity) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity rarity) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, rarity, EnumChatFormatting.GRAY, false, null); //Calls 5 } - //5 + //5 /* * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect */ - public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect, ItemStack OverrideItem) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { - setUnlocalizedName(unlocalizedName); - setTextureName(CORE.MODID + ":" + unlocalizedName); - setCreativeTab(creativeTab); - setMaxStackSize(stackSize); - setMaxDamage(maxDmg); + this.setUnlocalizedName(unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(creativeTab); + this.setMaxStackSize(stackSize); + this.setMaxDamage(maxDmg); this.rarity = regRarity; this.itemDescription = description; this.descColour = colour; @@ -135,29 +134,29 @@ public class CoreItem extends Item @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add(descColour+itemDescription); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + list.add(this.descColour+this.itemDescription); //super.addInformation(stack, aPlayer, list, bool); - } + } @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ - return rarity; + public EnumRarity getRarity(final ItemStack par1ItemStack){ + return this.rarity; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ - return hasEffect; + public boolean hasEffect(final ItemStack par1ItemStack){ + return this.hasEffect; } @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (turnsInto != null){ + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + if (this.turnsInto != null){ if (entityHolding instanceof EntityPlayer){ - Utils.LOG_INFO("Replacing "+iStack.getDisplayName()+" with "+turnsInto.getDisplayName()+"."); - ItemStack tempTransform = turnsInto; + Utils.LOG_INFO("Replacing "+iStack.getDisplayName()+" with "+this.turnsInto.getDisplayName()+"."); + final ItemStack tempTransform = this.turnsInto; if (iStack.stackSize == 64){ tempTransform.stackSize=64; ((EntityPlayer) entityHolding).inventory.addItemStackToInventory((tempTransform)); @@ -176,9 +175,10 @@ public class CoreItem extends Item } @Override - public String getItemStackDisplayName(ItemStack tItem) { - if (itemName == null || itemName.equals("")) - return super.getItemStackDisplayName(tItem); - return itemName; + public String getItemStackDisplayName(final ItemStack tItem) { + if ((this.itemName == null) || this.itemName.equals("")) { + return super.getItemStackDisplayName(tItem); + } + return this.itemName; } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java b/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java index 6292c5cde6..0420809253 100644 --- a/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java +++ b/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.material.Material; public class BaseItemBolt extends BaseItemComponent{ - public BaseItemBolt(Material material) { + public BaseItemBolt(final Material material) { super(material, BaseItemComponent.ComponentTypes.BOLT); } } diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 17af462a0f..2345c1ee8d 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.cell; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; @@ -7,8 +9,6 @@ import gtPlusPlus.core.util.Utils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BaseItemCell extends BaseItemComponent{ @@ -16,9 +16,9 @@ public class BaseItemCell extends BaseItemComponent{ private IIcon overlay; ComponentTypes Cell = ComponentTypes.CELL; - public BaseItemCell(Material material) { - super(material, BaseItemComponent.ComponentTypes.CELL); - fluidColour = (short[]) ((material == null) ? extraData : material.getRGBA()); + public BaseItemCell(final Material material) { + super(material, BaseItemComponent.ComponentTypes.CELL); + this.fluidColour = (short[]) ((material == null) ? this.extraData : material.getRGBA()); } @Override @@ -27,22 +27,22 @@ public class BaseItemCell extends BaseItemComponent{ return true; } - @Override - public void registerIcons(IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "item"+Cell.getComponent()); - this.overlay = i.registerIcon(CORE.MODID + ":" + "item"+Cell.getComponent()+"_Overlay"); + @Override + public void registerIcons(final IIconRegister i) { + this.base = i.registerIcon(CORE.MODID + ":" + "item"+this.Cell.getComponent()); + this.overlay = i.registerIcon(CORE.MODID + ":" + "item"+this.Cell.getComponent()+"_Overlay"); //this.overlay = cellMaterial.getFluid(1000).getFluid().get } - private short[] fluidColour; + private final short[] fluidColour; boolean upwards = true; @Override - public int getColorFromItemStack(ItemStack stack, int renderPass) { + public int getColorFromItemStack(final ItemStack stack, final int renderPass) { if (renderPass == 0){ - return Utils.rgbtoHexValue(230, 230, 230); - } - + return Utils.rgbtoHexValue(230, 230, 230); + } + /*if (tickValue == 20){ if (upwards){ @@ -56,7 +56,7 @@ public class BaseItemCell extends BaseItemComponent{ if (fluidBright >= 20) upwards = false; } } - + if (tickValue > 20){ tickValue=0; } @@ -65,12 +65,12 @@ public class BaseItemCell extends BaseItemComponent{ } return Utils.rgbtoHexValue(fluidColour[0]+fluidBright, fluidColour[1]+fluidBright, fluidColour[2]+fluidBright);*/ - return componentColour; + return this.componentColour; } @Override - public IIcon getIconFromDamageForRenderPass(int damage, int pass) { + public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { if(pass == 0) { return this.base; } diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java index ba32be9b53..fc9ebc67be 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.cell; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; @@ -10,8 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BaseItemPlasmaCell extends BaseItemComponent{ @@ -19,12 +19,12 @@ public class BaseItemPlasmaCell extends BaseItemComponent{ private IIcon overlay; ComponentTypes PlasmaCell = ComponentTypes.PLASMACELL; private int tickCounter = 0; - private int tickCounterMax = 200; - private short[] fluidColour; + private final int tickCounterMax = 200; + private final short[] fluidColour; - public BaseItemPlasmaCell(Material material) { - super(material, ComponentTypes.PLASMACELL); - fluidColour = (short[]) ((material == null) ? extraData : material.getRGBA()); + public BaseItemPlasmaCell(final Material material) { + super(material, ComponentTypes.PLASMACELL); + this.fluidColour = (short[]) ((material == null) ? this.extraData : material.getRGBA()); } @Override @@ -33,45 +33,45 @@ public class BaseItemPlasmaCell extends BaseItemComponent{ return true; } - @Override - public void registerIcons(IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "item"+PlasmaCell.getComponent()); - this.overlay = i.registerIcon(CORE.MODID + ":" + "item"+PlasmaCell.getComponent()+"_Overlay"); + @Override + public void registerIcons(final IIconRegister i) { + this.base = i.registerIcon(CORE.MODID + ":" + "item"+this.PlasmaCell.getComponent()); + this.overlay = i.registerIcon(CORE.MODID + ":" + "item"+this.PlasmaCell.getComponent()+"_Overlay"); //this.overlay = cellMaterial.getFluid(1000).getFluid().get } @Override - public int getColorFromItemStack(ItemStack stack, int renderPass) { + public int getColorFromItemStack(final ItemStack stack, final int renderPass) { if (renderPass == 0){ - return Utils.rgbtoHexValue(230, 230, 230); - } - return componentColour; + return Utils.rgbtoHexValue(230, 230, 230); + } + return this.componentColour; } @Override - public IIcon getIconFromDamageForRenderPass(int damage, int pass) { + public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { if(pass == 0) { return this.base; } return this.overlay; } - + @Override - public String getItemStackDisplayName(ItemStack cell) { - return materialName+" Plasma Cell"; + public String getItemStackDisplayName(final ItemStack cell) { + return this.materialName+" Plasma Cell"; } @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (componentMaterial != null){ + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + if (this.componentMaterial != null){ if (!world.isRemote){ - if(tickCounter < tickCounterMax ){ - tickCounter++; - } - else if(tickCounter >= tickCounterMax){ + if(this.tickCounter < this.tickCounterMax ){ + this.tickCounter++; + } + else if(this.tickCounter >= this.tickCounterMax){ entityHolding.attackEntityFrom(DamageSource.onFire, 2); - tickCounter = 0; + this.tickCounter = 0; } } } diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index 42a610641e..f28f2871a8 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -1,6 +1,10 @@ package gtPlusPlus.core.item.base.dusts; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; + +import java.util.List; + +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; @@ -10,15 +14,11 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; public class BaseItemDust extends Item{ @@ -26,14 +26,14 @@ public class BaseItemDust extends Item{ protected String materialName; protected String pileType; String name = ""; - private int mTier; - private Material dustInfo; + private final int mTier; + private final Material dustInfo; - public BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, int tier, int sRadioactivity) { - setUnlocalizedName(unlocalizedName); + public BaseItemDust(final String unlocalizedName, final String materialName, final Material matInfo, final int colour, final String pileSize, final int tier, final int sRadioactivity) { + this.setUnlocalizedName(unlocalizedName); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); - this.setTextureName(getCorrectTexture(pileSize)); + this.setTextureName(this.getCorrectTexture(pileSize)); this.setCreativeTab(tabMisc); this.colour = colour; @@ -44,13 +44,13 @@ public class BaseItemDust extends Item{ GameRegistry.registerItem(this, unlocalizedName); String temp = ""; - Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); - if (getUnlocalizedName().contains("item.")){ - temp = getUnlocalizedName().replace("item.", ""); + Utils.LOG_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); } else { - temp = getUnlocalizedName(); + temp = this.getUnlocalizedName(); } if (temp.contains("DustTiny")){ temp = temp.replace("itemD", "d"); @@ -63,73 +63,73 @@ public class BaseItemDust extends Item{ else { temp = temp.replace("itemD", "d"); Utils.LOG_WARNING("Generating OreDict Name: "+temp); - } - if (temp != null && !temp.equals("")){ + } + if ((temp != null) && !temp.equals("")){ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } - addFurnaceRecipe(); - addMacerationRecipe(); + this.addFurnaceRecipe(); + this.addMacerationRecipe(); } - private String getCorrectTexture(String pileSize){ + private String getCorrectTexture(final String pileSize){ if (!CORE.configSwitches.useGregtechTextures){ - if (pileSize == "dust" || pileSize == "Dust"){ + if ((pileSize == "dust") || (pileSize == "Dust")){ this.setTextureName(CORE.MODID + ":" + "dust");} else{ this.setTextureName(CORE.MODID + ":" + "dust"+pileSize); } - } + } if (pileSize.toLowerCase().contains("small")){ - return "gregtech" + ":" + "materialicons/METALLIC/dustSmall"; + return "gregtech" + ":" + "materialicons/METALLIC/dustSmall"; } else if (pileSize.toLowerCase().contains("tiny")){ - return "gregtech" + ":" + "materialicons/METALLIC/dustTiny"; - } - return "gregtech" + ":" + "materialicons/METALLIC/dust"; + return "gregtech" + ":" + "materialicons/METALLIC/dustTiny"; + } + return "gregtech" + ":" + "materialicons/METALLIC/dust"; } @Override - public String getItemStackDisplayName(ItemStack iStack) { + public String getItemStackDisplayName(final ItemStack iStack) { - if (getUnlocalizedName().contains("DustTiny")){ - name = "Tiny Pile of "+materialName + " Dust"; + if (this.getUnlocalizedName().contains("DustTiny")){ + this.name = "Tiny Pile of "+this.materialName + " Dust"; } - else if (getUnlocalizedName().contains("DustSmall")){ - name = "Small Pile of "+materialName + " Dust"; + else if (this.getUnlocalizedName().contains("DustSmall")){ + this.name = "Small Pile of "+this.materialName + " Dust"; } else { - name = materialName + " Dust"; + this.name = this.materialName + " Dust"; } - return name; + return this.name; } protected final int sRadiation; @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - EntityUtils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + EntityUtils.applyRadiationDamageToEntity(this.sRadiation, world, entityHolding); } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { //if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){ /*if (getUnlocalizedName().contains("DustTiny")){ - list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust."); + list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust."); } else if (getUnlocalizedName().contains("DustSmall")){ - list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust."); + list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust."); } else { list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust."); }*/ if (stack.getDisplayName().equalsIgnoreCase("fluorite")){ - list.add("Mined from Sandstone and Limestone."); + list.add("Mined from Sandstone and Limestone."); } - if (sRadiation > 0){ + if (this.sRadiation > 0){ list.add(CORE.GT_Tooltip_Radioactive); } - if (dustInfo != null){ - list.add(dustInfo.vChemicalFormula); + if (this.dustInfo != null){ + list.add(this.dustInfo.vChemicalFormula); } @@ -138,47 +138,47 @@ public class BaseItemDust extends Item{ } public final String getMaterialName() { - return materialName; + return this.materialName; } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - if (colour == 0){ + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + if (this.colour == 0){ return MathUtils.generateSingularRandomHexValue(); } - return colour; + return this.colour; } private void addMacerationRecipe(){ - Utils.LOG_WARNING("Adding recipe for "+materialName+" Dusts"); + Utils.LOG_WARNING("Adding recipe for "+this.materialName+" Dusts"); - String tempIngot = getUnlocalizedName().replace("item.itemDust", "ingot"); - String tempDust = getUnlocalizedName().replace("item.itemDust", "dust"); + String tempIngot = this.getUnlocalizedName().replace("item.itemDust", "ingot"); + final String tempDust = this.getUnlocalizedName().replace("item.itemDust", "dust"); ItemStack tempInputStack; ItemStack tempOutputStack; - if (getUnlocalizedName().contains("DustSmall") || getUnlocalizedName().contains("DustTiny")){ + if (this.getUnlocalizedName().contains("DustSmall") || this.getUnlocalizedName().contains("DustTiny")){ return; } - Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); - if (getUnlocalizedName().contains("item.")){ - tempIngot = getUnlocalizedName().replace("item.", ""); + Utils.LOG_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); } else { - tempIngot = getUnlocalizedName(); + tempIngot = this.getUnlocalizedName(); } tempIngot = tempIngot.replace("itemDust", "ingot"); Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot); - ItemStack[] outputStacks = {dustInfo.getDust(1)}; - if (tempIngot != null && !tempIngot.equals("")){ + final ItemStack[] outputStacks = {this.dustInfo.getDust(1)}; + if ((tempIngot != null) && !tempIngot.equals("")){ tempInputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1); tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempDust, 1); ItemStack tempStackOutput2 = null; - int chance = mTier*10/MathUtils.randInt(10, 20); + final int chance = (this.mTier*10)/MathUtils.randInt(10, 20); if (outputStacks.length != 0){ if (outputStacks.length == 1){ tempStackOutput2 = null; @@ -191,68 +191,68 @@ public class BaseItemDust extends Item{ else { tempStackOutput2 = null; } - } + } } else { tempStackOutput2 = null; } - if (null != tempOutputStack && null != tempInputStack){ + if ((null != tempOutputStack) && (null != tempInputStack)){ GT_ModHandler.addPulverisationRecipe(tempInputStack, tempOutputStack.splitStack(1), tempStackOutput2, chance); } } } - private void addFurnaceRecipe(){ + private void addFurnaceRecipe(){ String temp = ""; - if (getUnlocalizedName().contains("item.")){ - temp = getUnlocalizedName().replace("item.", ""); + if (this.getUnlocalizedName().contains("item.")){ + temp = this.getUnlocalizedName().replace("item.", ""); } else { - temp = getUnlocalizedName(); + temp = this.getUnlocalizedName(); } if (temp.contains("DustTiny") || temp.contains("DustSmall")){ return; } - temp = temp.replace("itemDust", "ingot"); - if (temp != null && !temp.equals("")){ + temp = temp.replace("itemDust", "ingot"); + if ((temp != null) && !temp.equals("")){ - if (dustInfo.requiresBlastFurnace()){ - Utils.LOG_WARNING("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace."); - String tempIngot = temp.replace("ingot", "ingotHot"); - ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1); + if (this.dustInfo.requiresBlastFurnace()){ + Utils.LOG_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); - addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*mTier); - } + this.addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*this.mTier); + } return; } - Utils.LOG_WARNING("Adding recipe for "+materialName+" Ingots in a furnace."); - ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); + Utils.LOG_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 (mTier < 5 || !dustInfo.requiresBlastFurnace()){ + 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 "+materialName); + Utils.LOG_WARNING("Successfully added a furnace recipe for "+this.materialName); } else { - Utils.LOG_WARNING("Failed to add a furnace recipe for "+materialName); + Utils.LOG_WARNING("Failed to add a furnace recipe for "+this.materialName); } - } - else if (mTier >= 5 || dustInfo.requiresBlastFurnace()){ - Utils.LOG_WARNING("Adding recipe for "+materialName+" Ingots in a Blast furnace."); + } + 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()); if (null != tempOutputStack){ - addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*mTier); - } - return; + this.addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*this.mTier); + } + return; } } - } + } } - private void addBlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tempRequired){ + private void addBlastFurnaceRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, final ItemStack output2, final int tempRequired){ //Special Cases /*if (input1.getUnlocalizedName().toLowerCase().contains("tantalloy61")){ Utils.LOG_INFO("Adding Special handler for Staballoy-61 in the Blast Furnace"); @@ -270,8 +270,8 @@ public class BaseItemDust extends Item{ GT_Values.NF, GT_Values.NF, output1, output2, - 250*mTier*20, - mTier*64, + 250*this.mTier*20, + this.mTier*64, tempRequired); diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java index 3eab83f812..2062094159 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java @@ -1,33 +1,32 @@ package gtPlusPlus.core.item.base.dusts; -import gtPlusPlus.core.lib.CORE; - import java.util.List; +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.core.lib.CORE; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.registry.GameRegistry; public abstract class BaseItemDustAbstract extends Item{ - + protected int colour = 0; protected String materialName; protected String pileType; - - public BaseItemDustAbstract(String unlocalizedName, String materialName, int colour, String pileSize) { + + public BaseItemDustAbstract(final String unlocalizedName, final String materialName, final int colour, final String pileSize) { this.setUnlocalizedName(unlocalizedName); - this.setMaxStackSize(64); + this.setMaxStackSize(64); if (pileSize.toLowerCase().equals("dust")){ - this.setTextureName(CORE.MODID + ":" + "dust"); + this.setTextureName(CORE.MODID + ":" + "dust"); } else{ - this.setTextureName(CORE.MODID + ":" + "dust"+pileSize); + this.setTextureName(CORE.MODID + ":" + "dust"+pileSize); } this.setMaxStackSize(64); this.colour = colour; - this.materialName = materialName; - setUnlocalizedName(unlocalizedName); + this.materialName = materialName; + this.setUnlocalizedName(unlocalizedName); GameRegistry.registerItem(this, unlocalizedName); } @@ -39,5 +38,5 @@ public abstract class BaseItemDustAbstract extends Item{ @Override public abstract int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF); - + } diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index a4e8c1cadc..8dc9eb8c3c 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -1,6 +1,10 @@ package gtPlusPlus.core.item.base.dusts; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -8,15 +12,11 @@ import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.materials.MaterialUtils; import gtPlusPlus.core.util.math.MathUtils; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; public class BaseItemDustUnique extends Item{ @@ -26,11 +26,11 @@ public class BaseItemDustUnique extends Item{ String name = ""; String chemicalNotation = ""; - public BaseItemDustUnique(String unlocalizedName, String materialName, int colour, String pileSize) { - setUnlocalizedName(unlocalizedName); + public BaseItemDustUnique(final String unlocalizedName, final String materialName, final int colour, final String pileSize) { + this.setUnlocalizedName(unlocalizedName); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); - this.setTextureName(getCorrectTexture(pileSize)); + this.setTextureName(this.getCorrectTexture(pileSize)); this.setCreativeTab(tabMisc); this.colour = colour; this.materialName = materialName; @@ -39,13 +39,13 @@ public class BaseItemDustUnique extends Item{ GameRegistry.registerItem(this, unlocalizedName); String temp = ""; - Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); - if (getUnlocalizedName().contains("item.")){ - temp = getUnlocalizedName().replace("item.", ""); + Utils.LOG_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); } else { - temp = getUnlocalizedName(); + temp = this.getUnlocalizedName(); } if (temp.contains("DustTiny")){ temp = temp.replace("itemD", "d"); @@ -58,103 +58,157 @@ public class BaseItemDustUnique extends Item{ else { temp = temp.replace("itemD", "d"); Utils.LOG_WARNING("Generating OreDict Name: "+temp); - } - if (temp != null && !temp.equals("")){ + } + if ((temp != null) && !temp.equals("")){ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } } @Override - public String getItemStackDisplayName(ItemStack iStack) { + public String getItemStackDisplayName(final ItemStack iStack) { - if (getUnlocalizedName().contains("DustTiny")){ - name = "Tiny Pile of "+materialName+ " Dust"; + if (this.getUnlocalizedName().contains("DustTiny")){ + this.name = "Tiny Pile of "+this.materialName+ " Dust"; } - else if (getUnlocalizedName().contains("DustSmall")){ - name = "Small Pile of "+materialName+ " Dust"; + else if (this.getUnlocalizedName().contains("DustSmall")){ + this.name = "Small Pile of "+this.materialName+ " Dust"; } else { - name = materialName+ " Dust"; + this.name = this.materialName+ " Dust"; } - return name; + return this.name; } - private String getCorrectTexture(String pileSize){ + private String getCorrectTexture(final String pileSize){ if (!CORE.configSwitches.useGregtechTextures){ - if (pileSize == "dust" || pileSize == "Dust"){ + if ((pileSize == "dust") || (pileSize == "Dust")){ this.setTextureName(CORE.MODID + ":" + "dust");} else{ this.setTextureName(CORE.MODID + ":" + "dust"+pileSize); } - } + } if (pileSize.toLowerCase().contains("small")){ - return "gregtech" + ":" + "materialicons/SHINY/dustSmall"; + return "gregtech" + ":" + "materialicons/SHINY/dustSmall"; } else if (pileSize.toLowerCase().contains("tiny")){ - return "gregtech" + ":" + "materialicons/SHINY/dustTiny"; - } - return "gregtech" + ":" + "materialicons/SHINY/dust"; + return "gregtech" + ":" + "materialicons/SHINY/dustTiny"; + } + return "gregtech" + ":" + "materialicons/SHINY/dust"; } protected final int sRadiation; @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - EntityUtils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + EntityUtils.applyRadiationDamageToEntity(this.sRadiation, world, entityHolding); } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - if (sRadiation > 0){ + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if (this.sRadiation > 0){ list.add(CORE.GT_Tooltip_Radioactive); } - if (containsSubScript(chemicalNotation)){ - list.add(chemicalNotation); + if (containsSubScript(this.chemicalNotation)){ + list.add(this.chemicalNotation); } super.addInformation(stack, aPlayer, list, bool); } - static boolean containsSubScript(String s){ - if (s.contains(MaterialUtils.superscript("1"))) return true; - if (s.contains(MaterialUtils.superscript("2"))) return true; - if (s.contains(MaterialUtils.superscript("3"))) return true; - if (s.contains(MaterialUtils.superscript("4"))) return true; - if (s.contains(MaterialUtils.superscript("5"))) return true; - if (s.contains(MaterialUtils.superscript("6"))) return true; - if (s.contains(MaterialUtils.superscript("7"))) return true; - if (s.contains(MaterialUtils.superscript("8"))) return true; - if (s.contains(MaterialUtils.superscript("9"))) return true; - if (s.contains(MaterialUtils.subscript("1"))) return true; - if (s.contains(MaterialUtils.subscript("2"))) return true; - if (s.contains(MaterialUtils.subscript("3"))) return true; - if (s.contains(MaterialUtils.subscript("4"))) return true; - if (s.contains(MaterialUtils.subscript("5"))) return true; - if (s.contains(MaterialUtils.subscript("6"))) return true; - if (s.contains(MaterialUtils.subscript("7"))) return true; - if (s.contains(MaterialUtils.subscript("8"))) return true; - if (s.contains(MaterialUtils.subscript("9"))) return true; - String r = MaterialUtils.subscript(s); - if (r.contains(("1"))) return false; - if (r.contains(("2"))) return false; - if (r.contains(("3"))) return false; - if (r.contains(("4"))) return false; - if (r.contains(("5"))) return false; - if (r.contains(("6"))) return false; - if (r.contains(("7"))) return false; - if (r.contains(("8"))) return false; - if (r.contains(("9"))) return false; + static boolean containsSubScript(final String s){ + if (s.contains(MaterialUtils.superscript("1"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("2"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("3"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("4"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("5"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("6"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("7"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("8"))) { + return true; + } + if (s.contains(MaterialUtils.superscript("9"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("1"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("2"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("3"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("4"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("5"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("6"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("7"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("8"))) { + return true; + } + if (s.contains(MaterialUtils.subscript("9"))) { + return true; + } + final String r = MaterialUtils.subscript(s); + if (r.contains(("1"))) { + return false; + } + if (r.contains(("2"))) { + return false; + } + if (r.contains(("3"))) { + return false; + } + if (r.contains(("4"))) { + return false; + } + if (r.contains(("5"))) { + return false; + } + if (r.contains(("6"))) { + return false; + } + if (r.contains(("7"))) { + return false; + } + if (r.contains(("8"))) { + return false; + } + if (r.contains(("9"))) { + return false; + } return false; } public final String getMaterialName() { - return MaterialUtils.subscript(materialName); + return MaterialUtils.subscript(this.materialName); } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - if (colour == 0){ + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + if (this.colour == 0){ return MathUtils.generateSingularRandomHexValue(); } - return colour; + return this.colour; } diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java index 0faa781fd9..981e78a563 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java @@ -1,16 +1,15 @@ package gtPlusPlus.core.item.base.dusts.decimal; +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; - -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import cpw.mods.fml.common.registry.GameRegistry; public class BaseItemCentidust extends Item{ @@ -18,39 +17,39 @@ public class BaseItemCentidust extends Item{ final String materialName; final String unlocalName; - public BaseItemCentidust(Material material) { + public BaseItemCentidust(final Material material) { this.dustMaterial = material; this.unlocalName = "itemCentidust"+material.getUnlocalizedName(); this.materialName = material.getLocalizedName(); this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName(unlocalName); + this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(10); this.setTextureName(CORE.MODID + ":" + "itemCentidust"); //TODO - GameRegistry.registerItem(this, unlocalName); + GameRegistry.registerItem(this, this.unlocalName); //GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); //TODO } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { - return (materialName+ " Centidust"); + return (this.materialName+ " Centidust"); } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - if (materialName != null && materialName != "" && !materialName.equals("")){ - list.add(EnumChatFormatting.GRAY+"1% of a " + materialName + " dust pile."); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"1% of a " + this.materialName + " dust pile."); } super.addInformation(stack, aPlayer, list, bool); } public final String getMaterialName() { - return materialName; + return this.materialName; } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - return dustMaterial.getRgbAsHex(); + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + return this.dustMaterial.getRgbAsHex(); } } diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java index afb9eef473..1db3520136 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java @@ -1,16 +1,15 @@ package gtPlusPlus.core.item.base.dusts.decimal; +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; - -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import cpw.mods.fml.common.registry.GameRegistry; public class BaseItemDecidust extends Item{ @@ -18,39 +17,39 @@ public class BaseItemDecidust extends Item{ final String materialName; final String unlocalName; - public BaseItemDecidust(Material material) { + public BaseItemDecidust(final Material material) { this.dustMaterial = material; this.unlocalName = "itemDecidust"+material.getUnlocalizedName(); this.materialName = material.getLocalizedName(); this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName(unlocalName); + this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(10); this.setTextureName(CORE.MODID + ":" + "itemDecidust"); //TODO - GameRegistry.registerItem(this, unlocalName); + GameRegistry.registerItem(this, this.unlocalName); //GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); //TODO } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { - return (materialName+ " Decidust"); + return (this.materialName+ " Decidust"); } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - if (materialName != null && materialName != "" && !materialName.equals("")){ - list.add(EnumChatFormatting.GRAY+"10% of a " + materialName + " dust pile."); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"10% of a " + this.materialName + " dust pile."); } super.addInformation(stack, aPlayer, list, bool); } public final String getMaterialName() { - return materialName; + return this.materialName; } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - return dustMaterial.getRgbAsHex(); + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + return this.dustMaterial.getRgbAsHex(); } } diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java index 7b0663d9cf..2ea6afb166 100644 --- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java +++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.base.foods; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import net.minecraft.entity.player.EntityPlayer; @@ -7,14 +8,13 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; public class BaseItemFood extends ItemFood { - private PotionEffect[] effects; + private final PotionEffect[] effects; protected String localName; - public BaseItemFood(String unlocalizedName, String localizedName, int healAmount, float saturationModifier, boolean wolvesFavorite, PotionEffect... effects) { + public BaseItemFood(final String unlocalizedName, final String localizedName, final int healAmount, final float saturationModifier, final boolean wolvesFavorite, final PotionEffect... effects) { super(healAmount, saturationModifier, wolvesFavorite); this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName.replace("Hot", "")); @@ -25,23 +25,24 @@ public class BaseItemFood extends ItemFood { } @Override - protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + protected void onFoodEaten(final ItemStack stack, final World world, final EntityPlayer player) { super.onFoodEaten(stack, world, player); - for (int i = 0; i < effects.length; i ++) { - if (!world.isRemote && effects[i] != null && effects[i].getPotionID() > 0) + for (int i = 0; i < this.effects.length; i ++) { + if (!world.isRemote && (this.effects[i] != null) && (this.effects[i].getPotionID() > 0)) { player.addPotionEffect(new PotionEffect(this.effects[i].getPotionID(), this.effects[i].getDuration(), this.effects[i].getAmplifier(), this.effects[i].getIsAmbient() ) ); + } } } - + @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { - return ("A Serving of "+localName); + return ("A Serving of "+this.localName); } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java index 92b8c8c224..69be546843 100644 --- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java +++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java @@ -1,11 +1,10 @@ package gtPlusPlus.core.item.base.foods; +import java.util.List; + import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,7 +20,7 @@ public class BaseItemHotFood extends BaseItemFood{ protected int cooldownTime; protected Item output; - public BaseItemHotFood(String unlocalizedName, int healAmount, float healSaturation, String foodName, int timeToCoolInSeconds, Item cooledFood) { + public BaseItemHotFood(final String unlocalizedName, final int healAmount, final float healSaturation, final String foodName, final int timeToCoolInSeconds, final Item cooledFood) { super(unlocalizedName, "Hot "+foodName, healAmount, healSaturation, false); this.unlocalName = unlocalizedName; this.cooldownTime = timeToCoolInSeconds * 20; @@ -31,47 +30,47 @@ public class BaseItemHotFood extends BaseItemFood{ } @Override - public ItemStack onEaten(ItemStack iStack, World world, EntityPlayer player) { + public ItemStack onEaten(final ItemStack iStack, final World world, final EntityPlayer player) { return super.onEaten(iStack, world, player); } @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { //Utils.LOG_INFO("Item Damage: "+iStack.getItemDamage()+" Max Damage: "+iStack.getMaxDamage()); if (!world.isRemote){ - if(iStack.getItemDamage() == cooldownTime) { - if (entityHolding instanceof EntityPlayer){ - Utils.LOG_INFO("Foods Done."); - ((EntityPlayer) entityHolding).inventory.addItemStackToInventory(ItemUtils.getSimpleStack(output)); - ((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this); + if(iStack.getItemDamage() == this.cooldownTime) { + if (entityHolding instanceof EntityPlayer){ + Utils.LOG_INFO("Foods Done."); + ((EntityPlayer) entityHolding).inventory.addItemStackToInventory(ItemUtils.getSimpleStack(this.output)); + ((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this); + } + }else if(iStack.getItemDamage() < this.cooldownTime){ + iStack.setItemDamage(iStack.getItemDamage() + 1); + } + if(MathUtils.divideXintoY(iStack.getItemDamage(), 150)){ + entityHolding.attackEntityFrom(DamageSource.onFire, 1); } - }else if(iStack.getItemDamage() < cooldownTime){ - iStack.setItemDamage(iStack.getItemDamage() + 1); - } - if(MathUtils.divideXintoY(iStack.getItemDamage(), 150)){ - entityHolding.attackEntityFrom(DamageSource.onFire, 1); - } - + } super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_); } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - if (materialName != null && materialName != "" && !materialName.equals("")){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot!"+EnumChatFormatting.GRAY+" Avoid direct handling.."); - list.add(EnumChatFormatting.GRAY+"This food has "+((cooldownTime-(int) stack.getItemDamage())/20)+" seconds left, until it is cool."); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot!"+EnumChatFormatting.GRAY+" Avoid direct handling.."); + list.add(EnumChatFormatting.GRAY+"This food has "+((this.cooldownTime-stack.getItemDamage())/20)+" seconds left, until it is cool."); } super.addInformation(stack, aPlayer, list, bool); } public final String getMaterialName() { - return materialName; + return this.materialName; } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { return Utils.rgbtoHexValue(230, 96, 96); } diff --git a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java index 7c4fe89568..b72ea5db15 100644 --- a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java +++ b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.material.Material; public class BaseItemGear extends BaseItemComponent{ - public BaseItemGear(Material material) { - super(material, BaseItemComponent.ComponentTypes.GEAR); + public BaseItemGear(final Material material) { + super(material, BaseItemComponent.ComponentTypes.GEAR); } } diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java index 3f6ff6e358..0933790de1 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java @@ -12,42 +12,42 @@ public class BaseItemIngot extends BaseItemComponent{ protected final String materialName; protected final String unlocalName; - public BaseItemIngot(Material material) { + public BaseItemIngot(final Material material) { this(material, ComponentTypes.INGOT); } - - public BaseItemIngot(Material material, ComponentTypes type) { + + public BaseItemIngot(final Material material, final ComponentTypes type) { super(material, type); this.materialName = material.getLocalizedName(); this.unlocalName = material.getUnlocalizedName(); - generateCompressorRecipe(); + this.generateCompressorRecipe(); } private void generateCompressorRecipe(){ - if (unlocalName.contains("itemIngot")){ - ItemStack tempStack = ItemUtils.getSimpleStack(this, 9); + if (this.unlocalName.contains("itemIngot")){ + final ItemStack tempStack = ItemUtils.getSimpleStack(this, 9); ItemStack tempOutput = null; - String temp = getUnlocalizedName().replace("item.itemIngot", "block"); - Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); - if (getUnlocalizedName().contains("item.")){ - temp = getUnlocalizedName().replace("item.", ""); + String temp = this.getUnlocalizedName().replace("item.itemIngot", "block"); + Utils.LOG_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); } temp = temp.replace("itemIngot", "block"); Utils.LOG_WARNING("Generating OreDict Name: "+temp); - if (temp != null && !temp.equals("")){ + if ((temp != null) && !temp.equals("")){ tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); if (tempOutput != null){ GT_ModHandler.addCompressionRecipe(tempStack, tempOutput); } - + } } - else if (unlocalName.contains("itemHotIngot")){ + else if (this.unlocalName.contains("itemHotIngot")){ return; } - + } - + } diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index a122589c9d..a06cfc2a30 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -12,43 +12,43 @@ import net.minecraft.world.World; public class BaseItemIngotHot extends BaseItemIngot{ - private ItemStack outputIngot; + private final ItemStack outputIngot; private int tickCounter = 0; - private int tickCounterMax = 200; - private int mTier; + private final int tickCounterMax = 200; + private final int mTier; - public BaseItemIngotHot(Material material) { + public BaseItemIngotHot(final Material material) { super(material, ComponentTypes.HOTINGOT); this.setTextureName(CORE.MODID + ":" + "itemIngotHot"); this.outputIngot = material.getIngot(1); this.mTier = material.vTier; - generateRecipe(); + this.generateRecipe(); } - + @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - return ("Hot "+materialName+ " Ingot"); + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + return ("Hot "+this.materialName+ " Ingot"); } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { return Utils.rgbtoHexValue(225, 225, 225); } private void generateRecipe(){ - Utils.LOG_WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+materialName+"."); - GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getSimpleStack(this), outputIngot.copy(), 60*mTier); - } + Utils.LOG_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); + } @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { if (!world.isRemote){ - if(tickCounter < tickCounterMax){ - tickCounter++; - } - else if(tickCounter == tickCounterMax){ + if(this.tickCounter < this.tickCounterMax){ + this.tickCounter++; + } + else if(this.tickCounter == this.tickCounterMax){ entityHolding.attackEntityFrom(DamageSource.onFire, 1); - tickCounter = 0; + this.tickCounter = 0; } } super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_); diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java index 15b1e48200..5d14660190 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java @@ -1,5 +1,6 @@ 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.core.creative.AddToCreativeTab; @@ -12,16 +13,15 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; -public class BaseItemIngotOLD extends Item{ +public class BaseItemIngot_OLD extends Item{ protected int colour; protected String materialName; protected String unlocalName; - public BaseItemIngotOLD(String unlocalizedName, String materialName, int colour, int sRadioactivity) { - setUnlocalizedName(unlocalizedName); + public BaseItemIngot_OLD(final String unlocalizedName, final String materialName, final int colour, final int sRadioactivity) { + this.setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(unlocalizedName); this.unlocalName = unlocalizedName; @@ -33,68 +33,68 @@ public class BaseItemIngotOLD extends Item{ this.sRadiation = sRadioactivity; GameRegistry.registerItem(this, unlocalizedName); String temp = ""; - if (unlocalName.contains("itemIngot")){ - temp = unlocalName.replace("itemI", "i"); + if (this.unlocalName.contains("itemIngot")){ + temp = this.unlocalName.replace("itemI", "i"); } - else if (unlocalName.contains("itemHotIngot")){ - temp = unlocalName.replace("itemHotIngot", "ingotHot"); + else if (this.unlocalName.contains("itemHotIngot")){ + temp = this.unlocalName.replace("itemHotIngot", "ingotHot"); } - if (temp != null && !temp.equals("")){ + if ((temp != null) && !temp.equals("")){ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); - } - generateCompressorRecipe(); + } + this.generateCompressorRecipe(); } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { - return (materialName+ " Ingot"); + return (this.materialName+ " Ingot"); } public final String getMaterialName() { - return materialName; + return this.materialName; } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - if (colour == 0){ + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + if (this.colour == 0){ return MathUtils.generateSingularRandomHexValue(); } - return colour; + return this.colour; } private void generateCompressorRecipe(){ - if (unlocalName.contains("itemIngot")){ - ItemStack tempStack = ItemUtils.getSimpleStack(this, 9); + if (this.unlocalName.contains("itemIngot")){ + final ItemStack tempStack = ItemUtils.getSimpleStack(this, 9); ItemStack tempOutput = null; - String temp = getUnlocalizedName().replace("item.itemIngot", "block"); - Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); - if (getUnlocalizedName().contains("item.")){ - temp = getUnlocalizedName().replace("item.", ""); + String temp = this.getUnlocalizedName().replace("item.itemIngot", "block"); + Utils.LOG_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); } temp = temp.replace("itemIngot", "block"); Utils.LOG_WARNING("Generating OreDict Name: "+temp); - if (temp != null && !temp.equals("")){ + if ((temp != null) && !temp.equals("")){ tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); if (tempOutput != null){ GT_ModHandler.addCompressionRecipe(tempStack, tempOutput); } - + } } - else if (unlocalName.contains("itemHotIngot")){ + else if (this.unlocalName.contains("itemHotIngot")){ return; } - + } - + protected final int sRadiation; - @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - EntityUtils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); - } + @Override + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + EntityUtils.applyRadiationDamageToEntity(this.sRadiation, world, entityHolding); + } } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java index 488f9a6f60..bccfeaebab 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java @@ -7,16 +7,16 @@ import net.minecraft.item.ItemStack; public class ItemBlockBase extends ItemBlock { - public ItemBlockBase(Block block) { - super(block); - this.setCreativeTab(AddToCreativeTab.tabBlock); - } + public ItemBlockBase(final Block block) { + super(block); + this.setCreativeTab(AddToCreativeTab.tabBlock); + } + + @Override + public int getColorFromItemStack(final ItemStack p_82790_1_, final int p_82790_2_) { + + return super.getColorFromItemStack(p_82790_1_, p_82790_2_); + } + - @Override - public int getColorFromItemStack(ItemStack p_82790_1_, int p_82790_2_) { - - return super.getColorFromItemStack(p_82790_1_, p_82790_2_); - } - - }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java index 2e39a47f81..f7da55cc2c 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java @@ -1,13 +1,12 @@ package gtPlusPlus.core.item.base.itemblock; +import java.util.List; + import gtPlusPlus.core.fluids.BlockFluidBase; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -21,56 +20,56 @@ public class ItemBlockFluid extends ItemBlock{ final BlockFluidBase baseBlock; String name; - public ItemBlockFluid(Block block) { + public ItemBlockFluid(final Block block) { super(block); this.baseBlock = (BlockFluidBase) block; - this.blockColour = baseBlock.getRenderColor(1); - this.thisFluid = baseBlock.getFluidMaterial(); - this.sRadiation=ItemUtils.getRadioactivityLevel(baseBlock.getUnlocalizedName()); - this.name = baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", ""); + this.blockColour = this.baseBlock.getRenderColor(1); + this.thisFluid = this.baseBlock.getFluidMaterial(); + this.sRadiation=ItemUtils.getRadioactivityLevel(this.baseBlock.getUnlocalizedName()); + this.name = this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", ""); //GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this)); } - - public final Material setFluidMaterial(Material M){ - return thisFluid=M; + + public final Material setFluidMaterial(final Material M){ + return this.thisFluid=M; } - public int getRenderColor(int aMeta) { - return blockColour; + public int getRenderColor(final int aMeta) { + return this.blockColour; } - + @Override - public String getItemStackDisplayName(ItemStack iStack) { - if (thisFluid != null){ - this.name = "Molten "+thisFluid.getLocalizedName(); - return name; + public String getItemStackDisplayName(final ItemStack iStack) { + if (this.thisFluid != null){ + this.name = "Molten "+this.thisFluid.getLocalizedName(); + return this.name; } - this.name = "Molten "+baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", ""); - return name; + this.name = "Molten "+this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", ""); + return this.name; } - + @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - if (blockColour == 0){ + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } - return blockColour; + return this.blockColour; } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add("Temperature: "+MathUtils.celsiusToKelvin(thisFluid.getMeltingPointC())+"K"); - if (sRadiation > 0){ + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K"); + if (this.sRadiation > 0){ list.add(CORE.GT_Tooltip_Radioactive); } super.addInformation(stack, aPlayer, list, bool); } public String GetProperName() { - String tempIngot; + String tempIngot; - tempIngot = "Molten "+baseBlock.getLocalizedName(); + tempIngot = "Molten "+this.baseBlock.getLocalizedName(); return tempIngot; } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index 1e34a22098..d7de10141f 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -1,14 +1,13 @@ package gtPlusPlus.core.item.base.itemblock; +import java.util.List; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.item.ItemUtils; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -20,51 +19,51 @@ public class ItemBlockGtBlock extends ItemBlock{ protected final int blockColour; protected final int sRadiation; - - private final Block thisBlock; + + private final Block thisBlock; private boolean isOre = false; - - public ItemBlockGtBlock(Block block) { + + public ItemBlockGtBlock(final Block block) { super(block); - thisBlock = block; + this.thisBlock = block; if (block instanceof BlockBaseOre){ - isOre = true; - } - BlockBaseModular baseBlock = (BlockBaseModular) block; + this.isOre = true; + } + final BlockBaseModular baseBlock = (BlockBaseModular) block; this.blockColour = baseBlock.getRenderColor(0); if (block.getLocalizedName().toLowerCase().contains("uranium") || block.getLocalizedName().toLowerCase().contains("plutonium") || block.getLocalizedName().toLowerCase().contains("thorium")){ - sRadiation = 2; + this.sRadiation = 2; } else { - sRadiation = 0; + this.sRadiation = 0; } GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), ItemUtils.getSimpleStack(this)); } - public int getRenderColor(int aMeta) { - return blockColour; - } - - @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - if (sRadiation > 0){ - list.add(CORE.GT_Tooltip_Radioactive); - } - if (isOre){ - if (thisBlock != null){ - if (thisBlock.getLocalizedName().equalsIgnoreCase("fluorite ore")){ - list.add("Mined from Sandstone and Limestone."); - } - } - } - else { + public int getRenderColor(final int aMeta) { + return this.blockColour; + } + + @Override + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if (this.sRadiation > 0){ + list.add(CORE.GT_Tooltip_Radioactive); + } + if (this.isOre){ + if (this.thisBlock != null){ + if (this.thisBlock.getLocalizedName().equalsIgnoreCase("fluorite ore")){ + list.add("Mined from Sandstone and Limestone."); + } } + } + else { + } super.addInformation(stack, aPlayer, list, bool); } - - @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - EntityUtils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); - } + + @Override + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + EntityUtils.applyRadiationDamageToEntity(this.sRadiation, world, entityHolding); + } } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java index 9d442e3102..9d9fbc1972 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java @@ -9,16 +9,16 @@ import net.minecraft.item.ItemBlock; public class ItemBlockGtFrameBox extends ItemBlock{ protected int blockColour; - - public ItemBlockGtFrameBox(Block block) { + + public ItemBlockGtFrameBox(final Block block) { super(block); - BlockBaseModular baseBlock = (BlockBaseModular) block; + final BlockBaseModular baseBlock = (BlockBaseModular) block; this.blockColour = baseBlock.getRenderColor(1); GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), ItemUtils.getSimpleStack(this)); } - public int getRenderColor(int aMeta) { - return blockColour; - } + public int getRenderColor(final int aMeta) { + return this.blockColour; + } } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockTileEntity.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockTileEntity.java index 73fcbc2ab6..7a5f20833f 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockTileEntity.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockTileEntity.java @@ -12,32 +12,32 @@ import net.minecraft.world.World; public class ItemBlockTileEntity extends ItemBlock{ String[] description; - - public ItemBlockTileEntity(Block block) { + + public ItemBlockTileEntity(final Block block) { super(block); } - - @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - for (int i =0; i< this.description.length; i++){ - if (!this.description[i].equals("")){ - list.add(this.description[i]); - } - } - - + + @Override + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + for (int i =0; i< this.description.length; i++){ + if (!this.description[i].equals("")){ + list.add(this.description[i]); + } + } + + super.addInformation(stack, aPlayer, list, bool); } - - @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - + + @Override + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + + } + + public void setDecription(final String[] description){ + for (int i =0; i< description.length; i++){ + this.description[i] = description[i]; } - - public void setDecription(String[] description){ - for (int i =0; i< description.length; i++){ - this.description[i] = description[i]; - } - } + } } diff --git a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java b/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java index d4f7ac02a6..a6eb598622 100644 --- a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java +++ b/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.material.Material; public class BaseItemNugget extends BaseItemComponent{ - public BaseItemNugget(Material material) { - super(material, BaseItemComponent.ComponentTypes.NUGGET); + public BaseItemNugget(final Material material) { + super(material, BaseItemComponent.ComponentTypes.NUGGET); } } diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java index a905e75186..231b593356 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java @@ -7,14 +7,14 @@ import gtPlusPlus.core.util.materials.MaterialUtils; public class BaseItemPlate extends BaseItemComponent{ - public BaseItemPlate(Material material) { + public BaseItemPlate(final Material material) { super(material, BaseItemComponent.ComponentTypes.PLATE); } - - public BaseItemPlate(String unlocalizedName, String materialName, MaterialState state, short[] colour, int tier, int sRadioactivity) { + + public BaseItemPlate(final String unlocalizedName, final String materialName, final MaterialState state, final short[] colour, final int tier, final int sRadioactivity) { this(MaterialUtils.generateQuickMaterial(materialName, state, new short[]{colour[0], colour[1], colour[2], 0}, sRadioactivity)); } - + } diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java index ce8bbe8191..c56889a5dd 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java +++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemStack; public class BaseItemPlateDouble extends BaseItemComponent{ - public BaseItemPlateDouble(Material material) { - super(material, BaseItemComponent.ComponentTypes.PLATEDOUBLE); + public BaseItemPlateDouble(final Material material) { + super(material, BaseItemComponent.ComponentTypes.PLATEDOUBLE); this.setMaxStackSize(32); } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - return ("Double "+materialName+ " Plate"); + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + return ("Double "+this.materialName+ " Plate"); } } diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java new file mode 100644 index 0000000000..0300a63848 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java @@ -0,0 +1,68 @@ +package gtPlusPlus.core.item.base.plates; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +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; +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class BaseItemPlate_OLD extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + public BaseItemPlate_OLD(final String unlocalizedName, final String materialName, final int colour, final int sRadioactivity) { + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName(unlocalizedName); + this.unlocalName = unlocalizedName; + this.setMaxStackSize(64); + this.setTextureName(CORE.MODID + ":" + "itemPlate"); + this.setMaxStackSize(64); + this.colour = colour; + this.materialName = materialName; + this.sRadiation = sRadioactivity; + GameRegistry.registerItem(this, unlocalizedName); + String temp = ""; + if (this.unlocalName.toLowerCase().contains("itemplate")){ + temp = this.unlocalName.replace("itemP", "p"); + } + if ((temp != null) && !temp.equals("")){ + GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + } + } + + @Override + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + + return (this.materialName+ " plate"); + } + + public final String getMaterialName() { + return this.materialName; + } + + @Override + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { + if (this.colour == 0){ + return MathUtils.generateSingularRandomHexValue(); + } + return this.colour; + + } + + protected final int sRadiation; + @Override + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { + EntityUtils.applyRadiationDamageToEntity(this.sRadiation, world, entityHolding); + } +} diff --git a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java index 6ad3509876..62777cc9f5 100644 --- a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java +++ b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.material.Material; public class BaseItemRing extends BaseItemComponent{ - public BaseItemRing(Material material) { + public BaseItemRing(final Material material) { super(material, BaseItemComponent.ComponentTypes.RING); } } diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java index 2e4acd6ccb..5fe7ca6424 100644 --- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java +++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java @@ -8,24 +8,24 @@ import net.minecraft.item.ItemStack; public class BaseItemRod extends BaseItemComponent{ - public BaseItemRod(Material material) { - super(material, BaseItemComponent.ComponentTypes.ROD); - addExtruderRecipe(); + public BaseItemRod(final Material material) { + super(material, BaseItemComponent.ComponentTypes.ROD); + this.addExtruderRecipe(); } private void addExtruderRecipe(){ - Utils.LOG_WARNING("Adding cutter recipe for "+materialName+" Rods"); + Utils.LOG_WARNING("Adding cutter recipe for "+this.materialName+" Rods"); - ItemStack stackStick = componentMaterial.getRod(1); - ItemStack stackBolt = componentMaterial.getBolt(4); + final ItemStack stackStick = this.componentMaterial.getRod(1); + final ItemStack stackBolt = this.componentMaterial.getBolt(4); GT_Values.RA.addCutterRecipe( stackStick, stackBolt, null, - (int) Math.max(componentMaterial.getMass() * 2L, 1L), - 4); + (int) Math.max(this.componentMaterial.getMass() * 2L, 1L), + 4); } } diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java index 882dc8b2bf..84d7d00472 100644 --- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java +++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java @@ -9,39 +9,39 @@ import net.minecraft.item.ItemStack; public class BaseItemRodLong extends BaseItemComponent{ - public BaseItemRodLong(Material material) { + public BaseItemRodLong(final Material material) { super(material, BaseItemComponent.ComponentTypes.RODLONG); - addExtruderRecipe(); + this.addExtruderRecipe(); } - + @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - return ("Long "+materialName+ " Rod"); + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + return ("Long "+this.materialName+ " Rod"); } private void addExtruderRecipe(){ - Utils.LOG_WARNING("Adding recipe for Long "+materialName+" Rods"); + Utils.LOG_WARNING("Adding recipe for Long "+this.materialName+" Rods"); - String tempStick = unlocalName.replace("itemRodLong", "stick"); - String tempStickLong = unlocalName.replace("itemRodLong", "stickLong"); - ItemStack stackStick = ItemUtils.getItemStackOfAmountFromOreDict(tempStick, 1); - ItemStack stackLong = ItemUtils.getItemStackOfAmountFromOreDict(tempStickLong, 1); + final String tempStick = this.unlocalName.replace("itemRodLong", "stick"); + final String tempStickLong = this.unlocalName.replace("itemRodLong", "stickLong"); + final ItemStack stackStick = ItemUtils.getItemStackOfAmountFromOreDict(tempStick, 1); + final ItemStack stackLong = ItemUtils.getItemStackOfAmountFromOreDict(tempStickLong, 1); - ItemStack temp = stackStick; + final ItemStack temp = stackStick; temp.stackSize = 2; GT_Values.RA.addForgeHammerRecipe( temp, stackLong, - (int) Math.max(componentMaterial.getMass(), 1L), + (int) Math.max(this.componentMaterial.getMass(), 1L), 16); GT_Values.RA.addCutterRecipe( stackLong, temp, null, - (int) Math.max(componentMaterial.getMass(), 1L), - 4); + (int) Math.max(this.componentMaterial.getMass(), 1L), + 4); } } diff --git a/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java b/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java index f993cc64b2..6960e89e89 100644 --- a/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java +++ b/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.material.Material; public class BaseItemRotor extends BaseItemComponent{ - public BaseItemRotor(Material material) { + public BaseItemRotor(final Material material) { super(material, BaseItemComponent.ComponentTypes.ROTOR); } } diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java index 93aa5b7526..f35e4834cc 100644 --- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java +++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java @@ -9,22 +9,22 @@ import net.minecraft.item.ItemStack; public class BaseItemScrew extends BaseItemComponent{ - public BaseItemScrew(Material material) { + public BaseItemScrew(final Material material) { super(material, BaseItemComponent.ComponentTypes.SCREW); - addLatheRecipe(); + this.addLatheRecipe(); } private void addLatheRecipe(){ - Utils.LOG_WARNING("Adding recipe for "+materialName+" Screws"); - ItemStack boltStack = ItemUtils.getItemStackOfAmountFromOreDict(unlocalName.replace("itemScrew", "bolt"), 1); - if (null != boltStack){ - GT_Values.RA.addLatheRecipe( - boltStack, - ItemUtils.getSimpleStack(this), - null, - (int) Math.max(componentMaterial.getMass() / 8L, 1L), - 4); - } + Utils.LOG_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( + boltStack, + ItemUtils.getSimpleStack(this), + null, + (int) Math.max(this.componentMaterial.getMass() / 8L, 1L), + 4); + } } } |