diff options
Diffstat (limited to 'src/main/java/gregtech/api/items')
9 files changed, 69 insertions, 93 deletions
diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java index 12d69cd0ec..2a20ac4972 100644 --- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java +++ b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java @@ -23,7 +23,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public class GT_Block_LongDistancePipe extends GT_Generic_Block { public IIconContainer[] mIcons; @@ -32,11 +31,11 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block { setStepSound(soundTypeMetal); setCreativeTab(GregTech_API.TAB_GREGTECH); GregTech_API.registerMachineBlock(this, -1); - + GT_LanguageManager.addStringLocalization(getUnlocalizedName()+".0.name", "Long Distance Fluid Pipeline Pipe"); GT_LanguageManager.addStringLocalization(getUnlocalizedName()+".1.name", "Long Distance Item Pipeline Pipe"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this"); - + ItemList.Long_Distance_Pipeline_Fluid_Pipe.set(new ItemStack(this, 1, 0)); ItemList.Long_Distance_Pipeline_Item_Pipe.set(new ItemStack(this, 1, 1)); mIcons = new IIconContainer[]{Textures.BlockIcons.LONG_DISTANCE_PIPE_FLUID, Textures.BlockIcons.LONG_DISTANCE_PIPE_ITEM}; @@ -49,9 +48,9 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block { } } @Override - public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) { + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); - super.breakBlock(aWorld, aX, aY, aZ, par5, par6); + super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetaData); } @Override public String getHarvestTool(int aMeta) { @@ -83,7 +82,7 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block { public String getLocalizedName() { return StatCollector.translateToLocal(this.mUnlocalizedName + ".name"); } - + @Override public IIcon getIcon(int aSide, int aMeta) { return mIcons[aMeta % mIcons.length].getIcon(); @@ -91,7 +90,7 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister p_149651_1_) { + public void registerBlockIcons(IIconRegister aIconRegister) { } @Override @@ -100,28 +99,18 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block { } @Override - public int quantityDropped(Random par1Random) { - return 1; - } - - @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); - } - - @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int metadata) { + return metadata; } @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 3; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java index 7debf4e424..12a075d181 100644 --- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java +++ b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java @@ -40,12 +40,12 @@ public class GT_CoolantCell_Item } tNBT.setInteger("heat", aHeat); if (this.heatStorage > 0) { - double var4 = (double) aHeat / (double) this.heatStorage; - int var6 = (int) (aStack.getMaxDamage() * var4); - if (var6 >= aStack.getMaxDamage()) { - var6 = aStack.getMaxDamage() - 1; + double heatRatio = (double) aHeat / (double) this.heatStorage; + int damage = (int) (aStack.getMaxDamage() * heatRatio); + if (damage >= aStack.getMaxDamage()) { + damage = aStack.getMaxDamage() - 1; } - aStack.setItemDamage(var6); + aStack.setItemDamage(damage); } } diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java index 78814803e4..904215b68a 100644 --- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java +++ b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java @@ -104,9 +104,9 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { if (mSpecials == 0) return; if (!aPlayer.worldObj.isRemote && (mSpecials & 1) != 0) { - int var4 = aPlayer.getAir(); - if (GT_ModHandler.canUseElectricItem(aStack, 1000) && var4 < 50) { - aPlayer.setAir(var4 + 250); + int airSupply = aPlayer.getAir(); + if (GT_ModHandler.canUseElectricItem(aStack, 1000) && airSupply < 50) { + aPlayer.setAir(airSupply + 250); GT_ModHandler.useElectricItem(aStack, 1000, aPlayer); } } @@ -134,38 +134,38 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } if (!aPlayer.worldObj.isRemote && (mSpecials & 128) != 0) { - float var6 = jumpChargeMap.containsKey(aPlayer) ? ((Float) jumpChargeMap.get(aPlayer)).floatValue() : 1.0F; + float jumpCharge = jumpChargeMap.containsKey(aPlayer) ? ((Float) jumpChargeMap.get(aPlayer)).floatValue() : 1.0F; - if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && var6 < 1.0F) { - var6 = 1.0F; + if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) { + jumpCharge = 1.0F; GT_ModHandler.useElectricItem(aStack, 1000, aPlayer); } - if (aPlayer.motionY >= 0.0D && var6 > 0.0F && !aPlayer.isInWater()) { + if (aPlayer.motionY >= 0.0D && jumpCharge > 0.0F && !aPlayer.isInWater()) { if (GT_ModHandler.getJumpKeyDown(aPlayer) && GT_ModHandler.getBoostKeyDown(aPlayer)) { - if (var6 == 1.0F) { + if (jumpCharge == 1.0F) { aPlayer.motionX *= 3.5D; aPlayer.motionZ *= 3.5D; } - aPlayer.motionY += (var6 * 0.3F); - var6 = (float) (var6 * 0.75D); - } else if (var6 < 1.0F) { - var6 = 0.0F; + aPlayer.motionY += (jumpCharge * 0.3F); + jumpCharge = (float) (jumpCharge * 0.75D); + } else if (jumpCharge < 1.0F) { + jumpCharge = 0.0F; } } - jumpChargeMap.put(aPlayer, Float.valueOf(var6)); + jumpChargeMap.put(aPlayer, Float.valueOf(jumpCharge)); } if ((mSpecials & 256) != 0) { if (GT_ModHandler.canUseElectricItem(aStack, 100) && aPlayer.isSprinting() && (aPlayer.onGround && Math.abs(aPlayer.motionX) + Math.abs(aPlayer.motionZ) > 0.10000000149011612D || aPlayer.isInWater())) { GT_ModHandler.useElectricItem(aStack, 100, aPlayer); - float var7 = 0.22F; + float bonus = 0.22F; if (aPlayer.isInWater()) { GT_ModHandler.useElectricItem(aStack, 100, aPlayer); - var7 = 0.1F; + bonus = 0.1F; if (aPlayer.motionY > 0) { @@ -173,8 +173,8 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } } - if (var7 > 0.0F) { - aPlayer.moveFlying(0.0F, 1.0F, var7); + if (bonus > 0.0F) { + aPlayer.moveFlying(0.0F, 1.0F, bonus); } } } @@ -224,11 +224,11 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs var2, List var3) { + public void getSubItems(Item aItem, CreativeTabs creativeTab, List outputSubItems) { ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage()); GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false); - var3.add(tCharged); - var3.add(tUncharged); + outputSubItems.add(tCharged); + outputSubItems.add(tUncharged); } public boolean canProvideEnergy(ItemStack aStack) { @@ -267,27 +267,27 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + public boolean isBookEnchantable(ItemStack ingredient, ItemStack bookEnchant) { return false; } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack toBeRepaired, ItemStack repairWith) { return false; } // TODO: @ForgeSubscribe - public void onEntityLivingFallEvent(LivingFallEvent var1) { - if (!var1.entity.worldObj.isRemote && var1.entity instanceof EntityPlayer) { - EntityPlayer var2 = (EntityPlayer) var1.entity; + public void onEntityLivingFallEvent(LivingFallEvent event) { + if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entity; for (int i = 0; i < 4; i++) { - ItemStack var3 = var2.inventory.armorInventory[i]; - if (var3 != null && var3.getItem() == this && (mSpecials & 2) != 0) { - int var4 = (int) var1.distance - 3; - int var5 = (this.mDamageEnergyCost * var4) / 4; - if (var5 <= GT_ModHandler.dischargeElectricItem(var3, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) { - GT_ModHandler.dischargeElectricItem(var3, var5, Integer.MAX_VALUE, true, false, true); - var1.setCanceled(true); + ItemStack armor = player.inventory.armorInventory[i]; + if (armor != null && armor.getItem() == this && (mSpecials & 2) != 0) { + int distanceFactor = (int) event.distance - 3; + int energyCost = (this.mDamageEnergyCost * distanceFactor) / 4; + if (energyCost <= GT_ModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) { + GT_ModHandler.dischargeElectricItem(armor, energyCost, Integer.MAX_VALUE, true, false, true); + event.setCanceled(true); break; } } @@ -296,18 +296,18 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } @Override - public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase var1, ItemStack var2, DamageSource var3, double var4, int var6) { - return new ISpecialArmor.ArmorProperties((var3 == DamageSource.fall && (mSpecials & 2) != 0) ? 10 : 0, getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage, mDamageEnergyCost > 0 ? 25 * GT_ModHandler.dischargeElectricItem(var2, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true) / mDamageEnergyCost : 0); + public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slotIndex) { + return new ISpecialArmor.ArmorProperties((source == DamageSource.fall && (mSpecials & 2) != 0) ? 10 : 0, getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage, mDamageEnergyCost > 0 ? 25 * GT_ModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true) / mDamageEnergyCost : 0); } @Override - public int getArmorDisplay(EntityPlayer var1, ItemStack var2, int var3) { + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slotIndex) { return (int) Math.round(20.0D * getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage); } @Override - public void damageArmor(EntityLivingBase var1, ItemStack var2, DamageSource var3, int var4, int var5) { - GT_ModHandler.dischargeElectricItem(var2, var4 * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true); + public void damageArmor(EntityLivingBase entity, ItemStack itemStack, DamageSource source, int damage, int slotIndex) { + GT_ModHandler.dischargeElectricItem(itemStack, damage * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true); } private double getBaseAbsorptionRatio() { diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java index 06bc25844e..796a414c78 100644 --- a/src/main/java/gregtech/api/items/GT_Generic_Item.java +++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java @@ -81,7 +81,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem { } @Override - public IIcon getIconFromDamage(int par1) { + public IIcon getIconFromDamage(int aMetaData) { return mIcon; } diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java index 38b065f2aa..9e38518607 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java @@ -98,7 +98,6 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements * @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. */ @@ -220,14 +219,10 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements } /** + * * @param aMetaValue the Meta Value of the Item you want to set it to. [0 - 32765] - * @param aMaxCharge Maximum Charge. (if this is == 0 it will remove the Electric Behavior) - * @param aTransferLimit Transfer Limit. - * @param aTier The electric Tier. - * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0). - * Use -1 if you want to make this Battery chargeable (the use and canUse Functions will still discharge if you just use this) - * Use -2 if you want to make this Battery dischargeable. - * Use -3 if you want to make this Battery charge/discharge-able. + * @param aCapacity fluid capacity in L or mb + * @param aStacksize item stack size * @return the Item itself for convenience in constructing. */ public final GT_MetaGenerated_Item setFluidContainerStats(int aMetaValue, long aCapacity, long aStacksize) { @@ -257,7 +252,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements public IIconContainer getIconContainer(int aMetaData) { return null; } - + /* ---------- INTERNAL OVERRIDES ---------- */ @Override @@ -302,7 +297,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { int j = mEnabledItems.length(); for (int i = 0; i < j; i++) if (mVisibleItems.get(i) || (D1 && mEnabledItems.get(i))) { diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java index f9f54b5219..f04b4a3345 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java @@ -109,7 +109,7 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item { public IIconContainer getIconContainer(int aMetaData, Materials aMaterial) { return aMaterial.mIconSet.mTextures[mIconSetIndex]; } - + /* ---------- INTERNAL OVERRIDES ---------- */ @Override @@ -146,14 +146,14 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) - public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { + public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) if (mPrefix.doGenerateItem(GregTech_API.sGeneratedMaterials[i]) && doesShowInCreative(mPrefix, GregTech_API.sGeneratedMaterials[i], GregTech_API.sDoShowAllItemsInCreative)) { ItemStack tStack = new ItemStack(this, 1, i); isItemStackUsable(tStack); aList.add(tStack); } - super.getSubItems(var1, aCreativeTab, aList); + super.getSubItems(aItem, aCreativeTab, aList); } @Override diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java index 7cae9dffdd..ca93a85eea 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java @@ -162,7 +162,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) - public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { + public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 32000; i++) { OrePrefixes aPrefix = mGeneratedPrefixList[i / 1000]; Materials aMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; @@ -174,7 +174,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item { } } } - super.getSubItems(var1, aCreativeTab, aList); + super.getSubItems(aItem, aCreativeTab, aList); } @Override diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index 10b2abe682..e8019ee975 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -320,7 +320,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements @Override @SideOnly(Side.CLIENT) - public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { + public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 32766; i += 2) { if (getToolStats(new ItemStack(this, 1, i)) != null) { ItemStack tStack = new ItemStack(this, 1, i); diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java index 16c6870cb0..e9c48991de 100644 --- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java +++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java @@ -40,7 +40,7 @@ public class GT_RadioactiveCell_Item } return b; } - + protected static int triangularNumber(int x) { return (x * x + x) / 2; @@ -73,15 +73,6 @@ public class GT_RadioactiveCell_Item aStack.setTagCompound(tNBT); } tNBT.setInteger("durability", aDurability); -// if (this.maxDelay > 0) -// { -// double var4 = (this.maxDelay - aDurability) / this.maxDelay; -// int var6 = (int)(aStack.getMaxDamage() * var4); -// if (var6 >= aStack.getMaxDamage()) { -// var6 = aStack.getMaxDamage() - 1; -// } -// aStack.setItemDamage(aStack.getMaxDamage() - var6); -// } } public int getMaxNuclearDurability() { @@ -93,11 +84,12 @@ public class GT_RadioactiveCell_Item } @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + public boolean isBookEnchantable(ItemStack ingredient, ItemStack bookEnchant) { return false; } - public boolean func_82789_a(ItemStack par1ItemStack, ItemStack par2ItemStack) { + // getIsRepairable + public boolean func_82789_a(ItemStack toBeRepaired, ItemStack repairWith) { return false; } |