From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + 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. --- src/Java/gtPlusPlus/core/item/ModItems.java | 148 ++--- src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 701 ++++++++++++--------- .../core/item/base/BaseItemBackpack.java | 88 +-- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 50 +- .../core/item/base/BaseItemComponent.java | 125 ++-- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 21 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 47 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 39 +- .../core/item/base/BaseItemWithCharge.java | 43 +- .../core/item/base/BaseItemWithDamageValue.java | 13 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 401 ++++++------ src/Java/gtPlusPlus/core/item/base/CoreItem.java | 94 +-- .../core/item/base/bolts/BaseItemBolt.java | 2 +- .../core/item/base/cell/BaseItemCell.java | 34 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 52 +- .../core/item/base/dusts/BaseItemDust.java | 168 ++--- .../core/item/base/dusts/BaseItemDustAbstract.java | 23 +- .../core/item/base/dusts/BaseItemDustUnique.java | 186 ++++-- .../item/base/dusts/decimal/BaseItemCentidust.java | 29 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 29 +- .../core/item/base/foods/BaseItemFood.java | 19 +- .../core/item/base/foods/BaseItemHotFood.java | 47 +- .../core/item/base/gears/BaseItemGear.java | 4 +- .../core/item/base/ingots/BaseItemIngot.java | 30 +- .../core/item/base/ingots/BaseItemIngotHot.java | 36 +- .../core/item/base/ingots/BaseItemIngotOLD.java | 100 --- .../core/item/base/ingots/BaseItemIngot_OLD.java | 100 +++ .../core/item/base/itemblock/ItemBlockBase.java | 22 +- .../core/item/base/itemblock/ItemBlockFluid.java | 57 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 69 +- .../item/base/itemblock/ItemBlockGtFrameBox.java | 12 +- .../item/base/itemblock/ItemBlockTileEntity.java | 44 +- .../core/item/base/nugget/BaseItemNugget.java | 4 +- .../core/item/base/plates/BaseItemPlate.java | 8 +- .../core/item/base/plates/BaseItemPlateDouble.java | 8 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 68 ++ .../core/item/base/rings/BaseItemRing.java | 2 +- .../core/item/base/rods/BaseItemRod.java | 16 +- .../core/item/base/rods/BaseItemRodLong.java | 28 +- .../core/item/base/rotors/BaseItemRotor.java | 2 +- .../core/item/base/screws/BaseItemScrew.java | 24 +- .../gtPlusPlus/core/item/effects/RarityEffect.java | 20 +- .../gtPlusPlus/core/item/effects/RarityEpic.java | 16 +- .../gtPlusPlus/core/item/effects/RarityRare.java | 16 +- .../core/item/effects/RarityUncommon.java | 12 +- .../core/item/general/BedLocator_Base.java | 77 ++- .../gtPlusPlus/core/item/general/BufferCore.java | 59 +- .../core/item/general/ItemBasicFirestarter.java | 20 +- .../core/item/general/ItemBlueprint.java | 124 ++-- .../core/item/general/ItemCloakingDevice.java | 115 ++-- .../core/item/general/ItemHealingDevice.java | 117 ++-- .../core/item/general/ItemSlowBuildingRing.java | 61 +- .../core/item/general/NuclearFuelRodBase.java | 334 +++++----- .../core/item/general/RF2EU_Battery.java | 145 +++-- .../core/item/general/fuelrods/FuelRod_Base.java | 171 +++-- .../item/general/fuelrods/FuelRod_Thorium.java | 2 +- src/Java/gtPlusPlus/core/item/init/ItemsFoods.java | 20 +- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 88 +-- .../core/item/materials/MaterialHandler.java | 6 +- .../core/item/tool/misc/SandstoneHammer.java | 27 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 137 ++-- .../core/item/tool/staballoy/MultiSpadeBase.java | 52 +- .../core/item/tool/staballoy/StaballoyAxe.java | 323 ++++++---- .../core/item/tool/staballoy/StaballoyPickaxe.java | 229 ++++--- .../core/item/tool/staballoy/StaballoySpade.java | 203 +++--- 65 files changed, 2811 insertions(+), 2556 deletions(-) delete mode 100644 src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java create mode 100644 src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java create mode 100644 src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java (limited to 'src/Java/gtPlusPlus/core/item') diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 6a9ded65b9..d042fac201 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -2,6 +2,8 @@ package gtPlusPlus.core.item; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.common.compat.COMPAT_Baubles; @@ -11,17 +13,19 @@ import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust; import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust; import gtPlusPlus.core.item.base.foods.BaseItemFood; import gtPlusPlus.core.item.base.foods.BaseItemHotFood; -import gtPlusPlus.core.item.base.ingots.BaseItemIngotOLD; +import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; +import gtPlusPlus.core.item.effects.RarityRare; import gtPlusPlus.core.item.effects.RarityUncommon; import gtPlusPlus.core.item.general.*; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.init.ItemsMultiTools; import gtPlusPlus.core.item.tool.misc.SandstoneHammer; import gtPlusPlus.core.item.tool.staballoy.*; -import gtPlusPlus.core.lib.*; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.configSwitches; +import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; @@ -36,12 +40,12 @@ import net.minecraft.item.Item.ToolMaterial; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.common.registry.GameRegistry; public final class ModItems { public static ToolMaterial STABALLOY = EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18); public static Item AAA_Broken; + public static Item itemAlkalusDisk; public static Item itemDebugShapeSpawner; @@ -189,7 +193,7 @@ public final class ModItems { public static BaseItemPlate itemPlateClay; public static BaseItemPlateDouble itemDoublePlateClay; - + public static Item dustFertUN18; public static Item dustFertUN32; @@ -200,12 +204,13 @@ public final class ModItems { public static final void init(){ //Default item used when recipes fail, handy for debugging. - AAA_Broken = new BaseItemIngotOLD("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0); + AAA_Broken = new BaseItemIngot_OLD("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0); + itemAlkalusDisk = new CoreItem("itemAlkalusDisk", AddToCreativeTab.tabMisc, 1, 0, "Unknown Use", EnumRarity.rare, EnumChatFormatting.AQUA, false, null); //Debug Loading if (CORE.DEBUG){ DEBUG_INIT.registerItems(); - } + } //Some Simple forms of materials @@ -225,7 +230,7 @@ public final class ModItems { itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc, ItemUtils.getSimpleStack(itemHydrogenBlob)).setTextureName(CORE.MODID + ":itemHeliumBlob"); //Register this neato device, for making some fires. - itemBasicFireMaker = new ItemBasicFirestarter(); + itemBasicFireMaker = new ItemBasicFirestarter(); //Make some backpacks //Primary colours @@ -271,7 +276,7 @@ public final class ModItems { MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM); MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM); MaterialGenerator.generate(ELEMENT.getInstance().THALLIUM); - + //RADIOACTIVE ELEMENTS MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().TECHNETIUM, false); //LFTR byproduct MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM, false); @@ -279,7 +284,7 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FRANCIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false); + //MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().ACTINIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROTACTINIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().NEPTUNIUM, false); //LFTR byproduct @@ -288,14 +293,14 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CALIFORNIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().EINSTEINIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FERMIUM, false); - - - + + + //Nuclear Isotopes - - //Lithium-7 is used as a part of the molten lithium fluoride in molten salt reactors: liquid-fluoride nuclear reactors. - //The large neutron-absorption cross-section of lithium-6 (about 940 barns[5]) as compared with the very small - //neutron cross-section of lithium-7 (about 45 millibarns) makes high separation of lithium-7 from natural lithium a + + //Lithium-7 is used as a part of the molten lithium fluoride in molten salt reactors: liquid-fluoride nuclear reactors. + //The large neutron-absorption cross-section of lithium-6 (about 940 barns[5]) as compared with the very small + //neutron cross-section of lithium-7 (about 45 millibarns) makes high separation of lithium-7 from natural lithium a //strong requirement for the possible use in lithium fluoride reactors. MaterialGenerator.generate(NUCLIDE.getInstance().LITHIUM7, false); //Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case. @@ -304,11 +309,11 @@ public final class ModItems { //because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232: MaterialGenerator.generate(NUCLIDE.getInstance().URANIUM232); //Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle. - MaterialGenerator.generate(NUCLIDE.getInstance().URANIUM233); - //Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage in radioisotope thermoelectric generators (RTGs) + MaterialGenerator.generate(NUCLIDE.getInstance().URANIUM233); + //Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage in radioisotope thermoelectric generators (RTGs) //and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().PLUTONIUM238, false); - + //Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though @@ -318,7 +323,7 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.SILICON_CARBIDE); MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE); MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE); - MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE); + MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE); //Generate Fluorides @@ -334,12 +339,12 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE); MaterialGenerator.generateNuclearMaterial(FLUORIDES.TECHNETIUM_HEXAFLUORIDE); MaterialGenerator.generateNuclearMaterial(FLUORIDES.SELENIUM_HEXAFLUORIDE); - + //Generate Reactor Fuel Salts MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4U235); MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4UF4); MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ThF4UF4); - + //Generate some Alloys @@ -348,7 +353,7 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.BLOODSTEEL); MaterialGenerator.generate(ALLOY.ZERON_100); - //Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper + //Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper MaterialGenerator.generate(ALLOY.TUMBAGA); //Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible MaterialGenerator.generate(ALLOY.POTIN); @@ -371,7 +376,7 @@ public final class ModItems { //Composite Alloys MaterialGenerator.generate(ALLOY.STELLITE); - MaterialGenerator.generate(ALLOY.TALONITE); + MaterialGenerator.generate(ALLOY.TALONITE); //Hastelloy MaterialGenerator.generate(ALLOY.HASTELLOY_W); @@ -385,13 +390,13 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.INCOLOY_MA956); //Leagrisium - MaterialGenerator.generate(ALLOY.LEAGRISIUM); + MaterialGenerator.generate(ALLOY.LEAGRISIUM); //Must be the final Alloy to Generate - MaterialGenerator.generate(ALLOY.QUANTUM); + MaterialGenerator.generate(ALLOY.QUANTUM); - } catch (Throwable r){ + } catch (final Throwable r){ Utils.LOG_INFO("Failed to Generated a Material. "+r.getMessage()); //Utils.LOG_INFO("Failed to Generated a Material. "+r.getCause().getMessage()); //Utils.LOG_INFO("Failed to Generated a Material. "+r.getStackTrace()[0].getMethodName()); @@ -403,7 +408,7 @@ public final class ModItems { //TC Style Shards, for use in making energy crystal mix. //A dull shard, able to be infused with an element. shardDull = new BaseItemTCShard("Drained", Utils.rgbtoHexValue(75, 75, 75), "Can be infused to create a magical shard.", "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt."); - + //Generates four elemental shards when TC is not installed. if (!LoadedMods.Thaumcraft){ shardAer = new BaseItemTCShard("Aer", Utils.rgbtoHexValue(225, 225, 5)); @@ -425,20 +430,20 @@ public final class ModItems { - //Nuclear Fuel Dusts + //Nuclear Fuel Dusts dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(240, 240, 240))[0]; //https://en.wikipedia.org/wiki/Lithium_carbonate dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts("LithiumPeroxide", "Lithium Peroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_peroxide dustLithiumHydroxide = ItemUtils.generateSpecialUseDusts("LithiumHydroxide", "Lithium Hydroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_hydroxide - if (ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() == ModItems.AAA_Broken || !LoadedMods.IHL){ + if ((ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() == ModItems.AAA_Broken) || !LoadedMods.IHL){ dustQuicklime = ItemUtils.generateSpecialUseDusts("Quicklime", "Quicklime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_oxide } dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts("CalciumHydroxide", "Hydrated Lime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_hydroxide dustCalciumCarbonate = ItemUtils.generateSpecialUseDusts("CalciumCarbonate", "Calcium Carbonate", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1) == null || ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustCalciumSulfate", 1) == null){ + if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1) == null) || (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustCalciumSulfate", 1) == null)){ dustCalciumSulfate = ItemUtils.generateSpecialUseDusts("Gypsum", "Calcium Sulfate (Gypsum)", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_sulfate GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate)); - } + } else { GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1)); } @@ -446,7 +451,7 @@ public final class ModItems { //FLiBe Fuel Compounds dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe - fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}); + fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}); //Zirconium //Cinter Pellet. @@ -459,47 +464,47 @@ public final class ModItems { GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1)); GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); FluidUtils.generateFluid("ZirconiumTetrafluoride", "Zirconium Tetrafluoride [ZrF4]", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride - + //Coolant Salt //NaBF4 - NaF - 621C //dustNaBF4NaF = ItemUtils.generateSpecialUseDusts("NaBF4NaF", "NaBF4NaF", Utils.rgbtoHexValue(45, 45, 90))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride - - + + //Load Tree Farmer if (CORE.configSwitches.enableMultiblock_TreeFarmer){ //https://en.wikipedia.org/wiki/UAN dustFertUN18 = ItemUtils.generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0]; dustFertUN32 = ItemUtils.generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0]; - + ItemStack temp1 = null; ItemStack temp2 = null; - + if (LoadedMods.IndustrialCraft2){ temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); } if (LoadedMods.Forestry){ - temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); + temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); } if (temp1 != null){ FluidUtils.generateFluidNonMolten("Fertiliser", "Fertiliser", 32, new short[]{45, 170, 45, 100}, temp1, temp2); } FluidUtils.generateFluidNonMolten("UN32Fertiliser", "UN-32 Fertiliser", 24, new short[]{55, 190, 55, 100}, null, null); FluidUtils.generateFluidNonMolten("UN18Fertiliser", "UN-18 Fertiliser", 22, new short[]{60, 155, 60, 100}, null, null); - + /*GT_Values.RA.addMixerRecipe( arg0, //Item In arg1, arg2, - arg3, + arg3, arg4, //Fluid in arg5, //Fluid Out arg6, //Item out - arg7, //Eu + arg7, //Eu arg8); //Time */ - + } - - + + //Test items metaItem2 = new BaseEuItem(); metaItem2.registerItem(0, EnumChatFormatting.BLACK+"Test Item 0", 0, 0, "I am 0."); @@ -511,7 +516,7 @@ public final class ModItems { //Create Multi-tools ItemsMultiTools.load(); - + //Just an unusual plate needed for some black magic. itemPlateClay = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); @@ -529,13 +534,13 @@ public final class ModItems { itemDustConductiveIron = ItemUtils.generateSpecialUseDusts("ConductiveIron", "Conductive Iron", Utils.rgbtoHexValue(164,109,100))[0]; //EnderIO Plates - itemPlateSoularium = new BaseItemPlate("itemPlate"+"Soularium", "Soularium", MaterialState.SOLID, new short[]{95, 90, 54}, 2, 0); - itemPlateRedstoneAlloy = new BaseItemPlate("itemPlate"+"RedstoneAlloy", "Redstone Alloy", MaterialState.SOLID, new short[]{178,34,34}, 2, 0); - itemPlateElectricalSteel =new BaseItemPlate("itemPlate"+"ElectricalSteel", "Electrical Steel", MaterialState.SOLID, new short[]{194, 194, 194}, 2, 0); - itemPlatePulsatingIron = new BaseItemPlate("itemPlate"+"PhasedIron", "Phased Iron", MaterialState.SOLID, new short[]{50, 91, 21}, 2, 0); - itemPlateEnergeticAlloy = new BaseItemPlate("itemPlate"+"EnergeticAlloy", "Energetic Alloy", MaterialState.SOLID, new short[]{252, 152, 45}, 2, 0); - itemPlateVibrantAlloy = new BaseItemPlate("itemPlate"+"VibrantAlloy", "Vibrant Alloy", MaterialState.SOLID, new short[]{204, 242, 142}, 2, 0); - itemPlateConductiveIron = new BaseItemPlate("itemPlate"+"ConductiveIron", "Conductive Iron", MaterialState.SOLID, new short[]{164, 109, 100}, 2, 0); + itemPlateSoularium = ItemUtils.generateSpecialUsePlate("itemPlate"+"Soularium", "Soularium", new short[]{95, 90, 54}, 0); + itemPlateRedstoneAlloy = ItemUtils.generateSpecialUsePlate("itemPlate"+"RedstoneAlloy", "Redstone Alloy", new short[]{178,34,34}, 0); + itemPlateElectricalSteel = ItemUtils.generateSpecialUsePlate("itemPlate"+"ElectricalSteel", "Electrical Steel", new short[]{194, 194, 194}, 0); + itemPlatePulsatingIron = ItemUtils.generateSpecialUsePlate("itemPlate"+"PhasedIron", "Phased Iron", new short[]{50, 91, 21}, 0); + itemPlateEnergeticAlloy = ItemUtils.generateSpecialUsePlate("itemPlate"+"EnergeticAlloy", "Energetic Alloy", new short[]{252, 152, 45}, 0); + itemPlateVibrantAlloy = ItemUtils.generateSpecialUsePlate("itemPlate"+"VibrantAlloy", "Vibrant Alloy", new short[]{204, 242, 142}, 0); + itemPlateConductiveIron = ItemUtils.generateSpecialUsePlate("itemPlate"+"ConductiveIron", "Conductive Iron", new short[]{164, 109, 100}, 0); //Register dumb naming conventions - Who chose fucking phased Iron/Gold? GT_OreDictUnificator.registerOre("dustPhasedGold", ItemUtils.getSimpleStack(itemDustVibrantAlloy)); @@ -550,11 +555,10 @@ public final class ModItems { //Big Reactors if (LoadedMods.Big_Reactors|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("BigReactors Found - Loading Resources."); - //Item Init - itemPlateBlutonium = new BaseItemPlate("itemPlate"+"Blutonium", "Blutonium", MaterialState.SOLID, new short[]{0, 0, 255}, 2, 0); - itemPlateCyanite = new BaseItemPlate("itemPlate"+"Cyanite", "Cyanite", MaterialState.SOLID, new short[]{0, 191, 255}, 2, 0); - itemPlateLudicrite = new BaseItemPlate("itemPlate"+"Ludicrite", "Ludicrite", MaterialState.SOLID, new short[]{167, 5, 179}, 2, 0); - + //Item Init + itemPlateBlutonium = ItemUtils.generateSpecialUsePlate("itemPlate"+"Blutonium", "Blutonium", new short[]{0, 0, 255}, 0); + itemPlateBlutonium = ItemUtils.generateSpecialUsePlate("itemPlate"+"Cyanite", "Cyanite", new short[]{0, 191, 255}, 0); + itemPlateLudicrite = ItemUtils.generateSpecialUsePlate("itemPlate"+"Ludicrite", "Ludicrite", new short[]{167, 5, 179}, 0); } else { Utils.LOG_WARNING("BigReactors not Found - Skipping Resources."); @@ -565,11 +569,10 @@ public final class ModItems { Utils.LOG_INFO("Thaumcraft Found - Loading Resources."); //Item Init try { - - ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); - itemPlateVoidMetal = new BaseItemPlate("itemPlate"+"Void", "Void", MaterialState.SOLID, new short[]{82, 17, 82}, 2, 0); + ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); + itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("itemPlate"+"Void", "Void", new short[]{82, 17, 82}, 0); GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); - } catch (NullPointerException e){ + } catch (final NullPointerException e){ e.getClass(); } @@ -583,7 +586,7 @@ public final class ModItems { Utils.LOG_INFO("ExtraUtilities Found - Loading Resources."); try { //MaterialGenerator.generate(ALLOY.BEDROCKIUM); - } catch (NullPointerException e){ + } catch (final NullPointerException e){ e.getClass(); } } @@ -595,7 +598,7 @@ public final class ModItems { if (LoadedMods.PneumaticCraft|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("PneumaticCraft Found - Loading Resources."); //Item Init - itemPlateCompressedIron = new BaseItemPlate("itemPlate"+"CompressedIron", "Compressed Iron", MaterialState.SOLID, new short[]{128, 128, 128}, 2, 0); + itemPlateCompressedIron = ItemUtils.generateSpecialUsePlate("itemPlate"+"CompressedIron", "Compressed Iron", new short[]{128, 128, 128}, 0); } else { Utils.LOG_WARNING("PneumaticCraft not Found - Skipping Resources."); @@ -617,7 +620,7 @@ public final class ModItems { if (LoadedMods.RFTools|| LOAD_ALL_CONTENT){ Utils.LOG_INFO("rfTools Found - Loading Resources."); //Item Init - itemPlateDimensionShard = new BaseItemPlate("itemPlate"+"DimensionShard", "Dimensional Shard", MaterialState.SOLID, new short[]{170, 230, 230}, 2, 0); + itemPlateDimensionShard = ItemUtils.generateSpecialUsePlate("itemPlate"+"DimensionShard", "Dimensional Shard", new short[]{170, 230, 230}, 0); } else { Utils.LOG_WARNING("rfTools not Found - Skipping Resources."); @@ -629,15 +632,15 @@ public final class ModItems { RfEuBattery = new RF2EU_Battery(); //Baubles Mod Test - try {Class baublesTest = Class.forName("baubles.api.IBauble"); - if (baublesTest != null){ + try {final Class baublesTest = Class.forName("baubles.api.IBauble"); + if (baublesTest != null){ COMPAT_Baubles.run(); } else { - Utils.LOG_INFO("Baubles Not Found - Skipping Resources."); + Utils.LOG_INFO("Baubles Not Found - Skipping Resources."); } - } catch(Throwable T){ - Utils.LOG_INFO("Baubles Not Found - Skipping Resources."); + } catch(final Throwable T){ + Utils.LOG_INFO("Baubles Not Found - Skipping Resources."); } } else { @@ -648,7 +651,8 @@ public final class ModItems { //Special Item Handling Case if (configSwitches.enableAlternativeBatteryAlloy) { //ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0); TODO - ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", MaterialState.SOLID, new short[]{35, 228, 141}, 2, 0); + ModItems.itemPlateBatteryAlloy = ItemUtils.generateSpecialUsePlate("itemPlateBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0); + } @@ -683,6 +687,6 @@ public final class ModItems { GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); //ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); - //GameRegistry.registerItem(ItemBlockGtFrameBox, "itemGtFrameBoxSet1"); + //GameRegistry.registerItem(ItemBlockGtFrameBox, "itemGtFrameBoxSet1"); } } 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>> mItemBehaviors = new HashMap>>(); + private final HashMap>> 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> rarity = new ArrayList>(); - private ArrayList> descColour = new ArrayList>(); - private ArrayList> itemName = new ArrayList>(); - private ArrayList> itemDescription = new ArrayList>(); - private ArrayList> hasEffect = new ArrayList>(); - - public final HashMap mElectricStats = new HashMap(); - public final HashMap mBurnValues = new HashMap(); + /** The unlocalized name of this item. */ + private String unlocalizedName; + + private final ArrayList> rarity = new ArrayList<>(); + private final ArrayList> descColour = new ArrayList<>(); + private final ArrayList> itemName = new ArrayList<>(); + private final ArrayList> itemDescription = new ArrayList<>(); + private final ArrayList> hasEffect = new ArrayList<>(); + + public final HashMap mElectricStats = new HashMap<>(); + public final HashMap 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(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)); - } + } + + + 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> tList = mItemBehaviors.get((short) getDamage(aStack)); - if (tList != null) for (IItemBehaviour 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> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + if (tList != null) { + for (final IItemBehaviour 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> tList = mItemBehaviors.get((short) getDamage(aStack)); - if (tList != null) for (IItemBehaviour tBehavior : tList) - if (!tBehavior.isItemStackUsable(this, aStack)) return false; + public boolean isItemStackUsable(final ItemStack aStack) { + final ArrayList> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + if (tList != null) { + for (final IItemBehaviour 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. - *

- * 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 aBehavior) { - if (aMetaValue < 0 || aMetaValue >= 32766 || aBehavior == null) return this; - ArrayList> tList = mItemBehaviors.get((short) aMetaValue); - if (tList == null) { - tList = new ArrayList>(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 tAspects = new ArrayList(); - // 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) 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. + *

+ * 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 aBehavior) { + if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { + return this; + } + ArrayList> 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 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) 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/BaseItemIngotOLD.java deleted file mode 100644 index 15b1e48200..0000000000 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java +++ /dev/null @@ -1,100 +0,0 @@ -package gtPlusPlus.core.item.base.ingots; - -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; -import cpw.mods.fml.common.registry.GameRegistry; - -public class BaseItemIngotOLD extends Item{ - - protected int colour; - protected String materialName; - protected String unlocalName; - - public BaseItemIngotOLD(String unlocalizedName, String materialName, int colour, int sRadioactivity) { - setUnlocalizedName(unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName(unlocalizedName); - this.unlocalName = unlocalizedName; - this.setMaxStackSize(64); - this.setTextureName(CORE.MODID + ":" + "itemIngot"); - this.setMaxStackSize(64); - this.colour = colour; - this.materialName = materialName; - this.sRadiation = sRadioactivity; - GameRegistry.registerItem(this, unlocalizedName); - String temp = ""; - if (unlocalName.contains("itemIngot")){ - temp = unlocalName.replace("itemI", "i"); - } - else if (unlocalName.contains("itemHotIngot")){ - temp = unlocalName.replace("itemHotIngot", "ingotHot"); - } - if (temp != null && !temp.equals("")){ - GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); - } - generateCompressorRecipe(); - } - - @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - - return (materialName+ " Ingot"); - } - - public final String getMaterialName() { - return materialName; - } - - @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { - if (colour == 0){ - return MathUtils.generateSingularRandomHexValue(); - } - return colour; - - } - - private void generateCompressorRecipe(){ - if (unlocalName.contains("itemIngot")){ - 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.", ""); - Utils.LOG_WARNING("Generating OreDict Name: "+temp); - } - temp = temp.replace("itemIngot", "block"); - Utils.LOG_WARNING("Generating OreDict Name: "+temp); - if (temp != null && !temp.equals("")){ - tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); - if (tempOutput != null){ - GT_ModHandler.addCompressionRecipe(tempStack, tempOutput); - } - - } - } - else if (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); - } -} diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java new file mode 100644 index 0000000000..5d14660190 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java @@ -0,0 +1,100 @@ +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; +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 BaseItemIngot_OLD extends Item{ + + protected int colour; + protected String materialName; + protected String unlocalName; + + 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; + this.setMaxStackSize(64); + this.setTextureName(CORE.MODID + ":" + "itemIngot"); + this.setMaxStackSize(64); + this.colour = colour; + this.materialName = materialName; + this.sRadiation = sRadioactivity; + GameRegistry.registerItem(this, unlocalizedName); + String temp = ""; + if (this.unlocalName.contains("itemIngot")){ + temp = this.unlocalName.replace("itemI", "i"); + } + else if (this.unlocalName.contains("itemHotIngot")){ + temp = this.unlocalName.replace("itemHotIngot", "ingotHot"); + } + if ((temp != null) && !temp.equals("")){ + GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + } + this.generateCompressorRecipe(); + } + + @Override + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + + return (this.materialName+ " Ingot"); + } + + 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; + + } + + private void generateCompressorRecipe(){ + if (this.unlocalName.contains("itemIngot")){ + final ItemStack tempStack = ItemUtils.getSimpleStack(this, 9); + ItemStack tempOutput = null; + String temp = this.getUnlocalizedName().replace("item.itemIngot", "block"); + Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName()); + 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("")){ + tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); + if (tempOutput != null){ + GT_ModHandler.addCompressionRecipe(tempStack, tempOutput); + } + + } + } + else if (this.unlocalName.contains("itemHotIngot")){ + return; + } + + + } + + + 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/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); + } } } diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java b/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java index 6bd7f009bb..b30f956b53 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java +++ b/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java @@ -1,12 +1,12 @@ package gtPlusPlus.core.item.effects; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.*; /* - * + * This determines the name colour. EnumRarity can be: EnumRarity.common - the standard white colour. EnumRarity.uncommon - a yellow colour. @@ -15,25 +15,25 @@ EnumRarity.epic - the purple colour used on the Golden Apple. @SideOnly is an FML annotation. It marks the method below it for existing only on one side. Possible values are: Side.CLIENT is probably the most common one. This marks the method as existing only on the client side. Side.SERVER marks the method as existing only on the server side. - * + * */ public class RarityEffect extends Item { - public RarityEffect(int par1){ + public RarityEffect(final int par1){ super(); this.setCreativeTab(CreativeTabs.tabMaterials); } - + @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.common; } - + @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return true; } - + } diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java b/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java index 952bcfc9d3..25bdc71349 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java +++ b/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java @@ -1,26 +1,26 @@ package gtPlusPlus.core.item.effects; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.*; public class RarityEpic extends Item { - public RarityEpic(int par1){ + public RarityEpic(final int par1){ super(); this.setCreativeTab(CreativeTabs.tabMaterials); } - + @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.epic; } - + @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return true; } - + } diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityRare.java b/src/Java/gtPlusPlus/core/item/effects/RarityRare.java index cc313f5e77..7b5ba69efc 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityRare.java +++ b/src/Java/gtPlusPlus/core/item/effects/RarityRare.java @@ -1,26 +1,26 @@ package gtPlusPlus.core.item.effects; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.*; public class RarityRare extends Item { - public RarityRare(int par1){ + public RarityRare(){ super(); this.setCreativeTab(CreativeTabs.tabMaterials); } - + @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.rare; } - + @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return true; } - + } diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java b/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java index 26e2429f6a..82c5c55fff 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java +++ b/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java @@ -1,20 +1,20 @@ package gtPlusPlus.core.item.effects; -import net.minecraft.item.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.*; public class RarityUncommon extends Item { - + @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.uncommon; } - + @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return true; } - + } diff --git a/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java b/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java index 5a05ac7655..55efc50c4e 100644 --- a/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java +++ b/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java @@ -1,10 +1,9 @@ package gtPlusPlus.core.item.general; -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; @@ -18,87 +17,87 @@ public class BedLocator_Base extends Item{ public int bed_X = 0; public int bed_Y = 0; public int bed_Z = 0; - - public BedLocator_Base(String unlocalizedName) { + + public BedLocator_Base(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); - this.setMaxStackSize(1); + this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); } @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) { + + + int NBT_X = this.bed_X; + int NBT_Y = this.bed_Y; + int NBT_Z = this.bed_Z; - - int NBT_X = bed_X; - int NBT_Y = bed_Y; - int NBT_Z = bed_Z; - if (stack.stackTagCompound != null) { NBT_X = stack.stackTagCompound.getInteger("pos_x"); NBT_Y = stack.stackTagCompound.getInteger("pos_y"); NBT_Z = stack.stackTagCompound.getInteger("pos_z"); - String tempX = String.valueOf(NBT_X); - String tempY = String.valueOf(NBT_Y); - String tempZ = String.valueOf(NBT_Z); - String formattedX = EnumChatFormatting.DARK_RED+tempX+EnumChatFormatting.GRAY; - String formattedY = EnumChatFormatting.RED+tempY+EnumChatFormatting.GRAY; - String formattedZ = EnumChatFormatting.RED+tempZ+EnumChatFormatting.GRAY; - - list.add(EnumChatFormatting.GRAY+"X: "+formattedX+"."); - list.add(EnumChatFormatting.GRAY+"Y: "+formattedY+"."); - list.add(EnumChatFormatting.GRAY+"Z: "+formattedZ+"."); - super.addInformation(stack, aPlayer, list, bool); - } + final String tempX = String.valueOf(NBT_X); + final String tempY = String.valueOf(NBT_Y); + final String tempZ = String.valueOf(NBT_Z); + final String formattedX = EnumChatFormatting.DARK_RED+tempX+EnumChatFormatting.GRAY; + final String formattedY = EnumChatFormatting.RED+tempY+EnumChatFormatting.GRAY; + final String formattedZ = EnumChatFormatting.RED+tempZ+EnumChatFormatting.GRAY; + + list.add(EnumChatFormatting.GRAY+"X: "+formattedX+"."); + list.add(EnumChatFormatting.GRAY+"Y: "+formattedY+"."); + list.add(EnumChatFormatting.GRAY+"Z: "+formattedZ+"."); + 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) { itemStack.stackTagCompound = new NBTTagCompound(); this.bed_X = 0; this.bed_Y = 0; this.bed_Z = 0; - itemStack.stackTagCompound.setInteger("pos_x", bed_X); - itemStack.stackTagCompound.setInteger("pos_y", bed_Y); - itemStack.stackTagCompound.setInteger("pos_z", bed_Z); + itemStack.stackTagCompound.setInteger("pos_x", this.bed_X); + itemStack.stackTagCompound.setInteger("pos_y", this.bed_Y); + itemStack.stackTagCompound.setInteger("pos_z", this.bed_Z); } @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(); if (par3Entity.getBedLocation() != null){ - this.bed_X = par3Entity.getBedLocation().posX; - this.bed_Y = par3Entity.getBedLocation().posY; - this.bed_Z = par3Entity.getBedLocation().posZ; + this.bed_X = par3Entity.getBedLocation().posX; + this.bed_Y = par3Entity.getBedLocation().posY; + this.bed_Z = par3Entity.getBedLocation().posZ; } else { this.bed_X = 0; this.bed_Y = 0; this.bed_Z = 0; } - itemStack.stackTagCompound.setInteger("pos_x", bed_X); - itemStack.stackTagCompound.setInteger("pos_y", bed_Y); - itemStack.stackTagCompound.setInteger("pos_z", bed_Z); + itemStack.stackTagCompound.setInteger("pos_x", this.bed_X); + itemStack.stackTagCompound.setInteger("pos_y", this.bed_Y); + itemStack.stackTagCompound.setInteger("pos_z", this.bed_Z); return super.onItemRightClick(itemStack, world, par3Entity); } diff --git a/src/Java/gtPlusPlus/core/item/general/BufferCore.java b/src/Java/gtPlusPlus/core/item/general/BufferCore.java index 42f8c99c70..40136d7409 100644 --- a/src/Java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/Java/gtPlusPlus/core/item/general/BufferCore.java @@ -1,23 +1,22 @@ package gtPlusPlus.core.item.general; +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; - -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BufferCore extends BaseItemWithDamageValue{ - + public int coreTier = 0; - - public BufferCore(String unlocalizedName, int i) { + + public BufferCore(final String unlocalizedName, final int i) { super(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); this.setMaxStackSize(2); @@ -25,74 +24,74 @@ public class BufferCore extends BaseItemWithDamageValue{ } @Override - public String getItemStackDisplayName(ItemStack stack) { + public String getItemStackDisplayName(final ItemStack stack) { return super.getItemStackDisplayName(stack)+" ["+CORE.VOLTAGES[this.coreTier-1]+"]."; } - + @Override @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() - { - return true; - } + public boolean requiresMultipleRenderPasses() + { + return true; + } @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.GRAY+"A key crafting component for making energy buffers."); super.addInformation(stack, aPlayer, list, bool); } public final int getCoreTier() { - return coreTier; + return this.coreTier; } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { //Figure Out Damage - String s = String.format("%X", HEX_OxFFFFFF); + final String s = String.format("%X", HEX_OxFFFFFF); //Utils.LOG_INFO(s); //String rgb = Utils.hex2Rgb(s); //Utils.LOG_INFO(rgb); - if (coreTier == 1){ + if (this.coreTier == 1){ HEX_OxFFFFFF = 0x4d4d4d; } - else if (coreTier == 2){ + else if (this.coreTier == 2){ HEX_OxFFFFFF = 0x666666; } - else if (coreTier == 3){ + else if (this.coreTier == 3){ HEX_OxFFFFFF = 0x8c8c8c; } - else if (coreTier == 4){ + else if (this.coreTier == 4){ HEX_OxFFFFFF = 0xa6a6a6; } - else if (coreTier == 5){ + else if (this.coreTier == 5){ HEX_OxFFFFFF = 0xcccccc; } - else if (coreTier == 6){ + else if (this.coreTier == 6){ HEX_OxFFFFFF = 0xe6e6e6; } - else if (coreTier == 7){ + else if (this.coreTier == 7){ HEX_OxFFFFFF = 0xffffcc; } - else if (coreTier == 8){ + else if (this.coreTier == 8){ HEX_OxFFFFFF = 0xace600; } - else if (coreTier == 9){ + else if (this.coreTier == 9){ HEX_OxFFFFFF = 0xffff00; } /*else if (coreTier == 10){ HEX_OxFFFFFF = 0xff0000; }*/ - else if (coreTier == 10){ + else if (this.coreTier == 10){ HEX_OxFFFFFF = Utils.rgbtoHexValue(MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250)); } else { HEX_OxFFFFFF = 0xffffff; } - + return HEX_OxFFFFFF; } - + } diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java b/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java index a7a1526277..6bb1e8d7bc 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java @@ -14,15 +14,15 @@ import net.minecraft.world.World; public class ItemBasicFirestarter extends CoreItem { public ItemBasicFirestarter() { - super("itemSimpleFiremaker", AddToCreativeTab.tabTools, 1, 5, "Can probably make you a fire"); + super("itemSimpleFiremaker", AddToCreativeTab.tabTools, 1, 5, "Can probably make you a fire"); this.setTextureName(CORE.MODID+":"+"itemFireStarter"); } @Override public boolean onItemUse( - ItemStack thisItem, EntityPlayer thisPlayer, World thisWorld, + final ItemStack thisItem, final EntityPlayer thisPlayer, final World thisWorld, int blockX, int blockY, int blockZ, - int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + final int p_77648_7_, final float p_77648_8_, final float p_77648_9_, final float p_77648_10_) { if (p_77648_7_ == 0) { --blockY; } @@ -47,23 +47,23 @@ public class ItemBasicFirestarter extends CoreItem { if (thisWorld.getBlock(blockX, blockY, blockZ) instanceof FirePit){ thisWorld.setBlockMetadataWithNotify(blockX, blockY, blockZ, 2, 4); PlayerUtils.messagePlayer(thisPlayer, "You light the fire pit. "); - } + } if (thisWorld.isAirBlock(blockX, blockY, blockZ)) { - int random = MathUtils.randInt(0, 3); + final int random = MathUtils.randInt(0, 3); //Explode, lol. if (random == 0){ PlayerUtils.messagePlayer(thisPlayer, "You somehow managed to set yourself on fire... "); - thisWorld.playSoundEffect((double)thisPlayer.posX + 0.5D, (double)thisPlayer.posY + 0.5D, (double)thisPlayer.posZ + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); - thisPlayer.setFire(4); + thisWorld.playSoundEffect(thisPlayer.posX + 0.5D, thisPlayer.posY + 0.5D, thisPlayer.posZ + 0.5D, "fire.ignite", 1.0F, (itemRand.nextFloat() * 0.4F) + 0.8F); + thisPlayer.setFire(4); thisItem.damageItem(thisItem.getMaxDamage(), thisPlayer); } //Create a fire else if (random == 2){ PlayerUtils.messagePlayer(thisPlayer, "You created a fire!"); - thisWorld.playSoundEffect((double)blockX + 0.5D, (double)blockY + 0.5D, (double)blockZ + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); - thisWorld.setBlock(blockX, blockY, blockZ, Blocks.fire); + thisWorld.playSoundEffect(blockX + 0.5D, blockY + 0.5D, blockZ + 0.5D, "fire.ignite", 1.0F, (itemRand.nextFloat() * 0.4F) + 0.8F); + thisWorld.setBlock(blockX, blockY, blockZ, Blocks.fire); } //Do nothing @@ -78,7 +78,7 @@ public class ItemBasicFirestarter extends CoreItem { } @Override - public String getItemStackDisplayName(ItemStack thisItem) { + public String getItemStackDisplayName(final ItemStack thisItem) { return "Basic Firemaker"; } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java index 0458a38110..65aa618cb3 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.general; +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.interfaces.IItemBlueprint; import gtPlusPlus.core.lib.CORE; @@ -7,9 +10,6 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.player.PlayerUtils; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -19,14 +19,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; public class ItemBlueprint extends Item implements IItemBlueprint{ - public ItemBlueprint(String unlocalizedName) { + public ItemBlueprint(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); - this.setMaxStackSize(1); + this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); //this.bpID = MathUtils.randInt(0, 1000); GameRegistry.registerItem(this, unlocalizedName); @@ -34,10 +33,10 @@ public class ItemBlueprint extends Item implements IItemBlueprint{ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack itemStack, EntityPlayer aPlayer, List list, boolean bool) { + public void addInformation(final ItemStack itemStack, final EntityPlayer aPlayer, final List list, final boolean bool) { //Create some NBT if it's not there, otherwise this does nothing. if (!itemStack.hasTagCompound()){ - createNBT(itemStack); + this.createNBT(itemStack); } //Set up some default variables. int id = -1; @@ -46,14 +45,14 @@ public class ItemBlueprint extends Item implements IItemBlueprint{ //Get proper display vars from NBT if it's there if (itemStack.hasTagCompound()){ //Utils.LOG_WARNING("Found TagCompound"); - id = (int) getNBT(itemStack, "mID"); - name = (String) getNBT(itemStack, "mName"); - blueprint = (boolean) getNBT(itemStack, "mBlueprint"); + id = (int) this.getNBT(itemStack, "mID"); + name = (String) this.getNBT(itemStack, "mName"); + blueprint = (boolean) this.getNBT(itemStack, "mBlueprint"); } //Write to tooltip list for each viable setting. if (itemStack.hasTagCompound()) { if (id != -1){ - list.add(EnumChatFormatting.GRAY+"Technical Document No. "+id); + list.add(EnumChatFormatting.GRAY+"Technical Document No. "+id); } if(blueprint){ list.add(EnumChatFormatting.BLUE+"Currently holding a blueprint for "+name); @@ -61,7 +60,7 @@ public class ItemBlueprint extends Item implements IItemBlueprint{ else { list.add(EnumChatFormatting.RED+"Currently not holding a blueprint for anything."); } - } + } else { list.add(EnumChatFormatting.RED+"Currently not holding a blueprint for anything."); } @@ -69,46 +68,46 @@ public class ItemBlueprint extends Item implements IItemBlueprint{ } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { return "Blueprint [I am useless]"; } @Override - public void onCreated(ItemStack itemStack, World world, EntityPlayer player) { - createNBT(itemStack); + public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) { + this.createNBT(itemStack); } @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) { //Let the player know what blueprint is held if (itemStack.hasTagCompound()) { - PlayerUtils.messagePlayer(par3Entity, "This Blueprint holds NBT data. "+"|"+getNBT(itemStack, "mID")+"|"+getNBT(itemStack, "mBlueprint")+"|"+getNBT(itemStack, "mName")+"|"+ItemUtils.getArrayStackNames(readItemsFromNBT(itemStack))); + PlayerUtils.messagePlayer(par3Entity, "This Blueprint holds NBT data. "+"|"+this.getNBT(itemStack, "mID")+"|"+this.getNBT(itemStack, "mBlueprint")+"|"+this.getNBT(itemStack, "mName")+"|"+ItemUtils.getArrayStackNames(this.readItemsFromNBT(itemStack))); } else { - createNBT(itemStack); - PlayerUtils.messagePlayer(par3Entity, "This is a placeholder. "+getNBT(itemStack, "mID")); + this.createNBT(itemStack); + PlayerUtils.messagePlayer(par3Entity, "This is a placeholder. "+this.getNBT(itemStack, "mID")); } return super.onItemRightClick(itemStack, world, par3Entity); } - public ItemStack[] readItemsFromNBT(ItemStack itemStack){ + public ItemStack[] readItemsFromNBT(final ItemStack itemStack){ ItemStack[] blueprint = new ItemStack[9]; if (itemStack.hasTagCompound()){ - NBTTagCompound nbt = itemStack.getTagCompound(); - NBTTagList list = nbt.getTagList("Items", 10); + final NBTTagCompound nbt = itemStack.getTagCompound(); + final NBTTagList list = nbt.getTagList("Items", 10); blueprint = new ItemStack[INV_SIZE]; for(int i = 0;i= 0 && slot < INV_SIZE) + final NBTTagCompound data = list.getCompoundTagAt(i); + final int slot = data.getInteger("Slot"); + if((slot >= 0) && (slot < INV_SIZE)) { blueprint[slot] = ItemStack.loadItemStackFromNBT(data); } @@ -118,17 +117,17 @@ public class ItemBlueprint extends Item implements IItemBlueprint{ return null; } - public ItemStack writeItemsToNBT(ItemStack itemStack, ItemStack[] craftingGrid){ - ItemStack[] blueprint = craftingGrid; + public ItemStack writeItemsToNBT(final ItemStack itemStack, final ItemStack[] craftingGrid){ + final ItemStack[] blueprint = craftingGrid; if (itemStack.hasTagCompound()){ - NBTTagCompound nbt = itemStack.getTagCompound(); - NBTTagList list = new NBTTagList(); + final NBTTagCompound nbt = itemStack.getTagCompound(); + final NBTTagList list = new NBTTagList(); for(int i = 0;i= 10000){ + if (this.getCharge(arg0) >= 10000){ arg1.addPotionEffect(new PotionEffect(Potion.invisibility.id, 10, 2)); - discharge(arg0, 10000, 5, true, true, false); + this.discharge(arg0, 10000, 5, true, true, false); } else { if (arg1.isPotionActive((Potion.invisibility))){ diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java index d922c243c3..63e0abb238 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -1,5 +1,11 @@ package gtPlusPlus.core.item.general; +import java.util.List; + +import baubles.api.BaubleType; +import baubles.api.IBauble; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -7,9 +13,6 @@ import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.player.PlayerUtils; import ic2.api.item.*; - -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -17,10 +20,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; @Optional.InterfaceList(value = {@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")}) public class ItemHealingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble{ @@ -32,28 +31,28 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI public ItemHealingDevice(){ this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setUnlocalizedName(unlocalizedName); + this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice"); this.thisStack = ItemUtils.getSimpleStack(this); - GameRegistry.registerItem(this, unlocalizedName); + GameRegistry.registerItem(this, this.unlocalizedName); } @Override - public void onUpdate(ItemStack itemStack, World worldObj, Entity player, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_, final boolean p_77663_5_) { if (worldObj.isRemote) { return; } if (player instanceof EntityPlayer){ - for (ItemStack is : ((EntityPlayer) player).inventory.mainInventory) { + for (final ItemStack is : ((EntityPlayer) player).inventory.mainInventory) { if (is == itemStack) { continue; } if (is != null) { if (is.getItem() instanceof IElectricItem) { - IElectricItem electricItem = (IElectricItem) is.getItem(); - chargeEU = ElectricItem.manager.getCharge(is); + final IElectricItem electricItem = (IElectricItem) is.getItem(); + this.chargeEU = ElectricItem.manager.getCharge(is); } } @@ -65,81 +64,81 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI } @Override - public boolean canProvideEnergy(ItemStack itemStack) { + public boolean canProvideEnergy(final ItemStack itemStack) { return true; } @Override - public Item getChargedItem(ItemStack itemStack) { - ItemStack x = itemStack.copy(); + public Item getChargedItem(final ItemStack itemStack) { + final ItemStack x = itemStack.copy(); x.setItemDamage(maxValueEU); return x.getItem(); } @Override - public Item getEmptyItem(ItemStack itemStack) { - ItemStack x = itemStack.copy(); + public Item getEmptyItem(final ItemStack itemStack) { + final ItemStack x = itemStack.copy(); x.setItemDamage(0); return x.getItem(); } @Override - public double getMaxCharge(ItemStack itemStack) { + public double getMaxCharge(final ItemStack itemStack) { return maxValueEU; } @Override - public int getTier(ItemStack itemStack) { + public int getTier(final ItemStack itemStack) { return 5; } @Override - public double getTransferLimit(ItemStack itemStack) { + public double getTransferLimit(final ItemStack itemStack) { return 32784; } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { return (EnumChatFormatting.BLUE+"Personal Healing NanoBooster"+EnumChatFormatting.RESET); } @Override - public double getDurabilityForDisplay(ItemStack stack) + public double getDurabilityForDisplay(final ItemStack stack) { //return 1.0D - getEnergyStored(stack) / this.capacity; - return 1.0D - (double)getCharge(stack) / (double)getMaxCharge(stack); + return 1.0D - (this.getCharge(stack) / this.getMaxCharge(stack)); } @Override - public boolean showDurabilityBar(ItemStack stack) + public boolean showDurabilityBar(final ItemStack stack) { return true; } - - public double secondsLeft(ItemStack stack){ - + + public double secondsLeft(final ItemStack stack){ + double r = 0; - r = getCharge(stack)/(1638400/4); + r = this.getCharge(stack)/(1638400/4); return (int) r; } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add(""); - list.add(EnumChatFormatting.GREEN+"Worn as a Necklace within Baubles."+EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GREEN+"Drains 1638400eu to restore hunger."+EnumChatFormatting.GRAY); - list.add(""); - list.add(EnumChatFormatting.GOLD+"IC2/EU Information"+EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+getTier(thisStack)+EnumChatFormatting.GRAY+"] Transfer Limit: ["+EnumChatFormatting.YELLOW+getTransferLimit(thisStack)+EnumChatFormatting.GRAY +"Eu/t]"); - list.add(EnumChatFormatting.GRAY+"Current Power: ["+EnumChatFormatting.YELLOW+(long) getCharge(stack)+EnumChatFormatting.GRAY+"Eu] ["+EnumChatFormatting.YELLOW+MathUtils.findPercentage(getCharge(stack), getMaxCharge(stack))+EnumChatFormatting.GRAY +"%]"); - list.add(EnumChatFormatting.GRAY+"Uses Remaining: ["+EnumChatFormatting.YELLOW+secondsLeft(stack)+ EnumChatFormatting.GRAY +"]"); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + list.add(""); + list.add(EnumChatFormatting.GREEN+"Worn as a Necklace within Baubles."+EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GREEN+"Drains 1638400eu to restore hunger."+EnumChatFormatting.GRAY); + list.add(""); + list.add(EnumChatFormatting.GOLD+"IC2/EU Information"+EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+this.getTier(this.thisStack)+EnumChatFormatting.GRAY+"] Transfer Limit: ["+EnumChatFormatting.YELLOW+this.getTransferLimit(this.thisStack)+EnumChatFormatting.GRAY +"Eu/t]"); + list.add(EnumChatFormatting.GRAY+"Current Power: ["+EnumChatFormatting.YELLOW+(long) this.getCharge(stack)+EnumChatFormatting.GRAY+"Eu] ["+EnumChatFormatting.YELLOW+MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))+EnumChatFormatting.GRAY +"%]"); + list.add(EnumChatFormatting.GRAY+"Uses Remaining: ["+EnumChatFormatting.YELLOW+this.secondsLeft(stack)+ EnumChatFormatting.GRAY +"]"); super.addInformation(stack, aPlayer, list, bool); } @Override - public double charge(ItemStack stack, double amount, int tier, - boolean ignoreTransferLimit, boolean simulate) { + public double charge(final ItemStack stack, final double amount, final int tier, + final boolean ignoreTransferLimit, final boolean simulate) { if (!simulate) { @@ -150,8 +149,8 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI } @Override - public double discharge(ItemStack stack, double amount, int tier, - boolean ignoreTransferLimit, boolean externally, boolean simulate) { + public double discharge(final ItemStack stack, final double amount, final int tier, + final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) { if (!simulate) { ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate); @@ -161,66 +160,66 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI } @Override - public double getCharge(ItemStack stack) { + public double getCharge(final ItemStack stack) { return ElectricItem.manager.getCharge(stack); } @Override - public boolean canUse(ItemStack stack, double amount) { + public boolean canUse(final ItemStack stack, final double amount) { return ElectricItem.manager.canUse(stack, amount); } @Override - public boolean use(ItemStack stack, double amount, EntityLivingBase entity) { + public boolean use(final ItemStack stack, final double amount, final EntityLivingBase entity) { return ElectricItem.manager.use(stack, amount, entity); } @Override - public void chargeFromArmor(ItemStack stack, EntityLivingBase entity) { + public void chargeFromArmor(final ItemStack stack, final EntityLivingBase entity) { ElectricItem.manager.chargeFromArmor(stack, entity); } @Override - public String getToolTip(ItemStack stack) { + public String getToolTip(final ItemStack stack) { return ElectricItem.manager.getToolTip(stack); } @Override - public boolean canEquip(ItemStack arg0, EntityLivingBase arg1) { + public boolean canEquip(final ItemStack arg0, final EntityLivingBase arg1) { return true; } @Override - public boolean canUnequip(ItemStack arg0, EntityLivingBase arg1) { + public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) { return true; } @Override - public BaubleType getBaubleType(ItemStack arg0) { + public BaubleType getBaubleType(final ItemStack arg0) { return BaubleType.AMULET; } @Override //TODO - public void onEquipped(ItemStack arg0, EntityLivingBase arg1) { + public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) { } @Override //TODO - public void onUnequipped(ItemStack arg0, EntityLivingBase arg1) { + public void onUnequipped(final ItemStack arg0, final EntityLivingBase arg1) { } @Override //TODO - public void onWornTick(ItemStack arg0, EntityLivingBase arg1) { + public void onWornTick(final ItemStack arg0, final EntityLivingBase arg1) { if (!arg1.worldObj.isRemote){ - if (getCharge(arg0) >= 1638400/4){ + if (this.getCharge(arg0) >= (1638400/4)){ if (arg1.getHealth() < arg1.getMaxHealth()){ - float rx = arg1.getMaxHealth()-arg1.getHealth(); + final float rx = arg1.getMaxHealth()-arg1.getHealth(); Utils.LOG_INFO("rx:"+rx); - arg1.heal(rx*2); - discharge(arg0, (1638400/4)*rx, 6, true, true, false); - PlayerUtils.messagePlayer((EntityPlayer) arg1, "Your NanoBooster Whirs! Leaving you feeling stronger. It Healed "+rx+" hp."); - PlayerUtils.messagePlayer((EntityPlayer) arg1, "You check it's remaining uses, it has "+secondsLeft(arg0)+"."); + arg1.heal(rx*2); + this.discharge(arg0, (1638400/4)*rx, 6, true, true, false); + PlayerUtils.messagePlayer((EntityPlayer) arg1, "Your NanoBooster Whirs! Leaving you feeling stronger. It Healed "+rx+" hp."); + PlayerUtils.messagePlayer((EntityPlayer) arg1, "You check it's remaining uses, it has "+this.secondsLeft(arg0)+"."); } } } diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java index 70ab4d38f5..e20271d4b6 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java @@ -1,13 +1,16 @@ package gtPlusPlus.core.item.general; +import java.util.List; + +import baubles.api.BaubleType; +import baubles.api.IBauble; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.events.CustomMovementHandler; import gtPlusPlus.core.handler.events.SneakManager; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.item.ItemUtils; - -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -16,38 +19,34 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; @Optional.InterfaceList(value = {@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")}) public class ItemSlowBuildingRing extends Item implements IBauble{ private final String unlocalizedName = "SlowBuildingRing"; CustomMovementHandler x; - + public ItemSlowBuildingRing(){ this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setUnlocalizedName(unlocalizedName); + this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice"); + this.setTextureName(CORE.MODID + ":" + "itemSlowBuildersRing"); ItemUtils.getSimpleStack(this); - GameRegistry.registerItem(this, unlocalizedName); + GameRegistry.registerItem(this, this.unlocalizedName); } @Override - public void onUpdate(ItemStack itemStack, World worldObj, Entity player, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_, final boolean p_77663_5_) { if (worldObj.isRemote) { return; } if (player instanceof EntityPlayer){ - for (ItemStack is : ((EntityPlayer) player).inventory.mainInventory) { + for (final ItemStack is : ((EntityPlayer) player).inventory.mainInventory) { if (is == itemStack) { continue; } if (is != null) { - + } } @@ -56,59 +55,59 @@ public class ItemSlowBuildingRing extends Item implements IBauble{ } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { return (EnumChatFormatting.YELLOW+"Slow Building Ring"+EnumChatFormatting.GRAY); } - + @Override - public boolean showDurabilityBar(ItemStack stack) + public boolean showDurabilityBar(final ItemStack stack) { return false; } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add(""); - list.add(EnumChatFormatting.GREEN+"Worn as a Ring within Baubles. Prevents you from sprinting."+EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GREEN+"Movement speed reduced to crouch speed."+EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GREEN+"Press shift while worn to toggle crouch on/off."+EnumChatFormatting.GRAY); - list.add(""); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + list.add(""); + list.add(EnumChatFormatting.GREEN+"Worn as a Ring within Baubles. Prevents you from sprinting."+EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GREEN+"Movement speed reduced to crouch speed."+EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GREEN+"Press shift while worn to toggle crouch on/off."+EnumChatFormatting.GRAY); + list.add(""); super.addInformation(stack, aPlayer, list, bool); } @Override - public boolean canEquip(ItemStack arg0, EntityLivingBase arg1) { + public boolean canEquip(final ItemStack arg0, final EntityLivingBase arg1) { return true; } @Override - public boolean canUnequip(ItemStack arg0, EntityLivingBase arg1) { + public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) { return true; } @Override - public BaubleType getBaubleType(ItemStack arg0) { + public BaubleType getBaubleType(final ItemStack arg0) { return BaubleType.RING; } @Override //TODO - public void onEquipped(ItemStack arg0, EntityLivingBase arg1) { + public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) { doEffect(arg1); } @Override //TODO - public void onUnequipped(ItemStack arg0, EntityLivingBase arg1) { + public void onUnequipped(final ItemStack arg0, final EntityLivingBase arg1) { SneakManager.setSprintingStateON(); SneakManager.setCrouchingStateOFF(); } @Override //TODO - public void onWornTick(ItemStack arg0, EntityLivingBase arg1) { + public void onWornTick(final ItemStack arg0, final EntityLivingBase arg1) { doEffect(arg1); } - - private static void doEffect(EntityLivingBase arg1){ + + private static void doEffect(final EntityLivingBase arg1){ if (arg1.worldObj.isRemote){ if (!arg1.isSneaking()){ arg1.setSneaking(true); diff --git a/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java b/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java index f452b83a73..f4ad191f11 100644 --- a/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java +++ b/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.general; +import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -12,199 +13,198 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.FillBucketEvent; -import cpw.mods.fml.common.eventhandler.Event; public class NuclearFuelRodBase extends Item { - /** field for checking if the bucket has been filled. */ - private Block isFull; - public NuclearFuelRodBase(Block p_i45331_1_) - { - this.maxStackSize = 1; - this.isFull = p_i45331_1_; - this.setCreativeTab(CreativeTabs.tabMisc); - } - - /** - * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer - */ - @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) - { - boolean flag = this.isFull == Blocks.air; - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(p_77659_2_, p_77659_3_, flag); - - if (movingobjectposition == null) - { - return p_77659_1_; - } - FillBucketEvent event = new FillBucketEvent(p_77659_3_, p_77659_1_, p_77659_2_, movingobjectposition); + /** field for checking if the bucket has been filled. */ + private final Block isFull; + public NuclearFuelRodBase(final Block p_i45331_1_) + { + this.maxStackSize = 1; + this.isFull = p_i45331_1_; + this.setCreativeTab(CreativeTabs.tabMisc); + } + + /** + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer + */ + @Override + public ItemStack onItemRightClick(final ItemStack p_77659_1_, final World p_77659_2_, final EntityPlayer p_77659_3_) + { + final boolean flag = this.isFull == Blocks.air; + final MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(p_77659_2_, p_77659_3_, flag); + + if (movingobjectposition == null) + { + return p_77659_1_; + } + final FillBucketEvent event = new FillBucketEvent(p_77659_3_, p_77659_1_, p_77659_2_, movingobjectposition); if (MinecraftForge.EVENT_BUS.post(event)) { - return p_77659_1_; + return p_77659_1_; } if (event.getResult() == Event.Result.ALLOW) { - if (p_77659_3_.capabilities.isCreativeMode) - { - return p_77659_1_; - } - - if (--p_77659_1_.stackSize <= 0) - { - return event.result; - } - - if (!p_77659_3_.inventory.addItemStackToInventory(event.result)) - { - p_77659_3_.dropPlayerItemWithRandomChoice(event.result, false); - } - - return p_77659_1_; + if (p_77659_3_.capabilities.isCreativeMode) + { + return p_77659_1_; + } + + if (--p_77659_1_.stackSize <= 0) + { + return event.result; + } + + if (!p_77659_3_.inventory.addItemStackToInventory(event.result)) + { + p_77659_3_.dropPlayerItemWithRandomChoice(event.result, false); + } + + return p_77659_1_; } if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - - if (!p_77659_2_.canMineBlock(p_77659_3_, i, j, k)) - { - return p_77659_1_; - } - - if (flag) - { - if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) - { - return p_77659_1_; - } - - Material material = p_77659_2_.getBlock(i, j, k).getMaterial(); - int l = p_77659_2_.getBlockMetadata(i, j, k); - - if (material == Material.water && l == 0) - { - p_77659_2_.setBlockToAir(i, j, k); - return this.func_150910_a(p_77659_1_, p_77659_3_, Items.water_bucket); - } - - if (material == Material.lava && l == 0) - { - p_77659_2_.setBlockToAir(i, j, k); - return this.func_150910_a(p_77659_1_, p_77659_3_, Items.lava_bucket); - } - } - else - { - if (this.isFull == Blocks.air) - { - return new ItemStack(Items.bucket); - } - - if (movingobjectposition.sideHit == 0) - { - --j; - } - - if (movingobjectposition.sideHit == 1) - { - ++j; - } - - if (movingobjectposition.sideHit == 2) - { - --k; - } - - if (movingobjectposition.sideHit == 3) - { - ++k; - } - - if (movingobjectposition.sideHit == 4) - { - --i; - } - - if (movingobjectposition.sideHit == 5) - { - ++i; - } - - if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) - { - return p_77659_1_; - } - - if (this.tryPlaceContainedLiquid(p_77659_2_, i, j, k) && !p_77659_3_.capabilities.isCreativeMode) - { - return new ItemStack(Items.bucket); - } - } + int i = movingobjectposition.blockX; + int j = movingobjectposition.blockY; + int k = movingobjectposition.blockZ; + + if (!p_77659_2_.canMineBlock(p_77659_3_, i, j, k)) + { + return p_77659_1_; + } + + if (flag) + { + if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) + { + return p_77659_1_; + } + + final Material material = p_77659_2_.getBlock(i, j, k).getMaterial(); + final int l = p_77659_2_.getBlockMetadata(i, j, k); + + if ((material == Material.water) && (l == 0)) + { + p_77659_2_.setBlockToAir(i, j, k); + return this.func_150910_a(p_77659_1_, p_77659_3_, Items.water_bucket); + } + + if ((material == Material.lava) && (l == 0)) + { + p_77659_2_.setBlockToAir(i, j, k); + return this.func_150910_a(p_77659_1_, p_77659_3_, Items.lava_bucket); + } + } + else + { + if (this.isFull == Blocks.air) + { + return new ItemStack(Items.bucket); + } + + if (movingobjectposition.sideHit == 0) + { + --j; + } + + if (movingobjectposition.sideHit == 1) + { + ++j; + } + + if (movingobjectposition.sideHit == 2) + { + --k; + } + + if (movingobjectposition.sideHit == 3) + { + ++k; + } + + if (movingobjectposition.sideHit == 4) + { + --i; + } + + if (movingobjectposition.sideHit == 5) + { + ++i; + } + + if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) + { + return p_77659_1_; + } + + if (this.tryPlaceContainedLiquid(p_77659_2_, i, j, k) && !p_77659_3_.capabilities.isCreativeMode) + { + return new ItemStack(Items.bucket); + } + } } return p_77659_1_; - } - - @SuppressWarnings("static-method") - private ItemStack func_150910_a(ItemStack p_150910_1_, EntityPlayer p_150910_2_, Item p_150910_3_) - { - if (p_150910_2_.capabilities.isCreativeMode) - { - return p_150910_1_; - } - else if (--p_150910_1_.stackSize <= 0) - { - return new ItemStack(p_150910_3_); - } - else - { - if (!p_150910_2_.inventory.addItemStackToInventory(new ItemStack(p_150910_3_))) - { - p_150910_2_.dropPlayerItemWithRandomChoice(new ItemStack(p_150910_3_, 1, 0), false); - } - - return p_150910_1_; - } - } - - /** - * Attempts to place the liquid contained inside the bucket. - */ - public boolean tryPlaceContainedLiquid(World p_77875_1_, int p_77875_2_, int p_77875_3_, int p_77875_4_) - { - if (this.isFull == Blocks.air) - { - return false; - } - Material material = p_77875_1_.getBlock(p_77875_2_, p_77875_3_, p_77875_4_).getMaterial(); - boolean flag = !material.isSolid(); + } + + @SuppressWarnings("static-method") + private ItemStack func_150910_a(final ItemStack p_150910_1_, final EntityPlayer p_150910_2_, final Item p_150910_3_) + { + if (p_150910_2_.capabilities.isCreativeMode) + { + return p_150910_1_; + } + else if (--p_150910_1_.stackSize <= 0) + { + return new ItemStack(p_150910_3_); + } + else + { + if (!p_150910_2_.inventory.addItemStackToInventory(new ItemStack(p_150910_3_))) + { + p_150910_2_.dropPlayerItemWithRandomChoice(new ItemStack(p_150910_3_, 1, 0), false); + } + + return p_150910_1_; + } + } + + /** + * Attempts to place the liquid contained inside the bucket. + */ + public boolean tryPlaceContainedLiquid(final World p_77875_1_, final int p_77875_2_, final int p_77875_3_, final int p_77875_4_) + { + if (this.isFull == Blocks.air) + { + return false; + } + final Material material = p_77875_1_.getBlock(p_77875_2_, p_77875_3_, p_77875_4_).getMaterial(); + final boolean flag = !material.isSolid(); if (!p_77875_1_.isAirBlock(p_77875_2_, p_77875_3_, p_77875_4_) && !flag) { - return false; + return false; } - if (p_77875_1_.provider.isHellWorld && this.isFull == Blocks.flowing_water) + if (p_77875_1_.provider.isHellWorld && (this.isFull == Blocks.flowing_water)) { - p_77875_1_.playSoundEffect((double)((float)p_77875_2_ + 0.5F), (double)((float)p_77875_3_ + 0.5F), (double)((float)p_77875_4_ + 0.5F), "random.fizz", 0.5F, 2.6F + (p_77875_1_.rand.nextFloat() - p_77875_1_.rand.nextFloat()) * 0.8F); + p_77875_1_.playSoundEffect(p_77875_2_ + 0.5F, p_77875_3_ + 0.5F, p_77875_4_ + 0.5F, "random.fizz", 0.5F, 2.6F + ((p_77875_1_.rand.nextFloat() - p_77875_1_.rand.nextFloat()) * 0.8F)); - for (int l = 0; l < 8; ++l) - { - p_77875_1_.spawnParticle("largesmoke", (double)p_77875_2_ + Math.random(), (double)p_77875_3_ + Math.random(), (double)p_77875_4_ + Math.random(), 0.0D, 0.0D, 0.0D); - } + for (int l = 0; l < 8; ++l) + { + p_77875_1_.spawnParticle("largesmoke", p_77875_2_ + Math.random(), p_77875_3_ + Math.random(), p_77875_4_ + Math.random(), 0.0D, 0.0D, 0.0D); + } } else { - if (!p_77875_1_.isRemote && flag && !material.isLiquid()) - { - p_77875_1_.func_147480_a(p_77875_2_, p_77875_3_, p_77875_4_, true); - } + if (!p_77875_1_.isRemote && flag && !material.isLiquid()) + { + p_77875_1_.func_147480_a(p_77875_2_, p_77875_3_, p_77875_4_, true); + } - p_77875_1_.setBlock(p_77875_2_, p_77875_3_, p_77875_4_, this.isFull, 0, 3); + p_77875_1_.setBlock(p_77875_2_, p_77875_3_, p_77875_4_, this.isFull, 0, 3); } return true; - } + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java index 3f51db7047..9c1fdd29f5 100644 --- a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java +++ b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java @@ -1,13 +1,17 @@ package gtPlusPlus.core.item.general; +import java.util.List; + +import cofh.energy.ItemEnergyContainer; +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; import ic2.api.item.*; - -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -18,11 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cofh.energy.ItemEnergyContainer; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, IElectricItemManager, IFuelHandler{ @@ -39,29 +38,29 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, //this.setMaxDamage(Integer.MAX_VALUE); //this.setDamage(UtilsItems.getSimpleStack(this), 0); this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setUnlocalizedName(unlocalizedName); + this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); this.setTextureName(CORE.MODID + ":" + "itemIngot"); this.thisStack = ItemUtils.getSimpleStack(this); - GameRegistry.registerItem(this, unlocalizedName); + GameRegistry.registerItem(this, this.unlocalizedName); } @Override - public void onUpdate(ItemStack itemStack, World worldObj, Entity player, int p_77663_4_, boolean p_77663_5_) { - getEnergyStored(itemStack); + public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_, final boolean p_77663_5_) { + this.getEnergyStored(itemStack); if (worldObj.isRemote) { return; } if (player instanceof EntityPlayer){ - for (ItemStack is : ((EntityPlayer) player).inventory.mainInventory) { + for (final ItemStack is : ((EntityPlayer) player).inventory.mainInventory) { if (is == itemStack) { continue; } if (is != null) { if (is.getItem() instanceof IElectricItem) { - IElectricItem electricItem = (IElectricItem) is.getItem(); - chargeEU = ElectricItem.manager.getCharge(is); + final IElectricItem electricItem = (IElectricItem) is.getItem(); + this.chargeEU = ElectricItem.manager.getCharge(is); } } @@ -73,145 +72,145 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, } @Override - public boolean canProvideEnergy(ItemStack itemStack) { + public boolean canProvideEnergy(final ItemStack itemStack) { return true; } @Override - public Item getChargedItem(ItemStack itemStack) { - ItemStack x = itemStack.copy(); + public Item getChargedItem(final ItemStack itemStack) { + final ItemStack x = itemStack.copy(); x.setItemDamage(maxValueEU); return x.getItem(); } @Override - public Item getEmptyItem(ItemStack itemStack) { - ItemStack x = itemStack.copy(); + public Item getEmptyItem(final ItemStack itemStack) { + final ItemStack x = itemStack.copy(); x.setItemDamage(0); return x.getItem(); } @Override - public double getMaxCharge(ItemStack itemStack) { + public double getMaxCharge(final ItemStack itemStack) { return maxValueEU; } @Override - public int getTier(ItemStack itemStack) { + public int getTier(final ItemStack itemStack) { return 3; } @Override - public double getTransferLimit(ItemStack itemStack) { + public double getTransferLimit(final ItemStack itemStack) { return 8196; } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { + public String getItemStackDisplayName(final ItemStack p_77653_1_) { return ("Universally Chargeable Battery"); } @Override - public double getDurabilityForDisplay(ItemStack stack) + public double getDurabilityForDisplay(final ItemStack stack) { //return 1.0D - getEnergyStored(stack) / this.capacity; - return MathUtils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack)); + return MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack)); } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) + public int getColorFromItemStack(final ItemStack par1ItemStack, final int par2) { - int i = 30; + final int i = 30; - float f13 = ((float)(Minecraft.getSystemTime() % 6000L) / 3000.0F * CORE.PI * 2.0F); + final float f13 = (((Minecraft.getSystemTime() % 6000L) / 3000.0F) * CORE.PI * 2.0F); - float t = 0.9F + 0.1F * MathHelper.cos(f13); + final float t = 0.9F + (0.1F * MathHelper.cos(f13)); - double v = 1.0D - getDurabilityForDisplay(par1ItemStack); + final double v = 1.0D - this.getDurabilityForDisplay(par1ItemStack); int r = i + (int)(v * (255 - i) * t); if (r > 255) { r = 255; } - int g = i + (int)(v * (64 - i) * t); + final int g = i + (int)(v * (64 - i) * t); - return r << 16 | g << 8 | i; + return (r << 16) | (g << 8) | i; } @Override - public boolean showDurabilityBar(ItemStack stack) + public boolean showDurabilityBar(final ItemStack stack) { return false; } @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - list.add(EnumChatFormatting.YELLOW+"IC2/EU Information"+EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+getTier(thisStack)+EnumChatFormatting.GRAY+"] Current Power: ["+EnumChatFormatting.YELLOW+(long) getCharge(stack)+EnumChatFormatting.GRAY+"/EU]"); - list.add(EnumChatFormatting.GRAY+"Transfer Limit: ["+EnumChatFormatting.YELLOW+getTransferLimit(thisStack)+ EnumChatFormatting.GRAY +"Eu/t]" +"Burn Time: ["+EnumChatFormatting.YELLOW+getBurnTime(stack)/20+EnumChatFormatting.GRAY+"s]"); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + list.add(EnumChatFormatting.YELLOW+"IC2/EU Information"+EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+this.getTier(this.thisStack)+EnumChatFormatting.GRAY+"] Current Power: ["+EnumChatFormatting.YELLOW+(long) this.getCharge(stack)+EnumChatFormatting.GRAY+"/EU]"); + list.add(EnumChatFormatting.GRAY+"Transfer Limit: ["+EnumChatFormatting.YELLOW+this.getTransferLimit(this.thisStack)+ EnumChatFormatting.GRAY +"Eu/t]" +"Burn Time: ["+EnumChatFormatting.YELLOW+(this.getBurnTime(stack)/20)+EnumChatFormatting.GRAY+"s]"); list.add(""); list.add(EnumChatFormatting.RED+"RF Information"); list.add(EnumChatFormatting.GRAY+"Extraction Rate: [" +EnumChatFormatting.RED+ this.maxExtract + EnumChatFormatting.GRAY + "Rf/t]" + " Insert Rate: [" +EnumChatFormatting.RED+ this.maxReceive+EnumChatFormatting.GRAY+"Rf/t]"); - list.add(EnumChatFormatting.GRAY+"Current Charge: ["+EnumChatFormatting.RED+getEnergyStored(stack) + EnumChatFormatting.GRAY + "Rf / " + getMaxEnergyStored(stack)+"Rf] "+EnumChatFormatting.RED+MathUtils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack))+EnumChatFormatting.GRAY+"%"); + list.add(EnumChatFormatting.GRAY+"Current Charge: ["+EnumChatFormatting.RED+this.getEnergyStored(stack) + EnumChatFormatting.GRAY + "Rf / " + this.getMaxEnergyStored(stack)+"Rf] "+EnumChatFormatting.RED+MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))+EnumChatFormatting.GRAY+"%"); super.addInformation(stack, aPlayer, list, bool); } @Override - public ItemStack getContainerItem(ItemStack itemStack) + public ItemStack getContainerItem(final ItemStack itemStack) { - ItemStack newItem = itemStack.copy(); + final ItemStack newItem = itemStack.copy(); newItem.stackSize = 1; - extractEnergy(newItem, 150000, false); + this.extractEnergy(newItem, 150000, false); return newItem; } @Override - public boolean hasContainerItem(ItemStack stack) + public boolean hasContainerItem(final ItemStack stack) { return true; } @Override - public int getBurnTime(ItemStack fuel) { + public int getBurnTime(final ItemStack fuel) { if ((fuel == null) || (fuel.getItem() != this)) { return 0; } - return extractEnergy(fuel, 150000, true) / 50 / 100; + return this.extractEnergy(fuel, 150000, true) / 50 / 100; } @Override - public double charge(ItemStack stack, double amount, int tier, - boolean ignoreTransferLimit, boolean simulate) { + public double charge(final ItemStack stack, final double amount, final int tier, + final boolean ignoreTransferLimit, final boolean simulate) { if (stack.stackTagCompound == null) { stack.stackTagCompound = new NBTTagCompound(); } int energy = stack.stackTagCompound.getInteger("Energy"); - int energyReceived = Math.min(this.capacity - energy, Math.min(this.maxReceive, maxReceive)); + final int energyReceived = Math.min(this.capacity - energy, Math.min(this.maxReceive, this.maxReceive)); if (!simulate) { energy += energyReceived; stack.stackTagCompound.setInteger("Energy", energy); ElectricItem.manager.discharge(stack, ElectricItem.manager.getCharge(stack), 3, true, true, false); ElectricItem.manager.charge(stack, energy/rfPerEU, 3, true, false); - + } return ElectricItem.manager.charge(stack, amount, tier, ignoreTransferLimit, simulate); } @Override - public double discharge(ItemStack stack, double amount, int tier, - boolean ignoreTransferLimit, boolean externally, boolean simulate) { + public double discharge(final ItemStack stack, final double amount, final int tier, + final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) { if ((stack.stackTagCompound == null) || (!stack.stackTagCompound.hasKey("Energy"))) { - double euCharge = getCharge(ItemUtils.getSimpleStack(this)); - if (euCharge != 0 && euCharge >= 1){ + final double euCharge = this.getCharge(ItemUtils.getSimpleStack(this)); + if ((euCharge != 0) && (euCharge >= 1)){ return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU)); } return 0; } int energy = stack.stackTagCompound.getInteger("Energy"); - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + final int energyExtracted = Math.min(energy, Math.min(this.maxExtract, this.maxExtract)); if (!simulate) { energy -= energyExtracted; @@ -219,70 +218,70 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, ElectricItem.manager.discharge(stack, ElectricItem.manager.getCharge(stack), 3, true, true, false); ElectricItem.manager.charge(stack, energy/rfPerEU, 3, true, false); } - + return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate); } @Override - public double getCharge(ItemStack stack) { + public double getCharge(final ItemStack stack) { return ElectricItem.manager.getCharge(stack); } @Override - public boolean canUse(ItemStack stack, double amount) { + public boolean canUse(final ItemStack stack, final double amount) { return ElectricItem.manager.canUse(stack, amount); } @Override - public boolean use(ItemStack stack, double amount, EntityLivingBase entity) { + public boolean use(final ItemStack stack, final double amount, final EntityLivingBase entity) { return ElectricItem.manager.use(stack, amount, entity); } @Override - public void chargeFromArmor(ItemStack stack, EntityLivingBase entity) { + public void chargeFromArmor(final ItemStack stack, final EntityLivingBase entity) { ElectricItem.manager.chargeFromArmor(stack, entity); } @Override - public String getToolTip(ItemStack stack) { + public String getToolTip(final ItemStack stack) { return ElectricItem.manager.getToolTip(stack); } @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) + public int receiveEnergy(final ItemStack container, final int maxReceive, final boolean simulate) { if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) { - double euCharge = getCharge(ItemUtils.getSimpleStack(this)); - if (euCharge != 0 && euCharge >= 1){ + final double euCharge = this.getCharge(ItemUtils.getSimpleStack(this)); + if ((euCharge != 0) && (euCharge >= 1)){ return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU)); } return 0; } int energy = container.stackTagCompound.getInteger("Energy"); - int energyReceived = Math.min(this.capacity - energy, Math.min(this.maxReceive, maxReceive)); + final int energyReceived = Math.min(this.capacity - energy, Math.min(this.maxReceive, maxReceive)); if (!simulate) { energy += energyReceived; container.stackTagCompound.setInteger("Energy", energy); ElectricItem.manager.discharge(container, ElectricItem.manager.getCharge(container), 3, true, true, false); ElectricItem.manager.charge(container, energy/rfPerEU, 3, true, false); - + } return energyReceived; } @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) + public int extractEnergy(final ItemStack container, final int maxExtract, final boolean simulate) { if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) { - double euCharge = getCharge(ItemUtils.getSimpleStack(this)); - if (euCharge != 0 && euCharge >= 1){ + final double euCharge = this.getCharge(ItemUtils.getSimpleStack(this)); + if ((euCharge != 0) && (euCharge >= 1)){ return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU)); } return 0; } int energy = container.stackTagCompound.getInteger("Energy"); - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + final int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); if (!simulate) { energy -= energyExtracted; @@ -294,16 +293,16 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, } @Override - public int getEnergyStored(ItemStack container) + public int getEnergyStored(final ItemStack container) { if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) { - double euCharge = getCharge(ItemUtils.getSimpleStack(this)); - if (euCharge != 0 && euCharge >= 1){ + final double euCharge = this.getCharge(ItemUtils.getSimpleStack(this)); + if ((euCharge != 0) && (euCharge >= 1)){ return (int) (MathUtils.decimalRoundingToWholes(euCharge*rfPerEU)); } return 0; } - int energy = container.stackTagCompound.getInteger("Energy"); + final int energy = container.stackTagCompound.getInteger("Energy"); ElectricItem.manager.discharge(container, ElectricItem.manager.getCharge(container), 3, true, true, false); ElectricItem.manager.charge(container, energy/rfPerEU, 3, true, false); return energy; diff --git a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java index 2a94456c2a..5678058818 100644 --- a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java +++ b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java @@ -1,10 +1,9 @@ package gtPlusPlus.core.item.general.fuelrods; -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; @@ -19,8 +18,8 @@ public class FuelRod_Base extends Item{ public int maximumFuel = 0; public String fuelType = ""; public float heat = 0; - public float maxHeat = getMaxHeat(); - public FuelRod_Base(String unlocalizedName, String type, int fuelLeft, int maxFuel) { + public float maxHeat = this.getMaxHeat(); + public FuelRod_Base(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); this.setMaxStackSize(1); @@ -30,88 +29,88 @@ public class FuelRod_Base extends Item{ this.fuelType = type; this.setCreativeTab(AddToCreativeTab.tabMachines); } - + private float getMaxHeat(){ float tempvar; - if (fuelType == "Thorium"){ + if (this.fuelType == "Thorium"){ tempvar = 2500; } - - else if (fuelType == "Uranium"){ + + else if (this.fuelType == "Uranium"){ tempvar = 5000; } - - else if (fuelType == "Plutonium"){ + + else if (this.fuelType == "Plutonium"){ tempvar = 10000; } - + else { tempvar = 5000; } return tempvar; - + } - - private void updateVars(ItemStack stack){ + + private void updateVars(final ItemStack stack){ if (stack.stackTagCompound != null) { - heat = stack.stackTagCompound.getFloat("heat"); - fuelRemaining = stack.stackTagCompound.getInteger("fuelRemaining"); - } + this.heat = stack.stackTagCompound.getFloat("heat"); + this.fuelRemaining = stack.stackTagCompound.getInteger("fuelRemaining"); + } } - + @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) { - Float NBT_Heat = heat; - Float NBT_MaxHeat = maxHeat; - int NBT_Fuel = fuelRemaining; - String NBT_Type= fuelType; + Float NBT_Heat = this.heat; + Float NBT_MaxHeat = this.maxHeat; + int NBT_Fuel = this.fuelRemaining; + String NBT_Type= this.fuelType; if (stack.stackTagCompound != null) { NBT_Heat = stack.stackTagCompound.getFloat("heat"); NBT_MaxHeat = stack.stackTagCompound.getFloat("maxHeat"); NBT_Fuel = stack.stackTagCompound.getInteger("fuelRemaining"); NBT_Type = stack.stackTagCompound.getString("fuelType"); - } + } - String tempHeat = String.valueOf(NBT_Heat); - String tempMaxHeat = String.valueOf(NBT_MaxHeat); - String tempFuel = String.valueOf(NBT_Fuel); - String formattedType = EnumChatFormatting.DARK_RED+NBT_Type+EnumChatFormatting.GRAY; + final String tempHeat = String.valueOf(NBT_Heat); + final String tempMaxHeat = String.valueOf(NBT_MaxHeat); + final String tempFuel = String.valueOf(NBT_Fuel); + final String formattedType = EnumChatFormatting.DARK_RED+NBT_Type+EnumChatFormatting.GRAY; String formattedHeat = EnumChatFormatting.RED+tempHeat+EnumChatFormatting.GRAY; - String formattedMaxHeat = EnumChatFormatting.RED+tempMaxHeat+EnumChatFormatting.GRAY; + final String formattedMaxHeat = EnumChatFormatting.RED+tempMaxHeat+EnumChatFormatting.GRAY; String formattedFuelLeft = tempFuel+EnumChatFormatting.GRAY; - int tempMax = maximumFuel; - float tempCurrentHeat = heat; - int tempFuelLeft = fuelRemaining; - + final int tempMax = this.maximumFuel; + final float tempCurrentHeat = this.heat; + final int tempFuelLeft = this.fuelRemaining; + //Fuel Usage Formatting - if (tempFuelLeft <= maximumFuel/3){ + if (tempFuelLeft <= (this.maximumFuel/3)){ formattedFuelLeft = EnumChatFormatting.RED+tempFuel+EnumChatFormatting.GRAY; } - else if (tempFuelLeft >= maximumFuel/3 && tempFuelLeft <= (maximumFuel/3)*2){ + else if ((tempFuelLeft >= (this.maximumFuel/3)) && (tempFuelLeft <= ((this.maximumFuel/3)*2))){ formattedFuelLeft = EnumChatFormatting.YELLOW+tempFuel+EnumChatFormatting.GRAY; } - else if (tempFuelLeft >= (maximumFuel/3)*2 && tempFuelLeft <= maximumFuel){ + else if ((tempFuelLeft >= ((this.maximumFuel/3)*2)) && (tempFuelLeft <= this.maximumFuel)){ formattedFuelLeft = EnumChatFormatting.GREEN+tempFuel+EnumChatFormatting.GRAY; } else { formattedFuelLeft = EnumChatFormatting.GRAY+tempFuel+EnumChatFormatting.GRAY; } - + //Heat Formatting - if (tempCurrentHeat <= 200 && tempCurrentHeat >= 0){ + if ((tempCurrentHeat <= 200) && (tempCurrentHeat >= 0)){ formattedHeat = EnumChatFormatting.GRAY+tempHeat+EnumChatFormatting.GRAY; } - else if (tempCurrentHeat <= maxHeat/3 && tempCurrentHeat > 200){ + else if ((tempCurrentHeat <= (this.maxHeat/3)) && (tempCurrentHeat > 200)){ formattedHeat = EnumChatFormatting.YELLOW+tempHeat+EnumChatFormatting.GRAY; } - else if (tempCurrentHeat >= maxHeat/3 && tempMax < (maxHeat/3)*2 && tempCurrentHeat != 0){ + else if ((tempCurrentHeat >= (this.maxHeat/3)) && (tempMax < ((this.maxHeat/3)*2)) && (tempCurrentHeat != 0)){ formattedHeat = EnumChatFormatting.GOLD+tempHeat+EnumChatFormatting.GRAY; } - else if (tempCurrentHeat >= ((maxHeat/3)*2) && tempMax <= maxHeat && tempCurrentHeat != 0){ + else if ((tempCurrentHeat >= ((this.maxHeat/3)*2)) && (tempMax <= this.maxHeat) && (tempCurrentHeat != 0)){ formattedHeat = EnumChatFormatting.RED+tempHeat+EnumChatFormatting.GRAY; } else { @@ -123,64 +122,64 @@ public class FuelRod_Base extends Item{ super.addInformation(stack, aPlayer, list, bool); } - public String getType(ItemStack stack){ + public String getType(final ItemStack stack){ if (stack.stackTagCompound != null){ return stack.stackTagCompound.getString("fuelType"); - } - return fuelType; + } + return this.fuelType; } - public int getFuelRemaining(ItemStack stack){ + public int getFuelRemaining(final ItemStack stack){ if (stack.stackTagCompound != null){ return stack.stackTagCompound.getInteger("fuelRemaining"); - } - return 0; + } + return 0; } public int getMaxFuel(){ - return maximumFuel; + return this.maximumFuel; } - public int getFuel(ItemStack stack){ + public int getFuel(final ItemStack stack){ if (stack != null){ - int i = stack.getItemDamage(); - int r = maximumFuel - i; + final int i = stack.getItemDamage(); + final int r = this.maximumFuel - i; return r; } return 0; } - public boolean setFuelRemainingExplicitly(int i){ - int tempFuel = fuelRemaining; - fuelRemaining = i; + public boolean setFuelRemainingExplicitly(final int i){ + final int tempFuel = this.fuelRemaining; + this.fuelRemaining = i; if (i != tempFuel){ return true; - } + } return false; } - public boolean addFuel(int i){ - int tempFuel = fuelRemaining; - fuelRemaining = tempFuel+i; - if (fuelRemaining != tempFuel){ + public boolean addFuel(final int i){ + final int tempFuel = this.fuelRemaining; + this.fuelRemaining = tempFuel+i; + if (this.fuelRemaining != tempFuel){ return true; - } + } return false; } - public float getHeat(ItemStack value){ + public float getHeat(final ItemStack value){ if (value.stackTagCompound != null){ - return value.stackTagCompound.getFloat("heat"); + return value.stackTagCompound.getFloat("heat"); } return 0f; } - public boolean addHeat(float i){ - float tempFuel = heat; - heat = tempFuel+i; - if (heat != tempFuel){ + public boolean addHeat(final float i){ + final float tempFuel = this.heat; + this.heat = tempFuel+i; + if (this.heat != tempFuel){ return true; - } + } return false; } @@ -188,36 +187,36 @@ public class FuelRod_Base extends Item{ //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) { itemStack.stackTagCompound = new NBTTagCompound(); - itemStack.stackTagCompound.setInteger("fuelRemaining", getFuelRemaining(itemStack)); - itemStack.stackTagCompound.setInteger("maximumFuel", maximumFuel); - itemStack.stackTagCompound.setFloat("heat", getHeat(itemStack)); - itemStack.stackTagCompound.setFloat("maxHeat", getMaxHeat()); - itemStack.stackTagCompound.setString("fuelType", getType(itemStack)); - updateVars(itemStack); + itemStack.stackTagCompound.setInteger("fuelRemaining", this.getFuelRemaining(itemStack)); + itemStack.stackTagCompound.setInteger("maximumFuel", this.maximumFuel); + itemStack.stackTagCompound.setFloat("heat", this.getHeat(itemStack)); + itemStack.stackTagCompound.setFloat("maxHeat", this.getMaxHeat()); + itemStack.stackTagCompound.setString("fuelType", this.getType(itemStack)); + this.updateVars(itemStack); } @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) { itemStack.stackTagCompound = new NBTTagCompound(); - itemStack.stackTagCompound.setInteger("fuelRemaining", getFuelRemaining(itemStack)); - itemStack.stackTagCompound.setInteger("maximumFuel", maximumFuel); - itemStack.stackTagCompound.setFloat("heat", getHeat(itemStack)); - itemStack.stackTagCompound.setFloat("maxHeat", getMaxHeat()); - itemStack.stackTagCompound.setString("fuelType", getType(itemStack)); - updateVars(itemStack); + itemStack.stackTagCompound.setInteger("fuelRemaining", this.getFuelRemaining(itemStack)); + itemStack.stackTagCompound.setInteger("maximumFuel", this.maximumFuel); + itemStack.stackTagCompound.setFloat("heat", this.getHeat(itemStack)); + itemStack.stackTagCompound.setFloat("maxHeat", this.getMaxHeat()); + itemStack.stackTagCompound.setString("fuelType", this.getType(itemStack)); + this.updateVars(itemStack); } - - + + } diff --git a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java index 9b852cb1ea..dbf1209b50 100644 --- a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java +++ b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.item.general.fuelrods; public class FuelRod_Thorium extends FuelRod_Base{ - public FuelRod_Thorium(String unlocalizedName, String type, int fuelLeft, int maxFuel) { + public FuelRod_Thorium(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) { super(unlocalizedName, type, fuelLeft, maxFuel); this.setMaxDamage(maxFuel); this.maximumFuel = maxFuel; diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java index 7fbfca0ac8..bc9fc1167e 100644 --- a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java +++ b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java @@ -14,30 +14,30 @@ public class ItemsFoods { public static void load(){ run(); } - + private static void run(){ - - //Raisin Bread + + //Raisin Bread ModItems.itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", "Raisin Bread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible(); GT_OreDictUnificator.registerOre("foodRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1)); - //Hot Raisin Bread + //Hot Raisin Bread ModItems.itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, ModItems.itemIngotRaisinBread); GT_OreDictUnificator.registerOre("foodHotRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1)); - //Raisin Bread + //Raisin Bread ModItems.itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false).setAlwaysEdible(); GT_OreDictUnificator.registerOre("foodRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemFoodRaisinToast", 1)); - //Hot Raisin Bread + //Hot Raisin Bread ModItems.itemHotFoodRaisinToast = new BaseItemHotFood("itemHotFoodRaisinToast", 1, 0.5f, "Raisin Toast", 20, ModItems.itemFoodRaisinToast); GT_OreDictUnificator.registerOre("foodHotRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodRaisinToast", 1)); - //Raisin Bread + //Raisin Bread ModItems.itemFoodCurriedSausages = new BaseItemFood("itemFoodCurriedSausages", "Curried Sausages", 5, 2f, false); GT_OreDictUnificator.registerOre("foodCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemFoodCurriedSausages", 1)); - //Hot Raisin Bread + //Hot Raisin Bread ModItems.itemHotFoodCurriedSausages = new BaseItemHotFood("itemHotFoodCurriedSausages", 1, 0.5f, "Curried Sausages", 240, ModItems.itemFoodCurriedSausages); GT_OreDictUnificator.registerOre("foodHotCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodCurriedSausages", 1)); - + } - + } diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java index 6a55356f1e..2c6479fbd4 100644 --- a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java +++ b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java @@ -14,60 +14,60 @@ public class ItemsMultiTools { public static void load(){ run(); } - + private static void run(){ - + //Load Multitools - boolean gtStyleTools = LoadedMods.Gregtech; - if (CORE.configSwitches.enableMultiSizeTools){ - - //GT Materials - Materials[] rm = Materials.values(); - for (Materials m : rm){ - toolFactoryGT(m, gtStyleTools); - } - - //GT++ Materials - toolFactory(ALLOY.HASTELLOY_C276); - toolFactory(ALLOY.HASTELLOY_N); - toolFactory(ALLOY.HASTELLOY_W); - toolFactory(ALLOY.HASTELLOY_X); - toolFactory(ALLOY.INCOLOY_020); - toolFactory(ALLOY.INCOLOY_DS); - toolFactory(ALLOY.INCOLOY_MA956); - toolFactory(ALLOY.INCONEL_625); - toolFactory(ALLOY.INCONEL_690); - toolFactory(ALLOY.INCONEL_792); - toolFactory(ALLOY.LEAGRISIUM); - toolFactory(ALLOY.TANTALLOY_60); - toolFactory(ALLOY.TANTALLOY_61); - toolFactory(ALLOY.STABALLOY); - toolFactory(ALLOY.QUANTUM); - //toolFactory(ALLOY.BEDROCKIUM); - toolFactory(ALLOY.POTIN); - toolFactory(ALLOY.TUMBAGA); - toolFactory(ALLOY.TALONITE); - toolFactory(ALLOY.STELLITE); - toolFactory(ALLOY.TUNGSTEN_CARBIDE); - toolFactory(ALLOY.TANTALUM_CARBIDE); - - - } - + final boolean gtStyleTools = LoadedMods.Gregtech; + if (CORE.configSwitches.enableMultiSizeTools){ + + //GT Materials + final Materials[] rm = Materials.values(); + for (final Materials m : rm){ + toolFactoryGT(m, gtStyleTools); + } + + //GT++ Materials + toolFactory(ALLOY.HASTELLOY_C276); + toolFactory(ALLOY.HASTELLOY_N); + toolFactory(ALLOY.HASTELLOY_W); + toolFactory(ALLOY.HASTELLOY_X); + toolFactory(ALLOY.INCOLOY_020); + toolFactory(ALLOY.INCOLOY_DS); + toolFactory(ALLOY.INCOLOY_MA956); + toolFactory(ALLOY.INCONEL_625); + toolFactory(ALLOY.INCONEL_690); + toolFactory(ALLOY.INCONEL_792); + toolFactory(ALLOY.LEAGRISIUM); + toolFactory(ALLOY.TANTALLOY_60); + toolFactory(ALLOY.TANTALLOY_61); + toolFactory(ALLOY.STABALLOY); + toolFactory(ALLOY.QUANTUM); + //toolFactory(ALLOY.BEDROCKIUM); + toolFactory(ALLOY.POTIN); + toolFactory(ALLOY.TUMBAGA); + toolFactory(ALLOY.TALONITE); + toolFactory(ALLOY.STELLITE); + toolFactory(ALLOY.TUNGSTEN_CARBIDE); + toolFactory(ALLOY.TANTALUM_CARBIDE); + + + } + } - - - private static boolean toolFactoryGT(Materials m, boolean b){ + + + private static boolean toolFactoryGT(final Materials m, final boolean b){ ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(b, m); ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(b, m); return true; } - - private static boolean toolFactory(Material m){ + + private static boolean toolFactory(final Material m){ Utils.LOG_WARNING("Generating Multi-Tools for "+m.getLocalizedName()); ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(m); ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(m); return true; } - + } diff --git a/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java b/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java index 0f89f2a0ff..40fc6539e6 100644 --- a/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java +++ b/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java @@ -4,7 +4,7 @@ public class MaterialHandler { @SuppressWarnings("unused") private String Staballoy; - - - + + + } diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java index 108ac4b83d..b78f81aa98 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java +++ b/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java @@ -1,16 +1,15 @@ package gtPlusPlus.core.item.tool.misc; -import gtPlusPlus.core.item.base.BaseItemWithDamageValue; -import gtPlusPlus.core.lib.CORE; - import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.item.base.BaseItemWithDamageValue; +import gtPlusPlus.core.lib.CORE; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SandstoneHammer extends BaseItemWithDamageValue{ @@ -18,14 +17,14 @@ public class SandstoneHammer extends BaseItemWithDamageValue{ * @see net.minecraft.item.Item#getColorFromItemStack(net.minecraft.item.ItemStack, int) */ @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { //Figure Out Damage return super.getColorFromItemStack(stack, HEX_OxFFFFFF); } - public SandstoneHammer(String unlocalizedName) { + public SandstoneHammer(final String unlocalizedName) { super(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); this.setMaxStackSize(1); @@ -34,13 +33,13 @@ public class SandstoneHammer extends BaseItemWithDamageValue{ @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.GRAY+"Allows you to craft sand from cobble, or sandstone from sand."); super.addInformation(stack, aPlayer, list, bool); - } + } @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) + public boolean doesContainerItemLeaveCraftingGrid(final ItemStack itemStack) { return false; } @@ -52,12 +51,12 @@ public class SandstoneHammer extends BaseItemWithDamageValue{ } @Override - public boolean hasContainerItem(ItemStack itemStack) + public boolean hasContainerItem(final ItemStack itemStack) { return true; } @Override - public ItemStack getContainerItem(ItemStack itemStack) + public ItemStack getContainerItem(final ItemStack itemStack) { itemStack.setItemDamage(itemStack.getItemDamage() + 8); @@ -66,12 +65,12 @@ public class SandstoneHammer extends BaseItemWithDamageValue{ @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.uncommon; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return false; } diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 55584faf2d..6499dc696b 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -1,5 +1,10 @@ package gtPlusPlus.core.item.tool.staballoy; +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.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -14,19 +19,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.world.World; -import java.util.List; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class MultiPickaxeBase extends StaballoyPickaxe{ /* (non-Javadoc) * @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack) */ @Override - public double getDurabilityForDisplay(ItemStack stack) { + public double getDurabilityForDisplay(final ItemStack stack) { if (super.getDurabilityForDisplay(stack) > 0){ return super.getDurabilityForDisplay(stack);} return 0; @@ -38,7 +37,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ public boolean isValid = true; private final Pair enchantment; - public MultiPickaxeBase(String unlocalizedName, ToolMaterial material, int materialDurability, int colour, Object enchant) { + public MultiPickaxeBase(final String unlocalizedName, final ToolMaterial material, final int materialDurability, final int colour, final Object enchant) { super(Utils.sanitizeString(unlocalizedName), material); this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName)); //this.setTextureName(CORE.MODID + ":" + "itemPickaxe"); @@ -50,13 +49,13 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ this.materialName = material.name(); this.displayName = unlocalizedName; this.setCreativeTab(AddToCreativeTab.tabTools); - miningLevel = material.getHarvestLevel(); - - - + this.miningLevel = material.getHarvestLevel(); + + + if (enchant != null){ if (enchant instanceof Pair){ - this.enchantment = (Pair) enchant; + this.enchantment = (Pair) enchant; } else { this.enchantment = null; @@ -65,38 +64,38 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ else { this.enchantment = null; } - - try {isValid = addRecipe();} catch (Throwable e){} - if (colour != 0 && isValid && materialDurability > 10000){ + + try {this.isValid = this.addRecipe();} catch (final Throwable e){} + if ((colour != 0) && this.isValid && (materialDurability > 10000)){ if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null){ - GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); - } + GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); + } } } /* - * - * - * - * Methods - * - * - * + * + * + * + * Methods + * + * + * */ private boolean addRecipe(){ - - String cleanName = Utils.sanitizeString(materialName); - - String plateDense = "plateDense"+cleanName; - String plateDouble = "plateDouble"+cleanName; - String rodLong = "stickLong"+cleanName; - String toolHammer = "craftingToolHardHammer"; - String toolWrench = "craftingToolWrench"; - String toolFile = "craftingToolFile"; - String toolScrewDriver = "craftingToolScrewdriver"; - + + final String cleanName = Utils.sanitizeString(this.materialName); + + final String plateDense = "plateDense"+cleanName; + final String plateDouble = "plateDouble"+cleanName; + final String rodLong = "stickLong"+cleanName; + final String toolHammer = "craftingToolHardHammer"; + final String toolWrench = "craftingToolWrench"; + final String toolFile = "craftingToolFile"; + final String toolScrewDriver = "craftingToolScrewdriver"; + if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){ Utils.LOG_WARNING("stickLong of "+cleanName+" does not exist."); return false; @@ -127,12 +126,12 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ } public final String getMaterialName() { - return materialName; + return this.materialName; } @Override - public String getItemStackDisplayName(ItemStack iStack) { - return displayName; + public String getItemStackDisplayName(final ItemStack iStack) { + return this.displayName; /*String name; if (getUnlocalizedName().toLowerCase().contains("wood")){ name = "Wooden"; @@ -155,22 +154,22 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ } @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; } @SuppressWarnings("static-method") - private float calculateDurabilityLoss(World world, int X, int Y, int Z){ + private float calculateDurabilityLoss(final World world, final int X, final int Y, final int Z){ float bDurabilityLoss = 0; Boolean correctTool = false; float bHardness = 0; - if (!world.isRemote){ + if (!world.isRemote){ try { - Block removalist = world.getBlock(X, Y, Z); + final Block removalist = world.getBlock(X, Y, Z); //Utils.LOG_WARNING(removalist.toString()); bHardness = removalist.getBlockHardness(world, X, Y, Z)*100; @@ -179,14 +178,14 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ bDurabilityLoss = 100; //Utils.LOG_WARNING("Durability Loss: "+bDurabilityLoss); - correctTool = canPickaxeBlock(removalist, world, new int[]{X,Y,Z}); + correctTool = this.canPickaxeBlock(removalist, world, new int[]{X,Y,Z}); Utils.LOG_WARNING(""+correctTool); if (!correctTool){ return 0; } - } catch (NullPointerException e){ + } catch (final NullPointerException e){ } } @@ -204,7 +203,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ String removalTool = ""; removalTool = block.getHarvestTool(1); - if (removalTool.equals("pickaxe") || UtilsMining.getBlockType(block, world, new int[]{X,Y,Z}, miningLevel)){ + if (removalTool.equals("pickaxe") || UtilsMining.getBlockType(block, world, new int[]{X,Y,Z}, miningLevel)){ if (canPickaxeBlock(block, world, new int[]{X,Y,Z})){ if((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1) && (block.getBlockHardness(world, X, Y, Z) <= 100) && (block != Blocks.water) && (block != Blocks.lava)){ @@ -229,70 +228,72 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ } }*/ - public void damageItem(ItemStack item, int damage, EntityPlayer localPlayer){ + @Override + public void damageItem(final ItemStack item, final int damage, final EntityPlayer localPlayer){ item.damageItem(damage, localPlayer); } - public void setItemDamage(ItemStack item, int damage){ + @Override + public void setItemDamage(final ItemStack item, final int damage){ item.setItemDamage(damage-1); } @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.uncommon; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return false; } @Override - public void onCreated(ItemStack mThisItem, World mWorld, EntityPlayer mPlayer) { + public void onCreated(final ItemStack mThisItem, final World mWorld, final EntityPlayer mPlayer) { Enchantment enchant = null; int enchantmentLevel = 0; - Pair Y = this.enchantment; + final Pair Y = this.enchantment; if (Y != null){ if (Y.getKey() != null){ - enchant = (Enchantment) ((Pair) this.enchantment).getKey(); + enchant = (Enchantment) ((Pair) this.enchantment).getKey(); } if (Y.getValue() != null){ - enchantmentLevel = (byte) ((Pair) this.enchantment).getValue(); + enchantmentLevel = (byte) ((Pair) this.enchantment).getValue(); } } - ItemStack itemToEnchant = mThisItem; - if (enchant != null && enchantmentLevel != 0 && enchantmentLevel >= 1){ + final ItemStack itemToEnchant = mThisItem; + if ((enchant != null) && (enchantmentLevel != 0) && (enchantmentLevel >= 1)){ itemToEnchant.addEnchantment(enchant, enchantmentLevel); } super.onCreated(itemToEnchant, mWorld, mPlayer); } @Override - public void getSubItems(Item mItem, CreativeTabs mCreativeTab, List mList) { + public void getSubItems(final Item mItem, final CreativeTabs mCreativeTab, final List mList) { Enchantment enchant = null; int enchantmentLevel = 0; - Pair Y = this.enchantment; + final Pair Y = this.enchantment; if (Y != null){ if (Y.getKey() != null){ - enchant = (Enchantment) ((Pair) this.enchantment).getKey(); + enchant = (Enchantment) ((Pair) this.enchantment).getKey(); } if (Y.getValue() != null){ - enchantmentLevel = (byte) ((Pair) this.enchantment).getValue(); + enchantmentLevel = (byte) ((Pair) this.enchantment).getValue(); } } - - Item thisItem = mItem; - ItemStack itemToEnchant = ItemUtils.getSimpleStack(thisItem); - if (enchant != null && enchantmentLevel != 0 && enchantmentLevel >= 1){ + + final Item thisItem = mItem; + final ItemStack itemToEnchant = ItemUtils.getSimpleStack(thisItem); + if ((enchant != null) && (enchantmentLevel != 0) && (enchantmentLevel >= 1)){ itemToEnchant.addEnchantment(enchant, enchantmentLevel); mList.add(itemToEnchant); } else { - mList.add(new ItemStack(thisItem, 1, 0)); + mList.add(new ItemStack(thisItem, 1, 0)); } - + } } diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index 627108f509..175c212a6c 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.tool.staballoy; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -8,9 +11,6 @@ import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class MultiSpadeBase extends StaballoySpade{ @@ -18,7 +18,7 @@ public class MultiSpadeBase extends StaballoySpade{ * @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack) */ @Override - public double getDurabilityForDisplay(ItemStack stack) { + public double getDurabilityForDisplay(final ItemStack stack) { if (super.getDurabilityForDisplay(stack) > 0){ return super.getDurabilityForDisplay(stack);} return 0; @@ -29,7 +29,7 @@ public class MultiSpadeBase extends StaballoySpade{ protected final String displayName; public boolean isValid = true; - public MultiSpadeBase(String unlocalizedName, ToolMaterial material, int materialDurability, int colour) { + public MultiSpadeBase(final String unlocalizedName, final ToolMaterial material, final int materialDurability, final int colour) { super(Utils.sanitizeString(unlocalizedName), material); this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName)); //this.setTextureName(CORE.MODID + ":" + "itemShovel"); @@ -41,23 +41,23 @@ public class MultiSpadeBase extends StaballoySpade{ this.materialName = material.name(); this.displayName = unlocalizedName; this.setCreativeTab(AddToCreativeTab.tabTools); - try {isValid = addRecipe();} catch (Throwable e){} - if (colour != 0 && isValid){ + try {this.isValid = this.addRecipe();} catch (final Throwable e){} + if ((colour != 0) && this.isValid){ if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null){ - GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); + GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); } } } private boolean addRecipe(){ - String cleanName = Utils.sanitizeString(materialName); - String plateDense = "plateDense"+cleanName; - String plateDouble = "plateDouble"+cleanName; - String rodLong = "stickLong"+cleanName; - String toolHammer = "craftingToolHardHammer"; - String toolWrench = "craftingToolWrench"; - String toolFile = "craftingToolFile"; - String toolScrewDriver = "craftingToolScrewdriver"; + final String cleanName = Utils.sanitizeString(this.materialName); + final String plateDense = "plateDense"+cleanName; + final String plateDouble = "plateDouble"+cleanName; + final String rodLong = "stickLong"+cleanName; + final String toolHammer = "craftingToolHardHammer"; + final String toolWrench = "craftingToolWrench"; + final String toolFile = "craftingToolFile"; + final String toolScrewDriver = "craftingToolScrewdriver"; if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){ return false; @@ -73,7 +73,7 @@ public class MultiSpadeBase extends StaballoySpade{ return true; } return false; - } + } RecipeUtils.recipeBuilder( toolFile, plateDense, toolHammer, @@ -85,12 +85,12 @@ public class MultiSpadeBase extends StaballoySpade{ } public final String getMaterialName() { - return materialName; + return this.materialName; } @Override - public String getItemStackDisplayName(ItemStack iStack) { - return displayName; + public String getItemStackDisplayName(final ItemStack iStack) { + return this.displayName; /*String name; if (getUnlocalizedName().toLowerCase().contains("wood")){ name = "Wooden"; @@ -101,21 +101,21 @@ public class MultiSpadeBase extends StaballoySpade{ } @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; + } @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.uncommon; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return false; } diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java index 301671fc24..7ec396a8b1 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java @@ -1,9 +1,10 @@ package gtPlusPlus.core.item.tool.staballoy; -import gtPlusPlus.core.lib.CORE; - import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.lib.CORE; import net.minecraft.block.*; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; @@ -12,179 +13,249 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class StaballoyAxe extends ItemAxe{ public String mat; - public StaballoyAxe(String unlocalizedName, ToolMaterial material) { + public StaballoyAxe(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); } - + // EXPLODE TREE byte[] tre= new byte[32000]; byte unchecked=0; byte needcheck=1; byte ignore =2; byte harvest =3; - - private boolean setcheck(int x, int y, int z) { - if(x<0 || x>19 || z<0 || z>19 || y<0 || y>79) return false; - int o=x+z*20+y*400; - if (tre[o]==unchecked) tre[o]=needcheck; + + private boolean setcheck(final int x, final int y, final int z) { + if((x<0) || (x>19) || (z<0) || (z>19) || (y<0) || (y>79)) { + return false; + } + final int o=x+(z*20)+(y*400); + if (this.tre[o]==this.unchecked) { + this.tre[o]=this.needcheck; + } return true; } - + @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+"Fells entire trees in a single swipe!.."); list.add(EnumChatFormatting.GRAY+"Ask Alkalus for new trees to be supported."); super.addInformation(stack, aPlayer, list, bool); } - - public static boolean canIgnore(Block bit){ - if (bit instanceof BlockAir)return true; - if (bit instanceof BlockGrass)return true; - if (bit instanceof BlockSand)return true; - if (bit instanceof BlockDirt)return true; - if (bit instanceof BlockCocoa)return true; - if (bit instanceof BlockVine)return true; - if (bit instanceof BlockMushroom)return true; - if (bit instanceof BlockSnow)return true; - if (bit instanceof BlockSnowBlock)return true; - if (bit instanceof BlockFlower)return true; - if (bit instanceof BlockTallGrass)return true; - if (bit instanceof BlockDoublePlant)return true; - + + public static boolean canIgnore(final Block bit){ + if (bit instanceof BlockAir) { + return true; + } + if (bit instanceof BlockGrass) { + return true; + } + if (bit instanceof BlockSand) { + return true; + } + if (bit instanceof BlockDirt) { + return true; + } + if (bit instanceof BlockCocoa) { + return true; + } + if (bit instanceof BlockVine) { + return true; + } + if (bit instanceof BlockMushroom) { + return true; + } + if (bit instanceof BlockSnow) { + return true; + } + if (bit instanceof BlockSnowBlock) { + return true; + } + if (bit instanceof BlockFlower) { + return true; + } + if (bit instanceof BlockTallGrass) { + return true; + } + if (bit instanceof BlockDoublePlant) { + return true; + } + //LoonTools.log("Found uncuttable "+bit.getClass().getSimpleName()); return false; } - - private int check(World par1World, int x, int y, int z, int xo, int yo,int zo) { + + private int check(final World par1World, final int x, final int y, final int z, final int xo, final int yo,final int zo) { int f=0; - int o=x+z*20+y*400; - if (tre[o]==needcheck){ - tre[o]=ignore; - Block bit = par1World.getBlock(x+xo, y+yo, z+zo); + final int o=x+(z*20)+(y*400); + if (this.tre[o]==this.needcheck){ + this.tre[o]=this.ignore; + final Block bit = par1World.getBlock(x+xo, y+yo, z+zo); if ((bit instanceof BlockLog)||(bit instanceof BlockLeavesBase)||(bit instanceof BlockHugeMushroom) || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){ f=1; - tre[o]=harvest; + this.tre[o]=this.harvest; //if (bit instanceof BlockLog){ // LoonTools.log("^ Found log @ "+x+xo+" "+y+yo+" "+z+zo+" "); //} - for(int xb=-1;xb<2;xb++) - for(int yb=-1;yb<2;yb++) - for(int zb=-1;zb<2;zb++) - if (!setcheck(x+xb,y+yb,z+zb))return 3; + for(int xb=-1;xb<2;xb++) { + for(int yb=-1;yb<2;yb++) { + for(int zb=-1;zb<2;zb++) { + if (!this.setcheck(x+xb,y+yb,z+zb)) { + return 3; + } + } + } + } }else{ - if (!canIgnore(bit)) return 2; + if (!canIgnore(bit)) { + return 2; + } } } return f; } - - public int checkTree(World par1World,int xo,int yo,int zo){ + + public int checkTree(final World par1World,final int xo,final int yo,final int zo){ boolean f; for (f=true;f==true;){ f=false; - for (int y=0;y<80;y++) - for(int z=0;z<20;z++) + for (int y=0;y<80;y++) { + for(int z=0;z<20;z++) { for(int x=0;x<20;x++){ - int r=check(par1World,x,y,z,xo,yo,zo); - if (r==3) return 3; - if (r==2) return 2; - if (r==1) f=true; + final int r=this.check(par1World,x,y,z,xo,yo,zo); + if (r==3) { + return 3; + } + if (r==2) { + return 2; + } + if (r==1) { + f=true; + } } - - for (int y=79;y>=0;y--) - for(int z=19;z>=0;z--) + } + } + + for (int y=79;y>=0;y--) { + for(int z=19;z>=0;z--) { for(int x=19;x>=0;x--){ - int r=check(par1World,x,y,z,xo,yo,zo); - if (r==2) return 3; + final int r=this.check(par1World,x,y,z,xo,yo,zo); + if (r==2) { + return 3; + } //if (r==2) return 2; - if (r==1) f=true; + if (r==1) { + f=true; + } } + } + } } return 1; } - - private int check2(World par1World, int x, int y, int z, int xo, int yo,int zo) { + + private int check2(final World par1World, final int x, final int y, final int z, final int xo, final int yo,final int zo) { int f=0; - int o=x+z*20+y*400; - if (tre[o]==needcheck){ - tre[o]=ignore; - Block bit = par1World.getBlock(x+xo, y+yo, z+zo); + final int o=x+(z*20)+(y*400); + if (this.tre[o]==this.needcheck){ + this.tre[o]=this.ignore; + final Block bit = par1World.getBlock(x+xo, y+yo, z+zo); if (bit instanceof BlockLog){ f=1; - tre[o]=harvest; + this.tre[o]=this.harvest; //if (bit instanceof BlockLog){ // LoonTools.log("^ Found log @ "+x+xo+" "+y+yo+" "+z+zo+" "); //} - for(int xb=-1;xb<2;xb++) - for(int yb=-1;yb<2;yb++) - for(int zb=-1;zb<2;zb++) - if (!setcheck(x+xb,y+yb,z+zb))return 3; + for(int xb=-1;xb<2;xb++) { + for(int yb=-1;yb<2;yb++) { + for(int zb=-1;zb<2;zb++) { + if (!this.setcheck(x+xb,y+yb,z+zb)) { + return 3; + } + } + } + } }else if (bit instanceof BlockLeavesBase){ }else{ - if (!canIgnore(bit)) return 2; + if (!canIgnore(bit)) { + return 2; + } } } return f; } - public int checkTree2(World par1World,int xo,int yo,int zo){ + public int checkTree2(final World par1World,final int xo,final int yo,final int zo){ boolean f; for (f=true;f==true;){ f=false; - for (int y=0;y<80;y++) - for(int z=0;z<20;z++) + for (int y=0;y<80;y++) { + for(int z=0;z<20;z++) { for(int x=0;x<20;x++){ - int r=check2(par1World,x,y,z,xo,yo,zo); - if (r==3) return 3; - if (r==2) return 2; - if (r==1) f=true; + final int r=this.check2(par1World,x,y,z,xo,yo,zo); + if (r==3) { + return 3; + } + if (r==2) { + return 2; + } + if (r==1) { + f=true; + } } - - for (int y=79;y>=0;y--) - for(int z=19;z>=0;z--) + } + } + + for (int y=79;y>=0;y--) { + for(int z=19;z>=0;z--) { for(int x=19;x>=0;x--){ - int r=check2(par1World,x,y,z,xo,yo,zo); - if (r==2) return 3; + final int r=this.check2(par1World,x,y,z,xo,yo,zo); + if (r==2) { + return 3; + } //if (r==2) return 2; - if (r==1) f=true; + if (r==1) { + f=true; + } } + } + } } return 1; } - - public void exploadTree(World par1World,int xo,int yo,int zo, EntityPlayer plr){ - for (int y=0;y<80;y++) - for(int z=0;z<20;z++) + + public void exploadTree(final World par1World,final int xo,final int yo,final int zo, final EntityPlayer plr){ + for (int y=0;y<80;y++) { + for(int z=0;z<20;z++) { for(int x=0;x<20;x++){ - int o=x+z*20+y*400; - if (tre[o]==harvest){ - Block bit = par1World.getBlock(x+xo, y+yo, z+zo); - int met = par1World.getBlockMetadata(x+xo, y+yo, z+zo); - + final int o=x+(z*20)+(y*400); + if (this.tre[o]==this.harvest){ + final Block bit = par1World.getBlock(x+xo, y+yo, z+zo); + final int met = par1World.getBlockMetadata(x+xo, y+yo, z+zo); + if ((bit instanceof BlockLog)||(bit instanceof BlockLeavesBase) || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){ bit.harvestBlock(par1World, plr, x+xo, y+yo, z+zo,met); par1World.setBlockToAir(x+xo, y+yo, z+zo); } } } + } + } } - private static void breakMushroom(World wld, Block bit, EntityPlayer plr, boolean silk, int x, int y, int z, int met) { + private static void breakMushroom(final World wld, final Block bit, final EntityPlayer plr, final boolean silk, final int x, final int y, final int z, final int met) { if (silk){ - ItemStack stk = null; //TODO + final ItemStack stk = null; //TODO /*if (bit==Blocks.brown_mushroom_block) stk = new ItemStack(LoonToolItems.brown_mushroom_block,1,met); else if (bit==Blocks.red_mushroom_block) stk = new ItemStack(LoonToolItems.red_mushroom_block,1,met); else stk = new ItemStack(bit,1,met);*/ - EntityItem entityitem = new EntityItem(wld, x+0.5, y+0.5, z+0.5, stk); + final EntityItem entityitem = new EntityItem(wld, x+0.5, y+0.5, z+0.5, stk); entityitem.delayBeforeCanPickup = 10; wld.spawnEntityInWorld(entityitem); }else{ @@ -192,15 +263,15 @@ public class StaballoyAxe extends ItemAxe{ } wld.setBlockToAir(x, y, z); } - - public void exploadMushroom(World par1World,int xo,int yo,int zo, EntityPlayer plr, boolean silk){ - for (int y=0;y<80;y++) - for(int z=0;z<20;z++) + + public void exploadMushroom(final World par1World,final int xo,final int yo,final int zo, final EntityPlayer plr, final boolean silk){ + for (int y=0;y<80;y++) { + for(int z=0;z<20;z++) { for(int x=0;x<20;x++){ - int o=x+z*20+y*400; - if (tre[o]==harvest){ - Block bit = par1World.getBlock(x+xo, y+yo, z+zo); - int met = par1World.getBlockMetadata(x+xo, y+yo, z+zo); + final int o=x+(z*20)+(y*400); + if (this.tre[o]==this.harvest){ + final Block bit = par1World.getBlock(x+xo, y+yo, z+zo); + final int met = par1World.getBlockMetadata(x+xo, y+yo, z+zo); if (bit instanceof BlockHugeMushroom){ breakMushroom(par1World, bit, plr, silk, x+xo, y+yo, z+zo,met); }else{ @@ -209,54 +280,62 @@ public class StaballoyAxe extends ItemAxe{ } } } + } + } } - + @Override - public boolean onBlockDestroyed(ItemStack itm, World wld,Block blk, int x, int y,int z, EntityLivingBase plr) { + public boolean onBlockDestroyed(final ItemStack itm, final World wld,final Block blk, final int x, final int y,final int z, final EntityLivingBase plr) { if (!wld.isRemote){ - Block bit = wld.getBlock(x, y, z); - boolean silk=EnchantmentHelper.getSilkTouchModifier(plr); + final Block bit = wld.getBlock(x, y, z); + final boolean silk=EnchantmentHelper.getSilkTouchModifier(plr); if ((bit instanceof BlockHugeMushroom)){ - for (int n=0;n<32000;n++) tre[n]=unchecked; - int met = wld.getBlockMetadata(x, y, z); + for (int n=0;n<32000;n++) { + this.tre[n]=this.unchecked; + } + final int met = wld.getBlockMetadata(x, y, z); breakMushroom(wld, bit, (EntityPlayer) plr, silk, x, y, z,met); wld.setBlockToAir(x,y,z); - tre[2210]=needcheck; - if (checkTree(wld,x-10,y-4,z-10)==1){ - exploadMushroom(wld,x-10,y-4,z-10,(EntityPlayer) plr,silk); + this.tre[2210]=this.needcheck; + if (this.checkTree(wld,x-10,y-4,z-10)==1){ + this.exploadMushroom(wld,x-10,y-4,z-10,(EntityPlayer) plr,silk); } } - - if (bit instanceof BlockLog || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){ + + if ((bit instanceof BlockLog) || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){ //LoonTools.log("cutting tree @ "+x+" "+y+" "+z+" "); - for (int n=0;n<32000;n++) tre[n]=unchecked; - int met = wld.getBlockMetadata(x, y, z); + for (int n=0;n<32000;n++) { + this.tre[n]=this.unchecked; + } + final int met = wld.getBlockMetadata(x, y, z); bit.harvestBlock(wld, (EntityPlayer) plr, x, y, z,met); wld.setBlockToAir(x,y,z); - tre[2210]=needcheck; - if (checkTree(wld,x-10,y-4,z-10)==1){ - exploadTree(wld,x-10,y-4,z-10,(EntityPlayer) plr); + this.tre[2210]=this.needcheck; + if (this.checkTree(wld,x-10,y-4,z-10)==1){ + this.exploadTree(wld,x-10,y-4,z-10,(EntityPlayer) plr); }else{ - for (int n=0;n<32000;n++) tre[n]=unchecked; - tre[2210]=needcheck; - if (checkTree2(wld,x-10,y-4,z-10)==1){ - exploadTree(wld,x-10,y-4,z-10,(EntityPlayer) plr); + for (int n=0;n<32000;n++) { + this.tre[n]=this.unchecked; + } + this.tre[2210]=this.needcheck; + if (this.checkTree2(wld,x-10,y-4,z-10)==1){ + this.exploadTree(wld,x-10,y-4,z-10,(EntityPlayer) plr); } } } } return super.onBlockDestroyed(itm, wld, blk, x, y, z, plr); } - + @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.rare; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return true; } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index 81943536ae..64a53a4eb7 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.item.tool.staballoy; +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.UtilsMining; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,8 +14,6 @@ import net.minecraft.init.Blocks; 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 StaballoyPickaxe extends ItemPickaxe{ @@ -22,7 +21,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ * @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack) */ @Override - public double getDurabilityForDisplay(ItemStack stack) { + public double getDurabilityForDisplay(final ItemStack stack) { if (super.getDurabilityForDisplay(stack) > 0){ return super.getDurabilityForDisplay(stack);} return 0; @@ -37,46 +36,46 @@ public class StaballoyPickaxe extends ItemPickaxe{ protected int miningLevel; /* - * - * - * - * Methods - * - * - * + * + * + * + * Methods + * + * + * */ @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer aPlayer) { - localPlayer = aPlayer; - localWorld = world; - thisPickaxe = stack; + public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer aPlayer) { + this.localPlayer = aPlayer; + this.localWorld = world; + this.thisPickaxe = stack; return super.onItemRightClick(stack, world, aPlayer); } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int X, int Y, int Z, EntityLivingBase entity) { + public boolean onBlockDestroyed(final ItemStack stack, final World world, final Block block, final int X, final int Y, final int Z, final EntityLivingBase entity) { //super.onBlockDestroyed(stack, world, block, X, Y, Z, entity); - localWorld = world; - thisPickaxe = stack; + this.localWorld = world; + this.thisPickaxe = stack; //checkFacing(world); - if (!world.isRemote){ - GetDestroyOrientation(block, lookingDirection, world, X, Y, Z, stack); + if (!world.isRemote){ + this.GetDestroyOrientation(block, this.lookingDirection, world, X, Y, Z, stack); } return super.onBlockDestroyed(stack, world, block, X, Y, Z, entity); } @SuppressWarnings("static-method") - private float calculateDurabilityLoss(World world, int X, int Y, int Z){ + private float calculateDurabilityLoss(final World world, final int X, final int Y, final int Z){ float bDurabilityLoss = 0; Boolean correctTool = false; float bHardness = 0; - if (!world.isRemote){ + if (!world.isRemote){ try { - Block removalist = world.getBlock(X, Y, Z); + final Block removalist = world.getBlock(X, Y, Z); //Utils.LOG_WARNING(removalist.toString()); bHardness = removalist.getBlockHardness(world, X, Y, Z); @@ -85,36 +84,36 @@ public class StaballoyPickaxe extends ItemPickaxe{ bDurabilityLoss = (bDurabilityLoss + bHardness); //Utils.LOG_WARNING("Durability Loss: "+bDurabilityLoss); - correctTool = canPickaxeBlock(removalist, world, new int[]{X,Y,Z}); + correctTool = this.canPickaxeBlock(removalist, world, new int[]{X,Y,Z}); Utils.LOG_WARNING(""+correctTool); if (!correctTool){ return 0; } - } catch (NullPointerException e){ + } catch (final NullPointerException e){ } } return 100; } - public Boolean canPickaxeBlock(Block currentBlock, World currentWorld, int[] xyz){ + public Boolean canPickaxeBlock(final Block currentBlock, final World currentWorld, final int[] xyz){ String correctTool = ""; - if (!currentWorld.isRemote){ + if (!currentWorld.isRemote){ try { correctTool = currentBlock.getHarvestTool(0); - if (UtilsMining.getBlockType(currentBlock, currentWorld, xyz, miningLevel) || correctTool.equals("pickaxe") || correctTool.equals("null")){ - //Utils.LOG_WARNING(correctTool); + if (UtilsMining.getBlockType(currentBlock, currentWorld, xyz, this.miningLevel) || correctTool.equals("pickaxe") || correctTool.equals("null")){ + //Utils.LOG_WARNING(correctTool); return true;} - } catch (NullPointerException e){ + } catch (final NullPointerException e){ return false;} } return false; } - private void GetDestroyOrientation(Block block, String FACING, World world, int X, int Y, int Z, ItemStack heldItem){ - localWorld = world; + private void GetDestroyOrientation(final Block block, final String FACING, final World world, final int X, final int Y, final int Z, final ItemStack heldItem){ + this.localWorld = world; float DURABILITY_LOSS = 0; if (!world.isRemote){ @@ -123,10 +122,10 @@ public class StaballoyPickaxe extends ItemPickaxe{ DURABILITY_LOSS = 0; for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { - float dur = calculateDurabilityLoss(world, X + i, Y, Z + j); - DURABILITY_LOSS = (DURABILITY_LOSS + dur); + final float dur = this.calculateDurabilityLoss(world, X + i, Y, Z + j); + DURABILITY_LOSS = (DURABILITY_LOSS + dur); Utils.LOG_WARNING("Added Loss: "+dur); - removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem); + this.removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem); } } } @@ -135,10 +134,10 @@ public class StaballoyPickaxe extends ItemPickaxe{ DURABILITY_LOSS = 0; for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { - float dur = calculateDurabilityLoss(world, X, Y + i, Z + j); + final float dur = this.calculateDurabilityLoss(world, X, Y + i, Z + j); DURABILITY_LOSS = (DURABILITY_LOSS + dur); Utils.LOG_WARNING("Added Loss: "+dur); - removeBlockAndDropAsItem(world, X , Y + i, Z + j, heldItem); + this.removeBlockAndDropAsItem(world, X , Y + i, Z + j, heldItem); } } } @@ -147,10 +146,10 @@ public class StaballoyPickaxe extends ItemPickaxe{ DURABILITY_LOSS = 0; for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { - float dur = calculateDurabilityLoss(world, X + j, Y + i, Z); + final float dur = this.calculateDurabilityLoss(world, X + j, Y + i, Z); DURABILITY_LOSS = (DURABILITY_LOSS + dur); Utils.LOG_WARNING("Added Loss: "+dur); - removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem); + this.removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem); } } } @@ -158,15 +157,15 @@ public class StaballoyPickaxe extends ItemPickaxe{ //int heldItemDurability = heldItem.getDamage(1); Utils.LOG_WARNING("Total Loss: "+(int)DURABILITY_LOSS); //heldItem.setDamage(heldStack, DURABILITY_LOSS); - //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); + //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); //Utils.LOG_WARNING("Durability: "+heldStack.getDamage(heldStack)); Utils.LOG_WARNING("1x: "+(heldItem.getItemDamage())); - int itemdmg = heldItem.getItemDamage(); - int maxdmg = heldItem.getMaxDamage(); - int dodmg = (int)DURABILITY_LOSS; - int durNow = (int) maxdmg-itemdmg; - int durLeft = (int) ((maxdmg-itemdmg)-DURABILITY_LOSS); - + final int itemdmg = heldItem.getItemDamage(); + final int maxdmg = heldItem.getMaxDamage(); + final int dodmg = (int)DURABILITY_LOSS; + final int durNow = maxdmg-itemdmg; + final int durLeft = (int) ((maxdmg-itemdmg)-DURABILITY_LOSS); + Utils.LOG_WARNING( "Current Damage: " + itemdmg + " Max Damage: " + maxdmg @@ -174,10 +173,10 @@ public class StaballoyPickaxe extends ItemPickaxe{ + " Current Durability: " + durNow + " Remaining Durability: " + durLeft ); - - + + //Break Tool - if ((durNow-dodmg) <= (99) && itemdmg != 0){ + if (((durNow-dodmg) <= (99)) && (itemdmg != 0)){ //TODO break tool Utils.LOG_WARNING("Breaking Tool"); heldItem.stackSize = 0; @@ -186,10 +185,10 @@ public class StaballoyPickaxe extends ItemPickaxe{ else { //setItemDamage(heldItem, durLeft); Utils.LOG_WARNING(""+(durNow-durLeft)); - damageItem(heldItem, (durNow-durLeft)-1, localPlayer); + this.damageItem(heldItem, (durNow-durLeft)-1, this.localPlayer); } - - + + /*if (heldItem.getItemDamage() <= ((heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS)){ Utils.LOG_WARNING("2: "+DURABILITY_LOSS+" 3: "+((heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS)); setItemDamage(heldItem, (int) (heldItem.getMaxDamage()-(heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS)); @@ -203,64 +202,64 @@ public class StaballoyPickaxe extends ItemPickaxe{ } } - - public void damageItem(ItemStack item, int damage, EntityPlayer localPlayer){ + + public void damageItem(final ItemStack item, final int damage, final EntityPlayer localPlayer){ item.damageItem(damage, localPlayer); } - - public void setItemDamage(ItemStack item, int damage){ + + public void setItemDamage(final ItemStack item, final int damage){ item.setItemDamage(damage-1); } //Should clear up blocks quicker if I chain it. - public final void removeBlockAndDropAsItem(World world, int X, int Y, int Z, ItemStack heldItem){ - localWorld = world; + public final void removeBlockAndDropAsItem(final World world, final int X, final int Y, final int Z, final ItemStack heldItem){ + this.localWorld = world; try { - Block block = world.getBlock(X, Y, Z); - float dur = calculateDurabilityLoss(world, X, Y, Z); + final Block block = world.getBlock(X, Y, Z); + final float dur = this.calculateDurabilityLoss(world, X, Y, Z); Utils.LOG_WARNING(block.toString()); String removalTool = ""; removalTool = block.getHarvestTool(1); Utils.LOG_WARNING("Removing.1 "+removalTool); /*if ((removalTool.equalsIgnoreCase("pickaxe") || removalTool.equalsIgnoreCase("null") || removalTool == null)){ - Utils.LOG_WARNING("Removing.2"); + Utils.LOG_WARNING("Removing.2"); if (UtilsMining.getBlockType(block, world, new int[]{X,Y,Z}, miningLevel)) { - Utils.LOG_WARNING("Removing.3"); */ - if (canPickaxeBlock(block, world, new int[]{X,Y,Z})){ - Utils.LOG_WARNING("Removing.4"); - - if (block == Blocks.air){ - return; - } - - if((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) >= 0) && (block.getBlockHardness(world, X, Y, Z) <= 100) && (block != Blocks.water) && (block != Blocks.lava)){ + Utils.LOG_WARNING("Removing.3"); */ + if (this.canPickaxeBlock(block, world, new int[]{X,Y,Z})){ + Utils.LOG_WARNING("Removing.4"); + + if (block == Blocks.air){ + return; + } + + if((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) >= 0) && (block.getBlockHardness(world, X, Y, Z) <= 100) && (block != Blocks.water) && (block != Blocks.lava)){ + + Utils.LOG_WARNING("Removing.5"); + if (heldItem.getItemDamage() <= (heldItem.getMaxDamage()-dur)){ - Utils.LOG_WARNING("Removing.5"); - if (heldItem.getItemDamage() <= (heldItem.getMaxDamage()-dur)){ - block.dropBlockAsItem(world, X, Y, Z, world.getBlockMetadata(X, Y, Z), 0); world.setBlockToAir(X, Y, Z); - - } - + } + + } /*} - + }*/ } else { Utils.LOG_WARNING("Incorrect Tool for mining this block."); } - } catch (NullPointerException e){ + } catch (final NullPointerException e){ } } - public boolean checkFacing(World world){ - localWorld = world; - if (localPlayer != null){ - int direction = MathHelper.floor_double((double)((localPlayer.rotationYaw * 4F) / 360F) + 0.5D) & 3; + public boolean checkFacing(final World world){ + this.localWorld = world; + if (this.localPlayer != null){ + final int direction = MathHelper.floor_double((this.localPlayer.rotationYaw * 4F) / 360F + 0.5D) & 3; //Utils.LOG_WARNING("Player - F: "+direction); //Utils.LOG_WARNING("Player - getLookVec(): "+localPlayer.getLookVec().yCoord); @@ -268,64 +267,64 @@ public class StaballoyPickaxe extends ItemPickaxe{ localPlayer.getLookVec().yCoord; }*/ - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, (EntityPlayer) localPlayer, false); + final MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, this.localPlayer, false); if (movingobjectposition != null){ - int sideHit = movingobjectposition.sideHit; + final int sideHit = movingobjectposition.sideHit; String playerStandingPosition = ""; - if (movingobjectposition != null) { + if (movingobjectposition != null) { //System.out.println("Side Hit: "+movingobjectposition.sideHit); } if (sideHit == 0){ playerStandingPosition = "above"; - FACING_HORIZONTAL = false; + this.FACING_HORIZONTAL = false; } else if (sideHit == 1){ playerStandingPosition = "below"; - FACING_HORIZONTAL = false; + this.FACING_HORIZONTAL = false; } else if (sideHit == 2){ playerStandingPosition = "facingSouth"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } else if (sideHit == 3){ playerStandingPosition = "facingNorth"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } else if (sideHit == 4){ playerStandingPosition = "facingEast"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } else if (sideHit == 5){ playerStandingPosition = "facingWest"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } - lookingDirection = playerStandingPosition; + this.lookingDirection = playerStandingPosition; - if (direction == 0){ - FACING = "south"; - } - else if (direction == 1){ - FACING = "west"; + if (direction == 0){ + this.FACING = "south"; } - else if (direction == 2){ - FACING = "north"; - } - else if (direction == 3){ - FACING = "east"; + else if (direction == 1){ + this.FACING = "west"; + } + else if (direction == 2){ + this.FACING = "north"; + } + else if (direction == 3){ + this.FACING = "east"; } } return true; } - return false; + return false; } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - thisPickaxe = stack; + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + this.thisPickaxe = stack; list.add(EnumChatFormatting.GRAY+"Mines a 3x3 at 100 durability per block mined."); list.add(EnumChatFormatting.GRAY+"Durability: "+(stack.getMaxDamage()-stack.getItemDamage())+"/"+stack.getMaxDamage()); //super.addInformation(stack, aPlayer, list, bool); @@ -333,25 +332,25 @@ public class StaballoyPickaxe extends ItemPickaxe{ @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.rare; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return true; } @Override - public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer aPlayer) { - thisPickaxe = itemstack; - localPlayer = aPlayer; - checkFacing(localPlayer.worldObj); + public boolean onBlockStartBreak(final ItemStack itemstack, final int X, final int Y, final int Z, final EntityPlayer aPlayer) { + this.thisPickaxe = itemstack; + this.localPlayer = aPlayer; + this.checkFacing(this.localPlayer.worldObj); return super.onBlockStartBreak(itemstack, X, Y, Z, aPlayer); } - - public StaballoyPickaxe(String unlocalizedName, ToolMaterial material) { + + public StaballoyPickaxe(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java index e5c3c92ced..4208b8c1af 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.item.tool.staballoy; +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.UtilsMining; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,8 +14,6 @@ import net.minecraft.init.Blocks; 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 StaballoySpade extends ItemSpade{ @@ -22,7 +21,7 @@ public class StaballoySpade extends ItemSpade{ * @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack) */ @Override - public double getDurabilityForDisplay(ItemStack stack) { + public double getDurabilityForDisplay(final ItemStack stack) { if (super.getDurabilityForDisplay(stack) > 0){ return super.getDurabilityForDisplay(stack);} return 0; @@ -37,56 +36,56 @@ public class StaballoySpade extends ItemSpade{ private int miningLevel; /* - * - * - * - * Methods - * - * - * + * + * + * + * Methods + * + * + * */ @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer aPlayer) { - localPlayer = aPlayer; - localWorld = world; - thisPickaxe = stack; + public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer aPlayer) { + this.localPlayer = aPlayer; + this.localWorld = world; + this.thisPickaxe = stack; return super.onItemRightClick(stack, world, aPlayer); } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int X, int Y, int Z, EntityLivingBase entity) { + public boolean onBlockDestroyed(final ItemStack stack, final World world, final Block block, final int X, final int Y, final int Z, final EntityLivingBase entity) { //super.onBlockDestroyed(stack, world, block, X, Y, Z, entity); - localWorld = world; - thisPickaxe = stack; + this.localWorld = world; + this.thisPickaxe = stack; //checkFacing(world); - if (!world.isRemote){ - GetDestroyOrientation(lookingDirection, world, X, Y, Z, stack); + if (!world.isRemote){ + this.GetDestroyOrientation(this.lookingDirection, world, X, Y, Z, stack); } return super.onBlockDestroyed(stack, world, block, X, Y, Z, entity); } - public Boolean canPickaxeBlock(Block currentBlock, World currentWorld, int[] xyz){ + public Boolean canPickaxeBlock(final Block currentBlock, final World currentWorld, final int[] xyz){ String correctTool = ""; - if (!currentWorld.isRemote){ + if (!currentWorld.isRemote){ try { correctTool = currentBlock.getHarvestTool(0); //Utils.LOG_WARNING(correctTool); Utils.LOG_INFO("Tool for Block: "+correctTool+" | Current block: "+currentBlock.getLocalizedName()); - if (UtilsMining.getBlockType(currentBlock, currentWorld, xyz, miningLevel) || correctTool.equals("shovel")){ + if (UtilsMining.getBlockType(currentBlock, currentWorld, xyz, this.miningLevel) || correctTool.equals("shovel")){ return true;} - } catch (NullPointerException e){ + } catch (final NullPointerException e){ return false;} } return false; } - private void GetDestroyOrientation(String FACING, World world, int X, int Y, int Z, ItemStack heldItem){ - localWorld = world; + private void GetDestroyOrientation(final String FACING, final World world, final int X, final int Y, final int Z, final ItemStack heldItem){ + this.localWorld = world; float DURABILITY_LOSS = 0; if (!world.isRemote){ @@ -94,7 +93,7 @@ public class StaballoySpade extends ItemSpade{ DURABILITY_LOSS = 0; for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS + removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem)); + DURABILITY_LOSS = (DURABILITY_LOSS + this.removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem)); } } } @@ -103,7 +102,7 @@ public class StaballoySpade extends ItemSpade{ DURABILITY_LOSS = 0; for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS + removeBlockAndDropAsItem(world, X , Y + i, Z + j, heldItem)); + DURABILITY_LOSS = (DURABILITY_LOSS + this.removeBlockAndDropAsItem(world, X , Y + i, Z + j, heldItem)); } } } @@ -112,7 +111,7 @@ public class StaballoySpade extends ItemSpade{ DURABILITY_LOSS = 0; for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS + removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem)); + DURABILITY_LOSS = (DURABILITY_LOSS + this.removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem)); } } } @@ -120,14 +119,14 @@ public class StaballoySpade extends ItemSpade{ //int heldItemDurability = heldItem.getDamage(1); Utils.LOG_INFO("Total Loss: "+(int)DURABILITY_LOSS); //heldItem.setDamage(heldStack, DURABILITY_LOSS); - //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); + //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); //Utils.LOG_WARNING("Durability: "+heldStack.getDamage(heldStack)); Utils.LOG_INFO("1x: "+(heldItem.getItemDamage())); - int itemdmg = heldItem.getItemDamage(); - int maxdmg = heldItem.getMaxDamage(); - int dodmg = (int)DURABILITY_LOSS; - int durNow = (int) maxdmg-itemdmg; - int durLeft = (int) ((maxdmg-itemdmg)-DURABILITY_LOSS); + final int itemdmg = heldItem.getItemDamage(); + final int maxdmg = heldItem.getMaxDamage(); + final int dodmg = (int)DURABILITY_LOSS; + final int durNow = maxdmg-itemdmg; + final int durLeft = (int) ((maxdmg-itemdmg)-DURABILITY_LOSS); Utils.LOG_INFO( "Current Damage: " + itemdmg @@ -139,7 +138,7 @@ public class StaballoySpade extends ItemSpade{ //Break Tool - if ((durNow-dodmg) <= (900) && itemdmg != 0){ + if (((durNow-dodmg) <= (900)) && (itemdmg != 0)){ //TODO break tool Utils.LOG_INFO("Breaking Tool"); heldItem.stackSize = 0; @@ -148,72 +147,72 @@ public class StaballoySpade extends ItemSpade{ else { //setItemDamage(heldItem, durLeft); Utils.LOG_INFO(""+(durNow-durLeft)); - damageItem(heldItem, (durNow-durLeft)-1, localPlayer); + this.damageItem(heldItem, (durNow-durLeft)-1, this.localPlayer); } DURABILITY_LOSS = 0; } } - public void damageItem(ItemStack item, int damage, EntityPlayer localPlayer){ + public void damageItem(final ItemStack item, final int damage, final EntityPlayer localPlayer){ item.damageItem(damage, localPlayer); } - public void setItemDamage(ItemStack item, int damage){ + public void setItemDamage(final ItemStack item, final int damage){ item.setItemDamage(damage-1); } //Should clear up blocks quicker if I chain it. - public int removeBlockAndDropAsItem(World world, int X, int Y, int Z, ItemStack heldItem){ - localWorld = world; + public int removeBlockAndDropAsItem(final World world, final int X, final int Y, final int Z, final ItemStack heldItem){ + this.localWorld = world; Utils.LOG_INFO("Trying to drop/remove a block."); try { - Block block = world.getBlock(X, Y, Z); + final Block block = world.getBlock(X, Y, Z); Utils.LOG_WARNING(block.toString()); String removalTool = ""; removalTool = block.getHarvestTool(0); if (removalTool != null){ - if (removalTool.equals("shovel")){ - if (canPickaxeBlock(block, world, new int[]{X,Y,Z})){ - if((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1) && (block.getBlockHardness(world, X, Y, Z) <= 100) && (block != Blocks.water) && (block != Blocks.lava)){ - - int itemdmg = heldItem.getItemDamage(); - int maxdmg = heldItem.getMaxDamage(); - int dodmg = (int)100; - int durNow = (int) maxdmg-itemdmg; - int durLeft = (int) ((maxdmg-itemdmg)-100); - - if ((durNow-dodmg) <= (900) && itemdmg != 0){ - //Do Nothing, Tool is useless. - return 0; + if (removalTool.equals("shovel")){ + if (this.canPickaxeBlock(block, world, new int[]{X,Y,Z})){ + if((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1) && (block.getBlockHardness(world, X, Y, Z) <= 100) && (block != Blocks.water) && (block != Blocks.lava)){ + + final int itemdmg = heldItem.getItemDamage(); + final int maxdmg = heldItem.getMaxDamage(); + final int dodmg = 100; + final int durNow = maxdmg-itemdmg; + final int durLeft = (maxdmg-itemdmg)-100; + + if (((durNow-dodmg) <= (900)) && (itemdmg != 0)){ + //Do Nothing, Tool is useless. + return 0; + } + block.dropBlockAsItem(world, X, Y, Z, world.getBlockMetadata(X, Y, Z), 0); + world.setBlockToAir(X, Y, Z); + Utils.LOG_INFO("Adding 100 damage to item."); + return 100; } - block.dropBlockAsItem(world, X, Y, Z, world.getBlockMetadata(X, Y, Z), 0); - world.setBlockToAir(X, Y, Z); - Utils.LOG_INFO("Adding 100 damage to item."); - return 100; + Utils.LOG_INFO("Incorrect Tool for mining this block. Wrong Block Water/lava/bedrock/blacklist"); + return 0; } - Utils.LOG_INFO("Incorrect Tool for mining this block. Wrong Block Water/lava/bedrock/blacklist"); + Utils.LOG_INFO("Incorrect Tool for mining this block. Cannot Shovel this block type."); return 0; } - Utils.LOG_INFO("Incorrect Tool for mining this block. Cannot Shovel this block type."); + Utils.LOG_INFO("Incorrect Tool for mining this block. Blocks mining tool is now Shovel."); return 0; } - Utils.LOG_INFO("Incorrect Tool for mining this block. Blocks mining tool is now Shovel."); + Utils.LOG_INFO("Either the block was air or it declares an invalid mining tool."); return 0; - } - Utils.LOG_INFO("Either the block was air or it declares an invalid mining tool."); - return 0; - } catch (NullPointerException e){ + } catch (final NullPointerException e){ Utils.LOG_INFO("Something Broke"); e.printStackTrace(); return 0; } } - public boolean checkFacing(World world){ - localWorld = world; - if (localPlayer != null){ - int direction = MathHelper.floor_double((double)((localPlayer.rotationYaw * 4F) / 360F) + 0.5D) & 3; + public boolean checkFacing(final World world){ + this.localWorld = world; + if (this.localPlayer != null){ + final int direction = MathHelper.floor_double((this.localPlayer.rotationYaw * 4F) / 360F + 0.5D) & 3; //Utils.LOG_WARNING("Player - F: "+direction); //Utils.LOG_WARNING("Player - getLookVec(): "+localPlayer.getLookVec().yCoord); @@ -221,88 +220,88 @@ public class StaballoySpade extends ItemSpade{ localPlayer.getLookVec().yCoord; }*/ - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, (EntityPlayer) localPlayer, false); + final MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, this.localPlayer, false); if (movingobjectposition != null){ - int sideHit = movingobjectposition.sideHit; + final int sideHit = movingobjectposition.sideHit; String playerStandingPosition = ""; - if (movingobjectposition != null) { + if (movingobjectposition != null) { //System.out.println("Side Hit: "+movingobjectposition.sideHit); } if (sideHit == 0){ playerStandingPosition = "above"; - FACING_HORIZONTAL = false; + this.FACING_HORIZONTAL = false; } else if (sideHit == 1){ playerStandingPosition = "below"; - FACING_HORIZONTAL = false; + this.FACING_HORIZONTAL = false; } else if (sideHit == 2){ playerStandingPosition = "facingSouth"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } else if (sideHit == 3){ playerStandingPosition = "facingNorth"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } else if (sideHit == 4){ playerStandingPosition = "facingEast"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } else if (sideHit == 5){ playerStandingPosition = "facingWest"; - FACING_HORIZONTAL = true; + this.FACING_HORIZONTAL = true; } - lookingDirection = playerStandingPosition; + this.lookingDirection = playerStandingPosition; - if (direction == 0){ - FACING = "south"; - } - else if (direction == 1){ - FACING = "west"; + if (direction == 0){ + this.FACING = "south"; } - else if (direction == 2){ - FACING = "north"; - } - else if (direction == 3){ - FACING = "east"; + else if (direction == 1){ + this.FACING = "west"; + } + else if (direction == 2){ + this.FACING = "north"; + } + else if (direction == 3){ + this.FACING = "east"; } } return true; } - return false; + return false; } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - thisPickaxe = stack; + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + this.thisPickaxe = stack; list.add(EnumChatFormatting.GOLD+"Spades a 3x3 area in the direction you are facing."); super.addInformation(stack, aPlayer, list, bool); } @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ + public EnumRarity getRarity(final ItemStack par1ItemStack){ return EnumRarity.rare; } @Override - public boolean hasEffect(ItemStack par1ItemStack){ + public boolean hasEffect(final ItemStack par1ItemStack){ return true; } @Override - public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer aPlayer) { - thisPickaxe = itemstack; - localPlayer = aPlayer; - checkFacing(localPlayer.worldObj); + public boolean onBlockStartBreak(final ItemStack itemstack, final int X, final int Y, final int Z, final EntityPlayer aPlayer) { + this.thisPickaxe = itemstack; + this.localPlayer = aPlayer; + this.checkFacing(this.localPlayer.worldObj); return super.onBlockStartBreak(itemstack, X, Y, Z, aPlayer); } - public StaballoySpade(String unlocalizedName, ToolMaterial material) { + public StaballoySpade(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); -- cgit