From e5b795fddcc091a11defd809407c924dcb23bc18 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Thu, 2 Jul 2015 11:05:07 -0400 Subject: [PATCH] Performance Commit --Too lazy to do the Altar recipe --- .../AlchemicalWizardry.java | 17 +-- .../BloodMagicConfiguration.java | 6 +- .../alchemicalWizardry/ModBlocks.java | 2 - .../alchemicalWizardry/ModItems.java | 1 - .../alchemicalWizardry/api/Vector3.java | 2 +- .../api/alchemy/AlchemyRecipe.java | 2 +- .../api/alchemy/energy/IAlchemyGoggles.java | 2 +- .../api/alchemy/energy/IReagentContainer.java | 12 +- .../energy/ISegmentedReagentHandler.java | 8 +- .../api/alchemy/energy/Reagent.java | 2 +- .../energy/TileSegmentedReagentHandler.java | 2 +- .../api/altarRecipeRegistry/AltarRecipe.java | 2 +- .../api/altarRecipeRegistry/IFadedRune.java | 2 +- .../api/bindingRegistry/BindingRecipe.java | 7 +- .../api/bindingRegistry/UnbindingRecipe.java | 7 +- .../api/compress/CompressionRegistry.java | 2 +- .../api/guide/PageAltarRecipe.java | 4 +- .../api/guide/PageMultiBlock.java | 4 +- .../api/harvest/IHarvestHandler.java | 2 +- .../api/items/ShapedBloodOrbRecipe.java | 4 +- .../api/items/interfaces/ArmourUpgrade.java | 6 +- .../api/items/interfaces/IBloodOrb.java | 4 +- .../api/rituals/IMasterRitualStone.java | 36 ++--- .../api/rituals/IRitualStone.java | 2 +- .../api/rituals/ITileRitualStone.java | 2 +- .../api/rituals/Rituals.java | 16 +- .../api/sacrifice/IIncense.java | 12 +- .../api/sacrifice/PlayerSacrificeHandler.java | 2 +- .../api/soulNetwork/SoulNetworkHandler.java | 21 --- .../api/spell/APISpellHelper.java | 5 +- .../api/spell/EntitySpellProjectile.java | 10 +- .../api/spell/IDigAreaEffect.java | 2 +- .../api/spell/ILeftClickEffect.java | 2 +- .../api/spell/IMeleeSpellEntityEffect.java | 2 +- .../api/spell/IMeleeSpellWorldEffect.java | 2 +- .../api/spell/IOnBanishTool.java | 2 +- .../api/spell/IOnBreakBlock.java | 2 +- .../api/spell/IOnSummonTool.java | 2 +- .../api/spell/IProjectileImpactEffect.java | 4 +- .../api/spell/IProjectileUpdateEffect.java | 2 +- .../api/spell/IRightClickEffect.java | 4 +- .../api/spell/ISelfSpellEffect.java | 2 +- .../api/spell/ISpecialDamageEffect.java | 4 +- .../api/spell/IToolUpdateEffect.java | 2 +- .../api/spell/SpellEnhancement.java | 2 +- .../api/spell/SpellEnhancementCost.java | 1 - .../api/spell/SpellEnhancementPotency.java | 1 - .../api/spell/SpellEnhancementPower.java | 1 - .../api/spell/SpellParadigmTool.java | 3 - .../api/tile/IBloodAltar.java | 31 ++-- .../api/tile/ISpellParadigmTile.java | 2 +- .../api/tile/ISpellTile.java | 4 +- .../book/interfaces/IEntryElement.java | 8 +- .../book/interfaces/IReviving.java | 2 +- .../client/ClientEventHandler.java | 2 +- .../client/ClientProxy.java | 1 - .../client/KeyBindings.java | 2 +- .../client/nei/NEIAlchemyRecipeHandler.java | 1 - .../client/nei/NEIAltarRecipeHandler.java | 2 +- .../client/nei/NEIBloodOrbShapedHandler.java | 2 +- .../nei/NEIBloodOrbShapelessHandler.java | 2 +- .../client/renderer/HUDElement.java | 4 +- .../client/renderer/Helper.java | 17 --- .../client/renderer/RenderFakeBlocks.java | 2 - .../client/renderer/RenderHelper.java | 18 +-- .../common/AlchemicalWizardryEventHooks.java | 22 +-- .../common/AlchemicalWizardryFuelHandler.java | 7 +- .../common/CommonProxy.java | 3 - .../common/IBindingAgent.java | 2 +- .../alchemicalWizardry/common/ICatalyst.java | 4 +- .../alchemicalWizardry/common/IDemon.java | 10 +- .../common/IFillingAgent.java | 2 +- .../common/NewPacketHandler.java | 6 +- .../common/block/BlockAlchemicCalcinator.java | 2 +- .../common/block/BlockAltar.java | 11 +- .../common/block/BlockBloodLightSource.java | 2 +- .../common/block/BlockConduit.java | 9 +- .../common/block/BlockCrucible.java | 6 +- .../common/block/BlockCrystal.java | 2 + .../common/block/BlockEnchantmentGlyph.java | 6 +- .../common/block/BlockHomHeart.java | 9 +- .../common/block/BlockOrientable.java | 1 - .../common/block/BlockPedestal.java | 9 +- .../common/block/BlockPlinth.java | 9 +- .../common/block/BlockSchematicSaver.java | 2 +- .../common/block/BlockSocket.java | 9 +- .../common/block/BlockSpellEnhancement.java | 1 - .../common/block/BlockSpellModifier.java | 1 - .../common/block/BlockSpellParadigm.java | 3 - .../common/block/BlockStabilityGlyph.java | 3 +- .../common/block/BlockTeleposer.java | 19 +-- .../common/block/BlockWritingTable.java | 9 +- .../common/block/BloodRune.java | 5 + .../common/block/IOrientable.java | 8 +- .../common/block/LifeEssenceBlock.java | 14 +- .../common/block/MimicBlock.java | 2 +- .../common/block/RitualStone.java | 14 +- .../common/block/SpectralBlock.java | 2 +- .../common/book/BookParser.java | 6 +- .../common/demonVillage/BlockSet.java | 31 ++-- .../demonVillage/BuildingSchematic.java | 2 +- .../common/demonVillage/DemonBuilding.java | 4 +- .../common/demonVillage/DemonVillagePath.java | 141 ++++++++---------- .../common/demonVillage/GridSpace.java | 6 +- .../common/demonVillage/GridSpaceHolder.java | 16 +- .../ai/EntityDemonAIHurtByTarget.java | 4 +- .../ai/IOccasionalRangedAttackMob.java | 2 +- .../demon/EntityMinorDemonGrunt.java | 27 ++-- .../demon/EntityMinorDemonGruntEarth.java | 3 - .../demon/EntityMinorDemonGruntFire.java | 3 - .../demon/EntityMinorDemonGruntGuardian.java | 3 - .../EntityMinorDemonGruntGuardianEarth.java | 3 - .../EntityMinorDemonGruntGuardianFire.java | 3 - .../EntityMinorDemonGruntGuardianIce.java | 3 - .../EntityMinorDemonGruntGuardianWind.java | 3 - .../demon/EntityMinorDemonGruntIce.java | 3 - .../demon/EntityMinorDemonGruntWind.java | 3 - .../demonHoard/demon/IHoardDemon.java | 8 +- .../loot/DemonVillageLootRegistry.java | 4 - .../tileEntity/BlockDemonChest.java | 4 +- .../tileEntity/ITilePortalNode.java | 2 +- .../demonVillage/tileEntity/TEDemonChest.java | 2 +- .../tileEntity/TEDemonPortal.java | 28 +--- .../common/entity/mob/EntityBileDemon.java | 43 +++--- .../common/entity/mob/EntityBoulderFist.java | 45 +++--- .../entity/mob/EntityEarthElemental.java | 2 +- .../common/entity/mob/EntityElemental.java | 40 ++--- .../common/entity/mob/EntityFallenAngel.java | 43 +++--- .../entity/mob/EntityFireElemental.java | 2 +- .../entity/mob/EntityHolyElemental.java | 2 +- .../common/entity/mob/EntityIceDemon.java | 46 +++--- .../entity/mob/EntityLowerGuardian.java | 47 +++--- .../common/entity/mob/EntityShade.java | 45 +++--- .../entity/mob/EntitySmallEarthGolem.java | 45 +++--- .../entity/mob/EntityWingedFireDemon.java | 49 +++--- .../common/items/ArmourInhibitor.java | 14 +- .../common/items/BloodShard.java | 1 - .../common/items/BoundAxe.java | 17 +-- .../common/items/BoundPickaxe.java | 14 +- .../common/items/BoundShovel.java | 13 +- .../common/items/CheatyItem.java | 10 +- .../common/items/CreativeDagger.java | 111 ++++++++++---- .../common/items/DaggerOfSacrifice.java | 20 +-- .../common/items/DemonPlacer.java | 5 - .../common/items/EnergyBattery.java | 10 +- .../common/items/EnergyBazooka.java | 14 +- .../common/items/EnergyBlast.java | 14 +- .../common/items/EnergyItems.java | 9 +- .../common/items/EnergySword.java | 8 +- .../common/items/ItemBloodLetterPack.java | 15 +- .../common/items/ItemBloodRuneBlock.java | 4 +- .../common/items/ItemCrystalBlock.java | 4 +- .../common/items/ItemDiabloKey.java | 2 - .../items/ItemEnchantmentGlyphBlock.java | 2 +- .../common/items/ItemIncense.java | 6 +- .../common/items/ItemRitualDiviner.java | 3 +- .../common/items/ItemSpellEffectBlock.java | 4 +- .../items/ItemSpellEnhancementBlock.java | 4 +- .../common/items/ItemSpellModifierBlock.java | 4 +- .../common/items/ItemSpellParadigmBlock.java | 4 +- .../common/items/ItemStabilityGlyphBlock.java | 2 +- .../common/items/LavaCrystal.java | 5 +- .../common/items/OrbOfTesting.java | 2 +- .../common/items/SacrificialDagger.java | 12 +- .../common/items/armour/BoundArmour.java | 38 ++--- .../common/items/armour/OmegaArmour.java | 1 - .../common/items/armour/OmegaArmourEarth.java | 12 +- .../common/items/armour/OmegaArmourFire.java | 12 +- .../common/items/armour/OmegaArmourWater.java | 12 +- .../common/items/armour/OmegaArmourWind.java | 12 +- .../items/energy/ItemAttunedCrystal.java | 2 +- .../items/energy/ItemTankSegmenter.java | 2 + .../common/items/potion/AlchemyFlask.java | 36 ++--- .../common/items/potion/AlchemyReagent.java | 1 - .../items/potion/EnhancedFillingAgent.java | 3 - .../items/routing/ILimitedRoutingFocus.java | 4 +- .../common/items/sigil/SigilAir.java | 2 - .../common/items/sigil/SigilBloodLight.java | 2 - .../common/items/sigil/SigilDivination.java | 6 +- .../common/items/sigil/SigilFluid.java | 12 -- .../common/items/sigil/SigilHarvest.java | 12 +- .../common/items/sigil/SigilLava.java | 9 +- .../items/sigil/SigilOfElementalAffinity.java | 6 +- .../items/sigil/SigilOfEnderSeverance.java | 4 +- .../common/items/sigil/SigilOfGrowth.java | 16 +- .../common/items/sigil/SigilOfHaste.java | 6 +- .../common/items/sigil/SigilOfMagnetism.java | 8 +- .../common/items/sigil/SigilOfSupression.java | 21 +-- .../common/items/sigil/SigilOfTheBridge.java | 10 +- .../items/sigil/SigilOfTheFastMiner.java | 6 +- .../common/items/sigil/SigilOfWind.java | 6 +- .../common/items/sigil/SigilPackRat.java | 6 +- .../common/items/sigil/SigilSeer.java | 2 - .../common/items/sigil/SigilVoid.java | 4 - .../items/thaumcraft/ItemSanguineArmour.java | 12 +- .../block/RenderAlchemicCalcinator.java | 11 +- .../renderer/block/RenderCrystalBelljar.java | 3 +- .../common/renderer/block/RenderPedestal.java | 7 +- .../common/renderer/block/RenderPlinth.java | 7 +- .../renderer/block/RenderReagentConduit.java | 5 - .../block/RenderSpellEffectBlock.java | 5 +- .../block/RenderSpellEnhancementBlock.java | 5 +- .../block/RenderSpellModifierBlock.java | 5 +- .../block/RenderSpellParadigmBlock.java | 5 +- .../renderer/block/RenderWritingTable.java | 7 +- .../TEAlchemicalCalcinatorItemRenderer.java | 4 +- .../common/rituals/RitualEffectCrafting.java | 6 +- .../spell/complex/effect/SpellHelper.java | 17 +-- .../common/tileEntity/TEAltar.java | 16 +- .../common/tileEntity/TEInventory.java | 5 - .../common/tileEntity/TEPedestal.java | 2 +- .../common/tileEntity/TEPlinth.java | 16 +- .../common/tileEntity/TESocket.java | 2 +- .../tileEntity/TESpectralContainer.java | 4 +- .../tileEntity/TESpellParadigmBlock.java | 2 +- .../common/tileEntity/TETeleposer.java | 3 +- .../common/tileEntity/TEWritingTable.java | 46 +----- 217 files changed, 840 insertions(+), 1244 deletions(-) delete mode 100644 src/main/java/WayofTime/alchemicalWizardry/client/renderer/Helper.java diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 7c14e2b3..80af036a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -12,7 +12,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import WayofTime.alchemicalWizardry.common.thread.CommandDownloadGAPI; -import WayofTime.alchemicalWizardry.common.thread.GAPIChecker; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -511,9 +510,7 @@ public class AlchemicalWizardry { logger.info("I have found a zip!"); ZipInputStream zipStream = new ZipInputStream(in); - ZipEntry entry = null; - - int extractCount = 0; + ZipEntry entry; while ((entry = zipStream.getNextEntry()) != null) { @@ -531,8 +528,6 @@ public class AlchemicalWizardry out.write(buffer, 0, len); } out.close(); - - extractCount++; } } } catch (Exception e) @@ -548,7 +543,7 @@ public class AlchemicalWizardry BloodMagicConfiguration.init(new File(event.getModConfigurationDirectory(), "AWWayofTime.cfg")); //Custom config stuff goes here - Potion[] potionTypes = null; + Potion[] potionTypes; for (Field f : Potion.class.getDeclaredFields()) { @@ -1423,16 +1418,16 @@ public class AlchemicalWizardry AlchemicalPotionCreationHandler.addPotion(new ItemStack(ModItems.weakBloodShard), Potion.field_76444_x.id, 4 * 60 * 20); //Absorption if(!AlchemicalWizardry.potionDisableBoost) - AlchemicalPotionCreationHandler.addPotion(new ItemStack(ModItems.terrae), AlchemicalWizardry.customPotionBoost.id, 1 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(ModItems.terrae), AlchemicalWizardry.customPotionBoost.id, 60 * 20); if(!AlchemicalWizardry.potionDisableFlight) - AlchemicalPotionCreationHandler.addPotion(new ItemStack(Items.feather), AlchemicalWizardry.customPotionFlight.id, 1 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Items.feather), AlchemicalWizardry.customPotionFlight.id, 60 * 20); // 1 * if(!AlchemicalWizardry.potionDisableReciprocation) - AlchemicalPotionCreationHandler.addPotion(new ItemStack(Items.arrow), AlchemicalWizardry.customPotionReciprocation.id, 1 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Items.arrow), AlchemicalWizardry.customPotionReciprocation.id, 60 * 20); // 1 * if(!AlchemicalWizardry.potionDisablePlanarBinding) - AlchemicalPotionCreationHandler.addPotion(new ItemStack(Items.ender_pearl), AlchemicalWizardry.customPotionPlanarBinding.id, 1 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Items.ender_pearl), AlchemicalWizardry.customPotionPlanarBinding.id, 60 * 20); // 1 * if(!AlchemicalWizardry.potionDisableSoulFray) AlchemicalPotionCreationHandler.addPotion(new ItemStack(Blocks.soul_sand), AlchemicalWizardry.customPotionSoulFray.id, 60 * 20); diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index 88b82e41..290756c1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -31,8 +31,6 @@ public class BloodMagicConfiguration public static final List colorList = new ArrayList(); public static Configuration config; - public static final String CATEGORY_GAMEPLAY = "gameplay"; - public static String[] teleposerBlacklist; public static String[] blacklist = {}; @@ -67,10 +65,10 @@ public class BloodMagicConfiguration AlchemicalWizardry.standardBindingAgentDungeonChance = config.get("Dungeon Loot Chances", "standardBindingAgent", 30).getInt(); AlchemicalWizardry.mundanePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundanePowerCatalyst", 20).getInt(); AlchemicalWizardry.averagePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "averagePowerCatalyst", 10).getInt(); - AlchemicalWizardry.greaterPowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterPowerCatalyst", 05).getInt(); + AlchemicalWizardry.greaterPowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterPowerCatalyst", 5).getInt(); AlchemicalWizardry.mundaneLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundaneLengtheningCatalyst", 20).getInt(); AlchemicalWizardry.averageLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "averageLengtheningCatalyst", 10).getInt(); - AlchemicalWizardry.greaterLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterLengtheningCatalyst", 05).getInt(); + AlchemicalWizardry.greaterLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterLengtheningCatalyst", 5).getInt(); AlchemicalWizardry.customPotionDrowningID = config.get("Potion ID", "Drowning", 100).getInt(); AlchemicalWizardry.customPotionBoostID = config.get("Potion ID", "Boost", 101).getInt(); AlchemicalWizardry.customPotionProjProtID = config.get("Potion ID", "ProjProt", 102).getInt(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java b/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java index 97aa9cba..7cf58421 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java @@ -59,8 +59,6 @@ import cpw.mods.fml.common.registry.GameRegistry; */ public class ModBlocks { - - public static Block testingBlock; public static Block bloodStoneBrick; public static Block largeBloodStoneBrick; public static BlockAltar blockAltar; diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index 39f72c93..684dbefd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -6,7 +6,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import WayofTime.alchemicalWizardry.api.items.ItemSpellMultiTool; import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; -import WayofTime.alchemicalWizardry.common.book.ItemBMBook; import WayofTime.alchemicalWizardry.common.items.armour.BoundArmour; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourEarth; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourFire; diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/Vector3.java b/src/main/java/WayofTime/alchemicalWizardry/api/Vector3.java index 338b2b7f..645d97e6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/Vector3.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/Vector3.java @@ -34,7 +34,7 @@ public class Vector3 @Override public boolean equals(Object object) { - return object == this ? true : (object instanceof Vector3 ? canEqual(this) && this.x == ((Vector3) object).x && this.y == ((Vector3) object).y && this.z == ((Vector3) object).z : false); + return object == this || object instanceof Vector3 && canEqual(this) && this.x == ((Vector3) object).x && this.y == ((Vector3) object).y && this.z == ((Vector3) object).z; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipe.java index aad27ee4..17465b72 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipe.java @@ -26,7 +26,7 @@ public class AlchemyRecipe return false; } - ItemStack[] recipe = new ItemStack[5]; + ItemStack[] recipe; if (items.length < 5) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IAlchemyGoggles.java b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IAlchemyGoggles.java index 8b3e2274..3d6ca980 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IAlchemyGoggles.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IAlchemyGoggles.java @@ -6,5 +6,5 @@ import net.minecraft.world.World; public interface IAlchemyGoggles { - public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player); + boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IReagentContainer.java b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IReagentContainer.java index 804fa728..e4d4d9dc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IReagentContainer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IReagentContainer.java @@ -2,15 +2,15 @@ package WayofTime.alchemicalWizardry.api.alchemy.energy; public interface IReagentContainer { - public ReagentStack getReagent(); + ReagentStack getReagent(); - public int getReagentStackAmount(); + int getReagentStackAmount(); - public int getCapacity(); + int getCapacity(); - public int fill(ReagentStack resource, boolean doFill); + int fill(ReagentStack resource, boolean doFill); - public ReagentStack drain(int maxDrain, boolean doDrain); + ReagentStack drain(int maxDrain, boolean doDrain); - public ReagentContainerInfo getInfo(); + ReagentContainerInfo getInfo(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ISegmentedReagentHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ISegmentedReagentHandler.java index 14cb51c3..52be7b9f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ISegmentedReagentHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ISegmentedReagentHandler.java @@ -4,11 +4,11 @@ import java.util.Map; public interface ISegmentedReagentHandler extends IReagentHandler { - public int getNumberOfTanks(); + int getNumberOfTanks(); - public int getTanksTunedToReagent(Reagent reagent); + int getTanksTunedToReagent(Reagent reagent); - public void setTanksTunedToReagent(Reagent reagent, int total); + void setTanksTunedToReagent(Reagent reagent, int total); - public Map getAttunedTankMap(); + Map getAttunedTankMap(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/Reagent.java b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/Reagent.java index 1abbc0b7..4cc88bcb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/Reagent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/Reagent.java @@ -47,6 +47,6 @@ public class Reagent @Override public boolean equals(Object o) { - return o instanceof Reagent ? this == o && name.equals(((Reagent) o).name) : false; + return o instanceof Reagent && this == o && name.equals(((Reagent) o).name); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/TileSegmentedReagentHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/TileSegmentedReagentHandler.java index a088b8a4..d1f2427f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/TileSegmentedReagentHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/TileSegmentedReagentHandler.java @@ -259,7 +259,7 @@ public class TileSegmentedReagentHandler extends TileEntity implements ISegmente return; } - this.attunedTankMap.put(reagent, new Integer(total)); + this.attunedTankMap.put(reagent, total); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java index fab96be4..50212fa9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java @@ -89,7 +89,7 @@ public class AltarRecipe NBTBase comparedBaseTag = comparedTag.getTag(str); if(comparedBaseTag instanceof NBTTagCompound) { - if(!this.areTagsEqual((NBTTagCompound) tag, comparedTag)) + if(!this.areTagsEqual(tag, comparedTag)) { return false; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java index 9f685d55..39d71675 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java @@ -2,5 +2,5 @@ package WayofTime.alchemicalWizardry.api.altarRecipeRegistry; public interface IFadedRune { - public int getAltarTierLimit(int meta); + int getAltarTierLimit(int meta); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/BindingRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/BindingRecipe.java index fc0ba2d7..8d2da96d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/BindingRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/BindingRecipe.java @@ -15,12 +15,7 @@ public class BindingRecipe public boolean doesRequiredItemMatch(ItemStack testStack) { - if (testStack == null || this.requiredItem == null) - { - return false; - } - - return this.requiredItem.isItemEqual(testStack); + return !(testStack == null || this.requiredItem == null) && this.requiredItem.isItemEqual(testStack); } public ItemStack getResult(ItemStack inputItem) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/UnbindingRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/UnbindingRecipe.java index 46c6fc23..c2ce032a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/UnbindingRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/UnbindingRecipe.java @@ -15,12 +15,7 @@ public class UnbindingRecipe public boolean doesRequiredItemMatch(ItemStack testStack) { - if (testStack == null || this.requiredItem == null) - { - return false; - } - - return this.requiredItem.isItemEqual(testStack); + return !(testStack == null || this.requiredItem == null) && this.requiredItem.isItemEqual(testStack); } public ItemStack getResult(ItemStack inputItem) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/compress/CompressionRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/api/compress/CompressionRegistry.java index fd17c8ba..689b022a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/compress/CompressionRegistry.java @@ -30,7 +30,7 @@ public class CompressionRegistry */ public static void registerItemThreshold(ItemStack stack, int threshold) { - thresholdMap.put(stack, new Integer(threshold)); + thresholdMap.put(stack, threshold); } public static ItemStack compressInventory(ItemStack[] inv, World world) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageAltarRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageAltarRecipe.java index 7f334f06..336159b7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageAltarRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageAltarRecipe.java @@ -42,7 +42,7 @@ public class PageAltarRecipe extends PageBase { guiBase.drawCenteredString(fontRenderer, StatCollector.translateToLocal("text.recipe.altar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7); - int inputY = (1 * 20) + (guiTop + guiBase.ySize / 5); + int inputY = (20) + (guiTop + guiBase.ySize / 5); //1 * 20 GuiHelper.drawItemStack(input, inputX, inputY); if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) { guiBase.renderToolTip(input, mouseX, mouseY); @@ -52,7 +52,7 @@ public class PageAltarRecipe extends PageBase { output = new ItemStack(Blocks.fire); } int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7); - int outputY = (1 * 20) + (guiTop + guiBase.xSize / 5); + int outputY = (20) + (guiTop + guiBase.xSize / 5); // 1 * 20 GuiHelper.drawItemStack(output, outputX, outputY); if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { guiBase.renderToolTip(output, outputX, outputY); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageMultiBlock.java b/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageMultiBlock.java index 89d5e839..09f510c2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageMultiBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageMultiBlock.java @@ -63,7 +63,7 @@ public class PageMultiBlock extends PageBase blockCount += perLvl; } tick= (showLayer==-1?blockCount:countPerLevel[showLayer])*40; - int yOff = (structureHeight-1)*12+structureWidth*5+structureLength*5+16; +// int yOff = (structureHeight-1)*12+structureWidth*5+structureLength*5+16; // pageButtons.add(new GuiButtonManualNavigation(gui, 100, x+4,y+yOff/2-5, 10,10, 4)); // pageButtons.add(new GuiButtonManualNavigation(gui, 101, x+4,y+yOff/2-8-16, 10,16, 3)); // pageButtons.add(new GuiButtonManualNavigation(gui, 102, x+4,y+yOff/2+8, 10,16, 2)); @@ -90,7 +90,7 @@ public class PageMultiBlock extends PageBase int xHalf = (structureWidth*5 - structureLength*5); int yOffPartial = (structureHeight-1)*12+structureWidth*5+structureLength*5; - int yOffTotal = yOffPartial+16; +// int yOffTotal = yOffPartial+16; GL11.glDisable(GL11.GL_DEPTH_TEST); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/harvest/IHarvestHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/harvest/IHarvestHandler.java index d5e479d7..0d5fb32b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/harvest/IHarvestHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/harvest/IHarvestHandler.java @@ -16,5 +16,5 @@ public interface IHarvestHandler * @param meta meta at this given location * @return true if successfully harvested, false if not */ - public boolean harvestAndPlant(World world, int xCoord, int yCoord, int zCoord, Block block, int meta); + boolean harvestAndPlant(World world, int xCoord, int yCoord, int zCoord, Block block, int meta); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapedBloodOrbRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapedBloodOrbRecipe.java index 6e5b0f9b..83461f3f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapedBloodOrbRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapedBloodOrbRecipe.java @@ -102,8 +102,8 @@ public class ShapedBloodOrbRecipe implements IRecipe if (in instanceof IBloodOrb || (in instanceof ItemStack && ((ItemStack) in).getItem() instanceof IBloodOrb)) { //If the item is an instanceof IBloodOrb then save the level of the orb if (in instanceof ItemStack) - itemMap.put(chr, (Integer) (((IBloodOrb) ((ItemStack) in).getItem()).getOrbLevel())); - else itemMap.put(chr, (Integer) (((IBloodOrb) in).getOrbLevel())); + itemMap.put(chr, ((IBloodOrb) ((ItemStack) in).getItem()).getOrbLevel()); + else itemMap.put(chr, ((IBloodOrb) in).getOrbLevel()); } else if (in instanceof ItemStack) { itemMap.put(chr, ((ItemStack) in).copy()); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ArmourUpgrade.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ArmourUpgrade.java index 7fce7cd0..ff4cec00 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ArmourUpgrade.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ArmourUpgrade.java @@ -7,9 +7,9 @@ import net.minecraft.world.World; public interface ArmourUpgrade { //Called when the armour ticks - public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack); + void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack); - public boolean isUpgrade(); + boolean isUpgrade(); - public int getEnergyForTenSeconds(); + int getEnergyForTenSeconds(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBloodOrb.java index e88e9cc2..c38ea2f1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBloodOrb.java @@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.api.items.interfaces; public interface IBloodOrb { - public int getMaxEssence(); + int getMaxEssence(); - public int getOrbLevel(); + int getOrbLevel(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java index 08666771..3577ad47 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java @@ -6,39 +6,39 @@ import net.minecraft.world.World; public interface IMasterRitualStone extends ISegmentedReagentHandler { - public void performRitual(World world, int x, int y, int z, String ritualID); + void performRitual(World world, int x, int y, int z, String ritualID); - public String getOwner(); + String getOwner(); - public void setCooldown(int newCooldown); + void setCooldown(int newCooldown); - public int getCooldown(); + int getCooldown(); - public void setVar1(int newVar1); + void setVar1(int newVar1); - public int getVar1(); + int getVar1(); - public void setActive(boolean active); + void setActive(boolean active); - public int getDirection(); + int getDirection(); - public World getWorld(); + World getWorld(); - public int getXCoord(); + int getXCoord(); - public int getYCoord(); + int getYCoord(); - public int getZCoord(); + int getZCoord(); - public NBTTagCompound getCustomRitualTag(); + NBTTagCompound getCustomRitualTag(); - public void setCustomRitualTag(NBTTagCompound tag); + void setCustomRitualTag(NBTTagCompound tag); - public boolean areTanksEmpty(); + boolean areTanksEmpty(); - public int getRunningTime(); + int getRunningTime(); - public LocalRitualStorage getLocalStorage(); + LocalRitualStorage getLocalStorage(); - public void setLocalStorage(LocalRitualStorage storage); + void setLocalStorage(LocalRitualStorage storage); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java index c2cec510..3ea6d90e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java @@ -14,5 +14,5 @@ public interface IRitualStone * @param runeType * @return */ - public boolean isRuneType(World world, int x, int y, int z, int meta, int runeType); + boolean isRuneType(World world, int x, int y, int z, int meta, int runeType); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/ITileRitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/ITileRitualStone.java index 72045152..68a0a24e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/ITileRitualStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/ITileRitualStone.java @@ -2,5 +2,5 @@ package WayofTime.alchemicalWizardry.api.rituals; public interface ITileRitualStone { - public boolean isRuneType(int runeType); + boolean isRuneType(int runeType); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java index a4d4f665..4b9a48c6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java @@ -126,12 +126,7 @@ public class Rituals { int direction = Rituals.getDirectionOfRitual(world, x, y, z, ritualID); - if (direction != -1) - { - return true; - } - - return false; + return direction != -1; } /** @@ -149,8 +144,8 @@ public class Rituals return false; } - Block test = null; - TileEntity te = null; + Block test; + TileEntity te; for (RitualComponent rc : ritual) { @@ -292,11 +287,6 @@ public class Rituals } } - public static int getNumberOfRituals() - { - return ritualMap.size(); - } - public String getRitualName() { return this.name; diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/IIncense.java b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/IIncense.java index 34c8aac5..46b04a00 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/IIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/IIncense.java @@ -4,18 +4,18 @@ import net.minecraft.item.ItemStack; public interface IIncense { - public int getMinLevel(ItemStack stack); + int getMinLevel(ItemStack stack); - public int getMaxLevel(ItemStack stack); + int getMaxLevel(ItemStack stack); - public int getIncenseDuration(ItemStack stack); + int getIncenseDuration(ItemStack stack); /** * @param stack * @return a float from 0 to 1 */ - public float getRedColour(ItemStack stack); - public float getGreenColour(ItemStack stack); - public float getBlueColour(ItemStack stack); + float getRedColour(ItemStack stack); + float getGreenColour(ItemStack stack); + float getBlueColour(ItemStack stack); float getTickRate(ItemStack stack); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java index 7ebf91e8..4a02c2d5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java @@ -95,7 +95,7 @@ public class PlayerSacrificeHandler public static IBloodAltar getAltar(World world, int x, int y, int z) { - TileEntity tileEntity = null; + TileEntity tileEntity; for (int i = -2; i <= 2; i++) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java index 6bab0503..d9f30f41 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java @@ -1,7 +1,5 @@ package WayofTime.alchemicalWizardry.api.soulNetwork; -import java.util.UUID; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,26 +14,11 @@ import WayofTime.alchemicalWizardry.api.event.ItemBindEvent; import WayofTime.alchemicalWizardry.api.event.ItemDrainInContainerEvent; import WayofTime.alchemicalWizardry.api.event.ItemDrainNetworkEvent; -import com.mojang.authlib.GameProfile; - import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.Event.Result; public class SoulNetworkHandler { - public static UUID getUUIDFromPlayer(EntityPlayer player) - { - return player.getPersistentID(); - } - - public static EntityPlayer getPlayerFromUUID(UUID uuid) - { - MinecraftServer server = MinecraftServer.getServer(); - GameProfile gameProfile; - gameProfile = server.func_152358_ax().func_152652_a(uuid); - return null; - } - public static boolean syphonFromNetworkWhileInContainer(ItemStack ist, int damageToBeDone) { String ownerName = ""; @@ -204,10 +187,6 @@ public class SoulNetworkHandler World world = player.worldObj; if (world != null) { - double posX = player.posX; - double posY = player.posY; - double posZ = player.posZ; - world.playSoundEffect((double) ((float) player.posX + 0.5F), (double) ((float) player.posY + 0.5F), (double) ((float) player.posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java index 5c5935e5..aff20eb5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java @@ -238,12 +238,11 @@ public class APISpellHelper float f6 = MathHelper.sin(-f1 * 0.017453292F); float f7 = f4 * f5; float f8 = f3 * f5; - double d3 = range; - if (player instanceof EntityPlayerMP) +// if (player instanceof EntityPlayerMP) { // d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance(); } - Vec3 vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3); + Vec3 vec31 = vec3.addVector((double) f7 * range, (double) f6 * range, (double) f8 * range); return world.func_147447_a(vec3, vec31, par3, !par3, par3); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java index d6ed9986..51657249 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java @@ -83,7 +83,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile @Override protected void entityInit() { - dataWatcher.addObject(16, Byte.valueOf((byte) 0)); + dataWatcher.addObject(16, 0); } /** @@ -200,7 +200,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile Block var18 = worldObj.getBlock(xTile, yTile, zTile); int var19 = worldObj.getBlockMetadata(xTile, yTile, zTile); - if (var18.equals(Block.getBlockById(inTile)) && var19 == inData) +// if (var18.equals(Block.getBlockById(inTile)) && var19 == inData) { // this.groundImpact(); // this.setDead(); @@ -353,7 +353,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile List spellEffectList = new LinkedList(); for (int i = 0; i < tagList.tagCount(); i++) { - NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i); + NBTTagCompound tag = tagList.getCompoundTagAt(i); SpellEffect eff = SpellEffect.getEffectFromTag(tag); if (eff != null) @@ -420,10 +420,10 @@ public class EntitySpellProjectile extends Entity implements IProjectile byte var2 = dataWatcher.getWatchableObjectByte(16); if (par1) { - dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 | 1))); + dataWatcher.updateObject(16, var2 | 1); } else { - dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 & -2))); + dataWatcher.updateObject(16, var2 & -2); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IDigAreaEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IDigAreaEffect.java index 2355ed7d..07939312 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IDigAreaEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IDigAreaEffect.java @@ -8,5 +8,5 @@ import net.minecraft.world.World; public interface IDigAreaEffect { - public abstract int digSurroundingArea(ItemStack container, World world, EntityPlayer player, MovingObjectPosition blockPos, String usedToolClass, float blockHardness, int harvestLvl, ItemSpellMultiTool itemTool); + int digSurroundingArea(ItemStack container, World world, EntityPlayer player, MovingObjectPosition blockPos, String usedToolClass, float blockHardness, int harvestLvl, ItemSpellMultiTool itemTool); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/ILeftClickEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ILeftClickEffect.java index 65f53f86..5683998b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/ILeftClickEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ILeftClickEffect.java @@ -5,5 +5,5 @@ import net.minecraft.item.ItemStack; public interface ILeftClickEffect { - public abstract int onLeftClickEntity(ItemStack stack, EntityLivingBase attacked, EntityLivingBase weilder); + int onLeftClickEntity(ItemStack stack, EntityLivingBase attacked, EntityLivingBase weilder); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java index 6b5d7ef7..4e1608cc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java @@ -5,5 +5,5 @@ import net.minecraft.world.World; public interface IMeleeSpellEntityEffect { - public void onEntityImpact(World world, EntityPlayer entityPlayer); + void onEntityImpact(World world, EntityPlayer entityPlayer); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java index b0560cfb..9be8966b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java @@ -5,5 +5,5 @@ import net.minecraft.world.World; public interface IMeleeSpellWorldEffect { - public void onWorldEffect(World world, EntityPlayer entityPlayer); + void onWorldEffect(World world, EntityPlayer entityPlayer); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBanishTool.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBanishTool.java index 4e12fdd4..d69396ba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBanishTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBanishTool.java @@ -6,5 +6,5 @@ import net.minecraft.world.World; public interface IOnBanishTool { - public abstract int onBanishTool(ItemStack toolStack, World world, Entity entity, int invSlot, boolean inHand); + int onBanishTool(ItemStack toolStack, World world, Entity entity, int invSlot, boolean inHand); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBreakBlock.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBreakBlock.java index 12f844cb..6c10f6c3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBreakBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBreakBlock.java @@ -8,5 +8,5 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IOnBreakBlock { - public abstract int onBlockBroken(ItemStack container, World world, EntityPlayer player, Block block, int meta, int x, int y, int z, ForgeDirection sideBroken); + int onBlockBroken(ItemStack container, World world, EntityPlayer player, Block block, int meta, int x, int y, int z, ForgeDirection sideBroken); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnSummonTool.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnSummonTool.java index 6a5ea4d3..e1a599a7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnSummonTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnSummonTool.java @@ -6,5 +6,5 @@ import net.minecraft.world.World; public interface IOnSummonTool { - public abstract int onSummonTool(ItemStack toolStack, World world, Entity entity); + int onSummonTool(ItemStack toolStack, World world, Entity entity); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java index c534823c..93215506 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java @@ -6,7 +6,7 @@ import net.minecraft.world.World; public interface IProjectileImpactEffect { - public void onEntityImpact(Entity mop, Entity projectile); + void onEntityImpact(Entity mop, Entity projectile); - public void onTileImpact(World world, MovingObjectPosition mop); + void onTileImpact(World world, MovingObjectPosition mop); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java index e9735388..958a83e7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java @@ -4,5 +4,5 @@ import net.minecraft.entity.Entity; public interface IProjectileUpdateEffect { - public void onUpdateEffect(Entity projectile); + void onUpdateEffect(Entity projectile); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IRightClickEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IRightClickEffect.java index dd9f7d26..b779b110 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IRightClickEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IRightClickEffect.java @@ -9,7 +9,7 @@ public interface IRightClickEffect { //public abstract int onRightClickEntity(ItemStack stack, EntityLivingBase attacked, EntityLivingBase weilder); - public abstract int onRightClickBlock(ItemStack stack, EntityLivingBase weilder, World world, MovingObjectPosition mop); + int onRightClickBlock(ItemStack stack, EntityLivingBase weilder, World world, MovingObjectPosition mop); - public abstract int onRightClickAir(ItemStack stack, EntityLivingBase weilder); + int onRightClickAir(ItemStack stack, EntityLivingBase weilder); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java index c49edafd..5bb25de3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java @@ -5,5 +5,5 @@ import net.minecraft.world.World; public interface ISelfSpellEffect { - public void onSelfUse(World world, EntityPlayer player); + void onSelfUse(World world, EntityPlayer player); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISpecialDamageEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISpecialDamageEffect.java index 323ccf3b..f60024b2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISpecialDamageEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISpecialDamageEffect.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; public interface ISpecialDamageEffect { - public float getDamageForEntity(Entity entity); + float getDamageForEntity(Entity entity); - public String getKey(); + String getKey(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IToolUpdateEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IToolUpdateEffect.java index c3bacfc2..92b7745a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/IToolUpdateEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IToolUpdateEffect.java @@ -6,5 +6,5 @@ import net.minecraft.world.World; public interface IToolUpdateEffect { - public abstract int onUpdate(ItemStack toolStack, World world, Entity par3Entity, int invSlot, boolean inHand); + int onUpdate(ItemStack toolStack, World world, Entity par3Entity, int invSlot, boolean inHand); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java index acbbdcc8..a7cb6b40 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java @@ -6,7 +6,7 @@ public class SpellEnhancement public static final int EFFICIENCY = 1; public static final int POTENCY = 2; - private int state = this.POWER; + private int state = POWER; protected SpellEnhancement(int state) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java index 8078ce64..a5ea252d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.spell; public class SpellEnhancementCost extends SpellEnhancement { - public SpellEnhancementCost() { super(SpellEnhancement.EFFICIENCY); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java index a540f89d..00ffc98f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java @@ -6,5 +6,4 @@ public class SpellEnhancementPotency extends SpellEnhancement { super(SpellEnhancement.POTENCY); } - } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java index 044ef100..d6e27d20 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.spell; public class SpellEnhancementPower extends SpellEnhancement { - public SpellEnhancementPower() { super(SpellEnhancement.POWER); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java index f6cc001b..e407ef24 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java @@ -30,7 +30,6 @@ public class SpellParadigmTool extends SpellParadigm private List digAreaEffectList; private List specialDamageEffectList; - private float maxDamage; private HashMap harvestLevel; private HashMap digSpeed; private HashMap maxDamageHash; @@ -62,8 +61,6 @@ public class SpellParadigmTool extends SpellParadigm this.toolInfoString = new HashMap(); this.critChanceHash = new HashMap(); - this.maxDamage = 5; - this.harvestLevel = new HashMap(); this.harvestLevel.put("pickaxe", -1); this.harvestLevel.put("shovel", -1); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java b/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java index 265b7cf7..eaee5700 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java @@ -5,39 +5,38 @@ package WayofTime.alchemicalWizardry.api.tile; */ public interface IBloodAltar { + int getCapacity(); - public int getCapacity(); + int getCurrentBlood(); - public int getCurrentBlood(); + int getTier(); - public int getTier(); + int getProgress(); - public int getProgress(); + float getSacrificeMultiplier(); - public float getSacrificeMultiplier(); + float getSelfSacrificeMultiplier(); - public float getSelfSacrificeMultiplier(); + float getOrbMultiplier(); - public float getOrbMultiplier(); + float getDislocationMultiplier(); - public float getDislocationMultiplier(); + int getBufferCapacity(); - public int getBufferCapacity(); + void sacrificialDaggerCall(int amount, boolean b); - public void sacrificialDaggerCall(int amount, boolean b); - - public void startCycle(); + void startCycle(); /** * Will set the altar to initiate a cooldown cycle after it crafts before starting to craft again, giving the user time to interact with the altar. * This can only be set while the altar is not active. * @param amount */ - public void requestPauseAfterCrafting(int amount); + void requestPauseAfterCrafting(int amount); - public void addToDemonBloodDuration(int dur); + void addToDemonBloodDuration(int dur); - public boolean hasDemonBlood(); + boolean hasDemonBlood(); - public void decrementDemonBlood(); + void decrementDemonBlood(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellParadigmTile.java b/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellParadigmTile.java index de9994bb..97af71d2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellParadigmTile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellParadigmTile.java @@ -6,5 +6,5 @@ import net.minecraft.world.World; public interface ISpellParadigmTile extends ISpellTile { - public void castSpell(World world, EntityPlayer entity, ItemStack spellCasterStack); + void castSpell(World world, EntityPlayer entity, ItemStack spellCasterStack); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellTile.java b/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellTile.java index 143a0ea3..c5d868e0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellTile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/tile/ISpellTile.java @@ -5,7 +5,7 @@ import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; public interface ISpellTile { - public void modifySpellParadigm(SpellParadigm parad); + void modifySpellParadigm(SpellParadigm parad); - public boolean canInputRecieveOutput(ForgeDirection output); + boolean canInputRecieveOutput(ForgeDirection output); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IEntryElement.java b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IEntryElement.java index 5bedc1e0..41a2970c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IEntryElement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IEntryElement.java @@ -7,7 +7,7 @@ public interface IEntryElement{ /** * In here you need to draw the element */ - public void drawElement(); + void drawElement(); /** * @param mX @@ -16,7 +16,7 @@ public interface IEntryElement{ * Mouse Y Position * @return is the mouse in a element */ - public boolean isMouseInElement(int mX, int mY); + boolean isMouseInElement(int mX, int mY); /** * This get's called when you enter the element @@ -26,7 +26,7 @@ public interface IEntryElement{ * Mouse Y Position */ - public void onMouseEnter(int mX, int mY); + void onMouseEnter(int mX, int mY); /** * This get's called when you click within the element @@ -37,5 +37,5 @@ public interface IEntryElement{ * @param type * Type of click (right, left, scroll) */ - public void onMouseClick(int mX, int mY, int type); + void onMouseClick(int mX, int mY, int type); } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IReviving.java b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IReviving.java index 79cea9fc..2cf180fd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IReviving.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IReviving.java @@ -3,5 +3,5 @@ package WayofTime.alchemicalWizardry.book.interfaces; import net.minecraft.world.World; public interface IReviving { - public void spawnEntity(World world, int x, int y, int z); + void spawnEntity(World world, int x, int y, int z); } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java index 23984f27..740a7069 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java @@ -66,7 +66,7 @@ public class ClientEventHandler if (event.phase.equals(Phase.START)) return; - if (!RenderHelper.onTickInGame(mcClient)) +// if (!RenderHelper.onTickInGame(mcClient)) { } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java index 0cb1c207..5f1075af 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java @@ -106,7 +106,6 @@ import cpw.mods.fml.common.FMLCommonHandler; public class ClientProxy extends CommonProxy { public static int renderPass; - public static int altarRenderType; @Override public void registerPostSideObjects() diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/KeyBindings.java b/src/main/java/WayofTime/alchemicalWizardry/client/KeyBindings.java index b616b662..2c924ac1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/KeyBindings.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/KeyBindings.java @@ -4,7 +4,7 @@ import net.minecraft.client.settings.KeyBinding; public class KeyBindings { - public static KeyBinding omegaTest; +// public static KeyBinding omegaTest; public static void init() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java index 72dd1b8a..d06aded2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java @@ -122,7 +122,6 @@ public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(ItemStack result) { for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { if (recipe == null) continue; - ItemStack output = recipe.getResult(); if (NEIServerUtils.areStacksSameTypeCrafting(result, recipe.getResult())) { arecipes.add(new CachedAlchemyRecipe(recipe)); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java index 372d8ad1..7029d5f4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java @@ -81,7 +81,7 @@ public class NEIAltarRecipeHandler extends TemplateRecipeHandler { //Mouse Position helper public Point getMouse(int width, int height) { - Point mousepos = this.getMousePosition(); + Point mousepos = getMousePosition(); int guiLeft = (width - 176) / 2; int guiTop = (height - 166) / 2; Point relMouse = new Point(mousepos.x - guiLeft, mousepos.y - guiTop); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java index ad2c63fe..98e2b782 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java @@ -49,7 +49,7 @@ public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { ingredients.add(stack); }else if(o instanceof List) { - PositionedStack stack = new PositionedStack((List)o, 25 + x * 18, 6 + y * 18, false); + PositionedStack stack = new PositionedStack(o, 25 + x * 18, 6 + y * 18, false); stack.setMaxSize(1); ingredients.add(stack); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java index 3e1b3d87..7be1ee25 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java @@ -46,7 +46,7 @@ public class NEIBloodOrbShapelessHandler extends ShapelessRecipeHandler { ingredients.add(stack); }else if(o instanceof List) { - PositionedStack stack = new PositionedStack((List)o, 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); + PositionedStack stack = new PositionedStack(o, 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); stack.setMaxSize(1); ingredients.add(stack); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/HUDElement.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/HUDElement.java index 2ceba76d..f3f97f01 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/HUDElement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/HUDElement.java @@ -59,8 +59,8 @@ public class HUDElement if (itemStack != null) { - int damage = 1; - int maxDamage = 1; + int damage; + int maxDamage; if (showValue) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/Helper.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/Helper.java deleted file mode 100644 index 1d3bcada..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/Helper.java +++ /dev/null @@ -1,17 +0,0 @@ -package WayofTime.alchemicalWizardry.client.renderer; - -import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; -import WayofTime.alchemicalWizardry.api.rituals.Rituals; - -public class Helper -{ - public static RitualEffect getEffectFromString(String name) - { - Rituals ritual = Rituals.ritualMap.get(name); - - if (ritual == null) - return null; - - return ritual.effect; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderFakeBlocks.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderFakeBlocks.java index 29054f37..1ddd11d2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderFakeBlocks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderFakeBlocks.java @@ -17,12 +17,10 @@ public class RenderFakeBlocks double maxY = minY + 1; double maxZ = minZ + 1; Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); tessellator.setColorRGBA(255, 255, 255, 200); - float texMinU, texMaxU, texMinV, texMaxV; texMinU = getMinU(block, meta, 0); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java index 9570d635..964feb72 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java @@ -29,7 +29,6 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class RenderHelper { - public static boolean showEquippedItem = true; public static boolean enableItemName = false; public static boolean enabled = true; public static boolean showInChat = true; @@ -62,7 +61,6 @@ public class RenderHelper { EntityPlayer player = mc.thePlayer; player.getEntityData(); - World world = mc.theWorld; if (SpellHelper.canPlayerSeeAlchemy(player)) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); @@ -254,10 +252,10 @@ public class RenderHelper float f1 = 0.00390625F; Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + p_73729_6_), (double)zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + p_73729_6_), (double)zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + 0), (double)zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + 0), (double)zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + 0) * f1)); + tessellator.addVertexWithUV((double)p_73729_1_, p_73729_2_ + p_73729_6_, (double)zLevel, (p_73729_3_ * f), (p_73729_4_ + p_73729_6_) * f1); + tessellator.addVertexWithUV(p_73729_1_ + p_73729_5_, p_73729_2_ + p_73729_6_, (double)zLevel, (p_73729_3_ + p_73729_5_) * f, (p_73729_4_ + p_73729_6_) * f1); + tessellator.addVertexWithUV(p_73729_1_ + p_73729_5_, (double)p_73729_2_, (double)zLevel, (p_73729_3_ + p_73729_5_) * f, p_73729_4_ * f1); + tessellator.addVertexWithUV((double)p_73729_1_, (double)p_73729_2_, (double)zLevel, (double)(p_73729_3_ * f), p_73729_4_ * f1); tessellator.draw(); } @@ -295,10 +293,10 @@ public class RenderHelper { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double)(p_94149_1_ + 0), (double)(p_94149_2_ + p_94149_5_), (double)zLevel, (double)p_94149_3_.getMinU(), (double)p_94149_3_.getMaxV()); + tessellator.addVertexWithUV((double)p_94149_1_, (double)(p_94149_2_ + p_94149_5_), (double)zLevel, (double)p_94149_3_.getMinU(), (double)p_94149_3_.getMaxV()); tessellator.addVertexWithUV((double)(p_94149_1_ + p_94149_4_), (double)(p_94149_2_ + p_94149_5_), (double)zLevel, (double)p_94149_3_.getMaxU(), (double)p_94149_3_.getMaxV()); - tessellator.addVertexWithUV((double)(p_94149_1_ + p_94149_4_), (double)(p_94149_2_ + 0), (double)zLevel, (double)p_94149_3_.getMaxU(), (double)p_94149_3_.getMinV()); - tessellator.addVertexWithUV((double)(p_94149_1_ + 0), (double)(p_94149_2_ + 0), (double)zLevel, (double)p_94149_3_.getMinU(), (double)p_94149_3_.getMinV()); + tessellator.addVertexWithUV((double)(p_94149_1_ + p_94149_4_), (double)p_94149_2_, (double)zLevel, (double)p_94149_3_.getMaxU(), (double)p_94149_3_.getMinV()); + tessellator.addVertexWithUV((double)p_94149_1_, (double)p_94149_2_, (double)zLevel, (double)p_94149_3_.getMinU(), (double)p_94149_3_.getMinV()); tessellator.draw(); } @@ -331,7 +329,7 @@ public class RenderHelper e.renderToHud(xBase + prevX + (alignMode.toLowerCase().contains("right") ? e.width() : 0), yBase); prevX += (e.width()); } - } else if (listMode.equalsIgnoreCase("compound")) + } //else if (listMode.equalsIgnoreCase("compound")) { //TODO } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java index 3d809346..2899815d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java @@ -63,7 +63,6 @@ import cpw.mods.fml.common.registry.GameRegistry; public class AlchemicalWizardryEventHooks { public static Map playerFlightBuff = new HashMap(); - public static Map playerBoostStepHeight = new HashMap(); public static List playersWith1Step = new ArrayList(); public static Map> respawnMap = new HashMap(); @@ -118,8 +117,7 @@ public class AlchemicalWizardryEventHooks if(prevHp > 0) { double originalDamage = event.ammount; - double initialReagentHp = prevHp; - + float recalculatedAmount = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, event.source, event.ammount); if (recalculatedAmount <= 0) return; recalculatedAmount = SpellHelper.applyPotionDamageCalculations(player, event.source, recalculatedAmount); //Recalculated damage @@ -241,7 +239,7 @@ public class AlchemicalWizardryEventHooks reagentAmount -= drain; hasReagentChanged = true; - + health += addedAmount; hasHealthChanged = true; @@ -378,7 +376,6 @@ public class AlchemicalWizardryEventHooks if (event.entityLiving instanceof EntityCreeper) { - GameRegistry d; return; } @@ -471,7 +468,7 @@ public class AlchemicalWizardryEventHooks { int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionReciprocation).getAmplifier(); float damageRecieve = event.ammount / 2 * (i + 1); - ((EntityLivingBase) entityAttacking).attackEntityFrom(DamageSource.generic, damageRecieve); + entityAttacking.attackEntityFrom(DamageSource.generic, damageRecieve); } } @@ -527,7 +524,7 @@ public class AlchemicalWizardryEventHooks NewPacketHandler.INSTANCE.sendTo(NewPacketHandler.getLPPacket(SoulNetworkHandler.getCurrentEssence(ownerName), SoulNetworkHandler.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(ownerName))), (EntityPlayerMP)entityLiving); } } - ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, ((EntityPlayer) event.entityLiving).capabilities, Float.valueOf(0.1f), new String[]{"walkSpeed", "g", "field_75097_g"}); + ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, ((EntityPlayer) event.entityLiving).capabilities, 0.1F, "walkSpeed", "g", "field_75097_g"); } if (entityLiving instanceof EntityPlayer && entityLiving.worldObj.isRemote) @@ -557,7 +554,7 @@ public class AlchemicalWizardryEventHooks { int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionDrowning).getAmplifier(); - if (event.entityLiving.worldObj.getWorldTime() % ((int) (20 / (i + 1))) == 0) + if (event.entityLiving.worldObj.getWorldTime() % (20 / (i + 1)) == 0) { event.entityLiving.attackEntityFrom(DamageSource.drown, 2); event.entityLiving.hurtResistantTime = Math.min(event.entityLiving.hurtResistantTime, 20 / (i + 1)); @@ -569,7 +566,6 @@ public class AlchemicalWizardryEventHooks if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionBoost)) { int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionBoost).getAmplifier(); - EntityLivingBase entity = event.entityLiving; //if(!entity.isSneaking()) { float percentIncrease = (i + 1) * 0.05f; @@ -600,7 +596,6 @@ public class AlchemicalWizardryEventHooks AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5).expand(d0, d0, d0); List list = event.entityLiving.worldObj.getEntitiesWithinAABB(Entity.class, axisalignedbb); Iterator iterator = list.iterator(); - EntityLivingBase livingEntity; while (iterator.hasNext()) { @@ -826,14 +821,9 @@ public class AlchemicalWizardryEventHooks { if(entity instanceof IManaBurst) { ItemStack lens = ((IManaBurst)entity).getSourceLens(); - if(lens.getItemDamage()!=8 && lens.getItemDamage()!=11) - return false; - else - return true; + return !(lens.getItemDamage()!=8 && lens.getItemDamage()!=11); } else return false; - - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java index 167559d5..5a09d2b2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java @@ -17,13 +17,12 @@ public class AlchemicalWizardryFuelHandler implements IFuelHandler @Override public int getBurnTime(ItemStack fuel) { - ItemStack itemStack = fuel; - if (itemStack == null) + if (fuel == null) { return 0; } - Item fuelItem = itemStack.getItem(); + Item fuelItem = fuel.getItem(); if (fuelItem.equals(ModItems.lavaCrystal)) { @@ -34,7 +33,7 @@ public class AlchemicalWizardryFuelHandler implements IFuelHandler return 200; } else { - NBTTagCompound tag = itemStack.getTagCompound(); + NBTTagCompound tag = fuel.getTagCompound(); if (tag == null) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java b/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java index c42748eb..ee1a7d93 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java @@ -27,9 +27,6 @@ import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy { - public static String ITEMS_PNG = "/WayofTime/alchemicalWizardry/items.png"; - public static String BLOCK_PNG = "/WayofTime/alchemicalWizardry/block.png"; - // Client stuff public void registerRenderers() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/IBindingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/IBindingAgent.java index 534d4b68..f2dcdc7d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/IBindingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/IBindingAgent.java @@ -2,5 +2,5 @@ package WayofTime.alchemicalWizardry.common; public interface IBindingAgent { - public abstract float getSuccessRateForPotionNumber(int potionEffects); + float getSuccessRateForPotionNumber(int potionEffects); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/ICatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/ICatalyst.java index 230cd51c..c3677580 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/ICatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/ICatalyst.java @@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common; public interface ICatalyst { - public abstract int getCatalystLevel(); + int getCatalystLevel(); - public abstract boolean isConcentration(); + boolean isConcentration(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/IDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/IDemon.java index abe0632b..e1d9cfdd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/IDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/IDemon.java @@ -2,13 +2,13 @@ package WayofTime.alchemicalWizardry.common; public interface IDemon { - public abstract void setSummonedConditions(); + void setSummonedConditions(); - public boolean isAggro(); + boolean isAggro(); - public void setAggro(boolean aggro); + void setAggro(boolean aggro); - public boolean getDoesDropCrystal(); + boolean getDoesDropCrystal(); - public void setDropCrystal(boolean crystal); + void setDropCrystal(boolean crystal); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/IFillingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/IFillingAgent.java index 2202a20d..df415cbf 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/IFillingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/IFillingAgent.java @@ -2,5 +2,5 @@ package WayofTime.alchemicalWizardry.common; public interface IFillingAgent { - public abstract int getFilledAmountForPotionNumber(int potionEffects); + int getFilledAmountForPotionNumber(int potionEffects); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java index 65b21e2c..5bdc65e4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java @@ -114,8 +114,6 @@ public enum NewPacketHandler TileEntity te = world.getTileEntity(msg.x, msg.y, msg.z); if (te instanceof TEOrientable) { - TEOrientable tile = (TEOrientable) te; - ((TEOrientable) te).setInputDirection(ForgeDirection.getOrientation(msg.input)); ((TEOrientable) te).setOutputDirection(ForgeDirection.getOrientation(msg.output)); } @@ -459,7 +457,7 @@ public enum NewPacketHandler target.writeInt(msg.index); - switch(msg.index) +// switch(msg.index) { } @@ -472,7 +470,7 @@ public enum NewPacketHandler System.out.println("Packet is recieved and being decoded"); - switch(index) +// switch(index) { } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAlchemicCalcinator.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAlchemicCalcinator.java index cd1aeb22..e9e98e44 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAlchemicCalcinator.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAlchemicCalcinator.java @@ -147,7 +147,7 @@ public class BlockAlchemicCalcinator extends BlockContainer tileEntity.setInventorySlotContents(1, newItem); } - } else if (playerItem == null) + } else { if (tileEntity.getStackInSlot(1) != null) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java index 0407445b..1b425496 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java @@ -26,13 +26,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockAltar extends BlockContainer { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon1; + private IIcon sideIcon2; @SideOnly(Side.CLIENT) - private static IIcon sideIcon2; - @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockAltar() { @@ -48,7 +46,6 @@ public class BlockAltar extends BlockContainer public void registerBlockIcons(IIconRegister iconRegister) { this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Top"); - this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType1"); this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2"); this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom"); } @@ -89,7 +86,7 @@ public class BlockAltar extends BlockContainer int maxEssence = bloodOrb.getMaxEssence(); int currentEssence = bloodOrb.getCurrentEssence(stack); int level = currentEssence * 15 / maxEssence; - return ((int) (Math.min(15, level))) % 16; + return Math.min(15, level) % 16; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java index b49d3b99..4b0dfb9a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java @@ -51,7 +51,7 @@ public class BlockBloodLightSource extends Block { if (rand.nextInt(3) != 0) { - float f = (float) 1.0F; + float f = 1.0F; float f1 = f * 0.6F + 0.4F; float f2 = f * f * 0.7F - 0.5F; float f3 = f * f * 0.6F - 0.7F; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java index 15fc85db..8be5b305 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java @@ -13,13 +13,11 @@ import net.minecraft.world.World; public class BlockConduit extends BlockOrientable { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon1; + private IIcon sideIcon2; @SideOnly(Side.CLIENT) - private static IIcon sideIcon2; - @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockConduit() { @@ -35,7 +33,6 @@ public class BlockConduit extends BlockOrientable public void registerBlockIcons(IIconRegister iconRegister) { this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Top"); - this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType1"); this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2"); this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java index d51d6099..195375ed 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java @@ -24,11 +24,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockCrucible extends BlockContainer { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon; + private IIcon sideIcon; @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockCrucible() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java index ea95d12e..57184a4f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java @@ -17,7 +17,9 @@ import java.util.List; public class BlockCrystal extends Block { //private Icon bloodRuneIcon; + @SideOnly(Side.CLIENT) private IIcon fullIcon; + @SideOnly(Side.CLIENT) private IIcon brickIcon; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java index 561b7a29..9cd21a37 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java @@ -17,8 +17,10 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph { - public IIcon enchantability; - public IIcon enchantmentLevel; + @SideOnly(Side.CLIENT) + private IIcon enchantability; + @SideOnly(Side.CLIENT) + private IIcon enchantmentLevel; public BlockEnchantmentGlyph() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java index c12b89e6..f1ba267a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java @@ -17,9 +17,12 @@ import net.minecraft.world.World; public class BlockHomHeart extends BlockContainer { - public IIcon bottomIcon; - public IIcon topIcon; - public IIcon sideIcon; + @SideOnly(Side.CLIENT) + private IIcon bottomIcon; + @SideOnly(Side.CLIENT) + private IIcon topIcon; + @SideOnly(Side.CLIENT) + private IIcon sideIcon; public BlockHomHeart() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockOrientable.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockOrientable.java index 16ac3581..6836b7ff 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockOrientable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockOrientable.java @@ -34,7 +34,6 @@ public class BlockOrientable extends BlockContainer return false; } - ForgeDirection sideClicked = ForgeDirection.getOrientation(side); TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof TEOrientable) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java index d0798a77..d057b4a3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java @@ -22,13 +22,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockPedestal extends BlockContainer { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon1; + private IIcon sideIcon2; @SideOnly(Side.CLIENT) - private static IIcon sideIcon2; - @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockPedestal() { @@ -46,7 +44,6 @@ public class BlockPedestal extends BlockContainer public void registerBlockIcons(IIconRegister iconRegister) { this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePedestal"); - this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java index 5bfad908..56d47c64 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java @@ -22,13 +22,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockPlinth extends BlockContainer { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon1; + private IIcon sideIcon2; @SideOnly(Side.CLIENT) - private static IIcon sideIcon2; - @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockPlinth() { @@ -46,7 +44,6 @@ public class BlockPlinth extends BlockContainer public void registerBlockIcons(IIconRegister iconRegister) { this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePlinth"); - this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java index be896e75..813e00ad 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java @@ -15,7 +15,7 @@ public class BlockSchematicSaver extends BlockContainer super(Material.rock); setHardness(2.0F); setResistance(5.0F); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); +// setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.setBlockName("schematicSaver"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java index a3a10951..9cfd5bcd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java @@ -23,13 +23,11 @@ import java.util.Random; public class BlockSocket extends BlockContainer { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon1; + private IIcon sideIcon2; @SideOnly(Side.CLIENT) - private static IIcon sideIcon2; - @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockSocket() { @@ -46,7 +44,6 @@ public class BlockSocket extends BlockContainer public void registerBlockIcons(IIconRegister iconRegister) { this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEnhancement.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEnhancement.java index 43d1e827..b58d36c0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEnhancement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEnhancement.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; import java.util.List; - public class BlockSpellEnhancement extends BlockOrientable { public BlockSpellEnhancement() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellModifier.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellModifier.java index 4dcdf5be..80c384cc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellModifier.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellModifier.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; import java.util.List; - public class BlockSpellModifier extends BlockOrientable { public BlockSpellModifier() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellParadigm.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellParadigm.java index e63981de..e510791c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellParadigm.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellParadigm.java @@ -17,9 +17,6 @@ import java.util.List; public class BlockSpellParadigm extends BlockOrientable { - public static final float minPos = (3f / 16f); - public static final float maxPos = (13f / 16f); - public BlockSpellParadigm() { super(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java index dd7b8048..50cddbf5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java @@ -17,7 +17,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockStabilityGlyph extends Block implements IStabilityGlyph { - public IIcon stability1; + @SideOnly(Side.CLIENT) + private IIcon stability1; public BlockStabilityGlyph() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java index de861321..97dea481 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java @@ -33,13 +33,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockTeleposer extends BlockContainer { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon1; + private IIcon sideIcon2; @SideOnly(Side.CLIENT) - private static IIcon sideIcon2; - @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockTeleposer() { @@ -55,7 +53,6 @@ public class BlockTeleposer extends BlockContainer public void registerBlockIcons(IIconRegister iconRegister) { this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Top"); - this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Side"); this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Side"); this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Side"); } @@ -219,17 +216,15 @@ public class BlockTeleposer extends BlockContainer worldF.setTileEntity(xf, yf, zf, tileToSet); } - Block initialBlock = blockI; - - if (initialBlock != null) + if (blockI != null) { - TileEntity tileToSet = initialBlock.createTileEntity(worldI, metaI); + TileEntity tileToSet = blockI.createTileEntity(worldI, metaI); worldI.setTileEntity(xi, yi, zi, tileToSet); } //TILES CLEARED - worldF.setBlock(xf, yf, zf, initialBlock, metaI, flag); + worldF.setBlock(xf, yf, zf, blockI, metaI, flag); if (tileEntityI != null) { @@ -292,6 +287,6 @@ public class BlockTeleposer extends BlockContainer @Optional.Method(modid = "ForgeMultipart") public static void sendDescriptorOfTile(World world, TileEntity tile) { - MultipartHelper.sendDescPacket(world, (TileMultipart)tile); + MultipartHelper.sendDescPacket(world, tile); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java index d67883df..c55e50a8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java @@ -25,13 +25,11 @@ import java.util.Random; public class BlockWritingTable extends BlockContainer { @SideOnly(Side.CLIENT) - private static IIcon topIcon; + private IIcon topIcon; @SideOnly(Side.CLIENT) - private static IIcon sideIcon1; + private IIcon sideIcon2; @SideOnly(Side.CLIENT) - private static IIcon sideIcon2; - @SideOnly(Side.CLIENT) - private static IIcon bottomIcon; + private IIcon bottomIcon; public BlockWritingTable() { @@ -47,7 +45,6 @@ public class BlockWritingTable extends BlockContainer public void registerBlockIcons(IIconRegister iconRegister) { this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:AlchemicChemistrySet"); - this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType1"); this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2"); this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java index a06b451e..9b1cdf56 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java @@ -17,10 +17,15 @@ import java.util.List; public class BloodRune extends Block { //private Icon bloodRuneIcon; + @SideOnly(Side.CLIENT) private IIcon altarCapacityRuneIcon; + @SideOnly(Side.CLIENT) private IIcon dislocationRuneIcon; + @SideOnly(Side.CLIENT) private IIcon orbCapacityRuneIcon; + @SideOnly(Side.CLIENT) private IIcon betterCapacityRuneIcon; + @SideOnly(Side.CLIENT) private IIcon accelerationRuneIcon; public BloodRune() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/IOrientable.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/IOrientable.java index 93b170b0..7545d11c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/IOrientable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/IOrientable.java @@ -4,11 +4,11 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IOrientable { - public ForgeDirection getInputDirection(); + ForgeDirection getInputDirection(); - public ForgeDirection getOutputDirection(); + ForgeDirection getOutputDirection(); - public void setInputDirection(ForgeDirection direction); + void setInputDirection(ForgeDirection direction); - public void setOutputDirection(ForgeDirection direction); + void setOutputDirection(ForgeDirection direction); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java index 26344146..79c6f8a4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java @@ -38,22 +38,12 @@ public class LifeEssenceBlock extends BlockFluidClassic @Override public boolean canDisplace(IBlockAccess world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) - { - return false; - } - - return super.canDisplace(world, x, y, z); + return !world.getBlock(x, y, z).getMaterial().isLiquid() && super.canDisplace(world, x, y, z); } @Override public boolean displaceIfPossible(World world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) - { - return false; - } - - return super.displaceIfPossible(world, x, y, z); + return !world.getBlock(x, y, z).getMaterial().isLiquid() && super.displaceIfPossible(world, x, y, z); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/MimicBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/MimicBlock.java index 6903e12d..84dcdcb6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/MimicBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/MimicBlock.java @@ -45,7 +45,7 @@ public class MimicBlock extends BlockContainer Block block = mimic.getBlock(); - return block != null ? block.shouldSideBeRendered(world, x, y, z, side) : true; + return block == null || block.shouldSideBeRendered(world, x, y, z, side); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java index 9f361a84..ae839bed 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java @@ -17,19 +17,19 @@ import net.minecraft.world.World; public class RitualStone extends Block implements IRitualStone { @SideOnly(Side.CLIENT) - private static IIcon blankIcon; + private IIcon blankIcon; @SideOnly(Side.CLIENT) - private static IIcon waterStoneIcon; + private IIcon waterStoneIcon; @SideOnly(Side.CLIENT) - private static IIcon fireStoneIcon; + private IIcon fireStoneIcon; @SideOnly(Side.CLIENT) - private static IIcon earthStoneIcon; + private IIcon earthStoneIcon; @SideOnly(Side.CLIENT) - private static IIcon airStoneIcon; + private IIcon airStoneIcon; @SideOnly(Side.CLIENT) - private static IIcon duskStoneIcon; + private IIcon duskStoneIcon; @SideOnly(Side.CLIENT) - private static IIcon dawnStoneIcon; + private IIcon dawnStoneIcon; public RitualStone() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java index 62c001a4..9ff5313a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java @@ -60,7 +60,7 @@ public class SpectralBlock extends BlockContainer return false; } - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + return block != this && super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/book/BookParser.java b/src/main/java/WayofTime/alchemicalWizardry/common/book/BookParser.java index 203b765a..8d874318 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/book/BookParser.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/book/BookParser.java @@ -29,7 +29,7 @@ public class BookParser @SideOnly(Side.CLIENT) public static List parseTextFile(String location) { - File textFiles = new File("config/BloodMagic/bookDocs"); +// File textFiles = new File("config/BloodMagic/bookDocs"); ArrayList entryList = new ArrayList(); //if(textFiles.exists()) { @@ -138,7 +138,7 @@ public class BookParser if(Minecraft.getMinecraft() != null && Minecraft.getMinecraft().fontRenderer != null) { List list = Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(strLine, 110); - if(list != null) +// if(list != null) { //System.out.println("Number of lines: " + list.size()); } @@ -150,7 +150,7 @@ public class BookParser { lastPageWasSpecial = true; boolean changePage = false; - int length = word.length(); +// int length = word.length(); word = word.replace('\t', ' '); List list = Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(strings[currentPage] + " " + word, 110); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java index def014c1..18503f85 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java @@ -119,11 +119,10 @@ public class BlockSet { int div = meta / 4; int mod = meta % 4; - int[] northSet = new int[]{1 + div*4, 0 + div*4, 3 + div*4, 2 + div*4}; - int[] eastSet = new int[]{2 + div*4, 3 + div*4, 1 + div*4, 0 + div*4}; - int[] southSet = new int[]{0 + div*4, 1 + div*4, 2 + div*4, 3 + div*4}; - int[] westSet = new int[]{3 + div*4, 2 + div*4, 0 + div*4, 1 + div*4}; - + int[] northSet = new int[]{1 + div*4, div*4, 3 + div*4, 2 + div*4}; //Second one: 0 + + int[] eastSet = new int[]{2 + div*4, 3 + div*4, 1 + div*4, div*4}; //Last one: 0 + + int[] southSet = new int[]{div*4, 1 + div*4, 2 + div*4, 3 + div*4}; //First one: 0 + + int[] westSet = new int[]{3 + div*4, 2 + div*4, div*4, 1 + div*4}; //Third one: 0 + switch (mod) { @@ -190,11 +189,10 @@ public class BlockSet { int div = meta / 4; int mod = meta % 4; - int[] northSet = new int[]{0 + div*4, 2 + div*4, 3 + div*4, 1 + div*4}; - int[] eastSet = new int[]{1 + div*4, 3 + div*4, 0 + div*4, 2 + div*4}; - int[] southSet = new int[]{2 + div*4, 0 + div*4, 1 + div*4, 3 + div*4}; - int[] westSet = new int[]{3 + div*4, 1 + div*4, 2 + div*4, 0 + div*4}; - + int[] northSet = new int[]{div * 4, 2 + div * 4, 3 + div * 4, 1 + div * 4}; //First one: 0 + + int[] eastSet = new int[]{1 + div*4, 3 + div*4, div*4, 2 + div*4}; //Third one: 0 + + int[] southSet = new int[]{2 + div*4, div*4, 1 + div*4, 3 + div*4}; //Second one: 0 + + int[] westSet = new int[]{3 + div*4, 1 + div*4, 2 + div*4, div*4}; //Last one: 0 + switch (mod) { @@ -215,10 +213,11 @@ public class BlockSet { int div = meta / 4; int mod = meta % 4; - int[] northSet = new int[]{0 + div*4, 2 + div*4, 3 + div*4, 1 + div*4}; - int[] eastSet = new int[]{1 + div*4, 3 + div*4, 0 + div*4, 2 + div*4}; - int[] southSet = new int[]{2 + div*4, 0 + div*4, 1 + div*4, 3 + div*4}; - int[] westSet = new int[]{3 + div*4, 1 + div*4, 2 + div*4, 0 + div*4}; + int[] northSet = new int[]{div*4, 2 + div*4, 3 + div*4, 1 + div*4}; //First one: 0 + + int[] eastSet = new int[]{1 + div*4, 3 + div*4, div*4, 2 + div*4}; //Third one: 0 + + int[] southSet = new int[]{2 + div*4, div*4, 1 + div*4, 3 + div*4}; //Second one: 0 + + int[] westSet = new int[]{3 + div*4, 1 + div*4, 2 + div*4, div*4}; //Last one: 0 + + switch (mod) @@ -253,7 +252,7 @@ public class BlockSet public Block getBlock() { - return this.getBlockForString(blockid); + return getBlockForString(blockid); } public static String getPairedIdForBlock(Block block) @@ -369,6 +368,6 @@ public class BlockSet public boolean isContained(Block block, int defaultMeta) { Block thisBlock = this.getBlock(); - return thisBlock == null ? false : thisBlock.equals(block) && this.metadata[0] == defaultMeta; + return thisBlock != null && thisBlock.equals(block) && this.metadata[0] == defaultMeta; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BuildingSchematic.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BuildingSchematic.java index 6b20989a..fc1ba6b7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BuildingSchematic.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BuildingSchematic.java @@ -129,7 +129,7 @@ public class BuildingSchematic public void destroyAllInField(World world, int xCoord, int yCoord, int zCoord, ForgeDirection dir) { - GridSpaceHolder grid = this.createGSH(); //GridSpaceHolder is not aware of the buildings - need to use the schematic +// GridSpaceHolder grid = this.createGSH(); //GridSpaceHolder is not aware of the buildings - need to use the schematic List positionList = getGriddedPositions(dir); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonBuilding.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonBuilding.java index e62c5eaf..aa190a28 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonBuilding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonBuilding.java @@ -59,8 +59,8 @@ public class DemonBuilding public Int3 getDoorSpace(ForgeDirection dir) { - int x = 0; - int z = 0; + int x; + int z; switch (dir) { case SOUTH: diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonVillagePath.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonVillagePath.java index b80d78bd..ee83c7f8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonVillagePath.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonVillagePath.java @@ -13,9 +13,9 @@ import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal public class DemonVillagePath { - public int xi; - public int yi; - public int zi; + public int xPos; + public int yPos; + public int zPos; public ForgeDirection dir; public int length; @@ -25,37 +25,37 @@ public class DemonVillagePath public DemonVillagePath(int xi, int yi, int zi, ForgeDirection dir, int length) { - this.xi = xi; - this.yi = yi; - this.zi = zi; + this.xPos = xi; + this.yPos = yi; + this.zPos = zi; this.dir = dir; this.length = length; } public Int3AndBool constructFullPath(TEDemonPortal portal, World world, int clearance) { - int xPos = this.xi; - int yPos = this.yi; - int zPos = this.zi; + int xi = this.xPos; + int yi = this.yPos; + int zi = this.zPos; int rad = this.getRoadRadius(); int value = 0; - - int finalYPos = this.constructPartialPath(portal, world, clearance, xPos - rad * dir.offsetX, yPos, zPos - rad * dir.offsetZ, dir, length + rad, false); + + int finalYPos = this.constructPartialPath(portal, world, clearance, xi - rad * dir.offsetX, yi, zi - rad * dir.offsetZ, dir, length + rad, false); for (int i = -rad; i <= rad; i++) { - value = Math.max(this.constructPartialPath(portal, world, clearance, xPos - rad * dir.offsetX + i * dir.offsetZ, yPos, zPos - rad * dir.offsetZ + i * dir.offsetX, dir, length + 2 * rad, true), value); + value = Math.max(this.constructPartialPath(portal, world, clearance, xi - rad * dir.offsetX + i * dir.offsetZ, yi, zi - rad * dir.offsetZ + i * dir.offsetX, dir, length + 2 * rad, true), value); if(TEDemonPortal.printDebug) System.out.println("" + (length + 2 * rad) + ", " + value + ""); } - - Int3 position = new Int3(xPos, finalYPos, zPos); + + Int3 position = new Int3(xi, finalYPos, zi); boolean bool = value >= length + 2 * rad; return new Int3AndBool(position, bool); } - + public class Int3AndBool { public Int3 coords; @@ -68,7 +68,7 @@ public class DemonVillagePath } /** - * + * * @param portal * @param world * @param clearance @@ -78,112 +78,108 @@ public class DemonVillagePath * @param dir * @param length * @param doConstruct - * @return length if doConstruct, yPos if !doConstruct + * @return length if doConstruct, yi if !doConstruct */ public int constructPartialPath(TEDemonPortal portal, World world, int clearance, int xi, int yi, int zi, ForgeDirection dir, int length, boolean doConstruct) { - int xPos = xi; - int yPos = yi; - int zPos = zi; - for (int i = 0; i < length; i++) { int xOffset = i * dir.offsetX; int zOffset = i * dir.offsetZ; boolean completed = false; - + for (int yOffset = 0; yOffset <= clearance; yOffset++) { int sign = 1; - Block block1 = world.getBlock(xPos + xOffset, yPos + sign * yOffset, zPos + zOffset); - Block highBlock1 = world.getBlock(xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset); + Block block1 = world.getBlock(xi + xOffset, yi + sign * yOffset, zi + zOffset); + Block highBlock1 = world.getBlock(xi + xOffset, yi + sign * yOffset + 1, zi + zOffset); - if ((this.forceReplaceBlock(block1))||(!block1.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset, zPos + zOffset) && this.isBlockReplaceable(block1) ) && (this.forceCanTunnelUnder(highBlock1) || highBlock1.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset))) + if ((this.forceReplaceBlock(block1))||(!block1.isReplaceable(world, xi + xOffset, yi + sign * yOffset, zi + zOffset) && this.isBlockReplaceable(block1) ) && (this.forceCanTunnelUnder(highBlock1) || highBlock1.isReplaceable(world, xi + xOffset, yi + sign * yOffset + 1, zi + zOffset))) { if(doConstruct) { - world.setBlock(xPos + xOffset, yPos + sign * yOffset, zPos + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); + world.setBlock(xi + xOffset, yi + sign * yOffset, zi + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); } - yPos += sign * yOffset; + yi += sign * yOffset; completed = true; break; } else if(canGoDown) { sign = -1; - Block block2 = world.getBlock(xPos + xOffset, yPos + sign * yOffset, zPos + zOffset); - Block highBlock2 = world.getBlock(xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset); + Block block2 = world.getBlock(xi + xOffset, yi + sign * yOffset, zi + zOffset); + Block highBlock2 = world.getBlock(xi + xOffset, yi + sign * yOffset + 1, zi + zOffset); - if ((this.forceReplaceBlock(block2))||(!block2.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset, zPos + zOffset) && this.isBlockReplaceable(block2)) && (this.forceCanTunnelUnder(highBlock2) || highBlock2.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset))) + if ((this.forceReplaceBlock(block2))||(!block2.isReplaceable(world, xi + xOffset, yi + sign * yOffset, zi + zOffset) && this.isBlockReplaceable(block2)) && (this.forceCanTunnelUnder(highBlock2) || highBlock2.isReplaceable(world, xi + xOffset, yi + sign * yOffset + 1, zi + zOffset))) { if(doConstruct) { - world.setBlock(xPos + xOffset, yPos + sign * yOffset, zPos + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); + world.setBlock(xi + xOffset, yi + sign * yOffset, zi + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); } - yPos += sign * yOffset; + yi += sign * yOffset; completed = true; break; } } } - + if(!completed) { boolean returnAmount = true; if(createBridgeInAirIfObstructed) { - Block block1 = world.getBlock(xPos + xOffset, yPos, zPos + zOffset); - - if (block1.isReplaceable(world, xPos + xOffset, yPos, zPos + zOffset) || !this.isBlockReplaceable(block1) || !this.forceReplaceBlock(block1)) + Block block1 = world.getBlock(xi + xOffset, yi, zi + zOffset); + + if (block1.isReplaceable(world, xi + xOffset, yi, zi + zOffset) || !this.isBlockReplaceable(block1) || !this.forceReplaceBlock(block1)) { returnAmount = false; if(doConstruct) { - world.setBlock(xPos + xOffset, yPos, zPos + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); + world.setBlock(xi + xOffset, yi, zi + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); } }else { returnAmount = true; } - - }else if(this.tunnelIfObstructed) - { - Block block1 = world.getBlock(xPos + xOffset, yPos, zPos + zOffset); - if (!block1.isReplaceable(world, xPos + xOffset, yPos, zPos + zOffset) || this.isBlockReplaceable(block1) || !this.forceReplaceBlock(block1)) + }else if(tunnelIfObstructed) + { + Block block1 = world.getBlock(xi + xOffset, yi, zi + zOffset); + + if (!block1.isReplaceable(world, xi + xOffset, yi, zi + zOffset) || this.isBlockReplaceable(block1) || !this.forceReplaceBlock(block1)) { returnAmount = false; if(doConstruct) { - world.setBlock(xPos + xOffset, yPos, zPos + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); - world.setBlockToAir(xPos + xOffset, yPos + 1, zPos + zOffset); - world.setBlockToAir(xPos + xOffset, yPos + 2, zPos + zOffset); - world.setBlockToAir(xPos + xOffset, yPos + 3, zPos + zOffset); + world.setBlock(xi + xOffset, yi, zi + zOffset, portal.getRoadBlock(), portal.getRoadMeta(), 3); + world.setBlockToAir(xi + xOffset, yi + 1, zi + zOffset); + world.setBlockToAir(xi + xOffset, yi + 2, zi + zOffset); + world.setBlockToAir(xi + xOffset, yi + 3, zi + zOffset); } }else { returnAmount = true; } } - + if(returnAmount) { - return doConstruct ? i : yPos; + return doConstruct ? i : yi; } } } - - return doConstruct ? length : yPos; + + return doConstruct ? length : yi; } public Int3 getFinalLocation(World world, int clearance) { - int xPos = xi; - int yPos = yi; - int zPos = zi; + int xi = xPos; + int yi = yPos; + int zi = zPos; for (int i = 0; i < length; i++) { @@ -194,29 +190,29 @@ public class DemonVillagePath { int sign = 1; - Block block1 = world.getBlock(xPos + xOffset, yPos + sign * yOffset, zPos + zOffset); - Block highBlock1 = world.getBlock(xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset); + Block block1 = world.getBlock(xi + xOffset, yi + sign * yOffset, zi + zOffset); + Block highBlock1 = world.getBlock(xi + xOffset, yi + sign * yOffset + 1, zi + zOffset); - if ((this.forceReplaceBlock(block1))||(!block1.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset, zPos + zOffset) && this.isBlockReplaceable(block1) ) && (this.forceCanTunnelUnder(highBlock1) || highBlock1.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset))) + if ((this.forceReplaceBlock(block1))||(!block1.isReplaceable(world, xi + xOffset, yi + sign * yOffset, zi + zOffset) && this.isBlockReplaceable(block1) ) && (this.forceCanTunnelUnder(highBlock1) || highBlock1.isReplaceable(world, xi + xOffset, yi + sign * yOffset + 1, zi + zOffset))) { - yPos += sign * yOffset; + yi += sign * yOffset; break; } else { sign = -1; - Block block2 = world.getBlock(xPos + xOffset, yPos + sign * yOffset, zPos + zOffset); - Block highBlock2 = world.getBlock(xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset); + Block block2 = world.getBlock(xi + xOffset, yi + sign * yOffset, zi + zOffset); + Block highBlock2 = world.getBlock(xi + xOffset, yi + sign * yOffset + 1, zi + zOffset); - if ((this.forceReplaceBlock(block2))||(!block2.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset, zPos + zOffset) && this.isBlockReplaceable(block2) ) && (this.forceCanTunnelUnder(highBlock2) || highBlock2.isReplaceable(world, xPos + xOffset, yPos + sign * yOffset + 1, zPos + zOffset))) + if ((this.forceReplaceBlock(block2))||(!block2.isReplaceable(world, xi + xOffset, yi + sign * yOffset, zi + zOffset) && this.isBlockReplaceable(block2) ) && (this.forceCanTunnelUnder(highBlock2) || highBlock2.isReplaceable(world, xi + xOffset, yi + sign * yOffset + 1, zi + zOffset))) { - yPos += sign * yOffset; + yi += sign * yOffset; break; } } } } - return new Int3(xPos, yPos, zPos); + return new Int3(xi, yi, zi); } public int getRoadRadius() @@ -226,31 +222,16 @@ public class DemonVillagePath public boolean isBlockReplaceable(Block block) { - if (block.getMaterial() == Material.leaves || block.getMaterial() == Material.vine || block instanceof IRoadWard) - { - return false; - } - return !block.equals(ModBlocks.blockDemonPortal); + return !(block.getMaterial() == Material.leaves || block.getMaterial() == Material.vine || block instanceof IRoadWard) &&!block.equals(ModBlocks.blockDemonPortal); } public boolean forceReplaceBlock(Block block) { - if(block.getMaterial().isLiquid()) - { - return true; - }else - { - return false; - } + return block.getMaterial().isLiquid(); } public boolean forceCanTunnelUnder(Block block) { - if(block instanceof BlockFlower || block == Blocks.double_plant) - { - return true; - } - - return false; + return block instanceof BlockFlower || block == Blocks.double_plant; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpace.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpace.java index 41f07491..b21a30f4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpace.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpace.java @@ -47,7 +47,7 @@ public class GridSpace public boolean isEmpty() { - return type == this.EMPTY; + return type == EMPTY; } public static GridSpace getGridFromTag(NBTTagCompound tag) @@ -67,11 +67,11 @@ public class GridSpace public boolean isRoadSegment() { - return type == this.ROAD || type == this.CROSSROAD; + return type == ROAD || type == CROSSROAD; } public boolean isBuilding() { - return type == this.HOUSE; + return type == HOUSE; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java index e7f60a4d..e4c58087 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java @@ -121,22 +121,18 @@ public class GridSpaceHolder { this.expandAreaInPosX(); this.setGridSpace(x, z, space); - return; } else if (x < -negXRadius) { this.expandAreaInNegX(); this.setGridSpace(x, z, space); - return; } else if (z > posZRadius) { this.expandAreaInPosZ(); this.setGridSpace(x, z, space); - return; } else if (z < -negZRadius) { this.expandAreaInNegZ(); this.setGridSpace(x, z, space); - return; } else { area[x + negXRadius][z + negZRadius] = space; @@ -162,8 +158,8 @@ public class GridSpaceHolder if(TEDemonPortal.printDebug) AlchemicalWizardry.logger.info("x: " + i + " z: " + j); - int xOff = 0; - int zOff = 0; + int xOff; + int zOff; switch (dir) { @@ -211,8 +207,8 @@ public class GridSpaceHolder continue; } - int xOff = 0; - int zOff = 0; + int xOff; + int zOff; switch (dir) { @@ -255,8 +251,8 @@ public class GridSpaceHolder continue; } - int xOff = 0; - int zOff = 0; + int xOff; + int zOff; switch (dir) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/EntityDemonAIHurtByTarget.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/EntityDemonAIHurtByTarget.java index b5f6afee..147ddd73 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/EntityDemonAIHurtByTarget.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/EntityDemonAIHurtByTarget.java @@ -10,8 +10,7 @@ import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal public class EntityDemonAIHurtByTarget extends EntityAIHurtByTarget { boolean entityCallsForHelp; - private int revengeTimer; - + public EntityDemonAIHurtByTarget(EntityCreature demon, boolean callsForHelp) { super(demon, callsForHelp); @@ -36,7 +35,6 @@ public class EntityDemonAIHurtByTarget extends EntityAIHurtByTarget } this.taskOwner.setAttackTarget(this.taskOwner.getAITarget()); - this.revengeTimer = this.taskOwner.func_142015_aE(); if (this.entityCallsForHelp && this.taskOwner instanceof IHoardDemon) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/IOccasionalRangedAttackMob.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/IOccasionalRangedAttackMob.java index f3693f34..958575d6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/IOccasionalRangedAttackMob.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/IOccasionalRangedAttackMob.java @@ -4,5 +4,5 @@ import net.minecraft.entity.IRangedAttackMob; public interface IOccasionalRangedAttackMob extends IRangedAttackMob { - public boolean shouldUseRangedAttack(); + boolean shouldUseRangedAttack(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGrunt.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGrunt.java index e70fd6f6..95934fc5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGrunt.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGrunt.java @@ -93,10 +93,10 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -296,10 +296,10 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -319,7 +319,7 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -330,7 +330,7 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -344,9 +344,9 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -368,10 +368,10 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -479,9 +479,6 @@ public class EntityMinorDemonGrunt extends EntityDemon implements IOccasionalRan { return; } - double xCoord; - double yCoord; - double zCoord; HolyProjectile hol = new HolyProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 15, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntEarth.java index 9630eb94..cf33c1f1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntEarth.java @@ -41,9 +41,6 @@ public class EntityMinorDemonGruntEarth extends EntityMinorDemonGrunt { return; } - double xCoord; - double yCoord; - double zCoord; ExplosionProjectile hol = new ExplosionProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 15, 600, false); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntFire.java index 3159e622..b7b58e5a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntFire.java @@ -37,9 +37,6 @@ public class EntityMinorDemonGruntFire extends EntityMinorDemonGrunt { return; } - double xCoord; - double yCoord; - double zCoord; FireProjectile hol = new FireProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 15, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardian.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardian.java index 65874cba..ac38f3c5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardian.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardian.java @@ -38,9 +38,6 @@ public class EntityMinorDemonGruntGuardian extends EntityMinorDemonGrunt { return; } - double xCoord; - double yCoord; - double zCoord; HolyProjectile hol = new HolyProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 20, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianEarth.java index 84940ddd..a055ebb1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianEarth.java @@ -45,9 +45,6 @@ public class EntityMinorDemonGruntGuardianEarth extends EntityMinorDemonGruntGua { return; } - double xCoord; - double yCoord; - double zCoord; ExplosionProjectile hol = new ExplosionProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 20, 600, false); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianFire.java index ef2187cd..8e502f5f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianFire.java @@ -41,9 +41,6 @@ public class EntityMinorDemonGruntGuardianFire extends EntityMinorDemonGruntGuar { return; } - double xCoord; - double yCoord; - double zCoord; FireProjectile hol = new FireProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 20, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianIce.java index 3a77ae69..ea35c250 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianIce.java @@ -38,9 +38,6 @@ public class EntityMinorDemonGruntGuardianIce extends EntityMinorDemonGruntGuard { return; } - double xCoord; - double yCoord; - double zCoord; IceProjectile hol = new IceProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 20, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianWind.java index 0f267859..86cd67d3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntGuardianWind.java @@ -55,9 +55,6 @@ public class EntityMinorDemonGruntGuardianWind extends EntityMinorDemonGruntGuar { return; } - double xCoord; - double yCoord; - double zCoord; WindGustProjectile hol = new WindGustProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 20, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntIce.java index cd06e680..cff401ed 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntIce.java @@ -34,9 +34,6 @@ public class EntityMinorDemonGruntIce extends EntityMinorDemonGrunt { return; } - double xCoord; - double yCoord; - double zCoord; IceProjectile hol = new IceProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 15, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntWind.java index 19cc1ce9..488ae144 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntWind.java @@ -51,9 +51,6 @@ public class EntityMinorDemonGruntWind extends EntityMinorDemonGrunt { return; } - double xCoord; - double yCoord; - double zCoord; WindGustProjectile hol = new WindGustProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 15, 600); this.worldObj.spawnEntityInWorld(hol); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/IHoardDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/IHoardDemon.java index 5087ec51..7f9f2660 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/IHoardDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/IHoardDemon.java @@ -4,8 +4,8 @@ import WayofTime.alchemicalWizardry.api.Int3; public interface IHoardDemon { - public void setPortalLocation(Int3 position); - public Int3 getPortalLocation(); - public boolean thrallDemon(Int3 location); - public boolean isSamePortal(IHoardDemon demon); + void setPortalLocation(Int3 position); + Int3 getPortalLocation(); + boolean thrallDemon(Int3 location); + boolean isSamePortal(IHoardDemon demon); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/loot/DemonVillageLootRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/loot/DemonVillageLootRegistry.java index 1dad06cb..a501269b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/loot/DemonVillageLootRegistry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/loot/DemonVillageLootRegistry.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Random; import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; import WayofTime.alchemicalWizardry.ModItems; @@ -16,9 +15,6 @@ public class DemonVillageLootRegistry public static void init() { - ItemStack lifeShardStack = new ItemStack(ModItems.baseItems, 1, 28); - ItemStack soulShardStack = new ItemStack(ModItems.baseItems, 1, 29); - String[] tier1Strings = new String[]{ChestGenHooks.DUNGEON_CHEST, ChestGenHooks.PYRAMID_DESERT_CHEST}; for(String str : tier1Strings) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java index e03030c5..eec54945 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java @@ -18,9 +18,7 @@ public class BlockDemonChest extends BlockChest implements IBlockPortalNode public IInventory func_149951_m(World world, int x, int y, int z) { - IInventory object = (IInventory)world.getTileEntity(x, y, z); - - return object; + return (IInventory)world.getTileEntity(x, y, z); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/ITilePortalNode.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/ITilePortalNode.java index 71bf7344..2771254d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/ITilePortalNode.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/ITilePortalNode.java @@ -2,5 +2,5 @@ package WayofTime.alchemicalWizardry.common.demonVillage.tileEntity; public interface ITilePortalNode { - public void setPortalLocation(TEDemonPortal teDemonPortal); + void setPortalLocation(TEDemonPortal teDemonPortal); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonChest.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonChest.java index b56c7b34..a1d4fd88 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonChest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonChest.java @@ -41,7 +41,7 @@ public class TEDemonChest extends TileEntityChest implements ITilePortalNode @Override public void checkForAdjacentChests() { - return; + } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java index 0a7b1ab3..5c6f43c4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java @@ -426,7 +426,7 @@ public class TEDemonPortal extends TileEntity } } - if(this.tier < this.tierCostList.length && this.demonHouseCooldown > this.tierCostList[this.tier]) + if(this.tier < tierCostList.length && this.demonHouseCooldown > tierCostList[this.tier]) { this.tier++; @@ -480,7 +480,7 @@ public class TEDemonPortal extends TileEntity int x = i / length; int z = i % length; - NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i); + NBTTagCompound tag = tagList.getCompoundTagAt(i); GridSpace space = GridSpace.getGridFromTag(tag); area[x][z] = space; @@ -519,8 +519,6 @@ public class TEDemonPortal extends TileEntity { for (int j = 0; j <= negZRadius + posZRadius; j++) { - int index = i + (negZRadius + posZRadius + 1) * j; - GridSpace space = area[i][j]; NBTTagCompound nextTag; @@ -610,8 +608,6 @@ public class TEDemonPortal extends TileEntity dir = ForgeDirection.NORTH; } - int length = 5; - Int3 road = findRoadSpaceFromDirection(dir, (rand.nextInt(negXRadius + negZRadius + posXRadius + posZRadius)) + 1); int x = road.xCoord; @@ -988,11 +984,6 @@ public class TEDemonPortal extends TileEntity return 0; } - if (convertStarter) - { - - } - int initGridX = gridXi; int initGridZ = gridZi; int initY = yi; @@ -1139,22 +1130,18 @@ public class TEDemonPortal extends TileEntity { this.expandAreaInPosX(); this.setGridSpace(x, z, space); - return; } else if (x < -negXRadius) { this.expandAreaInNegX(); this.setGridSpace(x, z, space); - return; } else if (z > posZRadius) { this.expandAreaInPosZ(); this.setGridSpace(x, z, space); - return; } else if (z < -negZRadius) { this.expandAreaInNegZ(); this.setGridSpace(x, z, space); - return; } else { area[x + negXRadius][z + negZRadius] = space; @@ -1202,10 +1189,10 @@ public class TEDemonPortal extends TileEntity int x = 0; int z = 0; - GridSpace home = this.getGridSpace(x, z); - int yLevel = home.getYLevel(); +// GridSpace home = this.getGridSpace(x, z); +// int yLevel = home.getYLevel(); - GridSpaceHolder grid = this.createGSH(); +// GridSpaceHolder grid = this.createGSH(); List directions = new ArrayList(); @@ -1249,9 +1236,8 @@ public class TEDemonPortal extends TileEntity ForgeDirection chosenDirection = (ForgeDirection) schemMap.keySet().toArray()[new Random().nextInt(schemMap.keySet().size())]; DemonBuilding build = schemMap.get(chosenDirection).get(new Random().nextInt(schemMap.get(chosenDirection).size())); - Int3 portalSpace = build.getDoorSpace(chosenDirection); +// Int3 portalSpace = build.getDoorSpace(chosenDirection); - this.nextDemonPortalDirection = chosenDirection; this.nextDemonPortalName = build.getName(); @@ -1348,7 +1334,7 @@ public class TEDemonPortal extends TileEntity dir = ForgeDirection.NORTH; } - Int3 space = this.findRoadSpaceFromDirection(dir, 1 * (rand.nextInt(negXRadius + negZRadius + posXRadius + posZRadius)) + 1); + Int3 space = this.findRoadSpaceFromDirection(dir, (rand.nextInt(negXRadius + negZRadius + posXRadius + posZRadius)) + 1); // Second: 1 * int x = space.xCoord; int z = space.zCoord; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java index 85c08619..603ca3f7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java @@ -18,14 +18,11 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class EntityBileDemon extends EntityDemon { - private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false); - private static float maxTamedHealth = 100.0F; private static float maxUntamedHealth = 200.0F; private int attackTimer; @@ -59,10 +56,10 @@ public class EntityBileDemon extends EntityDemon //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D); @@ -97,14 +94,14 @@ public class EntityBileDemon extends EntityDemon */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1))); } @@ -261,10 +258,10 @@ public class EntityBileDemon extends EntityDemon if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -284,7 +281,7 @@ public class EntityBileDemon extends EntityDemon { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -295,7 +292,7 @@ public class EntityBileDemon extends EntityDemon if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -309,9 +306,9 @@ public class EntityBileDemon extends EntityDemon { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -333,10 +330,10 @@ public class EntityBileDemon extends EntityDemon if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -379,10 +376,10 @@ public class EntityBileDemon extends EntityDemon if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -399,7 +396,7 @@ public class EntityBileDemon extends EntityDemon */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -414,10 +411,10 @@ public class EntityBileDemon extends EntityDemon { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java index 0e26556b..9e9baf78 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java @@ -20,7 +20,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -67,10 +66,10 @@ public class EntityBoulderFist extends EntityDemon //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -103,14 +102,14 @@ public class EntityBoulderFist extends EntityDemon */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); } /** @@ -247,10 +246,10 @@ public class EntityBoulderFist extends EntityDemon if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -270,7 +269,7 @@ public class EntityBoulderFist extends EntityDemon { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -281,7 +280,7 @@ public class EntityBoulderFist extends EntityDemon if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -295,9 +294,9 @@ public class EntityBoulderFist extends EntityDemon { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -319,10 +318,10 @@ public class EntityBoulderFist extends EntityDemon if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -366,10 +365,10 @@ public class EntityBoulderFist extends EntityDemon if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -386,7 +385,7 @@ public class EntityBoulderFist extends EntityDemon */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -401,10 +400,10 @@ public class EntityBoulderFist extends EntityDemon { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } @@ -461,9 +460,6 @@ public class EntityBoulderFist extends EntityDemon */ public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { - double xCoord; - double yCoord; - double zCoord; HolyProjectile hol = new HolyProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 5, 600); this.worldObj.spawnEntityInWorld(hol); } @@ -475,7 +471,6 @@ public class EntityBoulderFist extends EntityDemon { this.tasks.removeTask(this.aiAttackOnCollide); //this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItem(); this.tasks.addTask(4, this.aiAttackOnCollide); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityEarthElemental.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityEarthElemental.java index 5d7b5045..e6915fb6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityEarthElemental.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityEarthElemental.java @@ -20,7 +20,7 @@ public class EntityEarthElemental extends EntityElemental implements IMob { if (target instanceof EntityLivingBase) { - ((EntityLivingBase) target).attackEntityFrom(DamageSource.causeMobDamage(this), 10); + target.attackEntityFrom(DamageSource.causeMobDamage(this), 10); ((EntityLivingBase) target).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 4)); ((EntityLivingBase) target).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 150, 0)); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java index 4d7d946d..8dd7e935 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java @@ -135,15 +135,6 @@ public class EntityElemental extends EntityDemon this.motionY *= (double) f2; this.motionZ *= (double) f2; } - - double d0 = this.posX - this.prevPosX; - double d1 = this.posZ - this.prevPosZ; - float f4 = MathHelper.sqrt_double(d0 * d0 + d1 * d1) * 4.0F; - - if (f4 > 1.0F) - { - f4 = 1.0F; - } } /** @@ -251,7 +242,7 @@ public class EntityElemental extends EntityDemon if (this.attackCounter >= 10) { - this.worldObj.playAuxSFXAtEntity((EntityPlayer) null, 1008, (int) this.posX, (int) this.posY, (int) this.posZ, 0); + this.worldObj.playAuxSFXAtEntity(null, 1008, (int) this.posX, (int) this.posY, (int) this.posZ, 0); this.inflictEffectOnEntity(this.targetedEntity); this.attackCounter = -40; } @@ -262,7 +253,7 @@ public class EntityElemental extends EntityDemon } } else { - this.renderYawOffset = this.rotationYaw = -((float) Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float) Math.PI; + this.renderYawOffset = this.rotationYaw = -((float) Math.atan2(motionX, this.motionZ)) * 180.0F / (float) Math.PI; if (this.attackCounter > 0) { @@ -277,7 +268,7 @@ public class EntityElemental extends EntityDemon if (b0 != b1) { - this.dataWatcher.updateObject(25, Byte.valueOf(b1)); + this.dataWatcher.updateObject(25, b1); } } } @@ -342,10 +333,10 @@ public class EntityElemental extends EntityDemon //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -378,15 +369,15 @@ public class EntityElemental extends EntityDemon */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); - this.dataWatcher.addObject(25, Byte.valueOf((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); + this.dataWatcher.addObject(25, 0); } /** @@ -503,10 +494,10 @@ public class EntityElemental extends EntityDemon if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -540,10 +531,10 @@ public class EntityElemental extends EntityDemon if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -551,10 +542,10 @@ public class EntityElemental extends EntityDemon { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } @@ -608,7 +599,6 @@ public class EntityElemental extends EntityDemon public void setCombatTask() { this.tasks.removeTask(this.aiAttackOnCollide); - ItemStack itemstack = this.getHeldItem(); this.tasks.addTask(4, this.aiAttackOnCollide); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java index 23c4b297..bead6f9c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java @@ -17,7 +17,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -65,10 +64,10 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -101,14 +100,14 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); } /** @@ -245,10 +244,10 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -268,7 +267,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -293,9 +292,9 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -317,10 +316,10 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -365,10 +364,10 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -385,7 +384,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -400,10 +399,10 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } @@ -460,9 +459,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob */ public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { - double xCoord; - double yCoord; - double zCoord; HolyProjectile hol = new HolyProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 5, 600); this.worldObj.spawnEntityInWorld(hol); } @@ -474,7 +470,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob { this.tasks.removeTask(this.aiAttackOnCollide); this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItem(); this.tasks.addTask(4, this.aiArrowAttack); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFireElemental.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFireElemental.java index a599be7c..b09aa6e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFireElemental.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFireElemental.java @@ -19,7 +19,7 @@ public class EntityFireElemental extends EntityElemental implements IMob { if (target instanceof EntityLivingBase) { - ((EntityLivingBase) target).setFire(10); + target.setFire(10); ((EntityLivingBase) target).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 150, 0)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityHolyElemental.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityHolyElemental.java index c4c626a0..51be44c9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityHolyElemental.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityHolyElemental.java @@ -20,7 +20,7 @@ public class EntityHolyElemental extends EntityElemental implements IMob { if (target instanceof EntityLivingBase) { - ((EntityLivingBase) target).attackEntityFrom(DamageSource.causeMobDamage(this), 15); + target.attackEntityFrom(DamageSource.causeMobDamage(this), 15); ((EntityLivingBase) target).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 150, 0)); ((EntityLivingBase) target).addPotionEffect(new PotionEffect(Potion.poison.id, 100, 1)); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java index 994d11a3..572737b3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java @@ -63,10 +63,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -99,14 +99,14 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); } /** @@ -263,10 +263,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -286,7 +286,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -297,7 +297,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -311,9 +311,9 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -327,7 +327,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } if (!this.worldObj.isRemote) @@ -335,10 +335,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -382,10 +382,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -402,7 +402,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -417,10 +417,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } @@ -476,9 +476,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob */ public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { - double xCoord; - double yCoord; - double zCoord; IceProjectile hol = new IceProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 3, 600); this.worldObj.spawnEntityInWorld(hol); } @@ -490,7 +487,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob { this.tasks.removeTask(this.aiAttackOnCollide); this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItem(); this.tasks.addTask(4, this.aiArrowAttack); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java index 6081778a..3e96f1cd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java @@ -19,18 +19,14 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class EntityLowerGuardian extends EntityDemon { - private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false); - private static float maxTamedHealth = 50.0F; private static float maxUntamedHealth = 30.0F; private int attackTimer; - private boolean isAggro; public EntityLowerGuardian(World par1World) { @@ -63,10 +59,10 @@ public class EntityLowerGuardian extends EntityDemon //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -99,14 +95,14 @@ public class EntityLowerGuardian extends EntityDemon */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); } /** @@ -137,7 +133,6 @@ public class EntityLowerGuardian extends EntityDemon this.setAngry(par1NBTTagCompound.getBoolean("Angry")); attackTimer = par1NBTTagCompound.getByte("attackTimer"); - isAggro = par1NBTTagCompound.getBoolean("isAggro"); } /** @@ -264,10 +259,10 @@ public class EntityLowerGuardian extends EntityDemon if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -287,7 +282,7 @@ public class EntityLowerGuardian extends EntityDemon { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -298,7 +293,7 @@ public class EntityLowerGuardian extends EntityDemon if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -312,9 +307,9 @@ public class EntityLowerGuardian extends EntityDemon { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -328,7 +323,7 @@ public class EntityLowerGuardian extends EntityDemon if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } if (!this.worldObj.isRemote) @@ -336,10 +331,10 @@ public class EntityLowerGuardian extends EntityDemon if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -383,10 +378,10 @@ public class EntityLowerGuardian extends EntityDemon if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -403,7 +398,7 @@ public class EntityLowerGuardian extends EntityDemon */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -418,10 +413,10 @@ public class EntityLowerGuardian extends EntityDemon { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java index ee7be27e..04992c3a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java @@ -20,7 +20,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -66,10 +65,10 @@ public class EntityShade extends EntityDemon //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -102,14 +101,14 @@ public class EntityShade extends EntityDemon */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); } /** @@ -246,10 +245,10 @@ public class EntityShade extends EntityDemon if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -269,7 +268,7 @@ public class EntityShade extends EntityDemon { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -280,7 +279,7 @@ public class EntityShade extends EntityDemon if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -294,9 +293,9 @@ public class EntityShade extends EntityDemon { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -318,10 +317,10 @@ public class EntityShade extends EntityDemon if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -365,10 +364,10 @@ public class EntityShade extends EntityDemon if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -385,7 +384,7 @@ public class EntityShade extends EntityDemon */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -400,10 +399,10 @@ public class EntityShade extends EntityDemon { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } @@ -459,9 +458,6 @@ public class EntityShade extends EntityDemon */ public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { - double xCoord; - double yCoord; - double zCoord; HolyProjectile hol = new HolyProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 5, 600); this.worldObj.spawnEntityInWorld(hol); } @@ -473,7 +469,6 @@ public class EntityShade extends EntityDemon { this.tasks.removeTask(this.aiAttackOnCollide); //this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItem(); this.tasks.addTask(4, this.aiAttackOnCollide); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java index ea304b8d..e667bf8c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java @@ -17,7 +17,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -63,10 +62,10 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -99,14 +98,14 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); } /** @@ -242,10 +241,10 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -265,7 +264,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -276,7 +275,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -290,9 +289,9 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -314,10 +313,10 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -361,10 +360,10 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -381,7 +380,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -396,10 +395,10 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } @@ -455,9 +454,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM */ public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { - double xCoord; - double yCoord; - double zCoord; MudProjectile hol = new MudProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 3, 600, false); this.worldObj.spawnEntityInWorld(hol); } @@ -469,7 +465,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM { this.tasks.removeTask(this.aiAttackOnCollide); this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItem(); this.tasks.addTask(4, this.aiArrowAttack); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java index 0deadbca..4c0e09c8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java @@ -17,7 +17,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -65,10 +64,10 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM //My guess is that this will alter the max health if (this.isTamed()) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D); @@ -103,14 +102,14 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM */ protected void updateAITick() { - this.dataWatcher.updateObject(18, Float.valueOf(this.getHealth())); + this.dataWatcher.updateObject(18, this.getHealth()); } protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(18, new Float(this.getHealth())); - this.dataWatcher.addObject(19, new Byte((byte) 0)); + this.dataWatcher.addObject(18, this.getHealth()); + this.dataWatcher.addObject(19, 0); } /** @@ -246,10 +245,10 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM if (par1) { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxTamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxTamedHealth); } else { - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxUntamedHealth); } } @@ -269,7 +268,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM { ItemFood itemfood = (ItemFood) itemstack.getItem(); - if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < this.maxTamedHealth) + if (itemfood.isWolfsFavoriteMeat() && this.dataWatcher.getWatchableObjectFloat(18) < maxTamedHealth) { if (!par1EntityPlayer.capabilities.isCreativeMode) { @@ -280,7 +279,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } return true; @@ -294,9 +293,9 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM { this.aiSit.setSitting(!this.isSitting()); this.isJumping = false; - this.setPathToEntity((PathEntity) null); - this.setTarget((Entity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setTarget(null); + this.setAttackTarget(null); } this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting()); @@ -310,7 +309,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM if (itemstack.stackSize <= 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null); + par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null); } if (!this.worldObj.isRemote) @@ -318,10 +317,10 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM if (this.rand.nextInt(1) == 0) { this.setTamed(true); - this.setPathToEntity((PathEntity) null); - this.setAttackTarget((EntityLivingBase) null); + this.setPathToEntity(null); + this.setAttackTarget(null); this.aiSit.setSitting(true); - this.setHealth(this.maxTamedHealth); + this.setHealth(maxTamedHealth); this.func_152115_b(par1EntityPlayer.getUniqueID().toString()); this.playTameEffect(true); this.worldObj.setEntityState(this, (byte) 7); @@ -365,10 +364,10 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2))); + this.dataWatcher.updateObject(16, b0 | 2); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3))); + this.dataWatcher.updateObject(16, b0 & -3); } } @@ -385,7 +384,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM */ public void setCollarColor(int par1) { - this.dataWatcher.updateObject(20, Byte.valueOf((byte) (par1 & 15))); + this.dataWatcher.updateObject(20, par1 & 15); } /** @@ -400,10 +399,10 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM { if (par1) { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1)); + this.dataWatcher.updateObject(19, 1); } else { - this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0)); + this.dataWatcher.updateObject(19, 0); } } @@ -459,10 +458,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM */ public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { - double xCoord; - double yCoord; - double zCoord; - this.worldObj.playAuxSFXAtEntity((EntityPlayer) null, 1009, (int) this.posX, (int) this.posY, (int) this.posZ, 0); + this.worldObj.playAuxSFXAtEntity(null, 1009, (int) this.posX, (int) this.posY, (int) this.posZ, 0); FireProjectile hol = new FireProjectile(worldObj, this, par1EntityLivingBase, 1.8f, 0f, 20, 600); this.worldObj.spawnEntityInWorld(hol); } @@ -474,7 +470,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM { this.tasks.removeTask(this.aiAttackOnCollide); this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItem(); this.tasks.addTask(4, this.aiArrowAttack); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index f2138aa2..8c3fe83b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -17,8 +17,10 @@ import java.util.List; public class ArmourInhibitor extends EnergyItems { - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int tickDelay = 200; public ArmourInhibitor() @@ -110,10 +112,6 @@ public class ArmourInhibitor extends EnergyItems { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); - - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - } } else { par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); @@ -139,14 +137,12 @@ public class ArmourInhibitor extends EnergyItems if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer) + if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { } //TODO Do stuff par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 2, 0)); } - - return; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java index eb79625d..82d93df7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java @@ -33,7 +33,6 @@ public class BloodShard extends Item implements ArmourUpgrade if (this.equals(ModItems.demonBloodShard)) { this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonBloodShard"); - return; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 77596f93..f0ac52c4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -32,8 +32,10 @@ public class BoundAxe extends ItemAxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int energyUsed; public BoundAxe() @@ -212,7 +214,6 @@ public class BoundAxe extends ItemAxe implements IBindable } par1ItemStack.setItemDamage(0); - return; } public void setActivated(ItemStack par1ItemStack, boolean newActivated) @@ -260,19 +261,11 @@ public class BoundAxe extends ItemAxe implements IBindable */ public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - if (!getActivated(par1ItemStack)) - { - return false; - } - return true; + return getActivated(par1ItemStack); } public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase) { - if ((double) par3.getBlockHardness(par2World, par4, par5, par6) != 0.0D) - { - } - return true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 300ab966..1a358bca 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -31,11 +31,12 @@ import cpw.mods.fml.relauncher.SideOnly; public class BoundPickaxe extends ItemPickaxe implements IBindable { - public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int energyUsed; @@ -237,7 +238,6 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable } par1ItemStack.setItemDamage(0); - return; } public void setActivated(ItemStack par1ItemStack, boolean newActivated) @@ -285,11 +285,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable */ public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - if (!getActivated(par1ItemStack)) - { - return false; - } - return true; + return getActivated(par1ItemStack); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 1364d64e..3dbfc338 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -35,8 +35,10 @@ public class BoundShovel extends ItemSpade implements IBindable public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int energyUsed; @@ -216,7 +218,6 @@ public class BoundShovel extends ItemSpade implements IBindable } par1ItemStack.setItemDamage(0); - return; } public void setActivated(ItemStack par1ItemStack, boolean newActivated) @@ -264,11 +265,7 @@ public class BoundShovel extends ItemSpade implements IBindable */ public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - if (!getActivated(par1ItemStack)) - { - return false; - } - return true; + return getActivated(par1ItemStack); } public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, int par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java index 10a57088..29a842fa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java @@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +25,6 @@ public class CheatyItem extends Item implements IBindable public CheatyItem() { super(); - DamageSource damageSource = DamageSource.generic; setMaxStackSize(1); setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @@ -81,10 +81,10 @@ public class CheatyItem extends Item implements IBindable if (par3EntityPlayer.isSneaking()) { - EnergyItems.setCurrentEssence(itemTag.getString("ownerName"), 0); + SoulNetworkHandler.setCurrentEssence(itemTag.getString("ownerName"), 0); } else { - EnergyItems.addEssenceToMaximum(itemTag.getString("ownerName"), 1000000, Integer.MAX_VALUE); + SoulNetworkHandler.addCurrentEssenceToMaximum(itemTag.getString("ownerName"), 1000000, Integer.MAX_VALUE); } return par1ItemStack; } @@ -112,7 +112,7 @@ public class CheatyItem extends Item implements IBindable double posY = player.posY; double posZ = player.posZ; world.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - float f = (float) 1.0F; + float f = 1.0F; float f1 = f * 0.6F + 0.4F; float f2 = f * f * 0.7F - 0.5F; float f3 = f * f * 0.6F - 0.7F; @@ -144,7 +144,7 @@ public class CheatyItem extends Item implements IBindable } @Override - public boolean hasContainerItem() + public boolean hasContainerItem(ItemStack itemStack) { return true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java index d31df557..a3074d2a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java @@ -1,10 +1,15 @@ package WayofTime.alchemicalWizardry.common.items; +import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; +import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; @@ -21,33 +26,59 @@ public class CreativeDagger extends Item setFull3D(); } - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if (par3EntityPlayer instanceof FakePlayer) + if (this.canUseForSacrifice(stack)) { - return par1ItemStack; + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + return stack; } - double posX = par3EntityPlayer.posX; - double posY = par3EntityPlayer.posY; - double posZ = par3EntityPlayer.posZ; - par2World.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.8F); - float f = (float) 1.0F; + if (!player.capabilities.isCreativeMode) + { + SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2); + if(MinecraftForge.EVENT_BUS.post(evt)) + { + return stack; + } + + if(evt.shouldDrainHealth) + { + player.setHealth(player.getHealth() - 2); + } + + if(!evt.shouldFillAltar) + { + return stack; + } + } + + if (player instanceof FakePlayer) + { + return stack; + } + + double posX = player.posX; + double posY = player.posY; + double posZ = player.posZ; + world.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + float f = 1.0F; float f1 = f * 0.6F + 0.4F; float f2 = f * f * 0.7F - 0.5F; float f3 = f * f * 0.6F - 0.7F; for (int l = 0; l < 8; ++l) { - par2World.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); + world.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); } - if (!par2World.isRemote && SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) + if (!world.isRemote && SpellHelper.isFakePlayer(world, player)) { - return par1ItemStack; + return stack; } - findAndFillAltar(par2World, par3EntityPlayer, Integer.MAX_VALUE); - return par1ItemStack; + + findAndFillAltar(world, player, Integer.MAX_VALUE); + return stack; } public void findAndFillAltar(World world, EntityPlayer player, int amount) @@ -68,7 +99,7 @@ public class CreativeDagger extends Item public IBloodAltar getAltar(World world, int x, int y, int z) { - TileEntity tileEntity = null; + TileEntity tileEntity; for (int i = -2; i <= 2; i++) { @@ -78,29 +109,47 @@ public class CreativeDagger extends Item { tileEntity = world.getTileEntity(i + x, k + y, j + z); - if ((tileEntity instanceof IBloodAltar)) + if(tileEntity instanceof IBloodAltar) { - return (IBloodAltar) tileEntity; + return (IBloodAltar)tileEntity; } } - - if ((tileEntity instanceof IBloodAltar)) - { - return (IBloodAltar) tileEntity; - } } - - if ((tileEntity instanceof IBloodAltar)) - { - return (IBloodAltar) tileEntity; - } - } - - if ((tileEntity instanceof IBloodAltar)) - { - return (IBloodAltar) tileEntity; } return null; } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + if(!world.isRemote && entity instanceof EntityPlayer) + { + this.setUseForSacrifice(stack, this.isPlayerPreparedForSacrifice(world, (EntityPlayer)entity)); + } + } + + public boolean isPlayerPreparedForSacrifice(World world, EntityPlayer player) + { + return !world.isRemote && (PlayerSacrificeHandler.getPlayerIncense(player) > 0); + } + + public boolean canUseForSacrifice(ItemStack stack) + { + NBTTagCompound tag = stack.getTagCompound(); + + return tag != null && tag.getBoolean("sacrifice"); + } + + public void setUseForSacrifice(ItemStack stack, boolean sacrifice) + { + NBTTagCompound tag = stack.getTagCompound(); + if(tag == null) + { + tag = new NBTTagCompound(); + stack.setTagCompound(tag); + } + + tag.setBoolean("sacrifice", sacrifice); + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java index 1c1be7c5..6e6c84d4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java @@ -33,8 +33,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class DaggerOfSacrifice extends EnergyItems { - private float weaponDamage; - public DaggerOfSacrifice() { super(); @@ -43,7 +41,6 @@ public class DaggerOfSacrifice extends EnergyItems setEnergyUsed(100); setFull3D(); setMaxDamage(100); - weaponDamage = 1.0F; } @Override @@ -183,7 +180,7 @@ public class DaggerOfSacrifice extends EnergyItems public IBloodAltar getAltar(World world, int x, int y, int z) { - TileEntity tileEntity = null; + TileEntity tileEntity; for (int i = -2; i <= 2; i++) { @@ -198,22 +195,7 @@ public class DaggerOfSacrifice extends EnergyItems return (IBloodAltar) tileEntity; } } - - if ((tileEntity instanceof IBloodAltar)) - { - return (IBloodAltar) tileEntity; - } } - - if ((tileEntity instanceof IBloodAltar)) - { - return (IBloodAltar) tileEntity; - } - } - - if ((tileEntity instanceof IBloodAltar)) - { - return (IBloodAltar) tileEntity; } return null; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java index 6a370014..98e7a6db 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java @@ -35,11 +35,6 @@ public class DemonPlacer extends Item this.maxStackSize = 1; } - public String getItemDisplayName(ItemStack par1ItemStack) - { - return "Demon Crystal"; - } - @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java index 217adc20..3f12eb8e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java @@ -15,7 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.DamageSource; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -29,7 +28,6 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl public EnergyBattery(int damage) { super(); - DamageSource damageSource = DamageSource.generic; setMaxStackSize(1); setCreativeTab(AlchemicalWizardry.tabBloodMagic); maxEssence = damage; @@ -120,7 +118,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl double posY = player.posY; double posZ = player.posZ; world.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - float f = (float) 1.0F; + float f = 1.0F; float f1 = f * 0.6F + 0.4F; float f2 = f * f * 0.7F - 0.5F; float f3 = f * f * 0.6F - 0.7F; @@ -179,12 +177,13 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl } @Override - public boolean hasContainerItem() + public boolean hasContainerItem(ItemStack itemStack) { return true; } //@SideOnly(Side.SERVER) + @Deprecated public int getCurrentEssence(ItemStack par1ItemStack) { if (par1ItemStack == null) @@ -209,8 +208,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl worldSave.setItemData(owner, data); } - int currentEssence = data.currentEssence; - return (currentEssence); + return data.currentEssence; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index af78474e..c5fd3364 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -18,10 +18,11 @@ import java.util.List; public class EnergyBazooka extends EnergyItems { - private static IIcon activeIcon; - private static IIcon passiveIcon; - private static int damage; - private static final int maxDelay = 150; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; + private int damage; public EnergyBazooka() { @@ -65,6 +66,8 @@ public class EnergyBazooka extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + final int maxDelay = 150; + if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); @@ -84,7 +87,7 @@ public class EnergyBazooka extends EnergyItems if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!this.syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) + if(!syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) { return par1ItemStack; } @@ -141,7 +144,6 @@ public class EnergyBazooka extends EnergyItems } par1ItemStack.setItemDamage(0); - return; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index 38021266..03023a79 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -17,10 +17,11 @@ import java.util.List; public class EnergyBlast extends EnergyItems { - private static IIcon activeIcon; - private static IIcon passiveIcon; - private static int damage; - private static final int maxDelay = 15; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; + private int damage; public EnergyBlast() { @@ -65,6 +66,8 @@ public class EnergyBlast extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + final int maxDelay = 15; + if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); @@ -84,7 +87,7 @@ public class EnergyBlast extends EnergyItems if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!this.syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) + if(!syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) { return par1ItemStack; } @@ -133,7 +136,6 @@ public class EnergyBlast extends EnergyItems } par1ItemStack.setItemDamage(0); - return; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java index 59c490c3..4b0cecaa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java @@ -41,7 +41,7 @@ public class EnergyItems extends Item implements IBindable double posY = player.posY; double posZ = player.posZ; world.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - float f = (float) 1.0F; + float f = 1.0F; float f1 = f * 0.6F + 0.4F; float f2 = f * f * 0.7F - 0.5F; float f3 = f * f * 0.6F - 0.7F; @@ -186,8 +186,7 @@ public class EnergyItems extends Item implements IBindable //Global static methods public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { - if (SpellHelper.isFakePlayer(player)) return false; - return SoulNetworkHandler.checkAndSetItemPlayer(item, player); + return !SpellHelper.isFakePlayer(player) && SoulNetworkHandler.checkAndSetItemPlayer(item, player); } public static void setItemOwner(ItemStack item, String ownerName) @@ -223,6 +222,7 @@ public class EnergyItems extends Item implements IBindable return item.getTagCompound().getString("ownerName"); } + @Deprecated public static void drainPlayerNetwork(EntityPlayer player, int damageToBeDone) { String ownerName = SpellHelper.getUsername(player); @@ -251,6 +251,7 @@ public class EnergyItems extends Item implements IBindable } } + @Deprecated public static int getCurrentEssence(String ownerName) { if (MinecraftServer.getServer() == null) @@ -270,6 +271,7 @@ public class EnergyItems extends Item implements IBindable return data.currentEssence; } + @Deprecated public static void setCurrentEssence(String ownerName, int amount) { if (MinecraftServer.getServer() == null) @@ -290,6 +292,7 @@ public class EnergyItems extends Item implements IBindable data.markDirty(); } + @Deprecated public static void addEssenceToMaximum(String ownerName, int amount, int maximum) { if (MinecraftServer.getServer() == null) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java index 7822f86d..2ac7f609 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java @@ -25,9 +25,10 @@ import cpw.mods.fml.relauncher.SideOnly; public class EnergySword extends ItemSword { - private NBTTagCompound data; - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int energyUsed; public EnergySword() @@ -168,7 +169,6 @@ public class EnergySword extends ItemSword } par1ItemStack.setItemDamage(0); - return; } public void setActivated(ItemStack par1ItemStack, boolean newActivated) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java index 71359b89..dc5354c8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java @@ -23,12 +23,13 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAltarManipulator { - private static IIcon plateIcon; + @SideOnly(Side.CLIENT) + private IIcon plateIcon; - public static int conversionRate = 100; //LP / half heart - public static float activationPoint = 0.5f; - public static int tickRate = 20; - public static int maxStored = 10000; + public int conversionRate = 100; //LP / half heart + public float activationPoint = 0.5f; + public int tickRate = 20; + public int maxStored = 10000; public ItemBloodLetterPack() { @@ -50,8 +51,6 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - par3List.add(StatCollector.translateToLocal("tooltip.lp.storedlp") + " " + this.getStoredLP(par1ItemStack)); } } @@ -164,7 +163,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl @Override public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) { - return; + } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java index 8f8a8fd5..7932014c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemBloodRuneBlock extends ItemBlock - { public ItemBloodRuneBlock(Block block) { @@ -15,9 +14,8 @@ public class ItemBloodRuneBlock extends ItemBlock } public String getUnlocalizedName(ItemStack itemstack) - { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java index d063cdde..75c7ae92 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemCrystalBlock extends ItemBlock - { public ItemCrystalBlock(Block par1) { @@ -15,9 +14,8 @@ public class ItemCrystalBlock extends ItemBlock } public String getUnlocalizedName(ItemStack itemstack) - { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java index 5db9c349..3b9c33fb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java @@ -13,7 +13,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -25,7 +24,6 @@ public class ItemDiabloKey extends EnergyItems public ItemDiabloKey() { super(); - DamageSource damageSource = DamageSource.generic; setMaxStackSize(1); setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.setEnergyUsed(1000); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java index a50bc6c3..4dfc459b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java @@ -15,7 +15,7 @@ public class ItemEnchantmentGlyphBlock extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index b0bf0a6e..f906c402 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -28,10 +28,6 @@ public class ItemIncense extends Item implements IIncense @SideOnly(Side.CLIENT) private IIcon[] icons; - public static int minValue; - public static int maxValue; - public static int itemDuration; - public ItemIncense() { super(); @@ -194,7 +190,7 @@ public class ItemIncense extends Item implements IIncense public final float greenColour; public final float blueColour; - private EnumIncense(int minValue, int maxValue, float tickRate, int dur, float red, float green, float blue) + EnumIncense(int minValue, int maxValue, float tickRate, int dur, float red, float green, float blue) { this.minValue = minValue; this.maxValue = maxValue; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index ae333a2a..4f6b419c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -274,7 +274,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner } } else { - world.playAuxSFX(0000, x, y + 1, z, 0); + world.playAuxSFX(0, x, y + 1, z, 0); return true; } } @@ -406,7 +406,6 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner public void rotateRituals(World world, EntityPlayer player, ItemStack stack, boolean next) { this.voidStoredLocation(stack); - int maxRitualID = Rituals.getNumberOfRituals(); String currentRitualID = this.getCurrentRitual(stack); this.setCurrentRitual(stack, next? Rituals.getNextRitualKey(currentRitualID):Rituals.getPreviousRitualKey(currentRitualID)); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java index 2c4cf212..e9ec4502 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemSpellEffectBlock extends ItemBlock - { public ItemSpellEffectBlock(Block par1) { @@ -14,9 +13,8 @@ public class ItemSpellEffectBlock extends ItemBlock } public String getUnlocalizedName(ItemStack itemstack) - { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java index 9a43e529..5c515c3f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemSpellEnhancementBlock extends ItemBlock - { public ItemSpellEnhancementBlock(Block par1) { @@ -15,9 +14,8 @@ public class ItemSpellEnhancementBlock extends ItemBlock } public String getUnlocalizedName(ItemStack itemstack) - { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java index 0dfdcd30..44e02d7b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemSpellModifierBlock extends ItemBlock - { public ItemSpellModifierBlock(Block par1) { @@ -15,9 +14,8 @@ public class ItemSpellModifierBlock extends ItemBlock } public String getUnlocalizedName(ItemStack itemstack) - { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java index a22e0ce0..2984cdb7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemSpellParadigmBlock extends ItemBlock - { public ItemSpellParadigmBlock(Block par1) { @@ -15,9 +14,8 @@ public class ItemSpellParadigmBlock extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) - { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java index 209de15c..289fe3ec 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java @@ -15,7 +15,7 @@ public class ItemStabilityGlyphBlock extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; + String name; switch (itemstack.getItemDamage()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index aa8977dc..eec96479 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -56,10 +56,7 @@ public class LavaCrystal extends EnergyItems public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) - { - int damage = this.getDamage(par1ItemStack); - } + EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java index cd737697..4cd07069 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java @@ -35,7 +35,7 @@ public class OrbOfTesting extends EnergyItems return par1ItemStack; } - if (this.syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) + if (syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) { par3EntityPlayer.heal(1); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java index a22cae6f..b40ee311 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java @@ -125,7 +125,7 @@ public class SacrificialDagger extends Item double posY = player.posY; double posZ = player.posZ; world.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - float f = (float) 1.0F; + float f = 1.0F; float f1 = f * 0.6F + 0.4F; float f2 = f * f * 0.7F - 0.5F; float f3 = f * f * 0.6F - 0.7F; @@ -174,7 +174,7 @@ public class SacrificialDagger extends Item public IBloodAltar getAltar(World world, int x, int y, int z) { - TileEntity tileEntity = null; + TileEntity tileEntity; for (int i = -2; i <= 2; i++) { @@ -222,12 +222,8 @@ public class SacrificialDagger extends Item public boolean canUseForSacrifice(ItemStack stack) { NBTTagCompound tag = stack.getTagCompound(); - if(tag == null) - { - return false; - } - return tag.getBoolean("sacrifice"); + return tag != null && tag.getBoolean("sacrifice"); } public void setUseForSacrifice(ItemStack stack, boolean sacrifice) @@ -246,6 +242,6 @@ public class SacrificialDagger extends Item @SideOnly(Side.CLIENT) public boolean hasEffect(ItemStack stack, int pass) { - return this.canUseForSacrifice(stack) ? true : super.hasEffect(stack, pass); + return this.canUseForSacrifice(stack) || super.hasEffect(stack, pass); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java index 044da938..c6c1f305 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java @@ -41,10 +41,14 @@ import cpw.mods.fml.relauncher.SideOnly; public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialArmor, IBindable, IRevealer, IGoggles, IRunicArmor, ILPGauge { private static int invSize = 9; - private static IIcon helmetIcon; - private static IIcon plateIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon helmetIcon; + @SideOnly(Side.CLIENT) + private IIcon plateIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; public static boolean tryComplexRendering = true; @@ -251,22 +255,22 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA @Override public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - if (armor.equals(ModItems.boundHelmet)) + if (armor.getItem() == ModItems.boundHelmet) { return 3; } - if (armor.equals(ModItems.boundPlate)) + if (armor.getItem() == ModItems.boundPlate) { return 8; } - if (armor.equals(ModItems.boundLeggings)) + if (armor.getItem() == ModItems.boundLeggings) { return 6; } - if (armor.equals(ModItems.boundBoots)) + if (armor.getItem() == ModItems.boundBoots) { return 3; } @@ -322,7 +326,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - if (this.tryComplexRendering) + if (tryComplexRendering) { return "alchemicalwizardry:models/armor/BloodArmour_WIP.png"; } @@ -372,15 +376,6 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA itemStack.setTagCompound(new NBTTagCompound()); } - int maxBloodLevel = getMaxBloodShardLevel(itemStack); - ItemStack[] inv = getInternalInventory(itemStack); - - if (inv != null) - { - int iSize = 0; - int iBlood = 0; - } - if (!player.isPotionActive(AlchemicalWizardry.customPotionInhibit)) { tickInternalInventory(itemStack, world, player, 0, false); @@ -389,8 +384,6 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA this.setIsInvisible(itemStack, player.isPotionActive(Potion.invisibility.id)); this.repairArmour(world, player, itemStack); - - return; } public void repairArmour(World world, EntityPlayer player, ItemStack itemStack) @@ -491,7 +484,6 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA return false; } - Item item = addedItemStack.getItem(); int candidateSlot = -1; for (int i = invSize - 1; i >= 0; i--) @@ -540,7 +532,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA for (int i = 0; i < tagList.tagCount(); i++) { - NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i); + NBTTagCompound tag = tagList.getCompoundTagAt(i); int slot = tag.getByte("Slot"); if (slot >= 0 && slot < invSize) @@ -565,8 +557,6 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA for (int i = 0; i < invSize; i++) { - ItemStack stack = inventory[i]; - if (inventory[i] != null) { NBTTagCompound tag = new NBTTagCompound(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java index 139387b4..1b726b44 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java @@ -131,7 +131,6 @@ public abstract class OmegaArmour extends BoundArmour { if(EnergyItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75)) { - Reagent reagent = APISpellHelper.getPlayerReagentType(player); float reagentAmount = APISpellHelper.getPlayerCurrentReagentAmount(player); reagentAmount -= itemStack.getItemDamage() * reagentDrainPerDamage; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourEarth.java index de5cc181..a60bd254 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourEarth.java @@ -20,10 +20,14 @@ import cpw.mods.fml.relauncher.SideOnly; public class OmegaArmourEarth extends OmegaArmour { - private static IIcon helmetIcon; - private static IIcon plateIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon helmetIcon; + @SideOnly(Side.CLIENT) + private IIcon plateIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; public OmegaArmourEarth(int armorType) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourFire.java index 0d060d57..2f9d6825 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourFire.java @@ -21,10 +21,14 @@ import cpw.mods.fml.relauncher.SideOnly; public class OmegaArmourFire extends OmegaArmour { - private static IIcon helmetIcon; - private static IIcon plateIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon helmetIcon; + @SideOnly(Side.CLIENT) + private IIcon plateIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; public OmegaArmourFire(int armorType) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWater.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWater.java index 11e0e127..6afb527a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWater.java @@ -20,10 +20,14 @@ import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaWater; public class OmegaArmourWater extends OmegaArmour { - private static IIcon helmetIcon; - private static IIcon plateIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon helmetIcon; + @SideOnly(Side.CLIENT) + private IIcon plateIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; public OmegaArmourWater(int armorType) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWind.java index 77c80a7c..1048d1c4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWind.java @@ -20,10 +20,14 @@ import cpw.mods.fml.relauncher.SideOnly; public class OmegaArmourWind extends OmegaArmour { - private static IIcon helmetIcon; - private static IIcon plateIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon helmetIcon; + @SideOnly(Side.CLIENT) + private IIcon plateIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; public OmegaArmourWind(int armorType) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java index d8923262..dc357819 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java @@ -198,7 +198,7 @@ public class ItemAttunedCrystal extends Item implements IReagentManipulator return itemStack; } - int reagentLocation = -1; + int reagentLocation; reagentLocation = reagentList.indexOf(pastReagent); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java index 2faf341b..83bbbd6b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java @@ -23,7 +23,9 @@ import java.util.List; public class ItemTankSegmenter extends Item implements IReagentManipulator { + @SideOnly(Side.CLIENT) public IIcon crystalBody; + @SideOnly(Side.CLIENT) public IIcon crystalLabel; public ItemTankSegmenter() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java index 705c869d..27ac77f7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java @@ -32,8 +32,6 @@ import java.util.Map.Entry; public class AlchemyFlask extends Item { - private int maxPotionAmount = 20; - public AlchemyFlask() { super(); @@ -58,7 +56,7 @@ public class AlchemyFlask extends Item for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound = (NBTTagCompound) nbttaglist.getCompoundTagAt(i); + NBTTagCompound nbttagcompound = nbttaglist.getCompoundTagAt(i); arraylist.add(AlchemyPotionHelper.readEffectFromNBT(nbttagcompound)); } return arraylist; @@ -116,7 +114,7 @@ public class AlchemyFlask extends Item if (!par2World.isRemote) { - ArrayList list = this.getEffects(par1ItemStack); + ArrayList list = getEffects(par1ItemStack); if (list != null) { @@ -191,7 +189,7 @@ public class AlchemyFlask extends Item public void setConcentrationOfPotion(ItemStack par1ItemStack, int potionID, int concentration) { - ArrayList list = this.getEffects(par1ItemStack); + ArrayList list = getEffects(par1ItemStack); if (list != null) { for (AlchemyPotionHelper aph : list) @@ -202,13 +200,13 @@ public class AlchemyFlask extends Item break; } } - this.setEffects(par1ItemStack, list); + setEffects(par1ItemStack, list); } } public void setDurationFactorOfPotion(ItemStack par1ItemStack, int potionID, int durationFactor) { - ArrayList list = this.getEffects(par1ItemStack); + ArrayList list = getEffects(par1ItemStack); if (list != null) { for (AlchemyPotionHelper aph : list) @@ -219,7 +217,7 @@ public class AlchemyFlask extends Item break; } } - this.setEffects(par1ItemStack, list); + setEffects(par1ItemStack, list); } } @@ -241,8 +239,7 @@ public class AlchemyFlask extends Item public boolean addPotionEffect(ItemStack par1ItemStack, int potionID, int tickDuration) { - int i = 0; - ArrayList list = this.getEffects(par1ItemStack); + ArrayList list = getEffects(par1ItemStack); if (list != null) { for (AlchemyPotionHelper aph : list) @@ -251,17 +248,15 @@ public class AlchemyFlask extends Item { return false; } - - i++; } list.add(new AlchemyPotionHelper(potionID, tickDuration, 0, 0)); - this.setEffects(par1ItemStack, list); + setEffects(par1ItemStack, list); return true; } else { list = new ArrayList(); list.add(new AlchemyPotionHelper(potionID, tickDuration, 0, 0)); - this.setEffects(par1ItemStack, list); + setEffects(par1ItemStack, list); return true; } } @@ -362,13 +357,7 @@ public class AlchemyFlask extends Item public boolean isPotionThrowable(ItemStack par1ItemStack) { - if (par1ItemStack.hasTagCompound() && par1ItemStack.getTagCompound().getBoolean("throwable")) - { - return true; - } else - { - return false; - } + return par1ItemStack.hasTagCompound() && par1ItemStack.getTagCompound().getBoolean("throwable"); } public void setIsPotionThrowable(boolean flag, ItemStack par1ItemStack) @@ -385,7 +374,7 @@ public class AlchemyFlask extends Item { ItemStack potionStack = new ItemStack(Items.potionitem, 1, 0); potionStack.setTagCompound(new NBTTagCompound()); - ArrayList potionList = this.getPotionEffects(par1ItemStack); + ArrayList potionList = getPotionEffects(par1ItemStack); if (potionList == null) { @@ -402,7 +391,6 @@ public class AlchemyFlask extends Item nbttaglist.appendTag(d); } potionStack.getTagCompound().setTag("CustomPotionEffects", nbttaglist); - EntityPotion entityPotion = new EntityPotion(worldObj, entityLivingBase, potionStack); - return entityPotion; + return new EntityPotion(worldObj, entityLivingBase, potionStack); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java index c041f90a..4f7caa72 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java @@ -76,7 +76,6 @@ public class AlchemyReagent extends Item if (this == ModItems.tennebrae) { this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Tennebrae"); - return; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java index f2e1dfb4..b4026634 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java @@ -5,8 +5,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import java.util.Random; - public class EnhancedFillingAgent extends WeakFillingAgent { public EnhancedFillingAgent() @@ -18,7 +16,6 @@ public class EnhancedFillingAgent extends WeakFillingAgent @Override public int getFilledAmountForPotionNumber(int potionEffects) { - Random rand = new Random(); if (potionEffects == 0) { return 8; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/ILimitedRoutingFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/ILimitedRoutingFocus.java index f92ce7b9..da996b44 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/ILimitedRoutingFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/ILimitedRoutingFocus.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; public interface ILimitedRoutingFocus { - public int getRoutingFocusLimit(ItemStack stack); + int getRoutingFocusLimit(ItemStack stack); - public void setRoutingFocusLimit(ItemStack stack, int limit); + void setRoutingFocusLimit(ItemStack stack, int limit); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java index 23243c4c..78f7b38d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java @@ -18,8 +18,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil { - private int energyUsed; - public SigilAir() { super(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java index 729ea609..eeb69c9e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java @@ -22,8 +22,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgrade, ISigil { - private int tickDelay = 100; - public SigilBloodLight() { super(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java index 315b827e..26f59fae 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java @@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -76,13 +77,12 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani } String ownerName = itemTag.getString("ownerName"); - int currentEssence = EnergyItems.getCurrentEssence(ownerName); MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, false); if (movingobjectposition == null) { - par3EntityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.divinationsigil.currentessence") + " " + EnergyItems.getCurrentEssence(ownerName) + "LP")); + par3EntityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.divinationsigil.currentessence") + " " + SoulNetworkHandler.getCurrentEssence(ownerName) + "LP")); return par1ItemStack; } else @@ -97,7 +97,7 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani if (!(tile instanceof IReagentHandler)) { - par3EntityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.divinationsigil.currentessence") + " " + EnergyItems.getCurrentEssence(ownerName) + "LP")); + par3EntityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.divinationsigil.currentessence") + " " + SoulNetworkHandler.getCurrentEssence(ownerName) + "LP")); return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilFluid.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilFluid.java index 0ca86723..8dbc8541 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilFluid.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilFluid.java @@ -197,9 +197,6 @@ public class SigilFluid extends Item implements IFluidContainerItem, ISigil int range = 5; float f = 1.0F; - double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f + 1.62D - (double) player.yOffset; - double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; boolean flag = true; MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, flag); @@ -391,9 +388,6 @@ public class SigilFluid extends Item implements IFluidContainerItem, ISigil public ItemStack fillItemFromWorld(ItemStack container, World world, EntityPlayer player, boolean forceFill) { float f = 1.0F; - double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f + 1.62D - (double) player.yOffset; - double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; boolean flag = true; MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, flag); @@ -574,9 +568,6 @@ public class SigilFluid extends Item implements IFluidContainerItem, ISigil } float f = 1.0F; - double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f + 1.62D - (double) player.yOffset; - double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; boolean flag = false; MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, flag); @@ -608,9 +599,6 @@ public class SigilFluid extends Item implements IFluidContainerItem, ISigil public ItemStack drainSelectedTank(ItemStack container, World world, EntityPlayer player) { float f = 1.0F; - double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f + 1.62D - (double) player.yOffset; - double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; boolean flag = false; MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, flag); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java index 9d315645..08db2402 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java @@ -22,9 +22,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) - private static IIcon activeIcon; + private IIcon activeIcon; @SideOnly(Side.CLIENT) - private static IIcon passiveIcon; + private IIcon passiveIcon; public SigilHarvest() { @@ -137,11 +137,6 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade { return; } - - if(par2World.isRemote) - { - return; - } EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; @@ -179,8 +174,6 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade } } } - - return; } @Override @@ -206,7 +199,6 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade } } } - } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java index 9bc70f86..cbc7dc86 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java @@ -151,10 +151,8 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil return this.tryPlaceContainedLiquid(world, x, y, z, x, y, z); } } - return false; - } /** @@ -224,12 +222,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil } } - if (!usedBattery) - { - return false; - } - - return true; + return usedBattery; } else { return true; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java index 1b1f46aa..7d636c01 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java @@ -21,9 +21,9 @@ import java.util.List; public class SigilOfElementalAffinity extends EnergyItems implements ISigil { @SideOnly(Side.CLIENT) - private static IIcon activeIcon; + private IIcon activeIcon; @SideOnly(Side.CLIENT) - private static IIcon passiveIcon; + private IIcon passiveIcon; public SigilOfElementalAffinity() { @@ -156,7 +156,5 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil } } } - - return; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java index 694df843..5ed0ea63 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java @@ -23,9 +23,9 @@ import java.util.List; public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISigil { @SideOnly(Side.CLIENT) - private static IIcon activeIcon; + private IIcon activeIcon; @SideOnly(Side.CLIENT) - private static IIcon passiveIcon; + private IIcon passiveIcon; public SigilOfEnderSeverance() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java index 021628de..f888d5a2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -26,8 +26,10 @@ import java.util.List; public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil { - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int tickDelay = 100; public SigilOfGrowth() @@ -161,7 +163,6 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil return; } - EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; if (par1ItemStack.getTagCompound() == null) { par1ItemStack.setTagCompound(new NBTTagCompound()); @@ -169,7 +170,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer) + if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { if(!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) { @@ -202,8 +203,6 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil } } } - - return; } public static boolean applyBonemeal(ItemStack p_150919_0_, World p_150919_1_, int p_150919_2_, int p_150919_3_, int p_150919_4_, EntityPlayer player) @@ -218,10 +217,6 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil if (event.getResult() == Result.ALLOW) { - if (!p_150919_1_.isRemote) - { - - } return true; } @@ -270,7 +265,6 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil { Block block = world.getBlock(ix, iy, iz); - if (block instanceof IPlantable) { if (world.rand.nextInt(100) == 0) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java index bc208359..12b772ca 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -21,9 +21,9 @@ import java.util.List; public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) - private static IIcon activeIcon; + private IIcon activeIcon; @SideOnly(Side.CLIENT) - private static IIcon passiveIcon; + private IIcon passiveIcon; public SigilOfHaste() { @@ -152,8 +152,6 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil } } } - - return; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java index b0a899e1..1e6aa7e4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -23,8 +23,10 @@ import cpw.mods.fml.relauncher.SideOnly; public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHolding, ISigil { - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int tickDelay = 300; public SigilOfMagnetism() @@ -140,7 +142,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer) + if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { if(!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java index 203d27a9..370ef3af 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java @@ -24,9 +24,10 @@ import java.util.List; public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISigil { - private static IIcon activeIcon; - private static IIcon passiveIcon; - private int tickDelay = 200; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int radius = 5; private int refresh = 100; @@ -62,8 +63,8 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi public void registerIcons(IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SigilOfSupression_deactivated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:SigilOfSupression_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SigilOfSupression_deactivated"); + activeIcon = iconRegister.registerIcon("AlchemicalWizardry:SigilOfSupression_activated"); + passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SigilOfSupression_deactivated"); } @Override @@ -78,10 +79,10 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi if (tag.getBoolean("isActive")) { - return this.activeIcon; + return activeIcon; } else { - return this.passiveIcon; + return passiveIcon; } } @@ -91,16 +92,18 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi { if (par1 == 1) { - return this.activeIcon; + return activeIcon; } else { - return this.passiveIcon; + return passiveIcon; } } @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + int tickDelay = 200; + if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) { return par1ItemStack; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java index d62cb872..7b023b8b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -23,8 +23,10 @@ import java.util.List; public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISigil { - private static IIcon activeIcon; - private static IIcon passiveIcon; + @SideOnly(Side.CLIENT) + private IIcon activeIcon; + @SideOnly(Side.CLIENT) + private IIcon passiveIcon; private int tickDelay = 200; public SigilOfTheBridge() @@ -141,7 +143,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer) + if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { if(EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, this.getLPUsed(par1ItemStack))) { @@ -209,8 +211,6 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig this.incrimentLPUSed(par1ItemStack, incremented); } - - return; } public int getLPUsed(ItemStack par1ItemStack) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java index 4458e241..37755b9f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -22,9 +22,9 @@ import java.util.List; public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) - private static IIcon activeIcon; + private IIcon activeIcon; @SideOnly(Side.CLIENT) - private static IIcon passiveIcon; + private IIcon passiveIcon; public SigilOfTheFastMiner() { @@ -153,8 +153,6 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I } } } - - return; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java index 124eb4d7..71f8cf0b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -21,9 +21,9 @@ import java.util.List; public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) - private static IIcon activeIcon; + private IIcon activeIcon; @SideOnly(Side.CLIENT) - private static IIcon passiveIcon; + private IIcon passiveIcon; public SigilOfWind() { @@ -152,8 +152,6 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil } } } - - return; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java index c1a94699..1014041e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java @@ -23,9 +23,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) - private static IIcon activeIcon; + private IIcon activeIcon; @SideOnly(Side.CLIENT) - private static IIcon passiveIcon; + private IIcon passiveIcon; public SigilPackRat() { @@ -165,8 +165,6 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade } } } - - return; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java index 277ef97d..cdca8941 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java @@ -59,8 +59,6 @@ public class SigilSeer extends Item implements IHolding, ArmourUpgrade, ISigil return par1ItemStack; } - String ownerName = itemTag.getString("ownerName"); - return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java index 573e9f45..c62ee182 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java @@ -85,10 +85,6 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil } float f = 1.0F; - double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f + 1.62D - (double) player.yOffset; - double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; - boolean flag = this.isFull == 0; if (!world.canMineBlock(player, x, y, z)) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java index 8aa6bf95..997740d9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java @@ -25,10 +25,14 @@ import java.util.List; public class ItemSanguineArmour extends ItemArmor implements ArmourUpgrade, IGoggles, IVisDiscountGear, IRevealer, IRunicArmor, IRepairable { - private static IIcon helmetIcon; - private static IIcon plateIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon helmetIcon; + @SideOnly(Side.CLIENT) + private IIcon plateIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; public ItemSanguineArmour(int armorType) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java index ffd98f35..26ace13d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java @@ -10,12 +10,10 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -53,7 +51,7 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelConduit.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + this.modelConduit.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); GL11.glPopMatrix(); @@ -133,15 +131,12 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer private void renderTankContents(double x, double y, double z, int colourRed, int colourGreen, int colourBlue, int colourIntensity) { GL11.glPushMatrix(); - float f1 = 1.0f; Tessellator tessellator = Tessellator.instance; this.bindTexture(resourceLocation); GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); - float f2 = 0; - float f3 = -f2 * 0.2F - (float) MathHelper.floor_float(-f2 * 0.1F); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -366,7 +361,7 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer default: { - return; + } } } else @@ -416,7 +411,7 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer default: { - return; + } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java index f707c80f..b37b9391 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java @@ -8,7 +8,6 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; @@ -34,7 +33,7 @@ public class RenderCrystalBelljar extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelConduit.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + this.modelConduit.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); GL11.glPopMatrix(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java index 4536bab3..b5319f98 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java @@ -6,7 +6,6 @@ import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -45,7 +44,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelPedestal.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + this.modelPedestal.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); GL11.glPopMatrix(); GL11.glPushMatrix(); @@ -189,7 +188,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer default: { - return; + } } } else @@ -239,7 +238,7 @@ public class RenderPedestal extends TileEntitySpecialRenderer default: { - return; + } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java index 566dd151..a8a867e4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java @@ -6,7 +6,6 @@ import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -45,7 +44,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelPlinth.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + this.modelPlinth.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); GL11.glPopMatrix(); GL11.glPushMatrix(); @@ -183,7 +182,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer default: { - return; + } } } else @@ -233,7 +232,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer default: { - return; + } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderReagentConduit.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderReagentConduit.java index 8e059247..3ab80b7e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderReagentConduit.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderReagentConduit.java @@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -24,15 +23,12 @@ public class RenderReagentConduit extends TileEntitySpecialRenderer float key2 = (tileEntity.xCoord * 21.43f - tileEntity.yCoord * 9.96f + tileEntity.zCoord * 12.8f); Int3 colourMap = ((TEReagentConduit) tileEntity).getColour(); GL11.glPushMatrix(); - float f1 = 1.0f; Tessellator tessellator = Tessellator.instance; this.bindTexture(field_110629_a); GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); - float f2 = 0; - float f3 = -f2 * 0.2F - (float) MathHelper.floor_float(-f2 * 0.1F); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDepthMask(false); @@ -42,7 +38,6 @@ public class RenderReagentConduit extends TileEntitySpecialRenderer GL11.glRotatef(tileEntity.getWorldObj().getWorldTime() / 3.0f, 0F, 1F, 0F); //Rotate on planar axis GL11.glRotatef(renderCount + key1, 0F, 0F, 1F); //Rotate vertical axis GL11.glRotatef(renderCount * 2f + key2, 1F, 0F, 0F); //Rotate cylindrically - double offset = 0; tessellator.setBrightness(240); tessellator.addVertexWithUV(-0.5d, 0, -0.5d, 0.0d, 0.0d); tessellator.addVertexWithUV(0.5d, 0, -0.5d, 1.0d, 0.0d); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEffectBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEffectBlock.java index ca285e88..555fb5f7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEffectBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEffectBlock.java @@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellEffectBlock; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -21,7 +20,7 @@ public class RenderSpellEffectBlock extends TileEntitySpecialRenderer TESpellEffectBlock tileSpellBlock = (TESpellEffectBlock) tileEntity; GL11.glPushMatrix(); GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/BlockSpellEffect.png"); + ResourceLocation test; int meta = tileEntity.getWorldObj().getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); String resource = tileSpellBlock.getResourceLocationForMeta(meta); test = new ResourceLocation(resource); @@ -29,7 +28,7 @@ public class RenderSpellEffectBlock extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellEffectBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); + this.modelSpellEffectBlock.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEnhancementBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEnhancementBlock.java index a903ffa1..2f2d0ff3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEnhancementBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellEnhancementBlock.java @@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellEnhancementB import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEnhancementBlock; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -21,7 +20,7 @@ public class RenderSpellEnhancementBlock extends TileEntitySpecialRenderer TESpellEnhancementBlock tileSpellBlock = (TESpellEnhancementBlock) tileEntity; GL11.glPushMatrix(); GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/BlockSpellEnhancementPower1.png"); + ResourceLocation test; int meta = tileEntity.getWorldObj().getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); String resource = tileSpellBlock.getResourceLocationForMeta(meta); test = new ResourceLocation(resource); @@ -29,7 +28,7 @@ public class RenderSpellEnhancementBlock extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellEnhancementBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); + this.modelSpellEnhancementBlock.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellModifierBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellModifierBlock.java index 1e6df601..0a972266 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellModifierBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellModifierBlock.java @@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellModifierBloc import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -21,7 +20,7 @@ public class RenderSpellModifierBlock extends TileEntitySpecialRenderer TESpellModifierBlock tileSpellBlock = (TESpellModifierBlock) tileEntity; GL11.glPushMatrix(); GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/BlockSpellModifier.png"); + ResourceLocation test; int meta = tileEntity.getWorldObj().getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); String resource = tileSpellBlock.getResourceLocationForMeta(meta); test = new ResourceLocation(resource); @@ -29,7 +28,7 @@ public class RenderSpellModifierBlock extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellModifierBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); + this.modelSpellModifierBlock.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellParadigmBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellParadigmBlock.java index 941d8855..ca0f9336 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellParadigmBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderSpellParadigmBlock.java @@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellParadigmBloc import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -21,7 +20,7 @@ public class RenderSpellParadigmBlock extends TileEntitySpecialRenderer TESpellParadigmBlock tileSpellBlock = (TESpellParadigmBlock) tileEntity; GL11.glPushMatrix(); GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/BlockSpellParadigm.png"); + ResourceLocation test; int meta = tileEntity.getWorldObj().getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); String resource = tileSpellBlock.getResourceLocationForMeta(meta); test = new ResourceLocation(resource); @@ -29,7 +28,7 @@ public class RenderSpellParadigmBlock extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellParadigmBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); + this.modelSpellParadigmBlock.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, tileSpellBlock.getInputDirection(), tileSpellBlock.getOutputDirection()); GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderWritingTable.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderWritingTable.java index dec51680..c9f36674 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderWritingTable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderWritingTable.java @@ -7,7 +7,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -48,7 +47,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelWritingTable.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + this.modelWritingTable.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); GL11.glPopMatrix(); @@ -260,7 +259,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer default: { - return; + } } } else @@ -310,7 +309,7 @@ public class RenderWritingTable extends TileEntitySpecialRenderer default: { - return; + } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java index 0a3266dc..22c6c645 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java @@ -18,12 +18,12 @@ public class TEAlchemicalCalcinatorItemRenderer implements IItemRenderer private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); - GL11.glTranslatef((float) translateX + 0.5F, (float) translateY + 1.5F, (float) translateZ + 0.5F); + GL11.glTranslatef(translateX + 0.5F, translateY + 1.5F, translateZ + 0.5F); ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/AlchemicalCalcinator.png"); FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelConduit.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + this.modelConduit.render(null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrafting.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrafting.java index 4e86f944..889bed90 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrafting.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrafting.java @@ -28,7 +28,6 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class RitualEffectCrafting extends RitualEffect { - public static final boolean isTesting = false; public static final boolean limitToSingleStack = true; public static final int potentiaDrain = 2; public static final int virtusDrain = 2; @@ -126,12 +125,11 @@ public class RitualEffectCrafting extends RitualEffect if (returnStack == null) { tag.setBoolean("didLastCraftFail", true); - return; }else { boolean hasVirtus = this.canDrainReagent(ritualStone, ReagentRegistry.virtusReagent, virtusDrain, false); boolean addOutputToInputs = hasVirtus; - + IInventory outputInv = null; List invList = new ArrayList(); @@ -420,7 +418,7 @@ public class RitualEffectCrafting extends RitualEffect // return false; // } - return stack1.getItem() == stack2.getItem() && (stack1.getItem().getHasSubtypes() ? stack1.getItemDamage() == stack2.getItemDamage() : true); + return stack1.getItem() == stack2.getItem() && !stack1.getItem().getHasSubtypes() || stack1.getItemDamage() == stack2.getItemDamage(); } public boolean areItemStacksEqualWithWildcard(ItemStack recipeStack, ItemStack comparedStack) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java index 55c03291..7d6838e1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java @@ -7,7 +7,6 @@ import java.util.Random; import java.util.regex.Pattern; import net.minecraft.block.Block; -import net.minecraft.block.BlockLiquid; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; @@ -313,12 +312,7 @@ public class SpellHelper public static boolean isFakePlayer(World world, EntityPlayer player) { - if (world.isRemote) - { - return false; - } - - return isFakePlayer(player); + return !world.isRemote && isFakePlayer(player); } private static final Pattern FAKE_PLAYER_PATTERN = Pattern.compile("^(?:\\[.*\\])|(?:ComputerCraft)$"); @@ -334,15 +328,12 @@ public class SpellHelper if (block == Blocks.stone) { world.setBlock(posX, posY, posZ, Blocks.cobblestone); - return; } else if (block == Blocks.cobblestone) { world.setBlock(posX, posY, posZ, Blocks.gravel); - return; } else if (block == Blocks.gravel) { world.setBlock(posX, posY, posZ, Blocks.sand); - return; } } @@ -536,7 +527,7 @@ public class SpellHelper { if (stack == null) { - return stack; + return null; } boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; @@ -666,7 +657,7 @@ public class SpellHelper { if (stack == null) { - return stack; + return null; } boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; @@ -903,7 +894,7 @@ public class SpellHelper // } // else { - if (entity instanceof EntityZombie) +// if (entity instanceof EntityZombie) { //par2 = par2; // Forge: Noop Warning } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java index a3e8c653..78978791 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java @@ -61,7 +61,6 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I protected FluidStack fluidOutput; protected FluidStack fluidInput; private int progress; - private int hasChanged = 0; private int lockdownDuration; private int demonBloodDuration; @@ -258,16 +257,6 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I return fluid; } - public FluidStack getInputFluid() - { - return fluidInput; - } - - public FluidStack getOutputFluid() - { - return fluidOutput; - } - @Override public int getFluidAmount() { @@ -490,7 +479,6 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I if (AlchemicalWizardry.lockdownAltar) { List list = SpellHelper.getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15); - boolean hasHighRegen = false; for (EntityPlayer player : list) { PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); @@ -582,7 +570,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I if (progress >= liquidRequired * stackSize) { - ItemStack result = null; + ItemStack result; result = AltarRecipeRegistry.getItemForItemAndTier(this.getStackInSlot(0), this.upgradeLevel); if (result != null) { @@ -714,7 +702,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I public int[] buildIntDataList() { - int[] sortList = new int[1 * 3]; + int[] sortList = new int[3]; //1 * 3 int pos = 0; for (ItemStack is : inv) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEInventory.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEInventory.java index 856d154e..6d28ea18 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEInventory.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEInventory.java @@ -28,11 +28,6 @@ public abstract class TEInventory extends TileEntity implements IInventory return inv.length; } - public ItemStack[] getSlots() - { - return inv; - } - @Override public ItemStack getStackInSlot(int slot) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java index 6d0a7b0a..ff2d1875 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java @@ -105,7 +105,7 @@ public class TEPedestal extends TEInventory public int[] buildIntDataList() { - int[] sortList = new int[1 * 3]; + int[] sortList = new int[3]; //1 * 3 int pos = 0; for (ItemStack is : inv) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java index af245293..8ad6d782 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java @@ -56,7 +56,7 @@ public class TEPlinth extends TEInventory for (int i = 0; i < ring1TagList.tagCount(); i++) { - NBTTagCompound tag = (NBTTagCompound) ring1TagList.getCompoundTagAt(i); + NBTTagCompound tag = ring1TagList.getCompoundTagAt(i); int slot = tag.getByte("Slot"); if (slot >= 0 && slot < inv.length) @@ -69,7 +69,7 @@ public class TEPlinth extends TEInventory for (int i = 0; i < ring2TagList.tagCount(); i++) { - NBTTagCompound tag = (NBTTagCompound) ring2TagList.getCompoundTagAt(i); + NBTTagCompound tag = ring2TagList.getCompoundTagAt(i); int slot = tag.getByte("Slot"); if (slot >= 0 && slot < inv.length) @@ -82,7 +82,7 @@ public class TEPlinth extends TEInventory for (int i = 0; i < ring3TagList.tagCount(); i++) { - NBTTagCompound tag = (NBTTagCompound) ring3TagList.getCompoundTagAt(i); + NBTTagCompound tag = ring3TagList.getCompoundTagAt(i); int slot = tag.getByte("Slot"); if (slot >= 0 && slot < inv.length) @@ -105,8 +105,6 @@ public class TEPlinth extends TEInventory for (int i = 0; i < ring1Inv.length; i++) { - ItemStack stack = ring1Inv[i]; - if (ring1Inv[i] != null) { NBTTagCompound tag = new NBTTagCompound(); @@ -121,8 +119,6 @@ public class TEPlinth extends TEInventory for (int i = 0; i < ring2Inv.length; i++) { - ItemStack stack = ring2Inv[i]; - if (ring2Inv[i] != null) { NBTTagCompound tag = new NBTTagCompound(); @@ -137,8 +133,6 @@ public class TEPlinth extends TEInventory for (int i = 0; i < ring3Inv.length; i++) { - ItemStack stack = ring3Inv[i]; - if (ring3Inv[i] != null) { NBTTagCompound tag = new NBTTagCompound(); @@ -517,7 +511,7 @@ public class TEPlinth extends TEInventory public int[] buildIntDataList() { - int[] sortList = new int[1 * 3]; + int[] sortList = new int[3]; //1 * 3 int pos = 0; for (ItemStack is : inv) @@ -565,6 +559,4 @@ public class TEPlinth extends TEInventory pedestalPositions.add(new PlinthComponent(-7, 2, -4, 3)); pedestalPositions.add(new PlinthComponent(-7, 2, 4, 3)); } - - } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESocket.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESocket.java index ef3cf992..faa72994 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESocket.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESocket.java @@ -104,7 +104,7 @@ public class TESocket extends TEInventory public int[] buildIntDataList() { - int[] sortList = new int[1 * 3]; + int[] sortList = new int[3]; //1 * 3 int pos = 0; for (ItemStack is : inv) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralContainer.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralContainer.java index dd545da4..1ee0076c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralContainer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralContainer.java @@ -32,7 +32,7 @@ public class TESpectralContainer extends TileEntity for (int i = 0; i < tagList.tagCount(); i++) { - NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i); + NBTTagCompound tag = tagList.getCompoundTagAt(i); int slot = tag.getByte("Slot"); if (slot >= 0 && slot < inv.length) @@ -52,8 +52,6 @@ public class TESpectralContainer extends TileEntity for (int i = 0; i < inv.length; i++) { - ItemStack stack = inv[i]; - if (inv[i] != null) { NBTTagCompound tag = new NBTTagCompound(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java index 53814d41..21f12faa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java @@ -33,7 +33,7 @@ public class TESpellParadigmBlock extends TESpellBlock implements ISpellParadigm @Override protected void applySpellChange(SpellParadigm parad) { - return; + } public boolean canInputRecieve() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TETeleposer.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TETeleposer.java index 57959fe8..543cf411 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TETeleposer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TETeleposer.java @@ -237,7 +237,7 @@ public class TETeleposer extends TEInventory public int[] buildIntDataList() { - int[] sortList = new int[1 * 3]; + int[] sortList = new int[3]; //1 * 3 int pos = 0; for (ItemStack is : inv) @@ -263,5 +263,4 @@ public class TETeleposer extends TEInventory { return itemstack.getItem() instanceof TelepositionFocus; } - } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java index 5bed0af1..101950d1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java @@ -27,7 +27,6 @@ public class TEWritingTable extends TEInventory implements ISidedInventory public static final int sizeInv = 7; private int progress; - private int progressNeeded = 100; private int amountUsed; private int accelerationTime; @@ -162,13 +161,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory public boolean containsPotionFlask() { - if (getPotionFlaskPosition() != -1) - { - return true; - } else - { - return false; - } + return getPotionFlaskPosition() != -1; } public int getPotionFlaskPosition() @@ -210,13 +203,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory public boolean containsRegisteredPotionIngredient() { - if (getRegisteredPotionIngredientPosition() != -1) - { - return true; - } else - { - return false; - } + return getRegisteredPotionIngredientPosition() != -1; } public int getRegisteredPotionIngredientPosition() @@ -240,12 +227,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory public boolean containsCatalyst() { - if (getCatalystPosition() != -1) - { - return true; - } - - return false; + return getCatalystPosition() != -1; } public int getCatalystPosition() @@ -263,12 +245,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory public boolean containsBindingAgent() { - if (getBindingAgentPosition() != -1) - { - return true; - } - - return false; + return getBindingAgentPosition() != -1; } public int getBindingAgentPosition() @@ -286,12 +263,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory public boolean containsFillingAgent() { - if (getFillingAgentPosition() != -1) - { - return true; - } - - return false; + return getFillingAgentPosition() != -1; } public int getFillingAgentPosition() @@ -309,12 +281,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory public boolean containsBlankSlate() { - if (getBlankSlatePosition() != -1) - { - return true; - } - - return false; + return getBlankSlatePosition() != -1; } public int getBlankSlatePosition() @@ -333,6 +300,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory @Override public void updateEntity() { + int progressNeeded = 100; long worldTime = worldObj.getWorldTime(); if (worldObj.isRemote)