From bab9ad582fed7fc8f1d4aeb359081dc03e3943e6 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Tue, 15 Oct 2019 14:32:38 +0200 Subject: [PATCH] General Code Maintenance -might fix https://github.com/GTNewHorizons/NewHorizons/issues/5048 -optimised imports -removed some unused null checks -qualified names, generally made the code more readable Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- .../java/makeo/gadomancy/api/AuraEffect.java | 6 +- .../makeo/gadomancy/api/ClickBehavior.java | 2 +- .../makeo/gadomancy/api/GadomancyApi.java | 26 +- .../api/golems/AdditionalGolemType.java | 8 +- .../api/golems/cores/AdditionalGolemCore.java | 2 +- .../makeo/gadomancy/client/ClientProxy.java | 26 +- .../client/effect/EffectHandler.java | 48 ++- .../client/effect/fx/EntityFXFlowPolicy.java | 12 +- .../gadomancy/client/effect/fx/FXFlow.java | 140 +++---- .../gadomancy/client/effect/fx/FXVortex.java | 32 +- .../gadomancy/client/effect/fx/Orbital.java | 76 ++-- .../client/events/ClientHandler.java | 3 +- .../client/events/FakeArchitectItem.java | 2 +- .../client/events/RenderEventHandler.java | 73 ++-- .../client/events/ResourceReloadListener.java | 16 +- .../client/gui/ArcanePackagerGui.java | 43 +- .../gui/GuiResearchRecipeAuraEffects.java | 30 +- .../gadomancy/client/gui/InfusionClawGui.java | 24 +- .../client/models/ModelArcaneDropper.java | 160 ++++---- .../client/models/ModelArcanePackager.java | 132 +++--- .../client/models/ModelAuraPylon.java | 216 +++++----- .../client/models/ModelAuraPylonBottom.java | 300 +++++++------- .../client/models/ModelAuraPylonTop.java | 160 ++++---- .../client/models/ModelBlockProtector.java | 188 ++++----- .../models/ModelEssentiaCompressor.java | 384 +++++++++--------- .../client/models/ModelFocusPortalPart.java | 74 ++-- .../client/models/ModelInfusionClawPart.java | 20 +- .../gadomancy/client/models/ModelJarPot.java | 76 ++-- .../client/models/ModelManipulatorPart.java | 62 +-- .../client/models/ModelPackagerPiston.java | 28 +- .../models/ModelPackedCompressorBlock.java | 16 +- .../client/models/ModelSmallCube.java | 20 +- .../client/models/ModelWandPart.java | 12 +- .../block/BlockExtendedNodeJarRenderer.java | 14 +- .../block/BlockRenderingHandler.java | 2 +- .../block/RenderBlockStoneMachine.java | 8 +- .../block/RenderBlockTransparent.java | 2 +- .../entity/PlayerCameraRenderer.java | 38 +- .../entity/RenderAdditionalGolemBase.java | 14 +- .../renderers/entity/RenderEntityItem.java | 6 +- .../item/ItemCreativeNodeRenderer.java | 2 +- .../item/ItemJarExtendedNodeRenderer.java | 5 +- .../renderers/item/ItemNodeRenderer.java | 15 +- .../renderers/item/ItemRenderFamiliar.java | 60 ++- .../renderers/item/ItemRenderRemoteJar.java | 10 +- .../item/ItemRenderStoneMachine.java | 12 +- .../renderers/item/ItemRenderTileEntity.java | 6 +- .../item/ItemRenderTileEntityMulti.java | 6 +- .../renderers/tile/RenderTileAIShutdown.java | 26 +- .../tile/RenderTileArcaneDropper.java | 10 +- .../tile/RenderTileArcanePackager.java | 10 +- .../renderers/tile/RenderTileAuraPylon.java | 32 +- .../tile/RenderTileBlockProtector.java | 6 +- .../tile/RenderTileEssentiaCompressor.java | 36 +- .../tile/RenderTileInfusionClaw.java | 54 +-- .../tile/RenderTileKnowledgeBook.java | 10 +- .../tile/RenderTileManipulationFocus.java | 8 +- .../tile/RenderTileManipulatorPillar.java | 8 +- .../renderers/tile/RenderTileNodeBasic.java | 6 +- .../tile/RenderTileNodeManipulator.java | 4 +- .../renderers/tile/RenderTileRemoteJar.java | 8 +- .../renderers/tile/RenderTileStickyJar.java | 8 +- .../client/textures/GolemGuiTexture.java | 12 +- .../transformation/FakeEntityGolemBase.java | 116 +++--- .../transformation/TransformationHelper.java | 50 +-- .../util/ExtendedTypeDisplayManager.java | 40 +- .../client/util/FamiliarHandlerClient.java | 66 +-- .../util/MultiTickEffectDispatcher.java | 38 +- .../makeo/gadomancy/client/util/UtilsFX.java | 22 +- .../makeo/gadomancy/common/CommonProxy.java | 5 +- .../makeo/gadomancy/common/Gadomancy.java | 34 +- .../common/api/DefaultApiHandler.java | 22 +- .../common/aura/AuraEffectHandler.java | 19 +- .../gadomancy/common/aura/AuraEffects.java | 61 ++- .../common/aura/AuraResearchManager.java | 12 +- .../common/aura/ResearchPageAuraAspects.java | 5 +- .../blocks/BlockAdditionalEldritchPortal.java | 2 +- .../common/blocks/BlockArcaneDropper.java | 10 +- .../common/blocks/BlockAuraPylon.java | 19 +- .../blocks/BlockEssentiaCompressor.java | 32 +- .../common/blocks/BlockExtendedNodeJar.java | 14 +- .../common/blocks/BlockInfusionClaw.java | 4 +- .../common/blocks/BlockKnowledgeBook.java | 20 +- .../common/blocks/BlockNodeManipulator.java | 18 +- .../common/blocks/BlockRemoteJar.java | 6 +- .../common/blocks/BlockStickyJar.java | 26 +- .../common/blocks/BlockStoneMachine.java | 71 ++-- .../common/blocks/BlockTransparent.java | 4 +- .../blocks/tiles/SynchronizedTileEntity.java | 10 +- .../common/blocks/tiles/TileAIShutdown.java | 144 ++++--- .../tiles/TileAdditionalEldritchPortal.java | 16 +- .../blocks/tiles/TileArcaneDropper.java | 102 ++--- .../common/blocks/tiles/TileArcaneHand.java | 64 +-- .../blocks/tiles/TileArcanePackager.java | 154 ++++--- .../common/blocks/tiles/TileAuraPylon.java | 262 ++++++------ .../common/blocks/tiles/TileAuraPylonTop.java | 56 ++- .../blocks/tiles/TileBlockProtector.java | 124 +++--- .../blocks/tiles/TileEssentiaCompressor.java | 383 +++++++++-------- .../common/blocks/tiles/TileExtendedNode.java | 108 ++--- .../blocks/tiles/TileExtendedNodeJar.java | 53 ++- .../common/blocks/tiles/TileInfusionClaw.java | 195 +++++---- .../blocks/tiles/TileKnowledgeBook.java | 246 ++++++----- .../blocks/tiles/TileManipulatorPillar.java | 4 +- .../blocks/tiles/TileNodeManipulator.java | 380 +++++++++-------- .../tiles/TileOverrideEldritchLock.java | 4 +- .../common/blocks/tiles/TileRemoteJar.java | 62 ++- .../common/blocks/tiles/TileStickyJar.java | 278 ++++++------- .../containers/ContainerArcanePackager.java | 20 +- .../containers/ContainerInfusionClaw.java | 16 +- .../common/containers/FilteredSlot.java | 2 +- .../crafting/DeprecationItemPaybacks.java | 44 +- .../EtherealFamiliarUpgradeRecipe.java | 16 +- .../common/crafting/FamiliarUndoRecipe.java | 2 +- .../Familiar_Old_AugmentInfusion.java | 12 +- .../crafting/InfusionDisguiseArmor.java | 31 +- .../crafting/InfusionUpgradeRecipe.java | 6 +- .../crafting/InfusionVisualDisguiseArmor.java | 46 ++- .../common/crafting/RecipeStickyJar.java | 4 +- .../crafting/RecipeVisualStickyJar.java | 12 +- .../gadomancy/common/data/AbstractData.java | 12 +- .../gadomancy/common/data/DataAchromatic.java | 66 +-- .../gadomancy/common/data/DataFamiliar.java | 64 ++- .../gadomancy/common/data/SyncDataHolder.java | 34 +- .../common/data/config/ModConfig.java | 46 +-- .../gadomancy/common/data/config/ModData.java | 40 +- .../gadomancy/common/data/config/Sync.java | 3 +- .../common/entities/EntityAuraCore.java | 248 +++++------ .../common/entities/EntityItemElement.java | 12 +- .../common/entities/EntityPermNoClipItem.java | 82 ++-- .../common/entities/ai/AIBreakBlock.java | 199 +++++---- .../common/entities/ai/AIFollowOwner.java | 12 +- .../gadomancy/common/entities/ai/AISit.java | 12 +- .../ai/AIUncheckedAttackOnCollide.java | 10 +- .../entities/ai/AIUncheckedDartAttack.java | 8 +- .../entities/fake/AdvancedFakePlayer.java | 6 +- .../entities/fake/FakeNetServerHandler.java | 28 +- .../common/entities/fake/GolemFakePlayer.java | 20 +- .../golems/ItemAdditionalGolemPlacer.java | 32 +- .../golems/cores/BodyguardGolemCore.java | 42 +- .../golems/cores/EntityAITasksWrapper.java | 22 +- .../golems/nbt/ExtendedGolemProperties.java | 88 ++-- .../golems/nbt/OverrideNBTTagByte.java | 6 +- .../golems/nbt/OverrideRidingEntity.java | 10 +- .../golems/types/ObsidianGolemType.java | 4 +- .../golems/types/RemovedGolemType.java | 4 +- .../golems/types/SilverwoodGolemType.java | 4 +- .../golems/upgrades/GolemUpgrade.java | 44 +- .../upgrades/GolemUpgradeRunicShield.java | 30 +- .../player/ExtendedPlayerProperties.java | 10 +- .../common/events/EventHandlerEntity.java | 11 +- .../common/events/EventHandlerGolem.java | 11 +- .../common/events/EventHandlerRedirect.java | 36 +- .../common/events/EventHandlerWorld.java | 47 +-- .../familiar/FamiliarAIController_Old.java | 76 ++-- .../familiar/FamiliarAIProcess_Old.java | 12 +- .../common/familiar/FamiliarAugment.java | 70 ++-- .../common/familiar/FamiliarController.java | 78 ++-- .../integration/IntegrationAutomagy.java | 2 +- .../common/integration/IntegrationMod.java | 10 +- .../common/integration/IntegrationMorph.java | 6 +- .../common/integration/IntegrationNEI.java | 26 +- .../IntegrationThaumicTinkerer.java | 14 +- .../IntegrationThaumicHorizions.java | 12 +- .../RenderAdditionalGolemTH.java | 14 +- .../integration/waila/IntegrationWaila.java | 2 +- .../integration/waila/StickyJarProvider.java | 8 +- .../common/items/ItemArcanePackage.java | 8 +- .../gadomancy/common/items/ItemAuraCore.java | 42 +- .../ItemBlockAdditionalEldritchPortal.java | 4 +- .../common/items/ItemBlockAuraPylon.java | 6 +- .../items/ItemBlockEssentiaCompressor.java | 4 +- .../common/items/ItemBlockKnowledgeBook.java | 4 +- .../common/items/ItemBlockRemoteJar.java | 8 +- .../common/items/ItemBlockStoneMachine.java | 6 +- .../common/items/ItemCreativeNode.java | 8 +- .../gadomancy/common/items/ItemElement.java | 23 +- .../common/items/ItemExtendedNodeJar.java | 32 +- .../common/items/ItemFakeGolemPlacer.java | 8 +- .../common/items/ItemFakeGolemShield.java | 18 +- .../common/items/ItemFakeLootbag.java | 4 +- .../common/items/ItemFakeModIcon.java | 18 +- .../common/items/ItemGolemCoreBreak.java | 14 +- .../common/items/ItemTransformationFocus.java | 16 +- .../items/baubles/ItemEtherealFamiliar.java | 60 +-- .../items/baubles/ItemFamiliar_Old.java | 59 ++- .../common/network/PacketHandler.java | 20 +- .../network/packets/PacketAbortTransform.java | 10 +- .../packets/PacketAnimationAbsorb.java | 18 +- .../network/packets/PacketFamiliarBolt.java | 14 +- .../network/packets/PacketStartAnimation.java | 28 +- .../network/packets/PacketSyncConfigs.java | 6 +- .../network/packets/PacketSyncData.java | 12 +- .../network/packets/PacketTCNodeBolt.java | 16 +- .../packets/PacketTCNotificationText.java | 14 +- .../network/packets/PacketTCWispyLine.java | 36 +- .../packets/PacketTransformationInfo.java | 12 +- .../packets/PacketUpdateGolemTypeOrder.java | 10 +- .../packets/PacketUpdateOnlineState.java | 4 +- .../common/node/GrowingNodeBehavior.java | 172 ++++---- .../common/node/NodeManipulatorResult.java | 3 +- .../node/NodeManipulatorResultHandler.java | 24 +- .../common/potions/PotionAchromatic.java | 4 +- .../common/potions/PotionBuffGolem.java | 32 +- .../common/potions/PotionCustomTexture.java | 6 +- .../common/potions/PotionEldritch.java | 2 +- .../common/potions/PotionMiningLuck.java | 2 +- .../common/potions/PotionVisAffinity.java | 2 +- .../registration/AIShutdownWhitelist.java | 14 +- .../common/registration/RegisteredBlocks.java | 123 +++--- .../registration/RegisteredEnchantments.java | 4 +- .../registration/RegisteredEntities.java | 8 +- .../RegisteredFamiliarAI_Old.java | 6 +- .../registration/RegisteredGolemStuff.java | 11 +- .../registration/RegisteredIntegrations.java | 17 +- .../common/registration/RegisteredItems.java | 68 ++-- .../registration/RegisteredManipulations.java | 2 +- .../registration/RegisteredMultiblocks.java | 1 - .../registration/RegisteredPotions.java | 11 +- .../registration/RegisteredRecipes.java | 91 ++--- .../registration/RegisteredResearches.java | 116 +++--- .../common/registration/StickyJarInfo.java | 8 +- .../research/AlternatingResearchItem.java | 8 +- .../common/research/DisguiseResearchItem.java | 4 +- .../research/IfAnyParentResearchItem.java | 10 +- .../common/research/MultiResearchPage.java | 10 +- .../common/research/PseudoResearchItem.java | 16 +- .../common/research/SimpleResearchItem.java | 6 +- .../research/StickyJarResearchItem.java | 2 +- .../gadomancy/common/utils/ColorHelper.java | 6 +- .../common/utils/ExplosionHelper.java | 88 ++-- .../common/utils/GolemEnumHelper.java | 74 ++-- .../gadomancy/common/utils/Injector.java | 40 +- .../gadomancy/common/utils/MiscUtils.java | 24 +- .../common/utils/MultiblockHelper.java | 16 +- .../gadomancy/common/utils/NBTHelper.java | 20 +- .../common/utils/PrimalAspectList.java | 2 +- .../common/utils/RandomizedAspectList.java | 30 +- .../makeo/gadomancy/common/utils/Vector3.java | 34 +- .../gadomancy/common/utils/WandHandler.java | 26 +- .../utils/world/ChunkProviderTCOuter.java | 34 +- .../common/utils/world/TCMazeHandler.java | 103 +++-- .../common/utils/world/TCMazeSession.java | 40 +- .../common/utils/world/fake/FakeWorld.java | 12 +- .../world/fake/FakeWorldTCGeneration.java | 52 ++- .../gadomancy/coremod/GadomancyCore.java | 2 +- .../coremod/GadomancyTransformer.java | 18 +- 246 files changed, 4892 insertions(+), 5114 deletions(-) diff --git a/src/main/java/makeo/gadomancy/api/AuraEffect.java b/src/main/java/makeo/gadomancy/api/AuraEffect.java index ff284c7..45c23b0 100644 --- a/src/main/java/makeo/gadomancy/api/AuraEffect.java +++ b/src/main/java/makeo/gadomancy/api/AuraEffect.java @@ -98,7 +98,7 @@ public abstract class AuraEffect { /** * A EntityEffect AuraEffect class for convenience */ - public static abstract class EntityAuraEffect extends AuraEffect { + public abstract static class EntityAuraEffect extends AuraEffect { @Override public final EffectType getEffectType() { @@ -123,7 +123,7 @@ public abstract class AuraEffect { /** * A BlockEffect AuraEffect class for convenience */ - public static abstract class BlockAuraEffect extends AuraEffect { + public abstract static class BlockAuraEffect extends AuraEffect { @Override public final EffectType getEffectType() { @@ -140,7 +140,7 @@ public abstract class AuraEffect { } - public static enum EffectType { + public enum EffectType { ENTITY_EFFECT, BLOCK_EFFECT diff --git a/src/main/java/makeo/gadomancy/api/ClickBehavior.java b/src/main/java/makeo/gadomancy/api/ClickBehavior.java index ef9b7a3..2e7d25b 100644 --- a/src/main/java/makeo/gadomancy/api/ClickBehavior.java +++ b/src/main/java/makeo/gadomancy/api/ClickBehavior.java @@ -46,7 +46,7 @@ public abstract class ClickBehavior { //TODO not handled as expected. public boolean hasVisCost() { - return hasVisCost; + return this.hasVisCost; } public int getComparatorOutput() { diff --git a/src/main/java/makeo/gadomancy/api/GadomancyApi.java b/src/main/java/makeo/gadomancy/api/GadomancyApi.java index fdd6d77..dc2feee 100644 --- a/src/main/java/makeo/gadomancy/api/GadomancyApi.java +++ b/src/main/java/makeo/gadomancy/api/GadomancyApi.java @@ -26,54 +26,54 @@ public abstract class GadomancyApi { @Deprecated public static boolean registerAdditionalGolemType(String name, String modId, AdditionalGolemType newType){ - return handler.registerAdditionalGolemType(name, modId, newType); + return GadomancyApi.handler.registerAdditionalGolemType(name, modId, newType); } public static AdditionalGolemType getAdditionalGolemType(String name) { - return handler.getAdditionalGolemType(name); + return GadomancyApi.handler.getAdditionalGolemType(name); } public static AdditionalGolemType getAdditionalGolemType(EnumGolemType type) { - return getAdditionalGolemType(type.name()); + return GadomancyApi.getAdditionalGolemType(type.name()); } public static List getAdditionalGolemTypes() { - return handler.getAdditionalGolemTypes(); + return GadomancyApi.handler.getAdditionalGolemTypes(); } public static boolean isAdditionalGolemType(String name) { - return getAdditionalGolemType(name) != null; + return GadomancyApi.getAdditionalGolemType(name) != null; } public static boolean isAdditionalGolemType(EnumGolemType type) { - return isAdditionalGolemType(type.name()); + return GadomancyApi.isAdditionalGolemType(type.name()); } public static AdditionalGolemCore getAdditionalGolemCore(EntityGolemBase golem) { - return handler.getAdditionalGolemCore(golem); + return GadomancyApi.handler.getAdditionalGolemCore(golem); } public static AdditionalGolemCore getAdditionalGolemCore(ItemStack placer) { - return handler.getAdditionalGolemCore(placer); + return GadomancyApi.handler.getAdditionalGolemCore(placer); } public static void setAdditionalGolemCore(EntityGolemBase golem, AdditionalGolemCore core) { - handler.setAdditionalGolemCore(golem, core); + GadomancyApi.handler.setAdditionalGolemCore(golem, core); } public static boolean registerAdditionalGolemCore(String name, AdditionalGolemCore core) { - return handler.registerAdditionalGolemCore(name, core); + return GadomancyApi.handler.registerAdditionalGolemCore(name, core); } public static void registerAdditionalAuraEffect(Aspect aspect, AuraEffect effect) { - handler.registerAdditionalAuraEffect(aspect, effect); + GadomancyApi.handler.registerAdditionalAuraEffect(aspect, effect); } public static List getAdditionalGolemCores() { - return handler.getAdditionalGolemCores(); + return GadomancyApi.handler.getAdditionalGolemCores(); } public static void registerClawClickBehavior(ClickBehavior clickBehavior) { - handler.registerClawClickBehavior(clickBehavior); + GadomancyApi.handler.registerClawClickBehavior(clickBehavior); } } diff --git a/src/main/java/makeo/gadomancy/api/golems/AdditionalGolemType.java b/src/main/java/makeo/gadomancy/api/golems/AdditionalGolemType.java index 558fb1d..9735bc2 100644 --- a/src/main/java/makeo/gadomancy/api/golems/AdditionalGolemType.java +++ b/src/main/java/makeo/gadomancy/api/golems/AdditionalGolemType.java @@ -55,19 +55,19 @@ public abstract class AdditionalGolemType { public abstract ResourceLocation getInvSlotTexture(); public EnumGolemType getEnumEntry() { - return enumEntry; + return this.enumEntry; } public String getName() { - return enumEntry.name(); + return this.enumEntry.name(); } public Item getPlacerItem() { - return placerItem; + return this.placerItem; } public String getModId() { - return modId; + return this.modId; } @Deprecated diff --git a/src/main/java/makeo/gadomancy/api/golems/cores/AdditionalGolemCore.java b/src/main/java/makeo/gadomancy/api/golems/cores/AdditionalGolemCore.java index 315003d..d94d44e 100644 --- a/src/main/java/makeo/gadomancy/api/golems/cores/AdditionalGolemCore.java +++ b/src/main/java/makeo/gadomancy/api/golems/cores/AdditionalGolemCore.java @@ -71,7 +71,7 @@ public abstract class AdditionalGolemCore { public abstract ItemStack getItem(); public String getName() { - return name; + return this.name; } @Deprecated diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index dbc3f82..d38abc3 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -16,28 +16,18 @@ import makeo.gadomancy.client.renderers.block.RenderBlockStoneMachine; import makeo.gadomancy.client.renderers.block.RenderBlockTransparent; import makeo.gadomancy.client.renderers.entity.RenderAdditionalGolemBase; import makeo.gadomancy.client.renderers.entity.RenderEntityAuraCore; -import makeo.gadomancy.client.renderers.item.ItemCreativeNodeRenderer; -import makeo.gadomancy.client.renderers.item.ItemExNodeRenderer; -import makeo.gadomancy.client.renderers.item.ItemJarExtendedNodeRenderer; -import makeo.gadomancy.client.renderers.item.ItemRenderFamiliar; -import makeo.gadomancy.client.renderers.item.ItemRenderRemoteJar; -import makeo.gadomancy.client.renderers.item.ItemRenderStoneMachine; -import makeo.gadomancy.client.renderers.item.ItemRenderTEKnowledgeBook; -import makeo.gadomancy.client.renderers.item.ItemRenderTileEntity; -import makeo.gadomancy.client.renderers.item.ItemRenderTileEntityMulti; +import makeo.gadomancy.client.renderers.item.*; import makeo.gadomancy.client.renderers.tile.*; import makeo.gadomancy.client.util.MultiTickEffectDispatcher; import makeo.gadomancy.common.CommonProxy; import makeo.gadomancy.common.blocks.tiles.*; import makeo.gadomancy.common.entities.EntityAuraCore; -import makeo.gadomancy.common.entities.EntityItemElement; import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.SimpleReloadableResourceManager; import net.minecraft.entity.Entity; @@ -59,8 +49,6 @@ import thaumcraft.common.tiles.TileEldritchCap; import thaumcraft.common.tiles.TileEldritchObelisk; import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.Queue; @@ -82,7 +70,7 @@ public class ClientProxy extends CommonProxy { public void initalize() { super.initalize(); - injectGolemTextures(); + ClientProxy.injectGolemTextures(); //Tiles ClientRegistry.bindTileEntitySpecialRenderer(TileStickyJar.class, new RenderTileStickyJar()); @@ -170,9 +158,9 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityAuraCore.class, new RenderEntityAuraCore()); //Blocks - RegisteredBlocks.rendererTransparentBlock = registerBlockRenderer(new RenderBlockTransparent()); - RegisteredBlocks.rendererExtendedNodeJarBlock = registerBlockRenderer(new BlockExtendedNodeJarRenderer()); - RegisteredBlocks.rendererBlockStoneMachine = registerBlockRenderer(new RenderBlockStoneMachine()); + RegisteredBlocks.rendererTransparentBlock = this.registerBlockRenderer(new RenderBlockTransparent()); + RegisteredBlocks.rendererExtendedNodeJarBlock = this.registerBlockRenderer(new BlockExtendedNodeJarRenderer()); + RegisteredBlocks.rendererBlockStoneMachine = this.registerBlockRenderer(new RenderBlockStoneMachine()); } @Override @@ -221,7 +209,7 @@ public class ClientProxy extends CommonProxy { } public static void injectGolemTextures() { - RenderGolemBase render = unregisterRenderer(EntityGolemBase.class, RenderGolemBase.class); + RenderGolemBase render = ClientProxy.unregisterRenderer(EntityGolemBase.class, RenderGolemBase.class); if(render != null) { RenderingRegistry.registerEntityRenderingHandler(EntityGolemBase.class, new RenderAdditionalGolemBase()); } @@ -256,6 +244,6 @@ public class ClientProxy extends CommonProxy { @Override public void runDelayedClientSide(Runnable run) { - clientActions.add(run); + this.clientActions.add(run); } } diff --git a/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java b/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java index 59a13d2..4559b2b 100644 --- a/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java +++ b/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java @@ -9,10 +9,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; /** @@ -35,7 +33,7 @@ public class EffectHandler { public static final Object lockEffects = new Object(); public static EffectHandler getInstance() { - return instance; + return EffectHandler.instance; } @SubscribeEvent @@ -43,14 +41,14 @@ public class EffectHandler { Tessellator tessellator = Tessellator.instance; FXFlow.FXFlowBase.sheduleRender(tessellator); - Orbital.sheduleRenders(orbitals, event.partialTicks); - FXVortex.sheduleRender(fxVortexes, tessellator, event.partialTicks); + Orbital.sheduleRenders(EffectHandler.orbitals, event.partialTicks); + FXVortex.sheduleRender(EffectHandler.fxVortexes, tessellator, event.partialTicks); } public FXFlow effectFlow(World world, Vector3 origin, FXFlow.EntityFlowProperties properties) { FXFlow flow = new FXFlow(world); flow.applyProperties(properties).setPosition(origin); - registerFlow(flow); + this.registerFlow(flow); return flow; } @@ -59,8 +57,8 @@ public class EffectHandler { @Override public void run() { //System.out.println("register"); - synchronized (lockEffects) { - fxVortexes.add(vortex); + synchronized (EffectHandler.lockEffects) { + EffectHandler.fxVortexes.add(vortex); vortex.registered = true; } } @@ -72,8 +70,8 @@ public class EffectHandler { @Override public void run() { //System.out.println("unregister"); - synchronized (lockEffects) { - fxVortexes.remove(vortex); + synchronized (EffectHandler.lockEffects) { + EffectHandler.fxVortexes.remove(vortex); vortex.registered = false; } } @@ -84,8 +82,8 @@ public class EffectHandler { new Thread(new Runnable() { @Override public void run() { - synchronized (lockEffects) { - fxFlows.add(flow); + synchronized (EffectHandler.lockEffects) { + EffectHandler.fxFlows.add(flow); } } }).start(); @@ -95,8 +93,8 @@ public class EffectHandler { new Thread(new Runnable() { @Override public void run() { - synchronized (lockEffects) { - fxFlows.remove(flow); + synchronized (EffectHandler.lockEffects) { + EffectHandler.fxFlows.remove(flow); } } }).start(); @@ -106,8 +104,8 @@ public class EffectHandler { new Thread(new Runnable() { @Override public void run() { - synchronized (lockEffects) { - orbitals.add(orbital); + synchronized (EffectHandler.lockEffects) { + EffectHandler.orbitals.add(orbital); orbital.registered = true; } } @@ -118,8 +116,8 @@ public class EffectHandler { new Thread(new Runnable() { @Override public void run() { - synchronized (lockEffects) { - orbitals.remove(orbital); + synchronized (EffectHandler.lockEffects) { + EffectHandler.orbitals.remove(orbital); orbital.registered = false; } } @@ -127,19 +125,19 @@ public class EffectHandler { } public void tick() { - Orbital.tickOrbitals(orbitals); - FXFlow.tickFlows(fxFlows); - FXVortex.tickVortexes(fxVortexes); + Orbital.tickOrbitals(EffectHandler.orbitals); + FXFlow.tickFlows(EffectHandler.fxFlows); + FXVortex.tickVortexes(EffectHandler.fxVortexes); } public void clear() { new Thread(new Runnable() { @Override public void run() { - synchronized (lockEffects) { - orbitals.clear(); - fxFlows.clear(); - fxVortexes.clear(); + synchronized (EffectHandler.lockEffects) { + EffectHandler.orbitals.clear(); + EffectHandler.fxFlows.clear(); + EffectHandler.fxVortexes.clear(); } } }).start(); diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java b/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java index 79a56b4..a54aa74 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java @@ -28,12 +28,12 @@ public abstract class EntityFXFlowPolicy { private EntityFXFlowPolicy policy; - private Policies(EntityFXFlowPolicy policy) { + Policies(EntityFXFlowPolicy policy) { this.policy = policy; } public EntityFXFlowPolicy getPolicy() { - return policy; + return this.policy; } } @@ -42,13 +42,13 @@ public abstract class EntityFXFlowPolicy { @Override public void doSubParticles(FXFlow fxFlow, int policyCounter, double posX, double posY, double posZ, double lastPosX, double lastPosY, double lastPosZ) { - doParticles(fxFlow, policyCounter, posX, posY, posZ, fxFlow.getRand().nextInt(3) + 1); + this.doParticles(fxFlow, policyCounter, posX, posY, posZ, fxFlow.getRand().nextInt(3) + 1); } public void doParticles(FXFlow fxFlow, int policyCounter, double posX, double posY, double posZ, int count) { Random rand = fxFlow.getOriginWorld().rand; for (int i = 0; i < count; i++) { - Vector3 subOffset = genSubOffset(rand, fxFlow.getSurroundingDistance()); + Vector3 subOffset = this.genSubOffset(rand, fxFlow.getSurroundingDistance()); Color c = (fxFlow.getFadingColor() != null && rand.nextBoolean()) ? fxFlow.getFadingColor() : fxFlow.getColor(); FXFlow.FXFlowBase flow = new FXFlow.FXFlowBase(fxFlow.getOriginWorld(), posX + subOffset.getX(), posY + subOffset.getY(), posZ + subOffset.getZ(), c, rand.nextInt(1) + fxFlow.getSurroundingParticleSize(), 6, 240); Minecraft.getMinecraft().effectRenderer.addEffect(flow); @@ -74,8 +74,8 @@ public abstract class EntityFXFlowPolicy { Vector3 perpendicular = rotationAxis.clone().perpendicular().normalize().multiply(fxFlow.getSurroundingDistance()); Vector3 counterSide = perpendicular.clone().rotate(Math.toRadians(180), rotationAxis); - int currentDividedPolicyTick = policyCounter % TICKS_PER_FULL_TURN; - float currentDegree = 360F * (((float) currentDividedPolicyTick) / ((float) TICKS_PER_FULL_TURN)); + int currentDividedPolicyTick = policyCounter % CircularPolicy.TICKS_PER_FULL_TURN; + float currentDegree = 360F * (((float) currentDividedPolicyTick) / ((float) CircularPolicy.TICKS_PER_FULL_TURN)); double currentRad = Math.toRadians(currentDegree); perpendicular = perpendicular.rotate(currentRad, rotationAxis); diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java b/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java index b1edfb1..6bd90dc 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java @@ -13,8 +13,10 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import java.awt.*; -import java.util.*; +import java.util.ArrayDeque; import java.util.List; +import java.util.Queue; +import java.util.Random; /** * This class is part of the Gadomancy Mod @@ -29,10 +31,10 @@ public class FXFlow { private Color color; private Color fadingColor; - private int policyCounter = 0; + private int policyCounter; private EntityFXFlowPolicy policy; - private Vector3 target = null; + private Vector3 target; private int livingTicks = -1; @@ -91,7 +93,7 @@ public class FXFlow { } public FXFlow setPosition(Vector3 vec) { - return setPosition(vec.getX(), vec.getY(), vec.getZ()); + return this.setPosition(vec.getX(), vec.getY(), vec.getZ()); } public void setMotionMultiplier(float motionMultiplier) { @@ -102,9 +104,9 @@ public class FXFlow { this.unmodMotionBufX = motionX; this.unmodMotionBufY = motionY; this.unmodMotionBufZ = motionZ; - motionX *= motionMultiplier; - motionY *= motionMultiplier; - motionZ *= motionMultiplier; + motionX *= this.motionMultiplier; + motionY *= this.motionMultiplier; + motionZ *= this.motionMultiplier; this.motionBufferX = motionX; this.motionBufferY = motionY; this.motionBufferZ = motionZ; @@ -113,8 +115,8 @@ public class FXFlow { public void tick() { - livingTicks--; - if (livingTicks <= 0) { + this.livingTicks--; + if (this.livingTicks <= 0) { EffectHandler.getInstance().unregisterFlow(this); return; } @@ -128,24 +130,24 @@ public class FXFlow { this.posY += this.motionBufferY; this.posZ += this.motionBufferZ; - policyCounter += 1; - doParticles(); + this.policyCounter += 1; + this.doParticles(); } private void calculateVelocity() { - if(target == null) return; - if(livingTicks <= 0) return; //Never happens.. + if(this.target == null) return; + if(this.livingTicks <= 0) return; //Never happens.. - Vector3 pos = getPositionVector(); - double motDirX = target.getX() - pos.getX(); - double motDirY = target.getY() - pos.getY(); - double motDirZ = target.getZ() - pos.getZ(); - Vector3 mot = new Vector3(motDirX, motDirY, motDirZ).divide(livingTicks); - setMotion(mot.getX(), mot.getY(), mot.getZ()); + Vector3 pos = this.getPositionVector(); + double motDirX = this.target.getX() - pos.getX(); + double motDirY = this.target.getY() - pos.getY(); + double motDirZ = this.target.getZ() - pos.getZ(); + Vector3 mot = new Vector3(motDirX, motDirY, motDirZ).divide(this.livingTicks); + this.setMotion(mot.getX(), mot.getY(), mot.getZ()); } private Vector3 getPositionVector() { - return new Vector3(posX, posY, posZ); + return new Vector3(this.posX, this.posY, this.posZ); } public void setPolicy(EntityFXFlowPolicy policy) { @@ -161,98 +163,98 @@ public class FXFlow { EffectHandler.getInstance().unregisterFlow(this); return; } - if(Minecraft.getMinecraft().theWorld.provider.dimensionId != origin.provider.dimensionId) { + if(Minecraft.getMinecraft().theWorld.provider.dimensionId != this.origin.provider.dimensionId) { EffectHandler.getInstance().unregisterFlow(this); return; } - FXFlowBase flow = new FXFlowBase(origin, posX, posY, posZ, color, mainParticleSize, 9, 240); + FXFlowBase flow = new FXFlowBase(this.origin, this.posX, this.posY, this.posZ, this.color, this.mainParticleSize, 9, 240); Minecraft.getMinecraft().effectRenderer.addEffect(flow); //Initial position. - double lastPosX = posX - (posX - lastTickPosX) / 2.0D; - double lastPosY = posY - (posY - lastTickPosY) / 2.0D; - double lastPosZ = posZ - (posZ - lastTickPosZ) / 2.0D; - FXFlowBase flow2 = new FXFlowBase(origin, lastPosX, lastPosY, lastPosZ, color, (float) (mainParticleSize * 0.8), 8, 240); + double lastPosX = this.posX - (this.posX - this.lastTickPosX) / 2.0D; + double lastPosY = this.posY - (this.posY - this.lastTickPosY) / 2.0D; + double lastPosZ = this.posZ - (this.posZ - this.lastTickPosZ) / 2.0D; + FXFlowBase flow2 = new FXFlowBase(this.origin, lastPosX, lastPosY, lastPosZ, this.color, (float) (this.mainParticleSize * 0.8), 8, 240); Minecraft.getMinecraft().effectRenderer.addEffect(flow2); //Consistency to last position - if(policy != null) - policy.doSubParticles(this, policyCounter, posX, posY, posZ, lastPosX, lastPosY, lastPosZ); + if(this.policy != null) + this.policy.doSubParticles(this, this.policyCounter, this.posX, this.posY, this.posZ, lastPosX, lastPosY, lastPosZ); } public Color getColor() { - return color; + return this.color; } public Color getFadingColor() { - return fadingColor; + return this.fadingColor; } public float getSurroundingDistance() { - return surroundingDistance; + return this.surroundingDistance; } public float getSurroundingParticleSize() { - return surroundingParticleSize; + return this.surroundingParticleSize; } public float getMainParticleSize() { - return mainParticleSize; + return this.mainParticleSize; } public float getMotionMultiplier() { - return motionMultiplier; + return this.motionMultiplier; } public boolean isMovementVectorNullLength() { - return new Vector3(motionBufferX, motionBufferY, motionBufferZ).lengthSquared() == 0; + return new Vector3(this.motionBufferX, this.motionBufferY, this.motionBufferZ).lengthSquared() == 0; } public Vector3 getTarget() { - return target; + return this.target; } public World getOriginWorld() { - return origin; + return this.origin; } public Vector3 getMovementVector() { - if(isMovementVectorNullLength()) return new Vector3(unmodMotionBufX, unmodMotionBufY, unmodMotionBufZ); - return new Vector3(motionBufferX, motionBufferY, motionBufferZ); + if(this.isMovementVectorNullLength()) return new Vector3(this.unmodMotionBufX, this.unmodMotionBufY, this.unmodMotionBufZ); + return new Vector3(this.motionBufferX, this.motionBufferY, this.motionBufferZ); } public Random getRand() { - return origin.rand; + return this.origin.rand; } public FXFlow applyProperties(EntityFlowProperties properties) { if(properties != null) { if(properties.hasTarget) { - applyTarget(properties.target); + this.applyTarget(properties.target); } if(properties.color != null) { if(properties.fading != null) { - setColor(properties.fading); - setColor(properties.color); + this.setColor(properties.fading); + this.setColor(properties.color); } else { - setColor(properties.color); + this.setColor(properties.color); } } else { if(properties.fading != null) { - setColor(properties.fading); + this.setColor(properties.fading); } } if(properties.livingTicks != -1) - setLivingTicks(properties.livingTicks); + this.setLivingTicks(properties.livingTicks); if(properties.mainParticleSize != -1) - setMainParticleSize(properties.mainParticleSize); + this.setMainParticleSize(properties.mainParticleSize); if(properties.surroundingDistance != -1) - setSurroundingDistance(properties.surroundingDistance); + this.setSurroundingDistance(properties.surroundingDistance); if(properties.surroundingParticleSize != -1) - setSurroundingParticleSize(properties.surroundingParticleSize); + this.setSurroundingParticleSize(properties.surroundingParticleSize); if(properties.motionMultiplier != Float.MAX_VALUE) { - setMotionMultiplier(properties.motionMultiplier); + this.setMotionMultiplier(properties.motionMultiplier); } if(properties.policy != null) { - setPolicy(properties.policy); + this.setPolicy(properties.policy); } } return this; @@ -385,7 +387,7 @@ public class FXFlow { GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); - for(FXFlowBase fx : fxQueue) { + for(FXFlowBase fx : FXFlowBase.fxQueue) { tessellator.startDrawingQuads(); fx.renderEssenceBase(tessellator); tessellator.draw(); @@ -399,31 +401,31 @@ public class FXFlow { GL11.glDisable(GL11.GL_BLEND); GL11.glDepthMask(true); - fxQueue.clear(); + FXFlowBase.fxQueue.clear(); } private void renderEssenceBase(Tessellator tessellator) { - tessellator.setBrightness(rendBrightness); - GL11.glColor4f(partRed , partGreen, partBlue, partAlpha); - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - if(particleAge >= particleMaxAge) return; - float agescale = (float) particleAge / buffHalfLife; + tessellator.setBrightness(this.rendBrightness); + GL11.glColor4f(this.partRed, this.partGreen, this.partBlue, this.partAlpha); + Minecraft.getMinecraft().renderEngine.bindTexture(this.texture); + if(this.particleAge >= this.particleMaxAge) return; + float agescale = (float) this.particleAge / this.buffHalfLife; if(agescale >= 1.0F) agescale = 2 - agescale; - particleScale = buffParticleScale * agescale; - float f10 = 0.5F * particleScale; - float f11 = (float)(prevPosX + (posX - prevPosX) * partialTicks - interpPosX); - float f12 = (float)(prevPosY + (posY - prevPosY) * partialTicks - interpPosY); - float f13 = (float)(prevPosZ + (posZ - prevPosZ) * partialTicks - interpPosZ); + this.particleScale = this.buffParticleScale * agescale; + float f10 = 0.5F * this.particleScale; + float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * this.partialTicks - EntityFX.interpPosX); + float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * this.partialTicks - EntityFX.interpPosY); + float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * this.partialTicks - EntityFX.interpPosZ); - tessellator.addVertexWithUV(f11 - rendArg1 * f10 - rendArg4 * f10, f12 - rendArg2 * f10, f13 - rendArg3 * f10 - rendArg5 * f10, 0, 1); - tessellator.addVertexWithUV(f11 - rendArg1 * f10 + rendArg4 * f10, f12 + rendArg2 * f10, f13 - rendArg3 * f10 + rendArg5 * f10, 1, 1); - tessellator.addVertexWithUV(f11 + rendArg1 * f10 + rendArg4 * f10, f12 + rendArg2 * f10, f13 + rendArg3 * f10 + rendArg5 * f10, 1, 0); - tessellator.addVertexWithUV(f11 + rendArg1 * f10 - rendArg4 * f10, f12 - rendArg2 * f10, f13 + rendArg3 * f10 - rendArg5 * f10, 0, 0); + tessellator.addVertexWithUV(f11 - this.rendArg1 * f10 - this.rendArg4 * f10, f12 - this.rendArg2 * f10, f13 - this.rendArg3 * f10 - this.rendArg5 * f10, 0, 1); + tessellator.addVertexWithUV(f11 - this.rendArg1 * f10 + this.rendArg4 * f10, f12 + this.rendArg2 * f10, f13 - this.rendArg3 * f10 + this.rendArg5 * f10, 1, 1); + tessellator.addVertexWithUV(f11 + this.rendArg1 * f10 + this.rendArg4 * f10, f12 + this.rendArg2 * f10, f13 + this.rendArg3 * f10 + this.rendArg5 * f10, 1, 0); + tessellator.addVertexWithUV(f11 + this.rendArg1 * f10 - this.rendArg4 * f10, f12 - this.rendArg2 * f10, f13 + this.rendArg3 * f10 - this.rendArg5 * f10, 0, 0); } @Override public void renderParticle(Tessellator tessellator, float partialTicks, float par3, float par4, float par5, float par6, float par7) { - if(MiscUtils.getPositionVector(Minecraft.getMinecraft().renderViewEntity).distance(new Vector3(posX, posY, posZ)) > ModConfig.renderParticleDistance) return; + if(MiscUtils.getPositionVector(Minecraft.getMinecraft().renderViewEntity).distance(new Vector3(this.posX, this.posY, this.posZ)) > ModConfig.renderParticleDistance) return; this.partialTicks = partialTicks; this.rendArg1 = par3; @@ -432,7 +434,7 @@ public class FXFlow { this.rendArg4 = par6; this.rendArg5 = par7; - fxQueue.add(this); + FXFlowBase.fxQueue.add(this); } } diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java b/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java index 1f1ed2f..dd98c4e 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java @@ -29,10 +29,10 @@ public class FXVortex { public static final ResourceLocation TC_VORTEX_TEXTURE = new ResourceLocation("thaumcraft", "textures/misc/vortex.png"); private static final float RAD = (float) (Math.PI * 2); - private TileEssentiaCompressor parent = null; + private TileEssentiaCompressor parent; private long lastUpdateCall; private double x, y, z; - public boolean registered = false; + public boolean registered; public FXVortex(double x, double y, double z) { this.lastUpdateCall = System.currentTimeMillis(); @@ -64,26 +64,26 @@ public class FXVortex { float agescale = (float) (ClientHandler.ticks % 800) / 400F; if(agescale >= 1.0F) agescale = 2 - agescale; float size = 0.2F + 0.1F * agescale; - if(parent != null) { - size += size * (((float) parent.getSizeStage()) * 0.04F); + if(this.parent != null) { + size += size * (((float) this.parent.getSizeStage()) * 0.04F); } float anglePerc = (float) (ClientHandler.ticks % 300) / 300F; - float angle = RAD - RAD * anglePerc; + float angle = FXVortex.RAD - FXVortex.RAD * anglePerc; Vector3 iV = MiscUtils.interpolateEntityPosition(Minecraft.getMinecraft().renderViewEntity, pTicks); - if(parent != null && parent.getSizeStage() > 4) { - float mult = 0.001F * (parent.getSizeStage() - 4F); + if(this.parent != null && this.parent.getSizeStage() > 4) { + float mult = 0.001F * (this.parent.getSizeStage() - 4F); Vector3 shake = new Vector3( - RAND.nextFloat() * mult * (RAND.nextBoolean() ? 1 : -1), - RAND.nextFloat() * mult * (RAND.nextBoolean() ? 1 : -1), - RAND.nextFloat() * mult * (RAND.nextBoolean() ? 1 : -1)); + FXVortex.RAND.nextFloat() * mult * (FXVortex.RAND.nextBoolean() ? 1 : -1), + FXVortex.RAND.nextFloat() * mult * (FXVortex.RAND.nextBoolean() ? 1 : -1), + FXVortex.RAND.nextFloat() * mult * (FXVortex.RAND.nextBoolean() ? 1 : -1)); iV.add(shake); } GL11.glTranslated(-iV.getX(), -iV.getY(), -iV.getZ()); - UtilsFX.bindTexture(TC_VORTEX_TEXTURE); + UtilsFX.bindTexture(FXVortex.TC_VORTEX_TEXTURE); tessellator.startDrawingQuads(); tessellator.setBrightness(220); @@ -95,7 +95,7 @@ public class FXVortex { Vec3 v4 = Vec3.createVectorHelper(arX * size - arYZ * size, -arXZ * size, arZ * size - arXY * size); if (angle != 0.0F) { Vec3 pvec = Vec3.createVectorHelper(iV.getX(), iV.getY(), iV.getZ()); - Vec3 tvec = Vec3.createVectorHelper(x, y, z); + Vec3 tvec = Vec3.createVectorHelper(this.x, this.y, this.z); Vec3 qvec = pvec.subtract(tvec).normalize(); QuadHelper.setAxis(qvec, angle).rotate(v1); QuadHelper.setAxis(qvec, angle).rotate(v2); @@ -103,10 +103,10 @@ public class FXVortex { QuadHelper.setAxis(qvec, angle).rotate(v4); } tessellator.setNormal(0.0F, 0.0F, -1.0F); - tessellator.addVertexWithUV(x + v1.xCoord, y + v1.yCoord, z + v1.zCoord, 0, 1); - tessellator.addVertexWithUV(x + v2.xCoord, y + v2.yCoord, z + v2.zCoord, 1, 1); - tessellator.addVertexWithUV(x + v3.xCoord, y + v3.yCoord, z + v3.zCoord, 1, 0); - tessellator.addVertexWithUV(x + v4.xCoord, y + v4.yCoord, z + v4.zCoord, 0, 0); + tessellator.addVertexWithUV(this.x + v1.xCoord, this.y + v1.yCoord, this.z + v1.zCoord, 0, 1); + tessellator.addVertexWithUV(this.x + v2.xCoord, this.y + v2.yCoord, this.z + v2.zCoord, 1, 1); + tessellator.addVertexWithUV(this.x + v3.xCoord, this.y + v3.yCoord, this.z + v3.zCoord, 1, 0); + tessellator.addVertexWithUV(this.x + v4.xCoord, this.y + v4.yCoord, this.z + v4.zCoord, 0, 0); tessellator.draw(); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java b/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java index b42b0b7..1394485 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java @@ -24,8 +24,8 @@ public final class Orbital { private Vector3 center; private final World world; - private int orbitalCounter = 0; - public boolean registered = false; + private int orbitalCounter; + public boolean registered; //INFO: Needs to be updated when its "owner" gets rendered. public long lastRenderCall = System.currentTimeMillis(); @@ -41,48 +41,48 @@ public final class Orbital { } public void addOrbitalPoint(OrbitalRenderProperties properties) { - if(!orbitals.contains(properties)) { - orbitals.add(properties); + if(!this.orbitals.contains(properties)) { + this.orbitals.add(properties); } } public int orbitalsSize() { - return orbitals.size(); + return this.orbitals.size(); } public void clearOrbitals() { - orbitals.clear(); + this.orbitals.clear(); } public void doRender(float partialTicks) { - if(MiscUtils.getPositionVector(Minecraft.getMinecraft().renderViewEntity).distance(center) > ModConfig.renderParticleDistance) return; + if(MiscUtils.getPositionVector(Minecraft.getMinecraft().renderViewEntity).distance(this.center) > ModConfig.renderParticleDistance) return; if(Minecraft.getMinecraft().isGamePaused()) return; - for(OrbitalRenderProperties orbitalNode : orbitals) { + for(OrbitalRenderProperties orbitalNode : this.orbitals) { Axis axis = orbitalNode.getAxis(); int counterOffset = orbitalNode.getOffsetTicks() % orbitalNode.getTicksForFullCircle(); - int currentDividedPolicyTick = (orbitalCounter + counterOffset) % orbitalNode.getTicksForFullCircle(); + int currentDividedPolicyTick = (this.orbitalCounter + counterOffset) % orbitalNode.getTicksForFullCircle(); float currentDegree = 360F * (((float) currentDividedPolicyTick) / ((float) orbitalNode.getTicksForFullCircle())); double currentRad = Math.toRadians(currentDegree); - Vector3 point = axis.getAxis().clone().perpendicular().normalize().multiply(orbitalNode.getOffset()).rotate(currentRad, axis.getAxis()).add(center); + Vector3 point = axis.getAxis().clone().perpendicular().normalize().multiply(orbitalNode.getOffset()).rotate(currentRad, axis.getAxis()).add(this.center); if(orbitalNode.getRunnable() != null) { - orbitalNode.getRunnable().onRender(world, point, orbitalNode, orbitalCounter, partialTicks); + orbitalNode.getRunnable().onRender(this.world, point, orbitalNode, this.orbitalCounter, partialTicks); } if(orbitalNode.getParticleSize() <= 0) continue; - FXFlow.FXFlowBase flow = new FXFlow.FXFlowBase(world, point.getX(), point.getY(), point.getZ(), + FXFlow.FXFlowBase flow = new FXFlow.FXFlowBase(this.world, point.getX(), point.getY(), point.getZ(), orbitalNode.getColor(), orbitalNode.getParticleSize(), orbitalNode.getMultiplier(), orbitalNode.getBrightness()); - if(orbitalNode.getSubParticleColor() != null && world.rand.nextInt(3) == 0) { - Vector3 subOffset = genSubOffset(world.rand, 0.8F); - Color c = (world.rand.nextBoolean()) ? orbitalNode.getSubParticleColor() : orbitalNode.getColor(); - FXFlow.FXFlowBase flow2 = new FXFlow.FXFlowBase(world, + if(orbitalNode.getSubParticleColor() != null && this.world.rand.nextInt(3) == 0) { + Vector3 subOffset = this.genSubOffset(this.world.rand, 0.8F); + Color c = (this.world.rand.nextBoolean()) ? orbitalNode.getSubParticleColor() : orbitalNode.getColor(); + FXFlow.FXFlowBase flow2 = new FXFlow.FXFlowBase(this.world, point.getX() + subOffset.getX(), point.getY() + subOffset.getY(), point.getZ() + subOffset.getZ(), - c, orbitalNode.getSubSizeRunnable().getSubParticleSize(world.rand, orbitalCounter), 6, 240); + c, orbitalNode.getSubSizeRunnable().getSubParticleSize(this.world.rand, this.orbitalCounter), 6, 240); Minecraft.getMinecraft().effectRenderer.addEffect(flow2); } @@ -99,7 +99,7 @@ public final class Orbital { } public void reduceAllOffsets(float percent) { - for(OrbitalRenderProperties node : orbitals) { + for(OrbitalRenderProperties node : this.orbitals) { node.reduceOffset(percent); } } @@ -116,11 +116,11 @@ public final class Orbital { Axis axis = property.getAxis(); int counterOffset = property.getOffsetTicks() % property.getTicksForFullCircle(); - int currentDividedPolicyTick = (orbitalCounter + counterOffset) % property.getTicksForFullCircle(); + int currentDividedPolicyTick = (this.orbitalCounter + counterOffset) % property.getTicksForFullCircle(); float currentDegree = 360F * (((float) currentDividedPolicyTick) / ((float) property.getTicksForFullCircle())); double currentRad = Math.toRadians(currentDegree); - arr[i] = axis.getAxis().clone().perpendicular().normalize().multiply(property.getOffset()).rotate(currentRad, axis.getAxis()).add(center); + arr[i] = axis.getAxis().clone().perpendicular().normalize().multiply(property.getOffset()).rotate(currentRad, axis.getAxis()).add(this.center); } return arr; } @@ -155,19 +155,19 @@ public final class Orbital { private double originalOffset, offset; private Color color = Color.WHITE; private int ticksForFullCircle = 40; - private OrbitalRenderRunnable runnable = null; + private OrbitalRenderRunnable runnable; private int multiplier = 8; private int brightness = 240; private float particleSize = 0.2F; - private int offsetTicks = 0; + private int offsetTicks; - private Color subParticleColor = null; + private Color subParticleColor; private OrbitalSubSizeRunnable subSizeRunnable; public OrbitalRenderProperties(Axis axis, double offsetLength) { this.offset = this.originalOffset = offsetLength; this.axis = axis; - this.subSizeRunnable = subSizeRunnableStatic; + this.subSizeRunnable = OrbitalRenderProperties.subSizeRunnableStatic; } public OrbitalRenderProperties setColor(Color color) { @@ -222,55 +222,55 @@ public final class Orbital { } public float getParticleSize() { - return particleSize; + return this.particleSize; } public Color getColor() { - return color; + return this.color; } public Axis getAxis() { - return axis; + return this.axis; } public double getOffset() { - return offset; + return this.offset; } public Color getSubParticleColor() { - return subParticleColor; + return this.subParticleColor; } public int getTicksForFullCircle() { - return ticksForFullCircle; + return this.ticksForFullCircle; } public OrbitalRenderRunnable getRunnable() { - return runnable; + return this.runnable; } public OrbitalSubSizeRunnable getSubSizeRunnable() { - return subSizeRunnable; + return this.subSizeRunnable; } public int getMultiplier() { - return multiplier; + return this.multiplier; } public int getBrightness() { - return brightness; + return this.brightness; } public int getOffsetTicks() { - return offsetTicks; + return this.offsetTicks; } } - public static abstract class OrbitalSubSizeRunnable { + public abstract static class OrbitalSubSizeRunnable { public abstract float getSubParticleSize(Random rand, int orbitalExisted); } - public static abstract class OrbitalRenderRunnable { + public abstract static class OrbitalRenderRunnable { public abstract void onRender(World world, Vector3 selectedPosition, OrbitalRenderProperties properties, int orbitalExisted, float partialTicks); } @@ -295,7 +295,7 @@ public final class Orbital { } public Vector3 getAxis() { - return axis.clone(); + return this.axis.clone(); } } diff --git a/src/main/java/makeo/gadomancy/client/events/ClientHandler.java b/src/main/java/makeo/gadomancy/client/events/ClientHandler.java index 3408ac2..5677cfc 100644 --- a/src/main/java/makeo/gadomancy/client/events/ClientHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/ClientHandler.java @@ -10,7 +10,6 @@ import makeo.gadomancy.client.util.FamiliarHandlerClient; import makeo.gadomancy.common.Gadomancy; import net.minecraft.client.Minecraft; -import java.util.List; import java.util.Queue; /** @@ -29,7 +28,7 @@ public class ClientHandler { public void onClientTick(TickEvent.ClientTickEvent event) { if(event.phase.equals(TickEvent.Phase.END) && !Minecraft.getMinecraft().isGamePaused()) { FamiliarHandlerClient.playerTickEvent(); - ticks++; + ClientHandler.ticks++; EffectHandler.getInstance().tick(); } diff --git a/src/main/java/makeo/gadomancy/client/events/FakeArchitectItem.java b/src/main/java/makeo/gadomancy/client/events/FakeArchitectItem.java index 867b11b..3c37aa5 100644 --- a/src/main/java/makeo/gadomancy/client/events/FakeArchitectItem.java +++ b/src/main/java/makeo/gadomancy/client/events/FakeArchitectItem.java @@ -26,7 +26,7 @@ public class FakeArchitectItem extends Item implements IArchitect { @Override public ArrayList getArchitectBlocks(ItemStack stack, World world, int x, int y, int z, int side, EntityPlayer player) { - return coords; + return this.coords; } @Override diff --git a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java index e47b44c..1be659b 100644 --- a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java @@ -47,6 +47,7 @@ import thaumcraft.common.items.relics.ItemThaumometer; import thaumcraft.common.items.wands.ItemWandCasting; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.zip.GZIPInputStream; @@ -62,7 +63,7 @@ public class RenderEventHandler { private static final REHWandHandler WAND_HANDLER = new REHWandHandler(); private static final FakeArchitectItem ARCHITECT_ITEM = new FakeArchitectItem(); - private Object oldGolemblurb = null; + private Object oldGolemblurb; private int blurbId; @SubscribeEvent @@ -73,9 +74,9 @@ public class RenderEventHandler { if(golem != null) { AdditionalGolemCore core = GadomancyApi.getAdditionalGolemCore(golem); if(core != null) { - blurbId = core.getBaseCore(); - String key = "golemblurb." + blurbId + ".text"; - oldGolemblurb = ResourceReloadListener.languageList.get(key); + this.blurbId = core.getBaseCore(); + String key = "golemblurb." + this.blurbId + ".text"; + this.oldGolemblurb = ResourceReloadListener.languageList.get(key); ResourceReloadListener.languageList.put(key, StatCollector.translateToLocal(core.getUnlocalizedGuiText())); } } @@ -84,10 +85,10 @@ public class RenderEventHandler { @SubscribeEvent public void on(GuiScreenEvent.DrawScreenEvent.Post e) { - if(oldGolemblurb != null) { - String key = "golemblurb." + blurbId + ".text"; - ResourceReloadListener.languageList.put(key, oldGolemblurb); - oldGolemblurb = null; + if(this.oldGolemblurb != null) { + String key = "golemblurb." + this.blurbId + ".text"; + ResourceReloadListener.languageList.put(key, this.oldGolemblurb); + this.oldGolemblurb = null; } } @@ -111,10 +112,10 @@ public class RenderEventHandler { } coords.add(new BlockCoordinates(e.target.blockX + dir.offsetX, e.target.blockY + dir.offsetY, e.target.blockZ + dir.offsetZ)); - ARCHITECT_ITEM.setCoords(coords); + RenderEventHandler.ARCHITECT_ITEM.setCoords(coords); GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - WAND_HANDLER.handleArchitectOverlay(new ItemStack(ARCHITECT_ITEM), e, e.player.ticksExisted, e.target); + RenderEventHandler.WAND_HANDLER.handleArchitectOverlay(new ItemStack(RenderEventHandler.ARCHITECT_ITEM), e, e.player.ticksExisted, e.target); GL11.glPopAttrib(); } } @@ -155,15 +156,15 @@ public class RenderEventHandler { MultiTickEffectDispatcher.notifyRenderTick(Minecraft.getMinecraft().theWorld, event.partialTicks); } - private EntityPlayer current = null; - private ItemStack[] armor = null; + private EntityPlayer current; + private ItemStack[] armor; @SubscribeEvent(priority = EventPriority.LOWEST) public void renderEntityPre(RenderLivingEvent.Pre event) { if(event.entity instanceof EntityPlayer) { EntityPlayer p = (EntityPlayer) event.entity; if(((DataAchromatic)SyncDataHolder.getDataClient("AchromaticData")).isAchromatic((EntityPlayer) event.entity)) { - current = p; + this.current = p; GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.15F); GL11.glDepthMask(false); GL11.glEnable(GL11.GL_BLEND); @@ -171,14 +172,14 @@ public class RenderEventHandler { GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); } - armor = p.inventory.armorInventory; - p.inventory.armorInventory = new ItemStack[armor.length]; - System.arraycopy(armor, 0, p.inventory.armorInventory, 0, armor.length); + this.armor = p.inventory.armorInventory; + p.inventory.armorInventory = new ItemStack[this.armor.length]; + System.arraycopy(this.armor, 0, p.inventory.armorInventory, 0, this.armor.length); boolean changed = false; - for(int i = 0; i < armor.length; i++) { - if(armor[i] != null && NBTHelper.hasPersistentData(armor[i])) { - NBTTagCompound compound = NBTHelper.getPersistentData(armor[i]); + for(int i = 0; i < this.armor.length; i++) { + if(this.armor[i] != null && NBTHelper.hasPersistentData(this.armor[i])) { + NBTTagCompound compound = NBTHelper.getPersistentData(this.armor[i]); if(compound.hasKey("disguise")) { NBTBase base = compound.getTag("disguise"); if(base instanceof NBTTagCompound) { @@ -192,8 +193,8 @@ public class RenderEventHandler { } if(!changed) { - p.inventory.armorInventory = armor; - armor = null; + p.inventory.armorInventory = this.armor; + this.armor = null; } } } @@ -202,15 +203,15 @@ public class RenderEventHandler { public void renderPost(RenderLivingEvent.Post event) { if(event.entity instanceof EntityPlayer) { EntityPlayer p = (EntityPlayer) event.entity; - if(armor != null) { - p.inventory.armorInventory = armor; + if(this.armor != null) { + p.inventory.armorInventory = this.armor; } } } @SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true) public void onSetArmor(RenderPlayerEvent.SetArmorModel event) { - if(event.entityPlayer == current) { + if(event.entityPlayer == this.current) { GL11.glDisable(GL11.GL_BLEND); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glDepthMask(true); @@ -218,7 +219,7 @@ public class RenderEventHandler { } static { - ResourceLocation mod = new ResourceLocation(Gadomancy.MODID.toLowerCase() + new String(new byte[] {58, 116, 101, 120, 116, 117, 114, 101, 115, 47, 109, 111, 100, 101, 108, 115, 47, 109, 111, 100, 101, 108, 65, 115, 115, 101, 99, 46, 111, 98, 106}, Charset.forName("UTF-8"))); + ResourceLocation mod = new ResourceLocation(Gadomancy.MODID.toLowerCase() + new String(new byte[] {58, 116, 101, 120, 116, 117, 114, 101, 115, 47, 109, 111, 100, 101, 108, 115, 47, 109, 111, 100, 101, 108, 65, 115, 115, 101, 99, 46, 111, 98, 106}, StandardCharsets.UTF_8)); IModelCustom buf; try { buf = new WavefrontObject("gadomancy:wRender", new GZIPInputStream(Minecraft.getMinecraft().getResourceManager().getResource(mod).getInputStream())); @@ -230,19 +231,19 @@ public class RenderEventHandler { } private static final IModelCustom obj; - private static final ResourceLocation tex = new ResourceLocation(new String(new byte[] {103, 97, 100, 111, 109, 97, 110, 99, 121, 58, 116, 101, 120, 116, 117, 114, 101, 115, 47, 109, 105, 115, 99, 47, 116, 101, 120, 87, 46, 112, 110, 103}, Charset.forName("UTF-8"))); + private static final ResourceLocation tex = new ResourceLocation(new String(new byte[] {103, 97, 100, 111, 109, 97, 110, 99, 121, 58, 116, 101, 120, 116, 117, 114, 101, 115, 47, 109, 105, 115, 99, 47, 116, 101, 120, 87, 46, 112, 110, 103}, StandardCharsets.UTF_8)); private static int dList = -1; @SubscribeEvent public void onRender(RenderPlayerEvent.Specials.Post event) { if(event.entityPlayer == null) return; - if(obj == null) return; + if(RenderEventHandler.obj == null) return; if(!CommonProxy.serverOnlineState) return; if(!MiscUtils.isMisunderstood(event.entityPlayer)) return; GL11.glColor4f(1f, 1f, 1f, 1f); GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(tex); + Minecraft.getMinecraft().renderEngine.bindTexture(RenderEventHandler.tex); boolean f = event.entityPlayer.capabilities.isFlying; double ma = f ? 15 : 5; double r = (ma * (Math.abs((ClientHandler.ticks % 80) - 40) / 40D)) + @@ -250,22 +251,22 @@ public class RenderEventHandler { GL11.glScaled(0.07, 0.07, 0.07); GL11.glRotatef(180, 0, 0, 1); GL11.glTranslated(0, -12.7, 0.7 - (((float) (r / ma)) * (f ? 0.5D : 0.2D))); - if(dList == -1) { - dList = GLAllocation.generateDisplayLists(2); - GL11.glNewList(dList, GL11.GL_COMPILE); - obj.renderOnly("wR"); + if(RenderEventHandler.dList == -1) { + RenderEventHandler.dList = GLAllocation.generateDisplayLists(2); + GL11.glNewList(RenderEventHandler.dList, GL11.GL_COMPILE); + RenderEventHandler.obj.renderOnly("wR"); GL11.glEndList(); - GL11.glNewList(dList + 1, GL11.GL_COMPILE); - obj.renderOnly("wL"); + GL11.glNewList(RenderEventHandler.dList + 1, GL11.GL_COMPILE); + RenderEventHandler.obj.renderOnly("wL"); GL11.glEndList(); } GL11.glPushMatrix(); GL11.glRotated(20D + r, 0, -1, 0); - GL11.glCallList(dList); + GL11.glCallList(RenderEventHandler.dList); GL11.glPopMatrix(); GL11.glPushMatrix(); GL11.glRotated(20D + r, 0, 1, 0); - GL11.glCallList(dList + 1); + GL11.glCallList(RenderEventHandler.dList + 1); GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java index 45e9116..5ed0e38 100644 --- a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java +++ b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java @@ -26,7 +26,7 @@ public class ResourceReloadListener implements IResourceManagerReloadListener { public static final ResourceReloadListener instance = new ResourceReloadListener(); public static ResourceReloadListener getInstance() { - return instance; + return ResourceReloadListener.instance; } public static Map languageList; @@ -35,29 +35,29 @@ public class ResourceReloadListener implements IResourceManagerReloadListener { Injector inner = new Injector(StringTranslate.class); Object O = inner.getField(Injector.findField(StringTranslate.class, StringTranslate.class)); Injector instance = new Injector(O); - languageList = instance.getField(instance.findField(Map.class)); + ResourceReloadListener.languageList = instance.getField(instance.findField(Map.class)); } @Override public void onResourceManagerReload(IResourceManager resourceManager) { - reloadGolemResources(); + this.reloadGolemResources(); } public void reloadGolemResources() { - manipulateLanguageFile(); + this.manipulateLanguageFile(); Gadomancy.proxy.runDelayedClientSide(new Runnable() { @Override public void run() { - registerTextureOverride(); + ResourceReloadListener.this.registerTextureOverride(); } }); } private void manipulateLanguageFile() { - if(languageList != null) { + if(ResourceReloadListener.languageList != null) { for(AdditionalGolemType type : GadomancyApi.getAdditionalGolemTypes()) { - languageList.put("item.ItemGolemPlacer." + type.getEnumEntry().ordinal() + ".name", + ResourceReloadListener.languageList.put("item.ItemGolemPlacer." + type.getEnumEntry().ordinal() + ".name", StatCollector.translateToLocal(type.getUnlocalizedName() + ".name")); } } @@ -66,6 +66,6 @@ public class ResourceReloadListener implements IResourceManagerReloadListener { private static final ResourceLocation TC_GOLEM_GUI_TEXTURE = new ResourceLocation("thaumcraft", "textures/gui/guigolem.png"); private void registerTextureOverride() { - Minecraft.getMinecraft().renderEngine.loadTexture(TC_GOLEM_GUI_TEXTURE, new GolemGuiTexture(TC_GOLEM_GUI_TEXTURE)); + Minecraft.getMinecraft().renderEngine.loadTexture(ResourceReloadListener.TC_GOLEM_GUI_TEXTURE, new GolemGuiTexture(ResourceReloadListener.TC_GOLEM_GUI_TEXTURE)); } } diff --git a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java index 37b9dc1..453ea10 100644 --- a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java +++ b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java @@ -1,7 +1,6 @@ package makeo.gadomancy.client.gui; import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; import makeo.gadomancy.common.containers.ContainerArcanePackager; import makeo.gadomancy.common.utils.ColorHelper; import makeo.gadomancy.common.utils.SimpleResourceLocation; @@ -41,30 +40,30 @@ public class ArcanePackagerGui extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - if(tile.isInvalid()) { + if(this.tile.isInvalid()) { Minecraft.getMinecraft().displayGuiScreen(null); return; } GL11.glEnable(GL11.GL_BLEND); - this.mc.renderEngine.bindTexture(TEXTURE); + this.mc.renderEngine.bindTexture(ArcanePackagerGui.TEXTURE); GL11.glColor3f(1, 1, 1); - if(tile.progress > 0) { - drawTexturedModalRect(89, 67, 210, 0, tile.progress, 9); + if(this.tile.progress > 0) { + this.drawTexturedModalRect(89, 67, 210, 0, this.tile.progress, 9); } - if(tile.useEssentia) { - drawTexturedModalRect(91, 97, 249, 10, 8, 8); + if(this.tile.useEssentia) { + this.drawTexturedModalRect(91, 97, 249, 10, 8, 8); } - if(tile.autoStart) { - drawTexturedModalRect(91, 110, 249, 10, 8, 8); + if(this.tile.autoStart) { + this.drawTexturedModalRect(91, 110, 249, 10, 8, 8); } - if(tile.disguise) { - drawTexturedModalRect(91, 123, 249, 10, 8, 8); + if(this.tile.disguise) { + this.drawTexturedModalRect(91, 123, 249, 10, 8, 8); } GL11.glDisable(GL11.GL_BLEND); @@ -72,18 +71,18 @@ public class ArcanePackagerGui extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float mouseX, int mouseZ, int par3) { - this.mc.renderEngine.bindTexture(TEXTURE); + this.mc.renderEngine.bindTexture(ArcanePackagerGui.TEXTURE); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glEnable(GL11.GL_BLEND); int var5 = (this.width - this.xSize) / 2; int var6 = (this.height - this.ySize) / 2; - drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.ySize); + this.drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.ySize); - drawString(100, 98, "gadomancy.info.ArcanePackager.useEssentia", tile.useEssentia ? Color.WHITE : Color.GRAY); + this.drawString(100, 98, "gadomancy.info.ArcanePackager.useEssentia", this.tile.useEssentia ? Color.WHITE : Color.GRAY); - drawString(100, 111, "gadomancy.info.ArcanePackager.autoStart", tile.autoStart ? Color.WHITE : Color.GRAY); + this.drawString(100, 111, "gadomancy.info.ArcanePackager.autoStart", this.tile.autoStart ? Color.WHITE : Color.GRAY); - drawString(100, 124, "gadomancy.info.ArcanePackager.disguisePackage", tile.disguise ? Color.WHITE : Color.GRAY); + this.drawString(100, 124, "gadomancy.info.ArcanePackager.disguisePackage", this.tile.disguise ? Color.WHITE : Color.GRAY); GL11.glDisable(GL11.GL_BLEND); } @@ -107,22 +106,22 @@ public class ArcanePackagerGui extends GuiContainer { int checkY = y - baseY - 97; if(checkX >= 0 && checkX < 8 && checkY >= 0 && checkY < 8) { - tile.useEssentia = !tile.useEssentia; - this.mc.playerController.sendEnchantPacket(this.inventorySlots.windowId, tile.useEssentia ? 0 : 1); + this.tile.useEssentia = !this.tile.useEssentia; + this.mc.playerController.sendEnchantPacket(this.inventorySlots.windowId, this.tile.useEssentia ? 0 : 1); } checkY = y - baseY - 110; if(checkX >= 0 && checkX < 8 && checkY >= 0 && checkY < 8) { - tile.autoStart = !tile.autoStart; - this.mc.playerController.sendEnchantPacket(this.inventorySlots.windowId, tile.autoStart ? 2 : 3); + this.tile.autoStart = !this.tile.autoStart; + this.mc.playerController.sendEnchantPacket(this.inventorySlots.windowId, this.tile.autoStart ? 2 : 3); } checkY = y - baseY - 123; if(checkX >= 0 && checkX < 8 && checkY >= 0 && checkY < 8) { - tile.disguise = !tile.disguise; - this.mc.playerController.sendEnchantPacket(this.inventorySlots.windowId, tile.disguise ? 4 : 5); + this.tile.disguise = !this.tile.disguise; + this.mc.playerController.sendEnchantPacket(this.inventorySlots.windowId, this.tile.disguise ? 4 : 5); } } diff --git a/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java b/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java index c32df83..4b25676 100644 --- a/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java +++ b/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java @@ -56,20 +56,20 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { for (String s : list) { try { String s2 = s.substring(1); - ItemStack is = getFromCache(Integer.parseInt(s2)); + ItemStack is = GuiResearchRecipe.getFromCache(Integer.parseInt(s2)); if (is != null) { AspectList tags = ThaumcraftCraftingManager.getObjectTags(is); tags = ThaumcraftCraftingManager.getBonusTags(is, tags); if ((tags != null) && (tags.size() > 0)) { for (Aspect a : tags.getAspects()) { - ArrayList items = itemMap.get(a.getTag()); + ArrayList items = this.itemMap.get(a.getTag()); if (items == null) { items = new ArrayList(); } ItemStack is2 = is.copy(); is2.stackSize = tags.getAmount(a); items.add(is2); - itemMap.put(a.getTag(), items); + this.itemMap.put(a.getTag(), items); } } } @@ -104,7 +104,7 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { GL11.glTranslatef(var10, var11, 0.0F); GL11.glEnable(GL11.GL_BLEND); GL11.glScalef(1.3F, 1.3F, 1.0F); - drawTexturedModalRect(0, 0, 0, 0, this.paneWidth, this.paneHeight); + this.drawTexturedModalRect(0, 0, 0, 0, this.paneWidth, this.paneHeight); GL11.glPopMatrix(); Injector inj = new Injector(this, GuiResearchRecipe.class); @@ -121,7 +121,7 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { if (((current == page) || (current == page + 1)) && (current < maxPages)) { ResearchPage rPage = pages[a]; if (rPage instanceof ResearchPageAuraAspects) { - drawAuraAspectPagePre(rPage, current % 2, sw, sh, par1, par2, page); + this.drawAuraAspectPagePre(rPage, current % 2, sw, sh, par1, par2, page); } else if(rPage != null) { try { Method m = Injector.getMethod("drawPage", GuiResearchRecipe.class, ResearchPage.class, int.class, int.class, int.class, int.class, int.class); @@ -139,17 +139,17 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { } UtilsFX.bindTexture(this.tex1); float bob = MathHelper.sin(this.mc.thePlayer.ticksExisted / 3.0F) * 0.2F + 0.1F; - if (!history.isEmpty()) { + if (!GuiResearchRecipe.history.isEmpty()) { GL11.glEnable(GL11.GL_BLEND); - drawTexturedModalRectScaled(sw + 118, sh + 189, 38, 202, 20, 12, bob); + this.drawTexturedModalRectScaled(sw + 118, sh + 189, 38, 202, 20, 12, bob); } if (page > 0) { GL11.glEnable(GL11.GL_BLEND); - drawTexturedModalRectScaled(sw - 16, sh + 190, 0, 184, 12, 8, bob); + this.drawTexturedModalRectScaled(sw - 16, sh + 190, 0, 184, 12, 8, bob); } if (page < maxPages - 2) { GL11.glEnable(GL11.GL_BLEND); - drawTexturedModalRectScaled(sw + 262, sh + 190, 12, 184, 12, 8, bob); + this.drawTexturedModalRectScaled(sw + 262, sh + 190, 12, 184, 12, 8, bob); } inj.setField("reference", reference); @@ -160,8 +160,8 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { String researchName = Gadomancy.MODID.toUpperCase() + ".AURA_EFFECTS"; //We know the name of that research. researchName = StatCollector.translateToLocal(researchName); if ((thisPage == 0) && (side == 0)) { - drawTexturedModalRect(x + 4, y - 13, 24, 184, 96, 4); - drawTexturedModalRect(x + 4, y + 4, 24, 184, 96, 4); + this.drawTexturedModalRect(x + 4, y - 13, 24, 184, 96, 4); + this.drawTexturedModalRect(x + 4, y + 4, 24, 184, 96, 4); int offset = this.fontRendererObj.getStringWidth(researchName); if (offset <= 130) { this.fontRendererObj.drawString(researchName, x + 52 - offset / 2, y - 6, 3158064); @@ -176,7 +176,7 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { y += 25; } GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); - drawAuraPage(side, x - 8, y - 8, mx, my, page.aspects); + this.drawAuraPage(side, x - 8, y - 8, mx, my, page.aspects); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glPopAttrib(); } @@ -231,7 +231,7 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { int tx = x + start; int ty = y + count * 50; if ((mx >= tx) && (my >= ty) && (mx < tx + 40) && (my < ty + 40)) { - ArrayList items = itemMap.get(aspect.getTag()); + ArrayList items = this.itemMap.get(aspect.getTag()); if ((items != null) && (items.size() > 0)) { int xcount = 0; int ycount = 0; @@ -240,8 +240,8 @@ public class GuiResearchRecipeAuraEffects extends GuiResearchRecipe { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL11.GL_LIGHTING); - itemRenderer.renderItemAndEffectIntoGUI(this.mc.fontRenderer, this.mc.renderEngine, InventoryUtils.cycleItemStack(item), mx + 8 + xcount * 17, 17 * ycount + (my - (4 + items.size() / 8 * 8))); - itemRenderer.renderItemOverlayIntoGUI(this.mc.fontRenderer, this.mc.renderEngine, InventoryUtils.cycleItemStack(item), mx + 8 + xcount * 17, 17 * ycount + (my - (4 + items.size() / 8 * 8))); + GuiResearchRecipe.itemRenderer.renderItemAndEffectIntoGUI(this.mc.fontRenderer, this.mc.renderEngine, InventoryUtils.cycleItemStack(item), mx + 8 + xcount * 17, 17 * ycount + (my - (4 + items.size() / 8 * 8))); + GuiResearchRecipe.itemRenderer.renderItemOverlayIntoGUI(this.mc.fontRenderer, this.mc.renderEngine, InventoryUtils.cycleItemStack(item), mx + 8 + xcount * 17, 17 * ycount + (my - (4 + items.size() / 8 * 8))); RenderHelper.disableStandardItemLighting(); GL11.glPopMatrix(); xcount++; diff --git a/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java b/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java index 613654c..baa33ec 100644 --- a/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java +++ b/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java @@ -33,29 +33,29 @@ public class InfusionClawGui extends GuiContainer { public InfusionClawGui(InventoryPlayer playerInv, IInventory clawInv) { super(new ContainerInfusionClaw(playerInv, clawInv)); - container = (ContainerInfusionClaw) super.inventorySlots; + this.container = (ContainerInfusionClaw) super.inventorySlots; } @Override protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - if(((TileInfusionClaw)container.clawInv).isInvalid()) { + if(((TileInfusionClaw) this.container.clawInv).isInvalid()) { Minecraft.getMinecraft().displayGuiScreen(null); return; } - ItemStack cursorStack = container.playerInv.getItemStack(); - if(((TileInfusionClaw)container.clawInv).isRunning() || (cursorStack != null && cursorStack.stackSize > 0 && !container.clawInv.isItemValidForSlot(0, cursorStack))) { + ItemStack cursorStack = this.container.playerInv.getItemStack(); + if(((TileInfusionClaw) this.container.clawInv).isRunning() || (cursorStack != null && cursorStack.stackSize > 0 && !this.container.clawInv.isItemValidForSlot(0, cursorStack))) { GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1, 1, 1, 0.5f); - this.mc.renderEngine.bindTexture(BACKGROUND); + this.mc.renderEngine.bindTexture(InfusionClawGui.BACKGROUND); float t = this.zLevel; this.zLevel = 200.0F; GL11.glEnable(3042); - drawTexturedModalRect(80, 32, 240, 0, 16, 16); + this.drawTexturedModalRect(80, 32, 240, 0, 16, 16); GL11.glDisable(3042); this.zLevel = t; @@ -67,20 +67,20 @@ public class InfusionClawGui extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glEnable(GL11.GL_BLEND); - this.mc.renderEngine.bindTexture(BACKGROUND); + this.mc.renderEngine.bindTexture(InfusionClawGui.BACKGROUND); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int var5 = (this.width - this.xSize) / 2; int var6 = (this.height - this.ySize) / 2; - drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.ySize); + this.drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.ySize); int baseX = this.guiLeft; int baseY = this.guiTop; - drawTexturedModalRect(baseX + 114, baseY + 36, 244, 19, 8, 8); + this.drawTexturedModalRect(baseX + 114, baseY + 36, 244, 19, 8, 8); - boolean isLocked = ((TileInfusionClaw)container.clawInv).isLocked(); + boolean isLocked = ((TileInfusionClaw) this.container.clawInv).isLocked(); if(isLocked) { - drawTexturedModalRect(baseX + 114, baseY + 36, 244, 27, 8, 8); + this.drawTexturedModalRect(baseX + 114, baseY + 36, 244, 27, 8, 8); } GL11.glPushMatrix(); @@ -103,7 +103,7 @@ public class InfusionClawGui extends GuiContainer { int checkY = y - baseY - 36; if(checkX >= 0 && checkX < 8 && checkY >= 0 && checkY < 8) { - TileInfusionClaw tile = ((TileInfusionClaw)container.clawInv); + TileInfusionClaw tile = ((TileInfusionClaw) this.container.clawInv); this.mc.playerController.sendEnchantPacket(this.inventorySlots.windowId, tile.isLocked() ? 0 : 1); tile.setIsLocked(!tile.isLocked()); } diff --git a/src/main/java/makeo/gadomancy/client/models/ModelArcaneDropper.java b/src/main/java/makeo/gadomancy/client/models/ModelArcaneDropper.java index 99a4e15..e64768e 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelArcaneDropper.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelArcaneDropper.java @@ -28,91 +28,91 @@ public class ModelArcaneDropper extends ModelBase { ModelRenderer shape11; public ModelArcaneDropper() { - textureWidth = 64; - textureHeight = 64; + this.textureWidth = 64; + this.textureHeight = 64; - shape1 = new ModelRenderer(this, 44, 0); - shape1.addBox(0F, 0F, 0F, 2, 14, 8); - shape1.setRotationPoint(-1F, 10F, -4F); - shape1.setTextureSize(64, 64); - shape1.mirror = true; - setRotation(shape1, 0F, 0F, 0F); - shape2 = new ModelRenderer(this, 0, 0); - shape2.addBox(0F, 0F, 0F, 16, 16, 4); - shape2.setRotationPoint(-8F, 8F, 4F); - shape2.setTextureSize(64, 64); - shape2.mirror = true; - setRotation(shape2, 0F, 0F, 0F); - shape3 = new ModelRenderer(this, 0, 20); - shape3.addBox(0F, 0F, 0F, 16, 16, 4); - shape3.setRotationPoint(-8F, 8F, -8F); - shape3.setTextureSize(64, 64); - shape3.mirror = true; - setRotation(shape3, 0F, 0F, 0F); - shape4 = new ModelRenderer(this, 34, 22); - shape4.addBox(0F, 0F, 0F, 7, 2, 8); - shape4.setRotationPoint(1F, 10F, -4F); - shape4.setTextureSize(64, 64); - shape4.mirror = true; - setRotation(shape4, 0F, 0F, 0F); - shape5 = new ModelRenderer(this, 34, 32); - shape5.addBox(0F, 0F, 0F, 7, 4, 8); - shape5.setRotationPoint(1F, 20F, -4F); - shape5.setTextureSize(64, 64); - shape5.mirror = true; - setRotation(shape5, 0F, 0F, 0F); - shape6 = new ModelRenderer(this, 34, 52); - shape6.addBox(0F, 0F, 0F, 7, 4, 8); - shape6.setRotationPoint(-8F, 20F, -4F); - shape6.setTextureSize(64, 64); - shape6.mirror = true; - setRotation(shape6, 0F, 0F, 0F); - shape7 = new ModelRenderer(this, 0, 40); - shape7.addBox(0F, 0F, 0F, 7, 2, 8); - shape7.setRotationPoint(-8F, 10F, -4F); - shape7.setTextureSize(64, 64); - shape7.mirror = true; - setRotation(shape7, 0F, 0F, 0F); - shape8 = new ModelRenderer(this, 21, 50); - shape8.addBox(0F, 0F, 0F, 5, 2, 8); - shape8.setRotationPoint(3F, 8F, -4F); - shape8.setTextureSize(64, 64); - shape8.mirror = true; - setRotation(shape8, 0F, 0F, 0F); - shape9 = new ModelRenderer(this, 0, 50); - shape9.addBox(0F, 0F, 0F, 5, 2, 8); - shape9.setRotationPoint(-8F, 8F, -4F); - shape9.setTextureSize(64, 64); - shape9.mirror = true; - setRotation(shape9, 0F, 0F, 0F); - shape10 = new ModelRenderer(this, 0, 61); - shape10.addBox(0F, 0F, 0F, 6, 2, 1); - shape10.setRotationPoint(-3F, 8F, -4F); - shape10.setTextureSize(64, 64); - shape10.mirror = true; - setRotation(shape10, 0F, 0F, 0F); - shape11 = new ModelRenderer(this, 14, 61); - shape11.addBox(0F, 0F, 0F, 6, 2, 1); - shape11.setRotationPoint(-3F, 8F, 3F); - shape11.setTextureSize(64, 64); - shape11.mirror = true; - setRotation(shape11, 0F, 0F, 0F); + this.shape1 = new ModelRenderer(this, 44, 0); + this.shape1.addBox(0F, 0F, 0F, 2, 14, 8); + this.shape1.setRotationPoint(-1F, 10F, -4F); + this.shape1.setTextureSize(64, 64); + this.shape1.mirror = true; + this.setRotation(this.shape1, 0F, 0F, 0F); + this.shape2 = new ModelRenderer(this, 0, 0); + this.shape2.addBox(0F, 0F, 0F, 16, 16, 4); + this.shape2.setRotationPoint(-8F, 8F, 4F); + this.shape2.setTextureSize(64, 64); + this.shape2.mirror = true; + this.setRotation(this.shape2, 0F, 0F, 0F); + this.shape3 = new ModelRenderer(this, 0, 20); + this.shape3.addBox(0F, 0F, 0F, 16, 16, 4); + this.shape3.setRotationPoint(-8F, 8F, -8F); + this.shape3.setTextureSize(64, 64); + this.shape3.mirror = true; + this.setRotation(this.shape3, 0F, 0F, 0F); + this.shape4 = new ModelRenderer(this, 34, 22); + this.shape4.addBox(0F, 0F, 0F, 7, 2, 8); + this.shape4.setRotationPoint(1F, 10F, -4F); + this.shape4.setTextureSize(64, 64); + this.shape4.mirror = true; + this.setRotation(this.shape4, 0F, 0F, 0F); + this.shape5 = new ModelRenderer(this, 34, 32); + this.shape5.addBox(0F, 0F, 0F, 7, 4, 8); + this.shape5.setRotationPoint(1F, 20F, -4F); + this.shape5.setTextureSize(64, 64); + this.shape5.mirror = true; + this.setRotation(this.shape5, 0F, 0F, 0F); + this.shape6 = new ModelRenderer(this, 34, 52); + this.shape6.addBox(0F, 0F, 0F, 7, 4, 8); + this.shape6.setRotationPoint(-8F, 20F, -4F); + this.shape6.setTextureSize(64, 64); + this.shape6.mirror = true; + this.setRotation(this.shape6, 0F, 0F, 0F); + this.shape7 = new ModelRenderer(this, 0, 40); + this.shape7.addBox(0F, 0F, 0F, 7, 2, 8); + this.shape7.setRotationPoint(-8F, 10F, -4F); + this.shape7.setTextureSize(64, 64); + this.shape7.mirror = true; + this.setRotation(this.shape7, 0F, 0F, 0F); + this.shape8 = new ModelRenderer(this, 21, 50); + this.shape8.addBox(0F, 0F, 0F, 5, 2, 8); + this.shape8.setRotationPoint(3F, 8F, -4F); + this.shape8.setTextureSize(64, 64); + this.shape8.mirror = true; + this.setRotation(this.shape8, 0F, 0F, 0F); + this.shape9 = new ModelRenderer(this, 0, 50); + this.shape9.addBox(0F, 0F, 0F, 5, 2, 8); + this.shape9.setRotationPoint(-8F, 8F, -4F); + this.shape9.setTextureSize(64, 64); + this.shape9.mirror = true; + this.setRotation(this.shape9, 0F, 0F, 0F); + this.shape10 = new ModelRenderer(this, 0, 61); + this.shape10.addBox(0F, 0F, 0F, 6, 2, 1); + this.shape10.setRotationPoint(-3F, 8F, -4F); + this.shape10.setTextureSize(64, 64); + this.shape10.mirror = true; + this.setRotation(this.shape10, 0F, 0F, 0F); + this.shape11 = new ModelRenderer(this, 14, 61); + this.shape11.addBox(0F, 0F, 0F, 6, 2, 1); + this.shape11.setRotationPoint(-3F, 8F, 3F); + this.shape11.setTextureSize(64, 64); + this.shape11.mirror = true; + this.setRotation(this.shape11, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - shape1.render(f5); - shape2.render(f5); - shape3.render(f5); - shape4.render(f5); - shape5.render(f5); - shape6.render(f5); - shape7.render(f5); - shape8.render(f5); - shape9.render(f5); - shape10.render(f5); - shape11.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.shape1.render(f5); + this.shape2.render(f5); + this.shape3.render(f5); + this.shape4.render(f5); + this.shape5.render(f5); + this.shape6.render(f5); + this.shape7.render(f5); + this.shape8.render(f5); + this.shape9.render(f5); + this.shape10.render(f5); + this.shape11.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelArcanePackager.java b/src/main/java/makeo/gadomancy/client/models/ModelArcanePackager.java index cd44384..43d4564 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelArcanePackager.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelArcanePackager.java @@ -24,77 +24,77 @@ public class ModelArcanePackager extends ModelBase { ModelRenderer shape9; public ModelArcanePackager() { - textureWidth = 64; - textureHeight = 64; + this.textureWidth = 64; + this.textureHeight = 64; - shape1 = new ModelRenderer(this, 0, 0); - shape1.addBox(0F, 0F, 0F, 16, 3, 16); - shape1.setRotationPoint(-8F, 21F, -8F); - shape1.setTextureSize(64, 64); - shape1.mirror = true; - setRotation(shape1, 0F, 0F, 0F); - shape2 = new ModelRenderer(this, 0, 20); - shape2.addBox(0F, 0F, 0F, 16, 3, 16); - shape2.setRotationPoint(-8F, 12F, -8F); - shape2.setTextureSize(64, 64); - shape2.mirror = true; - setRotation(shape2, 0F, 0F, 0F); - shape3 = new ModelRenderer(this, 0, 40); - shape3.addBox(0F, 0F, 0F, 1, 5, 5); - shape3.setRotationPoint(7F, 13.5F, -2.5F); - shape3.setTextureSize(64, 64); - shape3.mirror = true; - setRotation(shape3, 0F, 0F, 0F); - shape4 = new ModelRenderer(this, 13, 40); - shape4.addBox(-2F, 0F, 0F, 3, 2, 2); - shape4.setRotationPoint(7F, 15F, -1F); - shape4.setTextureSize(64, 64); - shape4.mirror = true; - setRotation(shape4, 0F, 0F, 0.7853982F); - shape5 = new ModelRenderer(this, 13, 45); - shape5.addBox(0.3F, 0.12F, 0F, 1, 1, 2); - shape5.setRotationPoint(6F, 16F, -1F); - shape5.setTextureSize(64, 64); - shape5.mirror = true; - setRotation(shape5, 0F, 0F, 0F); - shape6 = new ModelRenderer(this, 7, 40); - shape6.addBox(0F, 0F, 0F, 1, 6, 16); - shape6.setRotationPoint(-8F, 15F, -8F); - shape6.setTextureSize(64, 64); - shape6.mirror = true; - setRotation(shape6, 0F, 0F, 0F); - shape7 = new ModelRenderer(this, 24, 40); - shape7.addBox(0F, 0F, 0F, 1, 6, 16); - shape7.setRotationPoint(7F, 15F, -8F); - shape7.setTextureSize(64, 64); - shape7.mirror = true; - setRotation(shape7, 0F, 0F, 0F); - shape8 = new ModelRenderer(this, -9, 56); - shape8.addBox(0F, 0F, 0F, 16, 6, 0); - shape8.setRotationPoint(-8F, 15F, 8F); - shape8.setTextureSize(64, 64); - shape8.mirror = true; - setRotation(shape8, 0F, 0F, 0F); - shape9 = new ModelRenderer(this, 6, 55); - shape9.addBox(0F, 0F, 0F, 16, 6, 1); - shape9.setRotationPoint(-8F, 15F, -8F); - shape9.setTextureSize(64, 64); - shape9.mirror = true; - setRotation(shape9, 0F, 0F, 0F); + this.shape1 = new ModelRenderer(this, 0, 0); + this.shape1.addBox(0F, 0F, 0F, 16, 3, 16); + this.shape1.setRotationPoint(-8F, 21F, -8F); + this.shape1.setTextureSize(64, 64); + this.shape1.mirror = true; + this.setRotation(this.shape1, 0F, 0F, 0F); + this.shape2 = new ModelRenderer(this, 0, 20); + this.shape2.addBox(0F, 0F, 0F, 16, 3, 16); + this.shape2.setRotationPoint(-8F, 12F, -8F); + this.shape2.setTextureSize(64, 64); + this.shape2.mirror = true; + this.setRotation(this.shape2, 0F, 0F, 0F); + this.shape3 = new ModelRenderer(this, 0, 40); + this.shape3.addBox(0F, 0F, 0F, 1, 5, 5); + this.shape3.setRotationPoint(7F, 13.5F, -2.5F); + this.shape3.setTextureSize(64, 64); + this.shape3.mirror = true; + this.setRotation(this.shape3, 0F, 0F, 0F); + this.shape4 = new ModelRenderer(this, 13, 40); + this.shape4.addBox(-2F, 0F, 0F, 3, 2, 2); + this.shape4.setRotationPoint(7F, 15F, -1F); + this.shape4.setTextureSize(64, 64); + this.shape4.mirror = true; + this.setRotation(this.shape4, 0F, 0F, 0.7853982F); + this.shape5 = new ModelRenderer(this, 13, 45); + this.shape5.addBox(0.3F, 0.12F, 0F, 1, 1, 2); + this.shape5.setRotationPoint(6F, 16F, -1F); + this.shape5.setTextureSize(64, 64); + this.shape5.mirror = true; + this.setRotation(this.shape5, 0F, 0F, 0F); + this.shape6 = new ModelRenderer(this, 7, 40); + this.shape6.addBox(0F, 0F, 0F, 1, 6, 16); + this.shape6.setRotationPoint(-8F, 15F, -8F); + this.shape6.setTextureSize(64, 64); + this.shape6.mirror = true; + this.setRotation(this.shape6, 0F, 0F, 0F); + this.shape7 = new ModelRenderer(this, 24, 40); + this.shape7.addBox(0F, 0F, 0F, 1, 6, 16); + this.shape7.setRotationPoint(7F, 15F, -8F); + this.shape7.setTextureSize(64, 64); + this.shape7.mirror = true; + this.setRotation(this.shape7, 0F, 0F, 0F); + this.shape8 = new ModelRenderer(this, -9, 56); + this.shape8.addBox(0F, 0F, 0F, 16, 6, 0); + this.shape8.setRotationPoint(-8F, 15F, 8F); + this.shape8.setTextureSize(64, 64); + this.shape8.mirror = true; + this.setRotation(this.shape8, 0F, 0F, 0F); + this.shape9 = new ModelRenderer(this, 6, 55); + this.shape9.addBox(0F, 0F, 0F, 16, 6, 1); + this.shape9.setRotationPoint(-8F, 15F, -8F); + this.shape9.setTextureSize(64, 64); + this.shape9.mirror = true; + this.setRotation(this.shape9, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - shape1.render(f5); - shape2.render(f5); - shape3.render(f5); - shape4.render(f5); - shape5.render(f5); - shape9.render(f5); - shape6.render(f5); - shape7.render(f5); - shape8.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.shape1.render(f5); + this.shape2.render(f5); + this.shape3.render(f5); + this.shape4.render(f5); + this.shape5.render(f5); + this.shape9.render(f5); + this.shape6.render(f5); + this.shape7.render(f5); + this.shape8.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java index a84be4d..c1b3873 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java @@ -24,120 +24,120 @@ public class ModelAuraPylon extends ModelBase { public ModelAuraPylon() { - textureWidth = 32; - textureHeight = 32; + this.textureWidth = 32; + this.textureHeight = 32; - outerpylon = new ModelRenderer(this, 0, 0); - outerpylon.addBox(0F, 0F, 0F, 2, 16, 2); - outerpylon.setRotationPoint(5F, 8F, 5F); - outerpylon.setTextureSize(32, 32); - outerpylon.mirror = true; - setRotation(outerpylon, 0F, 0F, 0F); - lowerconduit = new ModelRenderer(this, 9, 0); - lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); - lowerconduit.setRotationPoint(6F, 20F, 7F); - lowerconduit.setTextureSize(32, 32); - lowerconduit.mirror = true; - setRotation(lowerconduit, 0F, 2.356194F, 0F); - inlower1 = new ModelRenderer(this, 9, 3); - inlower1.addBox(0F, 0F, 0F, 1, 1, 3); - inlower1.setRotationPoint(3F, 20F, 3F); - inlower1.setTextureSize(32, 32); - inlower1.mirror = true; - setRotation(inlower1, 0F, 3.141593F, 0F); - inlower2 = new ModelRenderer(this, 9, 11); - inlower2.addBox(0F, 0F, 0F, 3, 1, 1); - inlower2.setRotationPoint(3F, 20F, 3F); - inlower2.setTextureSize(32, 32); - inlower2.mirror = true; - setRotation(inlower2, 0F, 3.141593F, 0F); - upperconduit = new ModelRenderer(this, 9, 0); - upperconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); - upperconduit.setRotationPoint(6F, 11F, 7F); - upperconduit.setTextureSize(32, 32); - upperconduit.mirror = true; - setRotation(upperconduit, 0F, 2.356194F, 0F); - inupper2 = new ModelRenderer(this, 9, 11); - inupper2.addBox(0F, 0F, 0F, 3, 1, 1); - inupper2.setRotationPoint(3F, 11F, 3F); - inupper2.setTextureSize(32, 32); - inupper2.mirror = true; - setRotation(inupper2, 0F, 3.141593F, 0F); - inupper1 = new ModelRenderer(this, 9, 3); - inupper1.addBox(0F, 0F, 0F, 1, 1, 3); - inupper1.setRotationPoint(3F, 11F, 3F); - inupper1.setTextureSize(32, 32); - inupper1.mirror = true; - setRotation(inupper1, 0F, 3.141593F, 0F); - outuppersmooth1 = new ModelRenderer(this, 9, 8); - outuppersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); - outuppersmooth1.setRotationPoint(6F, 11F, 6F); - outuppersmooth1.setTextureSize(32, 32); - outuppersmooth1.mirror = true; - setRotation(outuppersmooth1, 0F, 2.792527F, 0F); - outuppersmooth2 = new ModelRenderer(this, 9, 8); - outuppersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); - outuppersmooth2.setRotationPoint(5F, 11F, 7F); - outuppersmooth2.setTextureSize(32, 32); - outuppersmooth2.mirror = true; - setRotation(outuppersmooth2, 0F, 1.919862F, 0F); - inuppersmooth1 = new ModelRenderer(this, 9, 14); - inuppersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); - inuppersmooth1.setRotationPoint(2F, 11F, 2F); - inuppersmooth1.setTextureSize(32, 32); - inuppersmooth1.mirror = true; - setRotation(inuppersmooth1, 0F, 0.3490659F, 0F); - inuppersmooth2 = new ModelRenderer(this, 9, 14); - inuppersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); - inuppersmooth2.setRotationPoint(1F, 11F, 3F); - inuppersmooth2.setTextureSize(32, 32); - inuppersmooth2.mirror = true; - setRotation(inuppersmooth2, 0F, 1.22173F, 0F); - outlowersmooth2 = new ModelRenderer(this, 9, 8); - outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); - outlowersmooth2.setRotationPoint(5F, 20F, 7F); - outlowersmooth2.setTextureSize(32, 32); - outlowersmooth2.mirror = true; - setRotation(outlowersmooth2, 0F, 1.919862F, 0F); - outlowersmooth1 = new ModelRenderer(this, 9, 8); - outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); - outlowersmooth1.setRotationPoint(6F, 20F, 6F); - outlowersmooth1.setTextureSize(32, 32); - outlowersmooth1.mirror = true; - setRotation(outlowersmooth1, 0F, 2.792527F, 0F); - inlowersmooth1 = new ModelRenderer(this, 9, 14); - inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); - inlowersmooth1.setRotationPoint(2F, 20F, 2F); - inlowersmooth1.setTextureSize(32, 32); - inlowersmooth1.mirror = true; - setRotation(inlowersmooth1, 0F, 0.3490659F, 0F); - inlowersmooth2 = new ModelRenderer(this, 9, 14); - inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); - inlowersmooth2.setRotationPoint(1F, 20F, 3F); - inlowersmooth2.setTextureSize(32, 32); - inlowersmooth2.mirror = true; - setRotation(inlowersmooth2, 0F, 1.22173F, 0F); + this.outerpylon = new ModelRenderer(this, 0, 0); + this.outerpylon.addBox(0F, 0F, 0F, 2, 16, 2); + this.outerpylon.setRotationPoint(5F, 8F, 5F); + this.outerpylon.setTextureSize(32, 32); + this.outerpylon.mirror = true; + this.setRotation(this.outerpylon, 0F, 0F, 0F); + this.lowerconduit = new ModelRenderer(this, 9, 0); + this.lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); + this.lowerconduit.setRotationPoint(6F, 20F, 7F); + this.lowerconduit.setTextureSize(32, 32); + this.lowerconduit.mirror = true; + this.setRotation(this.lowerconduit, 0F, 2.356194F, 0F); + this.inlower1 = new ModelRenderer(this, 9, 3); + this.inlower1.addBox(0F, 0F, 0F, 1, 1, 3); + this.inlower1.setRotationPoint(3F, 20F, 3F); + this.inlower1.setTextureSize(32, 32); + this.inlower1.mirror = true; + this.setRotation(this.inlower1, 0F, 3.141593F, 0F); + this.inlower2 = new ModelRenderer(this, 9, 11); + this.inlower2.addBox(0F, 0F, 0F, 3, 1, 1); + this.inlower2.setRotationPoint(3F, 20F, 3F); + this.inlower2.setTextureSize(32, 32); + this.inlower2.mirror = true; + this.setRotation(this.inlower2, 0F, 3.141593F, 0F); + this.upperconduit = new ModelRenderer(this, 9, 0); + this.upperconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); + this.upperconduit.setRotationPoint(6F, 11F, 7F); + this.upperconduit.setTextureSize(32, 32); + this.upperconduit.mirror = true; + this.setRotation(this.upperconduit, 0F, 2.356194F, 0F); + this.inupper2 = new ModelRenderer(this, 9, 11); + this.inupper2.addBox(0F, 0F, 0F, 3, 1, 1); + this.inupper2.setRotationPoint(3F, 11F, 3F); + this.inupper2.setTextureSize(32, 32); + this.inupper2.mirror = true; + this.setRotation(this.inupper2, 0F, 3.141593F, 0F); + this.inupper1 = new ModelRenderer(this, 9, 3); + this.inupper1.addBox(0F, 0F, 0F, 1, 1, 3); + this.inupper1.setRotationPoint(3F, 11F, 3F); + this.inupper1.setTextureSize(32, 32); + this.inupper1.mirror = true; + this.setRotation(this.inupper1, 0F, 3.141593F, 0F); + this.outuppersmooth1 = new ModelRenderer(this, 9, 8); + this.outuppersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); + this.outuppersmooth1.setRotationPoint(6F, 11F, 6F); + this.outuppersmooth1.setTextureSize(32, 32); + this.outuppersmooth1.mirror = true; + this.setRotation(this.outuppersmooth1, 0F, 2.792527F, 0F); + this.outuppersmooth2 = new ModelRenderer(this, 9, 8); + this.outuppersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); + this.outuppersmooth2.setRotationPoint(5F, 11F, 7F); + this.outuppersmooth2.setTextureSize(32, 32); + this.outuppersmooth2.mirror = true; + this.setRotation(this.outuppersmooth2, 0F, 1.919862F, 0F); + this.inuppersmooth1 = new ModelRenderer(this, 9, 14); + this.inuppersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); + this.inuppersmooth1.setRotationPoint(2F, 11F, 2F); + this.inuppersmooth1.setTextureSize(32, 32); + this.inuppersmooth1.mirror = true; + this.setRotation(this.inuppersmooth1, 0F, 0.3490659F, 0F); + this.inuppersmooth2 = new ModelRenderer(this, 9, 14); + this.inuppersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); + this.inuppersmooth2.setRotationPoint(1F, 11F, 3F); + this.inuppersmooth2.setTextureSize(32, 32); + this.inuppersmooth2.mirror = true; + this.setRotation(this.inuppersmooth2, 0F, 1.22173F, 0F); + this.outlowersmooth2 = new ModelRenderer(this, 9, 8); + this.outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); + this.outlowersmooth2.setRotationPoint(5F, 20F, 7F); + this.outlowersmooth2.setTextureSize(32, 32); + this.outlowersmooth2.mirror = true; + this.setRotation(this.outlowersmooth2, 0F, 1.919862F, 0F); + this.outlowersmooth1 = new ModelRenderer(this, 9, 8); + this.outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); + this.outlowersmooth1.setRotationPoint(6F, 20F, 6F); + this.outlowersmooth1.setTextureSize(32, 32); + this.outlowersmooth1.mirror = true; + this.setRotation(this.outlowersmooth1, 0F, 2.792527F, 0F); + this.inlowersmooth1 = new ModelRenderer(this, 9, 14); + this.inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); + this.inlowersmooth1.setRotationPoint(2F, 20F, 2F); + this.inlowersmooth1.setTextureSize(32, 32); + this.inlowersmooth1.mirror = true; + this.setRotation(this.inlowersmooth1, 0F, 0.3490659F, 0F); + this.inlowersmooth2 = new ModelRenderer(this, 9, 14); + this.inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); + this.inlowersmooth2.setRotationPoint(1F, 20F, 3F); + this.inlowersmooth2.setTextureSize(32, 32); + this.inlowersmooth2.mirror = true; + this.setRotation(this.inlowersmooth2, 0F, 1.22173F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - outerpylon.render(f5); - lowerconduit.render(f5); - inlower1.render(f5); - inlower2.render(f5); - upperconduit.render(f5); - inupper2.render(f5); - inupper1.render(f5); - outuppersmooth1.render(f5); - outuppersmooth2.render(f5); - inuppersmooth1.render(f5); - inuppersmooth2.render(f5); - outlowersmooth2.render(f5); - outlowersmooth1.render(f5); - inlowersmooth1.render(f5); - inlowersmooth2.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.outerpylon.render(f5); + this.lowerconduit.render(f5); + this.inlower1.render(f5); + this.inlower2.render(f5); + this.upperconduit.render(f5); + this.inupper2.render(f5); + this.inupper1.render(f5); + this.outuppersmooth1.render(f5); + this.outuppersmooth2.render(f5); + this.inuppersmooth1.render(f5); + this.inuppersmooth2.render(f5); + this.outlowersmooth2.render(f5); + this.outlowersmooth1.render(f5); + this.inlowersmooth1.render(f5); + this.inlowersmooth2.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java index 7bc0945..36e869b 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java @@ -29,161 +29,161 @@ public class ModelAuraPylonBottom extends ModelBase { ModelRenderer pylonorn4; public ModelAuraPylonBottom() { - textureWidth = 32; - textureHeight = 32; + this.textureWidth = 32; + this.textureHeight = 32; - outerpylon = new ModelRenderer(this, 0, 0); - outerpylon.addBox(0F, 0F, 0F, 2, 16, 2); - outerpylon.setRotationPoint(5F, 8F, 5F); - outerpylon.setTextureSize(64, 32); - outerpylon.mirror = true; - setRotation(outerpylon, 0F, 0F, 0F); - lowerconduit = new ModelRenderer(this, 9, 0); - lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); - lowerconduit.setRotationPoint(6F, 20F, 7F); - lowerconduit.setTextureSize(64, 32); - lowerconduit.mirror = true; - setRotation(lowerconduit, 0F, 2.356194F, 0F); - inlower1 = new ModelRenderer(this, 9, 3); - inlower1.addBox(0F, 0F, 0F, 1, 1, 3); - inlower1.setRotationPoint(3F, 20F, 3F); - inlower1.setTextureSize(64, 32); - inlower1.mirror = true; - setRotation(inlower1, 0F, 3.141593F, 0F); - inlower2 = new ModelRenderer(this, 9, 11); - inlower2.addBox(0F, 0F, 0F, 3, 1, 1); - inlower2.setRotationPoint(3F, 20F, 3F); - inlower2.setTextureSize(64, 32); - inlower2.mirror = true; - setRotation(inlower2, 0F, 3.141593F, 0F); - upperconduit = new ModelRenderer(this, 9, 0); - upperconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); - upperconduit.setRotationPoint(6F, 11F, 7F); - upperconduit.setTextureSize(64, 32); - upperconduit.mirror = true; - setRotation(upperconduit, 0F, 2.356194F, 0F); - inupper2 = new ModelRenderer(this, 9, 11); - inupper2.addBox(0F, 0F, 0F, 3, 1, 1); - inupper2.setRotationPoint(3F, 11F, 3F); - inupper2.setTextureSize(64, 32); - inupper2.mirror = true; - setRotation(inupper2, 0F, 3.141593F, 0F); - inupper1 = new ModelRenderer(this, 9, 3); - inupper1.addBox(0F, 0F, 0F, 1, 1, 3); - inupper1.setRotationPoint(3F, 11F, 3F); - inupper1.setTextureSize(64, 32); - inupper1.mirror = true; - setRotation(inupper1, 0F, 3.141593F, 0F); - outuppersmooth1 = new ModelRenderer(this, 9, 8); - outuppersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); - outuppersmooth1.setRotationPoint(6F, 11F, 6F); - outuppersmooth1.setTextureSize(64, 32); - outuppersmooth1.mirror = true; - setRotation(outuppersmooth1, 0F, 2.792527F, 0F); - outuppersmooth2 = new ModelRenderer(this, 9, 8); - outuppersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); - outuppersmooth2.setRotationPoint(5F, 11F, 7F); - outuppersmooth2.setTextureSize(64, 32); - outuppersmooth2.mirror = true; - setRotation(outuppersmooth2, 0F, 1.919862F, 0F); - inuppersmooth1 = new ModelRenderer(this, 9, 14); - inuppersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); - inuppersmooth1.setRotationPoint(2F, 11F, 2F); - inuppersmooth1.setTextureSize(64, 32); - inuppersmooth1.mirror = true; - setRotation(inuppersmooth1, 0F, 0.3490659F, 0F); - inuppersmooth2 = new ModelRenderer(this, 9, 14); - inuppersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); - inuppersmooth2.setRotationPoint(1F, 11F, 3F); - inuppersmooth2.setTextureSize(64, 32); - inuppersmooth2.mirror = true; - setRotation(inuppersmooth2, 0F, 1.22173F, 0F); - outlowersmooth2 = new ModelRenderer(this, 9, 8); - outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); - outlowersmooth2.setRotationPoint(5F, 20F, 7F); - outlowersmooth2.setTextureSize(64, 32); - outlowersmooth2.mirror = true; - setRotation(outlowersmooth2, 0F, 1.919862F, 0F); - outlowersmooth1 = new ModelRenderer(this, 9, 8); - outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); - outlowersmooth1.setRotationPoint(6F, 20F, 6F); - outlowersmooth1.setTextureSize(64, 32); - outlowersmooth1.mirror = true; - setRotation(outlowersmooth1, 0F, 2.792527F, 0F); - inlowersmooth1 = new ModelRenderer(this, 9, 14); - inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); - inlowersmooth1.setRotationPoint(2F, 20F, 2F); - inlowersmooth1.setTextureSize(64, 32); - inlowersmooth1.mirror = true; - setRotation(inlowersmooth1, 0F, 0.3490659F, 0F); - inlowersmooth2 = new ModelRenderer(this, 9, 14); - inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); - inlowersmooth2.setRotationPoint(1F, 20F, 3F); - inlowersmooth2.setTextureSize(64, 32); - inlowersmooth2.mirror = true; - setRotation(inlowersmooth2, 0F, 1.22173F, 0F); - base = new ModelRenderer(this, 0, 22); - base.addBox(0F, 0F, 0F, 8, 2, 8); - base.setRotationPoint(0F, 22F, 0F); - base.setTextureSize(64, 32); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - baseornament = new ModelRenderer(this, 16, 14); - baseornament.addBox(0F, 0F, 0.2F, 2, 1, 6); - baseornament.setRotationPoint(-1F, 21F, 0F); - baseornament.setTextureSize(64, 32); - baseornament.mirror = true; - setRotation(baseornament, -0.1630138F, 0F, 0F); - pylonorn1 = new ModelRenderer(this, 18, 3); - pylonorn1.addBox(0F, -4F, 0F, 2, 3, 1); - pylonorn1.setRotationPoint(5F, 23.5F, 7F); - pylonorn1.setTextureSize(64, 32); - pylonorn1.mirror = true; - setRotation(pylonorn1, 0.2617994F, 0F, 0F); - pylonorn2 = new ModelRenderer(this, 18, 3); - pylonorn2.addBox(0F, -4F, -1F, 2, 3, 1); - pylonorn2.setRotationPoint(5F, 23.5F, 5F); - pylonorn2.setTextureSize(64, 32); - pylonorn2.mirror = true; - setRotation(pylonorn2, -0.2617994F, 0F, 0F); - pylonorn3 = new ModelRenderer(this, 18, 3); - pylonorn3.addBox(0F, -4F, 0F, 2, 3, 1); - pylonorn3.setRotationPoint(7F, 23.5F, 7F); - pylonorn3.setTextureSize(64, 32); - pylonorn3.mirror = true; - setRotation(pylonorn3, 0.2617994F, 1.570796F, 0F); - pylonorn4 = new ModelRenderer(this, 18, 3); - pylonorn4.addBox(0F, -4F, 0F, 2, 3, 1); - pylonorn4.setRotationPoint(5F, 23.5F, 5F); - pylonorn4.setTextureSize(64, 32); - pylonorn4.mirror = true; - setRotation(pylonorn4, 0.2617994F, -1.570796F, 0F); + this.outerpylon = new ModelRenderer(this, 0, 0); + this.outerpylon.addBox(0F, 0F, 0F, 2, 16, 2); + this.outerpylon.setRotationPoint(5F, 8F, 5F); + this.outerpylon.setTextureSize(64, 32); + this.outerpylon.mirror = true; + this.setRotation(this.outerpylon, 0F, 0F, 0F); + this.lowerconduit = new ModelRenderer(this, 9, 0); + this.lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); + this.lowerconduit.setRotationPoint(6F, 20F, 7F); + this.lowerconduit.setTextureSize(64, 32); + this.lowerconduit.mirror = true; + this.setRotation(this.lowerconduit, 0F, 2.356194F, 0F); + this.inlower1 = new ModelRenderer(this, 9, 3); + this.inlower1.addBox(0F, 0F, 0F, 1, 1, 3); + this.inlower1.setRotationPoint(3F, 20F, 3F); + this.inlower1.setTextureSize(64, 32); + this.inlower1.mirror = true; + this.setRotation(this.inlower1, 0F, 3.141593F, 0F); + this.inlower2 = new ModelRenderer(this, 9, 11); + this.inlower2.addBox(0F, 0F, 0F, 3, 1, 1); + this.inlower2.setRotationPoint(3F, 20F, 3F); + this.inlower2.setTextureSize(64, 32); + this.inlower2.mirror = true; + this.setRotation(this.inlower2, 0F, 3.141593F, 0F); + this.upperconduit = new ModelRenderer(this, 9, 0); + this.upperconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); + this.upperconduit.setRotationPoint(6F, 11F, 7F); + this.upperconduit.setTextureSize(64, 32); + this.upperconduit.mirror = true; + this.setRotation(this.upperconduit, 0F, 2.356194F, 0F); + this.inupper2 = new ModelRenderer(this, 9, 11); + this.inupper2.addBox(0F, 0F, 0F, 3, 1, 1); + this.inupper2.setRotationPoint(3F, 11F, 3F); + this.inupper2.setTextureSize(64, 32); + this.inupper2.mirror = true; + this.setRotation(this.inupper2, 0F, 3.141593F, 0F); + this.inupper1 = new ModelRenderer(this, 9, 3); + this.inupper1.addBox(0F, 0F, 0F, 1, 1, 3); + this.inupper1.setRotationPoint(3F, 11F, 3F); + this.inupper1.setTextureSize(64, 32); + this.inupper1.mirror = true; + this.setRotation(this.inupper1, 0F, 3.141593F, 0F); + this.outuppersmooth1 = new ModelRenderer(this, 9, 8); + this.outuppersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); + this.outuppersmooth1.setRotationPoint(6F, 11F, 6F); + this.outuppersmooth1.setTextureSize(64, 32); + this.outuppersmooth1.mirror = true; + this.setRotation(this.outuppersmooth1, 0F, 2.792527F, 0F); + this.outuppersmooth2 = new ModelRenderer(this, 9, 8); + this.outuppersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); + this.outuppersmooth2.setRotationPoint(5F, 11F, 7F); + this.outuppersmooth2.setTextureSize(64, 32); + this.outuppersmooth2.mirror = true; + this.setRotation(this.outuppersmooth2, 0F, 1.919862F, 0F); + this.inuppersmooth1 = new ModelRenderer(this, 9, 14); + this.inuppersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); + this.inuppersmooth1.setRotationPoint(2F, 11F, 2F); + this.inuppersmooth1.setTextureSize(64, 32); + this.inuppersmooth1.mirror = true; + this.setRotation(this.inuppersmooth1, 0F, 0.3490659F, 0F); + this.inuppersmooth2 = new ModelRenderer(this, 9, 14); + this.inuppersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); + this.inuppersmooth2.setRotationPoint(1F, 11F, 3F); + this.inuppersmooth2.setTextureSize(64, 32); + this.inuppersmooth2.mirror = true; + this.setRotation(this.inuppersmooth2, 0F, 1.22173F, 0F); + this.outlowersmooth2 = new ModelRenderer(this, 9, 8); + this.outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); + this.outlowersmooth2.setRotationPoint(5F, 20F, 7F); + this.outlowersmooth2.setTextureSize(64, 32); + this.outlowersmooth2.mirror = true; + this.setRotation(this.outlowersmooth2, 0F, 1.919862F, 0F); + this.outlowersmooth1 = new ModelRenderer(this, 9, 8); + this.outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); + this.outlowersmooth1.setRotationPoint(6F, 20F, 6F); + this.outlowersmooth1.setTextureSize(64, 32); + this.outlowersmooth1.mirror = true; + this.setRotation(this.outlowersmooth1, 0F, 2.792527F, 0F); + this.inlowersmooth1 = new ModelRenderer(this, 9, 14); + this.inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); + this.inlowersmooth1.setRotationPoint(2F, 20F, 2F); + this.inlowersmooth1.setTextureSize(64, 32); + this.inlowersmooth1.mirror = true; + this.setRotation(this.inlowersmooth1, 0F, 0.3490659F, 0F); + this.inlowersmooth2 = new ModelRenderer(this, 9, 14); + this.inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); + this.inlowersmooth2.setRotationPoint(1F, 20F, 3F); + this.inlowersmooth2.setTextureSize(64, 32); + this.inlowersmooth2.mirror = true; + this.setRotation(this.inlowersmooth2, 0F, 1.22173F, 0F); + this.base = new ModelRenderer(this, 0, 22); + this.base.addBox(0F, 0F, 0F, 8, 2, 8); + this.base.setRotationPoint(0F, 22F, 0F); + this.base.setTextureSize(64, 32); + this.base.mirror = true; + this.setRotation(this.base, 0F, 0F, 0F); + this.baseornament = new ModelRenderer(this, 16, 14); + this.baseornament.addBox(0F, 0F, 0.2F, 2, 1, 6); + this.baseornament.setRotationPoint(-1F, 21F, 0F); + this.baseornament.setTextureSize(64, 32); + this.baseornament.mirror = true; + this.setRotation(this.baseornament, -0.1630138F, 0F, 0F); + this.pylonorn1 = new ModelRenderer(this, 18, 3); + this.pylonorn1.addBox(0F, -4F, 0F, 2, 3, 1); + this.pylonorn1.setRotationPoint(5F, 23.5F, 7F); + this.pylonorn1.setTextureSize(64, 32); + this.pylonorn1.mirror = true; + this.setRotation(this.pylonorn1, 0.2617994F, 0F, 0F); + this.pylonorn2 = new ModelRenderer(this, 18, 3); + this.pylonorn2.addBox(0F, -4F, -1F, 2, 3, 1); + this.pylonorn2.setRotationPoint(5F, 23.5F, 5F); + this.pylonorn2.setTextureSize(64, 32); + this.pylonorn2.mirror = true; + this.setRotation(this.pylonorn2, -0.2617994F, 0F, 0F); + this.pylonorn3 = new ModelRenderer(this, 18, 3); + this.pylonorn3.addBox(0F, -4F, 0F, 2, 3, 1); + this.pylonorn3.setRotationPoint(7F, 23.5F, 7F); + this.pylonorn3.setTextureSize(64, 32); + this.pylonorn3.mirror = true; + this.setRotation(this.pylonorn3, 0.2617994F, 1.570796F, 0F); + this.pylonorn4 = new ModelRenderer(this, 18, 3); + this.pylonorn4.addBox(0F, -4F, 0F, 2, 3, 1); + this.pylonorn4.setRotationPoint(5F, 23.5F, 5F); + this.pylonorn4.setTextureSize(64, 32); + this.pylonorn4.mirror = true; + this.setRotation(this.pylonorn4, 0.2617994F, -1.570796F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - outerpylon.render(f5); - lowerconduit.render(f5); - inlower1.render(f5); - inlower2.render(f5); - upperconduit.render(f5); - inupper2.render(f5); - inupper1.render(f5); - outuppersmooth1.render(f5); - outuppersmooth2.render(f5); - inuppersmooth1.render(f5); - inuppersmooth2.render(f5); - outlowersmooth2.render(f5); - outlowersmooth1.render(f5); - inlowersmooth1.render(f5); - inlowersmooth2.render(f5); - base.render(f5); - baseornament.render(f5); - pylonorn1.render(f5); - pylonorn2.render(f5); - pylonorn3.render(f5); - pylonorn4.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.outerpylon.render(f5); + this.lowerconduit.render(f5); + this.inlower1.render(f5); + this.inlower2.render(f5); + this.upperconduit.render(f5); + this.inupper2.render(f5); + this.inupper1.render(f5); + this.outuppersmooth1.render(f5); + this.outuppersmooth2.render(f5); + this.inuppersmooth1.render(f5); + this.inuppersmooth2.render(f5); + this.outlowersmooth2.render(f5); + this.outlowersmooth1.render(f5); + this.inlowersmooth1.render(f5); + this.inlowersmooth2.render(f5); + this.base.render(f5); + this.baseornament.render(f5); + this.pylonorn1.render(f5); + this.pylonorn2.render(f5); + this.pylonorn3.render(f5); + this.pylonorn4.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java index c2336a0..296d987 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java @@ -20,92 +20,92 @@ public class ModelAuraPylonTop extends ModelBase { public ModelAuraPylonTop() { - textureWidth = 32; - textureHeight = 32; + this.textureWidth = 32; + this.textureHeight = 32; - outerpylon = new ModelRenderer(this, 0, 0); - outerpylon.addBox(0F, 0F, 0F, 2, 8, 2); - outerpylon.setRotationPoint(5F, 16F, 5F); - outerpylon.setTextureSize(64, 32); - outerpylon.mirror = true; - setRotation(outerpylon, 0F, 0F, 0F); - lowerconduit = new ModelRenderer(this, 9, 0); - lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); - lowerconduit.setRotationPoint(6F, 20F, 7F); - lowerconduit.setTextureSize(64, 32); - lowerconduit.mirror = true; - setRotation(lowerconduit, 0F, 2.356194F, 0F); - inlower1 = new ModelRenderer(this, 9, 3); - inlower1.addBox(0F, 0F, 0F, 1, 1, 3); - inlower1.setRotationPoint(3F, 20F, 3F); - inlower1.setTextureSize(64, 32); - inlower1.mirror = true; - setRotation(inlower1, 0F, 3.141593F, 0F); - inlower2 = new ModelRenderer(this, 9, 11); - inlower2.addBox(0F, 0F, 0F, 3, 1, 1); - inlower2.setRotationPoint(3F, 20F, 3F); - inlower2.setTextureSize(64, 32); - inlower2.mirror = true; - setRotation(inlower2, 0F, 3.141593F, 0F); - outlowersmooth2 = new ModelRenderer(this, 9, 8); - outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); - outlowersmooth2.setRotationPoint(5F, 20F, 7F); - outlowersmooth2.setTextureSize(64, 32); - outlowersmooth2.mirror = true; - setRotation(outlowersmooth2, 0F, 1.919862F, 0F); - outlowersmooth1 = new ModelRenderer(this, 9, 8); - outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); - outlowersmooth1.setRotationPoint(6F, 20F, 6F); - outlowersmooth1.setTextureSize(64, 32); - outlowersmooth1.mirror = true; - setRotation(outlowersmooth1, 0F, 2.792527F, 0F); - inlowersmooth1 = new ModelRenderer(this, 9, 14); - inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); - inlowersmooth1.setRotationPoint(2F, 20F, 2F); - inlowersmooth1.setTextureSize(64, 32); - inlowersmooth1.mirror = true; - setRotation(inlowersmooth1, 0F, 0.3490659F, 0F); - inlowersmooth2 = new ModelRenderer(this, 9, 14); - inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); - inlowersmooth2.setRotationPoint(1F, 20F, 3F); - inlowersmooth2.setTextureSize(64, 32); - inlowersmooth2.mirror = true; - setRotation(inlowersmooth2, 0F, 1.22173F, 0F); - outerpylonmiddle1 = new ModelRenderer(this, 0, 11); - outerpylonmiddle1.addBox(0F, 0F, 0F, 2, 4, 1); - outerpylonmiddle1.setRotationPoint(5F, 12F, 5F); - outerpylonmiddle1.setTextureSize(64, 32); - outerpylonmiddle1.mirror = true; - setRotation(outerpylonmiddle1, 0F, 0F, 0F); - outerpylonmiddle2 = new ModelRenderer(this, 0, 17); - outerpylonmiddle2.addBox(0F, 0F, 0F, 1, 4, 1); - outerpylonmiddle2.setRotationPoint(5F, 12F, 6F); - outerpylonmiddle2.setTextureSize(64, 32); - outerpylonmiddle2.mirror = true; - setRotation(outerpylonmiddle2, 0F, 0F, 0F); - outerpylonupper = new ModelRenderer(this, 5, 17); - outerpylonupper.addBox(0F, 0F, 0F, 1, 4, 1); - outerpylonupper.setRotationPoint(5F, 8F, 5F); - outerpylonupper.setTextureSize(64, 32); - outerpylonupper.mirror = true; - setRotation(outerpylonupper, 0F, 0F, 0F); + this.outerpylon = new ModelRenderer(this, 0, 0); + this.outerpylon.addBox(0F, 0F, 0F, 2, 8, 2); + this.outerpylon.setRotationPoint(5F, 16F, 5F); + this.outerpylon.setTextureSize(64, 32); + this.outerpylon.mirror = true; + this.setRotation(this.outerpylon, 0F, 0F, 0F); + this.lowerconduit = new ModelRenderer(this, 9, 0); + this.lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); + this.lowerconduit.setRotationPoint(6F, 20F, 7F); + this.lowerconduit.setTextureSize(64, 32); + this.lowerconduit.mirror = true; + this.setRotation(this.lowerconduit, 0F, 2.356194F, 0F); + this.inlower1 = new ModelRenderer(this, 9, 3); + this.inlower1.addBox(0F, 0F, 0F, 1, 1, 3); + this.inlower1.setRotationPoint(3F, 20F, 3F); + this.inlower1.setTextureSize(64, 32); + this.inlower1.mirror = true; + this.setRotation(this.inlower1, 0F, 3.141593F, 0F); + this.inlower2 = new ModelRenderer(this, 9, 11); + this.inlower2.addBox(0F, 0F, 0F, 3, 1, 1); + this.inlower2.setRotationPoint(3F, 20F, 3F); + this.inlower2.setTextureSize(64, 32); + this.inlower2.mirror = true; + this.setRotation(this.inlower2, 0F, 3.141593F, 0F); + this.outlowersmooth2 = new ModelRenderer(this, 9, 8); + this.outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); + this.outlowersmooth2.setRotationPoint(5F, 20F, 7F); + this.outlowersmooth2.setTextureSize(64, 32); + this.outlowersmooth2.mirror = true; + this.setRotation(this.outlowersmooth2, 0F, 1.919862F, 0F); + this.outlowersmooth1 = new ModelRenderer(this, 9, 8); + this.outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); + this.outlowersmooth1.setRotationPoint(6F, 20F, 6F); + this.outlowersmooth1.setTextureSize(64, 32); + this.outlowersmooth1.mirror = true; + this.setRotation(this.outlowersmooth1, 0F, 2.792527F, 0F); + this.inlowersmooth1 = new ModelRenderer(this, 9, 14); + this.inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); + this.inlowersmooth1.setRotationPoint(2F, 20F, 2F); + this.inlowersmooth1.setTextureSize(64, 32); + this.inlowersmooth1.mirror = true; + this.setRotation(this.inlowersmooth1, 0F, 0.3490659F, 0F); + this.inlowersmooth2 = new ModelRenderer(this, 9, 14); + this.inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); + this.inlowersmooth2.setRotationPoint(1F, 20F, 3F); + this.inlowersmooth2.setTextureSize(64, 32); + this.inlowersmooth2.mirror = true; + this.setRotation(this.inlowersmooth2, 0F, 1.22173F, 0F); + this.outerpylonmiddle1 = new ModelRenderer(this, 0, 11); + this.outerpylonmiddle1.addBox(0F, 0F, 0F, 2, 4, 1); + this.outerpylonmiddle1.setRotationPoint(5F, 12F, 5F); + this.outerpylonmiddle1.setTextureSize(64, 32); + this.outerpylonmiddle1.mirror = true; + this.setRotation(this.outerpylonmiddle1, 0F, 0F, 0F); + this.outerpylonmiddle2 = new ModelRenderer(this, 0, 17); + this.outerpylonmiddle2.addBox(0F, 0F, 0F, 1, 4, 1); + this.outerpylonmiddle2.setRotationPoint(5F, 12F, 6F); + this.outerpylonmiddle2.setTextureSize(64, 32); + this.outerpylonmiddle2.mirror = true; + this.setRotation(this.outerpylonmiddle2, 0F, 0F, 0F); + this.outerpylonupper = new ModelRenderer(this, 5, 17); + this.outerpylonupper.addBox(0F, 0F, 0F, 1, 4, 1); + this.outerpylonupper.setRotationPoint(5F, 8F, 5F); + this.outerpylonupper.setTextureSize(64, 32); + this.outerpylonupper.mirror = true; + this.setRotation(this.outerpylonupper, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - outerpylon.render(f5); - lowerconduit.render(f5); - inlower1.render(f5); - inlower2.render(f5); - outlowersmooth2.render(f5); - outlowersmooth1.render(f5); - inlowersmooth1.render(f5); - inlowersmooth2.render(f5); - outerpylonmiddle1.render(f5); - outerpylonmiddle2.render(f5); - outerpylonupper.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.outerpylon.render(f5); + this.lowerconduit.render(f5); + this.inlower1.render(f5); + this.inlower2.render(f5); + this.outlowersmooth2.render(f5); + this.outlowersmooth1.render(f5); + this.inlowersmooth1.render(f5); + this.inlowersmooth2.render(f5); + this.outerpylonmiddle1.render(f5); + this.outerpylonmiddle2.render(f5); + this.outerpylonupper.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/makeo/gadomancy/client/models/ModelBlockProtector.java b/src/main/java/makeo/gadomancy/client/models/ModelBlockProtector.java index baae869..0cd502b 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelBlockProtector.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelBlockProtector.java @@ -29,105 +29,105 @@ public class ModelBlockProtector extends ModelBase { ModelRenderer Shape13; public ModelBlockProtector() { - textureWidth = 64; - textureHeight = 64; + this.textureWidth = 64; + this.textureHeight = 64; - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 16, 3, 16); - Shape1.setRotationPoint(-8F, 21F, -8F); - Shape1.setTextureSize(64, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 20); - Shape2.addBox(0F, 0F, 0F, 4, 1, 1); - Shape2.setRotationPoint(-2F, 20F, -8F); - Shape2.setTextureSize(64, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 11, 20); - Shape3.addBox(0F, 0F, 0F, 4, 1, 3); - Shape3.setRotationPoint(-2F, 20F, -7F); - Shape3.setTextureSize(64, 64); - Shape3.mirror = true; - setRotation(Shape3, -0.3490659F, 0F, 0F); - Shape4 = new ModelRenderer(this, 27, 20); - Shape4.addBox(0F, 0F, 0F, 4, 1, 1); - Shape4.setRotationPoint(-2F, 20F, 7F); - Shape4.setTextureSize(64, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 38, 20); - Shape5.addBox(0F, 0F, -3F, 4, 1, 3); - Shape5.setRotationPoint(-2F, 20F, 7F); - Shape5.setTextureSize(64, 64); - Shape5.mirror = true; - setRotation(Shape5, 0.3490659F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 25); - Shape6.addBox(0F, 0F, 0F, 1, 1, 4); - Shape6.setRotationPoint(-8F, 20F, -2F); - Shape6.setTextureSize(64, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 11, 25); - Shape7.addBox(0F, 0F, 0F, 3, 1, 4); - Shape7.setRotationPoint(-7F, 20F, -2F); - Shape7.setTextureSize(64, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0.3490659F); - Shape8 = new ModelRenderer(this, 38, 25); - Shape8.addBox(-3F, 0F, 0F, 3, 1, 4); - Shape8.setRotationPoint(7F, 20F, -2F); - Shape8.setTextureSize(64, 64); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, -0.3490659F); - Shape9 = new ModelRenderer(this, 27, 25); - Shape9.addBox(0F, 0F, 0F, 1, 1, 4); - Shape9.setRotationPoint(7F, 20F, -2F); - Shape9.setTextureSize(64, 64); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 0, 31); - Shape10.addBox(0F, -7F, 0F, 2, 8, 2); - Shape10.setRotationPoint(3F, 22F, 3F); - Shape10.setTextureSize(64, 64); - Shape10.mirror = true; - setRotation(Shape10, 0.3490659F, 0F, -0.3490659F); - Shape11 = new ModelRenderer(this, 10, 31); - Shape11.addBox(-2F, -7F, -2F, 2, 8, 2); - Shape11.setRotationPoint(-3F, 22F, -3F); - Shape11.setTextureSize(64, 64); - Shape11.mirror = true; - setRotation(Shape11, -0.3490659F, 0F, 0.3490659F); - Shape12 = new ModelRenderer(this, 20, 31); - Shape12.addBox(0F, -7F, -2F, 2, 8, 2); - Shape12.setRotationPoint(3F, 22F, -3F); - Shape12.setTextureSize(64, 64); - Shape12.mirror = true; - setRotation(Shape12, -0.3490659F, 0F, -0.3490659F); - Shape13 = new ModelRenderer(this, 30, 31); - Shape13.addBox(-2F, -7F, 0F, 2, 8, 2); - Shape13.setRotationPoint(-3F, 22F, 3F); - Shape13.setTextureSize(64, 64); - Shape13.mirror = true; - setRotation(Shape13, 0.3490659F, 0F, 0.3490659F); + this.Shape1 = new ModelRenderer(this, 0, 0); + this.Shape1.addBox(0F, 0F, 0F, 16, 3, 16); + this.Shape1.setRotationPoint(-8F, 21F, -8F); + this.Shape1.setTextureSize(64, 64); + this.Shape1.mirror = true; + this.setRotation(this.Shape1, 0F, 0F, 0F); + this.Shape2 = new ModelRenderer(this, 0, 20); + this.Shape2.addBox(0F, 0F, 0F, 4, 1, 1); + this.Shape2.setRotationPoint(-2F, 20F, -8F); + this.Shape2.setTextureSize(64, 64); + this.Shape2.mirror = true; + this.setRotation(this.Shape2, 0F, 0F, 0F); + this.Shape3 = new ModelRenderer(this, 11, 20); + this.Shape3.addBox(0F, 0F, 0F, 4, 1, 3); + this.Shape3.setRotationPoint(-2F, 20F, -7F); + this.Shape3.setTextureSize(64, 64); + this.Shape3.mirror = true; + this.setRotation(this.Shape3, -0.3490659F, 0F, 0F); + this.Shape4 = new ModelRenderer(this, 27, 20); + this.Shape4.addBox(0F, 0F, 0F, 4, 1, 1); + this.Shape4.setRotationPoint(-2F, 20F, 7F); + this.Shape4.setTextureSize(64, 64); + this.Shape4.mirror = true; + this.setRotation(this.Shape4, 0F, 0F, 0F); + this.Shape5 = new ModelRenderer(this, 38, 20); + this.Shape5.addBox(0F, 0F, -3F, 4, 1, 3); + this.Shape5.setRotationPoint(-2F, 20F, 7F); + this.Shape5.setTextureSize(64, 64); + this.Shape5.mirror = true; + this.setRotation(this.Shape5, 0.3490659F, 0F, 0F); + this.Shape6 = new ModelRenderer(this, 0, 25); + this.Shape6.addBox(0F, 0F, 0F, 1, 1, 4); + this.Shape6.setRotationPoint(-8F, 20F, -2F); + this.Shape6.setTextureSize(64, 64); + this.Shape6.mirror = true; + this.setRotation(this.Shape6, 0F, 0F, 0F); + this.Shape7 = new ModelRenderer(this, 11, 25); + this.Shape7.addBox(0F, 0F, 0F, 3, 1, 4); + this.Shape7.setRotationPoint(-7F, 20F, -2F); + this.Shape7.setTextureSize(64, 64); + this.Shape7.mirror = true; + this.setRotation(this.Shape7, 0F, 0F, 0.3490659F); + this.Shape8 = new ModelRenderer(this, 38, 25); + this.Shape8.addBox(-3F, 0F, 0F, 3, 1, 4); + this.Shape8.setRotationPoint(7F, 20F, -2F); + this.Shape8.setTextureSize(64, 64); + this.Shape8.mirror = true; + this.setRotation(this.Shape8, 0F, 0F, -0.3490659F); + this.Shape9 = new ModelRenderer(this, 27, 25); + this.Shape9.addBox(0F, 0F, 0F, 1, 1, 4); + this.Shape9.setRotationPoint(7F, 20F, -2F); + this.Shape9.setTextureSize(64, 64); + this.Shape9.mirror = true; + this.setRotation(this.Shape9, 0F, 0F, 0F); + this.Shape10 = new ModelRenderer(this, 0, 31); + this.Shape10.addBox(0F, -7F, 0F, 2, 8, 2); + this.Shape10.setRotationPoint(3F, 22F, 3F); + this.Shape10.setTextureSize(64, 64); + this.Shape10.mirror = true; + this.setRotation(this.Shape10, 0.3490659F, 0F, -0.3490659F); + this.Shape11 = new ModelRenderer(this, 10, 31); + this.Shape11.addBox(-2F, -7F, -2F, 2, 8, 2); + this.Shape11.setRotationPoint(-3F, 22F, -3F); + this.Shape11.setTextureSize(64, 64); + this.Shape11.mirror = true; + this.setRotation(this.Shape11, -0.3490659F, 0F, 0.3490659F); + this.Shape12 = new ModelRenderer(this, 20, 31); + this.Shape12.addBox(0F, -7F, -2F, 2, 8, 2); + this.Shape12.setRotationPoint(3F, 22F, -3F); + this.Shape12.setTextureSize(64, 64); + this.Shape12.mirror = true; + this.setRotation(this.Shape12, -0.3490659F, 0F, -0.3490659F); + this.Shape13 = new ModelRenderer(this, 30, 31); + this.Shape13.addBox(-2F, -7F, 0F, 2, 8, 2); + this.Shape13.setRotationPoint(-3F, 22F, 3F); + this.Shape13.setTextureSize(64, 64); + this.Shape13.mirror = true; + this.setRotation(this.Shape13, 0.3490659F, 0F, 0.3490659F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.Shape1.render(f5); + this.Shape2.render(f5); + this.Shape3.render(f5); + this.Shape4.render(f5); + this.Shape5.render(f5); + this.Shape6.render(f5); + this.Shape7.render(f5); + this.Shape8.render(f5); + this.Shape9.render(f5); + this.Shape10.render(f5); + this.Shape11.render(f5); + this.Shape12.render(f5); + this.Shape13.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelEssentiaCompressor.java b/src/main/java/makeo/gadomancy/client/models/ModelEssentiaCompressor.java index e258c49..81e8f9b 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelEssentiaCompressor.java @@ -42,204 +42,204 @@ public class ModelEssentiaCompressor extends ModelBase { ModelRenderer InnerPillar4; public ModelEssentiaCompressor() { - textureWidth = 128; - textureHeight = 32; + this.textureWidth = 128; + this.textureHeight = 32; - Plate1 = new ModelRenderer(this, 64, 0); - Plate1.addBox(0F, 0F, 0F, 16, 2, 16); - Plate1.setRotationPoint(-8F, 22F, -8F); - Plate1.setTextureSize(128, 32); - Plate1.mirror = true; - setRotation(Plate1, 0F, 0F, 0F); - Plate2 = new ModelRenderer(this, 4, 0); - Plate2.addBox(0F, 0F, 0F, 14, 2, 14); - Plate2.setRotationPoint(-7F, 20F, -7F); - Plate2.setTextureSize(128, 32); - Plate2.mirror = true; - setRotation(Plate2, 0F, 0F, 0F); - Plate3 = new ModelRenderer(this, 4, 16); - Plate3.addBox(0F, 0F, 0F, 12, 3, 12); - Plate3.setRotationPoint(-6F, 17F, -6F); - Plate3.setTextureSize(128, 32); - Plate3.mirror = true; - setRotation(Plate3, 0F, 0F, 0F); - EdgePillar1 = new ModelRenderer(this, 0, 0); - EdgePillar1.addBox(0F, 0F, 0F, 1, 22, 1); - EdgePillar1.setRotationPoint(-8F, 0F, -8F); - EdgePillar1.setTextureSize(128, 32); - EdgePillar1.mirror = true; - setRotation(EdgePillar1, 0F, 0F, 0F); - EdgePillar2 = new ModelRenderer(this, 0, 0); - EdgePillar2.addBox(0F, 0F, 0F, 1, 22, 1); - EdgePillar2.setRotationPoint(7F, 0F, -8F); - EdgePillar2.setTextureSize(128, 32); - EdgePillar2.mirror = true; - setRotation(EdgePillar2, 0F, 0F, 0F); - EdgePillar3 = new ModelRenderer(this, 0, 0); - EdgePillar3.addBox(0F, 0F, 0F, 1, 22, 1); - EdgePillar3.setRotationPoint(7F, 0F, 7F); - EdgePillar3.setTextureSize(128, 32); - EdgePillar3.mirror = true; - setRotation(EdgePillar3, 0F, 0F, 0F); - EdgePillar4 = new ModelRenderer(this, 0, 0); - EdgePillar4.addBox(0F, 0F, 0F, 1, 22, 1); - EdgePillar4.setRotationPoint(-8F, 0F, 7F); - EdgePillar4.setTextureSize(128, 32); - EdgePillar4.mirror = true; - setRotation(EdgePillar4, 0F, 0F, 0F); - InnerLL1 = new ModelRenderer(this, 100, 18); - InnerLL1.addBox(0F, 0F, 0F, 2, 3, 10); - InnerLL1.setRotationPoint(-5F, 14F, -5F); - InnerLL1.setTextureSize(128, 32); - InnerLL1.mirror = true; - setRotation(InnerLL1, 0F, 0F, 0F); - InnerLL2 = new ModelRenderer(this, 100, 18); - InnerLL2.addBox(0F, 0F, 0F, 2, 3, 10); - InnerLL2.setRotationPoint(3F, 14F, -5F); - InnerLL2.setTextureSize(128, 32); - InnerLL2.mirror = true; - setRotation(InnerLL2, 0F, 0F, 0F); - InnerLSh1 = new ModelRenderer(this, 84, 18); - InnerLSh1.addBox(0F, 0F, 0F, 6, 3, 2); - InnerLSh1.setRotationPoint(-3F, 14F, -5F); - InnerLSh1.setTextureSize(128, 32); - InnerLSh1.mirror = true; - setRotation(InnerLSh1, 0F, 0F, 0F); - InnerLSH2 = new ModelRenderer(this, 84, 18); - InnerLSH2.addBox(0F, 0F, 0F, 6, 3, 2); - InnerLSH2.setRotationPoint(-3F, 14F, 3F); - InnerLSH2.setTextureSize(128, 32); - InnerLSH2.mirror = true; - setRotation(InnerLSH2, 0F, 0F, 0F); - InnerUp1 = new ModelRenderer(this, 64, 18); - InnerUp1.addBox(0F, 0F, 0F, 1, 2, 6); - InnerUp1.setRotationPoint(-5F, 12F, -3F); - InnerUp1.setTextureSize(128, 32); - InnerUp1.mirror = true; - setRotation(InnerUp1, 0F, 0F, 0F); - InnerUp2 = new ModelRenderer(this, 64, 18); - InnerUp2.addBox(0F, 0F, 0F, 1, 2, 6); - InnerUp2.setRotationPoint(4F, 12F, -3F); - InnerUp2.setTextureSize(128, 32); - InnerUp2.mirror = true; - setRotation(InnerUp2, 0F, 0F, 0F); - InnerUp3 = new ModelRenderer(this, 64, 18); - InnerUp3.addBox(0F, 0F, 0F, 6, 2, 1); - InnerUp3.setRotationPoint(-3F, 12F, 4F); - InnerUp3.setTextureSize(128, 32); - InnerUp3.mirror = true; - setRotation(InnerUp3, 0F, 0F, 0F); - InnerUp4 = new ModelRenderer(this, 64, 18); - InnerUp4.addBox(0F, 0F, 0F, 6, 2, 1); - InnerUp4.setRotationPoint(-3F, 12F, -5F); - InnerUp4.setTextureSize(128, 32); - InnerUp4.mirror = true; - setRotation(InnerUp4, 0F, 0F, 0F); - InnerEdgePiece1 = new ModelRenderer(this, 52, 18); - InnerEdgePiece1.addBox(0F, 0F, 0F, 2, 5, 2); - InnerEdgePiece1.setRotationPoint(3F, 9F, -5F); - InnerEdgePiece1.setTextureSize(128, 32); - InnerEdgePiece1.mirror = true; - setRotation(InnerEdgePiece1, 0F, 0F, 0F); - InnerEdgePiece2 = new ModelRenderer(this, 52, 18); - InnerEdgePiece2.addBox(0F, 0F, 0F, 2, 5, 2); - InnerEdgePiece2.setRotationPoint(3F, 9F, 3F); - InnerEdgePiece2.setTextureSize(128, 32); - InnerEdgePiece2.mirror = true; - setRotation(InnerEdgePiece2, 0F, 0F, 0F); - InnerEdgePiece3 = new ModelRenderer(this, 52, 18); - InnerEdgePiece3.addBox(0F, 0F, 0F, 2, 5, 2); - InnerEdgePiece3.setRotationPoint(-5F, 9F, 3F); - InnerEdgePiece3.setTextureSize(128, 32); - InnerEdgePiece3.mirror = true; - setRotation(InnerEdgePiece3, 0F, 0F, 0F); - InnerEdgePiece4 = new ModelRenderer(this, 52, 18); - InnerEdgePiece4.addBox(0F, 0F, 0F, 2, 5, 2); - InnerEdgePiece4.setRotationPoint(-5F, 9F, -5F); - InnerEdgePiece4.setTextureSize(128, 32); - InnerEdgePiece4.mirror = true; - setRotation(InnerEdgePiece4, 0F, 0F, 0F); - InnerPeak1 = new ModelRenderer(this, 124, 18); - InnerPeak1.addBox(0F, 0F, 0F, 1, 5, 1); - InnerPeak1.setRotationPoint(-5F, 4F, -5F); - InnerPeak1.setTextureSize(128, 32); - InnerPeak1.mirror = true; - setRotation(InnerPeak1, 0F, 0F, 0F); - InnerPeak2 = new ModelRenderer(this, 124, 18); - InnerPeak2.addBox(0F, 0F, 0F, 1, 5, 1); - InnerPeak2.setRotationPoint(-5F, 4F, 4F); - InnerPeak2.setTextureSize(128, 32); - InnerPeak2.mirror = true; - setRotation(InnerPeak2, 0F, 0F, 0F); - InnerPeak3 = new ModelRenderer(this, 124, 18); - InnerPeak3.addBox(0F, 0F, 0F, 1, 5, 1); - InnerPeak3.setRotationPoint(4F, 4F, -5F); - InnerPeak3.setTextureSize(128, 32); - InnerPeak3.mirror = true; - setRotation(InnerPeak3, 0F, 0F, 0F); - InnerPeak4 = new ModelRenderer(this, 124, 18); - InnerPeak4.addBox(0F, 0F, 0F, 1, 5, 1); - InnerPeak4.setRotationPoint(4F, 4F, 4F); - InnerPeak4.setTextureSize(128, 32); - InnerPeak4.mirror = true; - setRotation(InnerPeak4, 0F, 0F, 0F); - InnerPillar1 = new ModelRenderer(this, 0, 0); - InnerPillar1.addBox(0F, 0F, 0F, 1, 17, 1); - InnerPillar1.setRotationPoint(5F, 0F, 5F); - InnerPillar1.setTextureSize(128, 32); - InnerPillar1.mirror = true; - setRotation(InnerPillar1, 0F, 0F, 0F); - InnerPillar2 = new ModelRenderer(this, 0, 0); - InnerPillar2.addBox(0F, 0F, 0F, 1, 17, 1); - InnerPillar2.setRotationPoint(5F, 0F, -6F); - InnerPillar2.setTextureSize(128, 32); - InnerPillar2.mirror = true; - setRotation(InnerPillar2, 0F, 0F, 0F); - InnerPillar3 = new ModelRenderer(this, 0, 0); - InnerPillar3.addBox(0F, 0F, 0F, 1, 17, 1); - InnerPillar3.setRotationPoint(-6F, 0F, -6F); - InnerPillar3.setTextureSize(128, 32); - InnerPillar3.mirror = true; - setRotation(InnerPillar3, 0F, 0F, 0F); - InnerPillar4 = new ModelRenderer(this, 0, 0); - InnerPillar4.addBox(0F, 0F, 0F, 1, 17, 1); - InnerPillar4.setRotationPoint(-6F, 0F, 5F); - InnerPillar4.setTextureSize(128, 32); - InnerPillar4.mirror = true; - setRotation(InnerPillar4, 0F, 0F, 0F); + this.Plate1 = new ModelRenderer(this, 64, 0); + this.Plate1.addBox(0F, 0F, 0F, 16, 2, 16); + this.Plate1.setRotationPoint(-8F, 22F, -8F); + this.Plate1.setTextureSize(128, 32); + this.Plate1.mirror = true; + this.setRotation(this.Plate1, 0F, 0F, 0F); + this.Plate2 = new ModelRenderer(this, 4, 0); + this.Plate2.addBox(0F, 0F, 0F, 14, 2, 14); + this.Plate2.setRotationPoint(-7F, 20F, -7F); + this.Plate2.setTextureSize(128, 32); + this.Plate2.mirror = true; + this.setRotation(this.Plate2, 0F, 0F, 0F); + this.Plate3 = new ModelRenderer(this, 4, 16); + this.Plate3.addBox(0F, 0F, 0F, 12, 3, 12); + this.Plate3.setRotationPoint(-6F, 17F, -6F); + this.Plate3.setTextureSize(128, 32); + this.Plate3.mirror = true; + this.setRotation(this.Plate3, 0F, 0F, 0F); + this.EdgePillar1 = new ModelRenderer(this, 0, 0); + this.EdgePillar1.addBox(0F, 0F, 0F, 1, 22, 1); + this.EdgePillar1.setRotationPoint(-8F, 0F, -8F); + this.EdgePillar1.setTextureSize(128, 32); + this.EdgePillar1.mirror = true; + this.setRotation(this.EdgePillar1, 0F, 0F, 0F); + this.EdgePillar2 = new ModelRenderer(this, 0, 0); + this.EdgePillar2.addBox(0F, 0F, 0F, 1, 22, 1); + this.EdgePillar2.setRotationPoint(7F, 0F, -8F); + this.EdgePillar2.setTextureSize(128, 32); + this.EdgePillar2.mirror = true; + this.setRotation(this.EdgePillar2, 0F, 0F, 0F); + this.EdgePillar3 = new ModelRenderer(this, 0, 0); + this.EdgePillar3.addBox(0F, 0F, 0F, 1, 22, 1); + this.EdgePillar3.setRotationPoint(7F, 0F, 7F); + this.EdgePillar3.setTextureSize(128, 32); + this.EdgePillar3.mirror = true; + this.setRotation(this.EdgePillar3, 0F, 0F, 0F); + this.EdgePillar4 = new ModelRenderer(this, 0, 0); + this.EdgePillar4.addBox(0F, 0F, 0F, 1, 22, 1); + this.EdgePillar4.setRotationPoint(-8F, 0F, 7F); + this.EdgePillar4.setTextureSize(128, 32); + this.EdgePillar4.mirror = true; + this.setRotation(this.EdgePillar4, 0F, 0F, 0F); + this.InnerLL1 = new ModelRenderer(this, 100, 18); + this.InnerLL1.addBox(0F, 0F, 0F, 2, 3, 10); + this.InnerLL1.setRotationPoint(-5F, 14F, -5F); + this.InnerLL1.setTextureSize(128, 32); + this.InnerLL1.mirror = true; + this.setRotation(this.InnerLL1, 0F, 0F, 0F); + this.InnerLL2 = new ModelRenderer(this, 100, 18); + this.InnerLL2.addBox(0F, 0F, 0F, 2, 3, 10); + this.InnerLL2.setRotationPoint(3F, 14F, -5F); + this.InnerLL2.setTextureSize(128, 32); + this.InnerLL2.mirror = true; + this.setRotation(this.InnerLL2, 0F, 0F, 0F); + this.InnerLSh1 = new ModelRenderer(this, 84, 18); + this.InnerLSh1.addBox(0F, 0F, 0F, 6, 3, 2); + this.InnerLSh1.setRotationPoint(-3F, 14F, -5F); + this.InnerLSh1.setTextureSize(128, 32); + this.InnerLSh1.mirror = true; + this.setRotation(this.InnerLSh1, 0F, 0F, 0F); + this.InnerLSH2 = new ModelRenderer(this, 84, 18); + this.InnerLSH2.addBox(0F, 0F, 0F, 6, 3, 2); + this.InnerLSH2.setRotationPoint(-3F, 14F, 3F); + this.InnerLSH2.setTextureSize(128, 32); + this.InnerLSH2.mirror = true; + this.setRotation(this.InnerLSH2, 0F, 0F, 0F); + this.InnerUp1 = new ModelRenderer(this, 64, 18); + this.InnerUp1.addBox(0F, 0F, 0F, 1, 2, 6); + this.InnerUp1.setRotationPoint(-5F, 12F, -3F); + this.InnerUp1.setTextureSize(128, 32); + this.InnerUp1.mirror = true; + this.setRotation(this.InnerUp1, 0F, 0F, 0F); + this.InnerUp2 = new ModelRenderer(this, 64, 18); + this.InnerUp2.addBox(0F, 0F, 0F, 1, 2, 6); + this.InnerUp2.setRotationPoint(4F, 12F, -3F); + this.InnerUp2.setTextureSize(128, 32); + this.InnerUp2.mirror = true; + this.setRotation(this.InnerUp2, 0F, 0F, 0F); + this.InnerUp3 = new ModelRenderer(this, 64, 18); + this.InnerUp3.addBox(0F, 0F, 0F, 6, 2, 1); + this.InnerUp3.setRotationPoint(-3F, 12F, 4F); + this.InnerUp3.setTextureSize(128, 32); + this.InnerUp3.mirror = true; + this.setRotation(this.InnerUp3, 0F, 0F, 0F); + this.InnerUp4 = new ModelRenderer(this, 64, 18); + this.InnerUp4.addBox(0F, 0F, 0F, 6, 2, 1); + this.InnerUp4.setRotationPoint(-3F, 12F, -5F); + this.InnerUp4.setTextureSize(128, 32); + this.InnerUp4.mirror = true; + this.setRotation(this.InnerUp4, 0F, 0F, 0F); + this.InnerEdgePiece1 = new ModelRenderer(this, 52, 18); + this.InnerEdgePiece1.addBox(0F, 0F, 0F, 2, 5, 2); + this.InnerEdgePiece1.setRotationPoint(3F, 9F, -5F); + this.InnerEdgePiece1.setTextureSize(128, 32); + this.InnerEdgePiece1.mirror = true; + this.setRotation(this.InnerEdgePiece1, 0F, 0F, 0F); + this.InnerEdgePiece2 = new ModelRenderer(this, 52, 18); + this.InnerEdgePiece2.addBox(0F, 0F, 0F, 2, 5, 2); + this.InnerEdgePiece2.setRotationPoint(3F, 9F, 3F); + this.InnerEdgePiece2.setTextureSize(128, 32); + this.InnerEdgePiece2.mirror = true; + this.setRotation(this.InnerEdgePiece2, 0F, 0F, 0F); + this.InnerEdgePiece3 = new ModelRenderer(this, 52, 18); + this.InnerEdgePiece3.addBox(0F, 0F, 0F, 2, 5, 2); + this.InnerEdgePiece3.setRotationPoint(-5F, 9F, 3F); + this.InnerEdgePiece3.setTextureSize(128, 32); + this.InnerEdgePiece3.mirror = true; + this.setRotation(this.InnerEdgePiece3, 0F, 0F, 0F); + this.InnerEdgePiece4 = new ModelRenderer(this, 52, 18); + this.InnerEdgePiece4.addBox(0F, 0F, 0F, 2, 5, 2); + this.InnerEdgePiece4.setRotationPoint(-5F, 9F, -5F); + this.InnerEdgePiece4.setTextureSize(128, 32); + this.InnerEdgePiece4.mirror = true; + this.setRotation(this.InnerEdgePiece4, 0F, 0F, 0F); + this.InnerPeak1 = new ModelRenderer(this, 124, 18); + this.InnerPeak1.addBox(0F, 0F, 0F, 1, 5, 1); + this.InnerPeak1.setRotationPoint(-5F, 4F, -5F); + this.InnerPeak1.setTextureSize(128, 32); + this.InnerPeak1.mirror = true; + this.setRotation(this.InnerPeak1, 0F, 0F, 0F); + this.InnerPeak2 = new ModelRenderer(this, 124, 18); + this.InnerPeak2.addBox(0F, 0F, 0F, 1, 5, 1); + this.InnerPeak2.setRotationPoint(-5F, 4F, 4F); + this.InnerPeak2.setTextureSize(128, 32); + this.InnerPeak2.mirror = true; + this.setRotation(this.InnerPeak2, 0F, 0F, 0F); + this.InnerPeak3 = new ModelRenderer(this, 124, 18); + this.InnerPeak3.addBox(0F, 0F, 0F, 1, 5, 1); + this.InnerPeak3.setRotationPoint(4F, 4F, -5F); + this.InnerPeak3.setTextureSize(128, 32); + this.InnerPeak3.mirror = true; + this.setRotation(this.InnerPeak3, 0F, 0F, 0F); + this.InnerPeak4 = new ModelRenderer(this, 124, 18); + this.InnerPeak4.addBox(0F, 0F, 0F, 1, 5, 1); + this.InnerPeak4.setRotationPoint(4F, 4F, 4F); + this.InnerPeak4.setTextureSize(128, 32); + this.InnerPeak4.mirror = true; + this.setRotation(this.InnerPeak4, 0F, 0F, 0F); + this.InnerPillar1 = new ModelRenderer(this, 0, 0); + this.InnerPillar1.addBox(0F, 0F, 0F, 1, 17, 1); + this.InnerPillar1.setRotationPoint(5F, 0F, 5F); + this.InnerPillar1.setTextureSize(128, 32); + this.InnerPillar1.mirror = true; + this.setRotation(this.InnerPillar1, 0F, 0F, 0F); + this.InnerPillar2 = new ModelRenderer(this, 0, 0); + this.InnerPillar2.addBox(0F, 0F, 0F, 1, 17, 1); + this.InnerPillar2.setRotationPoint(5F, 0F, -6F); + this.InnerPillar2.setTextureSize(128, 32); + this.InnerPillar2.mirror = true; + this.setRotation(this.InnerPillar2, 0F, 0F, 0F); + this.InnerPillar3 = new ModelRenderer(this, 0, 0); + this.InnerPillar3.addBox(0F, 0F, 0F, 1, 17, 1); + this.InnerPillar3.setRotationPoint(-6F, 0F, -6F); + this.InnerPillar3.setTextureSize(128, 32); + this.InnerPillar3.mirror = true; + this.setRotation(this.InnerPillar3, 0F, 0F, 0F); + this.InnerPillar4 = new ModelRenderer(this, 0, 0); + this.InnerPillar4.addBox(0F, 0F, 0F, 1, 17, 1); + this.InnerPillar4.setRotationPoint(-6F, 0F, 5F); + this.InnerPillar4.setTextureSize(128, 32); + this.InnerPillar4.mirror = true; + this.setRotation(this.InnerPillar4, 0F, 0F, 0F); } @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - Plate1.render(f5); - Plate2.render(f5); - Plate3.render(f5); - EdgePillar1.render(f5); - EdgePillar2.render(f5); - EdgePillar3.render(f5); - EdgePillar4.render(f5); - InnerLL1.render(f5); - InnerLL2.render(f5); - InnerLSh1.render(f5); - InnerLSH2.render(f5); - InnerUp1.render(f5); - InnerUp2.render(f5); - InnerUp3.render(f5); - InnerUp4.render(f5); - InnerEdgePiece1.render(f5); - InnerEdgePiece2.render(f5); - InnerEdgePiece3.render(f5); - InnerEdgePiece4.render(f5); - InnerPeak1.render(f5); - InnerPeak2.render(f5); - InnerPeak3.render(f5); - InnerPeak4.render(f5); - InnerPillar1.render(f5); - InnerPillar2.render(f5); - InnerPillar3.render(f5); - InnerPillar4.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.Plate1.render(f5); + this.Plate2.render(f5); + this.Plate3.render(f5); + this.EdgePillar1.render(f5); + this.EdgePillar2.render(f5); + this.EdgePillar3.render(f5); + this.EdgePillar4.render(f5); + this.InnerLL1.render(f5); + this.InnerLL2.render(f5); + this.InnerLSh1.render(f5); + this.InnerLSH2.render(f5); + this.InnerUp1.render(f5); + this.InnerUp2.render(f5); + this.InnerUp3.render(f5); + this.InnerUp4.render(f5); + this.InnerEdgePiece1.render(f5); + this.InnerEdgePiece2.render(f5); + this.InnerEdgePiece3.render(f5); + this.InnerEdgePiece4.render(f5); + this.InnerPeak1.render(f5); + this.InnerPeak2.render(f5); + this.InnerPeak3.render(f5); + this.InnerPeak4.render(f5); + this.InnerPillar1.render(f5); + this.InnerPillar2.render(f5); + this.InnerPillar3.render(f5); + this.InnerPillar4.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelFocusPortalPart.java b/src/main/java/makeo/gadomancy/client/models/ModelFocusPortalPart.java index 08e49e5..2ff6893 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelFocusPortalPart.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelFocusPortalPart.java @@ -21,48 +21,48 @@ public class ModelFocusPortalPart extends ModelBase { ModelRenderer shape5; public ModelFocusPortalPart() { - textureWidth = 32; - textureHeight = 32; + this.textureWidth = 32; + this.textureHeight = 32; - shape1 = new ModelRenderer(this, 0, 3); - shape1.addBox(-1F, -2F, 0.41F, 2, 5, 1); - shape1.setRotationPoint(0F, 20F, 3.533333F); - shape1.setTextureSize(64, 32); - shape1.mirror = true; - setRotation(shape1, 0F, 0F, 0F); - shape2 = new ModelRenderer(this, 0, 0); - shape2.addBox(-1F, -1F, 0F, 2, 2, 1); - shape2.setRotationPoint(0F, 23F, 3.5F); - shape2.setTextureSize(64, 32); - shape2.mirror = true; - setRotation(shape2, -0.7853982F, 0F, 0F); - shape3 = new ModelRenderer(this, 0, 12); - shape3.addBox(0F, 0F, 0F, 2, 2, 1); - shape3.setRotationPoint(-1F, 21F, 2.5F); - shape3.setTextureSize(64, 32); - shape3.mirror = true; - setRotation(shape3, 0.7853982F, 0F, 0F); - shape4 = new ModelRenderer(this, 0, 9); - shape4.addBox(0F, 0F, 0F, 2, 2, 1); - shape4.setRotationPoint(-1F, 19F, 2.5F); - shape4.setTextureSize(64, 32); - shape4.mirror = true; - setRotation(shape4, 0.7853982F, 0F, 0F); - shape5 = new ModelRenderer(this, 6, 0); - shape5.addBox(0F, -1F, 0.03F, 2, 4, 1); - shape5.setRotationPoint(-1F, 18F, 3.5F); - shape5.setTextureSize(64, 32); - shape5.mirror = true; - setRotation(shape5, 0.7853982F, 0F, 0F); + this.shape1 = new ModelRenderer(this, 0, 3); + this.shape1.addBox(-1F, -2F, 0.41F, 2, 5, 1); + this.shape1.setRotationPoint(0F, 20F, 3.533333F); + this.shape1.setTextureSize(64, 32); + this.shape1.mirror = true; + this.setRotation(this.shape1, 0F, 0F, 0F); + this.shape2 = new ModelRenderer(this, 0, 0); + this.shape2.addBox(-1F, -1F, 0F, 2, 2, 1); + this.shape2.setRotationPoint(0F, 23F, 3.5F); + this.shape2.setTextureSize(64, 32); + this.shape2.mirror = true; + this.setRotation(this.shape2, -0.7853982F, 0F, 0F); + this.shape3 = new ModelRenderer(this, 0, 12); + this.shape3.addBox(0F, 0F, 0F, 2, 2, 1); + this.shape3.setRotationPoint(-1F, 21F, 2.5F); + this.shape3.setTextureSize(64, 32); + this.shape3.mirror = true; + this.setRotation(this.shape3, 0.7853982F, 0F, 0F); + this.shape4 = new ModelRenderer(this, 0, 9); + this.shape4.addBox(0F, 0F, 0F, 2, 2, 1); + this.shape4.setRotationPoint(-1F, 19F, 2.5F); + this.shape4.setTextureSize(64, 32); + this.shape4.mirror = true; + this.setRotation(this.shape4, 0.7853982F, 0F, 0F); + this.shape5 = new ModelRenderer(this, 6, 0); + this.shape5.addBox(0F, -1F, 0.03F, 2, 4, 1); + this.shape5.setRotationPoint(-1F, 18F, 3.5F); + this.shape5.setTextureSize(64, 32); + this.shape5.mirror = true; + this.setRotation(this.shape5, 0.7853982F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - shape1.render(f5); - shape2.render(f5); - shape3.render(f5); - shape4.render(f5); - shape5.render(f5); + this.shape1.render(f5); + this.shape2.render(f5); + this.shape3.render(f5); + this.shape4.render(f5); + this.shape5.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelInfusionClawPart.java b/src/main/java/makeo/gadomancy/client/models/ModelInfusionClawPart.java index 49661aa..c6188ff 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelInfusionClawPart.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelInfusionClawPart.java @@ -17,21 +17,21 @@ public class ModelInfusionClawPart extends ModelBase { ModelRenderer shape1; public ModelInfusionClawPart(int num) { - textureWidth = 32; - textureHeight = 64; + this.textureWidth = 32; + this.textureHeight = 64; - shape1 = new ModelRenderer(this, 0, 8*num); - shape1.addBox(-3F, -1F, -3F, 6, 2, 6); - shape1.setRotationPoint(0F, 0F, 0F); - shape1.setTextureSize(32, 64); - shape1.mirror = true; - setRotation(shape1, 0F, 0F, 0F); + this.shape1 = new ModelRenderer(this, 0, 8*num); + this.shape1.addBox(-3F, -1F, -3F, 6, 2, 6); + this.shape1.setRotationPoint(0F, 0F, 0F); + this.shape1.setTextureSize(32, 64); + this.shape1.mirror = true; + this.setRotation(this.shape1, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - shape1.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.shape1.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelJarPot.java b/src/main/java/makeo/gadomancy/client/models/ModelJarPot.java index 6ca7a51..012701e 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelJarPot.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelJarPot.java @@ -21,49 +21,49 @@ public class ModelJarPot extends ModelBase { ModelRenderer shape5; public ModelJarPot() { - textureWidth = 32; - textureHeight = 64; + this.textureWidth = 32; + this.textureHeight = 64; - shape1 = new ModelRenderer(this, 0, 0); - shape1.addBox(0F, 0F, 0F, 10, 0, 10); - shape1.setRotationPoint(-5F, 24F, -5F); - shape1.setTextureSize(32, 64); - shape1.mirror = true; - setRotation(shape1, 0F, 0F, 0F); - shape2 = new ModelRenderer(this, 0, 28); - shape2.addBox(0F, 0F, 0F, 1, 6, 12); - shape2.setRotationPoint(-6F, 18F, -6F); - shape2.setTextureSize(32, 64); - shape2.mirror = true; - setRotation(shape2, 0F, 0F, 0F); - shape3 = new ModelRenderer(this, 0, 10); - shape3.addBox(0F, 0F, 0F, 1, 6, 12); - shape3.setRotationPoint(5F, 18F, -6F); - shape3.setTextureSize(32, 64); - shape3.mirror = true; - setRotation(shape3, 0F, 0F, 0F); - shape4 = new ModelRenderer(this, 0, 53); - shape4.addBox(0F, 0F, 0F, 10, 6, 1); - shape4.setRotationPoint(-5F, 18F, 5F); - shape4.setTextureSize(32, 64); - shape4.mirror = true; - setRotation(shape4, 0F, 0F, 0F); - shape5 = new ModelRenderer(this, 0, 46); - shape5.addBox(0F, 0F, 0F, 10, 6, 1); - shape5.setRotationPoint(-5F, 18F, -6F); - shape5.setTextureSize(32, 64); - shape5.mirror = true; - setRotation(shape5, 0F, 0F, 0F); + this.shape1 = new ModelRenderer(this, 0, 0); + this.shape1.addBox(0F, 0F, 0F, 10, 0, 10); + this.shape1.setRotationPoint(-5F, 24F, -5F); + this.shape1.setTextureSize(32, 64); + this.shape1.mirror = true; + this.setRotation(this.shape1, 0F, 0F, 0F); + this.shape2 = new ModelRenderer(this, 0, 28); + this.shape2.addBox(0F, 0F, 0F, 1, 6, 12); + this.shape2.setRotationPoint(-6F, 18F, -6F); + this.shape2.setTextureSize(32, 64); + this.shape2.mirror = true; + this.setRotation(this.shape2, 0F, 0F, 0F); + this.shape3 = new ModelRenderer(this, 0, 10); + this.shape3.addBox(0F, 0F, 0F, 1, 6, 12); + this.shape3.setRotationPoint(5F, 18F, -6F); + this.shape3.setTextureSize(32, 64); + this.shape3.mirror = true; + this.setRotation(this.shape3, 0F, 0F, 0F); + this.shape4 = new ModelRenderer(this, 0, 53); + this.shape4.addBox(0F, 0F, 0F, 10, 6, 1); + this.shape4.setRotationPoint(-5F, 18F, 5F); + this.shape4.setTextureSize(32, 64); + this.shape4.mirror = true; + this.setRotation(this.shape4, 0F, 0F, 0F); + this.shape5 = new ModelRenderer(this, 0, 46); + this.shape5.addBox(0F, 0F, 0F, 10, 6, 1); + this.shape5.setRotationPoint(-5F, 18F, -6F); + this.shape5.setTextureSize(32, 64); + this.shape5.mirror = true; + this.setRotation(this.shape5, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - shape1.render(f5); - shape2.render(f5); - shape3.render(f5); - shape4.render(f5); - shape5.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.shape1.render(f5); + this.shape2.render(f5); + this.shape3.render(f5); + this.shape4.render(f5); + this.shape5.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelManipulatorPart.java b/src/main/java/makeo/gadomancy/client/models/ModelManipulatorPart.java index d27cf2d..5e977a5 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelManipulatorPart.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelManipulatorPart.java @@ -20,42 +20,42 @@ public class ModelManipulatorPart extends ModelBase { ModelRenderer shape5; public ModelManipulatorPart() { - textureWidth = 8; - textureHeight = 16; + this.textureWidth = 8; + this.textureHeight = 16; - shape2 = new ModelRenderer(this, 0, 5); - shape2.addBox(-1F, -2F, 0.41F, 2, 2, 1); - shape2.setRotationPoint(0F, 22F, 4F); - shape2.setTextureSize(8, 16); - shape2.mirror = true; - setRotation(shape2, 0F, 0F, 0F); - shape3 = new ModelRenderer(this, 0, 8); - shape3.addBox(-1F, -3.4F, 1F, 2, 2, 1); - shape3.setRotationPoint(0F, 22F, 4F); - shape3.setTextureSize(8, 16); - shape3.mirror = true; - setRotation(shape3, 0.3490659F, 0F, 0F); - shape4 = new ModelRenderer(this, 0, 0); - shape4.addBox(-1F, -1F, 0F, 2, 4, 1); - shape4.setRotationPoint(0F, 22F, 4F); - shape4.setTextureSize(8, 16); - shape4.mirror = true; - setRotation(shape4, -0.7853982F, 0F, 0F); - shape5 = new ModelRenderer(this, 0, 11); - shape5.addBox(-1F, -4.25F, 2.24F, 2, 2, 1); - shape5.setRotationPoint(0F, 22F, 4F); - shape5.setTextureSize(8, 16); - shape5.mirror = true; - setRotation(shape5, 0.7853982F, 0F, 0F); + this.shape2 = new ModelRenderer(this, 0, 5); + this.shape2.addBox(-1F, -2F, 0.41F, 2, 2, 1); + this.shape2.setRotationPoint(0F, 22F, 4F); + this.shape2.setTextureSize(8, 16); + this.shape2.mirror = true; + this.setRotation(this.shape2, 0F, 0F, 0F); + this.shape3 = new ModelRenderer(this, 0, 8); + this.shape3.addBox(-1F, -3.4F, 1F, 2, 2, 1); + this.shape3.setRotationPoint(0F, 22F, 4F); + this.shape3.setTextureSize(8, 16); + this.shape3.mirror = true; + this.setRotation(this.shape3, 0.3490659F, 0F, 0F); + this.shape4 = new ModelRenderer(this, 0, 0); + this.shape4.addBox(-1F, -1F, 0F, 2, 4, 1); + this.shape4.setRotationPoint(0F, 22F, 4F); + this.shape4.setTextureSize(8, 16); + this.shape4.mirror = true; + this.setRotation(this.shape4, -0.7853982F, 0F, 0F); + this.shape5 = new ModelRenderer(this, 0, 11); + this.shape5.addBox(-1F, -4.25F, 2.24F, 2, 2, 1); + this.shape5.setRotationPoint(0F, 22F, 4F); + this.shape5.setTextureSize(8, 16); + this.shape5.mirror = true; + this.setRotation(this.shape5, 0.7853982F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - shape2.render(f5); - shape3.render(f5); - shape4.render(f5); - shape5.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.shape2.render(f5); + this.shape3.render(f5); + this.shape4.render(f5); + this.shape5.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java b/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java index d61cf7d..f5d3ebc 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelPackagerPiston.java @@ -18,26 +18,26 @@ public class ModelPackagerPiston extends ModelBase { public ModelPackagerPiston(boolean cut) { - textureWidth = 64; - textureHeight = 32; + this.textureWidth = 64; + this.textureHeight = 32; - shape1 = new ModelRenderer(this, 0, 0); - shape1.addBox(0F, 0F, 0F, 10, 2, 10); - shape1.setRotationPoint(-5F, 16F, -5F); - shape1.setTextureSize(64, 32); - shape1.mirror = true; + this.shape1 = new ModelRenderer(this, 0, 0); + this.shape1.addBox(0F, 0F, 0F, 10, 2, 10); + this.shape1.setRotationPoint(-5F, 16F, -5F); + this.shape1.setTextureSize(64, 32); + this.shape1.mirror = true; - shape2 = new ModelRenderer(this, 41, cut ? 1 : 0); - shape2.addBox(0F, 0F, 0F, 4, 4, 4); - shape2.setRotationPoint(-2F, cut ? 13F : 12F, -2F); - shape2.setTextureSize(64, 32); - shape2.mirror = true; + this.shape2 = new ModelRenderer(this, 41, cut ? 1 : 0); + this.shape2.addBox(0F, 0F, 0F, 4, 4, 4); + this.shape2.setRotationPoint(-2F, cut ? 13F : 12F, -2F); + this.shape2.setTextureSize(64, 32); + this.shape2.mirror = true; } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - shape1.render(f5); - shape2.render(f5); + this.shape1.render(f5); + this.shape2.render(f5); } } diff --git a/src/main/java/makeo/gadomancy/client/models/ModelPackedCompressorBlock.java b/src/main/java/makeo/gadomancy/client/models/ModelPackedCompressorBlock.java index 101d3b6..dc0944d 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelPackedCompressorBlock.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelPackedCompressorBlock.java @@ -15,21 +15,21 @@ public class ModelPackedCompressorBlock extends ModelBase { ModelRenderer block; public ModelPackedCompressorBlock() { - textureHeight = 16; - textureWidth = 16; + this.textureHeight = 16; + this.textureWidth = 16; - block = new ModelRenderer(this, 0, 0); - block.addBox(0F, 0F, 0F, 16, 16, 16); - block.setRotationPoint(-8F, 22F, -8F); + this.block = new ModelRenderer(this, 0, 0); + this.block.addBox(0F, 0F, 0F, 16, 16, 16); + this.block.setRotationPoint(-8F, 22F, -8F); //block.setTextureSize(16, 16); - block.mirror = true; + this.block.mirror = true; } @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - block.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.block.render(f5); } @Override diff --git a/src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java b/src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java index 869066c..f60c514 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java @@ -17,21 +17,21 @@ public class ModelSmallCube extends ModelBase { ModelRenderer shape1; public ModelSmallCube() { - textureWidth = 8; - textureHeight = 4; + this.textureWidth = 8; + this.textureHeight = 4; - shape1 = new ModelRenderer(this, 0, 0); - shape1.addBox(-1F, -3F, -1F, 2, 2, 2); - shape1.setRotationPoint(0F, 0F, 0F); - shape1.setTextureSize(8, 4); - shape1.mirror = true; - setRotation(shape1, 0F, 0F, 0F); + this.shape1 = new ModelRenderer(this, 0, 0); + this.shape1.addBox(-1F, -3F, -1F, 2, 2, 2); + this.shape1.setRotationPoint(0F, 0F, 0F); + this.shape1.setTextureSize(8, 4); + this.shape1.mirror = true; + this.setRotation(this.shape1, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - shape1.render(f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.shape1.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java b/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java index b0d3169..662bd86 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java @@ -49,7 +49,7 @@ public class ModelWandPart extends ModelWand { this.Cap.setRotationPoint(0.0F, 0.0F, 0.0F); this.Cap.setTextureSize(64, 32); this.Cap.mirror = true; - setRotation(this.Cap, 0.0F, 0.0F, 0.0F); + this.setRotation(this.Cap, 0.0F, 0.0F, 0.0F); //this.CapBottom = new ModelRenderer(this, 0, 0); //this.CapBottom.addBox(-1.0F, -1.0F, -1.0F, 2, 2, 2); @@ -67,13 +67,13 @@ public class ModelWandPart extends ModelWand { this.Rod.setRotationPoint(0.0F, 2.0F, 0.0F); this.Rod.setTextureSize(64, 32); this.Rod.mirror = true; - setRotation(this.Rod, 0.0F, 0.0F, 0.0F); + this.setRotation(this.Rod, 0.0F, 0.0F, 0.0F); this.Focus = new ModelRenderer(this, 0, 0); this.Focus.addBox(-3.0F, -6.0F, -3.0F, 6, 6, 6); this.Focus.setRotationPoint(0.0F, 0.0F, 0.0F); this.Focus.setTextureSize(64, 32); this.Focus.mirror = true; - setRotation(this.Focus, 0.0F, 0.0F, 0.0F); + this.setRotation(this.Focus, 0.0F, 0.0F, 0.0F); } public void render(ItemStack wandStack) { @@ -217,7 +217,7 @@ public class ModelWandPart extends ModelWand { for (int rot = 0; rot < 10; rot++) { GL11.glPushMatrix(); GL11.glRotated(36 * rot + player.ticksExisted, 0.0D, 1.0D, 0.0D); - drawRune(0.16D, -0.009999999776482582D, -0.125D, rot, player); + this.drawRune(0.16D, -0.009999999776482582D, -0.125D, rot, player); GL11.glPopMatrix(); } GL11.glBlendFunc(770, 771); @@ -237,8 +237,8 @@ public class ModelWandPart extends ModelWand { int rune = (a + rot * 3) % 16; //edit start - if(a < runeCount) { - drawRune(0.36D + a * 0.14D, -0.009999999776482582D, -0.08D, rune, player); + if(a < this.runeCount) { + this.drawRune(0.36D + a * 0.14D, -0.009999999776482582D, -0.08D, rune, player); } //edit end } diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java index bdbed08..5bc4890 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java @@ -50,23 +50,23 @@ public class BlockExtendedNodeJarRenderer implements ISimpleBlockRenderingHandle Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); IIcon i1 = ((BlockJar) ConfigBlocks.blockJar).iconJarTop; IIcon i2 = ((BlockJar) ConfigBlocks.blockJar).iconJarSide; - block.setBlockBounds(W3, 0.0F, W3, W13, W12, W13); + block.setBlockBounds(BlockExtendedNodeJarRenderer.W3, 0.0F, BlockExtendedNodeJarRenderer.W3, BlockExtendedNodeJarRenderer.W13, BlockExtendedNodeJarRenderer.W12, BlockExtendedNodeJarRenderer.W13); renderer.setRenderBoundsFromBlock(block); - drawFaces(renderer, block, ((BlockJar) ConfigBlocks.blockJar).iconJarBottom, i1, i2, i2, i2, i2, true); - block.setBlockBounds(W5, W12, W5, W11, W14, W11); + BlockExtendedNodeJarRenderer.drawFaces(renderer, block, ((BlockJar) ConfigBlocks.blockJar).iconJarBottom, i1, i2, i2, i2, i2, true); + block.setBlockBounds(BlockExtendedNodeJarRenderer.W5, BlockExtendedNodeJarRenderer.W12, BlockExtendedNodeJarRenderer.W5, BlockExtendedNodeJarRenderer.W11, BlockExtendedNodeJarRenderer.W14, BlockExtendedNodeJarRenderer.W11); renderer.setRenderBoundsFromBlock(block); - drawFaces(renderer, block, ((BlockJar) ConfigBlocks.blockJar).iconJarBottom, i1, i2, i2, i2, i2, true); + BlockExtendedNodeJarRenderer.drawFaces(renderer, block, ((BlockJar) ConfigBlocks.blockJar).iconJarBottom, i1, i2, i2, i2, i2, true); GL11.glPopMatrix(); } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - int bb = setBrightness(world, x, y, z, block); + int bb = this.setBrightness(world, x, y, z, block); int metadata = world.getBlockMetadata(x, y, z); - block.setBlockBounds(W3, 0.0F, W3, W13, W12, W13); + block.setBlockBounds(BlockExtendedNodeJarRenderer.W3, 0.0F, BlockExtendedNodeJarRenderer.W3, BlockExtendedNodeJarRenderer.W13, BlockExtendedNodeJarRenderer.W12, BlockExtendedNodeJarRenderer.W13); renderer.setRenderBoundsFromBlock(block); renderer.renderStandardBlock(block, x, y, z); - block.setBlockBounds(W5, W12, W5, W11, W14, W11); + block.setBlockBounds(BlockExtendedNodeJarRenderer.W5, BlockExtendedNodeJarRenderer.W12, BlockExtendedNodeJarRenderer.W5, BlockExtendedNodeJarRenderer.W11, BlockExtendedNodeJarRenderer.W14, BlockExtendedNodeJarRenderer.W11); renderer.setRenderBoundsFromBlock(block); renderer.renderStandardBlock(block, x, y, z); diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/BlockRenderingHandler.java b/src/main/java/makeo/gadomancy/client/renderers/block/BlockRenderingHandler.java index 54d525f..ba4c591 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/BlockRenderingHandler.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/BlockRenderingHandler.java @@ -36,7 +36,7 @@ public abstract class BlockRenderingHandler implements ISimpleBlockRenderingHand } protected void renderFace(ForgeDirection side, RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { - renderFace(side.ordinal(), renderer, block, x, y, z, icon); + this.renderFace(side.ordinal(), renderer, block, x, y, z, icon); } /*protected void renderFaceHollow(int side, RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java index fd0ec65..3a1ef99 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java @@ -25,9 +25,9 @@ public class RenderBlockStoneMachine implements ISimpleBlockRenderingHandler { public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { if(metadata == 1) { BlockStoneMachine blockStoneMachine = (BlockStoneMachine)block; - DEVICE_BLOCK.iconPedestal[0] = blockStoneMachine.pedestalSideIcon; - DEVICE_BLOCK.iconPedestal[1] = blockStoneMachine.pedestalTopIcon; - DEVICE_RENDERER.renderInventoryBlock(DEVICE_BLOCK, 1, modelId, renderer); + RenderBlockStoneMachine.DEVICE_BLOCK.iconPedestal[0] = blockStoneMachine.pedestalSideIcon; + RenderBlockStoneMachine.DEVICE_BLOCK.iconPedestal[1] = blockStoneMachine.pedestalTopIcon; + RenderBlockStoneMachine.DEVICE_RENDERER.renderInventoryBlock(RenderBlockStoneMachine.DEVICE_BLOCK, 1, modelId, renderer); } } @@ -35,7 +35,7 @@ public class RenderBlockStoneMachine implements ISimpleBlockRenderingHandler { public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { int metadata = world.getBlockMetadata(x, y, z); if(metadata == 1) { - DEVICE_RENDERER.renderWorldBlock(world, x, y, z, block, modelId, renderer); + RenderBlockStoneMachine.DEVICE_RENDERER.renderWorldBlock(world, x, y, z, block, modelId, renderer); return true; } return false; diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java index 4e06197..707ac31 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java @@ -23,7 +23,7 @@ public class RenderBlockTransparent extends BlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { if(block instanceof IBlockTransparent) { - renderAllFaces(renderer, block, x, y, z, ((IBlockTransparent) block).getTransparentIcon()); + this.renderAllFaces(renderer, block, x, y, z, ((IBlockTransparent) block).getTransparentIcon()); } return false; } diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java index 186574e..61685e3 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java @@ -19,9 +19,9 @@ public class PlayerCameraRenderer extends EntityRenderer { private boolean isRemoved; private EntityRenderer prevRenderer; - public float xOffset = 0; - public float yOffset = 0; - public float zOffset = 0; + public float xOffset; + public float yOffset; + public float zOffset; public PlayerCameraRenderer(Minecraft minecraft, EntityRenderer prevRenderer) { super(minecraft, minecraft.getResourceManager()); @@ -33,15 +33,15 @@ public class PlayerCameraRenderer extends EntityRenderer { } public EntityRenderer getPrevRenderer() { - return prevRenderer; + return this.prevRenderer; } public boolean isMarkedForRemoval() { - return isMarkedForRemoval; + return this.isMarkedForRemoval; } public boolean isRemoved() { - return isRemoved; + return this.isRemoved; } public void markForRemoval() { @@ -49,27 +49,27 @@ public class PlayerCameraRenderer extends EntityRenderer { } private boolean canChangeView() { - return !isMarkedForRemoval && minecraft.thePlayer != null && !minecraft.thePlayer.isRiding() && !minecraft.thePlayer.isPlayerSleeping(); + return !this.isMarkedForRemoval && this.minecraft.thePlayer != null && !this.minecraft.thePlayer.isRiding() && !this.minecraft.thePlayer.isPlayerSleeping(); } private void removeIfMarked() { - if(isMarkedForRemoval && this.equals(Minecraft.getMinecraft().entityRenderer)) { - Minecraft.getMinecraft().entityRenderer = prevRenderer; - isRemoved = true; + if(this.isMarkedForRemoval && this.equals(Minecraft.getMinecraft().entityRenderer)) { + Minecraft.getMinecraft().entityRenderer = this.prevRenderer; + this.isRemoved = true; } } @Override public void updateCameraAndRender(float partialTicks) { - removeIfMarked(); + this.removeIfMarked(); - if(canChangeView()) { - moveCam(-1); + if(this.canChangeView()) { + this.moveCam(-1); //float tempEyeHeight = minecraft.thePlayer.eyeHeight; //minecraft.thePlayer.eyeHeight = minecraft.thePlayer.getDefaultEyeHeight(); super.updateCameraAndRender(partialTicks); //minecraft.thePlayer.eyeHeight = tempEyeHeight; - moveCam(1); + this.moveCam(1); return; } @@ -78,7 +78,7 @@ public class PlayerCameraRenderer extends EntityRenderer { } private void moveCam(int mod) { - EntityPlayer player = minecraft.thePlayer; + EntityPlayer player = this.minecraft.thePlayer; player.posX += this.xOffset * mod; player.lastTickPosX += this.xOffset * mod; @@ -95,12 +95,12 @@ public class PlayerCameraRenderer extends EntityRenderer { @Override public void getMouseOver(float partialTicks) { - removeIfMarked(); + this.removeIfMarked(); - if(canChangeView()) { - moveCam(-1); + if(this.canChangeView()) { + this.moveCam(-1); super.getMouseOver(partialTicks); - moveCam(1); + this.moveCam(1); return; } diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java index 1c2759d..f2cd30f 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java @@ -20,7 +20,7 @@ import thaumcraft.common.entities.golems.EntityGolemBase; * Created by makeo @ 12.03.2015 15:57 */ public class RenderAdditionalGolemBase extends RenderGolemBase { - private ItemStack toolItem = null; + private ItemStack toolItem; public RenderAdditionalGolemBase() { super(new ModelGolem(false)); @@ -44,8 +44,8 @@ public class RenderAdditionalGolemBase extends RenderGolemBase { if (RenderGolemHelper.requiresRenderFix((EntityGolemBase) entity)) { RenderGolemHelper.renderCarriedItemsFix(golem); - if(toolItem != null) { - RenderGolemHelper.renderToolItem(golem, toolItem, mainModel, renderManager); + if(this.toolItem != null) { + RenderGolemHelper.renderToolItem(golem, this.toolItem, this.mainModel, this.renderManager); } } @@ -60,8 +60,8 @@ public class RenderAdditionalGolemBase extends RenderGolemBase { @Override protected void renderCarriedItems(EntityGolemBase golem, float par2) { if (!RenderGolemHelper.requiresRenderFix(golem)) { - if(toolItem != null) { - RenderGolemHelper.renderToolItem(golem, toolItem, mainModel, renderManager); + if(this.toolItem != null) { + RenderGolemHelper.renderToolItem(golem, this.toolItem, this.mainModel, this.renderManager); } super.renderCarriedItems(golem, par2); } @@ -72,7 +72,7 @@ public class RenderAdditionalGolemBase extends RenderGolemBase { AdditionalGolemCore core = GadomancyApi.getAdditionalGolemCore(golem); ItemStack carriedItem = null; if(core != null) { - toolItem = core.getToolItem(golem); + this.toolItem = core.getToolItem(golem); carriedItem = golem.getCarriedForDisplay(); golem.getDataWatcher().getWatchedObject(16).setObject(null); @@ -82,7 +82,7 @@ public class RenderAdditionalGolemBase extends RenderGolemBase { if(carriedItem != null) { golem.getDataWatcher().getWatchedObject(16).setObject(carriedItem); - toolItem = null; + this.toolItem = null; } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityItem.java b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityItem.java index 335ed56..0417125 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityItem.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityItem.java @@ -23,7 +23,7 @@ public class RenderEntityItem extends Render { @Override public void doRender(Entity entity, double x, double y, double z, float parf1, float parf2) { if(!(entity instanceof EntityItem)) return; - ri.doRender(entity, x, y, z, parf1, parf2); + RenderEntityItem.ri.doRender(entity, x, y, z, parf1, parf2); } @Override @@ -32,8 +32,8 @@ public class RenderEntityItem extends Render { } static { - ri = new RenderItem(); - ri.setRenderManager(RenderManager.instance); + RenderEntityItem.ri = new RenderItem(); + RenderEntityItem.ri.setRenderManager(RenderManager.instance); } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java index 303b6c4..ffffd37 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java @@ -24,6 +24,6 @@ public class ItemCreativeNodeRenderer extends ItemExNodeRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - makeo.gadomancy.client.renderers.item.ItemNodeRenderer.renderNodeItem(type, item, ASPECTS, NodeType.values()[item.getItemDamage()], null, data); + makeo.gadomancy.client.renderers.item.ItemNodeRenderer.renderNodeItem(type, item, ItemCreativeNodeRenderer.ASPECTS, NodeType.values()[item.getItemDamage()], null, data); } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java index f0c5f4c..bade39a 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java @@ -33,10 +33,7 @@ public class ItemJarExtendedNodeRenderer implements IItemRenderer { } public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { - if (helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK) { - return false; - } - return true; + return helper != ItemRendererHelper.EQUIPPED_BLOCK; } RenderBlocks rb = new RenderBlocks(); diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemNodeRenderer.java index 8e9a6ee..4d2e483 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemNodeRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemNodeRenderer.java @@ -33,16 +33,13 @@ public class ItemNodeRenderer implements IItemRenderer { } public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { - if (helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK) { - return false; - } - return true; + return helper != ItemRendererHelper.EQUIPPED_BLOCK; } @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { //Gadomancy: Redirect. - renderNodeItem(type, item, data); + ItemNodeRenderer.renderNodeItem(type, item, data); } //Gadomancy: Renamed to access it static from another class and added aspects, nodeType and nodeModifier as params @@ -60,18 +57,18 @@ public class ItemNodeRenderer implements IItemRenderer { GL11.glPushMatrix(); GL11.glTranslated(0.5D, 0.5D, 0.5D); GL11.glScaled(2.0D, 2.0D, 2.0D); - renderItemNode(tjf); + ItemNodeRenderer.renderItemNode(tjf); GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - renderItemNode(tjf); + ItemNodeRenderer.renderItemNode(tjf); GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - renderItemNode(tjf); + ItemNodeRenderer.renderItemNode(tjf); GL11.glPopMatrix(); GL11.glEnable(32826); } public static void renderNodeItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { - renderNodeItem(type, item, aspects, NodeType.NORMAL, null, data); + ItemNodeRenderer.renderNodeItem(type, item, ItemNodeRenderer.aspects, NodeType.NORMAL, null, data); } private static AspectList aspects = new AspectList().add(Aspect.AIR, 40).add(Aspect.FIRE, 40).add(Aspect.EARTH, 40).add(Aspect.WATER, 40); diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java index 0c7041a..54becd1 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java @@ -7,9 +7,6 @@ import makeo.gadomancy.common.utils.world.fake.FakeWorld; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; @@ -19,7 +16,6 @@ import org.lwjgl.opengl.GL11; import thaumcraft.api.aspects.Aspect; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.lib.UtilsFX; -import thaumcraft.client.renderers.entity.RenderWisp; import thaumcraft.common.Thaumcraft; import thaumcraft.common.entities.monster.EntityWisp; @@ -36,7 +32,7 @@ import java.util.Random; */ public class ItemRenderFamiliar implements IItemRenderer { - private static EntityWisp ENTITY_WISP = null; + private static EntityWisp ENTITY_WISP; private float[] renderInfo = new float[5]; @Override @@ -62,26 +58,26 @@ public class ItemRenderFamiliar implements IItemRenderer { } try { - cleanActiveRenderInfo(type); + this.cleanActiveRenderInfo(type); GL11.glScalef(1.3F, 1.3F, 1.3F); if(ItemEtherealFamiliar.hasFamiliarAspect(item)) { - if(ENTITY_WISP == null) ENTITY_WISP = new EntityWisp(new FakeWorld()); - ENTITY_WISP.ticksExisted = FamiliarHandlerClient.PartialEntityFamiliar.DUMMY_FAMILIAR.ticksExisted; - ENTITY_WISP.setType(ItemEtherealFamiliar.getFamiliarAspect(item).getTag()); - renderEntityWispFor(null, ENTITY_WISP, 0, 0, 0, 0, 0); + if(ItemRenderFamiliar.ENTITY_WISP == null) ItemRenderFamiliar.ENTITY_WISP = new EntityWisp(new FakeWorld()); + ItemRenderFamiliar.ENTITY_WISP.ticksExisted = FamiliarHandlerClient.PartialEntityFamiliar.DUMMY_FAMILIAR.ticksExisted; + ItemRenderFamiliar.ENTITY_WISP.setType(ItemEtherealFamiliar.getFamiliarAspect(item).getTag()); + ItemRenderFamiliar.renderEntityWispFor(null, ItemRenderFamiliar.ENTITY_WISP, 0, 0, 0, 0, 0); } } finally { - restoreActiveRenderInfo(); + this.restoreActiveRenderInfo(); } GL11.glPopMatrix(); } private void cleanActiveRenderInfo(ItemRenderType renderType) { - renderInfo[0] = ActiveRenderInfo.rotationX; - renderInfo[1] = ActiveRenderInfo.rotationXZ; - renderInfo[2] = ActiveRenderInfo.rotationZ; - renderInfo[3] = ActiveRenderInfo.rotationYZ; - renderInfo[4] = ActiveRenderInfo.rotationXY; + this.renderInfo[0] = ActiveRenderInfo.rotationX; + this.renderInfo[1] = ActiveRenderInfo.rotationXZ; + this.renderInfo[2] = ActiveRenderInfo.rotationZ; + this.renderInfo[3] = ActiveRenderInfo.rotationYZ; + this.renderInfo[4] = ActiveRenderInfo.rotationXY; switch (renderType) { case ENTITY: break; @@ -112,20 +108,20 @@ public class ItemRenderFamiliar implements IItemRenderer { } private void restoreActiveRenderInfo() { - if(renderInfo[0] != -1) ActiveRenderInfo.rotationX = renderInfo[0]; - if(renderInfo[1] != -1) ActiveRenderInfo.rotationXZ = renderInfo[1]; - if(renderInfo[2] != -1) ActiveRenderInfo.rotationZ = renderInfo[2]; - if(renderInfo[3] != -1) ActiveRenderInfo.rotationYZ = renderInfo[3]; - if(renderInfo[4] != -1) ActiveRenderInfo.rotationXY = renderInfo[4]; - for (int i = 0; i < renderInfo.length; i++) { - renderInfo[i] = -1; + if(this.renderInfo[0] != -1) ActiveRenderInfo.rotationX = this.renderInfo[0]; + if(this.renderInfo[1] != -1) ActiveRenderInfo.rotationXZ = this.renderInfo[1]; + if(this.renderInfo[2] != -1) ActiveRenderInfo.rotationZ = this.renderInfo[2]; + if(this.renderInfo[3] != -1) ActiveRenderInfo.rotationYZ = this.renderInfo[3]; + if(this.renderInfo[4] != -1) ActiveRenderInfo.rotationXY = this.renderInfo[4]; + for (int i = 0; i < this.renderInfo.length; i++) { + this.renderInfo[i] = -1; } } - private static int size1 = 0; + private static int size1; public static void renderEntityWispFor(EntityPlayer owner, EntityWisp wisp, double x, double y, double z, float fq, float pticks) { - if (size1 == 0) { - size1 = UtilsFX.getTextureSize("textures/misc/wisp.png", 64); + if (ItemRenderFamiliar.size1 == 0) { + ItemRenderFamiliar.size1 = UtilsFX.getTextureSize("textures/misc/wisp.png", 64); } float f1 = ActiveRenderInfo.rotationX; @@ -180,13 +176,13 @@ public class ItemRenderFamiliar implements IItemRenderer { int i = wisp.ticksExisted % 16; - float size4 = size1 * 4; - float float_sizeMinus0_01 = size1 - 0.01F; + float size4 = ItemRenderFamiliar.size1 * 4; + float float_sizeMinus0_01 = ItemRenderFamiliar.size1 - 0.01F; - float x0 = (i % 4 * size1 + 0.0F) / size4; - float x1 = (i % 4 * size1 + float_sizeMinus0_01) / size4; - float x2 = (i / 4 * size1 + 0.0F) / size4; - float x3 = (i / 4 * size1 + float_sizeMinus0_01) / size4; + float x0 = (i % 4 * ItemRenderFamiliar.size1 + 0.0F) / size4; + float x1 = (i % 4 * ItemRenderFamiliar.size1 + float_sizeMinus0_01) / size4; + float x2 = (i / 4 * ItemRenderFamiliar.size1 + 0.0F) / size4; + float x3 = (i / 4 * ItemRenderFamiliar.size1 + float_sizeMinus0_01) / size4; tessellator.startDrawingQuads(); tessellator.setBrightness(240); diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java index 07cec93..4e88dda 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java @@ -32,15 +32,15 @@ public class ItemRenderRemoteJar extends ItemRenderTileEntity { AspectList aspects = ((ItemJarFilled)ConfigItems.itemJarFilled).getAspects(stack); if(aspects != null) { - tile.aspect = aspects.getAspects()[0]; - tile.amount = aspects.getAmount(tile.aspect); + this.tile.aspect = aspects.getAspects()[0]; + this.tile.amount = aspects.getAmount(this.tile.aspect); } else { - tile.aspect = null; - tile.amount = 0; + this.tile.aspect = null; + this.tile.amount = 0; } if(stack.hasTagCompound()) { - tile.networkId = NBTHelper.getUUID(stack.getTagCompound(), "networkId"); + this.tile.networkId = NBTHelper.getUUID(stack.getTagCompound(), "networkId"); } super.renderItem(type, stack, data); diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderStoneMachine.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderStoneMachine.java index 6bfb31e..4003c3e 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderStoneMachine.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderStoneMachine.java @@ -30,19 +30,19 @@ public class ItemRenderStoneMachine extends ItemRenderTileEntity { RenderInfo info = new RenderInfo(); info.renderer = renderer; info.tile = tile; - renderers.put(metadata, info); + this.renderers.put(metadata, info); if(tile.getWorldObj() == null) { - tile.setWorldObj(FAKE_WORLD); + tile.setWorldObj(ItemRenderTileEntity.FAKE_WORLD); } } @Override public void renderItem(ItemRenderType type, ItemStack stack, Object... data) { - RenderInfo info = renderers.get(stack.getItemDamage()); + RenderInfo info = this.renderers.get(stack.getItemDamage()); - tile = info.tile; - renderer = info.renderer; + this.tile = info.tile; + this.renderer = info.renderer; if(stack.getItemDamage() == 0) { GL11.glTranslatef(0, 2/16f, 0); @@ -53,6 +53,6 @@ public class ItemRenderStoneMachine extends ItemRenderTileEntity { @Override public boolean handleRenderType(ItemStack stack, ItemRenderType type) { - return renderers.containsKey(stack.getItemDamage()); + return this.renderers.containsKey(stack.getItemDamage()); } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java index 230fd2a..da3404c 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java @@ -28,7 +28,7 @@ public class ItemRenderTileEntity implements IItemRenderer this.tile = tile; if(tile.getWorldObj() == null) { - tile.setWorldObj(FAKE_WORLD); + tile.setWorldObj(ItemRenderTileEntity.FAKE_WORLD); } } @@ -52,9 +52,9 @@ public class ItemRenderTileEntity implements IItemRenderer if(type == ItemRenderType.INVENTORY) GL11.glTranslatef(0, -0.1F, 0); - if(type == ItemRenderType.EQUIPPED_FIRST_PERSON && tile instanceof TileManipulationFocus) + if(type == ItemRenderType.EQUIPPED_FIRST_PERSON && this.tile instanceof TileManipulationFocus) GL11.glTranslatef(0, 0.6F, 0); - this.renderer.renderTileEntityAt(tile, 0.0D, 0.0D, 0.0D, 0.0F); + this.renderer.renderTileEntityAt(this.tile, 0.0D, 0.0D, 0.0D, 0.0F); } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntityMulti.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntityMulti.java index 638af27..bfedbff 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntityMulti.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntityMulti.java @@ -24,7 +24,7 @@ public class ItemRenderTileEntityMulti implements IItemRenderer { public ItemRenderTileEntityMulti(RenderSet... renderSets) { for(RenderSet set : renderSets) { if(set != null) { - renderMap.put(set.meta, set); + this.renderMap.put(set.meta, set); } } } @@ -48,8 +48,8 @@ public class ItemRenderTileEntityMulti implements IItemRenderer { if(type == ItemRenderType.INVENTORY) GL11.glTranslatef(0, -0.1F, 0); - if(renderMap.containsKey(item.getItemDamage())) { - RenderSet set = renderMap.get(item.getItemDamage()); + if(this.renderMap.containsKey(item.getItemDamage())) { + RenderSet set = this.renderMap.get(item.getItemDamage()); set.renderer.renderTileEntityAt(set.te, 0, 0, 0, 0); } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java index 9fa5edd..6ebaab0 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java @@ -30,7 +30,7 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { TileAIShutdown ta = (TileAIShutdown) tileEntity; if(ta.getStoredEssentia() > 0) { - handleOrbital(ta); + this.handleOrbital(ta); } } @@ -47,7 +47,7 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { if(ta.getStoredEssentia() > 0) { if(ta.orbital != null && ta.orbital.orbitalsSize() == 0) { - fillOrbital(ta.orbital); + this.fillOrbital(ta.orbital); } } else { if(ta.orbital != null && ta.orbital.orbitalsSize() > 0) { @@ -63,9 +63,9 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { prop.setRenderRunnable(new Orbital.OrbitalRenderRunnable() { @Override public void onRender(World world, Vector3 pos, Orbital.OrbitalRenderProperties properties, int orbitalExisted, float partialTicks) { - if(rand.nextInt(3) == 0) { + if(RenderTileAIShutdown.rand.nextInt(3) == 0) { FXWisp ef = new FXWisp(world, - pos.getX() + randomOffset(), pos.getY() + randomOffset(), pos.getZ() + randomOffset(), + pos.getX() + RenderTileAIShutdown.randomOffset(), pos.getY() + RenderTileAIShutdown.randomOffset(), pos.getZ() + RenderTileAIShutdown.randomOffset(), 0.2F, 3); ef.setGravity(-0.08F); ParticleEngine.instance.addEffect(world, ef); @@ -80,9 +80,9 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { prop.setRenderRunnable(new Orbital.OrbitalRenderRunnable() { @Override public void onRender(World world, Vector3 pos, Orbital.OrbitalRenderProperties properties, int orbitalExisted, float partialTicks) { - if(rand.nextInt(3) == 0) { + if(RenderTileAIShutdown.rand.nextInt(3) == 0) { FXWisp ef = new FXWisp(world, - pos.getX() + randomOffset(), pos.getY() + randomOffset(), pos.getZ() + randomOffset(), + pos.getX() + RenderTileAIShutdown.randomOffset(), pos.getY() + RenderTileAIShutdown.randomOffset(), pos.getZ() + RenderTileAIShutdown.randomOffset(), 0.2F, 3); ef.setGravity(-0.08F); ParticleEngine.instance.addEffect(world, ef); @@ -97,9 +97,9 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { prop.setRenderRunnable(new Orbital.OrbitalRenderRunnable() { @Override public void onRender(World world, Vector3 pos, Orbital.OrbitalRenderProperties properties, int orbitalExisted, float partialTicks) { - if(rand.nextBoolean()) { + if(RenderTileAIShutdown.rand.nextBoolean()) { FXWisp ef = new FXWisp(world, - pos.getX() + randomOffset(), pos.getY() + randomOffset(), pos.getZ() + randomOffset(), + pos.getX() + RenderTileAIShutdown.randomOffset(), pos.getY() + RenderTileAIShutdown.randomOffset(), pos.getZ() + RenderTileAIShutdown.randomOffset(), 0.15F, 5); ef.setGravity(-0.08F); ParticleEngine.instance.addEffect(world, ef); @@ -114,9 +114,9 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { prop.setRenderRunnable(new Orbital.OrbitalRenderRunnable() { @Override public void onRender(World world, Vector3 pos, Orbital.OrbitalRenderProperties properties, int orbitalExisted, float partialTicks) { - if(rand.nextBoolean()) { + if(RenderTileAIShutdown.rand.nextBoolean()) { FXWisp ef = new FXWisp(world, - pos.getX() + randomOffset(), pos.getY() + randomOffset(), pos.getZ() + randomOffset(), + pos.getX() + RenderTileAIShutdown.randomOffset(), pos.getY() + RenderTileAIShutdown.randomOffset(), pos.getZ() + RenderTileAIShutdown.randomOffset(), 0.15F, 5); ef.setGravity(-0.08F); ParticleEngine.instance.addEffect(world, ef); @@ -131,9 +131,9 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { prop.setRenderRunnable(new Orbital.OrbitalRenderRunnable() { @Override public void onRender(World world, Vector3 pos, Orbital.OrbitalRenderProperties properties, int orbitalExisted, float partialTicks) { - if(rand.nextBoolean()) { + if(RenderTileAIShutdown.rand.nextBoolean()) { FXWisp ef = new FXWisp(world, - pos.getX() + randomOffset(), pos.getY() + randomOffset(), pos.getZ() + randomOffset(), + pos.getX() + RenderTileAIShutdown.randomOffset(), pos.getY() + RenderTileAIShutdown.randomOffset(), pos.getZ() + RenderTileAIShutdown.randomOffset(), 0.15F, 5); ef.setGravity(-0.08F); ParticleEngine.instance.addEffect(world, ef); @@ -145,7 +145,7 @@ public class RenderTileAIShutdown extends TileEntitySpecialRenderer { } private static float randomOffset() { - return rand.nextFloat() * 0.2F; + return RenderTileAIShutdown.rand.nextFloat() * 0.2F; } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java index 62ede5a..f2ca49e 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java @@ -53,12 +53,12 @@ public class RenderTileArcaneDropper extends TileEntitySpecialRenderer { GL11.glRotatef(90, 0, 1, 0); } - bindTexture(RESOURCE); - MODEL.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + this.bindTexture(RenderTileArcaneDropper.RESOURCE); + RenderTileArcaneDropper.MODEL.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - renderBellow(); + this.renderBellow(); GL11.glRotatef(180, 0, 1, 0); - renderBellow(); + this.renderBellow(); GL11.glPopMatrix(); } @@ -71,7 +71,7 @@ public class RenderTileArcaneDropper extends TileEntitySpecialRenderer { GL11.glTranslatef(-0.05f, 0.03f, 0f); GL11.glScalef(0.6f, 0.44f, 0.55f); - BELLOWS_RENDERER.renderEntityAt(BELLOWS_TILE, 0, 0, 0, 0); + RenderTileArcaneDropper.BELLOWS_RENDERER.renderEntityAt(RenderTileArcaneDropper.BELLOWS_TILE, 0, 0, 0, 0); GL11.glPopMatrix(); } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java index 35911ea..8f5f75e 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java @@ -54,18 +54,18 @@ public class RenderTileArcanePackager extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - bindTexture(TEXTURE_PISTON); + this.bindTexture(RenderTileArcanePackager.TEXTURE_PISTON); if(pistonOffset < 1/16f) { - MODEL_PISTON_CUT.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + RenderTileArcanePackager.MODEL_PISTON_CUT.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); } else { - MODEL_PISTON.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + RenderTileArcanePackager.MODEL_PISTON.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); } GL11.glPopMatrix(); - bindTexture(TEXTURE); - MODEL.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + this.bindTexture(RenderTileArcanePackager.TEXTURE); + RenderTileArcanePackager.MODEL.render(null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java index f5ef7aa..6b7e233 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java @@ -15,10 +15,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import thaumcraft.api.aspects.Aspect; import thaumcraft.client.fx.ParticleEngine; -import thaumcraft.client.fx.particles.FXEssentiaTrail; import thaumcraft.client.fx.particles.FXWisp; import java.awt.*; @@ -48,20 +46,20 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { GL11.glPushMatrix(); ResourceLocation textureToBind; if(tile instanceof TileAuraPylonTop) { - textureToBind = PYLON_TEXTURE_TOP; + textureToBind = RenderTileAuraPylon.PYLON_TEXTURE_TOP; } else if(((TileAuraPylon) tile).isInputTile() || ((TileAuraPylon) tile).isLowestTile()) { - textureToBind = PYLON_TEXTURE_BOTTOM; + textureToBind = RenderTileAuraPylon.PYLON_TEXTURE_BOTTOM; } else { - textureToBind = PYLON_TEXTURE; + textureToBind = RenderTileAuraPylon.PYLON_TEXTURE; } - bindTexture(textureToBind); + this.bindTexture(textureToBind); for(int i = 0; i < 4; i++) { if(tile instanceof TileAuraPylonTop) { GL11.glPushMatrix(); GL11.glRotatef(180, 1, 0, 0); GL11.glTranslatef(0, -2F, 0); //bindTexture(PYLON_TEXTURE_TOP); - MODEL_AURA_PYLON_TOP.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileAuraPylon.MODEL_AURA_PYLON_TOP.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); } else { if(((TileAuraPylon) tile).isInputTile() || ((TileAuraPylon) tile).isLowestTile()) { @@ -69,11 +67,11 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { GL11.glRotatef(180, 1, 0, 0); GL11.glTranslatef(0, -2F, 0); //bindTexture(PYLON_TEXTURE_BOTTOM); - MODEL_AURA_PYLON_BOTTOM.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileAuraPylon.MODEL_AURA_PYLON_BOTTOM.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); } else { //bindTexture(PYLON_TEXTURE); - MODEL_AURA_PYLON.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileAuraPylon.MODEL_AURA_PYLON.render(null, 0, 0, 0, 0, 0, 0.0625f); } } @@ -98,17 +96,17 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { Color c = new Color(a.getColor()); if(tile.getWorldObj().rand.nextInt(12) == 0) { if(a == Aspect.ENTROPY || a == Aspect.DARKNESS || a == Aspect.UNDEAD) { - spawnWispParticles((TileAuraPylonTop) tile, 5, 0.5F, false); + this.spawnWispParticles((TileAuraPylonTop) tile, 5, 0.5F, false); } else { - spawnWispParticles((TileAuraPylonTop) tile, c, 0.5F, false); + this.spawnWispParticles((TileAuraPylonTop) tile, c, 0.5F, false); } } c = c.darker().darker(); if(tile.getWorldObj().rand.nextInt(20) == 0) { if(a == Aspect.ENTROPY || a == Aspect.DARKNESS || a == Aspect.UNDEAD) { - spawnWispParticles((TileAuraPylonTop) tile, 5, 0.25F, false); + this.spawnWispParticles((TileAuraPylonTop) tile, 5, 0.25F, false); } else { - spawnWispParticles((TileAuraPylonTop) tile, c, 0.25F, false); + this.spawnWispParticles((TileAuraPylonTop) tile, c, 0.25F, false); } } } @@ -123,9 +121,9 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { col |= (0x55 << 24); Color c = new Color(col, true); Random rand = tile.getWorldObj().rand; - addNewOrbitalPoint(ta.orbital, rand, c); - addNewOrbitalPoint(ta.orbital, rand, c); - addNewOrbitalPoint(ta.orbital, rand, c); + this.addNewOrbitalPoint(ta.orbital, rand, c); + this.addNewOrbitalPoint(ta.orbital, rand, c); + this.addNewOrbitalPoint(ta.orbital, rand, c); } } } else { @@ -174,7 +172,7 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partTicks) { - renderTileEntity(tileEntity, x, y, z, partTicks); + this.renderTileEntity(tileEntity, x, y, z, partTicks); } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java index dc74077..58d31a8 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java @@ -23,7 +23,7 @@ public class RenderTileBlockProtector extends TileJarRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { - renderTileEntityAt((TileBlockProtector)tile, x, y, z, partialTicks); + this.renderTileEntityAt((TileBlockProtector)tile, x, y, z, partialTicks); } public void renderTileEntityAt(TileBlockProtector tile, double x, double y, double z, float partialTicks) { @@ -51,7 +51,7 @@ public class RenderTileBlockProtector extends TileJarRenderer { GL11.glTranslatef(0.5f, 1.5f, 0.5f); GL11.glRotatef(180, 1, 0, 0); - bindTexture(tile.getPowerLevel() > 0 ? TEXTURE_ON : TEXTURE_OFF); + this.bindTexture(tile.getPowerLevel() > 0 ? RenderTileBlockProtector.TEXTURE_ON : RenderTileBlockProtector.TEXTURE_OFF); new ModelBlockProtector().render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); @@ -63,7 +63,7 @@ public class RenderTileBlockProtector extends TileJarRenderer { GL11.glRotatef(180, 0, 0, 1); GL11.glTranslatef(-0.5f, 0, 0.5f); - bindTexture(new ResourceLocation("thaumcraft", "textures/models/jar.png")); + this.bindTexture(new ResourceLocation("thaumcraft", "textures/models/jar.png")); new ModelJar().renderAll(); GL11.glPopMatrix(); diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java index 0ad9cc7..61e83b4 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java @@ -2,34 +2,18 @@ package makeo.gadomancy.client.renderers.tile; import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.client.effect.fx.FXVortex; -import makeo.gadomancy.client.events.ClientHandler; -import makeo.gadomancy.client.models.ModelPackedCompressorBlock; import makeo.gadomancy.client.models.ModelEssentiaCompressor; +import makeo.gadomancy.client.models.ModelPackedCompressorBlock; import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; -import makeo.gadomancy.common.utils.MiscUtils; import makeo.gadomancy.common.utils.SimpleResourceLocation; -import makeo.gadomancy.common.utils.Vector3; import makeo.gadomancy.common.utils.world.fake.FakeWorld; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; -import net.minecraft.client.renderer.ActiveRenderInfo; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; -import thaumcraft.client.fx.ParticleEngine; -import thaumcraft.client.lib.QuadHelper; -import thaumcraft.client.lib.UtilsFX; import java.util.HashMap; -import java.util.IdentityHashMap; import java.util.Map; /** @@ -58,17 +42,17 @@ public class RenderTileEssentiaCompressor extends TileEntitySpecialRenderer { int yOffset = ((TileEssentiaCompressor) tileEntity).getMultiblockYIndex(); GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y - yOffset - 0.5, z + 0.5); - bindTexture(COMPRESSOR_TEXTURE); + this.bindTexture(RenderTileEssentiaCompressor.COMPRESSOR_TEXTURE); GL11.glRotatef(180, 1, 0, 0); GL11.glTranslatef(0, -2F, 0); - MODEL_ESSENTIA_COMPRESSOR.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileEssentiaCompressor.MODEL_ESSENTIA_COMPRESSOR.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glRotatef(180, 1, 0, 0); - MODEL_ESSENTIA_COMPRESSOR.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileEssentiaCompressor.MODEL_ESSENTIA_COMPRESSOR.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); GL11.glPushMatrix(); if(yOffset == 1) { //The middle one. - well. the one where the blackhole is. - renderBlackHoleEffect(tileEntity.xCoord + 0.5, tileEntity.yCoord + 0.5, tileEntity.zCoord + 0.5, + this.renderBlackHoleEffect(tileEntity.xCoord + 0.5, tileEntity.yCoord + 0.5, tileEntity.zCoord + 0.5, (TileEssentiaCompressor) tileEntity.getWorldObj().getTileEntity(tileEntity.xCoord, tileEntity.yCoord - 1, tileEntity.zCoord)); } GL11.glPopMatrix(); @@ -81,8 +65,8 @@ public class RenderTileEssentiaCompressor extends TileEntitySpecialRenderer { } else { GL11.glTranslatef(0, -2.877F, 0); } - bindTexture(PACKED_COMPRESSOR_TEXTURE); - MODEL_PACKED_COMPRESSOR.render(null, 0, 0, 0, 0, 0, 0.0625f); + this.bindTexture(RenderTileEssentiaCompressor.PACKED_COMPRESSOR_TEXTURE); + RenderTileEssentiaCompressor.MODEL_PACKED_COMPRESSOR.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); } @@ -93,11 +77,11 @@ public class RenderTileEssentiaCompressor extends TileEntitySpecialRenderer { private void renderBlackHoleEffect(double x, double y, double z, TileEssentiaCompressor te) { ChunkCoordinates cc = new ChunkCoordinates((int) x, (int) y, (int) z); FXVortex v; - if (ownedVortex.containsKey(cc)) { - v = ownedVortex.get(cc); + if (RenderTileEssentiaCompressor.ownedVortex.containsKey(cc)) { + v = RenderTileEssentiaCompressor.ownedVortex.get(cc); } else { v = new FXVortex(x, y, z, te); - ownedVortex.put(cc, v); + RenderTileEssentiaCompressor.ownedVortex.put(cc, v); v.registered = true; EffectHandler.getInstance().registerVortex(v); } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java index 2d289b9..d94746b 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java @@ -43,19 +43,19 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { static { MODELS = new ModelInfusionClawPart[8]; - for (int i = 0; i < MODELS.length; i++) { - MODELS[i] = new ModelInfusionClawPart(i); + for (int i = 0; i < RenderTileInfusionClaw.MODELS.length; i++) { + RenderTileInfusionClaw.MODELS[i] = new ModelInfusionClawPart(i); } - new Injector(WAND_RENDERER).setField("model", new ModelWandPart(7, 4)); - new Injector(STAFF_RENDERER).setField("model", new ModelWandPart(7, 4)); + new Injector(RenderTileInfusionClaw.WAND_RENDERER).setField("model", new ModelWandPart(7, 4)); + new Injector(RenderTileInfusionClaw.STAFF_RENDERER).setField("model", new ModelWandPart(7, 4)); - RENDER_PRIMAL_ORB.setRenderManager(RenderManager.instance); + RenderTileInfusionClaw.RENDER_PRIMAL_ORB.setRenderManager(RenderManager.instance); } @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { - render((TileInfusionClaw) tile, x, y, z, partialTicks); + this.render((TileInfusionClaw) tile, x, y, z, partialTicks); } private void render(TileInfusionClaw tile, double x, double y, double z, float partialTicks) { @@ -66,9 +66,9 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x, y, z); - renderPart(tile, elapsed, ticks); + this.renderPart(tile, elapsed, ticks); - renderPrimalOrb(tile, elapsed); + this.renderPrimalOrb(tile, elapsed); GL11.glPopMatrix(); } @@ -78,13 +78,13 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { GL11.glTranslatef(0.5f, 0.5f, 0.5f); World world = tile.getWorldObj(); - bindTexture(RESOURCE); + this.bindTexture(RenderTileInfusionClaw.RESOURCE); - renderSides(tile, world, tile.xCoord, tile.yCoord, tile.zCoord, elapsed); + this.renderSides(tile, world, tile.xCoord, tile.yCoord, tile.zCoord, elapsed); - renderCircle(tile, elapsed); + this.renderCircle(tile, elapsed); - renderWand(tile.getStackInSlot(0), ticks); + this.renderWand(tile.getStackInSlot(0), ticks); GL11.glPopMatrix(); } @@ -132,7 +132,7 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { GL11.glRotated(45, Math.cos(angle), 0, -Math.sin(angle)); GL11.glScalef(0.75f, 0.75f, 0.75f); - renderPart(i); + this.renderPart(i); GL11.glPopMatrix(); } @@ -142,7 +142,7 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { private void renderWand(ItemStack wandStack, float ticks) { GL11.glRotatef(((ticks/3) / 20.0F) * (180F / (float)Math.PI), 0, 1f, 0); - renderTopPart(); + this.renderTopPart(); if (wandStack != null && wandStack.stackSize > 0) { GL11.glPushMatrix(); @@ -159,9 +159,9 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { if(item.isStaff(wandFocusStack)) { GL11.glTranslatef(0, -0.5f, 0); - STAFF_RENDERER.renderItem(IItemRenderer.ItemRenderType.ENTITY, wandFocusStack); + RenderTileInfusionClaw.STAFF_RENDERER.renderItem(IItemRenderer.ItemRenderType.ENTITY, wandFocusStack); } else { - WAND_RENDERER.renderItem(IItemRenderer.ItemRenderType.ENTITY, wandFocusStack); + RenderTileInfusionClaw.WAND_RENDERER.renderItem(IItemRenderer.ItemRenderType.ENTITY, wandFocusStack); } GL11.glPopMatrix(); } @@ -172,7 +172,7 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { GL11.glTranslatef(0, (0.5f - (1f / 16f * 0.75f)), 0); GL11.glScalef(0.75f, 0.75f, 0.75f); - renderPart(4); + this.renderPart(4); GL11.glPopMatrix(); } @@ -189,7 +189,7 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { EntityPrimalOrb orb = new EntityPrimalOrb(tile.getWorldObj(), Minecraft.getMinecraft().thePlayer, true); orb.ticksExisted = Minecraft.getMinecraft().renderViewEntity.ticksExisted; - RENDER_PRIMAL_ORB.renderEntityAt(orb, 0, 0, 0, 0, 0); + RenderTileInfusionClaw.RENDER_PRIMAL_ORB.renderEntityAt(orb, 0, 0, 0, 0, 0); GL11.glPopMatrix(); @@ -202,8 +202,8 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { private void createSideZap(TileInfusionClaw tile) { for(int i = 2; i < 6; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); - createZap(tile, 0.5f + 0.5f*(float)dir.offsetX, 0.6f, 0.5f + 0.5f*(float)dir.offsetZ, 0.5f + dir.offsetX*0.2f, 0.2f, 0.5f + dir.offsetZ*0.2f); - playZapSound(tile.xCoord, tile.yCoord, tile.zCoord); + this.createZap(tile, 0.5f + 0.5f*(float)dir.offsetX, 0.6f, 0.5f + 0.5f*(float)dir.offsetZ, 0.5f + dir.offsetX*0.2f, 0.2f, 0.5f + dir.offsetZ*0.2f); + this.playZapSound(tile.xCoord, tile.yCoord, tile.zCoord); } } @@ -227,7 +227,7 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { tile.animationStates[8] = -tile.animationStates[8]; tile.animationStates[9] = 1; - createSideZap(tile); + this.createSideZap(tile); } } else if (tile.animationStates[8] < 0) { tile.animationStates[8] += elapsed * 0.5; @@ -238,8 +238,8 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { } for (int i = 0; i < 4; i++) { - float heightMove = getNextMoveOffset(tile, i, speed, elapsed); - float widthMove = getNextMoveOffset(tile, i + 4, speed, elapsed); + float heightMove = this.getNextMoveOffset(tile, i, speed, elapsed); + float widthMove = this.getNextMoveOffset(tile, i + 4, speed, elapsed); ForgeDirection dir = ForgeDirection.getOrientation(i + 2); boolean powered = world != null && world.getIndirectPowerLevelTo(x + dir.offsetX, y, z + dir.offsetZ, dir.ordinal()) > 0; @@ -252,7 +252,7 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { GL11.glScalef(0.75f, 0.75f, 0.75f); - renderRedstonePart(powered); + this.renderRedstonePart(powered); GL11.glPopMatrix(); } @@ -260,15 +260,15 @@ public class RenderTileInfusionClaw extends TileEntitySpecialRenderer { } private float getNextMoveOffset(TileInfusionClaw tile, int id, float speed, float elapsed) { - tile.animationStates[id] += RANDOM.nextDouble() * 2 * elapsed * speed; + tile.animationStates[id] += RenderTileInfusionClaw.RANDOM.nextDouble() * 2 * elapsed * speed; return (float) ((1d / 16d) * Math.sin(tile.animationStates[id] / 30)); } private void renderRedstonePart(boolean powered) { - renderPart(powered ? 6 : 5); + this.renderPart(powered ? 6 : 5); } private void renderPart(int num) { - MODELS[num].render(null, 0f, 0f, 0f, 0f, 0f, 0.0625f); + RenderTileInfusionClaw.MODELS[num].render(null, 0f, 0f, 0f, 0f, 0f, 0.0625f); } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java index c477840..6d87f19 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java @@ -23,7 +23,7 @@ public class RenderTileKnowledgeBook extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks) { if(te == null || !(te instanceof TileKnowledgeBook)) return; - renderFloatingBook((TileKnowledgeBook) te, x, y, z, partialTicks); + this.renderFloatingBook((TileKnowledgeBook) te, x, y, z, partialTicks); } private void renderFloatingBook(TileKnowledgeBook te, double x, double y, double z, float partialTicks) { @@ -45,11 +45,11 @@ public class RenderTileKnowledgeBook extends TileEntitySpecialRenderer { float f3 = attributes.field_145925_p + f2 * partialTicks; GL11.glRotatef(-f3 * 180.0F / (float)Math.PI, 0.0F, 1.0F, 0.0F); GL11.glRotatef(80.0F, 0.0F, 0.0F, 1.0F); - this.bindTexture(bookTexture); + this.bindTexture(RenderTileKnowledgeBook.bookTexture); float f4 = attributes.field_145931_j + (attributes.field_145933_i - attributes.field_145931_j) * partialTicks + 0.25F; float f5 = attributes.field_145931_j + (attributes.field_145933_i - attributes.field_145931_j) * partialTicks + 0.75F; - f4 = (f4 - (float)MathHelper.truncateDoubleToInt((double)f4)) * 1.6F - 0.3F; - f5 = (f5 - (float)MathHelper.truncateDoubleToInt((double)f5)) * 1.6F - 0.3F; + f4 = (f4 - (float)MathHelper.truncateDoubleToInt(f4)) * 1.6F - 0.3F; + f5 = (f5 - (float)MathHelper.truncateDoubleToInt(f5)) * 1.6F - 0.3F; if (f4 < 0.0F) { @@ -73,7 +73,7 @@ public class RenderTileKnowledgeBook extends TileEntitySpecialRenderer { //float f6 = attributes.field_145927_n + (attributes.field_145930_m - attributes.field_145927_n) * partialTicks; We don't want it to close.. GL11.glEnable(GL11.GL_CULL_FACE); - modelBook.render(null, 45F, f4, f5, 0.9F, 0.0F, 0.0625F); + RenderTileKnowledgeBook.modelBook.render(null, 45F, f4, f5, 0.9F, 0.0F, 0.0625F); GL11.glPopMatrix(); } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java index d96b6a1..eb457c7 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java @@ -24,7 +24,7 @@ public class RenderTileManipulationFocus extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x, y, z); - bindTexture(new SimpleResourceLocation("models/manipulation_focus_" + tile.getBlockMetadata() + ".png")); + this.bindTexture(new SimpleResourceLocation("models/manipulation_focus_" + tile.getBlockMetadata() + ".png")); GL11.glRotatef(180, 1, 0, 0); GL11.glTranslatef(0.5f, -1.5f + (2/16f), -0.5f); @@ -33,9 +33,9 @@ public class RenderTileManipulationFocus extends TileEntitySpecialRenderer { GL11.glPushMatrix(); for(int i = 0; i < 4; i++) { if(tile.getBlockMetadata() == 0) { - RANDOM_FOCUS.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileManipulationFocus.RANDOM_FOCUS.render(null, 0, 0, 0, 0, 0, 0.0625f); } else { - PORTAL_FOCUS.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileManipulationFocus.PORTAL_FOCUS.render(null, 0, 0, 0, 0, 0, 0.0625f); } GL11.glRotatef(90, 0, 1, 0); @@ -48,6 +48,6 @@ public class RenderTileManipulationFocus extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { - renderTileEntityAt((TileManipulationFocus)tile, x, y, z, partialTicks); + this.renderTileEntityAt((TileManipulationFocus)tile, x, y, z, partialTicks); } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java index dd63136..0f3144d 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java @@ -24,14 +24,14 @@ public class RenderTileManipulatorPillar extends TileInfusionPillarRenderer { @Override public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) { - ResourceLocation originalTexture = BOUND_TEXTURES.get(TC_TEXTURE); - BOUND_TEXTURES.put(TC_TEXTURE, TEXTURE); + ResourceLocation originalTexture = RenderTileManipulatorPillar.BOUND_TEXTURES.get(RenderTileManipulatorPillar.TC_TEXTURE); + RenderTileManipulatorPillar.BOUND_TEXTURES.put(RenderTileManipulatorPillar.TC_TEXTURE, RenderTileManipulatorPillar.TEXTURE); super.renderTileEntityAt(par1TileEntity, par2, par4, par6, par8); if(originalTexture != null) { - BOUND_TEXTURES.put(TC_TEXTURE, originalTexture); + RenderTileManipulatorPillar.BOUND_TEXTURES.put(RenderTileManipulatorPillar.TC_TEXTURE, originalTexture); } else { - BOUND_TEXTURES.remove(TC_TEXTURE); + RenderTileManipulatorPillar.BOUND_TEXTURES.remove(RenderTileManipulatorPillar.TC_TEXTURE); } } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java index defc351..cdd9538 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java @@ -49,7 +49,7 @@ public class RenderTileNodeBasic { public static void renderNode(EntityLivingBase viewer, double viewDistance, boolean visible, boolean depthIgnore, float size, double x, double y, double z, float partialTicks, AspectList aspects, NodeType type, NodeModifier mod) { long nt = System.nanoTime(); - UtilsFX.bindTexture(nodetex); + UtilsFX.bindTexture(RenderTileNodeBasic.nodetex); int frames = 32; if ((aspects.size() > 0) && (visible)) { double distance = viewer.getDistance(x, y, z); //Gadomancy: Removed '+ 0.5D' to coords. @@ -181,7 +181,7 @@ public class RenderTileNodeBasic { //Gadomancy START public static void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { - renderTileEntityAt(tile, x, y, z, partialTicks, 1.0F); + RenderTileNodeBasic.renderTileEntityAt(tile, x, y, z, partialTicks, 1.0F); } //Gadomancy END @@ -217,7 +217,7 @@ public class RenderTileNodeBasic { } } //Gadomancy: Changed from tile.xCoord, ... to x, y, z to make it dependent from params - renderNode(viewer, viewDistance, condition, depthIgnore, size, x, y, z, partialTicks, ((INode) tile).getAspects(), ((INode) tile).getNodeType(), ((INode) tile).getNodeModifier()); + RenderTileNodeBasic.renderNode(viewer, viewDistance, condition, depthIgnore, size, x, y, z, partialTicks, ((INode) tile).getAspects(), ((INode) tile).getNodeType(), ((INode) tile).getNodeModifier()); if (((tile instanceof TileNode)) && (((TileNode) tile).drainEntity != null) && (((TileNode) tile).drainCollision != null)) { Entity drainEntity = ((TileNode) tile).drainEntity; if (((drainEntity instanceof EntityPlayer)) && (!((EntityPlayer) drainEntity).isUsingItem())) { diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java index 004cca1..65415ae 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java @@ -29,7 +29,7 @@ public class RenderTileNodeManipulator extends TileWandPedestalRenderer { GL11.glPushMatrix(); GL11.glColor4f(r, g, b, a); - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + Minecraft.getMinecraft().renderEngine.bindTexture(RenderTileNodeManipulator.TEXTURE); for(int i = 0; i < 4; i++) { GL11.glPushMatrix(); @@ -37,7 +37,7 @@ public class RenderTileNodeManipulator extends TileWandPedestalRenderer { ForgeDirection dir = ForgeDirection.getOrientation(i + 2); GL11.glTranslatef(dir.offsetX * (-6/16f), 0, dir.offsetZ * (-6/16f)); - MODEL.render(null, 0, 0, 0, 0, 0, 0.0625f); + RenderTileNodeManipulator.MODEL.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java index c9f94e1..736b101 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java @@ -40,8 +40,8 @@ public class RenderTileRemoteJar extends TileJarRenderer { renderer.func_147497_a(this.field_147501_a); - if(field_147501_a.field_147553_e != null) { - renderer.renderTileEntityAt(createFakeTile(tile, BlockRemoteJar.getJarTile(tile).networkId != null), 0, 0, 0, partialTicks); + if(this.field_147501_a.field_147553_e != null) { + renderer.renderTileEntityAt(this.createFakeTile(tile, BlockRemoteJar.getJarTile(tile).networkId != null), 0, 0, 0, partialTicks); } GL11.glPopMatrix(); @@ -51,7 +51,7 @@ public class RenderTileRemoteJar extends TileJarRenderer { GL11.glTranslatef(0.5f, 0.002f, 0.5f); GL11.glRotatef(180, 0, 0, 1); - bindTexture(OVERLAY_TEXTURE); + this.bindTexture(RenderTileRemoteJar.OVERLAY_TEXTURE); GL11.glScalef(1.002f, 1f, 1.002f); @@ -59,7 +59,7 @@ public class RenderTileRemoteJar extends TileJarRenderer { GL11.glTranslatef(0, -1.5f, 0); //GL11.glRotatef(180, 1f, 0, 0); - MODEL_JAR_POT.render(null, 0f, 0f, 0f, 0f, 0f, 0.0625f); + RenderTileRemoteJar.MODEL_JAR_POT.render(null, 0f, 0f, 0f, 0f, 0f, 0.0625f); GL11.glPopMatrix(); GL11.glPopAttrib(); diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java index e3956ed..4ee9d1b 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java @@ -36,7 +36,7 @@ public class RenderTileStickyJar extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x, y, z); - rotateJar(stickyJar.placedOn, ForgeDirection.getOrientation(stickyJar.facing)); + this.rotateJar(stickyJar.placedOn, ForgeDirection.getOrientation(stickyJar.facing)); //TESR TileEntitySpecialRenderer renderer = TileEntityRendererDispatcher.instance.getSpecialRenderer(parent); @@ -55,9 +55,9 @@ public class RenderTileStickyJar extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - bindTexture(TextureMap.locationBlocksTexture); + this.bindTexture(TextureMap.locationBlocksTexture); - RENDER_BLOCKS.blockAccess = world; + RenderTileStickyJar.RENDER_BLOCKS.blockAccess = world; Tessellator tess = Tessellator.instance; tess.startDrawingQuads(); @@ -66,7 +66,7 @@ public class RenderTileStickyJar extends TileEntitySpecialRenderer { tess.setTranslation(-tile.xCoord, -tile.yCoord, -tile.zCoord); - RENDER_BLOCKS.renderBlockByRenderType(block, tile.xCoord, tile.yCoord, tile.zCoord); + RenderTileStickyJar.RENDER_BLOCKS.renderBlockByRenderType(block, tile.xCoord, tile.yCoord, tile.zCoord); tess.setTranslation(0, 0, 0); tess.draw(); diff --git a/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java b/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java index f5ab50c..b792500 100644 --- a/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java +++ b/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java @@ -47,7 +47,7 @@ public class GolemGuiTexture extends BaseTexture { { IResource iresource = resourceManager.getResource(this.textureLocation); inputstream = iresource.getInputStream(); - BufferedImage bufferedimage = manipulateImage(resourceManager, ImageIO.read(inputstream)); + BufferedImage bufferedimage = this.manipulateImage(resourceManager, ImageIO.read(inputstream)); boolean flag = false; boolean flag1 = false; @@ -66,7 +66,7 @@ public class GolemGuiTexture extends BaseTexture { } catch (RuntimeException runtimeexception) { - LOGGER.warn("Failed reading metadata of: " + this.textureLocation, runtimeexception); + GolemGuiTexture.LOGGER.warn("Failed reading metadata of: " + this.textureLocation, runtimeexception); } } @@ -86,7 +86,7 @@ public class GolemGuiTexture extends BaseTexture { List types = GadomancyApi.getAdditionalGolemTypes(); - int newHeight = (24*scale) * (getMaxOrdinal() + 1); + int newHeight = (24*scale) * (this.getMaxOrdinal() + 1); BufferedImage newImg = new BufferedImage(image.getWidth(), newHeight < image.getHeight() ? image.getHeight() : newHeight, image.getType()); for(int x = 0; x < image.getWidth(); x++) { @@ -98,12 +98,12 @@ public class GolemGuiTexture extends BaseTexture { for(AdditionalGolemType type : types) { try { int ordinal = type.getEnumEntry().ordinal(); - BufferedImage slotImg = loadImage(resourceManager, type.getInvSlotTexture()); + BufferedImage slotImg = this.loadImage(resourceManager, type.getInvSlotTexture()); float slotScale = (24*scale) / (float)slotImg.getWidth(); if(slotScale > 1) { - slotImg = scaleImage(slotImg, slotScale, slotScale); + slotImg = this.scaleImage(slotImg, slotScale, slotScale); } for(int x = 0; x < slotImg.getWidth(); x++) { @@ -112,7 +112,7 @@ public class GolemGuiTexture extends BaseTexture { } } } catch (IOException e) { - LOGGER.warn("Failed loading golem inventory slot texture of: " + type.getModId() + ":" + type.getName()); + GolemGuiTexture.LOGGER.warn("Failed loading golem inventory slot texture of: " + type.getModId() + ":" + type.getName()); } } return newImg; diff --git a/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java b/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java index bb8d873..f04d2fe 100644 --- a/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java +++ b/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java @@ -34,68 +34,68 @@ public class FakeEntityGolemBase extends EntityGolemBase { //Golem stuff @Override public String getGolemDecoration() { - return golem.getGolemDecoration(); + return this.golem.getGolemDecoration(); } @Override public EnumGolemType getGolemType() { - return golem.getGolemType(); + return this.golem.getGolemType(); } @Override public byte getCore() { - return golem.getCore(); + return this.golem.getCore(); } @Override public int getCarryLimit() { - return golem.getCarryLimit(); + return this.golem.getCarryLimit(); } @Override public byte getUpgrade(int slot) { - return golem.getUpgrade(slot); + return this.golem.getUpgrade(slot); } @Override public int getUpgradeAmount(int type) { - return golem.getUpgradeAmount(type); + return this.golem.getUpgradeAmount(type); } //Player stuff @Override public float getEyeHeight() { - return player.getEyeHeight(); + return this.player.getEyeHeight(); } @Override public ItemStack getCarriedForDisplay() { - return player.getHeldItem(); + return this.player.getHeldItem(); } @Override public ItemStack getHeldItem() { - return player.getHeldItem(); + return this.player.getHeldItem(); } @Override public boolean isSneaking() { - return player.isSneaking(); + return this.player.isSneaking(); } @Override public boolean isEating() { - return player.isEating(); + return this.player.isEating(); } @Override public boolean isInvisible() { - return player.isInvisible(); + return this.player.isInvisible(); } @Override public boolean isSprinting() { - return player.isSprinting(); + return this.player.isSprinting(); } @Override @@ -104,72 +104,72 @@ public class FakeEntityGolemBase extends EntityGolemBase { } public void syncWithPlayer() { - setWorld(player.worldObj); - setPosition(player.posX, player.posY, player.posZ); + this.setWorld(this.player.worldObj); + this.setPosition(this.player.posX, this.player.posY, this.player.posZ); - lastTickPosX = player.lastTickPosX; - lastTickPosY = player.lastTickPosY; - lastTickPosZ = player.lastTickPosZ; + this.lastTickPosX = this.player.lastTickPosX; + this.lastTickPosY = this.player.lastTickPosY; + this.lastTickPosZ = this.player.lastTickPosZ; - motionX = player.motionX; - motionY = player.motionY; - motionZ = player.motionZ; + this.motionX = this.player.motionX; + this.motionY = this.player.motionY; + this.motionZ = this.player.motionZ; - moveForward = player.moveForward; - moveStrafing = player.moveStrafing; + this.moveForward = this.player.moveForward; + this.moveStrafing = this.player.moveStrafing; - onGround = player.onGround; + this.onGround = this.player.onGround; - prevPosX = player.prevPosX; - prevPosY = player.prevPosY; - prevPosZ = player.prevPosZ; + this.prevPosX = this.player.prevPosX; + this.prevPosY = this.player.prevPosY; + this.prevPosZ = this.player.prevPosZ; - rotationPitch = player.rotationPitch; - rotationYaw = player.rotationYaw; - rotationYawHead = player.rotationYawHead; + this.rotationPitch = this.player.rotationPitch; + this.rotationYaw = this.player.rotationYaw; + this.rotationYawHead = this.player.rotationYawHead; - prevRotationPitch = player.prevRotationPitch; - prevRotationYaw = player.prevRotationYaw; - prevRotationYawHead = player.prevRotationYawHead; + this.prevRotationPitch = this.player.prevRotationPitch; + this.prevRotationYaw = this.player.prevRotationYaw; + this.prevRotationYawHead = this.player.prevRotationYawHead; - limbSwing = player.limbSwing; + this.limbSwing = this.player.limbSwing; - limbSwingAmount = player.limbSwingAmount; - prevLimbSwingAmount = player.prevLimbSwingAmount; - isSwingInProgress = player.isSwingInProgress; + this.limbSwingAmount = this.player.limbSwingAmount; + this.prevLimbSwingAmount = this.player.prevLimbSwingAmount; + this.isSwingInProgress = this.player.isSwingInProgress; - swingProgress = player.swingProgress; - prevSwingProgress = player.prevSwingProgress; + this.swingProgress = this.player.swingProgress; + this.prevSwingProgress = this.player.prevSwingProgress; - renderYawOffset = player.renderYawOffset; - prevRenderYawOffset = player.prevRenderYawOffset; + this.renderYawOffset = this.player.renderYawOffset; + this.prevRenderYawOffset = this.player.prevRenderYawOffset; - ticksExisted = player.ticksExisted; - isDead = false; - isAirBorne = player.isAirBorne; + this.ticksExisted = this.player.ticksExisted; + this.isDead = false; + this.isAirBorne = this.player.isAirBorne; - yOffset = 0; + this.yOffset = 0; - swingProgress = player.swingProgress; - prevSwingProgress = player.prevSwingProgress; + this.swingProgress = this.player.swingProgress; + this.prevSwingProgress = this.player.prevSwingProgress; - limbSwing = player.limbSwing; - limbSwingAmount = player.limbSwingAmount; - prevLimbSwingAmount = player.limbSwingAmount; + this.limbSwing = this.player.limbSwing; + this.limbSwingAmount = this.player.limbSwingAmount; + this.prevLimbSwingAmount = this.player.limbSwingAmount; - isSwingInProgress = player.isSwingInProgress; + this.isSwingInProgress = this.player.isSwingInProgress; - itemCarried = player.getHeldItem(); + this.itemCarried = this.player.getHeldItem(); - if(player.isSwingInProgress) { - if(player.getHeldItem() == null) { - action = 6 - player.swingProgressInt; + if(this.player.isSwingInProgress) { + if(this.player.getHeldItem() == null) { + this.action = 6 - this.player.swingProgressInt; } else { - rightArm = 5 - (int)(player.swingProgress * 5); + this.rightArm = 5 - (int)(this.player.swingProgress * 5); } } else { - action = 0; - rightArm = 0; + this.action = 0; + this.rightArm = 0; } } } diff --git a/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java b/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java index 2ecbef4..efacefd 100644 --- a/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java +++ b/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java @@ -38,7 +38,7 @@ public class TransformationHelper { DEFAULT_GOLEM = new FakeEntityGolemBase(golem, null); } - private static PlayerCameraRenderer renderer = null; + private static PlayerCameraRenderer renderer; private static Map transformedPlayers = new HashMap(); @@ -50,7 +50,7 @@ public class TransformationHelper { Minecraft mc = Minecraft.getMinecraft(); return mc.thePlayer.equals(mc.renderViewEntity) && !RegisteredIntegrations.morph.isMorphed() && mc.entityRenderer.getClass().equals(EntityRenderer.class) - && (renderer == null || renderer.isRemoved()); + && (TransformationHelper.renderer == null || TransformationHelper.renderer.isRemoved()); } public static boolean isForeignTransformed() { @@ -62,24 +62,24 @@ public class TransformationHelper { } public static boolean isTransformed() { - return renderer != null && !renderer.isMarkedForRemoval(); + return TransformationHelper.renderer != null && !TransformationHelper.renderer.isMarkedForRemoval(); } public static boolean isTransformed(EntityPlayer player) { if(player.equals(Minecraft.getMinecraft().thePlayer)) - return isTransformed(); - return getTransformedEntityId(player) != -1; + return TransformationHelper.isTransformed(); + return TransformationHelper.getTransformedEntityId(player) != -1; } public static FakeEntityGolemBase getTransformedEntity(EntityPlayer player) { - Integer entityId = transformedPlayers.get(player.getEntityId()); + Integer entityId = TransformationHelper.transformedPlayers.get(player.getEntityId()); if(entityId != null) { - FakeEntityGolemBase golem = entityCache.get(entityId); + FakeEntityGolemBase golem = TransformationHelper.entityCache.get(entityId); if(golem == null) { - EntityGolemBase rawGolem = findGolem(entityId); + EntityGolemBase rawGolem = TransformationHelper.findGolem(entityId); if(rawGolem != null) { golem = new FakeEntityGolemBase(rawGolem, player); - entityCache.put(entityId, golem); + TransformationHelper.entityCache.put(entityId, golem); } } @@ -87,7 +87,7 @@ public class TransformationHelper { return golem; } } - return DEFAULT_GOLEM; + return TransformationHelper.DEFAULT_GOLEM; } private static EntityGolemBase findGolem(int entityId) { @@ -102,47 +102,47 @@ public class TransformationHelper { } public static FakeEntityGolemBase getTransformedEntity() { - return getTransformedEntity(Minecraft.getMinecraft().thePlayer); + return TransformationHelper.getTransformedEntity(Minecraft.getMinecraft().thePlayer); } private static int getTransformedEntityId(EntityPlayer player) { - Integer entityId = transformedPlayers.get(player.getEntityId()); + Integer entityId = TransformationHelper.transformedPlayers.get(player.getEntityId()); return entityId == null ? -1 : entityId; } public static int getTransformedEntityId() { - return getTransformedEntityId(Minecraft.getMinecraft().thePlayer); + return TransformationHelper.getTransformedEntityId(Minecraft.getMinecraft().thePlayer); } public static void cancelTransformation(PacketAbortTransform.AbortReason reason) { - if(isTransformed()) { + if(TransformationHelper.isTransformed()) { PacketHandler.INSTANCE.sendToServer(new PacketAbortTransform(reason)); - onAbortTransformation(Minecraft.getMinecraft().thePlayer.getEntityId()); + TransformationHelper.onAbortTransformation(Minecraft.getMinecraft().thePlayer.getEntityId()); } } public static void onStartTransformation(int targetId, int appearanceId) { if(Minecraft.getMinecraft().thePlayer.getEntityId() == targetId) { - if(isTransformable()) { - transformedPlayers.put(targetId, appearanceId); + if(TransformationHelper.isTransformable()) { + TransformationHelper.transformedPlayers.put(targetId, appearanceId); Minecraft mc = Minecraft.getMinecraft(); - renderer = new PlayerCameraRenderer(mc, mc.entityRenderer); - mc.entityRenderer = renderer; + TransformationHelper.renderer = new PlayerCameraRenderer(mc, mc.entityRenderer); + mc.entityRenderer = TransformationHelper.renderer; } else { - cancelTransformation(PacketAbortTransform.AbortReason.TRANSFORMATION_FAILED); + TransformationHelper.cancelTransformation(PacketAbortTransform.AbortReason.TRANSFORMATION_FAILED); } } else { - transformedPlayers.put(targetId, appearanceId); + TransformationHelper.transformedPlayers.put(targetId, appearanceId); } } public static void onAbortTransformation(int targetId) { - transformedPlayers.remove(targetId); - entityCache.remove(targetId); + TransformationHelper.transformedPlayers.remove(targetId); + TransformationHelper.entityCache.remove(targetId); - if(Minecraft.getMinecraft().thePlayer.getEntityId() == targetId && isTransformed()) { - renderer.markForRemoval(); + if(Minecraft.getMinecraft().thePlayer.getEntityId() == targetId && TransformationHelper.isTransformed()) { + TransformationHelper.renderer.markForRemoval(); } } } \ No newline at end of file diff --git a/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java b/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java index f6da503..2c80f90 100644 --- a/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java +++ b/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java @@ -16,48 +16,48 @@ import thaumcraft.api.nodes.NodeType; public class ExtendedTypeDisplayManager { private static int timeout = 7; - private static int currTime = 0; + private static int currTime; - private static boolean changedLanguageFile = false; - private static String currentNodeId = null; - private static String changedEntry = null; - private static String oldName = null; + private static boolean changedLanguageFile; + private static String currentNodeId; + private static String changedEntry; + private static String oldName; public static void notifyRenderTick() { - if(currTime > timeout) { - if(changedLanguageFile) { - resetLanguageFile(); + if(ExtendedTypeDisplayManager.currTime > ExtendedTypeDisplayManager.timeout) { + if(ExtendedTypeDisplayManager.changedLanguageFile) { + ExtendedTypeDisplayManager.resetLanguageFile(); } } else { - currTime++; + ExtendedTypeDisplayManager.currTime++; } } private static void resetLanguageFile() { - currentNodeId = null; - ResourceReloadListener.languageList.put(changedEntry, oldName); - changedLanguageFile = false; + ExtendedTypeDisplayManager.currentNodeId = null; + ResourceReloadListener.languageList.put(ExtendedTypeDisplayManager.changedEntry, ExtendedTypeDisplayManager.oldName); + ExtendedTypeDisplayManager.changedLanguageFile = false; } public static void notifyDisplayTick(String id, NodeType nodeType, ExtendedNodeType extendedNodeType) { - currTime = 0; + ExtendedTypeDisplayManager.currTime = 0; - if(currentNodeId != null && !currentNodeId.equals(id)) { + if(ExtendedTypeDisplayManager.currentNodeId != null && !ExtendedTypeDisplayManager.currentNodeId.equals(id)) { //New node. - resetLanguageFile(); + ExtendedTypeDisplayManager.resetLanguageFile(); } - if(!changedLanguageFile) { + if(!ExtendedTypeDisplayManager.changedLanguageFile) { String toChance = "nodetype." + nodeType + ".name"; String name = StatCollector.translateToLocal(toChance); String growingStr = StatCollector.translateToLocal("gadomancy.nodes." + extendedNodeType.name()); String newName = name + ", " + growingStr; ResourceReloadListener.languageList.put(toChance, newName); - oldName = name; - changedEntry = toChance; - changedLanguageFile = true; - currentNodeId = id; + ExtendedTypeDisplayManager.oldName = name; + ExtendedTypeDisplayManager.changedEntry = toChance; + ExtendedTypeDisplayManager.changedLanguageFile = true; + ExtendedTypeDisplayManager.currentNodeId = id; } } } diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java index f3aa9fa..350a020 100644 --- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java +++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java @@ -34,7 +34,7 @@ import java.util.Map; */ public class FamiliarHandlerClient { - private static EntityWisp ENTITY_WISP = null; + private static EntityWisp ENTITY_WISP; private static RenderWisp fallbackRenderer; @@ -44,7 +44,7 @@ public class FamiliarHandlerClient { public static void processBoltPacket(PacketFamiliarBolt pkt) { EntityPlayer p = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(pkt.owner); if(p == null || p.getDistanceSqToEntity(Minecraft.getMinecraft().thePlayer) > 1024) return; //32^2 - ExFamiliarData data = clientFamiliars.get(p.getCommandSenderName()); + ExFamiliarData data = FamiliarHandlerClient.clientFamiliars.get(p.getCommandSenderName()); if(data == null) return; PartialEntityFamiliar fam = data.familiar; float y = (float) (fam.posY + 1.22F); @@ -60,16 +60,16 @@ public class FamiliarHandlerClient { @SideOnly(Side.CLIENT) public static void playerRenderEvent(EntityPlayer player, float partialTicks) { String ownerName = player.getCommandSenderName(); - if(!clientFamiliars.containsKey(ownerName)) return; + if(!FamiliarHandlerClient.clientFamiliars.containsKey(ownerName)) return; - ExFamiliarData data = clientFamiliars.get(ownerName); + ExFamiliarData data = FamiliarHandlerClient.clientFamiliars.get(ownerName); PartialEntityFamiliar fam = data.familiar; Aspect aspect = Aspect.getAspect(data.data.aspectTag); - if(ENTITY_WISP == null) ENTITY_WISP = new EntityWisp(new FakeWorld()); - ENTITY_WISP.setType(aspect.getTag()); - ENTITY_WISP.ticksExisted = fam.dummyEntity.ticksExisted; + if(FamiliarHandlerClient.ENTITY_WISP == null) FamiliarHandlerClient.ENTITY_WISP = new EntityWisp(new FakeWorld()); + FamiliarHandlerClient.ENTITY_WISP.setType(aspect.getTag()); + FamiliarHandlerClient.ENTITY_WISP.ticksExisted = fam.dummyEntity.ticksExisted; GL11.glPushMatrix(); if(fam.owner == null || fam.owner.get() == null) { fam.owner = new WeakReference(player); @@ -91,35 +91,35 @@ public class FamiliarHandlerClient { diffZ -= ((entity.posZ - entity.lastTickPosZ) * partialTicks); } - ItemRenderFamiliar.renderEntityWispFor(fam.owner.get(), ENTITY_WISP, diffX, diffY, diffZ, 0, partialTicks); + ItemRenderFamiliar.renderEntityWispFor(fam.owner.get(), FamiliarHandlerClient.ENTITY_WISP, diffX, diffY, diffZ, 0, partialTicks); GL11.glPopMatrix(); } @SideOnly(Side.CLIENT) public static void playerTickEvent() { if(Minecraft.getMinecraft().theWorld == null) return; - for(ExFamiliarData data : clientFamiliars.values()) { + for(ExFamiliarData data : FamiliarHandlerClient.clientFamiliars.values()) { data.familiar.tick(); } PartialEntityFamiliar.DUMMY_FAMILIAR.tick(); } static { - fallbackRenderer = new RenderWisp(); - fallbackRenderer.setRenderManager(RenderManager.instance); + FamiliarHandlerClient.fallbackRenderer = new RenderWisp(); + FamiliarHandlerClient.fallbackRenderer.setRenderManager(RenderManager.instance); } public static void handleAdditions(List toAdd) { for(DataFamiliar.FamiliarData data : toAdd) { PartialEntityFamiliar familiar = new PartialEntityFamiliar(Minecraft.getMinecraft().theWorld.getPlayerEntityByName(data.owner), data.owner); ExFamiliarData exData = new ExFamiliarData(data, familiar); - clientFamiliars.put(data.owner, exData); + FamiliarHandlerClient.clientFamiliars.put(data.owner, exData); } } public static void handleRemovals(List toRemove) { for(DataFamiliar.FamiliarData data : toRemove) { - clientFamiliars.remove(data.owner); + FamiliarHandlerClient.clientFamiliars.remove(data.owner); } } @@ -136,18 +136,18 @@ public class FamiliarHandlerClient { @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (o == null || this.getClass() != o.getClass()) return false; ExFamiliarData that = (ExFamiliarData) o; - return !(data != null ? !data.equals(that.data) : that.data != null) && !(familiar != null ? !familiar.equals(that.familiar) : that.familiar != null); + return (this.data != null ? this.data.equals(that.data) : that.data == null) && (this.familiar != null ? this.familiar.equals(that.familiar) : that.familiar == null); } @Override public int hashCode() { - int result = data != null ? data.hashCode() : 0; - result = 31 * result + (familiar != null ? familiar.hashCode() : 0); + int result = this.data != null ? this.data.hashCode() : 0; + result = 31 * result + (this.familiar != null ? this.familiar.hashCode() : 0); return result; } } @@ -182,7 +182,7 @@ public class FamiliarHandlerClient { public double posX, posY, posZ; public double renderX, renderY, renderZ; public double prevPosX, prevPosY, prevPosZ; - public int ticksExisted = 0; + public int ticksExisted; public PartialEntityFamiliar(EntityPlayer owner, String ownerNameToSearch) { this.owner = new WeakReference(owner); @@ -190,14 +190,14 @@ public class FamiliarHandlerClient { } public void tick() { - ticksExisted++; - dummyEntity.ticksExisted = ticksExisted; + this.ticksExisted++; + this.dummyEntity.ticksExisted = this.ticksExisted; - if(owner.get() == null) { - if(potentialOwnerName != null) { - EntityPlayer player = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(potentialOwnerName); + if(this.owner.get() == null) { + if(this.potentialOwnerName != null) { + EntityPlayer player = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(this.potentialOwnerName); if(player != null) { - owner = new WeakReference(player); + this.owner = new WeakReference(player); } else { return; } @@ -205,8 +205,8 @@ public class FamiliarHandlerClient { return; } } else { - if(owner.get().worldObj.provider.dimensionId != Minecraft.getMinecraft().renderViewEntity.worldObj.provider.dimensionId) { - owner = new WeakReference(null); + if(this.owner.get().worldObj.provider.dimensionId != Minecraft.getMinecraft().renderViewEntity.worldObj.provider.dimensionId) { + this.owner = new WeakReference(null); return; } } @@ -215,15 +215,15 @@ public class FamiliarHandlerClient { this.prevPosY = this.posY; this.prevPosZ = this.posZ; - double part = ((double) ticksExisted) / ((double) CRICLE_TIME_TICKS); - double theta = RAD_CAP * part; - this.renderX = RADIUS * Math.cos(theta); - this.renderZ = RADIUS * Math.sin(theta); + double part = ((double) this.ticksExisted) / ((double) PartialEntityFamiliar.CRICLE_TIME_TICKS); + double theta = PartialEntityFamiliar.RAD_CAP * part; + this.renderX = PartialEntityFamiliar.RADIUS * Math.cos(theta); + this.renderZ = PartialEntityFamiliar.RADIUS * Math.sin(theta); this.renderY = Math.sin(theta * 2) / 2D; - this.posX = owner.get().posX + renderX; - this.posZ = owner.get().posZ + renderZ; - this.posY = owner.get().posY + renderY; + this.posX = this.owner.get().posX + this.renderX; + this.posZ = this.owner.get().posZ + this.renderZ; + this.posY = this.owner.get().posY + this.renderY; } } diff --git a/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java b/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java index 2726dc1..25009c2 100644 --- a/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java +++ b/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java @@ -30,18 +30,18 @@ public class MultiTickEffectDispatcher { private static List bubbleInfos = new ArrayList(); public static void notifyRenderTick(World currentRenderWorld, float partialTicks) { - renderLock.lock(); + MultiTickEffectDispatcher.renderLock.lock(); try { - handleVortexDiggingEffects(currentRenderWorld); - handleWispyLineEffects(currentRenderWorld, partialTicks); - handleBubbleSpawnings(currentRenderWorld); + MultiTickEffectDispatcher.handleVortexDiggingEffects(currentRenderWorld); + MultiTickEffectDispatcher.handleWispyLineEffects(currentRenderWorld, partialTicks); + MultiTickEffectDispatcher.handleBubbleSpawnings(currentRenderWorld); } finally { - renderLock.unlock(); + MultiTickEffectDispatcher.renderLock.unlock(); } } private static void handleBubbleSpawnings(World world) { - Iterator it = bubbleInfos.iterator(); + Iterator it = MultiTickEffectDispatcher.bubbleInfos.iterator(); while(it.hasNext()) { BubbleFXInfo info = it.next(); if(info.dimId != world.provider.dimensionId) { @@ -68,7 +68,7 @@ public class MultiTickEffectDispatcher { private static void handleWispyLineEffects(World currentRenderWorld, float partialTicks) { Tessellator tessellator; - Iterator it = floatyLineInfos.iterator(); + Iterator it = MultiTickEffectDispatcher.floatyLineInfos.iterator(); while(it.hasNext()) { FloatyLineInfo info = it.next(); if(info.dimId != currentRenderWorld.provider.dimensionId) { @@ -91,7 +91,7 @@ public class MultiTickEffectDispatcher { } private static void handleVortexDiggingEffects(World currentRenderWorld) { - Iterator it = vortexDigInfos.iterator(); + Iterator it = MultiTickEffectDispatcher.vortexDigInfos.iterator(); while(it.hasNext()) { VortexDigInfo info = it.next(); if(info.dimId != currentRenderWorld.provider.dimensionId) { @@ -109,29 +109,29 @@ public class MultiTickEffectDispatcher { } public static void registerBubbles(BubbleFXInfo info) { - renderLock.lock(); + MultiTickEffectDispatcher.renderLock.lock(); try { - bubbleInfos.add(info); + MultiTickEffectDispatcher.bubbleInfos.add(info); } finally { - renderLock.unlock(); + MultiTickEffectDispatcher.renderLock.unlock(); } } public static void registerVortexDig(VortexDigInfo info) { - renderLock.lock(); + MultiTickEffectDispatcher.renderLock.lock(); try { - vortexDigInfos.add(info); + MultiTickEffectDispatcher.vortexDigInfos.add(info); } finally { - renderLock.unlock(); + MultiTickEffectDispatcher.renderLock.unlock(); } } public static void registerFloatyLine(FloatyLineInfo info) { - renderLock.lock(); + MultiTickEffectDispatcher.renderLock.lock(); try { - floatyLineInfos.add(info); + MultiTickEffectDispatcher.floatyLineInfos.add(info); } finally { - renderLock.unlock(); + MultiTickEffectDispatcher.renderLock.unlock(); } } @@ -140,7 +140,7 @@ public class MultiTickEffectDispatcher { private int dimId; private double pedestalX, pedestalY, pedestalZ; private double originX, originY, originZ; - private int renderTicks = 0; + private int renderTicks; private int tickCap; private int colorAsInt; private int randomOffset = -1; @@ -182,7 +182,7 @@ public class MultiTickEffectDispatcher { private int tX, tY, tZ; private Block blockInstance; private int meta; - private int renderTicks = 0; + private int renderTicks; private int tickCap; public VortexDigInfo(int dimId, int oX, int oY, int oZ, int tX, int tY, int tZ, Block blockInstance, int meta, int tickDuration) { diff --git a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java index 817ed8b..16baeef 100644 --- a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java +++ b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java @@ -20,17 +20,17 @@ import java.util.Random; */ public class UtilsFX { - private static final Color[] RUNE_COLORS_RED = new Color[] { new Color(0xB60707), new Color(0xEE3782), new Color(0xF37B20), new Color(0xFF6722), new Color(0xFF6D30), new Color(0xFF0000) }; - private static final Color[] RUNE_COLORS_GREEN = new Color[] { new Color(0x015629), new Color(0x0E9C00), new Color(0x010000), new Color(0x01FF00), new Color(0x014C3E)}; - private static final Color[] RUNE_COLORS_BLUE = new Color[] { new Color(0x060956), new Color(0x012578), new Color(0x0C1556), new Color(0x0100FF), new Color(0x01018C)}; + private static final Color[] RUNE_COLORS_RED = { new Color(0xB60707), new Color(0xEE3782), new Color(0xF37B20), new Color(0xFF6722), new Color(0xFF6D30), new Color(0xFF0000) }; + private static final Color[] RUNE_COLORS_GREEN = { new Color(0x015629), new Color(0x0E9C00), new Color(0x010000), new Color(0x01FF00), new Color(0x014C3E)}; + private static final Color[] RUNE_COLORS_BLUE = { new Color(0x060956), new Color(0x012578), new Color(0x0C1556), new Color(0x0100FF), new Color(0x01018C)}; public static void doRuneEffects(World world, int x, int y, int z, int colorFlag) { if(world.isRemote) { int cnt = 20; while(cnt > 0) { cnt--; - Color rand = evaluateRandomColor(world.rand, colorFlag); - Thaumcraft.proxy.blockRunes(world, x + randomOffset(world), y + randomOffset(world), z + randomOffset(world), + Color rand = UtilsFX.evaluateRandomColor(world.rand, colorFlag); + Thaumcraft.proxy.blockRunes(world, x + UtilsFX.randomOffset(world), y + UtilsFX.randomOffset(world), z + UtilsFX.randomOffset(world), rand.getRed() / 255F, rand.getGreen() / 255F, rand.getBlue() / 255F, world.rand.nextInt(10) + 30, -0.01F - (world.rand.nextBoolean() ? world.rand.nextBoolean() ? 0.02F : 0.01F : 0F)); } } @@ -39,9 +39,9 @@ public class UtilsFX { private static Color evaluateRandomColor(Random rand, int colorFlag) { Color[] possibleColors; if(colorFlag == 1) { - possibleColors = RUNE_COLORS_BLUE; + possibleColors = UtilsFX.RUNE_COLORS_BLUE; } else { - possibleColors = RUNE_COLORS_RED; + possibleColors = UtilsFX.RUNE_COLORS_RED; } return possibleColors[rand.nextInt(possibleColors.length)]; } @@ -52,7 +52,7 @@ public class UtilsFX { public static void doSparkleEffectsAround(World world, int x, int y, int z) { for(ChunkCoordinates cc : MiscUtils.getCoordinatesAround(new ChunkCoordinates(x, y, z))) { - doSparkleEffects(world, cc.posX, cc.posY, cc.posZ); + UtilsFX.doSparkleEffects(world, cc.posX, cc.posY, cc.posZ); } } @@ -64,14 +64,14 @@ public class UtilsFX { int count = world.rand.nextInt(6) + 2; for (int i = 0; i < count; i++) { Minecraft.getMinecraft().effectRenderer.addEffect( - new EntitySmokeFX(world, x + 0.5 + randEffectOffset(world.rand), y + 0.5 + randEffectOffset(world.rand), z + 0.5 + randEffectOffset(world.rand), - randEffectOffset(world.rand) * 0.01F, randEffectOffset(world.rand) * 0.1F, randEffectOffset(world.rand) * 0.01F, size)); + new EntitySmokeFX(world, x + 0.5 + UtilsFX.randEffectOffset(world.rand), y + 0.5 + UtilsFX.randEffectOffset(world.rand), z + 0.5 + UtilsFX.randEffectOffset(world.rand), + UtilsFX.randEffectOffset(world.rand) * 0.01F, UtilsFX.randEffectOffset(world.rand) * 0.1F, UtilsFX.randEffectOffset(world.rand) * 0.01F, size)); } } public static void doSmokeEffectsAround(World world, int x, int y, int z, float size) { for(ChunkCoordinates cc : MiscUtils.getCoordinatesAround(new ChunkCoordinates(x, y, z))) { - doSmokeEffects(world, cc.posX, cc.posY, cc.posZ, size); + UtilsFX.doSmokeEffects(world, cc.posX, cc.posY, cc.posZ, size); } } diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 7e1efd8..8c40348 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -21,7 +21,6 @@ import makeo.gadomancy.common.utils.Injector; import makeo.gadomancy.common.utils.world.WorldProviderTCEldrich; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; @@ -44,7 +43,7 @@ import java.util.List; */ public class CommonProxy implements IGuiHandler { - public static boolean serverOnlineState = false; + public static boolean serverOnlineState; public static final EventHandlerGolem EVENT_HANDLER_GOLEM = new EventHandlerGolem(); @@ -65,7 +64,7 @@ public class CommonProxy implements IGuiHandler { public void initalize() { NetworkRegistry.INSTANCE.registerGuiHandler(Gadomancy.instance, this); - MinecraftForge.EVENT_BUS.register(EVENT_HANDLER_GOLEM); + MinecraftForge.EVENT_BUS.register(CommonProxy.EVENT_HANDLER_GOLEM); FMLCommonHandler.instance().bus().register(new EventHandlerNetwork()); EventHandlerWorld worldEventHandler = new EventHandlerWorld(); MinecraftForge.EVENT_BUS.register(worldEventHandler); diff --git a/src/main/java/makeo/gadomancy/common/Gadomancy.java b/src/main/java/makeo/gadomancy/common/Gadomancy.java index 74efb03..04fa78a 100644 --- a/src/main/java/makeo/gadomancy/common/Gadomancy.java +++ b/src/main/java/makeo/gadomancy/common/Gadomancy.java @@ -2,11 +2,7 @@ package makeo.gadomancy.common; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLConstructionEvent; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.*; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.common.api.DefaultApiHandler; import makeo.gadomancy.common.data.config.ModConfig; @@ -33,53 +29,53 @@ public class Gadomancy { private static final String PROXY_CLIENT = "makeo.gadomancy.client.ClientProxy"; private static final String PROXY_SERVER = "makeo.gadomancy.common.CommonProxy"; - @Mod.Instance(value = Gadomancy.MODID) + @Mod.Instance(Gadomancy.MODID) public static Gadomancy instance; - @SidedProxy(clientSide = PROXY_CLIENT, serverSide = PROXY_SERVER) + @SidedProxy(clientSide = Gadomancy.PROXY_CLIENT, serverSide = Gadomancy.PROXY_SERVER) public static CommonProxy proxy; public static Logger log = LogManager.getLogger("Gadomancy"); - private static ModData modData = null; + private static ModData modData; public static ModData getModData() { - return modData; + return Gadomancy.modData; } public static void loadModData() { - modData = new ModData("data"); - modData.load(); + Gadomancy.modData = new ModData("data"); + Gadomancy.modData.load(); } public static void unloadModData() { - if(modData != null) { - modData.save(); - modData = null; + if(Gadomancy.modData != null) { + Gadomancy.modData.save(); + Gadomancy.modData = null; } } @Mod.EventHandler public void onConstruct(FMLConstructionEvent event) { GadomancyApi.setInstance(new DefaultApiHandler()); - proxy.onConstruct(); + Gadomancy.proxy.onConstruct(); } @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - event.getModMetadata().version = VERSION; + event.getModMetadata().version = Gadomancy.VERSION; ModConfig.init(event.getSuggestedConfigurationFile()); - proxy.preInitalize(); + Gadomancy.proxy.preInitalize(); } @Mod.EventHandler public void init(FMLInitializationEvent event) { - proxy.initalize(); + Gadomancy.proxy.initalize(); FMLInterModComms.sendMessage(Thaumcraft.MODID, "dimensionBlacklist", ModConfig.dimOuterId + ":0"); } @Mod.EventHandler public void postInit(FMLPostInitializationEvent event) { - proxy.postInitalize(); + Gadomancy.proxy.postInitalize(); } } diff --git a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java index beae828..461923b 100644 --- a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java +++ b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java @@ -7,11 +7,11 @@ import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import makeo.gadomancy.api.internal.IApiHandler; import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.aura.AuraEffectHandler; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.entities.golems.ItemAdditionalGolemPlacer; import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.aura.AuraEffectHandler; import makeo.gadomancy.common.utils.GolemEnumHelper; import makeo.gadomancy.common.utils.NBTHelper; import makeo.gadomancy.common.utils.StringHelper; @@ -44,7 +44,7 @@ public class DefaultApiHandler implements IApiHandler { @Override public boolean registerAdditionalGolemType(String name, String modId, AdditionalGolemType newType) { String uniqueName = name.toUpperCase(); - if(!additionalGolemTypes.containsKey(uniqueName)) { + if(!DefaultApiHandler.additionalGolemTypes.containsKey(uniqueName)) { GolemEnumHelper.addGolemType(uniqueName, newType); ItemAdditionalGolemPlacer placerItem = new ItemAdditionalGolemPlacer(newType); @@ -52,7 +52,7 @@ public class DefaultApiHandler implements IApiHandler { newType.setModId(modId); newType.setPlacerItem(placerItem); - additionalGolemTypes.put(uniqueName, newType); + DefaultApiHandler.additionalGolemTypes.put(uniqueName, newType); return true; } return false; @@ -60,12 +60,12 @@ public class DefaultApiHandler implements IApiHandler { @Override public AdditionalGolemType getAdditionalGolemType(String name) { - return additionalGolemTypes.get(name.toUpperCase()); + return DefaultApiHandler.additionalGolemTypes.get(name.toUpperCase()); } @Override public List getAdditionalGolemTypes() { - return new ArrayList(additionalGolemTypes.values()); + return new ArrayList(DefaultApiHandler.additionalGolemTypes.values()); } private static Map additionalGolemCores = new HashMap(); @@ -74,7 +74,7 @@ public class DefaultApiHandler implements IApiHandler { public AdditionalGolemCore getAdditionalGolemCore(EntityGolemBase golem) { String coreName = golem.getDataWatcher().getWatchableObjectString(ModConfig.golemDatawatcherId); if(!coreName.isEmpty()) { - return additionalGolemCores.get(coreName); + return DefaultApiHandler.additionalGolemCores.get(coreName); } return null; } @@ -84,7 +84,7 @@ public class DefaultApiHandler implements IApiHandler { if(NBTHelper.hasPersistentData(placer)) { NBTTagCompound persistent = NBTHelper.getPersistentData(placer); if(persistent.hasKey("Core")) { - return additionalGolemCores.get(persistent.getString("Core")); + return DefaultApiHandler.additionalGolemCores.get(persistent.getString("Core")); } } return null; @@ -92,9 +92,9 @@ public class DefaultApiHandler implements IApiHandler { @Override public boolean registerAdditionalGolemCore(String name, AdditionalGolemCore core) { - if(!additionalGolemCores.containsKey(name)) { + if(!DefaultApiHandler.additionalGolemCores.containsKey(name)) { core.setName(name); - additionalGolemCores.put(name, core); + DefaultApiHandler.additionalGolemCores.put(name, core); return true; } return false; @@ -120,7 +120,7 @@ public class DefaultApiHandler implements IApiHandler { @Override public List getAdditionalGolemCores() { - return new ArrayList(additionalGolemCores.values()); + return new ArrayList(DefaultApiHandler.additionalGolemCores.values()); } @Override @@ -132,7 +132,7 @@ public class DefaultApiHandler implements IApiHandler { public void registerAdditionalAuraEffect(Aspect aspect, AuraEffect effect) { if(aspect == null || effect == null) return; if(AuraEffectHandler.registeredEffects.containsKey(aspect)) { - log.warn("AuraEffect for '" + aspect.getTag() + "' is already registered!"); + DefaultApiHandler.log.warn("AuraEffect for '" + aspect.getTag() + "' is already registered!"); } else { AuraEffectHandler.registeredEffects.put(aspect, effect); } diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java index 957f62c..b6918d7 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.aura; import makeo.gadomancy.api.AuraEffect; -import makeo.gadomancy.common.data.config.ModConfig; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; @@ -9,11 +8,7 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** * This class is part of the Gadomancy Mod @@ -28,23 +23,23 @@ public class AuraEffectHandler { public static Map registeredEffects = new HashMap(); public static void distributeEffects(Aspect aspect, World worldObj, double x, double y, double z, int tick) { - if(!registeredEffects.containsKey(aspect) || worldObj.isRemote || AuraResearchManager.isBlacklisted(aspect)) return; - AuraEffect effect = registeredEffects.get(aspect); + if(!AuraEffectHandler.registeredEffects.containsKey(aspect) || worldObj.isRemote || AuraResearchManager.isBlacklisted(aspect)) return; + AuraEffect effect = AuraEffectHandler.registeredEffects.get(aspect); if((tick % effect.getTickInterval()) != 0) return; AuraEffect.EffectType type = effect.getEffectType(); if(type != null) { switch (type) { case ENTITY_EFFECT: - doEntityEffects(effect, worldObj, x, y, z); + AuraEffectHandler.doEntityEffects(effect, worldObj, x, y, z); break; case BLOCK_EFFECT: - doBlockEffects(effect, worldObj, x, y, z); + AuraEffectHandler.doBlockEffects(effect, worldObj, x, y, z); break; } } else { - doEntityEffects(effect, worldObj, x, y, z); - doBlockEffects(effect, worldObj, x, y, z); + AuraEffectHandler.doEntityEffects(effect, worldObj, x, y, z); + AuraEffectHandler.doBlockEffects(effect, worldObj, x, y, z); } //Distribute research diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java index ef664f7..5b1df44 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java @@ -4,12 +4,10 @@ import makeo.gadomancy.api.AuraEffect; import makeo.gadomancy.common.events.EventHandlerEntity; import makeo.gadomancy.common.integration.IntegrationThaumicTinkerer; import makeo.gadomancy.common.registration.RegisteredIntegrations; -import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.registration.RegisteredPotions; import makeo.gadomancy.common.utils.MiscUtils; import net.minecraft.block.Block; import net.minecraft.entity.*; -import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.monster.EntitySkeleton; @@ -38,18 +36,16 @@ import thaumcraft.common.config.Config; import thaumcraft.common.config.ConfigEntities; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.monster.EntityBrainyZombie; -import thaumcraft.common.entities.monster.boss.EntityThaumcraftBoss; -import thaumcraft.common.entities.monster.mods.ChampionModifier; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.research.ScanManager; import thaumcraft.common.lib.utils.EntityUtils; import thaumcraft.common.lib.utils.Utils; import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; -import java.lang.reflect.InvocationTargetException; import java.util.Random; -import static makeo.gadomancy.common.utils.MiscUtils.*; +import static makeo.gadomancy.common.utils.MiscUtils.ticksForMinutes; +import static makeo.gadomancy.common.utils.MiscUtils.ticksForSeconds; /** * This class is part of the Gadomancy Mod @@ -252,9 +248,9 @@ public class AuraEffects { @Override public void doEntityEffect(ChunkCoordinates originTile, Entity e) { - addOrExtendPotionEffect(Potion.damageBoost, (EntityLivingBase) e, ticksForMinutes(3), 30, 1, false); - addOrExtendPotionEffect(Potion.moveSpeed, (EntityLivingBase) e, ticksForMinutes(3), 30, 0, false); - addOrExtendPotionEffect(Potion.regeneration, (EntityLivingBase) e, ticksForMinutes(3), 30, 0, false); + AuraEffects.addOrExtendPotionEffect(Potion.damageBoost, (EntityLivingBase) e, ticksForMinutes(3), 30, 1, false); + AuraEffects.addOrExtendPotionEffect(Potion.moveSpeed, (EntityLivingBase) e, ticksForMinutes(3), 30, 0, false); + AuraEffects.addOrExtendPotionEffect(Potion.regeneration, (EntityLivingBase) e, ticksForMinutes(3), 30, 0, false); } @Override @@ -270,10 +266,10 @@ public class AuraEffects { @Override public void doBlockEffect(ChunkCoordinates originTile, ChunkCoordinates selectedBlock, World world) { EntityBrainyZombie zombie = new EntityBrainyZombie(world); - boolean canSpawn = setAndCheckPosition(zombie, selectedBlock, world, true) && zombie.getCanSpawnHere(); //Position for getCanSpawn here is updated. + boolean canSpawn = AuraEffects.setAndCheckPosition(zombie, selectedBlock, world, true) && zombie.getCanSpawnHere(); //Position for getCanSpawn here is updated. if(canSpawn) { ChunkCoordinates pos = new ChunkCoordinates((int) zombie.posX, (int) zombie.posY, (int) zombie.posZ); - pos = iterateDown(pos, world); + pos = AuraEffects.iterateDown(pos, world); zombie.setPosition(pos.posX + 0.5, pos.posY, pos.posZ + 0.5); world.spawnEntityInWorld(zombie); } @@ -350,7 +346,7 @@ public class AuraEffects { public void doEntityEffect(ChunkCoordinates originTile, Entity e) { EntityGolemBase golem = (EntityGolemBase) e; - addOrExtendPotionEffect(RegisteredPotions.BUFF_GOLEM, golem, ticksForMinutes(6), 10, 0, false); + AuraEffects.addOrExtendPotionEffect(RegisteredPotions.BUFF_GOLEM, golem, ticksForMinutes(6), 10, 0, false); } @Override @@ -371,7 +367,7 @@ public class AuraEffects { @Override public void doBlockEffect(ChunkCoordinates originTile, ChunkCoordinates selectedBlock, World world) { - waterLocation(selectedBlock, world); + AuraEffects.waterLocation(selectedBlock, world); } @Override @@ -387,7 +383,7 @@ public class AuraEffects { @Override public void doBlockEffect(ChunkCoordinates originTile, ChunkCoordinates selectedBlock, World world) { - waterLocation(selectedBlock, world); + AuraEffects.waterLocation(selectedBlock, world); } @Override @@ -461,7 +457,7 @@ public class AuraEffects { @Override public void doBlockEffect(ChunkCoordinates originTile, ChunkCoordinates selectedBlock, World world) { EntityLiving mob = world.rand.nextBoolean() ? new EntitySkeleton(world) : new EntityZombie(world); - if(setAndCheckPosition(mob, selectedBlock, world, true) && world.difficultySetting != EnumDifficulty.PEACEFUL) { + if(AuraEffects.setAndCheckPosition(mob, selectedBlock, world, true) && world.difficultySetting != EnumDifficulty.PEACEFUL) { for(int i = 0; i < 5; i++) { mob.setCurrentItemOrArmor(i, null); } @@ -471,7 +467,7 @@ public class AuraEffects { do { int slot = mob.getEquipmentInSlot(0) == null ? 0 : (mob.getEquipmentInSlot(4) == null ? 4 : (world.rand.nextInt(3)+1)); if(mob.getEquipmentInSlot(slot) == null) { - ItemStack[] items = ITEMS_SOUL[slot]; + ItemStack[] items = AuraEffects.ITEMS_SOUL[slot]; ItemStack stack = items[world.rand.nextInt(items.length)]; if(stack.getItem() != Items.bow || mob instanceof EntitySkeleton) { totalCount--; @@ -486,7 +482,7 @@ public class AuraEffects { mob.addPotionEffect(new PotionEffect(Potion.invisibility.getId(), MiscUtils.ticksForMinutes(60*24*365), 1, true)); ChunkCoordinates pos = new ChunkCoordinates((int) mob.posX, (int) mob.posY, (int) mob.posZ); - pos = iterateDown(pos, world); + pos = AuraEffects.iterateDown(pos, world); mob.setPosition(pos.posX + 0.5, pos.posY, pos.posZ + 0.5); world.spawnEntityInWorld(mob); } @@ -507,10 +503,10 @@ public class AuraEffects { slime.writeEntityToNBT(data); data.setInteger("Size", 0); slime.readEntityFromNBT(data); - boolean canSpawn = setAndCheckPosition(slime, selectedBlock, world, true) && world.difficultySetting != EnumDifficulty.PEACEFUL; + boolean canSpawn = AuraEffects.setAndCheckPosition(slime, selectedBlock, world, true) && world.difficultySetting != EnumDifficulty.PEACEFUL; if(canSpawn) { ChunkCoordinates pos = new ChunkCoordinates((int) slime.posX, (int) slime.posY, (int) slime.posZ); - pos = iterateDown(pos, world); + pos = AuraEffects.iterateDown(pos, world); slime.setPosition(pos.posX + 0.5, pos.posY, pos.posZ + 0.5); world.spawnEntityInWorld(slime); } @@ -523,7 +519,7 @@ public class AuraEffects { }.register(Aspect.SLIME); public static final AuraEffect BESTIA = new AuraEffect.BlockAuraEffect() { - private final Class[] animalClasses = new Class[] { EntitySheep.class, EntityCow.class, EntityChicken.class, EntityPig.class }; + private final Class[] animalClasses = { EntitySheep.class, EntityCow.class, EntityChicken.class, EntityPig.class }; @Override public int getBlockCount(Random random) { @@ -532,17 +528,17 @@ public class AuraEffects { @Override public void doBlockEffect(ChunkCoordinates originTile, ChunkCoordinates selectedBlock, World world) { - Class animalClass = animalClasses[world.rand.nextInt(animalClasses.length)]; + Class animalClass = this.animalClasses[world.rand.nextInt(this.animalClasses.length)]; EntityLivingBase animal; try { animal = (EntityLivingBase) animalClass.getConstructor(World.class).newInstance(world); } catch (Exception e) { return; } - boolean canSpawn = setAndCheckPosition(animal, selectedBlock, world, true); + boolean canSpawn = AuraEffects.setAndCheckPosition(animal, selectedBlock, world, true); if(canSpawn) { ChunkCoordinates pos = new ChunkCoordinates((int) animal.posX, (int) animal.posY, (int) animal.posZ); - pos = iterateDown(pos, world); + pos = AuraEffects.iterateDown(pos, world); animal.setPosition(pos.posX + 0.5, pos.posY, pos.posZ + 0.5); world.spawnEntityInWorld(animal); } @@ -584,12 +580,12 @@ public class AuraEffects { if (e == null || !(e instanceof EntityLivingBase)) return; EntityLivingBase living = (EntityLivingBase) e; - addOrExtendPotionEffect(potion, living, durationCap, addedDuration, amplifier); + AuraEffects.addOrExtendPotionEffect(this.potion, living, this.durationCap, this.addedDuration, this.amplifier); } @Override public int getTickInterval() { - return tickInterval; + return this.tickInterval; } } @@ -622,7 +618,7 @@ public class AuraEffects { } private static void addOrExtendPotionEffect(Potion potion, EntityLivingBase entityLiving, int cap, int durToAdd, int amplifier) { - addOrExtendPotionEffect(potion, entityLiving, cap, durToAdd, amplifier, true); + AuraEffects.addOrExtendPotionEffect(potion, entityLiving, cap, durToAdd, amplifier, true); } private static ChunkCoordinates iterateDown(ChunkCoordinates pos, World world) { @@ -639,11 +635,11 @@ public class AuraEffects { if(!world.isAirBlock(cc.posX, cc.posY, cc.posZ)) { if(!mayVary) return false; ChunkCoordinates up = new ChunkCoordinates(cc.posX, cc.posY + 1, cc.posZ); - if(setAndCheckPosition(entity, up, world, false)) { + if(AuraEffects.setAndCheckPosition(entity, up, world, false)) { return true; } ChunkCoordinates down = new ChunkCoordinates(cc.posX, cc.posY - 1, cc.posZ); - return setAndCheckPosition(entity, down, world, false); + return AuraEffects.setAndCheckPosition(entity, down, world, false); } ChunkCoordinates up = new ChunkCoordinates(cc.posX, cc.posY + 1, cc.posZ); if(world.isAirBlock(up.posX, up.posY, up.posZ)) { @@ -657,14 +653,13 @@ public class AuraEffects { } if(!mayVary) return false; ChunkCoordinates hMove = new ChunkCoordinates(cc.posX + 1, cc.posY, cc.posZ ); - if(setAndCheckPosition(entity, hMove, world, false)) return true; + if(AuraEffects.setAndCheckPosition(entity, hMove, world, false)) return true; hMove = new ChunkCoordinates(cc.posX , cc.posY, cc.posZ + 1); - if(setAndCheckPosition(entity, hMove, world, false)) return true; + if(AuraEffects.setAndCheckPosition(entity, hMove, world, false)) return true; hMove = new ChunkCoordinates(cc.posX - 1, cc.posY, cc.posZ ); - if(setAndCheckPosition(entity, hMove, world, false)) return true; + if(AuraEffects.setAndCheckPosition(entity, hMove, world, false)) return true; hMove = new ChunkCoordinates(cc.posX , cc.posY, cc.posZ - 1); - if(setAndCheckPosition(entity, hMove, world, false)) return true; - return false; + return AuraEffects.setAndCheckPosition(entity, hMove, world, false); } } diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java b/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java index 070375e..3eda4a9 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java @@ -4,12 +4,10 @@ import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.network.packets.PacketTCNotificationText; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.StatCollector; import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; import thaumcraft.common.Thaumcraft; import thaumcraft.common.lib.research.ResearchManager; @@ -31,12 +29,12 @@ public class AuraResearchManager { public static void tryUnlockAuraEffect(EntityPlayer player, Aspect aspect) { if(!AuraEffectHandler.registeredEffects.containsKey(aspect)) return; - if(isBlacklisted(aspect)) return; + if(AuraResearchManager.isBlacklisted(aspect)) return; if(!ResearchManager.isResearchComplete(player.getCommandSenderName(), Gadomancy.MODID.toUpperCase() + ".AURA_EFFECTS")) return; if(!Thaumcraft.proxy.getPlayerKnowledge().hasDiscoveredAspect(player.getCommandSenderName(), aspect)) return; - String res = String.format(TC_AURA_RESEARCH_STR, aspect.getTag()); + String res = String.format(AuraResearchManager.TC_AURA_RESEARCH_STR, aspect.getTag()); if(ResearchManager.isResearchComplete(player.getCommandSenderName(), res)) return; Thaumcraft.proxy.getResearchManager().completeResearch(player, res); @@ -62,8 +60,8 @@ public class AuraResearchManager { public static List getKnowledge(EntityPlayer player) { List lines = new ArrayList(); for(Aspect a : AuraEffectHandler.registeredEffects.keySet()) { - if(ResearchManager.isResearchComplete(player.getCommandSenderName(), String.format(TC_AURA_RESEARCH_STR, a.getTag()))) { - if(!isBlacklisted(a)) lines.add(a.getTag()); + if(ResearchManager.isResearchComplete(player.getCommandSenderName(), String.format(AuraResearchManager.TC_AURA_RESEARCH_STR, a.getTag()))) { + if(!AuraResearchManager.isBlacklisted(a)) lines.add(a.getTag()); } } return lines; @@ -79,7 +77,7 @@ public class AuraResearchManager { public static void registerAuraResearches() { for(Aspect a : AuraEffectHandler.registeredEffects.keySet()) { - new ResearchItem(String.format(TC_AURA_RESEARCH_STR, a.getTag()), Gadomancy.MODID).registerResearchItem(); + new ResearchItem(String.format(AuraResearchManager.TC_AURA_RESEARCH_STR, a.getTag()), Gadomancy.MODID).registerResearchItem(); } } } diff --git a/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java b/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java index e874bd3..8a67014 100644 --- a/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java +++ b/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.aura; import makeo.gadomancy.common.utils.SimpleResourceLocation; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -59,7 +58,7 @@ public class ResearchPageAuraAspects extends ResearchPage { public static AspectList createPageAspectList(List tagList) { AspectList list = new AspectList(); for(String tag : tagList) { - Aspect a = createAuraFakeAspect(tag); + Aspect a = ResearchPageAuraAspects.createAuraFakeAspect(tag); if(a != null) list.add(a, 0); } return list; @@ -87,7 +86,7 @@ public class ResearchPageAuraAspects extends ResearchPage { @Override public String getName() { - if(headAspect) return super.getName(); + if(this.headAspect) return super.getName(); String tag = super.getTag(); if(tag == null || tag.isEmpty() || tag.equals("")) return ""; return StatCollector.translateToLocal(tag); diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java index 27ec676..fe042d2 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java @@ -19,7 +19,7 @@ import thaumcraft.common.config.ConfigBlocks; public class BlockAdditionalEldritchPortal extends BlockEldritchPortal { public BlockAdditionalEldritchPortal() { - setCreativeTab(RegisteredItems.creativeTab); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java b/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java index b8d0e86..4d8b3b1 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java @@ -27,9 +27,9 @@ import java.util.List; public class BlockArcaneDropper extends BlockTransparent { public BlockArcaneDropper() { super(Material.rock); - setHardness(3.5f); + this.setHardness(3.5f); - setCreativeTab(RegisteredItems.creativeTab); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override @@ -83,7 +83,7 @@ public class BlockArcaneDropper extends BlockTransparent { super.maxZ = box.maxZ; } - private static final AxisAlignedBB[] COLLISION_BOXES = new AxisAlignedBB[]{ + private static final AxisAlignedBB[] COLLISION_BOXES = { AxisAlignedBB.getBoundingBox(0, 0, 0, 1, 0.3125f, 1),//down AxisAlignedBB.getBoundingBox(0, 0.6875f, 0, 1, 1, 1),//up @@ -97,9 +97,9 @@ public class BlockArcaneDropper extends BlockTransparent { public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB boundingBox, List list, Entity entity) { ForgeDirection side = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) & 7); - for(int i = 0; i < COLLISION_BOXES.length; i++) { + for(int i = 0; i < BlockArcaneDropper.COLLISION_BOXES.length; i++) { if(i != side.ordinal()) { - this.setBlockBounds(COLLISION_BOXES[i]); + this.setBlockBounds(BlockArcaneDropper.COLLISION_BOXES[i]); super.addCollisionBoxesToList(world, x, y, z, boundingBox, list, entity); } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java b/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java index b149db3..b85fd1a 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java @@ -4,7 +4,6 @@ import cpw.mods.fml.common.network.NetworkRegistry; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; import makeo.gadomancy.common.blocks.tiles.TileAuraPylonTop; -import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.network.packets.PacketStartAnimation; import makeo.gadomancy.common.registration.RegisteredBlocks; @@ -44,11 +43,11 @@ public class BlockAuraPylon extends BlockContainer implements IBlockTransparent public BlockAuraPylon() { super(Material.iron); - setHardness(10F); - setResistance(50F); - setStepSound(Block.soundTypeStone); - setBlockBounds(0.0625F, 0, 0.0625F, 0.9375F, 1, 0.9375F); - setCreativeTab(RegisteredItems.creativeTab); + this.setHardness(10F); + this.setResistance(50F); + this.setStepSound(Block.soundTypeStone); + this.setBlockBounds(0.0625F, 0, 0.0625F, 0.9375F, 1, 0.9375F); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override @@ -58,7 +57,7 @@ public class BlockAuraPylon extends BlockContainer implements IBlockTransparent @Override public void registerBlockIcons(IIconRegister ir) { - icon = ir.registerIcon(Gadomancy.MODID + ":transparent"); + this.icon = ir.registerIcon(Gadomancy.MODID + ":transparent"); super.registerBlockIcons(ir); } @@ -104,7 +103,7 @@ public class BlockAuraPylon extends BlockContainer implements IBlockTransparent public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) { if(world.getBlockMetadata(x, y, z) != 1) { Block up = world.getBlock(x, y + 1, z); - return up != null && up instanceof BlockAuraPylon && up.onBlockActivated(world, x, y + 1, z, player, side, par7, par8, par9); + return up instanceof BlockAuraPylon && up.onBlockActivated(world, x, y + 1, z, player, side, par7, par8, par9); } ItemStack heldItem = player.getHeldItem(); if(!world.isRemote && heldItem != null && heldItem.getItem() instanceof ItemWandCasting && @@ -122,7 +121,7 @@ public class BlockAuraPylon extends BlockContainer implements IBlockTransparent ta.setTileInformation(false, true); int count = 1; TileEntity iter = world.getTileEntity(x, y - count, z); - while(iter != null && iter instanceof TileAuraPylon) { + while (iter instanceof TileAuraPylon) { ((TileAuraPylon) iter).setPartOfMultiblock(true); world.markBlockForUpdate(x, y - count, z); iter.markDirty(); @@ -153,6 +152,6 @@ public class BlockAuraPylon extends BlockContainer implements IBlockTransparent @Override public IIcon getTransparentIcon() { - return icon; + return this.icon; } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java b/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java index dd3c7b7..2905417 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java @@ -38,11 +38,11 @@ public class BlockEssentiaCompressor extends BlockContainer implements IBlockTra public BlockEssentiaCompressor() { super(Material.wood); - setHardness(5F); - setResistance(20F); - setHarvestLevel("axe", 1); - setBlockBounds(0, 0, 0, 1, 1, 1); - setCreativeTab(RegisteredItems.creativeTab); + this.setHardness(5F); + this.setResistance(20F); + this.setHarvestLevel("axe", 1); + this.setBlockBounds(0, 0, 0, 1, 1, 1); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override @@ -57,13 +57,13 @@ public class BlockEssentiaCompressor extends BlockContainer implements IBlockTra @Override public void registerBlockIcons(IIconRegister ir) { - icon = ir.registerIcon(Gadomancy.MODID + ":transparent"); + this.icon = ir.registerIcon(Gadomancy.MODID + ":transparent"); super.registerBlockIcons(ir); } @Override public IIcon getTransparentIcon() { - return icon; + return this.icon; } @Override @@ -108,13 +108,13 @@ public class BlockEssentiaCompressor extends BlockContainer implements IBlockTra } if(((TileEssentiaCompressor) te).isMultiblockFormed()) { if(((TileEssentiaCompressor) te).isMasterTile()) { - setBlockBounds(0, 0, 0, 1, 3, 1); //master is lowest tile here. + this.setBlockBounds(0, 0, 0, 1, 3, 1); //master is lowest tile here. } else { int yM = ((TileEssentiaCompressor) te).getMultiblockYIndex(); - setBlockBounds(0, -yM, 0, 1, 3 - yM, 1); + this.setBlockBounds(0, -yM, 0, 1, 3 - yM, 1); } } else { - setBlockBounds(0, 0, 0, 1, 1, 1); + this.setBlockBounds(0, 0, 0, 1, 1, 1); } } @@ -132,8 +132,8 @@ public class BlockEssentiaCompressor extends BlockContainer implements IBlockTra ItemStack heldItem = player.getHeldItem(); if(heldItem != null && heldItem.getItem() instanceof ItemWandCasting && ResearchManager.isResearchComplete(player.getCommandSenderName(), SimpleResearchItem.getFullName("ESSENTIA_COMPRESSOR"))) { - ChunkCoordinates lowest = findLowestCompressorBlock(world, x, y, z); - boolean canForm = lowest != null && isMuliblockPossible(world, lowest); + ChunkCoordinates lowest = this.findLowestCompressorBlock(world, x, y, z); + boolean canForm = lowest != null && this.isMuliblockPossible(world, lowest); if(canForm && ThaumcraftApiHelper.consumeVisFromWandCrafting(player.getCurrentEquippedItem(), player, RegisteredRecipes.costsCompressorMultiblock, true)) { int multiblockID = TileEssentiaCompressor.getAndIncrementNewMultiblockId(); TileEssentiaCompressor compressor = (TileEssentiaCompressor) world.getTileEntity(lowest.posX, lowest.posY, lowest.posZ); @@ -159,15 +159,15 @@ public class BlockEssentiaCompressor extends BlockContainer implements IBlockTra private boolean isMuliblockPossible(World world, ChunkCoordinates lowest) { return lowest != null && - isMultiblockable(world, lowest.posX, lowest.posY , lowest.posZ) && - isMultiblockable(world, lowest.posX, lowest.posY + 1, lowest.posZ) && - isMultiblockable(world, lowest.posX, lowest.posY + 2, lowest.posZ); + this.isMultiblockable(world, lowest.posX, lowest.posY , lowest.posZ) && + this.isMultiblockable(world, lowest.posX, lowest.posY + 1, lowest.posZ) && + this.isMultiblockable(world, lowest.posX, lowest.posY + 2, lowest.posZ); } private ChunkCoordinates findLowestCompressorBlock(World world, int x, int y, int z) { ChunkCoordinates result = null; for (int i = 0; i <= y; i++) { - if(!isMultiblockable(world, x, y - i, z)) break; + if(!this.isMultiblockable(world, x, y - i, z)) break; result = new ChunkCoordinates(x, y - i, z); } return result; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java index 7ea56e5..05fee77 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java @@ -39,10 +39,10 @@ public class BlockExtendedNodeJar extends BlockContainer { public BlockExtendedNodeJar() { super(Material.glass); - setHardness(0.3F); - setStepSound(new CustomStepSound("jar", 1.0F, 1.0F)); - setLightLevel(0.66F); - setBlockName("blockExNodeJar"); + this.setHardness(0.3F); + this.setStepSound(new CustomStepSound("jar", 1.0F, 1.0F)); + this.setLightLevel(0.66F); + this.setBlockName("blockExNodeJar"); } @Override @@ -78,7 +78,7 @@ public class BlockExtendedNodeJar extends BlockContainer { public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); + this.dropBlockAsItem(par1World, par2, par3, par4, par5, 0); super.onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer); } @@ -102,12 +102,12 @@ public class BlockExtendedNodeJar extends BlockContainer { } public void setBlockBoundsBasedOnState(IBlockAccess world, int i, int j, int k) { - setBlockBounds(0.1875F, 0.0F, 0.1875F, 0.8125F, 0.75F, 0.8125F); + this.setBlockBounds(0.1875F, 0.0F, 0.1875F, 0.8125F, 0.75F, 0.8125F); super.setBlockBoundsBasedOnState(world, i, j, k); } public void addCollisionBoxesToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java b/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java index 850a78b..1f3de34 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java @@ -27,9 +27,9 @@ import net.minecraft.world.World; public class BlockInfusionClaw extends BlockTransparent { public BlockInfusionClaw() { super(Material.rock); - setHardness(3.5f); + this.setHardness(3.5f); - setCreativeTab(RegisteredItems.creativeTab); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java index 9d62053..81028ae 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java @@ -7,7 +7,6 @@ import makeo.gadomancy.common.registration.RegisteredItems; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -16,7 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; @@ -34,8 +32,8 @@ public class BlockKnowledgeBook extends BlockContainer implements IBlockTranspar public BlockKnowledgeBook() { super(Material.circuits); - setBlockBounds(0.0625F, 0.125F, 0.0625F, 0.9375F, 0.5F, 0.9375F); - setCreativeTab(RegisteredItems.creativeTab); + this.setBlockBounds(0.0625F, 0.125F, 0.0625F, 0.9375F, 0.5F, 0.9375F); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override @@ -50,7 +48,7 @@ public class BlockKnowledgeBook extends BlockContainer implements IBlockTranspar @Override public void registerBlockIcons(IIconRegister ir) { - icon = ir.registerIcon(Gadomancy.MODID + ":transparent"); + this.icon = ir.registerIcon(Gadomancy.MODID + ":transparent"); super.registerBlockIcons(ir); } @@ -75,16 +73,16 @@ public class BlockKnowledgeBook extends BlockContainer implements IBlockTranspar Block lower = world.getBlock(x, y - 1, z); int metaLower = world.getBlockMetadata(x, y - 1, z); if(!lower.equals(ConfigBlocks.blockStoneDevice) || metaLower != 1) { - breakThisBlock(world, x, y, z); + this.breakThisBlock(world, x, y, z); } if(!world.isAirBlock(x, y + 1, z)) { - breakThisBlock(world, x, y, z); + this.breakThisBlock(world, x, y, z); } } - public void breakThisBlock(World world, int x, int y, int z) { + private void breakThisBlock(World world, int x, int y, int z) { if(world.isRemote) return; - ArrayList stacks = getDrops(world, x, y, z, 0, 0); + ArrayList stacks = this.getDrops(world, x, y, z, 0, 0); for(ItemStack i : stacks) { EntityItem item = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, i); world.spawnEntityInWorld(item); @@ -103,7 +101,7 @@ public class BlockKnowledgeBook extends BlockContainer implements IBlockTranspar @Override public int getComparatorInputOverride(World world, int x, int y, int z, int p_149736_5_) { TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TileKnowledgeBook) { + if (te instanceof TileKnowledgeBook) { if(((TileKnowledgeBook) te).isResearching()) { if(((TileKnowledgeBook) te).hasCognitio()) { return 15; @@ -121,7 +119,7 @@ public class BlockKnowledgeBook extends BlockContainer implements IBlockTranspar @Override public IIcon getTransparentIcon() { - return icon; + return this.icon; } @Override diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java index 19ef447..bf391d5 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java @@ -28,21 +28,21 @@ import java.util.List; public class BlockNodeManipulator extends BlockStoneDevice { public BlockNodeManipulator() { - setBlockName("blockNodeManipulator"); - setCreativeTab(RegisteredItems.creativeTab); + this.setBlockName("blockNodeManipulator"); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override public void registerBlockIcons(IIconRegister ir) { super.registerBlockIcons(ir); - iconPedestal[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_bot"); - iconWandPedestal[0] = ir.registerIcon(Gadomancy.MODID + ":manipulator_side"); - iconWandPedestal[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_top"); + this.iconPedestal[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_bot"); + this.iconWandPedestal[0] = ir.registerIcon(Gadomancy.MODID + ":manipulator_side"); + this.iconWandPedestal[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_top"); - iconWandPedestalFocus[0] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_side"); - iconWandPedestalFocus[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_top"); - iconWandPedestalFocus[2] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_bot"); + this.iconWandPedestalFocus[0] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_side"); + this.iconWandPedestalFocus[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_top"); + this.iconWandPedestalFocus[2] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_bot"); } @Override @@ -63,7 +63,7 @@ public class BlockNodeManipulator extends BlockStoneDevice { int ret = super.getComparatorInputOverride(world, x, y, z, rs); TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileNodeManipulator) return 0; + if (te instanceof TileNodeManipulator) return 0; return ret; } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java index 8806e5b..72823d5 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java @@ -29,7 +29,7 @@ import java.util.List; */ public class BlockRemoteJar extends BlockJar { public BlockRemoteJar() { - setCreativeTab(RegisteredItems.creativeTab); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override @@ -59,7 +59,7 @@ public class BlockRemoteJar extends BlockJar { if(drop.getItem() == ConfigItems.itemJarFilled || drop.getItem() == Item.getItemFromBlock(this)) { drop.func_150996_a(Item.getItemFromBlock(this)); - TileRemoteJar tile = getJarTile(world, x, y, z); + TileRemoteJar tile = BlockRemoteJar.getJarTile(world, x, y, z); if(tile.networkId != null) { NBTHelper.setUUID(NBTHelper.getData(drop), "networkId", tile.networkId); } @@ -93,6 +93,6 @@ public class BlockRemoteJar extends BlockJar { } public static TileRemoteJar getJarTile(World world, int x, int y, int z) { - return getJarTile(world.getTileEntity(x, y, z)); + return BlockRemoteJar.getJarTile(world.getTileEntity(x, y, z)); } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java index cc1afbf..403e602 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java @@ -41,7 +41,7 @@ import java.util.Map; public class BlockStickyJar extends BlockJar implements IBlockTransparent { public BlockStickyJar() { - setCreativeTab(null); + this.setCreativeTab(null); } private IIcon iconTransparent; @@ -55,18 +55,18 @@ public class BlockStickyJar extends BlockJar implements IBlockTransparent { return stickyJar.getParentBlock().getIcon(world, x, y, z, side); } } - return iconTransparent; + return this.iconTransparent; } @Override public void registerBlockIcons(IIconRegister ir) { super.registerBlockIcons(ir); - iconTransparent = ir.registerIcon(Gadomancy.MODID + ":transparent"); + this.iconTransparent = ir.registerIcon(Gadomancy.MODID + ":transparent"); } @Override public IIcon getTransparentIcon() { - return iconTransparent; + return this.iconTransparent; } public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { @@ -74,7 +74,7 @@ public class BlockStickyJar extends BlockJar implements IBlockTransparent { TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof TileStickyJar) { - flipBlockBounds((TileStickyJar) tile); + this.flipBlockBounds((TileStickyJar) tile); } } @@ -82,12 +82,12 @@ public class BlockStickyJar extends BlockJar implements IBlockTransparent { ForgeDirection placedOn = stickyJar.placedOn; if (placedOn != ForgeDirection.DOWN) { - float minX = (float) getBlockBoundsMinX(); - float minY = (float) getBlockBoundsMinY(); - float minZ = (float) getBlockBoundsMinZ(); - float maxX = (float) getBlockBoundsMaxX(); - float maxY = (float) getBlockBoundsMaxY(); - float maxZ = (float) getBlockBoundsMaxZ(); + float minX = (float) this.getBlockBoundsMinX(); + float minY = (float) this.getBlockBoundsMinY(); + float minZ = (float) this.getBlockBoundsMinZ(); + float maxX = (float) this.getBlockBoundsMaxX(); + float maxY = (float) this.getBlockBoundsMaxY(); + float maxZ = (float) this.getBlockBoundsMaxZ(); float temp; if (placedOn == ForgeDirection.NORTH || placedOn == ForgeDirection.SOUTH) { @@ -199,7 +199,7 @@ public class BlockStickyJar extends BlockJar implements IBlockTransparent { stickyJar.getParentBlock().onBlockPlacedBy(world, x, y, z, ent, stack); } - onBlockPlacedOn(stickyJar, ent); + this.onBlockPlacedOn(stickyJar, ent); } } @@ -251,7 +251,7 @@ public class BlockStickyJar extends BlockJar implements IBlockTransparent { if (info.needsPhialHandling() && heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) { if(!world.isRemote) { - handlePhial(world, x, y, z, player, heldItem, tileStickyJar); + BlockStickyJar.handlePhial(world, x, y, z, player, heldItem, tileStickyJar); } return true; } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java index b932234..b641008 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java @@ -1,7 +1,10 @@ package makeo.gadomancy.common.blocks; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.*; +import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; +import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; +import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; +import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.ItemUtils; @@ -41,46 +44,46 @@ import java.util.Random; public class BlockStoneMachine extends Block { public BlockStoneMachine() { super(Material.rock); - setHardness(3.0F); - setResistance(25.0F); - setStepSound(Block.soundTypeStone); - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - setCreativeTab(RegisteredItems.creativeTab); + this.setHardness(3.0F); + this.setResistance(25.0F); + this.setStepSound(Block.soundTypeStone); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + this.setCreativeTab(RegisteredItems.creativeTab); } private IIcon pillarIcon; private IIcon focusIcon; public IIcon pedestalSideIcon; public IIcon pedestalTopIcon; - public IIcon protectorIcon; - public IIcon packagerIcon; + private IIcon protectorIcon; + private IIcon packagerIcon; @Override public void registerBlockIcons(IIconRegister ir) { - pillarIcon = ir.registerIcon("thaumcraft:es_1"); - focusIcon = ir.registerIcon("thaumcraft:thaumiumblock"); - pedestalTopIcon = ir.registerIcon(Gadomancy.MODID + ":manipulator_bot"); - pedestalSideIcon = ir.registerIcon(Gadomancy.MODID + ":ancient_pedestal_side"); - protectorIcon = ir.registerIcon("thaumcraft:pipe_1"); - packagerIcon = ir.registerIcon("thaumcraft:planks_greatwood"); + this.pillarIcon = ir.registerIcon("thaumcraft:es_1"); + this.focusIcon = ir.registerIcon("thaumcraft:thaumiumblock"); + this.pedestalTopIcon = ir.registerIcon(Gadomancy.MODID + ":manipulator_bot"); + this.pedestalSideIcon = ir.registerIcon(Gadomancy.MODID + ":ancient_pedestal_side"); + this.protectorIcon = ir.registerIcon("thaumcraft:pipe_1"); + this.packagerIcon = ir.registerIcon("thaumcraft:planks_greatwood"); } @Override public IIcon getIcon(int side, int metadata) { if (metadata == 11 || metadata == 15) { - return pillarIcon; + return this.pillarIcon; } else if (metadata == 0 || metadata == 3) { - return focusIcon; + return this.focusIcon; } else if (metadata == 1) { if (side > 1) { - return pedestalSideIcon; + return this.pedestalSideIcon; } else { - return pedestalTopIcon; + return this.pedestalTopIcon; } } else if (metadata == 2) { - return protectorIcon; + return this.protectorIcon; } else if(metadata == 4) { - return packagerIcon; + return this.packagerIcon; } return super.getIcon(side, metadata); @@ -102,7 +105,7 @@ public class BlockStoneMachine extends Block { public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 11 || metadata == 15) { - return new ItemStack(getItemDropped(metadata, null, 0), 1, damageDropped(metadata)); + return new ItemStack(this.getItemDropped(metadata, null, 0), 1, this.damageDropped(metadata)); } return super.getPickBlock(target, world, x, y, z, player); @@ -192,17 +195,17 @@ public class BlockStoneMachine extends Block { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 15) { if (world.getBlock(x, y + 1, z) != this || world.getBlockMetadata(x, y + 1, z) != 11) { - dropBlockAsItem(world, x, y, z, metadata, 0); + this.dropBlockAsItem(world, x, y, z, metadata, 0); world.setBlockToAir(x, y, z); } } else if (metadata == 11) { if (world.getBlock(x, y - 1, z) != this || world.getBlockMetadata(x, y - 1, z) != 15) { - dropBlockAsItem(world, x, y, z, metadata, 0); + this.dropBlockAsItem(world, x, y, z, metadata, 0); world.setBlockToAir(x, y, z); } } else if (metadata == 0 || metadata == 3) { if (world.getBlock(x, y - 1, z) != RegisteredBlocks.blockNodeManipulator || world.getBlockMetadata(x, y - 1, z) != 5) { - dropBlockAsItem(world, x, y, z, metadata, 0); + this.dropBlockAsItem(world, x, y, z, metadata, 0); world.setBlockToAir(x, y, z); } } else if(metadata == 1) { @@ -267,17 +270,17 @@ public class BlockStoneMachine extends Block { public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 15) { - setBlockBounds(0, 0, 0, 1, 0.5f, 1); + this.setBlockBounds(0, 0, 0, 1, 0.5f, 1); } else if (metadata == 11) { - setBlockBounds(0.0F, -1.0F, 0.0F, 1.0F, -0.5F, 1.0F); + this.setBlockBounds(0.0F, -1.0F, 0.0F, 1.0F, -0.5F, 1.0F); } else if (metadata == 0 || metadata == 3) { - setBlockBounds(3 / 16f, 0, 3 / 16f, 1 - (3 / 16f), 6 / 16f, 1 - (3 / 16f)); + this.setBlockBounds(3 / 16f, 0, 3 / 16f, 1 - (3 / 16f), 6 / 16f, 1 - (3 / 16f)); } else if (metadata == 1) { - setBlockBounds(0.25f, 0, 0.25f, 0.75f, 0.99f, 0.75f); + this.setBlockBounds(0.25f, 0, 0.25f, 0.75f, 0.99f, 0.75f); } else if(metadata == 2) { - setBlockBounds(0, 0, 0, 1, 3/16f, 1); + this.setBlockBounds(0, 0, 0, 1, 3/16f, 1); } else if(metadata == 4) { - setBlockBounds(0, 0, 0, 1, 12/16f, 1); + this.setBlockBounds(0, 0, 0, 1, 12/16f, 1); }/* else if(metadata == 5) { setBlockBounds(0, 0, 0, 1, 1, 1); }*/ @@ -288,13 +291,13 @@ public class BlockStoneMachine extends Block { public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List list, Entity entity) { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 11 || metadata == 15 || metadata == 1) { - setBlockBounds(0, 0, 0, 1, 1, 1); + this.setBlockBounds(0, 0, 0, 1, 1, 1); } else if(metadata == 2) { - setBlockBounds(3 / 16f, 0, 3 / 16f, 1 - (3 / 16f), 9.5f/16f, 1 - (3 / 16f)); + this.setBlockBounds(3 / 16f, 0, 3 / 16f, 1 - (3 / 16f), 9.5f/16f, 1 - (3 / 16f)); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); - setBlockBoundsBasedOnState(world, x, y, z); + this.setBlockBoundsBasedOnState(world, x, y, z); } else { - setBlockBoundsBasedOnState(world, x, y, z); + this.setBlockBoundsBasedOnState(world, x, y, z); } super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java b/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java index 10cbc6a..dcdc0b1 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java @@ -24,12 +24,12 @@ public abstract class BlockTransparent extends Block implements IBlockTransparen private IIcon iconTransparent; public IIcon getTransparentIcon() { - return iconTransparent; + return this.iconTransparent; } @Override public void registerBlockIcons(IIconRegister ir) { - iconTransparent = ir.registerIcon(Gadomancy.MODID + ":transparent"); + this.iconTransparent = ir.registerIcon(Gadomancy.MODID + ":transparent"); super.registerBlockIcons(ir); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/SynchronizedTileEntity.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/SynchronizedTileEntity.java index 3ab7d1b..0fbef02 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/SynchronizedTileEntity.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/SynchronizedTileEntity.java @@ -18,31 +18,31 @@ import net.minecraft.util.ChunkCoordinates; public class SynchronizedTileEntity extends TileEntity { public ChunkCoordinates getCoords() { - return new ChunkCoordinates(xCoord, yCoord, zCoord); + return new ChunkCoordinates(this.xCoord, this.yCoord, this.zCoord); } public final void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); - readCustomNBT(compound); + this.readCustomNBT(compound); } public void readCustomNBT(NBTTagCompound compound) {} public final void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound); - writeCustomNBT(compound); + this.writeCustomNBT(compound); } public void writeCustomNBT(NBTTagCompound compound) {} public final Packet getDescriptionPacket() { NBTTagCompound compound = new NBTTagCompound(); - writeCustomNBT(compound); + this.writeCustomNBT(compound); return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 255, compound); } public final void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity paket) { super.onDataPacket(manager, paket); - readCustomNBT(paket.func_148857_g()); + this.readCustomNBT(paket.func_148857_g()); } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java index 3c33c37..83e0a7e 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java @@ -4,10 +4,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import makeo.gadomancy.client.effect.fx.Orbital; import makeo.gadomancy.common.registration.AIShutdownWhitelist; -import makeo.gadomancy.common.registration.RegisteredMultiblocks; import makeo.gadomancy.common.utils.Injector; -import makeo.gadomancy.common.utils.MultiblockHelper; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; @@ -24,12 +21,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.UUID; +import java.util.*; /** * This class is part of the Gadomancy Mod @@ -51,8 +43,8 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon public Orbital orbital; - private int ticksExisted = 0; - private int storedAmount = 0; + private int ticksExisted; + private int storedAmount; @Override public boolean canUpdate() { @@ -61,34 +53,34 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public void updateEntity() { - if(worldObj == null) return; - ticksExisted++; + if(this.worldObj == null) return; + this.ticksExisted++; - if(!worldObj.isRemote) { - ChunkCoordinates cc = getCoords(); - if (!trackedEntities.containsKey(cc)) trackedEntities.put(cc, Lists.newLinkedList()); + if(!this.worldObj.isRemote) { + ChunkCoordinates cc = this.getCoords(); + if (!TileAIShutdown.trackedEntities.containsKey(cc)) TileAIShutdown.trackedEntities.put(cc, Lists.newLinkedList()); - if ((ticksExisted & 15) == 0) { - killAI(); + if ((this.ticksExisted & 15) == 0) { + this.killAI(); } - if (((ticksExisted & 7) == 0)) { - handleIO(); + if (((this.ticksExisted & 7) == 0)) { + this.handleIO(); } - if (((ticksExisted & 31) == 0)) { - drainDefaultEssentia(); + if (((this.ticksExisted & 31) == 0)) { + this.drainDefaultEssentia(); } } } private void drainDefaultEssentia() { - storedAmount = Math.max(0, storedAmount - 1); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.storedAmount = Math.max(0, this.storedAmount - 1); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } private void handleIO() { - if (storedAmount < MAX_AMT) { + if (this.storedAmount < TileAIShutdown.MAX_AMT) { TileEntity te = ThaumcraftApiHelper.getConnectableTile(this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.UP); if (te != null) { IEssentiaTransport ic = (IEssentiaTransport) te; @@ -96,32 +88,32 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon return; } - if (ic.getSuctionAmount(ForgeDirection.DOWN) < getSuctionAmount(ForgeDirection.UP)) { - addToContainer(Aspect.ENTROPY, ic.takeEssentia(Aspect.ENTROPY, 1, ForgeDirection.DOWN)); + if (ic.getSuctionAmount(ForgeDirection.DOWN) < this.getSuctionAmount(ForgeDirection.UP)) { + this.addToContainer(Aspect.ENTROPY, ic.takeEssentia(Aspect.ENTROPY, 1, ForgeDirection.DOWN)); } } } } private void killAI() { - ChunkCoordinates cc = getCoords(); - List objEntityList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, BOX.copy().offset(xCoord, yCoord, zCoord)); + ChunkCoordinates cc = this.getCoords(); + List objEntityList = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, TileAIShutdown.BOX.copy().offset(this.xCoord, this.yCoord, this.zCoord)); for (Object o : objEntityList) { if(o != null && o instanceof EntityLiving && - !((EntityLiving) o).isDead && canAffect((EntityLiving) o)) { + !((EntityLiving) o).isDead && this.canAffect((EntityLiving) o)) { EntityLiving el = (EntityLiving) o; - if(storedAmount <= 0) return; - AffectedEntity affected = removeAI(el); - trackedEntities.get(cc).add(affected); + if(this.storedAmount <= 0) return; + AffectedEntity affected = this.removeAI(el); + TileAIShutdown.trackedEntities.get(cc).add(affected); } } } private AffectedEntity removeAI(EntityLiving el) { - if(RAND.nextInt(4) == 0) { - storedAmount = Math.max(0, storedAmount - 1); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + if(TileAIShutdown.RAND.nextInt(4) == 0) { + this.storedAmount = Math.max(0, this.storedAmount - 1); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } UUID uu = el.getUniqueID(); @@ -157,21 +149,21 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon iterator.remove(); } } - injEntityLivingBase.setObject(el); - injEntityLivingBase.setField("ignoreCollisions", true); - injEntityLivingBase.setObject(null); + TileAIShutdown.injEntityLivingBase.setObject(el); + TileAIShutdown.injEntityLivingBase.setField("ignoreCollisions", true); + TileAIShutdown.injEntityLivingBase.setObject(null); return new AffectedEntity(uu, tasks, targetTasks); } public int getStoredEssentia() { - return storedAmount; + return this.storedAmount; } public boolean canAffect(EntityLiving el) { - ChunkCoordinates cc = getCoords(); - if(!trackedEntities.containsKey(cc)) return false; + ChunkCoordinates cc = this.getCoords(); + if(!TileAIShutdown.trackedEntities.containsKey(cc)) return false; UUID uu = el.getUniqueID(); - for (AffectedEntity ae : trackedEntities.get(cc)) { + for (AffectedEntity ae : TileAIShutdown.trackedEntities.get(cc)) { if(ae.eUUID.equals(uu)) return false; } return true; @@ -184,7 +176,7 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public void writeCustomNBT(NBTTagCompound compound) { - compound.setInteger("amount", storedAmount); + compound.setInteger("amount", this.storedAmount); } @@ -194,8 +186,8 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public AspectList getAspects() { - if(storedAmount <= 0) return new AspectList(); - return new AspectList().add(Aspect.ENTROPY, storedAmount); + if(this.storedAmount <= 0) return new AspectList(); + return new AspectList().add(Aspect.ENTROPY, this.storedAmount); } @Override @@ -214,12 +206,12 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon if (aspect == null) return 0; - if (storedAmount < MAX_AMT) { - int added = Math.min(amount, MAX_AMT - storedAmount); - storedAmount += added; + if (this.storedAmount < TileAIShutdown.MAX_AMT) { + int added = Math.min(amount, TileAIShutdown.MAX_AMT - this.storedAmount); + this.storedAmount += added; amount -= added; this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - markDirty(); + this.markDirty(); } return amount; } @@ -253,17 +245,17 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public boolean isConnectable(ForgeDirection direction) { - return direction != null && direction.equals(ForgeDirection.UP); + return ForgeDirection.UP.equals(direction); } @Override public boolean canInputFrom(ForgeDirection direction) { - return isConnectable(direction); + return this.isConnectable(direction); } @Override public boolean canOutputTo(ForgeDirection direction) { - return isConnectable(direction); + return this.isConnectable(direction); } @Override @@ -271,14 +263,14 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public Aspect getSuctionType(ForgeDirection direction) { - if(!isConnectable(direction)) return null; + if(!this.isConnectable(direction)) return null; return Aspect.ENTROPY; } @Override public int getSuctionAmount(ForgeDirection direction) { - if(!isConnectable(direction)) return 0; - return getMinimumSuction(); + if(!this.isConnectable(direction)) return 0; + return this.getMinimumSuction(); } @Override @@ -288,7 +280,7 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public int addEssentia(Aspect aspect, int i, ForgeDirection direction) { - return canInputFrom(direction) ? addToContainer(aspect, i) : 0; + return this.canInputFrom(direction) ? this.addToContainer(aspect, i) : 0; } @Override @@ -298,8 +290,8 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public int getEssentiaAmount(ForgeDirection direction) { - if(!isConnectable(direction)) return 0; - return storedAmount; + if(!this.isConnectable(direction)) return 0; + return this.storedAmount; } @Override @@ -315,15 +307,15 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon //Tracker methods public static void removeTrackedEntity(EntityLiving entityLiving) { - for (ChunkCoordinates cc : trackedEntities.keySet()) { - for (AffectedEntity ae : trackedEntities.get(cc)) { + for (ChunkCoordinates cc : TileAIShutdown.trackedEntities.keySet()) { + for (AffectedEntity ae : TileAIShutdown.trackedEntities.get(cc)) { if(ae.eUUID.equals(entityLiving.getUniqueID())) { - trackedEntities.get(cc).remove(ae); + TileAIShutdown.trackedEntities.get(cc).remove(ae); entityLiving.tasks.taskEntries = ae.tasks; entityLiving.targetTasks.taskEntries = ae.targetTasks; - injEntityLivingBase.setObject(entityLiving); - injEntityLivingBase.setField("ignoreCollisions", false); - injEntityLivingBase.setObject(null); + TileAIShutdown.injEntityLivingBase.setObject(entityLiving); + TileAIShutdown.injEntityLivingBase.setField("ignoreCollisions", false); + TileAIShutdown.injEntityLivingBase.setObject(null); return; } } @@ -332,21 +324,21 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon public static void removeTrackedEntities(World world, int x, int y, int z) { ChunkCoordinates cc = new ChunkCoordinates(x, y, z); - if(trackedEntities.containsKey(cc)) { - for (AffectedEntity ae : trackedEntities.get(cc)) { + if(TileAIShutdown.trackedEntities.containsKey(cc)) { + for (AffectedEntity ae : TileAIShutdown.trackedEntities.get(cc)) { for (Object objE : world.getLoadedEntityList()) { if(objE != null && objE instanceof EntityLiving && !((EntityLiving) objE).isDead && ((EntityLiving) objE).getUniqueID().equals(ae.eUUID)) { ((EntityLiving) objE).tasks.taskEntries = ae.tasks; ((EntityLiving) objE).targetTasks.taskEntries = ae.targetTasks; - injEntityLivingBase.setObject(objE); - injEntityLivingBase.setField("ignoreCollisions", false); - injEntityLivingBase.setObject(null); + TileAIShutdown.injEntityLivingBase.setObject(objE); + TileAIShutdown.injEntityLivingBase.setField("ignoreCollisions", false); + TileAIShutdown.injEntityLivingBase.setObject(null); } } } - trackedEntities.remove(new ChunkCoordinates(x, y, z)); + TileAIShutdown.trackedEntities.remove(new ChunkCoordinates(x, y, z)); } } @@ -367,14 +359,14 @@ public class TileAIShutdown extends SynchronizedTileEntity implements IAspectCon @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (o == null || this.getClass() != o.getClass()) return false; AffectedEntity that = (AffectedEntity) o; - return !(eUUID != null ? !eUUID.equals(that.eUUID) : that.eUUID != null); + return this.eUUID != null ? this.eUUID.equals(that.eUUID) : that.eUUID == null; } @Override public int hashCode() { - return eUUID != null ? eUUID.hashCode() : 0; + return this.eUUID != null ? this.eUUID.hashCode() : 0; } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java index 1067ff3..149d33b 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java @@ -27,7 +27,7 @@ public class TileAdditionalEldritchPortal extends TileEldritchPortal { private static Map trackedPortalActivity = new HashMap(); private EntityPlayer toTeleport; - private int count = 0; + private int count; @Override public void updateEntity() { @@ -39,7 +39,7 @@ public class TileAdditionalEldritchPortal extends TileEldritchPortal { this.opencount += 1; } - if ((!this.worldObj.isRemote) && (this.count % 5 == 0) && toTeleport == null) { + if ((!this.worldObj.isRemote) && (this.count % 5 == 0) && this.toTeleport == null) { List players = this.worldObj.getEntitiesWithinAABB(EntityPlayerMP.class, AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1).expand(0.5D, 1.0D, 0.5D)); if(players != null && !players.isEmpty()) { EntityPlayerMP toTeleport = players.get(0); @@ -57,7 +57,7 @@ public class TileAdditionalEldritchPortal extends TileEldritchPortal { //Teleporting there. if(TCMazeHandler.createSessionWaitForTeleport(toTeleport)) { - startTracking(toTeleport, new ExtendedChunkCoordinates(new ChunkCoordinates(xCoord, yCoord, zCoord), toTeleport.dimension)); + TileAdditionalEldritchPortal.startTracking(toTeleport, new ExtendedChunkCoordinates(new ChunkCoordinates(this.xCoord, this.yCoord, this.zCoord), toTeleport.dimension)); } } else { //Teleporting back. @@ -69,15 +69,15 @@ public class TileAdditionalEldritchPortal extends TileEldritchPortal { } public static void startTracking(EntityPlayer player, ExtendedChunkCoordinates tileCoords) { - if(!trackedPortalActivity.containsKey(player)) { - trackedPortalActivity.put(player, tileCoords); + if(!TileAdditionalEldritchPortal.trackedPortalActivity.containsKey(player)) { + TileAdditionalEldritchPortal.trackedPortalActivity.put(player, tileCoords); } } public static void informSessionStart(EntityPlayer player) { - if(trackedPortalActivity.containsKey(player)) { - ExtendedChunkCoordinates tileCoords = trackedPortalActivity.get(player); - trackedPortalActivity.remove(player); + if(TileAdditionalEldritchPortal.trackedPortalActivity.containsKey(player)) { + ExtendedChunkCoordinates tileCoords = TileAdditionalEldritchPortal.trackedPortalActivity.get(player); + TileAdditionalEldritchPortal.trackedPortalActivity.remove(player); if(tileCoords != null) { ChunkCoordinates cc = tileCoords.coordinates; WorldServer ws = MinecraftServer.getServer().worldServerForDimension(tileCoords.dimId); diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java index 6dc082f..ec55df2 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java @@ -23,77 +23,77 @@ import java.util.List; * * Created by makeo @ 28.09.2015 20:13 */ -public class TileArcaneDropper extends TileEntity implements IInventory, ISidedInventory { +public class TileArcaneDropper extends TileEntity implements ISidedInventory { private static final double RADIUS = 1.5; private List items = new ArrayList(); private final List dropQueue = new ArrayList(); - private int count = 0; + private int count; - private int removedCount = 0; - private EntityItem removedEntity = null; + private int removedCount; + private EntityItem removedEntity; @Override public void updateEntity() { - removedCount = 0; - removedEntity = null; + this.removedCount = 0; + this.removedEntity = null; - if(dropQueue.size() > 0) { - for(int i = 0; i < dropQueue.size(); i++) { - EntityItem item = dropQueue.get(i); - if(!item.isDead && !worldObj.loadedEntityList.contains(item)) { - getWorldObj().spawnEntityInWorld(item); - dropQueue.remove(i); + if(this.dropQueue.size() > 0) { + for(int i = 0; i < this.dropQueue.size(); i++) { + EntityItem item = this.dropQueue.get(i); + if(!item.isDead && !this.worldObj.loadedEntityList.contains(item)) { + this.getWorldObj().spawnEntityInWorld(item); + this.dropQueue.remove(i); i--; } } } - if(count > 20) { - count = 0; + if(this.count > 20) { + this.count = 0; - World world = getWorldObj(); + World world = this.getWorldObj(); if(!world.isRemote) { - int oldSize = items.size(); - updateInventory(); - if(oldSize != 0 || items.size() != 0) { + int oldSize = this.items.size(); + this.updateInventory(); + if(oldSize != 0 || this.items.size() != 0) { //Comparator... - world.notifyBlockChange(xCoord, yCoord, zCoord, getBlockType()); + world.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); } } } - count++; + this.count++; } private void updateInventory() { - ForgeDirection dir = ForgeDirection.getOrientation(getBlockMetadata() & 7); + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() & 7); double x = this.xCoord + dir.offsetX*2 + 0.5; double y = this.yCoord + dir.offsetY*2 + 0.5; double z = this.zCoord + dir.offsetZ*2 + 0.5; - AxisAlignedBB box = AxisAlignedBB.getBoundingBox(x, y, z, x, y, z).expand(RADIUS, RADIUS, RADIUS); - items = getWorldObj().getEntitiesWithinAABB(EntityItem.class, box); + AxisAlignedBB box = AxisAlignedBB.getBoundingBox(x, y, z, x, y, z).expand(TileArcaneDropper.RADIUS, TileArcaneDropper.RADIUS, TileArcaneDropper.RADIUS); + this.items = this.getWorldObj().getEntitiesWithinAABB(EntityItem.class, box); //Add 10 empty slots for(int i = 0; i < 10; i++) { - items.add(null); + this.items.add(null); } } private EntityItem dropItem(ItemStack stack) { - if(removedEntity != null && removedEntity.isDead) { - for(EntityItem entityItem : items) { - if(entityItem == removedEntity) { - if(InventoryUtils.areItemStacksEqualStrict(removedEntity.getEntityItem(), stack) - && removedEntity.getEntityItem().stackSize + removedCount == stack.stackSize) { - removedEntity.getEntityItem().stackSize += removedCount; - removedEntity.isDead = false; + if(this.removedEntity != null && this.removedEntity.isDead) { + for(EntityItem entityItem : this.items) { + if(entityItem == this.removedEntity) { + if(InventoryUtils.areItemStacksEqualStrict(this.removedEntity.getEntityItem(), stack) + && this.removedEntity.getEntityItem().stackSize + this.removedCount == stack.stackSize) { + this.removedEntity.getEntityItem().stackSize += this.removedCount; + this.removedEntity.isDead = false; - removedCount = 0; - removedEntity = null; + this.removedCount = 0; + this.removedEntity = null; return entityItem; } @@ -101,13 +101,13 @@ public class TileArcaneDropper extends TileEntity implements IInventory, ISidedI } } - ForgeDirection side = ForgeDirection.getOrientation(getBlockMetadata() & 7); + ForgeDirection side = ForgeDirection.getOrientation(this.getBlockMetadata() & 7); double x = this.xCoord + 0.5 + side.offsetX*0.5; double y = this.yCoord + 0.25 + side.offsetY*0.5; double z = this.zCoord + 0.5 + side.offsetZ*0.5; - EntityItem entityItem = new EntityItem(getWorldObj(), x, y, z, stack.copy());// + EntityItem entityItem = new EntityItem(this.getWorldObj(), x, y, z, stack.copy());// entityItem.motionX = side.offsetX*0.1; entityItem.motionY = side.offsetY*0.1; @@ -116,33 +116,33 @@ public class TileArcaneDropper extends TileEntity implements IInventory, ISidedI entityItem.delayBeforeCanPickup = 3; //prevent stackOverflows - dropQueue.add(entityItem); + this.dropQueue.add(entityItem); return entityItem; } @Override public int getSizeInventory() { - updateInventory(); - return items.size(); + this.updateInventory(); + return this.items.size(); } @Override public ItemStack getStackInSlot(int slot) { - updateInventory(); + this.updateInventory(); - if(slot >= items.size()) return null; //Get rekt. nothing here on this slot. + if(slot >= this.items.size()) return null; //Get rekt. nothing here on this slot. - EntityItem entity = items.get(slot); + EntityItem entity = this.items.get(slot); return entity == null || entity.isDead ? null : entity.getEntityItem(); } @Override public ItemStack decrStackSize(int slot, int amount) { - ItemStack stack = getStackInSlot(slot); + ItemStack stack = this.getStackInSlot(slot); if(stack.stackSize - amount <= 0) { - setInventorySlotContents(slot, null); + this.setInventorySlotContents(slot, null); return stack.copy(); } @@ -150,15 +150,15 @@ public class TileArcaneDropper extends TileEntity implements IInventory, ISidedI newStack.stackSize = amount; stack.stackSize -= amount; - removedEntity = items.get(slot); - removedCount = amount; + this.removedEntity = this.items.get(slot); + this.removedCount = amount; return newStack; } @Override public void setInventorySlotContents(int slot, ItemStack stack) { - EntityItem oldEntity = items.get(slot); + EntityItem oldEntity = this.items.get(slot); if(oldEntity != null) { oldEntity.setDead(); @@ -169,7 +169,7 @@ public class TileArcaneDropper extends TileEntity implements IInventory, ISidedI oldEntity.getEntityItem().stackSize = stack.stackSize; oldEntity.isDead = false; } else { - items.set(slot, dropItem(stack)); + this.items.set(slot, this.dropItem(stack)); } } } @@ -216,7 +216,7 @@ public class TileArcaneDropper extends TileEntity implements IInventory, ISidedI @Override public int[] getAccessibleSlotsFromSide(int side) { - int[] slots = new int[getSizeInventory()]; + int[] slots = new int[this.getSizeInventory()]; for(int i = 0; i < slots.length; i++) { slots[i] = i; } @@ -226,13 +226,13 @@ public class TileArcaneDropper extends TileEntity implements IInventory, ISidedI @Override public boolean canInsertItem(int slot, ItemStack stack, int side) { return RegisteredBlocks.blockArcaneDropper - .isSideSolid(getWorldObj(), this.xCoord, this.yCoord, this.zCoord, ForgeDirection.getOrientation(side)); + .isSideSolid(this.getWorldObj(), this.xCoord, this.yCoord, this.zCoord, ForgeDirection.getOrientation(side)); } @Override public boolean canExtractItem(int slot, ItemStack stack, int side) { - if(canInsertItem(slot, stack, side)) { - EntityItem entityItem = items.get(slot); + if(this.canInsertItem(slot, stack, side)) { + EntityItem entityItem = this.items.get(slot); return entityItem == null || entityItem.delayBeforeCanPickup <= 0; } return false; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java index d09f3d0..cb69cc8 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java @@ -29,47 +29,47 @@ import java.util.UUID; *

* Created by makeo @ 16.12.2015 11:50 */ -public class TileArcaneHand extends SynchronizedTileEntity implements IInventory, ISidedInventory { +public class TileArcaneHand extends SynchronizedTileEntity implements ISidedInventory { private GuiFakePlayer fakePlayer; - private ItemInWorldManager im = null; - private Container container = null; - private List slots = null; + private ItemInWorldManager im; + private Container container; + private List slots; @Override public void updateEntity() { - if(im == null) { - updateConnection(); + if(this.im == null) { + this.updateConnection(); } } public void updateConnection() { - container = null; - slots = null; + this.container = null; + this.slots = null; - if (im == null) { - im = new ItemInWorldManager(worldObj); + if (this.im == null) { + this.im = new ItemInWorldManager(this.worldObj); } else { - im.setWorld((WorldServer) worldObj); + this.im.setWorld((WorldServer) this.worldObj); } - TileEntity tile = getWorldObj().getTileEntity(xCoord, yCoord - 1, zCoord); - if (tile != null && worldObj instanceof WorldServer) { - if(fakePlayer == null) { - fakePlayer = new GuiFakePlayer(this); + TileEntity tile = this.getWorldObj().getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); + if (tile != null && this.worldObj instanceof WorldServer) { + if(this.fakePlayer == null) { + this.fakePlayer = new GuiFakePlayer(this); } - fakePlayer.posX = xCoord; - fakePlayer.posY = yCoord; - fakePlayer.posZ = zCoord; + this.fakePlayer.posX = this.xCoord; + this.fakePlayer.posY = this.yCoord; + this.fakePlayer.posZ = this.zCoord; - this.im.activateBlockOrUseItem(fakePlayer, worldObj, null, xCoord, yCoord - 1, zCoord, ForgeDirection.UP.ordinal(), 0.5F, 0.5F, 0.5F); + this.im.activateBlockOrUseItem(this.fakePlayer, this.worldObj, null, this.xCoord, this.yCoord - 1, this.zCoord, ForgeDirection.UP.ordinal(), 0.5F, 0.5F, 0.5F); } } @Override public int[] getAccessibleSlotsFromSide(int side) { - if(container == null) { + if(this.container == null) { return new int[0]; } @@ -82,12 +82,12 @@ public class TileArcaneHand extends SynchronizedTileEntity implements IInventory @Override public boolean canInsertItem(int slot, ItemStack stack, int side) { - return slots.get(slot).isItemValid(stack); + return this.slots.get(slot).isItemValid(stack); } @Override public boolean canExtractItem(int slot, ItemStack stack, int side) { - return slots.get(slot).canTakeStack(fakePlayer); + return this.slots.get(slot).canTakeStack(this.fakePlayer); } private static class GuiFakePlayer extends AdvancedFakePlayer { @@ -100,12 +100,12 @@ public class TileArcaneHand extends SynchronizedTileEntity implements IInventory public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) { ModContainer mc = FMLCommonHandler.instance().findContainerFor(mod); - tile.container = NetworkRegistry.INSTANCE.getRemoteGuiContainer(mc, this, modGuiId, world, x, y, z); - if (tile.container != null) { - tile.slots = new ArrayList(); - for (Slot slot : (List) tile.container.inventorySlots) { - if(!inventory.equals(slot.inventory)) { - tile.slots.add(slot); + this.tile.container = NetworkRegistry.INSTANCE.getRemoteGuiContainer(mc, this, modGuiId, world, x, y, z); + if (this.tile.container != null) { + this.tile.slots = new ArrayList(); + for (Slot slot : (List) this.tile.container.inventorySlots) { + if(!this.inventory.equals(slot.inventory)) { + this.tile.slots.add(slot); } } } @@ -124,17 +124,17 @@ public class TileArcaneHand extends SynchronizedTileEntity implements IInventory @Override public int getSizeInventory() { - return slots.size(); + return this.slots.size(); } @Override public ItemStack getStackInSlot(int slot) { - return slots.get(slot).getStack(); + return this.slots.get(slot).getStack(); } @Override public ItemStack decrStackSize(int slot, int amount) { - Slot s = slots.get(slot); + Slot s = this.slots.get(slot); if (s.getStack() != null) { ItemStack itemstack; @@ -164,7 +164,7 @@ public class TileArcaneHand extends SynchronizedTileEntity implements IInventory @Override public void setInventorySlotContents(int slot, ItemStack stack) { - slots.get(slot).putStack(stack); + this.slots.get(slot).putStack(stack); } @Override diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java index a19b01b..db2d647 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java @@ -25,38 +25,38 @@ import java.util.List; *

* Created by makeo @ 14.11.2015 12:22 */ -public class TileArcanePackager extends TileJarFillable implements IInventory, ISidedInventory { +public class TileArcanePackager extends TileJarFillable implements ISidedInventory { private static final Aspect ASPECT = Aspect.CLOTH; private ItemStack[] contents = new ItemStack[12]; //0 - 46 public byte progress = -1; - public boolean autoStart = false; - public boolean useEssentia = false; - public boolean disguise = false; - private Boolean redstoneState = null; + public boolean autoStart; + public boolean useEssentia; + public boolean disguise; + private Boolean redstoneState; - private int count = 0; + private int count; public TileArcanePackager() { - aspectFilter = ASPECT; - maxAmount = 8; + this.aspectFilter = TileArcanePackager.ASPECT; + this.maxAmount = 8; } @Override public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); - contents = new ItemStack[getSizeInventory()]; + this.contents = new ItemStack[this.getSizeInventory()]; NBTTagList list = compound.getTagList("Items", 10); for (int i = 0; i < list.tagCount(); ++i) { NBTTagCompound slot = list.getCompoundTagAt(i); int j = slot.getByte("Slot") & 255; - if (j >= 0 && j < contents.length) { - contents[j] = ItemStack.loadItemStackFromNBT(slot); + if (j >= 0 && j < this.contents.length) { + this.contents[j] = ItemStack.loadItemStackFromNBT(slot); } } } @@ -66,11 +66,11 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I super.writeToNBT(compound); NBTTagList list = new NBTTagList(); - for (int i = 0; i < contents.length; ++i) { - if (contents[i] != null) { + for (int i = 0; i < this.contents.length; ++i) { + if (this.contents[i] != null) { NBTTagCompound slot = new NBTTagCompound(); slot.setByte("Slot", (byte) i); - contents[i].writeToNBT(slot); + this.contents[i].writeToNBT(slot); list.appendTag(slot); } } @@ -80,51 +80,51 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I @Override public void updateEntity() { super.updateEntity(); - if (worldObj.isRemote) { - if (progress >= 0 && progress < 46) { - progress++; + if (this.worldObj.isRemote) { + if (this.progress >= 0 && this.progress < 46) { + this.progress++; } } else { - if (redstoneState == null) { - redstoneState = worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); + if (this.redstoneState == null) { + this.redstoneState = this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord); } - if (progress >= 47) { - doPack(); - progress = -1; - markForUpdate(); - count = 1; + if (this.progress >= 47) { + this.doPack(); + this.progress = -1; + this.markForUpdate(); + this.count = 1; } - if (progress >= 0) { - progress++; - } else if (count++ % 5 == 0) { - if (autoStart && canPack()) { - progress = 0; - markForUpdate(); + if (this.progress >= 0) { + this.progress++; + } else if (this.count++ % 5 == 0) { + if (this.autoStart && this.canPack()) { + this.progress = 0; + this.markForUpdate(); } } } } public void updateRedstone(boolean state) { - if(redstoneState != null && state && !redstoneState) { - if (canPack()) { - progress = 0; - markForUpdate(); + if(this.redstoneState != null && state && !this.redstoneState) { + if (this.canPack()) { + this.progress = 0; + this.markForUpdate(); } } - redstoneState = state; + this.redstoneState = state; } private boolean canPack() { - if (getStackInSlot(11) != null) { + if (this.getStackInSlot(11) != null) { return false; } boolean check = false; for (int i = 0; i < 9; i++) { - if (getStackInSlot(i) != null) { + if (this.getStackInSlot(i) != null) { check = true; break; } @@ -134,65 +134,60 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I return false; } - if (useEssentia) { - if (amount < 4) { - return false; - } + if (this.useEssentia) { + return this.amount >= 4; } else { - ItemStack leather = getStackInSlot(9); + ItemStack leather = this.getStackInSlot(9); if (leather == null || leather.stackSize < 1 || leather.getItem() != Items.leather) { return false; } - ItemStack string = getStackInSlot(10); - if (string == null || string.stackSize < 1 || string.getItem() != Items.string) { - return false; - } + ItemStack string = this.getStackInSlot(10); + return string != null && string.stackSize >= 1 && string.getItem() == Items.string; } - return true; } private void doPack() { - if (canPack()) { + if (this.canPack()) { List contents = new ArrayList(); for (int i = 0; i < 9; i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = this.getStackInSlot(i); if (stack != null) { contents.add(stack); } } - ItemStack pack = new ItemStack(disguise ? RegisteredItems.itemFakeLootbag : RegisteredItems.itemPackage, 1, useEssentia ? 1 : 0); + ItemStack pack = new ItemStack(this.disguise ? RegisteredItems.itemFakeLootbag : RegisteredItems.itemPackage, 1, this.useEssentia ? 1 : 0); boolean success = RegisteredItems.itemPackage.setContents(pack, contents); if (success) { - if (useEssentia) { - amount -= 4; + if (this.useEssentia) { + this.amount -= 4; } else { - decrStackSize(9, 1); - decrStackSize(10, 1); + this.decrStackSize(9, 1); + this.decrStackSize(10, 1); } - setInventorySlotContents(11, pack); + this.setInventorySlotContents(11, pack); for (int i = 0; i < 9; i++) { - setInventorySlotContents(i, null); + this.setInventorySlotContents(i, null); } } else { - worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 1, false, false); + this.worldObj.newExplosion(null, this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, 1, false, false); for(int i = 0; i < 9; i++) { ItemStack stack = this.contents[i]; if(stack != null) { - EntityItem entityItem = new EntityItem(worldObj, xCoord + 0.5, yCoord + (13/16f), zCoord + 0.5, stack); - ItemUtils.applyRandomDropOffset(entityItem, worldObj.rand); - worldObj.spawnEntityInWorld(entityItem); + EntityItem entityItem = new EntityItem(this.worldObj, this.xCoord + 0.5, this.yCoord + (13/16f), this.zCoord + 0.5, stack); + ItemUtils.applyRandomDropOffset(entityItem, this.worldObj.rand); + this.worldObj.spawnEntityInWorld(entityItem); this.contents[i] = null; } } - progress = -1; - markForUpdate(); + this.progress = -1; + this.markForUpdate(); } } } @@ -200,14 +195,14 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I @Override public void readCustomNBT(NBTTagCompound compound) { super.readCustomNBT(compound); - aspectFilter = ASPECT; + this.aspectFilter = TileArcanePackager.ASPECT; - progress = compound.getByte("progress"); + this.progress = compound.getByte("progress"); byte settings = compound.getByte("settings"); - autoStart = (settings & 1) == 1; - useEssentia = (settings & 2) == 2; - disguise = (settings & 4) == 4; + this.autoStart = (settings & 1) == 1; + this.useEssentia = (settings & 2) == 2; + this.disguise = (settings & 4) == 4; } @Override @@ -215,17 +210,17 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I super.writeCustomNBT(compound); compound.removeTag("AspectFilter"); - compound.setByte("progress", progress); + compound.setByte("progress", this.progress); - byte settings = (byte) (autoStart ? 1 : 0); - settings |= useEssentia ? 2 : 0; - settings |= disguise ? 4 : 0; + byte settings = (byte) (this.autoStart ? 1 : 0); + settings |= this.useEssentia ? 2 : 0; + settings |= this.disguise ? 4 : 0; compound.setByte("settings", settings); } public void markForUpdate() { - markDirty(); - getWorldObj().markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } @Override @@ -235,7 +230,7 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I @Override public ItemStack getStackInSlot(int slot) { - return contents[slot]; + return this.contents[slot]; } @Override @@ -321,13 +316,10 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I return stack.getItem() == Items.leather; } else if (slot == 10) { return stack.getItem() == Items.string; - } else if (slot == 11) { - return false; - } - return true; + } else return slot != 11; } - private static final int[] ORIENTATION_MAPPING = new int[]{-1, -1, 0, 2, 1, 3}; + private static final int[] ORIENTATION_MAPPING = {-1, -1, 0, 2, 1, 3}; @Override public int[] getAccessibleSlotsFromSide(int side) { @@ -335,7 +327,7 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I return new int[]{11}; } - if (ORIENTATION_MAPPING[side] == super.facing) { + if (TileArcanePackager.ORIENTATION_MAPPING[side] == super.facing) { return new int[]{9, 10, 0, 1, 2, 3, 4, 5, 6, 7, 8}; } @@ -344,7 +336,7 @@ public class TileArcanePackager extends TileJarFillable implements IInventory, I @Override public boolean canInsertItem(int slot, ItemStack stack, int side) { - return !(useEssentia && (slot == 9 || slot == 10)); + return !(this.useEssentia && (slot == 9 || slot == 10)); } @Override diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java index d8f5f96..4f8f270 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java @@ -2,8 +2,8 @@ package makeo.gadomancy.common.blocks.tiles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.aura.AuraEffectHandler; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.utils.NBTHelper; import net.minecraft.block.Block; import net.minecraft.command.IEntitySelector; @@ -39,14 +39,14 @@ import java.util.List; */ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectContainer, IEssentiaTransport, EntityPermNoClipItem.IItemMasterTile { - private ItemStack crystalEssentiaStack = null; - private boolean isPartOfMultiblock = false; + private ItemStack crystalEssentiaStack; + private boolean isPartOfMultiblock; - private int timeSinceLastItemInfo = 0; + private int timeSinceLastItemInfo; - private int ticksExisted = 0; + private int ticksExisted; private Aspect holdingAspect; - private int amount = 0; + private int amount; private int maxAmount = 5; private boolean isMasterTile; private boolean isInputTile; @@ -54,47 +54,47 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. @Override public void updateEntity() { - ticksExisted++; - timeSinceLastItemInfo++; + this.ticksExisted++; + this.timeSinceLastItemInfo++; - if (!worldObj.isRemote) { - if ((ticksExisted & 3) == 0) { - if (checkComponents()) return; + if (!this.worldObj.isRemote) { + if ((this.ticksExisted & 3) == 0) { + if (this.checkComponents()) return; } - if (isInputTile()) { - handleIO(); + if (this.isInputTile()) { + this.handleIO(); } - if (isMasterTile()) { - TileAuraPylon io = getInputTile(); + if (this.isMasterTile()) { + TileAuraPylon io = this.getInputTile(); if(io != null && io.amount > 0) { - if ((ticksExisted & 31) == 0) { - drainEssentia(io); + if ((this.ticksExisted & 31) == 0) { + this.drainEssentia(io); } - doAuraEffects(holdingAspect); + this.doAuraEffects(this.holdingAspect); } - if(holdingAspect != null && timeSinceLastItemInfo > 8) { - informItemRemoval(); + if(this.holdingAspect != null && this.timeSinceLastItemInfo > 8) { + this.informItemRemoval(); } } } else { - if(isInputTile() && holdingAspect != null) { - doEssentiaTrail(); + if(this.isInputTile() && this.holdingAspect != null) { + this.doEssentiaTrail(); } } - if (isMasterTile()) { - if (crystalEssentiaStack == null) { - tryVortexPossibleItems(); + if (this.isMasterTile()) { + if (this.crystalEssentiaStack == null) { + this.tryVortexPossibleItems(); } } } @Override public boolean canStillHoldItem() { - return isMasterTile(); + return this.isMasterTile(); } @Override @@ -104,25 +104,25 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont private void doAuraEffects(Aspect aspect) { if(aspect == null) return; - if(!isMasterTile()) return; - if(worldObj.isRemote) return; - AuraEffectHandler.distributeEffects(aspect, worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, ticksExisted); + if(!this.isMasterTile()) return; + if(this.worldObj.isRemote) return; + AuraEffectHandler.distributeEffects(aspect, this.worldObj, this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, this.ticksExisted); } private void drainEssentia(TileAuraPylon io) { - if(!isMasterTile()) return; + if(!this.isMasterTile()) return; io.amount--; - worldObj.markBlockForUpdate(io.xCoord, io.yCoord, io.zCoord); + this.worldObj.markBlockForUpdate(io.xCoord, io.yCoord, io.zCoord); io.markDirty(); } //Client-Side input tile only! @SideOnly(Side.CLIENT) private void doEssentiaTrail() { - if((ticksExisted & 1) == 0) return; - TileAuraPylon tile = getMasterTile(); + if((this.ticksExisted & 1) == 0) return; + TileAuraPylon tile = this.getMasterTile(); if(tile == null) return; - TileAuraPylon inputTile = getInputTile(); + TileAuraPylon inputTile = this.getInputTile(); if(inputTile == null) return; Aspect a = inputTile.getAspectType(); if(a == null) return; @@ -132,35 +132,35 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont FXEssentiaTrail essentiaTrail = new FXEssentiaTrail(tile.getWorldObj(), inputTile.xCoord + 0.5, inputTile.yCoord + 0.2, inputTile.zCoord + 0.5, tile.xCoord + 0.5, tile.yCoord + 1.7, tile.zCoord + 0.5, count, a.getColor(), 1); essentiaTrail.noClip = true; essentiaTrail.motionY = (0.1F + MathHelper.sin(count / 3.0F) * 0.01F); - essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.001F + worldObj.rand.nextGaussian() * 0.002000000094994903D); - essentiaTrail.motionZ = (MathHelper.sin(count / 10.0F) * 0.001F + worldObj.rand.nextGaussian() * 0.002000000094994903D); + essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.001F + this.worldObj.rand.nextGaussian() * 0.002000000094994903D); + essentiaTrail.motionZ = (MathHelper.sin(count / 10.0F) * 0.001F + this.worldObj.rand.nextGaussian() * 0.002000000094994903D); ParticleEngine.instance.addEffect(tile.getWorldObj(), essentiaTrail); } //Special to masterTile only! private void distributeAspectInformation() { - if(!isMasterTile()) return; + if(!this.isMasterTile()) return; int count = 1; - TileEntity iter = worldObj.getTileEntity(xCoord, yCoord - count, zCoord); + TileEntity iter = this.worldObj.getTileEntity(this.xCoord, this.yCoord - count, this.zCoord); while(iter != null && iter instanceof TileAuraPylon) { - ((TileAuraPylon) iter).holdingAspect = holdingAspect; - worldObj.markBlockForUpdate(xCoord, yCoord - count, zCoord); + ((TileAuraPylon) iter).holdingAspect = this.holdingAspect; + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord - count, this.zCoord); iter.markDirty(); count++; - iter = worldObj.getTileEntity(xCoord, yCoord - count, zCoord); + iter = this.worldObj.getTileEntity(this.xCoord, this.yCoord - count, this.zCoord); } } //Special to masterTile only! private void tryVortexPossibleItems() { - TileAuraPylon io = getInputTile(); + TileAuraPylon io = this.getInputTile(); if (io == null) return; - int masterY = yCoord + 1; + int masterY = this.yCoord + 1; float dst = ((float) (masterY - io.yCoord)) / 2F; float yC = masterY - dst; - List entityItems = worldObj.selectEntitiesWithinAABB(EntityItem.class, - AxisAlignedBB.getBoundingBox(xCoord - 0.5, yC - 0.5, zCoord - 0.5, xCoord + 0.5, yC + 0.5, zCoord + 0.5).expand(8, 8, 8), new IEntitySelector() { + List entityItems = this.worldObj.selectEntitiesWithinAABB(EntityItem.class, + AxisAlignedBB.getBoundingBox(this.xCoord - 0.5, yC - 0.5, this.zCoord - 0.5, this.xCoord + 0.5, yC + 0.5, this.zCoord + 0.5).expand(8, 8, 8), new IEntitySelector() { @Override public boolean isEntityApplicable(Entity e) { return !(e instanceof EntityPermanentItem) && !(e instanceof EntitySpecialItem) && @@ -169,10 +169,10 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont ((ItemCrystalEssence) ((EntityItem) e).getEntityItem().getItem()).getAspects(((EntityItem) e).getEntityItem()) != null; } }); - Entity dummy = new EntityItem(worldObj); - dummy.posX = xCoord + 0.5; + Entity dummy = new EntityItem(this.worldObj); + dummy.posX = this.xCoord + 0.5; dummy.posY = yC + 0.5; - dummy.posZ = zCoord + 0.5; + dummy.posZ = this.zCoord + 0.5; //MC code. EntityItem entity = null; @@ -188,13 +188,13 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } } if(entity == null) return; - if(dummy.getDistanceToEntity(entity) < 1 && !worldObj.isRemote) { + if(dummy.getDistanceToEntity(entity) < 1 && !this.worldObj.isRemote) { ItemStack inter = entity.getEntityItem(); inter.stackSize--; this.crystalEssentiaStack = inter.copy(); this.crystalEssentiaStack.stackSize = 1; - EntityPermNoClipItem item = new EntityPermNoClipItem(entity.worldObj, xCoord + 0.5F, yC + 0.3F, zCoord + 0.5F, crystalEssentiaStack, xCoord, yCoord, zCoord); + EntityPermNoClipItem item = new EntityPermNoClipItem(entity.worldObj, this.xCoord + 0.5F, yC + 0.3F, this.zCoord + 0.5F, this.crystalEssentiaStack, this.xCoord, this.yCoord, this.zCoord); entity.worldObj.spawnEntityInWorld(item); item.motionX = 0; item.motionY = 0; @@ -203,19 +203,19 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont item.age = entity.age; item.noClip = true; - timeSinceLastItemInfo = 0; + this.timeSinceLastItemInfo = 0; - holdingAspect = ((ItemCrystalEssence) crystalEssentiaStack.getItem()).getAspects(crystalEssentiaStack).getAspects()[0]; - distributeAspectInformation(); + this.holdingAspect = ((ItemCrystalEssence) this.crystalEssentiaStack.getItem()).getAspects(this.crystalEssentiaStack).getAspects()[0]; + this.distributeAspectInformation(); if(inter.stackSize <= 0) entity.setDead(); entity.noClip = false; item.delayBeforeCanPickup = 60; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } else { entity.noClip = true; - applyMovementVectors(entity); + this.applyMovementVectors(entity); } } @@ -236,7 +236,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Special to inputTile only! private void handleIO() { - if ((!worldObj.isRemote) && ((ticksExisted & 15) == 0) && (getEssentiaAmount() < getMaxAmount())) { + if ((!this.worldObj.isRemote) && ((this.ticksExisted & 15) == 0) && (this.getEssentiaAmount() < this.getMaxAmount())) { TileEntity te = ThaumcraftApiHelper.getConnectableTile(this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.DOWN); if (te != null) { IEssentiaTransport ic = (IEssentiaTransport) te; @@ -244,8 +244,8 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont return; } - if ((holdingAspect != null) && (ic.getSuctionAmount(ForgeDirection.UP) < getSuctionAmount(ForgeDirection.DOWN))) { - addToContainer(holdingAspect, ic.takeEssentia(holdingAspect, 1, ForgeDirection.UP)); + if ((this.holdingAspect != null) && (ic.getSuctionAmount(ForgeDirection.UP) < this.getSuctionAmount(ForgeDirection.DOWN))) { + this.addToContainer(this.holdingAspect, ic.takeEssentia(this.holdingAspect, 1, ForgeDirection.UP)); } } } @@ -253,16 +253,16 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont @Override public void informItemRemoval() { - if(!isMasterTile()) return; + if(!this.isMasterTile()) return; this.crystalEssentiaStack = null; this.holdingAspect = null; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); - distributeAspectInformation(); - TileAuraPylon io = getInputTile(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); + this.distributeAspectInformation(); + TileAuraPylon io = this.getInputTile(); if(io == null) return; io.amount = 0; - worldObj.markBlockForUpdate(io.xCoord, io.yCoord, io.zCoord); + this.worldObj.markBlockForUpdate(io.xCoord, io.yCoord, io.zCoord); io.markDirty(); } @@ -280,52 +280,52 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. //Returns true, if state has changed, false if still complete state. private boolean checkComponents() { - TileAuraPylon te = getMasterTile(); + TileAuraPylon te = this.getMasterTile(); if (te == null) { - breakTile(); + this.breakTile(); return true; } - te = getInputTile(); + te = this.getInputTile(); if (te == null) { - breakTile(); + this.breakTile(); return true; } - if(!hasTopTile()) { - breakTile(); + if(!this.hasTopTile()) { + this.breakTile(); return true; } return false; } private boolean hasTopTile() { - TileAuraPylon master = getMasterTile(); + TileAuraPylon master = this.getMasterTile(); if(master == null) return false; - TileEntity te = worldObj.getTileEntity(master.xCoord, master.yCoord + 1, master.zCoord); + TileEntity te = this.worldObj.getTileEntity(master.xCoord, master.yCoord + 1, master.zCoord); return !(te == null || !(te instanceof TileAuraPylonTop)); } //Individual. private void breakTile() { - if(!isPartOfMultiblock || worldObj.isRemote) return; + if(!this.isPartOfMultiblock || this.worldObj.isRemote) return; - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - Block pylon = worldObj.getBlock(xCoord, yCoord, zCoord); + int meta = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); + Block pylon = this.worldObj.getBlock(this.xCoord, this.yCoord, this.zCoord); if(pylon != null) { - ArrayList stacks = pylon.getDrops(worldObj, xCoord, yCoord, zCoord, meta, 0); + ArrayList stacks = pylon.getDrops(this.worldObj, this.xCoord, this.yCoord, this.zCoord, meta, 0); for(ItemStack i : stacks) { - EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, i); + EntityItem item = new EntityItem(this.worldObj, this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, i); //ItemUtils.applyRandomDropOffset(item, worldObj.rand); - worldObj.spawnEntityInWorld(item); + this.worldObj.spawnEntityInWorld(item); } } - worldObj.removeTileEntity(xCoord, yCoord, zCoord); - worldObj.setBlockToAir(xCoord, yCoord, zCoord); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.worldObj.removeTileEntity(this.xCoord, this.yCoord, this.zCoord); + this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } //Individual public boolean isPartOfMultiblock() { - return isPartOfMultiblock; + return this.isPartOfMultiblock; } //Individual. @@ -347,57 +347,57 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. public boolean isInputTile() { - return isInputTile; + return this.isInputTile; } //Individual. public TileAuraPylon getInputTile() { - if (isInputTile()) return this; - if(worldObj == null) return null; - TileEntity superTile = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + if (this.isInputTile()) return this; + if(this.worldObj == null) return null; + TileEntity superTile = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); if (superTile == null || !(superTile instanceof TileAuraPylon)) return null; return ((TileAuraPylon) superTile).getInputTile(); } //Individual. public boolean isMasterTile() { - return isMasterTile; + return this.isMasterTile; } //Individual. public TileAuraPylon getMasterTile() { - if (isMasterTile()) return this; - if(worldObj == null) return null; - TileEntity superTile = worldObj.getTileEntity(xCoord, yCoord + 1, zCoord); + if (this.isMasterTile()) return this; + if(this.worldObj == null) return null; + TileEntity superTile = this.worldObj.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord); if (superTile == null || !(superTile instanceof TileAuraPylon)) return null; return ((TileAuraPylon) superTile).getMasterTile(); } //Dynamic. public int getEssentiaAmount() { - TileAuraPylon io = getInputTile(); + TileAuraPylon io = this.getInputTile(); if (io == null) return 0; return io.amount; } //Dynamic. public Aspect getAspectType() { - TileAuraPylon io = getInputTile(); + TileAuraPylon io = this.getInputTile(); if (io == null) return null; return io.holdingAspect; } //Dynamic. public int getMaxAmount() { - TileAuraPylon io = getInputTile(); + TileAuraPylon io = this.getInputTile(); if (io == null) return 0; int max = io.maxAmount; int counter = 1; - TileEntity superTile = worldObj.getTileEntity(xCoord, yCoord + counter, zCoord); + TileEntity superTile = this.worldObj.getTileEntity(this.xCoord, this.yCoord + counter, this.zCoord); while (superTile != null && superTile instanceof TileAuraPylon) { max += ((TileAuraPylon) superTile).maxAmount; counter++; - superTile = worldObj.getTileEntity(xCoord, yCoord + counter, zCoord); + superTile = this.worldObj.getTileEntity(this.xCoord, this.yCoord + counter, this.zCoord); } return max; } @@ -421,16 +421,16 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont @Override public void writeCustomNBT(NBTTagCompound compound) { - compound.setBoolean("input", isInputTile); - compound.setBoolean("master", isMasterTile); - if (holdingAspect != null) { - compound.setString("aspect", holdingAspect.getTag()); + compound.setBoolean("input", this.isInputTile); + compound.setBoolean("master", this.isMasterTile); + if (this.holdingAspect != null) { + compound.setString("aspect", this.holdingAspect.getTag()); } - compound.setInteger("amount", amount); - compound.setInteger("maxAmount", maxAmount); - compound.setBoolean("partOfMultiblock", isPartOfMultiblock); - if(crystalEssentiaStack != null) - NBTHelper.setStack(compound, "crystalStack", crystalEssentiaStack); + compound.setInteger("amount", this.amount); + compound.setInteger("maxAmount", this.maxAmount); + compound.setBoolean("partOfMultiblock", this.isPartOfMultiblock); + if(this.crystalEssentiaStack != null) + NBTHelper.setStack(compound, "crystalStack", this.crystalEssentiaStack); } /////////////////////////////////////////////////////////////////////////////////////////////// @@ -440,7 +440,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Dynamic. @Override public AspectList getAspects() { - TileAuraPylon io = getInputTile(); + TileAuraPylon io = this.getInputTile(); AspectList al = new AspectList(); if (io != null && io.holdingAspect != null && io.amount > 0) { al.add(io.holdingAspect, io.amount); @@ -456,7 +456,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. @Override public boolean doesContainerAccept(Aspect aspect) { - return isInputTile() && holdingAspect != null && holdingAspect.equals(aspect); + return this.isInputTile() && this.holdingAspect != null && this.holdingAspect.equals(aspect); } //Individual. @@ -466,15 +466,15 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont return amount; } - if (!isInputTile()) return 0; + if (!this.isInputTile()) return 0; if (aspect == null) return 0; - if (holdingAspect != null && this.amount < getMaxAmount() && aspect == holdingAspect) { - int added = Math.min(amount, getMaxAmount() - this.amount); + if (this.holdingAspect != null && this.amount < this.getMaxAmount() && aspect == this.holdingAspect) { + int added = Math.min(amount, this.getMaxAmount() - this.amount); this.amount += added; amount -= added; this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - markDirty(); + this.markDirty(); } return amount; } @@ -482,17 +482,17 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. @Override public boolean takeFromContainer(Aspect aspect, int i) { - if (!isInputTile()) return false; - if (aspect == null || holdingAspect == null) return false; + if (!this.isInputTile()) return false; + if (aspect == null || this.holdingAspect == null) return false; - if (this.amount >= i && holdingAspect.equals(aspect)) { + if (this.amount >= i && this.holdingAspect.equals(aspect)) { this.amount -= i; if (this.amount <= 0) { this.holdingAspect = null; this.amount = 0; } this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - markDirty(); + this.markDirty(); return true; } return false; @@ -508,16 +508,16 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. @Override public boolean doesContainerContainAmount(Aspect aspect, int i) { - return isInputTile() && holdingAspect != null && this.amount >= i && aspect == holdingAspect; + return this.isInputTile() && this.holdingAspect != null && this.amount >= i && aspect == this.holdingAspect; } //Individual. @Override public boolean doesContainerContain(AspectList list) { - if (!isInputTile()) return false; - if (holdingAspect == null) return false; + if (!this.isInputTile()) return false; + if (this.holdingAspect == null) return false; - for (Aspect a : list.getAspects()) if ((this.amount > 0) && (a == holdingAspect)) return true; + for (Aspect a : list.getAspects()) if ((this.amount > 0) && (a == this.holdingAspect)) return true; return false; } @@ -534,13 +534,13 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. @Override public boolean isConnectable(ForgeDirection face) { - return isInputTile() && face == ForgeDirection.DOWN; + return this.isInputTile() && face == ForgeDirection.DOWN; } //Individual. @Override public boolean canInputFrom(ForgeDirection face) { - return isInputTile() && face == ForgeDirection.DOWN; + return this.isInputTile() && face == ForgeDirection.DOWN; } //Individual. @@ -557,14 +557,14 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Individual. @Override public Aspect getSuctionType(ForgeDirection forgeDirection) { - return isInputTile() ? holdingAspect : null; + return this.isInputTile() ? this.holdingAspect : null; } @Override public int getSuctionAmount(ForgeDirection forgeDirection) { - if (!isInputTile()) return 0; - if (holdingAspect == null) return 0; - return getMinimumSuction(); + if (!this.isInputTile()) return 0; + if (this.holdingAspect == null) return 0; + return this.getMinimumSuction(); } @Override @@ -574,20 +574,20 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont @Override public int addEssentia(Aspect aspect, int amt, ForgeDirection direction) { - if (!isInputTile()) return 0; - return canInputFrom(direction) ? amount - addToContainer(aspect, amount) : 0; + if (!this.isInputTile()) return 0; + return this.canInputFrom(direction) ? this.amount - this.addToContainer(aspect, this.amount) : 0; } //Individual. @Override public Aspect getEssentiaType(ForgeDirection forgeDirection) { - return isInputTile() ? holdingAspect : null; + return this.isInputTile() ? this.holdingAspect : null; } //Individual. @Override public int getEssentiaAmount(ForgeDirection forgeDirection) { - return isInputTile() ? amount : 0; + return this.isInputTile() ? this.amount : 0; } @Override @@ -602,8 +602,8 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } public boolean isLowestTile() { - if(worldObj == null) return false; - TileEntity te = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + if(this.worldObj == null) return false; + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); return te == null || !(te instanceof TileAuraPylon); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java index b3d4721..a2fefbb 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java @@ -3,13 +3,9 @@ package makeo.gadomancy.common.blocks.tiles; import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.client.effect.fx.Orbital; import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.utils.ItemUtils; -import makeo.gadomancy.common.utils.Vector3; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -28,31 +24,31 @@ import java.util.ArrayList; public class TileAuraPylonTop extends SynchronizedTileEntity implements IAspectContainer { public Orbital orbital; - private boolean shouldRender = false; - private boolean shouldRenderAura = false; + private boolean shouldRender; + private boolean shouldRenderAura; @Override public void updateEntity() { - TileEntity te = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); - if(!worldObj.isRemote) { + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); + if(!this.worldObj.isRemote) { if(te == null || !(te instanceof TileAuraPylon)) { - breakTile(); + this.breakTile(); return; } - if(worldObj.getBlock(xCoord, yCoord - 1, zCoord) != RegisteredBlocks.blockAuraPylon || worldObj.getBlockMetadata(xCoord, yCoord - 1, zCoord) != 0) { - breakTile(); + if(this.worldObj.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) != RegisteredBlocks.blockAuraPylon || this.worldObj.getBlockMetadata(this.xCoord, this.yCoord - 1, this.zCoord) != 0) { + this.breakTile(); return; } TileAuraPylon pylon = (TileAuraPylon) te; - if(pylon.isPartOfMultiblock() && !pylon.isMasterTile()) breakTile(); + if(pylon.isPartOfMultiblock() && !pylon.isMasterTile()) this.breakTile(); } else { - shouldRender = te != null && te instanceof TileAuraPylon && ((TileAuraPylon) te).isPartOfMultiblock(); - shouldRenderAura = te != null && te instanceof TileAuraPylon && ((TileAuraPylon) te).getEssentiaAmount() > 0; + this.shouldRender = te != null && te instanceof TileAuraPylon && ((TileAuraPylon) te).isPartOfMultiblock(); + this.shouldRenderAura = te != null && te instanceof TileAuraPylon && ((TileAuraPylon) te).getEssentiaAmount() > 0; } } public Aspect getAspect() { - TileEntity te = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); if(te == null || !(te instanceof TileAuraPylon)) { return null; } @@ -60,35 +56,35 @@ public class TileAuraPylonTop extends SynchronizedTileEntity implements IAspectC } private void breakTile() { - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - Block pylon = worldObj.getBlock(xCoord, yCoord, zCoord); + int meta = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); + Block pylon = this.worldObj.getBlock(this.xCoord, this.yCoord, this.zCoord); if(pylon != null) { - ArrayList stacks = pylon.getDrops(worldObj, xCoord, yCoord, zCoord, meta, 0); + ArrayList stacks = pylon.getDrops(this.worldObj, this.xCoord, this.yCoord, this.zCoord, meta, 0); for(ItemStack i : stacks) { - EntityItem item = new EntityItem(worldObj, xCoord, yCoord, zCoord, i); - worldObj.spawnEntityInWorld(item); + EntityItem item = new EntityItem(this.worldObj, this.xCoord, this.yCoord, this.zCoord, i); + this.worldObj.spawnEntityInWorld(item); } } - worldObj.removeTileEntity(xCoord, yCoord, zCoord); - worldObj.setBlockToAir(xCoord, yCoord, zCoord); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.worldObj.removeTileEntity(this.xCoord, this.yCoord, this.zCoord); + this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } public boolean shouldRenderEffect() { - return shouldRender; + return this.shouldRender; } public boolean shouldRenderAuraEffect() { - return shouldRenderAura; + return this.shouldRenderAura; } @Override public void invalidate() { super.invalidate(); - if(orbital != null) { - orbital.clearOrbitals(); - if(orbital.registered) - EffectHandler.getInstance().unregisterOrbital(orbital); + if(this.orbital != null) { + this.orbital.clearOrbitals(); + if(this.orbital.registered) + EffectHandler.getInstance().unregisterOrbital(this.orbital); } } @@ -99,7 +95,7 @@ public class TileAuraPylonTop extends SynchronizedTileEntity implements IAspectC @Override public AspectList getAspects() { - TileEntity master = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + TileEntity master = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); if(master == null || !(master instanceof TileAuraPylon)) return null; return ((TileAuraPylon) master).getAspects(); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java index d7a2474..eb8a7e9 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java @@ -33,45 +33,45 @@ public class TileBlockProtector extends TileJarFillable { private static final int MAX_RANGE = 15; private static final Aspect ASPECT = Aspect.ORDER; - private int range = 0; - private int saturation = 0; - private int count = 0; + private int range; + private int saturation; + private int count; public TileBlockProtector() { - maxAmount = 8; - aspectFilter = ASPECT; + this.maxAmount = 8; + this.aspectFilter = TileBlockProtector.ASPECT; } public int getCurrentRange() { - return range; + return this.range; } public int getPowerLevel() { - return Math.min(worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord), MAX_RANGE); + return Math.min(this.worldObj.getStrongestIndirectPower(this.xCoord, this.yCoord, this.zCoord), TileBlockProtector.MAX_RANGE); } @Override public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound); - compound.setInteger("ProtectSaturation", saturation); + compound.setInteger("ProtectSaturation", this.saturation); } @Override public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); - saturation = compound.getInteger("ProtectSaturation"); + this.saturation = compound.getInteger("ProtectSaturation"); } @Override public void readCustomNBT(NBTTagCompound compound) { super.readCustomNBT(compound); - aspectFilter = ASPECT; + this.aspectFilter = TileBlockProtector.ASPECT; - int oldRange = range; - range = compound.getInteger("ProtectRange"); + int oldRange = this.range; + this.range = compound.getInteger("ProtectRange"); - if(worldObj != null && worldObj.isRemote && oldRange != range) { - worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); + if(this.worldObj != null && this.worldObj.isRemote && oldRange != this.range) { + this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord); } } @@ -79,57 +79,57 @@ public class TileBlockProtector extends TileJarFillable { public void writeCustomNBT(NBTTagCompound compound) { super.writeCustomNBT(compound); compound.removeTag("AspectFilter"); - compound.setInteger("ProtectRange", range); + compound.setInteger("ProtectRange", this.range); } @Override public void updateEntity() { - if (!protectors.contains(this)) { - protectors.add(this); + if (!TileBlockProtector.protectors.contains(this)) { + TileBlockProtector.protectors.add(this); } - if (!worldObj.isRemote) { - if (++count % 5 == 0 && amount < maxAmount) { - fillJar(); + if (!this.worldObj.isRemote) { + if (++this.count % 5 == 0 && this.amount < this.maxAmount) { + this.fillJar(); } - if (count % UPDATE_TICKS == 0) { - if(range == 0) { - saturation = 0; + if (this.count % TileBlockProtector.UPDATE_TICKS == 0) { + if(this.range == 0) { + this.saturation = 0; } - if (saturation > 0) { - saturation--; + if (this.saturation > 0) { + this.saturation--; return; } - int powerLevel = getPowerLevel(); - boolean executeDecrease = range > powerLevel; + int powerLevel = this.getPowerLevel(); + boolean executeDecrease = this.range > powerLevel; - if(range <= powerLevel && powerLevel > 0) { + if(this.range <= powerLevel && powerLevel > 0) { executeDecrease = true; - if (takeFromContainer(ASPECT, 1)) { + if (this.takeFromContainer(TileBlockProtector.ASPECT, 1)) { - if (range < powerLevel) { - range++; - markDirty(); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + if (this.range < powerLevel) { + this.range++; + this.markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - saturation = 16 - range; + this.saturation = 16 - this.range; } executeDecrease = false; } } - if (executeDecrease && range > 0) { - range--; + if (executeDecrease && this.range > 0) { + this.range--; - markDirty(); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } } - } else if(range > 0) { - float sizeMod = 1 - (range / 15f); + } else if(this.range > 0) { + float sizeMod = 1 - (this.range / 15f); if (this.worldObj.rand.nextInt(9 - Thaumcraft.proxy.particleCount(2)) == 0) { Thaumcraft.proxy.wispFX3(this.worldObj, this.xCoord + 0.5F, this.yCoord + 0.68F, this.zCoord + 0.5F, this.xCoord + 0.3F + this.worldObj.rand.nextFloat() * 0.4F, this.yCoord + 0.68F, this.zCoord + 0.3F + this.worldObj.rand.nextFloat() * 0.4F, 0.3F - (0.15f*sizeMod), 6, true, -0.025F); } @@ -138,14 +138,14 @@ public class TileBlockProtector extends TileJarFillable { } } - if(range > 0) { - for(EntityLivingBase entity : (List)worldObj.getEntitiesWithinAABB(EntityLivingBase.class, getProtectedAABB())) { + if(this.range > 0) { + for(EntityLivingBase entity : (List) this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, this.getProtectedAABB())) { if(entity instanceof EntityCreeper) { ((EntityCreeper) entity).timeSinceIgnited = 0; } - if(worldObj.isRemote && !(entity instanceof EntityPlayer)) { - spawnEntityParticles(entity); + if(this.worldObj.isRemote && !(entity instanceof EntityPlayer)) { + this.spawnEntityParticles(entity); } } } @@ -153,12 +153,12 @@ public class TileBlockProtector extends TileJarFillable { private void spawnEntityParticles(EntityLivingBase entity) { AxisAlignedBB cube = entity.boundingBox; - if(cube != null && worldObj.rand.nextInt(20) == 0) { - double posX = worldObj.rand.nextDouble() * (cube.maxX - cube.minX) + cube.minX; - double posY = worldObj.rand.nextDouble() * (cube.maxX - cube.minX) + cube.minY; - double posZ = worldObj.rand.nextDouble() * (cube.maxX - cube.minX) + cube.minZ; + if(cube != null && this.worldObj.rand.nextInt(20) == 0) { + double posX = this.worldObj.rand.nextDouble() * (cube.maxX - cube.minX) + cube.minX; + double posY = this.worldObj.rand.nextDouble() * (cube.maxX - cube.minX) + cube.minY; + double posZ = this.worldObj.rand.nextDouble() * (cube.maxX - cube.minX) + cube.minZ; - switch (worldObj.rand.nextInt(5)) { + switch (this.worldObj.rand.nextInt(5)) { case 0: posX = cube.maxX; break; case 1: posY = cube.maxY; break; case 2: posZ = cube.maxZ; break; @@ -183,11 +183,11 @@ public class TileBlockProtector extends TileJarFillable { } else if ((this.aspect != null) && (this.amount > 0)) { ta = this.aspect; } else if ((ic.getEssentiaAmount(ForgeDirection.UP) > 0) && - (ic.getSuctionAmount(ForgeDirection.UP) < getSuctionAmount(ForgeDirection.DOWN)) && (getSuctionAmount(ForgeDirection.DOWN) >= ic.getMinimumSuction())) { + (ic.getSuctionAmount(ForgeDirection.UP) < this.getSuctionAmount(ForgeDirection.DOWN)) && (this.getSuctionAmount(ForgeDirection.DOWN) >= ic.getMinimumSuction())) { ta = ic.getEssentiaType(ForgeDirection.UP); } - if ((ta != null) && (ic.getSuctionAmount(ForgeDirection.UP) < getSuctionAmount(ForgeDirection.DOWN))) { - addToContainer(ta, ic.takeEssentia(ta, 1, ForgeDirection.UP)); + if ((ta != null) && (ic.getSuctionAmount(ForgeDirection.UP) < this.getSuctionAmount(ForgeDirection.DOWN))) { + this.addToContainer(ta, ic.takeEssentia(ta, 1, ForgeDirection.UP)); } } } @@ -220,28 +220,28 @@ public class TileBlockProtector extends TileJarFillable { private static List protectors = new ArrayList(); public static boolean isSpotProtected(World world, final double x, final double y, final double z) { - return isSpotProtected(world, new ProtectionHelper() { + return TileBlockProtector.isSpotProtected(world, new ProtectionHelper() { @Override public boolean checkProtection(TileBlockProtector tile) { - return isSpotProtected(tile, x, y, z); + return TileBlockProtector.isSpotProtected(tile, x, y, z); } }); } public static boolean isSpotProtected(World world, final Entity entity) { - return isSpotProtected(world, new ProtectionHelper() { + return TileBlockProtector.isSpotProtected(world, new ProtectionHelper() { @Override public boolean checkProtection(TileBlockProtector tile) { - return isSpotProtected(tile, entity); + return TileBlockProtector.isSpotProtected(tile, entity); } }); } public static boolean isSpotProtected(World world, ProtectionHelper helper) { - for (int i = 0; i < protectors.size(); i++) { - TileBlockProtector protector = protectors.get(i); + for (int i = 0; i < TileBlockProtector.protectors.size(); i++) { + TileBlockProtector protector = TileBlockProtector.protectors.get(i); if (protector.isInvalid()) { - protectors.remove(i); + TileBlockProtector.protectors.remove(i); i--; } else if (protector.worldObj.isRemote == world.isRemote && helper.checkProtection(protector)) { @@ -251,7 +251,7 @@ public class TileBlockProtector extends TileJarFillable { return false; } - private static interface ProtectionHelper { + private interface ProtectionHelper { boolean checkProtection(TileBlockProtector tile); } @@ -260,11 +260,11 @@ public class TileBlockProtector extends TileJarFillable { if (entityAABB != null) { return tile.getProtectedAABB().intersectsWith(entityAABB.addCoord(entity.posX, entity.posY, entity.posZ)); } - return isSpotProtected(tile, entity.posX, entity.posY, entity.posZ); + return TileBlockProtector.isSpotProtected(tile, entity.posX, entity.posY, entity.posZ); } private AxisAlignedBB getProtectedAABB() { - return AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - range, zCoord - range, xCoord + range, yCoord + range, zCoord + range); + return AxisAlignedBB.getBoundingBox(this.xCoord - this.range, this.yCoord - this.range, this.zCoord - this.range, this.xCoord + this.range, this.yCoord + this.range, this.zCoord + this.range); } private static boolean isSpotProtected(TileBlockProtector tile, double x, double y, double z) { diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java index c03bd58..7109ee7 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java @@ -42,11 +42,8 @@ import tuhljin.automagy.api.essentia.IAspectContainerWithMax; import tuhljin.automagy.api.essentia.IEssentiaLocusReadable; import java.awt.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; import java.util.List; -import java.util.Map; +import java.util.*; /** * This class is part of the Gadomancy Mod @@ -56,116 +53,116 @@ import java.util.Map; * * Created by HellFirePvP @ 22.04.2016 21:42 */ -@Optional.InterfaceList(value = { - @Optional.Interface(iface = "tuhljin.automagy.api.essentia.IEssentiaLocusReadable",modid = "Automagy"), - @Optional.Interface(iface = "tuhljin.automagy.api.essentia.IAspectContainerWithMax",modid = "Automagy") +@Optional.InterfaceList({ + @Optional.Interface(iface = "tuhljin.automagy.api.essentia.IEssentiaLocusReadable", modid = "Automagy"), + @Optional.Interface(iface = "tuhljin.automagy.api.essentia.IAspectContainerWithMax", modid = "Automagy") }) -public class TileEssentiaCompressor extends SynchronizedTileEntity implements IAspectSource, IEssentiaTransport,IEssentiaLocusReadable, IAspectContainerWithMax { +public class TileEssentiaCompressor extends SynchronizedTileEntity implements IEssentiaTransport,IEssentiaLocusReadable, IAspectContainerWithMax { public static final int MAX_SIZE = 8; public static final int MAX_ASPECT_STORAGE = 3000, STD_ASPECT_STORAGE = 200; private static Injector injEssentiaHandler = new Injector(EssentiaHandler.class); - private static int multiblockIDCounter = 0; + private static int multiblockIDCounter; //Standard multiblock stuff - private boolean isMasterTile = false; //For debugging + private boolean isMasterTile; //For debugging private int multiblockYIndex = -1, multiblockId = -1; - private boolean isMultiblockPresent = false; + private boolean isMultiblockPresent; - private int incSize = 0; - private Vector3 coordPedestal = null; - private int consumeTick = 0; + private int incSize; + private Vector3 coordPedestal; + private int consumeTick; private AspectList al = new AspectList(); - private int ticksExisted = 0; - private boolean prevFound = false; + private int ticksExisted; + private boolean prevFound; @Override public void updateEntity() { super.updateEntity(); - ticksExisted++; + this.ticksExisted++; - if(!worldObj.isRemote) { - if(isMultiblockFormed()) { - checkMultiblock(); + if(!this.worldObj.isRemote) { + if(this.isMultiblockFormed()) { + this.checkMultiblock(); } - if(!isMultiblockFormed()) return; + if(!this.isMultiblockFormed()) return; - if (isMasterTile() && (prevFound || (ticksExisted % 100) == 0)) { - List coords = searchAndGetSources(); + if (this.isMasterTile() && (this.prevFound || (this.ticksExisted % 100) == 0)) { + List coords = this.searchAndGetSources(); if (coords == null || coords.isEmpty()) { - prevFound = false; + this.prevFound = false; } else { - prevFound = searchForEssentia(coords); + this.prevFound = this.searchForEssentia(coords); } } - if(isMasterTile() && ((incSize < MAX_SIZE && (ticksExisted % 40) == 0) || (coordPedestal != null))) { - consumeElements(); + if(this.isMasterTile() && ((this.incSize < TileEssentiaCompressor.MAX_SIZE && (this.ticksExisted % 40) == 0) || (this.coordPedestal != null))) { + this.consumeElements(); } } else { - if(isMasterTile() && isMultiblockFormed()) { - playLightningEffects(); - playVortexEffects(); - if(al.visSize() > 0) { - playEssentiaEffects(); + if(this.isMasterTile() && this.isMultiblockFormed()) { + this.playLightningEffects(); + this.playVortexEffects(); + if(this.al.visSize() > 0) { + this.playEssentiaEffects(); } } } - if(isMasterTile() && isMultiblockFormed()) { - vortexEntities(); + if(this.isMasterTile() && this.isMultiblockFormed()) { + this.vortexEntities(); } } @Optional.Method(modid = "Automagy") public AspectList getAspectsBase() { - if(isMultiblockFormed() && multiblockYIndex == 1) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if (master == null) return null; return master.al; } - return al; + return this.al; } private void consumeElements() { - if(coordPedestal != null) { - if(!checkPedestal(coordPedestal)) { - consumeTick = 0; - coordPedestal = null; + if(this.coordPedestal != null) { + if(!this.checkPedestal(this.coordPedestal)) { + this.consumeTick = 0; + this.coordPedestal = null; return; } - consumeTick++; - if(consumeTick <= 400) { + this.consumeTick++; + if(this.consumeTick <= 400) { PacketAnimationAbsorb absorb = new PacketAnimationAbsorb( - xCoord, yCoord + 1, zCoord, - coordPedestal.getBlockX(), coordPedestal.getBlockY() + 1, coordPedestal.getBlockZ(), + this.xCoord, this.yCoord + 1, this.zCoord, + this.coordPedestal.getBlockX(), this.coordPedestal.getBlockY() + 1, this.coordPedestal.getBlockZ(), 5, Block.getIdFromBlock(ConfigBlocks.blockCosmeticSolid), 1); makeo.gadomancy.common.network.PacketHandler.INSTANCE.sendToAllAround(absorb, new NetworkRegistry.TargetPoint( - getWorldObj().provider.dimensionId, - xCoord, yCoord, zCoord, 16)); + this.getWorldObj().provider.dimensionId, + this.xCoord, this.yCoord, this.zCoord, 16)); } else { - TilePedestal te = (TilePedestal) worldObj.getTileEntity( - coordPedestal.getBlockX(), coordPedestal.getBlockY(), coordPedestal.getBlockZ()); + TilePedestal te = (TilePedestal) this.worldObj.getTileEntity( + this.coordPedestal.getBlockX(), this.coordPedestal.getBlockY(), this.coordPedestal.getBlockZ()); te.setInventorySlotContents(0, null); te.markDirty(); - worldObj.markBlockForUpdate( - coordPedestal.getBlockX(), coordPedestal.getBlockY(), coordPedestal.getBlockZ()); - consumeTick = 0; - coordPedestal = null; - incSize += 1; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.worldObj.markBlockForUpdate( + this.coordPedestal.getBlockX(), this.coordPedestal.getBlockY(), this.coordPedestal.getBlockZ()); + this.consumeTick = 0; + this.coordPedestal = null; + this.incSize += 1; + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } } else { for (int xx = -3; xx <= 3; xx++) { for (int zz = -3; zz <= 3; zz++) { - Vector3 offset = new Vector3(xCoord + xx, yCoord, zCoord + zz); - if(checkPedestal(offset)) { + Vector3 offset = new Vector3(this.xCoord + xx, this.yCoord, this.zCoord + zz); + if(this.checkPedestal(offset)) { this.coordPedestal = offset; this.consumeTick = 0; return; @@ -178,11 +175,11 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA } private boolean checkPedestal(Vector3 coordPedestal) { - Block at = worldObj.getBlock( + Block at = this.worldObj.getBlock( coordPedestal.getBlockX(), coordPedestal.getBlockY(), coordPedestal.getBlockZ()); - int md = worldObj.getBlockMetadata( + int md = this.worldObj.getBlockMetadata( coordPedestal.getBlockX(), coordPedestal.getBlockY(), coordPedestal.getBlockZ()); - TileEntity te = worldObj.getTileEntity( + TileEntity te = this.worldObj.getTileEntity( coordPedestal.getBlockX(), coordPedestal.getBlockY(), coordPedestal.getBlockZ()); if(at == null || te == null || md != 1) return false; if(!at.equals(RegisteredBlocks.blockStoneMachine) || !(te instanceof TilePedestal)) return false; @@ -193,12 +190,12 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA //only call from master tile. private boolean searchForEssentia(List coordinates) { - if(ticksExisted % 10 != 0) return prevFound; + if(this.ticksExisted % 10 != 0) return this.prevFound; for (Aspect a : Aspect.aspects.values()) { - if (doDrain(a, coordinates)) { - al.add(a, 1); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + if (this.doDrain(a, coordinates)) { + this.al.add(a, 1); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); return true; } } @@ -208,7 +205,7 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA //only call from master tile. private boolean doDrain(Aspect a, List coordinates) { for (WorldCoordinates coordinate : coordinates) { - TileEntity sourceTile = worldObj.getTileEntity(coordinate.x, coordinate.y, coordinate.z); + TileEntity sourceTile = this.worldObj.getTileEntity(coordinate.x, coordinate.y, coordinate.z); if (!(sourceTile instanceof IAspectSource)) { continue; } @@ -216,14 +213,14 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA continue; IAspectSource as = (IAspectSource)sourceTile; AspectList contains = as.getAspects(); - if(contains == null || contains.visSize() > al.visSize()) + if(contains == null || contains.visSize() > this.al.visSize()) continue; - if(!canAccept(a)) + if(!this.canAccept(a)) continue; if (as.takeFromContainer(a, 1)) { - PacketHandler.INSTANCE.sendToAllAround(new PacketFXEssentiaSource(xCoord, yCoord + 1, zCoord, - (byte)(xCoord - coordinate.x), (byte)(yCoord - coordinate.y + 1), (byte)(zCoord - coordinate.z), - a.getColor()), new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord + 1, zCoord, 32.0D)); + PacketHandler.INSTANCE.sendToAllAround(new PacketFXEssentiaSource(this.xCoord, this.yCoord + 1, this.zCoord, + (byte)(this.xCoord - coordinate.x), (byte)(this.yCoord - coordinate.y + 1), (byte)(this.zCoord - coordinate.z), + a.getColor()), new NetworkRegistry.TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord + 1, this.zCoord, 32.0D)); return true; } } @@ -231,31 +228,31 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA } private boolean canAccept(Aspect a) { - int current = al.getAmount(a); - int max = STD_ASPECT_STORAGE + incSize * ((MAX_ASPECT_STORAGE - STD_ASPECT_STORAGE) / MAX_SIZE); + int current = this.al.getAmount(a); + int max = TileEssentiaCompressor.STD_ASPECT_STORAGE + this.incSize * ((TileEssentiaCompressor.MAX_ASPECT_STORAGE - TileEssentiaCompressor.STD_ASPECT_STORAGE) / TileEssentiaCompressor.MAX_SIZE); return current < max; } public int getSizeStage() { - return incSize; + return this.incSize; } float tr = 1.0F; - float tri = 0.0F; + float tri; float tg = 1.0F; - float tgi = 0.0F; + float tgi; float tb = 1.0F; - float tbi = 0.0F; + float tbi; public float cr = 1.0F; public float cg = 1.0F; public float cb = 1.0F; - public Aspect displayAspect = null; + public Aspect displayAspect; //Thanks @TileEssentiaReservoir :P @SideOnly(Side.CLIENT) private void playEssentiaEffects() { - if ((ClientHandler.ticks % 20 == 0) && (al.size() > 0)) { - this.displayAspect = al.getAspects()[(ClientHandler.ticks / 20 % al.size())]; + if ((ClientHandler.ticks % 20 == 0) && (this.al.size() > 0)) { + this.displayAspect = this.al.getAspects()[(ClientHandler.ticks / 20 % this.al.size())]; Color c = new Color(this.displayAspect.getColor()); this.tr = (c.getRed() / 255.0F); this.tg = (c.getGreen() / 255.0F); @@ -273,64 +270,64 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA this.cb -= this.tbi; } int count = 1; - cr = Math.min(1.0F, Math.max(0.0F, cr)); - cg = Math.min(1.0F, Math.max(0.0F, cg)); - cb = Math.min(1.0F, Math.max(0.0F, cb)); - FXEssentiaTrail essentiaTrail = new FXEssentiaTrail(worldObj, xCoord + 0.5, yCoord + 0.4, zCoord + 0.5, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, count, new Color(cr, cg, cb).getRGB(), 0.8F); + this.cr = Math.min(1.0F, Math.max(0.0F, this.cr)); + this.cg = Math.min(1.0F, Math.max(0.0F, this.cg)); + this.cb = Math.min(1.0F, Math.max(0.0F, this.cb)); + FXEssentiaTrail essentiaTrail = new FXEssentiaTrail(this.worldObj, this.xCoord + 0.5, this.yCoord + 0.4, this.zCoord + 0.5, this.xCoord + 0.5, this.yCoord + 1.5, this.zCoord + 0.5, count, new Color(this.cr, this.cg, this.cb).getRGB(), 0.8F); essentiaTrail.noClip = true; essentiaTrail.motionY = (0.01F + MathHelper.sin(count / 3.0F) * 0.001F); - essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.01F + worldObj.rand.nextGaussian() * 0.01D); - essentiaTrail.motionZ = (MathHelper.sin(count / 10.0F) * 0.01F + worldObj.rand.nextGaussian() * 0.01D); - ParticleEngine.instance.addEffect(worldObj, essentiaTrail); + essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.01F + this.worldObj.rand.nextGaussian() * 0.01D); + essentiaTrail.motionZ = (MathHelper.sin(count / 10.0F) * 0.01F + this.worldObj.rand.nextGaussian() * 0.01D); + ParticleEngine.instance.addEffect(this.worldObj, essentiaTrail); - essentiaTrail = new FXEssentiaTrail(worldObj, xCoord + 0.5, yCoord + 2.6, zCoord + 0.5, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, count, new Color(cr, cg, cb).getRGB(), 0.8F); + essentiaTrail = new FXEssentiaTrail(this.worldObj, this.xCoord + 0.5, this.yCoord + 2.6, this.zCoord + 0.5, this.xCoord + 0.5, this.yCoord + 1.5, this.zCoord + 0.5, count, new Color(this.cr, this.cg, this.cb).getRGB(), 0.8F); essentiaTrail.noClip = true; essentiaTrail.motionY = -(0.01F + MathHelper.sin(count / 3.0F) * 0.001F); - essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.01F + worldObj.rand.nextGaussian() * 0.01D); - essentiaTrail.motionZ = (MathHelper.sin(count / 10.0F) * 0.01F + worldObj.rand.nextGaussian() * 0.01D); - ParticleEngine.instance.addEffect(worldObj, essentiaTrail); + essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.01F + this.worldObj.rand.nextGaussian() * 0.01D); + essentiaTrail.motionZ = (MathHelper.sin(count / 10.0F) * 0.01F + this.worldObj.rand.nextGaussian() * 0.01D); + ParticleEngine.instance.addEffect(this.worldObj, essentiaTrail); } private List searchAndGetSources() { WorldCoordinates thisCoordinates = new WorldCoordinates(this); Map> teSources = new HashMap>(); - getSourcesField(teSources); + this.getSourcesField(teSources); if(!teSources.containsKey(thisCoordinates)) { - searchSources(); - getSourcesField(teSources); + this.searchSources(); + this.getSourcesField(teSources); if(teSources.containsKey(thisCoordinates)) { - return searchAndGetSources(); + return this.searchAndGetSources(); } return new ArrayList(); } List result = teSources.get(thisCoordinates); - ((Map>) injEssentiaHandler.getField("sources")).remove(thisCoordinates); + ((Map>) TileEssentiaCompressor.injEssentiaHandler.getField("sources")).remove(thisCoordinates); return result; } private void searchSources() { - WorldCoordinates thisCoord = new WorldCoordinates(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + WorldCoordinates thisCoord = new WorldCoordinates(this.xCoord, this.yCoord, this.zCoord, this.worldObj.provider.dimensionId); List coords = new LinkedList(); for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - unsafe_search(thisCoord, direction, coords); + this.unsafe_search(thisCoord, direction, coords); } - ((Map>) injEssentiaHandler.getField("sources")).put(thisCoord, coords); + ((Map>) TileEssentiaCompressor.injEssentiaHandler.getField("sources")).put(thisCoord, coords); } private void unsafe_search(WorldCoordinates coord, ForgeDirection direction, List out) { - ((HashMap) injEssentiaHandler.getField("sourcesDelay")).remove(coord); - injEssentiaHandler.invokeMethod("getSources", new Class[]{ World.class, WorldCoordinates.class, ForgeDirection.class, int.class }, worldObj, coord, direction, 5); - List coords = ((Map>) injEssentiaHandler.getField("sources")).get(coord); + ((HashMap) TileEssentiaCompressor.injEssentiaHandler.getField("sourcesDelay")).remove(coord); + TileEssentiaCompressor.injEssentiaHandler.invokeMethod("getSources", new Class[]{ World.class, WorldCoordinates.class, ForgeDirection.class, int.class }, this.worldObj, coord, direction, 5); + List coords = ((Map>) TileEssentiaCompressor.injEssentiaHandler.getField("sources")).get(coord); if(coords != null) { - out.addAll(((Map>) injEssentiaHandler.getField("sources")).get(coord)); - ((Map>) injEssentiaHandler.getField("sources")).remove(coord); + out.addAll(((Map>) TileEssentiaCompressor.injEssentiaHandler.getField("sources")).get(coord)); + ((Map>) TileEssentiaCompressor.injEssentiaHandler.getField("sources")).remove(coord); } } private void getSourcesField(Map> out) { out.clear(); - out.putAll((Map>) injEssentiaHandler.getField("sources")); + out.putAll(TileEssentiaCompressor.injEssentiaHandler.getField("sources")); } private void playVortexEffects() { @@ -345,7 +342,7 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA Vec3 v2 = Vec3.createVectorHelper(tx + 0.5D, ty + 0.5D, tz + 0.5D); MovingObjectPosition mop = ThaumcraftApiHelper.rayTraceIgnoringSource(this.worldObj, v1, v2, true, false, false); - if ((mop != null) && (getDistanceFrom(mop.blockX, mop.blockY, mop.blockZ) < 16.0D)) { + if ((mop != null) && (this.getDistanceFrom(mop.blockX, mop.blockY, mop.blockZ) < 16.0D)) { tx = mop.blockX; ty = mop.blockY; tz = mop.blockZ; @@ -360,19 +357,19 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @SideOnly(Side.CLIENT) private void playLightningEffects() { - if(incSize < 6) { - if(incSize < 2) { - if(worldObj.rand.nextInt(6) != 0) return; + if(this.incSize < 6) { + if(this.incSize < 2) { + if(this.worldObj.rand.nextInt(6) != 0) return; } else { - if(worldObj.rand.nextBoolean()) return; + if(this.worldObj.rand.nextBoolean()) return; } } - double originX = xCoord + 0.5; - double originY = yCoord + 1.5; - double originZ = zCoord + 0.5; - double targetX = xCoord + 0.4 + worldObj.rand.nextFloat() * 0.2; - double targetY = yCoord + 0.4 + (worldObj.rand.nextBoolean() ? 2.2 : 0); - double targetZ = zCoord + 0.4 + worldObj.rand.nextFloat() * 0.2; + double originX = this.xCoord + 0.5; + double originY = this.yCoord + 1.5; + double originZ = this.zCoord + 0.5; + double targetX = this.xCoord + 0.4 + this.worldObj.rand.nextFloat() * 0.2; + double targetY = this.yCoord + 0.4 + (this.worldObj.rand.nextBoolean() ? 2.2 : 0); + double targetZ = this.zCoord + 0.4 + this.worldObj.rand.nextFloat() * 0.2; FXLightningBolt bolt = new FXLightningBolt(Minecraft.getMinecraft().theWorld, originX, originY, originZ, targetX, targetY, targetZ, Minecraft.getMinecraft().theWorld.rand.nextLong(), 10, 4.0F, 5); bolt.defaultFractal(); @@ -381,24 +378,24 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA } private void vortexEntities() { - if(incSize <= 0) return; - List entities = worldObj.getEntitiesWithinAABB(Entity.class, - AxisAlignedBB.getBoundingBox(xCoord - 0.5, yCoord - 0.5, zCoord - 0.5, - xCoord + 0.5, yCoord + 0.5, zCoord + 0.5).expand(4, 4, 4)); + if(this.incSize <= 0) return; + List entities = this.worldObj.getEntitiesWithinAABB(Entity.class, + AxisAlignedBB.getBoundingBox(this.xCoord - 0.5, this.yCoord - 0.5, this.zCoord - 0.5, + this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5).expand(4, 4, 4)); for (Object o : entities) { if(o == null || !(o instanceof Entity) || ((Entity) o).isDead) continue; - applyMovementVectors((Entity) o); + this.applyMovementVectors((Entity) o); } } private void applyMovementVectors(Entity entity) { - double mult = incSize * (1D / ((double) MAX_SIZE)); + double mult = this.incSize * (1D / ((double) TileEssentiaCompressor.MAX_SIZE)); - double var3 = (xCoord + 0.5D - entity.posX) / 8.0D; - double var5 = (yCoord + 1.5D - entity.posY) / 8.0D; - double var7 = (zCoord + 0.5D - entity.posZ) / 8.0D; + double var3 = (this.xCoord + 0.5D - entity.posX) / 8.0D; + double var5 = (this.yCoord + 1.5D - entity.posY) / 8.0D; + double var7 = (this.zCoord + 0.5D - entity.posZ) / 8.0D; double var9 = Math.sqrt(var3 * var3 + var5 * var5 + var7 * var7); double var11 = 1.0D - var9; if (var11 > 0.0D) { @@ -410,75 +407,75 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA } public void checkMultiblock() { - if(isMasterTile) { - boolean canSustain = isMultiblockableBlock(1); - if(!isMultiblockableBlock(2)) canSustain = false; + if(this.isMasterTile) { + boolean canSustain = this.isMultiblockableBlock(1); + if(!this.isMultiblockableBlock(2)) canSustain = false; if(!canSustain) { - breakMultiblock(); - isMultiblockPresent = false; + this.breakMultiblock(); + this.isMultiblockPresent = false; } } else { - TileEssentiaCompressor master = tryFindMasterTile(); + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master != null) { if(!master.isMultiblockPresent) { - breakMultiblock(); + this.breakMultiblock(); } } else { - breakMultiblock(); + this.breakMultiblock(); } } } public TileEssentiaCompressor tryFindMasterTile() { - if(!isMultiblockFormed()) + if(!this.isMultiblockFormed()) return null; - if(isMasterTile()) + if(this.isMasterTile()) return this; //lul.. check before plz. - Block down = worldObj.getBlock(xCoord, yCoord - multiblockYIndex, zCoord); + Block down = this.worldObj.getBlock(this.xCoord, this.yCoord - this.multiblockYIndex, this.zCoord); if(!down.equals(RegisteredBlocks.blockEssentiaCompressor)) return null; - TileEntity te = worldObj.getTileEntity(xCoord, yCoord - multiblockYIndex, zCoord); + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord - this.multiblockYIndex, this.zCoord); if(!(te instanceof TileEssentiaCompressor)) return null; TileEssentiaCompressor compressor = (TileEssentiaCompressor) te; - if(compressor.multiblockId != multiblockId || !compressor.isMasterTile()) + if(compressor.multiblockId != this.multiblockId || !compressor.isMasterTile()) return null; return compressor; } private boolean isMultiblockableBlock(int yOffset) { - Block block = worldObj.getBlock(xCoord, yCoord + yOffset, zCoord); - TileEntity te = worldObj.getTileEntity(xCoord, yCoord + yOffset, zCoord); + Block block = this.worldObj.getBlock(this.xCoord, this.yCoord + yOffset, this.zCoord); + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord + yOffset, this.zCoord); if(!block.equals(RegisteredBlocks.blockEssentiaCompressor)) return false; if(!(te instanceof TileEssentiaCompressor)) return false; TileEssentiaCompressor compressor = (TileEssentiaCompressor) te; - return compressor.multiblockId == multiblockId; + return compressor.multiblockId == this.multiblockId; } public void breakMultiblock() { - doExplosion(); + this.doExplosion(); this.multiblockId = -1; this.isMasterTile = false; this.multiblockYIndex = -1; this.al = new AspectList(); - markDirty(); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } private void doExplosion() { - AspectList al = getAspects(); + AspectList al = this.getAspects(); if(al.visSize() > 0) { - ExplosionHelper.taintplosion(worldObj, xCoord, yCoord, zCoord, true, 2, 2.0F, 4, 20); - worldObj.setBlockToAir(xCoord, yCoord, zCoord); + ExplosionHelper.taintplosion(this.worldObj, this.xCoord, this.yCoord, this.zCoord, true, 2, 2.0F, 4, 20); + this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord); } else { - ExplosionHelper.taintplosion(worldObj, xCoord, yCoord, zCoord, false, 0, 2.0F, 4, 20); - worldObj.setBlockToAir(xCoord, yCoord, zCoord); + ExplosionHelper.taintplosion(this.worldObj, this.xCoord, this.yCoord, this.zCoord, false, 0, 2.0F, 4, 20); + this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord); } } public static int getAndIncrementNewMultiblockId() { - multiblockIDCounter++; - return multiblockIDCounter; + TileEssentiaCompressor.multiblockIDCounter++; + return TileEssentiaCompressor.multiblockIDCounter; } public void setInMultiblock(boolean isMaster, int yIndex, int multiblockId) { @@ -489,20 +486,20 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA this.isMultiblockPresent = true; //Initial state. } this.al = new AspectList(); - markDirty(); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } public boolean isMultiblockFormed() { - return multiblockId != -1; + return this.multiblockId != -1; } public boolean isMasterTile() { - return isMasterTile; + return this.isMasterTile; } public int getMultiblockYIndex() { - return multiblockYIndex; + return this.multiblockYIndex; } @Override @@ -534,21 +531,21 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA compound.setBoolean("multiblockPresent", this.isMasterTile); compound.setInteger("sizeInc", this.incSize); NBTTagCompound aspects = new NBTTagCompound(); - for (Aspect a : al.aspects.keySet()) { - aspects.setInteger(a.getTag(), al.aspects.get(a)); + for (Aspect a : this.al.aspects.keySet()) { + aspects.setInteger(a.getTag(), this.al.aspects.get(a)); } compound.setTag("aspects", aspects); } @Override public AspectList getAspects() { - if(!isMultiblockFormed()) { + if(!this.isMultiblockFormed()) { return new AspectList(); } else { - if(isMasterTile()) { - return al; + if(this.isMasterTile()) { + return this.al; } else { - TileEssentiaCompressor master = tryFindMasterTile(); + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return new AspectList(); return master.getAspects(); } @@ -560,17 +557,17 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public boolean doesContainerAccept(Aspect aspect) { - return isMultiblockFormed() && multiblockYIndex == 1 && canAccept(aspect); + return this.isMultiblockFormed() && this.multiblockYIndex == 1 && this.canAccept(aspect); } @Override public int addToContainer(Aspect aspect, int i) { - if(doesContainerAccept(aspect) && canAccept(aspect)) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.doesContainerAccept(aspect) && this.canAccept(aspect)) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return 0; master.al.add(aspect, i); - worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); + this.markDirty(); return i; } return 0; @@ -579,13 +576,13 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public boolean takeFromContainer(Aspect aspect, int i) { - if(isMultiblockFormed() && multiblockYIndex == 1) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return false; boolean couldTake = master.al.reduce(aspect, i); master.al.remove(aspect, 0); - worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); + this.markDirty(); return couldTake; } return false; @@ -599,8 +596,8 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public boolean doesContainerContainAmount(Aspect aspect, int i) { - if(isMultiblockFormed() && multiblockYIndex == 1) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return false; return master.al.getAmount(aspect) >= i; } @@ -615,8 +612,8 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public int containerContains(Aspect aspect) { - if(isMultiblockFormed() && multiblockYIndex == 1) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return 0; return master.al.getAmount(aspect); } @@ -632,7 +629,7 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public boolean canInputFrom(ForgeDirection direction) { - if(isMultiblockFormed() && multiblockYIndex == 1) { //The middle one + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { //The middle one return direction == ForgeDirection.SOUTH || direction == ForgeDirection.NORTH || direction == ForgeDirection.EAST || @@ -643,7 +640,7 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public boolean canOutputTo(ForgeDirection direction) { - if(isMultiblockFormed() && multiblockYIndex == 1) { //The middle one + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { //The middle one return direction == ForgeDirection.SOUTH || direction == ForgeDirection.NORTH || direction == ForgeDirection.EAST || @@ -666,7 +663,7 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public int getSuctionAmount(ForgeDirection direction) { - if(canInputFrom(direction)) { + if(this.canInputFrom(direction)) { return 16; } return 0; @@ -674,14 +671,14 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public int takeEssentia(Aspect aspect, int i, ForgeDirection direction) { - if(isMultiblockFormed() && multiblockYIndex == 1) { - if(!canOutputTo(direction)) return 0; - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { + if(!this.canOutputTo(direction)) return 0; + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return 0; int amt = master.al.getAmount(aspect); int taken = amt - master.al.remove(aspect, i).getAmount(aspect); - worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); + this.markDirty(); return taken; } return 0; @@ -689,12 +686,12 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public int addEssentia(Aspect aspect, int i, ForgeDirection direction) { - if(canInputFrom(direction) && canAccept(aspect)) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.canInputFrom(direction) && this.canAccept(aspect)) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return 0; master.al.add(aspect, i); - worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); + this.markDirty(); return i; } return 0; @@ -702,18 +699,18 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA @Override public Aspect getEssentiaType(ForgeDirection direction) { - if(isMultiblockFormed() && multiblockYIndex == 1) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return null; - return new ArrayList(master.al.aspects.keySet()).get(worldObj.rand.nextInt(master.al.size())); + return new ArrayList(master.al.aspects.keySet()).get(this.worldObj.rand.nextInt(master.al.size())); } return null; } @Override public int getEssentiaAmount(ForgeDirection direction) { - if(isMultiblockFormed() && multiblockYIndex == 1) { - TileEssentiaCompressor master = tryFindMasterTile(); + if(this.isMultiblockFormed() && this.multiblockYIndex == 1) { + TileEssentiaCompressor master = this.tryFindMasterTile(); if(master == null) return 0; return master.al.visSize(); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java index 0efcc2c..5d10ad6 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -37,13 +37,13 @@ import java.util.List; * * Created by HellFirePvP @ 21.10.2015 23:39 */ -public class TileExtendedNode extends TileNode implements INode { +public class TileExtendedNode extends TileNode { - public int ticksExisted = 0; + public int ticksExisted; private ExtendedNodeType extendedNodeType; private GrowingNodeBehavior behavior; - private boolean doingVortexExplosion = false; + private boolean doingVortexExplosion; private ExplosionHelper.VortexExplosion vortexExplosion; @@ -55,54 +55,54 @@ public class TileExtendedNode extends TileNode implements INode { public void updateEntity() { super.updateEntity(); - ticksExisted++; + this.ticksExisted++; if(this.doingVortexExplosion) { if(this.vortexExplosion == null) { this.vortexExplosion = new ExplosionHelper.VortexExplosion(this); } - if(vortexExplosion.isFinished()) { + if(this.vortexExplosion.isFinished()) { this.vortexExplosion = null; this.doingVortexExplosion = false; } else { - vortexExplosion.update(); + this.vortexExplosion.update(); } } boolean needUpdate; - needUpdate = handleGrowingNodeFirst(false); - needUpdate = handleGrowingNodeSecond(needUpdate); + needUpdate = this.handleGrowingNodeFirst(false); + needUpdate = this.handleGrowingNodeSecond(needUpdate); - if(!worldObj.isRemote && needUpdate) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + if(!this.worldObj.isRemote && needUpdate) { + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } } private boolean handleGrowingNodeSecond(boolean needUpdate) { - if(extendedNodeType == null || extendedNodeType != ExtendedNodeType.GROWING) return needUpdate; + if(this.extendedNodeType == null || this.extendedNodeType != ExtendedNodeType.GROWING) return needUpdate; - if(worldObj.difficultySetting == EnumDifficulty.PEACEFUL) return needUpdate; - if(worldObj.isRemote) return needUpdate; - if(ticksExisted % 8 != 0) return needUpdate; + if(this.worldObj.difficultySetting == EnumDifficulty.PEACEFUL) return needUpdate; + if(this.worldObj.isRemote) return needUpdate; + if(this.ticksExisted % 8 != 0) return needUpdate; - List livingEntities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1).expand(6.0D, 6.0D, 6.0D)); + List livingEntities = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1).expand(6.0D, 6.0D, 6.0D)); if ((livingEntities != null) && (livingEntities.size() > 0)) { for (Object e : livingEntities) { EntityLivingBase livingEntity = (EntityLivingBase) e; if ((livingEntity.isEntityAlive()) && (!livingEntity.isEntityInvulnerable())) { if(livingEntity instanceof EntityPlayer && ((EntityPlayer) livingEntity).capabilities.isCreativeMode) continue; - if(!behavior.mayZapNow()) continue; + if(!this.behavior.mayZapNow()) continue; - ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", worldObj, xCoord, yCoord, zCoord, 6); + ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", this.worldObj, this.xCoord, this.yCoord, this.zCoord, 6); - livingEntity.attackEntityFrom(DamageSource.magic, behavior.getZapDamage()); + livingEntity.attackEntityFrom(DamageSource.magic, this.behavior.getZapDamage()); - worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "thaumcraft:zap", 0.8F, 1.0F); + this.worldObj.playSoundEffect(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, "thaumcraft:zap", 0.8F, 1.0F); - PacketTCNodeBolt packet = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 0.5F, zCoord + 0.5F, (float) livingEntity.posX, (float) (livingEntity.posY + livingEntity.height), (float) livingEntity.posZ, 0, false); - PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 32.0D)); + PacketTCNodeBolt packet = new PacketTCNodeBolt(this.xCoord + 0.5F, this.yCoord + 0.5F, this.zCoord + 0.5F, (float) livingEntity.posX, (float) (livingEntity.posY + livingEntity.height), (float) livingEntity.posZ, 0, false); + PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 32.0D)); } } } @@ -111,9 +111,9 @@ public class TileExtendedNode extends TileNode implements INode { } private boolean handleGrowingNodeFirst(boolean needUpdate) { - if(extendedNodeType == null || extendedNodeType != ExtendedNodeType.GROWING) return needUpdate; + if(this.extendedNodeType == null || this.extendedNodeType != ExtendedNodeType.GROWING) return needUpdate; - needUpdate = doVortex(EntityAspectOrb.class, needUpdate, new GrowingNodeVortexRunnable() { + needUpdate = this.doVortex(EntityAspectOrb.class, needUpdate, new GrowingNodeVortexRunnable() { @Override public Aspect getAspect(EntityAspectOrb entity) { return entity.getAspect(); @@ -124,7 +124,7 @@ public class TileExtendedNode extends TileNode implements INode { return GrowingNodeBehavior.AspectType.ASPECT_ORB; } }); - needUpdate = doVortex(EntityItem.class, needUpdate, new GrowingNodeVortexRunnable() { + needUpdate = this.doVortex(EntityItem.class, needUpdate, new GrowingNodeVortexRunnable() { @Override public boolean doesVortex(EntityItem entity) { return entity.getEntityItem().getItem() instanceof ItemWispEssence || entity.getEntityItem().getItem() instanceof ItemManaBean || entity.getEntityItem().getItem() instanceof ItemCrystalEssence; @@ -141,7 +141,7 @@ public class TileExtendedNode extends TileNode implements INode { return entity.getEntityItem().getItem() instanceof ItemWispEssence ? GrowingNodeBehavior.AspectType.WISP_ESSENCE : entity.getEntityItem().getItem() instanceof ItemCrystalEssence ? GrowingNodeBehavior.AspectType.CRYSTAL_ESSENCE : GrowingNodeBehavior.AspectType.MANA_BEAN; } }); - needUpdate = doVortex(EntityWisp.class, needUpdate, new GrowingNodeVortexRunnable() { + needUpdate = this.doVortex(EntityWisp.class, needUpdate, new GrowingNodeVortexRunnable() { @Override public Aspect getAspect(EntityWisp entity) { return Aspect.getAspect(entity.getType()); @@ -152,26 +152,26 @@ public class TileExtendedNode extends TileNode implements INode { return GrowingNodeBehavior.AspectType.WISP; } }); - if(worldObj.isRemote) return needUpdate; + if(this.worldObj.isRemote) return needUpdate; - if(behavior.lookingForNode()) { - int xx = worldObj.rand.nextInt(8) - worldObj.rand.nextInt(8); - int yy = worldObj.rand.nextInt(8) - worldObj.rand.nextInt(8); - int zz = worldObj.rand.nextInt(8) - worldObj.rand.nextInt(8); - TileEntity t = worldObj.getTileEntity(xCoord + xx, yCoord + yy, zCoord + zz); + if(this.behavior.lookingForNode()) { + int xx = this.worldObj.rand.nextInt(8) - this.worldObj.rand.nextInt(8); + int yy = this.worldObj.rand.nextInt(8) - this.worldObj.rand.nextInt(8); + int zz = this.worldObj.rand.nextInt(8) - this.worldObj.rand.nextInt(8); + TileEntity t = this.worldObj.getTileEntity(this.xCoord + xx, this.yCoord + yy, this.zCoord + zz); if(t != null && t instanceof TileNode && !(xx == 0 && yy == 0 && zz == 0)) { TileNode node = (TileNode) t; - int thisSize = getAspectsBase().visSize(); + int thisSize = this.getAspectsBase().visSize(); int othersSize = node.getAspectsBase().visSize(); if(thisSize >= othersSize) { - behavior.lockOnTo(node); - worldObj.markBlockForUpdate(xCoord + xx, yCoord + yy, zCoord + zz); + this.behavior.lockOnTo(node); + this.worldObj.markBlockForUpdate(this.xCoord + xx, this.yCoord + yy, this.zCoord + zz); node.markDirty(); needUpdate = true; } } } else { - needUpdate = behavior.updateBehavior(needUpdate); + needUpdate = this.behavior.updateBehavior(needUpdate); } return needUpdate; } @@ -197,16 +197,16 @@ public class TileExtendedNode extends TileNode implements INode { E entity = (E) eObj; if(!runnable.doesVortex(entity)) continue; if ((entity.isEntityAlive()) && (!entity.isEntityInvulnerable())) { - double d = getDistanceTo(entity.posX, entity.posY, entity.posZ); + double d = this.getDistanceTo(entity.posX, entity.posY, entity.posZ); if (d < 0.5D) { //prev: 2.0D Aspect a = runnable.getAspect(entity); if(a != null) { - if (getAspects().getAmount(a) < getNodeVisBase(a)) { - addToContainer(a, 1); + if (this.getAspects().getAmount(a) < this.getNodeVisBase(a)) { + this.addToContainer(a, 1); } else { //Adding it permanently - if(!worldObj.isRemote && behavior.doesAccept(a)) { - behavior.addAspect(runnable.getAspectType(entity), a, 1); + if(!this.worldObj.isRemote && this.behavior.doesAccept(a)) { + this.behavior.addAspect(runnable.getAspectType(entity), a, 1); } } } @@ -214,14 +214,14 @@ public class TileExtendedNode extends TileNode implements INode { entity.setDead(); } } - applyMovementVectors(entity); + this.applyMovementVectors(entity); } } return needUpdate; } public ExtendedNodeType getExtendedNodeType() { - return extendedNodeType; + return this.extendedNodeType; } public void setExtendedNodeType(ExtendedNodeType extendedNodeType) { @@ -229,17 +229,17 @@ public class TileExtendedNode extends TileNode implements INode { } public NBTTagCompound getBehaviorSnapshot() { - if(extendedNodeType != null && extendedNodeType == ExtendedNodeType.GROWING) { + if(this.extendedNodeType != null && this.extendedNodeType == ExtendedNodeType.GROWING) { NBTTagCompound behaviorCompound = new NBTTagCompound(); - behavior.writeToNBT(behaviorCompound); + this.behavior.writeToNBT(behaviorCompound); return behaviorCompound; } return null; } public void readBehaviorSnapshot(NBTTagCompound tagCompound) { - if(tagCompound != null && extendedNodeType != null && extendedNodeType == ExtendedNodeType.GROWING) { - behavior.readFromNBT(tagCompound); + if(tagCompound != null && this.extendedNodeType != null && this.extendedNodeType == ExtendedNodeType.GROWING) { + this.behavior.readFromNBT(tagCompound); } } @@ -256,9 +256,9 @@ public class TileExtendedNode extends TileNode implements INode { this.extendedNodeType = null; } - if(extendedNodeType != null && extendedNodeType == ExtendedNodeType.GROWING) { + if(this.extendedNodeType != null && this.extendedNodeType == ExtendedNodeType.GROWING) { NBTTagCompound growingNodeBehavior = compound.getCompoundTag("NodeBehavior"); - behavior.readFromNBT(growingNodeBehavior); + this.behavior.readFromNBT(growingNodeBehavior); } } @@ -268,12 +268,12 @@ public class TileExtendedNode extends TileNode implements INode { NBTTagCompound compound = new NBTTagCompound(); - if(extendedNodeType != null) { - compound.setString("exNodeType", extendedNodeType.name()); + if(this.extendedNodeType != null) { + compound.setString("exNodeType", this.extendedNodeType.name()); - if(extendedNodeType == ExtendedNodeType.GROWING) { + if(this.extendedNodeType == ExtendedNodeType.GROWING) { NBTTagCompound behaviorCompound = new NBTTagCompound(); - behavior.writeToNBT(behaviorCompound); + this.behavior.writeToNBT(behaviorCompound); compound.setTag("NodeBehavior", behaviorCompound); } } @@ -282,7 +282,7 @@ public class TileExtendedNode extends TileNode implements INode { } public void triggerVortexExplosion() { - doingVortexExplosion = true; + this.doingVortexExplosion = true; } private abstract static class GrowingNodeVortexRunnable { diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java index bb7c22f..c4b3ac1 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java @@ -34,15 +34,15 @@ public class TileExtendedNodeJar extends TileJarNode { private AspectList aspects = new AspectList(); private AspectList aspectsBase = new AspectList(); private NodeType nodeType = NodeType.NORMAL; - private NodeModifier nodeModifier = null; - private ExtendedNodeType extendedNodeType = null; - private NBTTagCompound behaviorSnapshot = null; + private NodeModifier nodeModifier; + private ExtendedNodeType extendedNodeType; + private NBTTagCompound behaviorSnapshot; private String id = ""; - public long animate = 0L; + public long animate; @Override public ResourceLocation getTexture() { - return tex; + return TileExtendedNodeJar.tex; } public boolean canUpdate() { @@ -70,13 +70,13 @@ public class TileExtendedNodeJar extends TileJarNode { } else { this.aspectsBase = al.copy(); } - setNodeType(NodeType.values()[nbttagcompound.getByte("type")]); + this.setNodeType(NodeType.values()[nbttagcompound.getByte("type")]); byte mod = nbttagcompound.getByte("modifier"); - if(mod >= 0) setNodeModifier(NodeModifier.values()[mod]); else setNodeModifier(null); + if(mod >= 0) this.setNodeModifier(NodeModifier.values()[mod]); else this.setNodeModifier(null); byte exType = nbttagcompound.getByte("extendedNodeType"); - if(exType >= 0) setExtendedNodeType(ExtendedNodeType.values()[exType]); else setExtendedNodeType(null); + if(exType >= 0) this.setExtendedNodeType(ExtendedNodeType.values()[exType]); else this.setExtendedNodeType(null); if(nbttagcompound.hasKey("Behavior")) { - behaviorSnapshot = nbttagcompound.getCompoundTag("Behavior"); + this.behaviorSnapshot = nbttagcompound.getCompoundTag("Behavior"); } } @@ -93,11 +93,11 @@ public class TileExtendedNodeJar extends TileJarNode { tlist.appendTag(f); } } - nbttagcompound.setByte("type", (byte) getNodeType().ordinal()); - nbttagcompound.setByte("modifier", getNodeModifier() == null ? -1 : (byte) getNodeModifier().ordinal()); - nbttagcompound.setByte("extendedNodeType", getExtendedNodeType() == null ? -1 : (byte) getExtendedNodeType().ordinal()); - if(behaviorSnapshot != null) { - nbttagcompound.setTag("Behavior", behaviorSnapshot); + nbttagcompound.setByte("type", (byte) this.getNodeType().ordinal()); + nbttagcompound.setByte("modifier", this.getNodeModifier() == null ? -1 : (byte) this.getNodeModifier().ordinal()); + nbttagcompound.setByte("extendedNodeType", this.getExtendedNodeType() == null ? -1 : (byte) this.getExtendedNodeType().ordinal()); + if(this.behaviorSnapshot != null) { + nbttagcompound.setTag("Behavior", this.behaviorSnapshot); } } @@ -121,7 +121,7 @@ public class TileExtendedNodeJar extends TileJarNode { } this.aspects.add(tt, am - out); this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - markDirty(); + this.markDirty(); return out; } @@ -129,7 +129,7 @@ public class TileExtendedNodeJar extends TileJarNode { if (this.aspects.getAmount(tt) >= am) { this.aspects.remove(tt, am); this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); - markDirty(); + this.markDirty(); return true; } return false; @@ -140,10 +140,7 @@ public class TileExtendedNodeJar extends TileJarNode { } public boolean doesContainerContainAmount(Aspect tag, int amt) { - if (this.aspects.getAmount(tag) >= amt) { - return true; - } - return false; + return this.aspects.getAmount(tag) >= amt; } public boolean doesContainerContain(AspectList ot) { @@ -176,7 +173,7 @@ public class TileExtendedNodeJar extends TileJarNode { } public ExtendedNodeType getExtendedNodeType() { - return extendedNodeType; + return this.extendedNodeType; } public void setExtendedNodeType(ExtendedNodeType extendedNodeType) { @@ -200,7 +197,7 @@ public class TileExtendedNodeJar extends TileJarNode { } public NBTTagCompound getBehaviorSnapshot() { - return behaviorSnapshot; + return this.behaviorSnapshot; } public void setNodeVisBase(Aspect aspect, short nodeVisBase) { @@ -236,12 +233,12 @@ public class TileExtendedNodeJar extends TileJarNode { world.setBlock(x, y, z, ConfigBlocks.blockAiry, 0, 3); TileExtendedNode tn = (TileExtendedNode) world.getTileEntity(x, y, z); if (tn != null) { - tn.setAspects(getAspects()); - tn.setNodeModifier(getNodeModifier()); - tn.setNodeType(getNodeType()); - tn.setExtendedNodeType(getExtendedNodeType()); - new Injector(tn, TileNode.class).setField("id", getId()); - tn.readBehaviorSnapshot(getBehaviorSnapshot()); + tn.setAspects(this.getAspects()); + tn.setNodeModifier(this.getNodeModifier()); + tn.setNodeType(this.getNodeType()); + tn.setExtendedNodeType(this.getExtendedNodeType()); + new Injector(tn, TileNode.class).setField("id", this.getId()); + tn.readBehaviorSnapshot(this.getBehaviorSnapshot()); world.markBlockForUpdate(x, y, z); tn.markDirty(); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java index bc49a49..fe4ec46 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java @@ -20,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.server.management.ItemInWorldManager; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.storage.IPlayerFileData; @@ -47,7 +46,7 @@ import java.util.UUID; * * Created by makeo @ 05.10.2015 22:32 */ -public class TileInfusionClaw extends SynchronizedTileEntity implements IInventory, ISidedInventory { +public class TileInfusionClaw extends SynchronizedTileEntity implements ISidedInventory { private static final UUID FAKE_UUID = UUID.fromString("b23c8c3f-d7bd-49b3-970a-8e86728bab82"); private static final Random RANDOM = new Random(); @@ -55,14 +54,14 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento private static final ItemFocusPrimal WAND_FOCUS = (ItemFocusPrimal) ConfigItems.itemFocusPrimal; private static final AspectList MAX_WAND_COST = new AspectList().add(Aspect.WATER, 250).add(Aspect.AIR, 250).add(Aspect.EARTH, 250).add(Aspect.FIRE, 250).add(Aspect.ORDER, 250).add(Aspect.ENTROPY, 250); - private ItemInWorldManager im = null; - private Boolean redstoneState = null; + private ItemInWorldManager im; + private Boolean redstoneState; - private int count = 0; + private int count; - private String player = null; - private ItemStack wandStack = null; - private boolean isLocked = false; + private String player; + private ItemStack wandStack; + private boolean isLocked; private int cooldown; @@ -82,88 +81,88 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento public TileInfusionClaw() { if(Gadomancy.proxy.getSide() == Side.CLIENT) { - animationStates = new float[12]; + this.animationStates = new float[12]; EntityLivingBase entity = Minecraft.getMinecraft().renderViewEntity; - lastRenderTick = entity == null ? 0 : entity.ticksExisted; + this.lastRenderTick = entity == null ? 0 : entity.ticksExisted; } } @Override public void updateEntity() { - World world = getWorldObj(); + World world = this.getWorldObj(); if(!world.isRemote) { - if(redstoneState == null) { - redstoneState = world.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); + if(this.redstoneState == null) { + this.redstoneState = world.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord); } - if(cooldown > 0) { - cooldown--; - if(cooldown == (int)(7.5f*20)) { - performClickBlock(); + if(this.cooldown > 0) { + this.cooldown--; + if(this.cooldown == (int)(7.5f*20)) { + this.performClickBlock(); } } - if(count > 20) { - count = 0; - if(yCoord > 0) { + if(this.count > 20) { + this.count = 0; + if(this.yCoord > 0) { //Comparator... - world.notifyBlockChange(xCoord, yCoord, zCoord, getBlockType()); + world.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); } } - count++; + this.count++; } } @Override public void readCustomNBT(NBTTagCompound compound) { if(compound.hasKey("player")) { - player = compound.getString("player"); + this.player = compound.getString("player"); } - wandStack = NBTHelper.getStack(compound, "wandStack"); - isLocked = compound.getBoolean("isLocked"); + this.wandStack = NBTHelper.getStack(compound, "wandStack"); + this.isLocked = compound.getBoolean("isLocked"); } @Override public void writeCustomNBT(NBTTagCompound compound) { - if(hasOwner()) { - compound.setString("player", player); + if(this.hasOwner()) { + compound.setString("player", this.player); } - if(wandStack != null) { - NBTHelper.setStack(compound, "wandStack", wandStack); + if(this.wandStack != null) { + NBTHelper.setStack(compound, "wandStack", this.wandStack); } - compound.setBoolean("isLocked", isLocked); + compound.setBoolean("isLocked", this.isLocked); } private void markForUpdate() { - markDirty(); - getWorldObj().markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } public void updateRedstone(boolean state) { - if(redstoneState != null && state && !redstoneState) { - startClickBlock(); + if(this.redstoneState != null && state && !this.redstoneState) { + this.startClickBlock(); } - redstoneState = state; + this.redstoneState = state; } public boolean isLocked() { - return isLocked; + return this.isLocked; } public void setIsLocked(boolean isLocked) { this.isLocked = isLocked; - if(!getWorldObj().isRemote) { - markForUpdate(); + if(!this.getWorldObj().isRemote) { + this.markForUpdate(); } } public boolean setOwner(EntityPlayer player) { - World world = getWorldObj(); - if(!world.isRemote && isValidOwner(player)) { + World world = this.getWorldObj(); + if(!world.isRemote && this.isValidOwner(player)) { this.player = player.getCommandSenderName(); - markForUpdate(); + this.markForUpdate(); return true; } @@ -174,67 +173,67 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento return !AdvancedFakePlayer.isFakePlayer(player); } - private ArrayList research = null; + private ArrayList research; private void loadResearch(EntityPlayer fakePlayer) { boolean online = false; for(String username : MinecraftServer.getServer().getAllUsernames()) { - if(username.equals(player)) { + if(username.equals(this.player)) { online = true; break; } } if(online) { - this.research = ResearchManager.getResearchForPlayer(player); + this.research = ResearchManager.getResearchForPlayer(this.player); } else { - if(research == null) { + if(this.research == null) { Thaumcraft.proxy.getCompletedResearch().put(fakePlayer.getCommandSenderName(), new ArrayList()); IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer().worldServerForDimension(0).getSaveHandler().getSaveHandler(); SaveHandler sh = (SaveHandler)playerNBTManagerObj; File dir = ObfuscationReflectionHelper.getPrivateValue(SaveHandler.class, sh, "playersDirectory", "field_75771_c"); - File file1 = new File(dir, player + ".thaum"); - File file2 = new File(dir, player + ".thaumbak"); + File file1 = new File(dir, this.player + ".thaum"); + File file2 = new File(dir, this.player + ".thaumbak"); ResearchManager.loadPlayerData(fakePlayer, file1, file2, false); this.research = ResearchManager.getResearchForPlayerSafe(fakePlayer.getCommandSenderName()); } } - Thaumcraft.proxy.getCompletedResearch().put(fakePlayer.getCommandSenderName(), research == null ? new ArrayList() : research); + Thaumcraft.proxy.getCompletedResearch().put(fakePlayer.getCommandSenderName(), this.research == null ? new ArrayList() : this.research); } public String getOwner() { - return player; + return this.player; } public boolean hasOwner() { - return player != null; + return this.player != null; } private void startClickBlock() { - if(!isRunning()) { - ClickBehavior behavior = getClickBehavior(getWorldObj(), xCoord, yCoord-1, zCoord); - if(behavior != null && (!behavior.hasVisCost() || hasSufficientVis())) { - startRunning(); + if(!this.isRunning()) { + ClickBehavior behavior = this.getClickBehavior(this.getWorldObj(), this.xCoord, this.yCoord -1, this.zCoord); + if(behavior != null && (!behavior.hasVisCost() || this.hasSufficientVis())) { + this.startRunning(); } } } @SuppressWarnings("unused") private void performClickBlock() { - World world = getWorldObj(); - int x = xCoord; - int y = yCoord - 1; - int z = zCoord; + World world = this.getWorldObj(); + int x = this.xCoord; + int y = this.yCoord - 1; + int z = this.zCoord; - ClickBehavior behavior = getClickBehavior(world, x, y, z); + ClickBehavior behavior = this.getClickBehavior(world, x, y, z); if(behavior != null) { if (world == null){ try { - world = getWorldObj(); + world = this.getWorldObj(); } catch(NullPointerException e){ makeo.gadomancy.common.Gadomancy.log.error("fatal error, world == null! at InfusionClaw"); @@ -242,21 +241,21 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento } } - AdvancedFakePlayer fakePlayer = new AdvancedFakePlayer((WorldServer) world, FAKE_UUID); - loadResearch(fakePlayer); + AdvancedFakePlayer fakePlayer = new AdvancedFakePlayer((WorldServer) world, TileInfusionClaw.FAKE_UUID); + this.loadResearch(fakePlayer); if(behavior.hasVisCost()) { - if(hasSufficientVis()) { - consumeVis(fakePlayer); + if(this.hasSufficientVis()) { + this.consumeVis(fakePlayer); } else { return; } } - if(im == null) { - im = new ItemInWorldManager(world); + if(this.im == null) { + this.im = new ItemInWorldManager(world); } else { - im.setWorld((WorldServer) world); + this.im.setWorld((WorldServer) world); } if(fakePlayer == null){ @@ -264,57 +263,57 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento return; } - fakePlayer.setHeldItem(wandStack); - this.im.activateBlockOrUseItem(fakePlayer, world, wandStack, x, y, z, ForgeDirection.UP.ordinal(), 0.5F, 0.5F, 0.5F); - addInstability(behavior); + fakePlayer.setHeldItem(this.wandStack); + this.im.activateBlockOrUseItem(fakePlayer, world, this.wandStack, x, y, z, ForgeDirection.UP.ordinal(), 0.5F, 0.5F, 0.5F); + this.addInstability(behavior); } } private ClickBehavior getClickBehavior(World world, int x, int y, int z) { - if(y >= 0 && !world.isRemote && world instanceof WorldServer && hasOwner() - && !world.isAirBlock(x, y, z) && wandStack != null && wandStack.stackSize > 0) { + if(y >= 0 && !world.isRemote && world instanceof WorldServer && this.hasOwner() + && !world.isAirBlock(x, y, z) && this.wandStack != null && this.wandStack.stackSize > 0) { return RegisteredBlocks.getClawClickBehavior(world, x, y, z); } return null; } public boolean isRunning() { - if(getWorldObj().isRemote) { - return animationStates[8] + animationStates[9] + animationStates[11] != 0; + if(this.getWorldObj().isRemote) { + return this.animationStates[8] + this.animationStates[9] + this.animationStates[11] != 0; } - return cooldown > 0; + return this.cooldown > 0; } private void startRunning() { - PacketHandler.INSTANCE.sendToAllAround(new PacketStartAnimation(PacketStartAnimation.ID_INFUSIONCLAW, xCoord, yCoord, zCoord), - new NetworkRegistry.TargetPoint(getWorldObj().provider.dimensionId, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 48)); - cooldown = 22*20; + PacketHandler.INSTANCE.sendToAllAround(new PacketStartAnimation(PacketStartAnimation.ID_INFUSIONCLAW, this.xCoord, this.yCoord, this.zCoord), + new NetworkRegistry.TargetPoint(this.getWorldObj().provider.dimensionId, this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, 48)); + this.cooldown = 22*20; } private void addInstability(ClickBehavior behavior) { int instability = 23; - int maxVis = WAND_ITEM.getMaxVis(wandStack); + int maxVis = TileInfusionClaw.WAND_ITEM.getMaxVis(this.wandStack); instability += maxVis < 100 ? 3 : -2; instability -= Math.floor((maxVis > 300 ? 300 : maxVis) / 300f * 10f); - instability -= WAND_ITEM.isStaff(wandStack) ? 6 : -1; + instability -= TileInfusionClaw.WAND_ITEM.isStaff(this.wandStack) ? 6 : -1; - instability += Math.floor((WAND_ITEM.getCap(wandStack).getBaseCostModifier() - 0.4) * 3); + instability += Math.floor((TileInfusionClaw.WAND_ITEM.getCap(this.wandStack).getBaseCostModifier() - 0.4) * 3); - instability -= WAND_ITEM.getCap(wandStack) == ConfigItems.WAND_CAP_VOID ? 3 : 0; - instability -= WAND_ITEM.getRod(wandStack) == ConfigItems.STAFF_ROD_PRIMAL ? 6 : 0; + instability -= TileInfusionClaw.WAND_ITEM.getCap(this.wandStack) == ConfigItems.WAND_CAP_VOID ? 3 : 0; + instability -= TileInfusionClaw.WAND_ITEM.getRod(this.wandStack) == ConfigItems.STAFF_ROD_PRIMAL ? 6 : 0; behavior.addInstability(instability); } private boolean hasSufficientVis() { - return wandStack != null && wandStack.stackSize > 0 && WAND_ITEM.consumeAllVis(wandStack, null, MAX_WAND_COST, false, false); + return this.wandStack != null && this.wandStack.stackSize > 0 && TileInfusionClaw.WAND_ITEM.consumeAllVis(this.wandStack, null, TileInfusionClaw.MAX_WAND_COST, false, false); } private void consumeVis(EntityPlayer player) { - WAND_ITEM.consumeAllVis(wandStack, player, WAND_FOCUS.getVisCost(wandStack), true, false); - markForUpdate(); + TileInfusionClaw.WAND_ITEM.consumeAllVis(this.wandStack, player, TileInfusionClaw.WAND_FOCUS.getVisCost(this.wandStack), true, false); + this.markForUpdate(); } @Override @@ -324,19 +323,19 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento @Override public ItemStack getStackInSlot(int slot) { - return wandStack; + return this.wandStack; } @Override public ItemStack decrStackSize(int slot, int amount) { - if(isRunning()) { + if(this.isRunning()) { return null; } if(amount > 0) { - ItemStack result = wandStack.copy(); - wandStack = null; - markForUpdate(); + ItemStack result = this.wandStack.copy(); + this.wandStack = null; + this.markForUpdate(); return result; } return null; @@ -349,8 +348,8 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento @Override public void setInventorySlotContents(int slot, ItemStack stack) { - wandStack = stack; - markForUpdate(); + this.wandStack = stack; + this.markForUpdate(); } @Override @@ -385,12 +384,12 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { - if(isRunning()) { + if(this.isRunning()) { return false; } - if(stack.getItem() == WAND_ITEM) { - return !WAND_ITEM.isSceptre(stack) && WAND_ITEM.getFocus(stack) == null; + if(stack.getItem() == TileInfusionClaw.WAND_ITEM) { + return !TileInfusionClaw.WAND_ITEM.isSceptre(stack) && TileInfusionClaw.WAND_ITEM.getFocus(stack) == null; } return false; } @@ -402,11 +401,11 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements IInvento @Override public boolean canInsertItem(int slot, ItemStack stack, int side) { - return !isRunning() && side > 0 && side < 6; + return !this.isRunning() && side > 0 && side < 6; } @Override public boolean canExtractItem(int slot, ItemStack stack, int side) { - return (!isLocked() || !hasSufficientVis()) && canInsertItem(slot, stack, side); + return (!this.isLocked() || !this.hasSufficientVis()) && this.canInsertItem(slot, stack, side); } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java index 13ce69d..7c03450 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java @@ -33,11 +33,7 @@ import thaumcraft.common.lib.events.EssentiaHandler; import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.lib.research.ResearchNoteData; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; /** * HellFirePvP@Admin @@ -61,84 +57,84 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP private FloatingBookAttributes bookAttributes = new FloatingBookAttributes(); //The itemstack this is connected to. - private ItemStack storedResearchNote = null; - private EntityPermNoClipItem.ItemChangeTask scheduledTask = null; + private ItemStack storedResearchNote; + private EntityPermNoClipItem.ItemChangeTask scheduledTask; //Ticks - private int timeSinceLastItemInfo = 0; - private int ticksExisted = 0; - private int ticksCognitio = 0; + private int timeSinceLastItemInfo; + private int ticksExisted; + private int ticksCognitio; //Sound effect stuff. I didn't like it when it's like changing pages 4 times in a row... - private boolean turnedPagesLastTick = false; + private boolean turnedPagesLastTick; //General research stuff - private boolean researching = false; - private AspectList workResearchAspects = null; - private int surroundingKnowledge = 0; + private boolean researching; + private AspectList workResearchAspects; + private int surroundingKnowledge; @Override public void updateEntity() { - bookAttributes.updateFloatingBook(); + this.bookAttributes.updateFloatingBook(); - ticksExisted++; - timeSinceLastItemInfo++; + this.ticksExisted++; + this.timeSinceLastItemInfo++; - if (!worldObj.isRemote) { - if(timeSinceLastItemInfo > 8) { - informItemRemoval(); + if (!this.worldObj.isRemote) { + if(this.timeSinceLastItemInfo > 8) { + this.informItemRemoval(); } - if(updateResearchStatus()) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + if(this.updateResearchStatus()) { + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } - if(researching) { - doResearchCycle(); + if(this.researching) { + this.doResearchCycle(); } } else { - if(researching && hasCognitio()) { - doResearchEffects(); + if(this.researching && this.hasCognitio()) { + this.doResearchEffects(); } } - if (storedResearchNote == null) { - tryVortexUnfinishedResearchNotes(); + if (this.storedResearchNote == null) { + this.tryVortexUnfinishedResearchNotes(); } } public boolean hasCognitio() { - return ticksCognitio > 0; + return this.ticksCognitio > 0; } public boolean isResearching() { - return researching; + return this.researching; } private void doResearchCycle() { - drainCognitio(); + this.drainCognitio(); - if(!hasCognitio()) { + if(!this.hasCognitio()) { return; } - checkSurroundings(); + this.checkSurroundings(); - int chance = Math.max(0, MAX_NEEDED_KNOWLEDGE - this.surroundingKnowledge) + 100; - if(rand.nextInt(chance) == 0) { - doResearchProgress(); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + int chance = Math.max(0, TileKnowledgeBook.MAX_NEEDED_KNOWLEDGE - this.surroundingKnowledge) + 100; + if(TileKnowledgeBook.rand.nextInt(chance) == 0) { + this.doResearchProgress(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } } private void doResearchProgress() { List aspects = new ArrayList(this.workResearchAspects.aspects.keySet()); if(aspects.isEmpty()) { - finishResearch(); + this.finishResearch(); return; } - Aspect a = aspects.get(rand.nextInt(aspects.size())); + Aspect a = aspects.get(TileKnowledgeBook.rand.nextInt(aspects.size())); int value = this.workResearchAspects.aspects.get(a); value--; if(value <= 0) { @@ -147,33 +143,33 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP this.workResearchAspects.aspects.put(a, value); } if(this.workResearchAspects.aspects.isEmpty()) { - finishResearch(); + this.finishResearch(); } } private void checkSurroundings() { this.surroundingKnowledge = 0; - for (int xx = -SURROUNDINGS_SEARCH_XZ; xx <= SURROUNDINGS_SEARCH_XZ; xx++) { - for (int zz = -SURROUNDINGS_SEARCH_XZ; zz <= SURROUNDINGS_SEARCH_XZ; zz++) { + for (int xx = -TileKnowledgeBook.SURROUNDINGS_SEARCH_XZ; xx <= TileKnowledgeBook.SURROUNDINGS_SEARCH_XZ; xx++) { + for (int zz = -TileKnowledgeBook.SURROUNDINGS_SEARCH_XZ; zz <= TileKnowledgeBook.SURROUNDINGS_SEARCH_XZ; zz++) { lblYLoop: - for (int yy = -SURROUNDINGS_SEARCH_Y; yy <= SURROUNDINGS_SEARCH_Y; yy++) { - int absX = xx + xCoord; - int absY = yy + yCoord; - int absZ = zz + zCoord; - Block at = worldObj.getBlock(absX, absY, absZ); - int meta = worldObj.getBlockMetadata(absX, absY, absZ); - TileEntity te = worldObj.getTileEntity(absX, absY, absZ); + for (int yy = -TileKnowledgeBook.SURROUNDINGS_SEARCH_Y; yy <= TileKnowledgeBook.SURROUNDINGS_SEARCH_Y; yy++) { + int absX = xx + this.xCoord; + int absY = yy + this.yCoord; + int absZ = zz + this.zCoord; + Block at = this.worldObj.getBlock(absX, absY, absZ); + int meta = this.worldObj.getBlockMetadata(absX, absY, absZ); + TileEntity te = this.worldObj.getTileEntity(absX, absY, absZ); if(at.equals(Blocks.bookshelf)) { this.surroundingKnowledge += 1; } else if(te != null && te instanceof IKnowledgeProvider) { - this.surroundingKnowledge += ((IKnowledgeProvider) te).getProvidedKnowledge(worldObj, absX, absY, absZ); + this.surroundingKnowledge += ((IKnowledgeProvider) te).getProvidedKnowledge(this.worldObj, absX, absY, absZ); } else if(at instanceof IKnowledgeProvider) { - this.surroundingKnowledge += ((IKnowledgeProvider) at).getProvidedKnowledge(worldObj, absX, absY, absZ); + this.surroundingKnowledge += ((IKnowledgeProvider) at).getProvidedKnowledge(this.worldObj, absX, absY, absZ); } else { - for (BlockSnapshot sn : knowledgeIncreaseMap.keySet()) { + for (BlockSnapshot sn : TileKnowledgeBook.knowledgeIncreaseMap.keySet()) { if(sn.block.equals(at) && sn.metadata == meta) { - this.surroundingKnowledge += knowledgeIncreaseMap.get(sn); + this.surroundingKnowledge += TileKnowledgeBook.knowledgeIncreaseMap.get(sn); continue lblYLoop; } } @@ -184,30 +180,30 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP } private void drainCognitio() { - if(ticksCognitio <= 0) { - searchForCognitio(); + if(this.ticksCognitio <= 0) { + this.searchForCognitio(); } else { - ticksCognitio--; - if(ticksCognitio <= 40) { - searchForCognitio(); + this.ticksCognitio--; + if(this.ticksCognitio <= 40) { + this.searchForCognitio(); } - if(ticksCognitio <= 0) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + if(this.ticksCognitio <= 0) { + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } } } private void searchForCognitio() { - if((ticksExisted & 31) == 0) { + if((this.ticksExisted & 31) == 0) { int drainRange = 4; ForgeDirection[] toTry = ForgeDirection.VALID_DIRECTIONS; for (ForgeDirection dir : toTry) { if(dir == null) continue; //LUL should not happen... if(EssentiaHandler.drainEssentia(this, Aspect.MIND, dir, drainRange)) { - ticksCognitio += COGNITIO_TICKS; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.ticksCognitio += TileKnowledgeBook.COGNITIO_TICKS; + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); break; } } @@ -216,42 +212,42 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP @SideOnly(Side.CLIENT) private void doResearchEffects() { - if((ticksExisted & 15) == 0) { - UtilsFX.doRuneEffects(Minecraft.getMinecraft().theWorld, xCoord, yCoord - 1, zCoord, 0); + if((this.ticksExisted & 15) == 0) { + UtilsFX.doRuneEffects(Minecraft.getMinecraft().theWorld, this.xCoord, this.yCoord - 1, this.zCoord, 0); } - if((ticksExisted & 31) == 0) { - switch (rand.nextInt(5)) { + if((this.ticksExisted & 31) == 0) { + switch (TileKnowledgeBook.rand.nextInt(5)) { case 0: - if(!turnedPagesLastTick) { - worldObj.playSound(xCoord + 0.5, yCoord + 0.3, zCoord + 0.5, "thaumcraft:page", 0.4F, 1.0F, false); - turnedPagesLastTick = true; + if(!this.turnedPagesLastTick) { + this.worldObj.playSound(this.xCoord + 0.5, this.yCoord + 0.3, this.zCoord + 0.5, "thaumcraft:page", 0.4F, 1.0F, false); + this.turnedPagesLastTick = true; break; } case 1: case 2: case 3: - worldObj.playSound(xCoord + 0.5, yCoord + 0.3, zCoord + 0.5, "thaumcraft:write", 0.2F, 1.0F, false); - turnedPagesLastTick = false; + this.worldObj.playSound(this.xCoord + 0.5, this.yCoord + 0.3, this.zCoord + 0.5, "thaumcraft:write", 0.2F, 1.0F, false); + this.turnedPagesLastTick = false; break; } } } private void finishResearch() { - stopResearch(); - scheduleFinishItemChange(); - PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_SPARKLE_SPREAD, xCoord, yCoord, zCoord); - PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.stopResearch(); + this.scheduleFinishItemChange(); + PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_SPARKLE_SPREAD, this.xCoord, this.yCoord, this.zCoord); + PacketHandler.INSTANCE.sendToAllAround(packet, this.getTargetPoint(32)); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } private NetworkRegistry.TargetPoint getTargetPoint(double radius) { - return new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, radius); + return new NetworkRegistry.TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, radius); } private void scheduleFinishItemChange() { - scheduledTask = new EntityPermNoClipItem.ItemChangeTask() { + this.scheduledTask = new EntityPermNoClipItem.ItemChangeTask() { @Override public void changeItem(EntityPermNoClipItem item) { ItemStack stack = item.getEntityItem(); @@ -263,24 +259,24 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP //Returns true, if updating/sync is required. private boolean updateResearchStatus() { - if(researching) { - if(storedResearchNote != null) { - ResearchNoteData nd = ResearchManager.getData(storedResearchNote); + if(this.researching) { + if(this.storedResearchNote != null) { + ResearchNoteData nd = ResearchManager.getData(this.storedResearchNote); if(nd == null || nd.isComplete()) { - stopResearch(); + this.stopResearch(); return true; } } else { - stopResearch(); + this.stopResearch(); return true; } } else { - if(storedResearchNote != null) { - ResearchNoteData nd = ResearchManager.getData(storedResearchNote); + if(this.storedResearchNote != null) { + ResearchNoteData nd = ResearchManager.getData(this.storedResearchNote); if(nd != null && !nd.isComplete()) { ResearchItem ri = ResearchCategories.getResearch(nd.key); if(ri != null) { - beginResearch(ri.tags); + this.beginResearch(ri.tags); return true; } } @@ -293,7 +289,7 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP AspectList workResearchList = new AspectList(); for (Aspect a : researchTags.aspects.keySet()) { int value = researchTags.aspects.get(a); - int newVal = (int) Math.max(LOWEST_AMOUNT, ((double) value) * MULTIPLIER); + int newVal = (int) Math.max(TileKnowledgeBook.LOWEST_AMOUNT, ((double) value) * TileKnowledgeBook.MULTIPLIER); workResearchList.add(a, newVal); } this.workResearchAspects = workResearchList; @@ -319,16 +315,16 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP @Override public void informItemRemoval() { this.storedResearchNote = null; - stopResearch(); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.stopResearch(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } @Override public EntityPermNoClipItem.ItemChangeTask getAndRemoveScheduledChangeTask() { - if(scheduledTask != null) { - EntityPermNoClipItem.ItemChangeTask buffer = scheduledTask; - scheduledTask = null; + if(this.scheduledTask != null) { + EntityPermNoClipItem.ItemChangeTask buffer = this.scheduledTask; + this.scheduledTask = null; return buffer; } return null; @@ -340,22 +336,22 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP } private void tryVortexUnfinishedResearchNotes() { - float centerY = yCoord + 0.4F; - List entityItems = worldObj.selectEntitiesWithinAABB(EntityItem.class, - AxisAlignedBB.getBoundingBox(xCoord - 0.5, centerY - 0.5, zCoord - 0.5, xCoord + 0.5, centerY + 0.5, zCoord + 0.5).expand(8, 8, 8), new IEntitySelector() { + float centerY = this.yCoord + 0.4F; + List entityItems = this.worldObj.selectEntitiesWithinAABB(EntityItem.class, + AxisAlignedBB.getBoundingBox(this.xCoord - 0.5, centerY - 0.5, this.zCoord - 0.5, this.xCoord + 0.5, centerY + 0.5, this.zCoord + 0.5).expand(8, 8, 8), new IEntitySelector() { @Override public boolean isEntityApplicable(Entity e) { return !(e instanceof EntityPermanentItem) && !(e instanceof EntitySpecialItem) && e instanceof EntityItem && ((EntityItem) e).getEntityItem() != null && ((EntityItem) e).getEntityItem().getItem() instanceof ItemResearchNotes && - shouldVortexResearchNote(((EntityItem) e).getEntityItem()); + TileKnowledgeBook.this.shouldVortexResearchNote(((EntityItem) e).getEntityItem()); } }); - Entity dummy = new EntityItem(worldObj); - dummy.posX = xCoord + 0.5; + Entity dummy = new EntityItem(this.worldObj); + dummy.posX = this.xCoord + 0.5; dummy.posY = centerY + 0.5; - dummy.posZ = zCoord + 0.5; + dummy.posZ = this.zCoord + 0.5; //MC code. EntityItem entity = null; @@ -371,13 +367,13 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP } } if(entity == null) return; - if(dummy.getDistanceToEntity(entity) < 1 && !worldObj.isRemote) { + if(dummy.getDistanceToEntity(entity) < 1 && !this.worldObj.isRemote) { ItemStack inter = entity.getEntityItem(); inter.stackSize--; this.storedResearchNote = inter.copy(); this.storedResearchNote.stackSize = 1; - EntityPermNoClipItem item = new EntityPermNoClipItem(entity.worldObj, xCoord + 0.5F, centerY + 0.3F, zCoord + 0.5F, storedResearchNote, xCoord, yCoord, zCoord); + EntityPermNoClipItem item = new EntityPermNoClipItem(entity.worldObj, this.xCoord + 0.5F, centerY + 0.3F, this.zCoord + 0.5F, this.storedResearchNote, this.xCoord, this.yCoord, this.zCoord); entity.worldObj.spawnEntityInWorld(item); item.motionX = 0; item.motionY = 0; @@ -386,16 +382,16 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP item.age = entity.age; item.noClip = true; - timeSinceLastItemInfo = 0; + this.timeSinceLastItemInfo = 0; if(inter.stackSize <= 0) entity.setDead(); entity.noClip = false; item.delayBeforeCanPickup = 60; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } else { entity.noClip = true; - applyMovementVectors(entity); + this.applyMovementVectors(entity); } } @@ -423,7 +419,7 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP } public FloatingBookAttributes getBookAttributes() { - return bookAttributes; + return this.bookAttributes; } @Override @@ -436,18 +432,18 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP @Override public void writeCustomNBT(NBTTagCompound compound) { - if(workResearchAspects != null) { - NBTHelper.setAspectList(compound, "workAspects", workResearchAspects); + if(this.workResearchAspects != null) { + NBTHelper.setAspectList(compound, "workAspects", this.workResearchAspects); } - compound.setInteger("cognitio", ticksCognitio); - compound.setBoolean("researching", researching); - if(storedResearchNote != null) - NBTHelper.setStack(compound, "crystalStack", storedResearchNote); + compound.setInteger("cognitio", this.ticksCognitio); + compound.setBoolean("researching", this.researching); + if(this.storedResearchNote != null) + NBTHelper.setStack(compound, "crystalStack", this.storedResearchNote); } @Override public AspectList getAspects() { - return workResearchAspects; + return this.workResearchAspects; } @Override @@ -499,9 +495,9 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP } } - public static interface IKnowledgeProvider { + public interface IKnowledgeProvider { - public int getProvidedKnowledge(World world, int blockX, int blockY, int blockZ); + int getProvidedKnowledge(World world, int blockX, int blockY, int blockZ); } @@ -524,7 +520,7 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP private void updateFloatingBook() { this.field_145927_n = this.field_145930_m; this.field_145925_p = this.field_145928_o; - EntityPlayer entityplayer = TileKnowledgeBook.this.worldObj.getClosestPlayer((double)((float)TileKnowledgeBook.this.xCoord + 0.5F), (double)((float)TileKnowledgeBook.this.yCoord + 0.5F), (double)((float)TileKnowledgeBook.this.zCoord + 0.5F), 3.0D); + EntityPlayer entityplayer = TileKnowledgeBook.this.worldObj.getClosestPlayer((float)TileKnowledgeBook.this.xCoord + 0.5F, (float)TileKnowledgeBook.this.yCoord + 0.5F, (float)TileKnowledgeBook.this.zCoord + 0.5F, 3.0D); if (entityplayer != null) { @@ -533,13 +529,13 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP this.field_145924_q = (float)Math.atan2(d1, d0); this.field_145930_m += 0.1F; - if (this.field_145930_m < 0.5F || rand.nextInt(40) == 0) + if (this.field_145930_m < 0.5F || TileKnowledgeBook.rand.nextInt(40) == 0) { float f1 = this.field_145932_k; do { - this.field_145932_k += (float)(rand.nextInt(4) - rand.nextInt(4)); + this.field_145932_k += (float)(TileKnowledgeBook.rand.nextInt(4) - TileKnowledgeBook.rand.nextInt(4)); } while (f1 == this.field_145932_k); } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java index 960a626..352d817 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java @@ -14,7 +14,7 @@ public class TileManipulatorPillar extends TileInfusionPillar { public void setOrientation(byte orientation) { this.orientation = orientation; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } } \ No newline at end of file diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java index 56e6e29..6b4b315 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java @@ -32,11 +32,7 @@ import thaumcraft.common.lib.utils.InventoryUtils; import thaumcraft.common.tiles.TilePedestal; import thaumcraft.common.tiles.TileWandPedestal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * This class is part of the Gadomancy Mod @@ -46,7 +42,7 @@ import java.util.Map; * * Created by HellFirePvP @ 26.10.2015 20:16 */ -public class TileNodeManipulator extends TileWandPedestal implements IAspectContainer, IWandable { +public class TileNodeManipulator extends TileWandPedestal implements IWandable { private static final int NODE_MANIPULATION_POSSIBLE_WORK_START = 70; private static final int NODE_MANIPULATION_WORK_ASPECT_CAP = 120; @@ -55,89 +51,89 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont private static final int ELDRITCH_PORTAL_CREATOR_ASPECT_CAP = 150; //Already set when only multiblock would be present. aka is set, if 'isMultiblockPresent()' returns true. - private MultiblockType multiblockType = null; - private boolean multiblockStructurePresent = false; - private boolean isMultiblock = false; + private MultiblockType multiblockType; + private boolean multiblockStructurePresent; + private boolean isMultiblock; private AspectList workAspectList = new AspectList(); private List bufferedCCPedestals = new ArrayList(); - private boolean isWorking = false; - private int workTick = 0; + private boolean isWorking; + private int workTick; @Override public void updateEntity() { - if(worldObj.isRemote) return; + if(this.worldObj.isRemote) return; - if(isInMultiblock()) { - checkMultiblockTick(); + if(this.isInMultiblock()) { + this.checkMultiblockTick(); } - if(isInMultiblock()) { - multiblockTick(); + if(this.isInMultiblock()) { + this.multiblockTick(); } } private void multiblockTick() { - if(multiblockType == null) { - if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock)) { - multiblockType = MultiblockType.NODE_MANIPULATOR; - } else if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeEldritchPortalCreator) && checkEldritchEyes(false)) { - multiblockType = MultiblockType.E_PORTAL_CREATOR; + if(this.multiblockType == null) { + if(MultiblockHelper.isMultiblockPresent(this.worldObj, this.xCoord, this.yCoord, this.zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock)) { + this.multiblockType = MultiblockType.NODE_MANIPULATOR; + } else if(MultiblockHelper.isMultiblockPresent(this.worldObj, this.xCoord, this.yCoord, this.zCoord, RegisteredMultiblocks.completeEldritchPortalCreator) && this.checkEldritchEyes(false)) { + this.multiblockType = MultiblockType.E_PORTAL_CREATOR; } } - if(multiblockType == null) { - breakMultiblock(); + if(this.multiblockType == null) { + this.breakMultiblock(); return; } - switch (multiblockType) { + switch (this.multiblockType) { case NODE_MANIPULATOR: - if(!isWorking) { - doAspectChecks(NODE_MANIPULATION_WORK_ASPECT_CAP, NODE_MANIPULATION_POSSIBLE_WORK_START); + if(!this.isWorking) { + this.doAspectChecks(TileNodeManipulator.NODE_MANIPULATION_WORK_ASPECT_CAP, TileNodeManipulator.NODE_MANIPULATION_POSSIBLE_WORK_START); } else { - manipulationTick(); + this.manipulationTick(); } break; case E_PORTAL_CREATOR: - if(!isWorking) { - doAspectChecks(ELDRITCH_PORTAL_CREATOR_ASPECT_CAP, ELDRITCH_PORTAL_CREATOR_WORK_START); + if(!this.isWorking) { + this.doAspectChecks(TileNodeManipulator.ELDRITCH_PORTAL_CREATOR_ASPECT_CAP, TileNodeManipulator.ELDRITCH_PORTAL_CREATOR_WORK_START); } else { - if(!checkEldritchEyes(true)) { - if(workTick > 1) { - workAspectList = new AspectList(); - workTick = 0; - isWorking = false; - markDirty(); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + if(!this.checkEldritchEyes(true)) { + if(this.workTick > 1) { + this.workAspectList = new AspectList(); + this.workTick = 0; + this.isWorking = false; + this.markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } return; } - eldritchPortalCreationTick(); + this.eldritchPortalCreationTick(); } break; } } private boolean checkEldritchEyes(boolean checkForEyes) { - bufferedCCPedestals.clear(); + this.bufferedCCPedestals.clear(); int validPedestalsFound = 0; labelIt: for (int xDiff = -8; xDiff <= 8; xDiff++) { labelZ: for (int zDiff = -8; zDiff <= 8; zDiff++) { for (int yDiff = -5; yDiff <= 10; yDiff++) { - int itX = xCoord + xDiff; - int itY = yCoord + yDiff; - int itZ = zCoord + zDiff; + int itX = this.xCoord + xDiff; + int itY = this.yCoord + yDiff; + int itZ = this.zCoord + zDiff; - Block block = worldObj.getBlock(itX, itY, itZ); - int meta = worldObj.getBlockMetadata(itX, itY, itZ); - TileEntity te = worldObj.getTileEntity(itX, itY, itZ); + Block block = this.worldObj.getBlock(itX, itY, itZ); + int meta = this.worldObj.getBlockMetadata(itX, itY, itZ); + TileEntity te = this.worldObj.getTileEntity(itX, itY, itZ); if(block != null && block.equals(RegisteredBlocks.blockStoneMachine) && meta == 1 - && te != null && te instanceof TilePedestal && (!checkForEyes || checkTile((TilePedestal) te))) { + && te != null && te instanceof TilePedestal && (!checkForEyes || this.checkTile((TilePedestal) te))) { validPedestalsFound++; - bufferedCCPedestals.add(new ChunkCoordinates(itX, itY, itZ)); + this.bufferedCCPedestals.add(new ChunkCoordinates(itX, itY, itZ)); if(validPedestalsFound >= 4) { break labelIt; } @@ -155,86 +151,86 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } private void eldritchPortalCreationTick() { - workTick++; - if(workTick < 400) { - if((workTick & 15) == 0) { - PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, xCoord, yCoord, zCoord, (byte) 1); - PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); + this.workTick++; + if(this.workTick < 400) { + if((this.workTick & 15) == 0) { + PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, this.xCoord, this.yCoord, this.zCoord, (byte) 1); + PacketHandler.INSTANCE.sendToAllAround(packet, this.getTargetPoint(32)); } - if((workTick & 7) == 0) { - int index = (workTick >> 3) & 3; + if((this.workTick & 7) == 0) { + int index = (this.workTick >> 3) & 3; try { - ChunkCoordinates cc = bufferedCCPedestals.get(index); + ChunkCoordinates cc = this.bufferedCCPedestals.get(index); PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, cc.posX, cc.posY, cc.posZ, (byte) 1); - PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); + PacketHandler.INSTANCE.sendToAllAround(packet, this.getTargetPoint(32)); } catch (Exception exc) {} } - if(worldObj.rand.nextBoolean()) { - Vec3 rel = getRelPillarLoc(worldObj.rand.nextInt(4)); - PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + rel.xCoord), (float) (yCoord + 2.5F + rel.yCoord), (float) (zCoord + 0.5F + rel.zCoord), 2, false); - PacketHandler.INSTANCE.sendToAllAround(bolt, getTargetPoint(32)); + if(this.worldObj.rand.nextBoolean()) { + Vec3 rel = this.getRelPillarLoc(this.worldObj.rand.nextInt(4)); + PacketTCNodeBolt bolt = new PacketTCNodeBolt(this.xCoord + 0.5F, this.yCoord + 2.5F, this.zCoord + 0.5F, (float) (this.xCoord + 0.5F + rel.xCoord), (float) (this.yCoord + 2.5F + rel.yCoord), (float) (this.zCoord + 0.5F + rel.zCoord), 2, false); + PacketHandler.INSTANCE.sendToAllAround(bolt, this.getTargetPoint(32)); } - if(worldObj.rand.nextInt(4) == 0) { - Vec3 relPed = getRelPedestalLoc(worldObj.rand.nextInt(4)); - PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F - relPed.xCoord), (float) (yCoord + 1.5 + relPed.yCoord), (float) (zCoord + 0.5F - relPed.zCoord), 2, false); - PacketHandler.INSTANCE.sendToAllAround(bolt, getTargetPoint(32)); + if(this.worldObj.rand.nextInt(4) == 0) { + Vec3 relPed = this.getRelPedestalLoc(this.worldObj.rand.nextInt(4)); + PacketTCNodeBolt bolt = new PacketTCNodeBolt(this.xCoord + 0.5F, this.yCoord + 2.5F, this.zCoord + 0.5F, (float) (this.xCoord + 0.5F - relPed.xCoord), (float) (this.yCoord + 1.5 + relPed.yCoord), (float) (this.zCoord + 0.5F - relPed.zCoord), 2, false); + PacketHandler.INSTANCE.sendToAllAround(bolt, this.getTargetPoint(32)); } } else { - schedulePortalCreation(); + this.schedulePortalCreation(); } } private void schedulePortalCreation() { - workTick = 0; - isWorking = false; - workAspectList = new AspectList(); + this.workTick = 0; + this.isWorking = false; + this.workAspectList = new AspectList(); - TileEntity te = worldObj.getTileEntity(xCoord, yCoord + 2, zCoord); + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord + 2, this.zCoord); if(te == null || !(te instanceof INode)) return; - consumeEldritchEyes(); + this.consumeEldritchEyes(); - worldObj.removeTileEntity(xCoord, yCoord + 2, zCoord); - worldObj.setBlockToAir(xCoord, yCoord + 2, zCoord); - worldObj.setBlock(xCoord, yCoord + 2, zCoord, RegisteredBlocks.blockAdditionalEldrichPortal); + this.worldObj.removeTileEntity(this.xCoord, this.yCoord + 2, this.zCoord); + this.worldObj.setBlockToAir(this.xCoord, this.yCoord + 2, this.zCoord); + this.worldObj.setBlock(this.xCoord, this.yCoord + 2, this.zCoord, RegisteredBlocks.blockAdditionalEldrichPortal); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - worldObj.markBlockForUpdate(xCoord, yCoord + 2, zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord + 2, this.zCoord); + this.markDirty(); } private void consumeEldritchEyes() { - for (ChunkCoordinates cc : bufferedCCPedestals) { + for (ChunkCoordinates cc : this.bufferedCCPedestals) { try { - TilePedestal pedestal = (TilePedestal) worldObj.getTileEntity(cc.posX, cc.posY, cc.posZ); + TilePedestal pedestal = (TilePedestal) this.worldObj.getTileEntity(cc.posX, cc.posY, cc.posZ); pedestal.setInventorySlotContents(0, null); PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_SPARKLE_SPREAD, cc.posX, cc.posY, cc.posZ); - PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); + PacketHandler.INSTANCE.sendToAllAround(packet, this.getTargetPoint(32)); } catch (Exception exc) {} } } private void manipulationTick() { - workTick++; - if(workTick < 300) { - if(workTick % 16 == 0) { - PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, xCoord, yCoord, zCoord); - PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); + this.workTick++; + if(this.workTick < 300) { + if(this.workTick % 16 == 0) { + PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, this.xCoord, this.yCoord, this.zCoord); + PacketHandler.INSTANCE.sendToAllAround(packet, this.getTargetPoint(32)); } - if(worldObj.rand.nextInt(4) == 0) { - Vec3 rel = getRelPillarLoc(worldObj.rand.nextInt(4)); - PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + rel.xCoord), (float) (yCoord + 2.5F + rel.yCoord), (float) (zCoord + 0.5F + rel.zCoord), 0, false); - PacketHandler.INSTANCE.sendToAllAround(bolt, getTargetPoint(32)); + if(this.worldObj.rand.nextInt(4) == 0) { + Vec3 rel = this.getRelPillarLoc(this.worldObj.rand.nextInt(4)); + PacketTCNodeBolt bolt = new PacketTCNodeBolt(this.xCoord + 0.5F, this.yCoord + 2.5F, this.zCoord + 0.5F, (float) (this.xCoord + 0.5F + rel.xCoord), (float) (this.yCoord + 2.5F + rel.yCoord), (float) (this.zCoord + 0.5F + rel.zCoord), 0, false); + PacketHandler.INSTANCE.sendToAllAround(bolt, this.getTargetPoint(32)); } } else { - scheduleManipulation(); + this.scheduleManipulation(); } } private Vec3 getRelPedestalLoc(int pedestalId) { try { - ChunkCoordinates cc = bufferedCCPedestals.get(pedestalId); - return Vec3.createVectorHelper(xCoord - cc.posX, yCoord - cc.posY, zCoord - cc.posZ); + ChunkCoordinates cc = this.bufferedCCPedestals.get(pedestalId); + return Vec3.createVectorHelper(this.xCoord - cc.posX, this.yCoord - cc.posY, this.zCoord - cc.posZ); } catch (Exception exc) {} return Vec3.createVectorHelper(0, 0, 0); } @@ -254,75 +250,75 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } private void scheduleManipulation() { - float overSized = calcOversize(NODE_MANIPULATION_POSSIBLE_WORK_START); + float overSized = this.calcOversize(TileNodeManipulator.NODE_MANIPULATION_POSSIBLE_WORK_START); - workTick = 0; - isWorking = false; - workAspectList = new AspectList(); + this.workTick = 0; + this.isWorking = false; + this.workAspectList = new AspectList(); - TileEntity te = worldObj.getTileEntity(xCoord, yCoord + 2, zCoord); + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord + 2, this.zCoord); if(te == null || !(te instanceof INode)) return; INode node = (INode) te; - int areaRange = NODE_MANIPULATION_WORK_ASPECT_CAP - NODE_MANIPULATION_POSSIBLE_WORK_START; + int areaRange = TileNodeManipulator.NODE_MANIPULATION_WORK_ASPECT_CAP - TileNodeManipulator.NODE_MANIPULATION_POSSIBLE_WORK_START; int percChanceForBetter = 0; if(areaRange > 0) { percChanceForBetter = (int) ((overSized / ((float) areaRange)) * 100); } NodeManipulatorResult result; do { - result = NodeManipulatorResultHandler.getRandomResult(worldObj, node, percChanceForBetter); - } while (!result.affect(worldObj, node)); - PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_SPARKLE_SPREAD, xCoord, yCoord + 2, zCoord); - PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - worldObj.markBlockForUpdate(xCoord, yCoord + 2, zCoord); - markDirty(); + result = NodeManipulatorResultHandler.getRandomResult(this.worldObj, node, percChanceForBetter); + } while (!result.affect(this.worldObj, node)); + PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_SPARKLE_SPREAD, this.xCoord, this.yCoord + 2, this.zCoord); + PacketHandler.INSTANCE.sendToAllAround(packet, this.getTargetPoint(32)); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord + 2, this.zCoord); + this.markDirty(); ((TileEntity) node).markDirty(); } private float calcOversize(int neededAspects) { int overall = 0; for(Aspect a : Aspect.getPrimalAspects()) { - overall += workAspectList.getAmount(a) - neededAspects; + overall += this.workAspectList.getAmount(a) - neededAspects; } return ((float) overall) / 6F; } private void doAspectChecks(int aspectCap, int possibleWorkStart) { - if(canDrainFromWand(aspectCap)) { - Aspect a = drainAspectFromWand(aspectCap); + if(this.canDrainFromWand(aspectCap)) { + Aspect a = this.drainAspectFromWand(aspectCap); if(a != null) { - playAspectDrainFromWand(a); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.playAspectDrainFromWand(a); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } } else { - checkIfEnoughVis(possibleWorkStart); + this.checkIfEnoughVis(possibleWorkStart); } } private void checkIfEnoughVis(int start) { boolean enough = true; for(Aspect a : Aspect.getPrimalAspects()) { - if(workAspectList.getAmount(a) < start) { + if(this.workAspectList.getAmount(a) < start) { enough = false; break; } } if(enough) { - isWorking = true; + this.isWorking = true; } } private Aspect drainAspectFromWand(int cap) { - ItemStack stack = getStackInSlot(0); + ItemStack stack = this.getStackInSlot(0); if(stack == null || !(stack.getItem() instanceof ItemWandCasting)) return null; //Should never happen.. AspectList aspects = ((ItemWandCasting) stack.getItem()).getAllVis(stack); - for(Aspect a : getRandomlyOrderedPrimalAspectList()) { - if(aspects.getAmount(a) >= 100 && workAspectList.getAmount(a) < cap) { + for(Aspect a : this.getRandomlyOrderedPrimalAspectList()) { + if(aspects.getAmount(a) >= 100 && this.workAspectList.getAmount(a) < cap) { int amt = aspects.getAmount(a); ((ItemWandCasting) stack.getItem()).storeVis(stack, a, amt - 100); - workAspectList.add(a, 1); + this.workAspectList.add(a, 1); return a; } } @@ -336,49 +332,49 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } private boolean canDrainFromWand(int cap) { - ItemStack stack = getStackInSlot(0); + ItemStack stack = this.getStackInSlot(0); if(stack == null || !(stack.getItem() instanceof ItemWandCasting)) return false; AspectList aspects = ((ItemWandCasting) stack.getItem()).getAllVis(stack); for(Aspect a : Aspect.getPrimalAspects()) { if(aspects.getAmount(a) < 100) continue; - if(workAspectList.getAmount(a) < cap) return true; + if(this.workAspectList.getAmount(a) < cap) return true; } return false; } private void checkMultiblockTick() { - checkMultiblock(); - if(!isMultiblockStructurePresent()) { - breakMultiblock(); - isMultiblock = false; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.checkMultiblock(); + if(!this.isMultiblockStructurePresent()) { + this.breakMultiblock(); + this.isMultiblock = false; + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); } } private void playAspectDrainFromWand(Aspect drained) { if(drained == null) return; - NetworkRegistry.TargetPoint point = getTargetPoint(32); - PacketTCWispyLine line = new PacketTCWispyLine(worldObj.provider.dimensionId, xCoord + 0.5, yCoord + 0.8, zCoord + 0.5, - xCoord + 0.5, yCoord + 1.4 + (((double) worldObj.rand.nextInt(4)) / 10D), zCoord + 0.5, 40, drained.getColor()); + NetworkRegistry.TargetPoint point = this.getTargetPoint(32); + PacketTCWispyLine line = new PacketTCWispyLine(this.worldObj.provider.dimensionId, this.xCoord + 0.5, this.yCoord + 0.8, this.zCoord + 0.5, + this.xCoord + 0.5, this.yCoord + 1.4 + (((double) this.worldObj.rand.nextInt(4)) / 10D), this.zCoord + 0.5, 40, drained.getColor()); PacketHandler.INSTANCE.sendToAllAround(line, point); } private void dropWand() { - if(getStackInSlot(0) != null) - InventoryUtils.dropItems(worldObj, xCoord, yCoord, zCoord); + if(this.getStackInSlot(0) != null) + InventoryUtils.dropItems(this.worldObj, this.xCoord, this.yCoord, this.zCoord); } public void breakMultiblock() { MultiblockHelper.MultiblockPattern compareableCompleteStructure, toRestore; - if(multiblockType == null) { - workAspectList = new AspectList(); - dropWand(); - workTick = 0; - isWorking = false; + if(this.multiblockType == null) { + this.workAspectList = new AspectList(); + this.dropWand(); + this.workTick = 0; + this.isWorking = false; return; } - switch (multiblockType) { + switch (this.multiblockType) { case NODE_MANIPULATOR: compareableCompleteStructure = RegisteredMultiblocks.completeNodeManipulatorMultiblock; toRestore = RegisteredMultiblocks.incompleteNodeManipulatorMultiblock; @@ -395,27 +391,27 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont MultiblockHelper.BlockInfo restoreInfo = toRestore.get(v); if(info.block == RegisteredBlocks.blockNode || (info.block == RegisteredBlocks.blockStoneMachine && (info.meta == 0 || info.meta == 3)) || info.block == Blocks.air || info.block == RegisteredBlocks.blockNodeManipulator) continue; - int absX = v.x + xCoord; - int absY = v.y + yCoord; - int absZ = v.z + zCoord; - if(worldObj.getBlock(absX, absY, absZ) == info.block && worldObj.getBlockMetadata(absX, absY, absZ) == info.meta) { - worldObj.setBlock(absX, absY, absZ, Blocks.air, 0, 0); - worldObj.setBlock(absX, absY, absZ, restoreInfo.block, restoreInfo.meta, 0); - worldObj.markBlockForUpdate(absX, absY, absZ); + int absX = v.x + this.xCoord; + int absY = v.y + this.yCoord; + int absZ = v.z + this.zCoord; + if(this.worldObj.getBlock(absX, absY, absZ) == info.block && this.worldObj.getBlockMetadata(absX, absY, absZ) == info.meta) { + this.worldObj.setBlock(absX, absY, absZ, Blocks.air, 0, 0); + this.worldObj.setBlock(absX, absY, absZ, restoreInfo.block, restoreInfo.meta, 0); + this.worldObj.markBlockForUpdate(absX, absY, absZ); } } - workAspectList = new AspectList(); + this.workAspectList = new AspectList(); this.multiblockType = null; - dropWand(); - workTick = 0; - isWorking = false; + this.dropWand(); + this.workTick = 0; + this.isWorking = false; } public void formMultiblock() { MultiblockHelper.MultiblockPattern toBuild; - if(multiblockType == null) return; - switch (multiblockType) { + if(this.multiblockType == null) return; + switch (this.multiblockType) { case NODE_MANIPULATOR: toBuild = RegisteredMultiblocks.completeNodeManipulatorMultiblock; break; @@ -429,30 +425,30 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont MultiblockHelper.BlockInfo info = toBuild.get(v); if(info.block == RegisteredBlocks.blockNode || (info.block == RegisteredBlocks.blockStoneMachine && (info.meta == 0 || info.meta == 1 || info.meta == 3)) || info.block == Blocks.air || info.block == RegisteredBlocks.blockNodeManipulator) continue; - int absX = v.x + xCoord; - int absY = v.y + yCoord; - int absZ = v.z + zCoord; - worldObj.setBlock(absX, absY, absZ, Blocks.air, 0, 0); - worldObj.setBlock(absX, absY, absZ, info.block, info.meta, 0); - worldObj.markBlockForUpdate(absX, absY, absZ); + int absX = v.x + this.xCoord; + int absY = v.y + this.yCoord; + int absZ = v.z + this.zCoord; + this.worldObj.setBlock(absX, absY, absZ, Blocks.air, 0, 0); + this.worldObj.setBlock(absX, absY, absZ, info.block, info.meta, 0); + this.worldObj.markBlockForUpdate(absX, absY, absZ); } - NetworkRegistry.TargetPoint target = getTargetPoint(32); - TileManipulatorPillar pillar = (TileManipulatorPillar) worldObj.getTileEntity(xCoord + 1, yCoord, zCoord + 1); //wrong + NetworkRegistry.TargetPoint target = this.getTargetPoint(32); + TileManipulatorPillar pillar = (TileManipulatorPillar) this.worldObj.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord + 1); //wrong pillar.setOrientation((byte) 5); PacketStartAnimation animation = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, pillar.xCoord, pillar.yCoord, pillar.zCoord); PacketHandler.INSTANCE.sendToAllAround(animation, target); - TileManipulatorPillar pillar2 = (TileManipulatorPillar) worldObj.getTileEntity(xCoord - 1, yCoord, zCoord + 1); + TileManipulatorPillar pillar2 = (TileManipulatorPillar) this.worldObj.getTileEntity(this.xCoord - 1, this.yCoord, this.zCoord + 1); pillar2.setOrientation((byte) 3); animation = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, pillar2.xCoord, pillar2.yCoord, pillar2.zCoord); PacketHandler.INSTANCE.sendToAllAround(animation, target); - TileManipulatorPillar pillar3 = (TileManipulatorPillar) worldObj.getTileEntity(xCoord + 1, yCoord, zCoord - 1); //wrong + TileManipulatorPillar pillar3 = (TileManipulatorPillar) this.worldObj.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord - 1); //wrong pillar3.setOrientation((byte) 4); animation = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, pillar3.xCoord, pillar3.yCoord, pillar3.zCoord); PacketHandler.INSTANCE.sendToAllAround(animation, target); - animation = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, xCoord - 1, yCoord, zCoord - 1); + animation = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, this.xCoord - 1, this.yCoord, this.zCoord - 1); PacketHandler.INSTANCE.sendToAllAround(animation, target); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + this.markDirty(); this.isMultiblock = true; } @@ -468,7 +464,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont if(tag.hasKey("multiblockType")) { this.multiblockType = MultiblockType.values()[tag.getInteger("multiblockType")]; } - workAspectList.readFromNBT(tag, "workAspectList"); + this.workAspectList.readFromNBT(tag, "workAspectList"); } @Override @@ -480,55 +476,55 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont tag.setBoolean("mBlockState", this.isMultiblock); tag.setBoolean("manipulating", this.isWorking); tag.setInteger("workTick", this.workTick); - if(multiblockType != null) { + if(this.multiblockType != null) { tag.setInteger("multiblockType", this.multiblockType.ordinal()); } - workAspectList.writeToNBT(tag, "workAspectList"); + this.workAspectList.writeToNBT(tag, "workAspectList"); compound.setTag("Gadomancy", tag); } public boolean isInMultiblock() { - return isMultiblock; + return this.isMultiblock; } public boolean isMultiblockStructurePresent() { - return multiblockStructurePresent; + return this.multiblockStructurePresent; } public MultiblockType getMultiblockType() { - return multiblockType; + return this.multiblockType; } public boolean checkMultiblock() { - boolean prevState = isMultiblockStructurePresent(); + boolean prevState = this.isMultiblockStructurePresent(); if(prevState) { //If there is already a multiblock formed... - if(isInMultiblock()) { //If we were actually in multiblock before - if(multiblockType == null) { - if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock)) { - multiblockType = MultiblockType.NODE_MANIPULATOR; - } else if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeEldritchPortalCreator) && checkEldritchEyes(false)) { - multiblockType = MultiblockType.E_PORTAL_CREATOR; + if(this.isInMultiblock()) { //If we were actually in multiblock before + if(this.multiblockType == null) { + if(MultiblockHelper.isMultiblockPresent(this.worldObj, this.xCoord, this.yCoord, this.zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock)) { + this.multiblockType = MultiblockType.NODE_MANIPULATOR; + } else if(MultiblockHelper.isMultiblockPresent(this.worldObj, this.xCoord, this.yCoord, this.zCoord, RegisteredMultiblocks.completeEldritchPortalCreator) && this.checkEldritchEyes(false)) { + this.multiblockType = MultiblockType.E_PORTAL_CREATOR; } } - if(multiblockType == null) { - breakMultiblock(); + if(this.multiblockType == null) { + this.breakMultiblock(); return false; } - switch (multiblockType) { + switch (this.multiblockType) { case NODE_MANIPULATOR: - setMultiblockStructurePresent(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock), MultiblockType.NODE_MANIPULATOR); + this.setMultiblockStructurePresent(MultiblockHelper.isMultiblockPresent(this.worldObj, this.xCoord, this.yCoord, this.zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock), MultiblockType.NODE_MANIPULATOR); break; case E_PORTAL_CREATOR: - setMultiblockStructurePresent(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeEldritchPortalCreator) && checkEldritchEyes(false), MultiblockType.E_PORTAL_CREATOR); + this.setMultiblockStructurePresent(MultiblockHelper.isMultiblockPresent(this.worldObj, this.xCoord, this.yCoord, this.zCoord, RegisteredMultiblocks.completeEldritchPortalCreator) && this.checkEldritchEyes(false), MultiblockType.E_PORTAL_CREATOR); break; } } else { //If we weren't in multiblock eventhough it would be possible. - checkForNonExistingMultiblock(); + this.checkForNonExistingMultiblock(); } } else { //If there was no multiblock formed before.. - checkForNonExistingMultiblock(); + this.checkForNonExistingMultiblock(); } - return isMultiblockStructurePresent(); + return this.isMultiblockStructurePresent(); } private void setMultiblockStructurePresent(boolean present, MultiblockType type) { @@ -544,11 +540,11 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont patternMap.put(RegisteredMultiblocks.incompleteNodeManipulatorMultiblock, MultiblockType.NODE_MANIPULATOR); for(MultiblockHelper.MultiblockPattern pattern : patternMap.keySet()) { - if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, pattern)) { + if(MultiblockHelper.isMultiblockPresent(this.worldObj, this.xCoord, this.yCoord, this.zCoord, pattern)) { if(pattern == RegisteredMultiblocks.incompleteEldritchPortalCreator) { - if(!checkEldritchEyes(false)) return; + if(!this.checkEldritchEyes(false)) return; } - setMultiblockStructurePresent(true, patternMap.get(pattern)); + this.setMultiblockStructurePresent(true, patternMap.get(pattern)); return; } } @@ -556,16 +552,16 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont @Override public boolean canInsertItem(int par1, ItemStack par2ItemStack, int par3) { - return isInMultiblock() && super.canInsertItem(par1, par2ItemStack, par3); + return this.isInMultiblock() && super.canInsertItem(par1, par2ItemStack, par3); } public NetworkRegistry.TargetPoint getTargetPoint(double radius) { - return new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, radius); + return new NetworkRegistry.TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, radius); } @Override public AspectList getAspects() { - return workAspectList; + return this.workAspectList; } @Override @@ -622,7 +618,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont @Override public void onWandStoppedUsing(ItemStack stack, World world, EntityPlayer player, int i) {} - public static enum MultiblockType { + public enum MultiblockType { NODE_MANIPULATOR(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", RegisteredRecipes.costsNodeManipulatorMultiblock), E_PORTAL_CREATOR(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", RegisteredRecipes.costsEldritchPortalCreatorMultiblock); @@ -630,17 +626,17 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont private String research; private AspectList costs; - private MultiblockType(String research, AspectList costs) { + MultiblockType(String research, AspectList costs) { this.research = research; this.costs = costs; } public String getResearchNeeded() { - return research; + return this.research; } public AspectList getMultiblockCosts() { - return costs; + return this.costs; } } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java index 4b179be..52fa5a5 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java @@ -34,12 +34,12 @@ public class TileOverrideEldritchLock extends TileEldritchLock { int count = Entity.nextEntityID - nextEntityId; Entity[] bosses = new Entity[count]; for(int i = 0; i < count; i++) { - bosses[i] = worldObj.getEntityByID(nextEntityId + i); + bosses[i] = this.worldObj.getEntityByID(nextEntityId + i); } MazeHandler.labyrinth = old; for(TCMazeSession session : TCMazeHandler.getSessions().values()) { - if(session.chunksAffected != null && session.chunksAffected.containsKey(new CellLoc(xCoord >> 4, zCoord >> 4))) { + if(session.chunksAffected != null && session.chunksAffected.containsKey(new CellLoc(this.xCoord >> 4, this.zCoord >> 4))) { TCMazeHandler.putBosses(session, bosses); break; } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java index 85c1002..f9f044e 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java @@ -5,13 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import thaumcraft.common.tiles.TileJarFillable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; /** * This class is part of the Gadomancy Mod @@ -22,72 +16,72 @@ import java.util.UUID; * Created by makeo @ 14.10.2015 15:06 */ public class TileRemoteJar extends TileJarFillable { - public UUID networkId = null; + public UUID networkId; - private int count = 0; + private int count; - private boolean registered_to_network = false; + private boolean registered_to_network; @Override public void updateEntity() { super.updateEntity(); - if (count % 3 == 0 && !getWorldObj().isRemote && networkId != null && (!registered_to_network || amount < maxAmount)) { - count = 0; + if (this.count % 3 == 0 && !this.getWorldObj().isRemote && this.networkId != null && (!this.registered_to_network || this.amount < this.maxAmount)) { + this.count = 0; - JarNetwork network = getNetwork(networkId); + JarNetwork network = TileRemoteJar.getNetwork(this.networkId); - registered_to_network = true; + this.registered_to_network = true; if(!network.jars.contains(this)) { - network.jars.add((TileJarFillable) worldObj.getTileEntity(xCoord, yCoord, zCoord)); + network.jars.add((TileJarFillable) this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord)); } network.update(); } - count++; + this.count++; } @Override public void readCustomNBT(NBTTagCompound compound) { super.readCustomNBT(compound); - networkId = NBTHelper.getUUID(compound, "networkId"); + this.networkId = NBTHelper.getUUID(compound, "networkId"); } @Override public void writeCustomNBT(NBTTagCompound compound) { super.writeCustomNBT(compound); - if(networkId != null) { - NBTHelper.setUUID(compound, "networkId", networkId); + if(this.networkId != null) { + NBTHelper.setUUID(compound, "networkId", this.networkId); } } private static Map networks = new HashMap(); private static class JarNetwork { - private long lastTime = 0; + private long lastTime; private List jars = new ArrayList(); private void update() { long time = MinecraftServer.getServer().getEntityWorld().getTotalWorldTime(); - if(time > lastTime) { - if(jars.size() > 1) { - Collections.sort(jars, new Comparator() { + if(time > this.lastTime) { + if(this.jars.size() > 1) { + Collections.sort(this.jars, new Comparator() { @Override public int compare(TileJarFillable o1, TileJarFillable o2) { return o2.amount - o1.amount; } }); - TileJarFillable jar1 = jars.get(0); - if(!isValid(jar1)) { - jars.remove(0); + TileJarFillable jar1 = this.jars.get(0); + if(!JarNetwork.isValid(jar1)) { + this.jars.remove(0); return; } - TileJarFillable jar2 = jars.get(jars.size() - 1); - if(!isValid(jar2)) { - jars.remove(jars.size() - 1); + TileJarFillable jar2 = this.jars.get(this.jars.size() - 1); + if(!JarNetwork.isValid(jar2)) { + this.jars.remove(this.jars.size() - 1); return; } @@ -95,7 +89,7 @@ public class TileRemoteJar extends TileJarFillable { jar1.takeFromContainer(jar1.aspect, 1); } } - lastTime = time + 3; + this.lastTime = time + 3; } } @@ -106,17 +100,17 @@ public class TileRemoteJar extends TileJarFillable { } private static JarNetwork getNetwork(UUID id) { - JarNetwork network = networks.get(id); + JarNetwork network = TileRemoteJar.networks.get(id); if(network == null) { network = new JarNetwork(); - networks.put(id, network); + TileRemoteJar.networks.put(id, network); } return network; } public void markForUpdate() { - markDirty(); - getWorldObj().markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java index f4670bc..6a3d5e3 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java @@ -31,7 +31,7 @@ public class TileStickyJar extends TileJarFillable { private Block parentBlock; private Integer parentMetadata = 0; - private TileJarFillable parent = null; + private TileJarFillable parent; public ForgeDirection placedOn; @@ -39,42 +39,42 @@ public class TileStickyJar extends TileJarFillable { private Field fieldCount; public TileStickyJar() { - injector = new Injector(null, TileJarFillable.class); - fieldCount = Injector.getField("count", TileJarFillable.class); + this.injector = new Injector(null, TileJarFillable.class); + this.fieldCount = Injector.getField("count", TileJarFillable.class); } public Block getParentBlock() { - return parentBlock; + return this.parentBlock; } public TileJarFillable getParent() { - return parent; + return this.parent; } public boolean isValid() { - return parentBlock != null && parent != null; + return this.parentBlock != null && this.parent != null; } - private boolean needsRenderUpdate = false; + private boolean needsRenderUpdate; public void init(TileJarFillable parent, Block parentBlock, int parentMetadata, ForgeDirection placedOn) { this.parent = parent; this.placedOn = placedOn; - parent.xCoord = xCoord; - parent.yCoord = yCoord; - parent.zCoord = zCoord; + parent.xCoord = this.xCoord; + parent.yCoord = this.yCoord; + parent.zCoord = this.zCoord; - syncFromParent(); + this.syncFromParent(); - this.parent.setWorldObj(getWorldObj()); + this.parent.setWorldObj(this.getWorldObj()); this.parentBlock = parentBlock; this.parentMetadata = parentMetadata; this.injector.setObject(this.parent); - markDirty(); - needsRenderUpdate = true; + this.markDirty(); + this.needsRenderUpdate = true; } private void sync(TileJarFillable from, TileJarFillable to) { @@ -88,60 +88,60 @@ public class TileStickyJar extends TileJarFillable { } public void syncToParent() { - sync(this, parent); + this.sync(this, this.parent); } public void syncFromParent() { - sync(parent, this); + this.sync(this.parent, this); } public Integer getParentMetadata() { - return parentMetadata; + return this.parentMetadata; } private int count; @Override public void updateEntity() { - if(!isValid()) { - if(!getWorldObj().isRemote) { - getWorldObj().setBlock(this.xCoord, this.yCoord, this.zCoord, Blocks.air); + if(!this.isValid()) { + if(!this.getWorldObj().isRemote) { + this.getWorldObj().setBlock(this.xCoord, this.yCoord, this.zCoord, Blocks.air); } return; } - if(getWorldObj().isRemote && needsRenderUpdate) { - needsRenderUpdate = false; - Minecraft.getMinecraft().renderGlobal.markBlockForUpdate(xCoord, yCoord, zCoord); + if(this.getWorldObj().isRemote && this.needsRenderUpdate) { + this.needsRenderUpdate = false; + Minecraft.getMinecraft().renderGlobal.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } - syncToParent(); + this.syncToParent(); boolean canTakeEssentia = this.amount < this.maxAmount; - if(parent instanceof TileJarFillableVoid) canTakeEssentia = true; + if(this.parent instanceof TileJarFillableVoid) canTakeEssentia = true; if ((!this.worldObj.isRemote) && (++this.count % 5 == 0) && canTakeEssentia) { - fillJar(); + this.fillJar(); } - injector.setField(fieldCount, 1); + this.injector.setField(this.fieldCount, 1); - parent.updateEntity(); + this.parent.updateEntity(); - syncFromParent(); + this.syncFromParent(); } @Override public void setWorldObj(World world) { super.setWorldObj(world); - if(parent != null) - parent.setWorldObj(worldObj); + if(this.parent != null) + this.parent.setWorldObj(this.worldObj); } private void fillJar() { - ForgeDirection inputDir = placedOn.getOpposite(); + ForgeDirection inputDir = this.placedOn.getOpposite(); - TileEntity te = ThaumcraftApiHelper.getConnectableTile(parent.getWorldObj(), parent.xCoord, parent.yCoord, parent.zCoord, inputDir); + TileEntity te = ThaumcraftApiHelper.getConnectableTile(this.parent.getWorldObj(), this.parent.xCoord, this.parent.yCoord, this.parent.zCoord, inputDir); if (te != null) { IEssentiaTransport ic = (IEssentiaTransport)te; @@ -149,16 +149,16 @@ public class TileStickyJar extends TileJarFillable { return; } Aspect ta = null; - if (parent.aspectFilter != null) { - ta = parent.aspectFilter; - } else if ((parent.aspect != null) && (parent.amount > 0)) { - ta = parent.aspect; + if (this.parent.aspectFilter != null) { + ta = this.parent.aspectFilter; + } else if ((this.parent.aspect != null) && (this.parent.amount > 0)) { + ta = this.parent.aspect; } else if ((ic.getEssentiaAmount(inputDir.getOpposite()) > 0) && - (ic.getSuctionAmount(inputDir.getOpposite()) < getSuctionAmount(ForgeDirection.UP)) && (getSuctionAmount(ForgeDirection.UP) >= ic.getMinimumSuction())) { + (ic.getSuctionAmount(inputDir.getOpposite()) < this.getSuctionAmount(ForgeDirection.UP)) && (this.getSuctionAmount(ForgeDirection.UP) >= ic.getMinimumSuction())) { ta = ic.getEssentiaType(inputDir.getOpposite()); } - if ((ta != null) && (ic.getSuctionAmount(inputDir.getOpposite()) < getSuctionAmount(ForgeDirection.UP))) { - addToContainer(ta, ic.takeEssentia(ta, 1, inputDir.getOpposite())); + if ((ta != null) && (ic.getSuctionAmount(inputDir.getOpposite()) < this.getSuctionAmount(ForgeDirection.UP))) { + this.addToContainer(ta, ic.takeEssentia(ta, 1, inputDir.getOpposite())); } } } @@ -171,42 +171,42 @@ public class TileStickyJar extends TileJarFillable { if(block != null && compound.hasKey("parent") && compound.hasKey("parentMetadata")) { NBTTagCompound data = compound.getCompoundTag("parent"); int metadata = compound.getInteger("parentMetadata"); - TileEntity tile = block.createTileEntity(getWorldObj(), metadata); + TileEntity tile = block.createTileEntity(this.getWorldObj(), metadata); if(tile instanceof TileJarFillable) { - placedOn = ForgeDirection.getOrientation(compound.getInteger("placedOn")); + this.placedOn = ForgeDirection.getOrientation(compound.getInteger("placedOn")); tile.readFromNBT(data); - init((TileJarFillable) tile, block, metadata, placedOn); + this.init((TileJarFillable) tile, block, metadata, this.placedOn); } } } - if(!isValid() && !getWorldObj().isRemote) { - getWorldObj().setBlockToAir(xCoord, yCoord, zCoord); + if(!this.isValid() && !this.getWorldObj().isRemote) { + this.getWorldObj().setBlockToAir(this.xCoord, this.yCoord, this.zCoord); } } @Override public void writeCustomNBT(NBTTagCompound compound) { - if(isValid()) { - compound.setString("parentType", GameData.getBlockRegistry().getNameForObject(parentBlock)); - compound.setInteger("parentMetadata", parentMetadata); + if(this.isValid()) { + compound.setString("parentType", GameData.getBlockRegistry().getNameForObject(this.parentBlock)); + compound.setInteger("parentMetadata", this.parentMetadata); - syncToParent(); + this.syncToParent(); NBTTagCompound data = new NBTTagCompound(); - parent.writeToNBT(data); + this.parent.writeToNBT(data); compound.setTag("parent", data); - compound.setInteger("placedOn", placedOn.ordinal()); + compound.setInteger("placedOn", this.placedOn.ordinal()); } } @Override public AspectList getAspects() { - if(isValid()) { - syncToParent(); - AspectList result = parent.getAspects(); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + AspectList result = this.parent.getAspects(); + this.syncFromParent(); return result; } return new AspectList(); @@ -214,19 +214,19 @@ public class TileStickyJar extends TileJarFillable { @Override public void setAspects(AspectList paramAspectList) { - if(isValid()) { - syncToParent(); - parent.getAspects(); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + this.parent.getAspects(); + this.syncFromParent(); } } @Override public boolean doesContainerAccept(Aspect paramAspect) { - if(isValid()) { - syncToParent(); - boolean result = parent.doesContainerAccept(paramAspect); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.doesContainerAccept(paramAspect); + this.syncFromParent(); return result; } return false; @@ -234,10 +234,10 @@ public class TileStickyJar extends TileJarFillable { @Override public int addToContainer(Aspect paramAspect, int paramInt) { - if(isValid()) { - syncToParent(); - int result = parent.addToContainer(paramAspect, paramInt); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + int result = this.parent.addToContainer(paramAspect, paramInt); + this.syncFromParent(); return result; } return paramInt; @@ -245,10 +245,10 @@ public class TileStickyJar extends TileJarFillable { @Override public boolean takeFromContainer(Aspect paramAspect, int paramInt) { - if(isValid()) { - syncToParent(); - boolean result = parent.takeFromContainer(paramAspect, paramInt); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.takeFromContainer(paramAspect, paramInt); + this.syncFromParent(); return result; } return false; @@ -256,10 +256,10 @@ public class TileStickyJar extends TileJarFillable { @Override public boolean takeFromContainer(AspectList paramAspectList) { - if(isValid()) { - syncToParent(); - boolean result = parent.takeFromContainer(paramAspectList); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.takeFromContainer(paramAspectList); + this.syncFromParent(); return result; } return false; @@ -267,10 +267,10 @@ public class TileStickyJar extends TileJarFillable { @Override public boolean doesContainerContainAmount(Aspect paramAspect, int paramInt) { - if(isValid()) { - syncToParent(); - boolean result = parent.doesContainerContainAmount(paramAspect, paramInt); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.doesContainerContainAmount(paramAspect, paramInt); + this.syncFromParent(); return result; } return false; @@ -278,10 +278,10 @@ public class TileStickyJar extends TileJarFillable { @Override public boolean doesContainerContain(AspectList paramAspectList) { - if(isValid()) { - syncToParent(); - boolean result = parent.doesContainerContain(paramAspectList); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.doesContainerContain(paramAspectList); + this.syncFromParent(); return result; } return false; @@ -289,10 +289,10 @@ public class TileStickyJar extends TileJarFillable { @Override public int containerContains(Aspect paramAspect) { - if(isValid()) { - syncToParent(); - int result = parent.containerContains(paramAspect); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + int result = this.parent.containerContains(paramAspect); + this.syncFromParent(); return result; } return 0; @@ -300,19 +300,19 @@ public class TileStickyJar extends TileJarFillable { @Override public boolean isConnectable(ForgeDirection face) { - if(isValid()) { - syncToParent(); - return parent.isConnectable(changeDirection(face)); + if(this.isValid()) { + this.syncToParent(); + return this.parent.isConnectable(this.changeDirection(face)); } return false; } @Override public boolean canInputFrom(ForgeDirection face) { - if(isValid()) { - syncToParent(); - boolean result = parent.canInputFrom(changeDirection(face)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.canInputFrom(this.changeDirection(face)); + this.syncFromParent(); return result; } return false; @@ -320,24 +320,24 @@ public class TileStickyJar extends TileJarFillable { @Override public boolean canOutputTo(ForgeDirection face) { - if(isValid()) { - syncToParent(); - boolean result = parent.canOutputTo(changeDirection(face)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.canOutputTo(this.changeDirection(face)); + this.syncFromParent(); return result; } return false; } public ForgeDirection changeDirection(ForgeDirection face) { - if(placedOn == ForgeDirection.UP) { + if(this.placedOn == ForgeDirection.UP) { if(face == ForgeDirection.UP || face == ForgeDirection.DOWN) { return face.getOpposite(); } return face; } - if(placedOn == ForgeDirection.DOWN) { + if(this.placedOn == ForgeDirection.DOWN) { return face; } @@ -348,15 +348,15 @@ public class TileStickyJar extends TileJarFillable { if(face == ForgeDirection.DOWN) { return ForgeDirection.SOUTH; } - if(face == placedOn) { + if(face == this.placedOn) { return ForgeDirection.DOWN; } - if(face == placedOn.getOpposite()) { + if(face == this.placedOn.getOpposite()) { return ForgeDirection.UP; } - switch (placedOn) { + switch (this.placedOn) { case EAST: return face == ForgeDirection.NORTH ? ForgeDirection.WEST : ForgeDirection.EAST; case SOUTH: return face.getOpposite(); case WEST: return face == ForgeDirection.SOUTH ? ForgeDirection.WEST : ForgeDirection.EAST; @@ -369,19 +369,19 @@ public class TileStickyJar extends TileJarFillable { @Override public void setSuction(Aspect paramAspect, int paramInt) { - if(isValid()) { - syncToParent(); - parent.setSuction(paramAspect, paramInt); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + this.parent.setSuction(paramAspect, paramInt); + this.syncFromParent(); } } @Override public Aspect getSuctionType(ForgeDirection paramForgeDirection) { - if(isValid()) { - syncToParent(); - Aspect result = parent.getSuctionType(changeDirection(paramForgeDirection)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + Aspect result = this.parent.getSuctionType(this.changeDirection(paramForgeDirection)); + this.syncFromParent(); return result; } return null; @@ -389,10 +389,10 @@ public class TileStickyJar extends TileJarFillable { @Override public int getSuctionAmount(ForgeDirection paramForgeDirection) { - if(isValid()) { - syncToParent(); - int result = parent.getSuctionAmount(changeDirection(paramForgeDirection)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + int result = this.parent.getSuctionAmount(this.changeDirection(paramForgeDirection)); + this.syncFromParent(); return result; } return 0; @@ -400,10 +400,10 @@ public class TileStickyJar extends TileJarFillable { @Override public int takeEssentia(Aspect paramAspect, int paramInt, ForgeDirection paramForgeDirection) { - if(isValid()) { - syncToParent(); - int result = parent.takeEssentia(paramAspect, paramInt, changeDirection(paramForgeDirection)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + int result = this.parent.takeEssentia(paramAspect, paramInt, this.changeDirection(paramForgeDirection)); + this.syncFromParent(); return result; } return paramInt; @@ -411,10 +411,10 @@ public class TileStickyJar extends TileJarFillable { @Override public int addEssentia(Aspect paramAspect, int paramInt, ForgeDirection paramForgeDirection) { - if(isValid()) { - syncToParent(); - int result = parent.addEssentia(paramAspect, paramInt, changeDirection(paramForgeDirection)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + int result = this.parent.addEssentia(paramAspect, paramInt, this.changeDirection(paramForgeDirection)); + this.syncFromParent(); return result; } return paramInt; @@ -422,10 +422,10 @@ public class TileStickyJar extends TileJarFillable { @Override public Aspect getEssentiaType(ForgeDirection paramForgeDirection) { - if(isValid()) { - syncToParent(); - Aspect result = parent.getEssentiaType(changeDirection(paramForgeDirection)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + Aspect result = this.parent.getEssentiaType(this.changeDirection(paramForgeDirection)); + this.syncFromParent(); return result; } return null; @@ -433,10 +433,10 @@ public class TileStickyJar extends TileJarFillable { @Override public int getEssentiaAmount(ForgeDirection paramForgeDirection) { - if(isValid()) { - syncToParent(); - int result = parent.getEssentiaAmount(changeDirection(paramForgeDirection)); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + int result = this.parent.getEssentiaAmount(this.changeDirection(paramForgeDirection)); + this.syncFromParent(); return result; } return 0; @@ -444,10 +444,10 @@ public class TileStickyJar extends TileJarFillable { @Override public int getMinimumSuction() { - if(isValid()) { - syncToParent(); - int result = parent.getMinimumSuction(); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + int result = this.parent.getMinimumSuction(); + this.syncFromParent(); return result; } return 0; @@ -455,10 +455,10 @@ public class TileStickyJar extends TileJarFillable { @Override public boolean renderExtendedTube() { - if(isValid()) { - syncToParent(); - boolean result = parent.renderExtendedTube(); - syncFromParent(); + if(this.isValid()) { + this.syncToParent(); + boolean result = this.parent.renderExtendedTube(); + this.syncFromParent(); return result; } return false; diff --git a/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java b/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java index 7714fbe..4e637ea 100644 --- a/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java +++ b/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java @@ -27,25 +27,25 @@ public class ContainerArcanePackager extends Container { for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - addSlotToContainer(new Slot(packagerInv, j + i * 3, 16 + 18 * j, 42 + i * 23)); + this.addSlotToContainer(new Slot(packagerInv, j + i * 3, 16 + 18 * j, 42 + i * 23)); } } - addSlotToContainer(new FilteredSlot(packagerInv, 9, 95, 33)); - addSlotToContainer(new FilteredSlot(packagerInv, 10, 113, 33)); - addSlotToContainer(new FilteredSlot(packagerInv, 11, 160, 64)); + this.addSlotToContainer(new FilteredSlot(packagerInv, 9, 95, 33)); + this.addSlotToContainer(new FilteredSlot(packagerInv, 10, 113, 33)); + this.addSlotToContainer(new FilteredSlot(packagerInv, 11, 160, 64)); - bindPlayerInventory(); + this.bindPlayerInventory(); } protected void bindPlayerInventory() { for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(this.playerInv, j + i * 9 + 9, 16 + j * 18, 151 + i * 18)); + this.addSlotToContainer(new Slot(this.playerInv, j + i * 9 + 9, 16 + j * 18, 151 + i * 18)); } } for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(this.playerInv, i, 16 + i * 18, 209)); + this.addSlotToContainer(new Slot(this.playerInv, i, 16 + i * 18, 209)); } } @@ -58,14 +58,14 @@ public class ContainerArcanePackager extends Container { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - int size = packagerInv.getSizeInventory(); + int size = this.packagerInv.getSizeInventory(); if (slotIndex < size) { if (!this.mergeItemStack(itemstack1, size, this.inventorySlots.size(), true)) { return null; } } else { int specialSlot = itemstack1.getItem() == Items.leather ? 9 : itemstack1.getItem() == Items.string ? 10 : -1; - if(specialSlot != -1 && (packagerInv.getStackInSlot(specialSlot) == null || packagerInv.getStackInSlot(specialSlot).stackSize < 64)) { + if(specialSlot != -1 && (this.packagerInv.getStackInSlot(specialSlot) == null || this.packagerInv.getStackInSlot(specialSlot).stackSize < 64)) { this.mergeItemStack(itemstack1, specialSlot, specialSlot + 1, false); if(itemstack1.stackSize == 0) { @@ -90,7 +90,7 @@ public class ContainerArcanePackager extends Container { @Override public boolean enchantItem(EntityPlayer player, int id) { - TileArcanePackager tile = (TileArcanePackager) packagerInv; + TileArcanePackager tile = (TileArcanePackager) this.packagerInv; switch (id) { case 0: diff --git a/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java b/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java index 5e7cd39..449ce81 100644 --- a/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java @@ -24,24 +24,24 @@ public class ContainerInfusionClaw extends Container { this.playerInv = playerInv; this.clawInv = clawInv; - addSlotToContainer(new FilteredSlot(clawInv, 0, 80, 32)); - bindPlayerInventory(); + this.addSlotToContainer(new FilteredSlot(clawInv, 0, 80, 32)); + this.bindPlayerInventory(); } protected void bindPlayerInventory() { for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(this.playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + this.addSlotToContainer(new Slot(this.playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); } } for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(this.playerInv, i, 8 + i * 18, 142)); + this.addSlotToContainer(new Slot(this.playerInv, i, 8 + i * 18, 142)); } } @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { - if(((TileInfusionClaw)clawInv).isRunning()) { + if(((TileInfusionClaw) this.clawInv).isRunning()) { return null; } @@ -57,7 +57,7 @@ public class ContainerInfusionClaw extends Container { return null; } } else { - if(!((Slot)inventorySlots.get(0)).isItemValid(itemstack1)) { + if(!((Slot) this.inventorySlots.get(0)).isItemValid(itemstack1)) { return null; } @@ -77,7 +77,7 @@ public class ContainerInfusionClaw extends Container { @Override public boolean enchantItem(EntityPlayer player, int value) { - ((TileInfusionClaw)clawInv).setIsLocked(value == 1); + ((TileInfusionClaw) this.clawInv).setIsLocked(value == 1); return false; } @@ -103,6 +103,6 @@ public class ContainerInfusionClaw extends Container { @Override public boolean canInteractWith(EntityPlayer player) { - return clawInv.isUseableByPlayer(player); + return this.clawInv.isUseableByPlayer(player); } } diff --git a/src/main/java/makeo/gadomancy/common/containers/FilteredSlot.java b/src/main/java/makeo/gadomancy/common/containers/FilteredSlot.java index c2786c2..40bc716 100644 --- a/src/main/java/makeo/gadomancy/common/containers/FilteredSlot.java +++ b/src/main/java/makeo/gadomancy/common/containers/FilteredSlot.java @@ -19,6 +19,6 @@ public class FilteredSlot extends Slot { @Override public boolean isItemValid(ItemStack stack) { - return inventory.isItemValidForSlot(slotNumber, stack); + return this.inventory.isItemValidForSlot(this.slotNumber, stack); } } diff --git a/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java b/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java index efb9ca6..82c490f 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java +++ b/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java @@ -45,12 +45,12 @@ public class DeprecationItemPaybacks { int auram = 44; int magic = 51; int other = 37; - ItemStack phials = getPhialStack(Aspect.AURA, auram); + ItemStack phials = DeprecationItemPaybacks.getPhialStack(Aspect.AURA, auram); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.MAGIC, magic); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.MAGIC, magic); if(phials != null) reward.add(phials); if(aspect != null) { - phials = getPhialStack(aspect, other); + phials = DeprecationItemPaybacks.getPhialStack(aspect, other); if(phials != null) reward.add(phials); } @@ -84,14 +84,14 @@ public class DeprecationItemPaybacks { int magic = 101; int permutatio = 54; int other = 81; - ItemStack phials = getPhialStack(Aspect.AURA, auram); + ItemStack phials = DeprecationItemPaybacks.getPhialStack(Aspect.AURA, auram); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.EXCHANGE, permutatio); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.EXCHANGE, permutatio); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.MAGIC, magic); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.MAGIC, magic); if(phials != null) reward.add(phials); if(aspect != null) { - phials = getPhialStack(aspect, other); + phials = DeprecationItemPaybacks.getPhialStack(aspect, other); if(phials != null) reward.add(phials); } @@ -124,14 +124,14 @@ public class DeprecationItemPaybacks { int magic = 93; int telum = 49; int other = 104; - ItemStack phials = getPhialStack(Aspect.AURA, auram); + ItemStack phials = DeprecationItemPaybacks.getPhialStack(Aspect.AURA, auram); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.WEAPON, telum); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.WEAPON, telum); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.MAGIC, magic); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.MAGIC, magic); if(phials != null) reward.add(phials); if(aspect != null) { - phials = getPhialStack(aspect, other); + phials = DeprecationItemPaybacks.getPhialStack(aspect, other); if(phials != null) reward.add(phials); } @@ -163,14 +163,14 @@ public class DeprecationItemPaybacks { int magic = 71; int other = 59; int eldritch = 37; - ItemStack phials = getPhialStack(Aspect.AURA, auram); + ItemStack phials = DeprecationItemPaybacks.getPhialStack(Aspect.AURA, auram); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.ELDRITCH, eldritch); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.ELDRITCH, eldritch); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.MAGIC, magic); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.MAGIC, magic); if(phials != null) reward.add(phials); if(aspect != null) { - phials = getPhialStack(aspect, other); + phials = DeprecationItemPaybacks.getPhialStack(aspect, other); if(phials != null) reward.add(phials); } ItemStack craftingPackage = new ItemStack(RegisteredItems.itemPackage, 1, 1); @@ -198,12 +198,12 @@ public class DeprecationItemPaybacks { int auram = 37; int magic = 53; int other = 35; - ItemStack phials = getPhialStack(Aspect.AURA, auram); + ItemStack phials = DeprecationItemPaybacks.getPhialStack(Aspect.AURA, auram); if(phials != null) reward.add(phials); - phials = getPhialStack(Aspect.MAGIC, magic); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.MAGIC, magic); if(phials != null) reward.add(phials); if(aspect != null) { - phials = getPhialStack(aspect, other); + phials = DeprecationItemPaybacks.getPhialStack(aspect, other); if(phials != null) reward.add(phials); } ItemStack craftingPackage = new ItemStack(RegisteredItems.itemPackage, 1, 1); @@ -234,12 +234,12 @@ public class DeprecationItemPaybacks { int auram = 34; int magic = 51; int otherAspect = 46; - ItemStack phials = getPhialStack(Aspect.AURA, auram); + ItemStack phials = DeprecationItemPaybacks.getPhialStack(Aspect.AURA, auram); if(phials != null) rewardCrafting.add(phials); - phials = getPhialStack(Aspect.MAGIC, magic); + phials = DeprecationItemPaybacks.getPhialStack(Aspect.MAGIC, magic); if(phials != null) rewardCrafting.add(phials); if(aspect != null) { - phials = getPhialStack(aspect, otherAspect); + phials = DeprecationItemPaybacks.getPhialStack(aspect, otherAspect); if(phials != null) rewardCrafting.add(phials); } ItemStack craftingPackage = new ItemStack(RegisteredItems.itemPackage, 1, 1); @@ -249,7 +249,7 @@ public class DeprecationItemPaybacks { private static ItemStack getPhialStack(Aspect aspect, int aspectAmount) { ItemEssence phial = (ItemEssence) ConfigItems.itemEssence; - ItemStack phialStack = new ItemStack(phial, getPhialAmount(aspectAmount), 1); + ItemStack phialStack = new ItemStack(phial, DeprecationItemPaybacks.getPhialAmount(aspectAmount), 1); if(phialStack.stackSize > 0) { phial.setAspects(phialStack, new AspectList().add(aspect, 8)); return phialStack; diff --git a/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java b/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java index 8d1be98..ed30dba 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java +++ b/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java @@ -31,7 +31,7 @@ public class EtherealFamiliarUpgradeRecipe extends InfusionRecipe { @Override public boolean matches(ArrayList input, ItemStack in, World world, EntityPlayer player) { if(in == null || !(in.getItem() instanceof ItemEtherealFamiliar)) return false; //We call it "FamiliarAugment" Recipe for a reason.. - if(getRecipeInput() == null || !(getRecipeInput().getItem() instanceof ItemEtherealFamiliar)) return false; //A bit late but still working.. + if(this.getRecipeInput() == null || !(this.getRecipeInput().getItem() instanceof ItemEtherealFamiliar)) return false; //A bit late but still working.. if((this.research.length() > 0) && (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), this.research))) { return false; @@ -40,14 +40,14 @@ public class EtherealFamiliarUpgradeRecipe extends InfusionRecipe { FamiliarAugment.FamiliarAugmentList list = ItemEtherealFamiliar.getAugments(in); int level; - if(list.contains(toAdd)) { - level = list.getLevel(toAdd); + if(list.contains(this.toAdd)) { + level = list.getLevel(this.toAdd); } else { level = 0; } - if(requiredPreviousLevel > level) return false; //Requires higher level to do this infusion. + if(this.requiredPreviousLevel > level) return false; //Requires higher level to do this infusion. - if(!toAdd.checkConditions(list, level + 1)) { + if(!this.toAdd.checkConditions(list, level + 1)) { return false; //Preconditions not met. } @@ -58,14 +58,14 @@ public class EtherealFamiliarUpgradeRecipe extends InfusionRecipe { for (ItemStack is : input) { ii.add(is.copy()); } - for (ItemStack comp : getComponents()) { + for (ItemStack comp : this.getComponents()) { boolean b = false; for (int a = 0; a < ii.size(); a++) { inCopy = ii.get(a).copy(); if (comp.getItemDamage() == 32767) { inCopy.setItemDamage(32767); } - if (areItemStacksEqual(inCopy, comp, true)) { + if (InfusionRecipe.areItemStacksEqual(inCopy, comp, true)) { ii.remove(a); b = true; break; @@ -81,7 +81,7 @@ public class EtherealFamiliarUpgradeRecipe extends InfusionRecipe { @Override public Object getRecipeOutput(ItemStack in) { ItemStack inputCopy = in.copy(); - ItemEtherealFamiliar.incrementAugmentLevel(inputCopy, toAdd); + ItemEtherealFamiliar.incrementAugmentLevel(inputCopy, this.toAdd); return inputCopy; } } diff --git a/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java b/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java index a580ff2..26ea9c8 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java +++ b/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java @@ -23,7 +23,7 @@ public class FamiliarUndoRecipe extends ShapelessRecipes { public FamiliarUndoRecipe() { super(new ItemStack(RegisteredItems.itemPackage, 1, 2).setStackDisplayName(EnumChatFormatting.GOLD + "Used Familiar Items"), new ArrayList() { { - add(new ItemStack(RegisteredItems.itemFamiliar_old)); + this.add(new ItemStack(RegisteredItems.itemFamiliar_old)); } }); } diff --git a/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java b/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java index fc71375..3c28f68 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java +++ b/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java @@ -30,27 +30,27 @@ public class Familiar_Old_AugmentInfusion extends InfusionRecipe { @Override public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { if(central == null || !(central.getItem() instanceof ItemFamiliar_Old)) return false; //We call it "FamiliarAugment" Recipe for a reason.. - if(getRecipeInput() == null || !(getRecipeInput().getItem() instanceof ItemFamiliar_Old)) return false; //A bit late but still working.. + if(this.getRecipeInput() == null || !(this.getRecipeInput().getItem() instanceof ItemFamiliar_Old)) return false; //A bit late but still working.. if ((this.research.length() > 0) && (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), this.research))) { return false; } ItemStack centralCopy = central.copy(); - if(!((ItemFamiliar_Old) centralCopy.getItem()).hasUpgrade(centralCopy, getUpgradeToAdd().getNeededPreviousUpgrade())) return false; + if(!((ItemFamiliar_Old) centralCopy.getItem()).hasUpgrade(centralCopy, this.getUpgradeToAdd().getNeededPreviousUpgrade())) return false; ArrayList ii = new ArrayList(); for (ItemStack is : input) { ii.add(is.copy()); } - for (ItemStack comp : getComponents()) { + for (ItemStack comp : this.getComponents()) { boolean b = false; for (int a = 0; a < ii.size(); a++) { centralCopy = ii.get(a).copy(); if (comp.getItemDamage() == 32767) { centralCopy.setItemDamage(32767); } - if (areItemStacksEqual(centralCopy, comp, true)) { + if (InfusionRecipe.areItemStacksEqual(centralCopy, comp, true)) { ii.remove(a); b = true; break; @@ -66,11 +66,11 @@ public class Familiar_Old_AugmentInfusion extends InfusionRecipe { @Override public Object getRecipeOutput(ItemStack input) { ItemStack inputCopy = input.copy(); - ((ItemFamiliar_Old) input.getItem()).addUpgrade(inputCopy, getUpgradeToAdd()); + ((ItemFamiliar_Old) input.getItem()).addUpgrade(inputCopy, this.getUpgradeToAdd()); return inputCopy; } public ItemFamiliar_Old.FamiliarUpgrade getUpgradeToAdd() { - return upgradeToAdd; + return this.upgradeToAdd; } } diff --git a/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java b/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java index 04bfbd0..6506456 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java +++ b/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java @@ -16,7 +16,10 @@ import thaumcraft.common.config.ConfigItems; import thaumcraft.common.lib.crafting.InfusionRunicAugmentRecipe; import thaumcraft.common.lib.research.ResearchManager; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * This class is part of the Gadomancy Mod @@ -27,23 +30,23 @@ import java.util.*; * Created by makeo @ 25.12.2015 15:35 */ public class InfusionDisguiseArmor extends InfusionRunicAugmentRecipe { - public static final ItemStack[] COMPONENTS = new ItemStack[] {new ItemStack(Items.slime_ball), new ItemStack(ConfigItems.itemResource, 1, 3), new ItemStack(Items.slime_ball), new ItemStack(ConfigItems.itemResource, 1, 3)}; + public static final ItemStack[] COMPONENTS = {new ItemStack(Items.slime_ball), new ItemStack(ConfigItems.itemResource, 1, 3), new ItemStack(Items.slime_ball), new ItemStack(ConfigItems.itemResource, 1, 3)}; public static final AspectList ASPECTS = new AspectList().add(Aspect.SLIME, 12).add(Aspect.ARMOR, 10).add(Aspect.MAGIC, 8); private Map> cachedItems = new HashMap>(); @Override public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { - if(input.size() != COMPONENTS.length + 1 || !ResearchManager.isResearchComplete(player.getCommandSenderName(), SimpleResearchItem.getFullName("STICKYJAR"))) { + if(input.size() != InfusionDisguiseArmor.COMPONENTS.length + 1 || !ResearchManager.isResearchComplete(player.getCommandSenderName(), SimpleResearchItem.getFullName("STICKYJAR"))) { return false; } List copy = (List) input.clone(); List result = new ArrayList(copy.size()); - for(ItemStack required : COMPONENTS) { + for(ItemStack required : InfusionDisguiseArmor.COMPONENTS) { boolean contains = false; for(int i = 0; i < copy.size(); i++) { - if(areItemStacksEqual(required, copy.get(i), true)) { + if(InfusionRecipe.areItemStacksEqual(required, copy.get(i), true)) { contains = true; result.add(copy.get(i)); copy.remove(i); @@ -56,18 +59,18 @@ public class InfusionDisguiseArmor extends InfusionRunicAugmentRecipe { } ItemStack disguise = copy.get(0); - if(!isValidDisguise(central, disguise)) { + if(!this.isValidDisguise(central, disguise)) { return false; } result.add(0, disguise); - cachedItems.put(central, result); + this.cachedItems.put(central, result); return true; } @Override public ItemStack[] getComponents(ItemStack input) { - List components = cachedItems.get(input); + List components = this.cachedItems.get(input); if(components != null) { return components.toArray(new ItemStack[components.size()]); } @@ -76,8 +79,8 @@ public class InfusionDisguiseArmor extends InfusionRunicAugmentRecipe { @Override public AspectList getAspects(ItemStack input) { - cachedItems.remove(input); - return ASPECTS; + this.cachedItems.remove(input); + return InfusionDisguiseArmor.ASPECTS; } @Override @@ -87,9 +90,9 @@ public class InfusionDisguiseArmor extends InfusionRunicAugmentRecipe { @Override public Object getRecipeOutput(ItemStack input) { - List components = cachedItems.get(input); + List components = this.cachedItems.get(input); if(components != null) { - return disguiseStack(input, components.get(0)); + return InfusionDisguiseArmor.disguiseStack(input, components.get(0)); } return input; } @@ -106,12 +109,12 @@ public class InfusionDisguiseArmor extends InfusionRunicAugmentRecipe { } private boolean isValidDisguise(ItemStack armor, ItemStack disguise) { - if(isDisguised(armor) || isDisguised(disguise)) { + if(this.isDisguised(armor) || this.isDisguised(disguise)) { return false; } int armorPos = EntityLiving.getArmorPosition(armor); - return armorPos != 0 && (isInvisItem(disguise) || EntityLiving.getArmorPosition(disguise) == armorPos); + return armorPos != 0 && (this.isInvisItem(disguise) || EntityLiving.getArmorPosition(disguise) == armorPos); } private boolean isDisguised(ItemStack stack) { diff --git a/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java b/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java index d25fa03..b0720f3 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java +++ b/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java @@ -29,20 +29,20 @@ public class InfusionUpgradeRecipe extends InfusionRecipe { private final GolemUpgrade upgrade; private InfusionUpgradeRecipe(String research, GolemUpgrade upgrade, int inst, AspectList aspects2, ItemStack input, ItemStack[] recipe) { - super(research, DEFAULT_OUTPUT, inst, aspects2, input, recipe); + super(research, InfusionUpgradeRecipe.DEFAULT_OUTPUT, inst, aspects2, input, recipe); this.upgrade = upgrade; } @Override public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { - return super.matches(input, central, world, player) && !upgrade.hasUpgrade(central); + return super.matches(input, central, world, player) && !this.upgrade.hasUpgrade(central); } @Override public Object getRecipeOutput(ItemStack input) { ItemStack output = input.copy(); - upgrade.addUpgrade(output); + this.upgrade.addUpgrade(output); return output; } diff --git a/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java b/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java index 20bca02..06682c2 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java +++ b/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java @@ -15,7 +15,9 @@ import thaumcraft.api.internal.DummyInternalMethodHandler; import thaumcraft.api.internal.IInternalMethodHandler; import thaumcraft.common.lib.research.ResearchManager; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; /** * This class is part of the Gadomancy Mod @@ -27,7 +29,7 @@ import java.util.*; */ public class InfusionVisualDisguiseArmor extends InfusionRecipe { private static final IInternalMethodHandler FAKE_HANDLER = new FakeMethodHandler(); - private static final int[] POTION_METAS = new int[]{8206, 16398, 8270, 16462}; + private static final int[] POTION_METAS = {8206, 16398, 8270, 16462}; private static ItemStack[] armorItems; @@ -38,11 +40,11 @@ public class InfusionVisualDisguiseArmor extends InfusionRecipe { super("", new ItemStack(Blocks.cobblestone), 0, InfusionDisguiseArmor.ASPECTS, new ItemStack(Blocks.dirt), new ItemStack[0]); this.transparent = transparent; - components = new ItemStack[InfusionDisguiseArmor.COMPONENTS.length + 1]; - System.arraycopy(InfusionDisguiseArmor.COMPONENTS, 0, components, 1, InfusionDisguiseArmor.COMPONENTS.length); + this.components = new ItemStack[InfusionDisguiseArmor.COMPONENTS.length + 1]; + System.arraycopy(InfusionDisguiseArmor.COMPONENTS, 0, this.components, 1, InfusionDisguiseArmor.COMPONENTS.length); - if(armorItems == null && Gadomancy.proxy.getSide() == Side.CLIENT) { - findArmorItems(); + if(InfusionVisualDisguiseArmor.armorItems == null && Gadomancy.proxy.getSide() == Side.CLIENT) { + this.findArmorItems(); } } @@ -65,29 +67,29 @@ public class InfusionVisualDisguiseArmor extends InfusionRecipe { } } } - armorItems = items.toArray(new ItemStack[items.size()]); + InfusionVisualDisguiseArmor.armorItems = items.toArray(new ItemStack[items.size()]); } private boolean canSee(ItemStack stack) { - String research = getResearchKey(stack); + String research = InfusionVisualDisguiseArmor.getResearchKey(stack); return research == null || ResearchManager.isResearchComplete(Minecraft.getMinecraft().thePlayer.getCommandSenderName(), research); } public ItemStack getCurrentDisguise() { - if(transparent) { - return new ItemStack(Items.potionitem, 1, POTION_METAS[(int)((System.currentTimeMillis() / 1000) % POTION_METAS.length)]); + if(this.transparent) { + return new ItemStack(Items.potionitem, 1, InfusionVisualDisguiseArmor.POTION_METAS[(int)((System.currentTimeMillis() / 1000) % InfusionVisualDisguiseArmor.POTION_METAS.length)]); } Random random = new Random(System.currentTimeMillis() / 1000); - int first = getRecipeInput(random); - int firstPos = EntityLiving.getArmorPosition(armorItems[first]); + int first = this.getRecipeInput(random); + int firstPos = EntityLiving.getArmorPosition(InfusionVisualDisguiseArmor.armorItems[first]); int next; do { - next = random.nextInt(armorItems.length); + next = random.nextInt(InfusionVisualDisguiseArmor.armorItems.length); } - while (next == first || EntityLiving.getArmorPosition(armorItems[next]) != firstPos || !canSee(armorItems[next])); - return armorItems[next]; + while (next == first || EntityLiving.getArmorPosition(InfusionVisualDisguiseArmor.armorItems[next]) != firstPos || !this.canSee(InfusionVisualDisguiseArmor.armorItems[next])); + return InfusionVisualDisguiseArmor.armorItems[next]; } @Override @@ -96,14 +98,14 @@ public class InfusionVisualDisguiseArmor extends InfusionRecipe { if(Minecraft.getMinecraft().thePlayer == null) { return new ItemStack(Items.cookie); } - return armorItems[getRecipeInput(new Random(System.currentTimeMillis() / 1000))]; + return InfusionVisualDisguiseArmor.armorItems[this.getRecipeInput(new Random(System.currentTimeMillis() / 1000))]; } private int getRecipeInput(Random random) { int index; do { - index = random.nextInt(armorItems.length); - } while (!canSee(armorItems[index])); + index = random.nextInt(InfusionVisualDisguiseArmor.armorItems.length); + } while (!this.canSee(InfusionVisualDisguiseArmor.armorItems[index])); return index; } @@ -113,20 +115,20 @@ public class InfusionVisualDisguiseArmor extends InfusionRecipe { if(Minecraft.getMinecraft().thePlayer == null) { return new ItemStack(Items.cookie); } - return InfusionDisguiseArmor.disguiseStack(input, getCurrentDisguise()); + return InfusionDisguiseArmor.disguiseStack(input, this.getCurrentDisguise()); } @Override @SideOnly(Side.CLIENT) public ItemStack[] getComponents() { - components[0] = getCurrentDisguise(); - return components; + this.components[0] = this.getCurrentDisguise(); + return this.components; } @SideOnly(Side.CLIENT) private static String getResearchKey(ItemStack stack) { IInternalMethodHandler old = ThaumcraftApi.internalMethods; - ThaumcraftApi.internalMethods = FAKE_HANDLER; + ThaumcraftApi.internalMethods = InfusionVisualDisguiseArmor.FAKE_HANDLER; Object[] result = ThaumcraftApi.getCraftingRecipeKey(Minecraft.getMinecraft().thePlayer, stack); ThaumcraftApi.internalMethods = old; return result == null ? null : (String)result[0]; diff --git a/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java b/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java index b45f458..42d09a0 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java @@ -25,12 +25,12 @@ public class RecipeStickyJar implements IArcaneRecipe { @Override public boolean matches(IInventory inv, World world, EntityPlayer player) { - return ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), SimpleResearchItem.getFullName("STICKYJAR")) && getJarItem(inv) != null; + return ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), SimpleResearchItem.getFullName("STICKYJAR")) && this.getJarItem(inv) != null; } @Override public ItemStack getCraftingResult(IInventory inv) { - ItemStack jarItem = getJarItem(inv); + ItemStack jarItem = this.getJarItem(inv); if(jarItem != null) { ItemStack result = jarItem.copy(); result.stackSize = 1; diff --git a/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java b/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java index 3fa11da..c016954 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java @@ -30,7 +30,7 @@ public class RecipeVisualStickyJar extends ShapedArcaneRecipe { @Override @SideOnly(Side.CLIENT) public AspectList getAspects() { - updateVisualStickyJarRecipes(); + this.updateVisualStickyJarRecipes(); return super.getAspects(); } @@ -39,12 +39,12 @@ public class RecipeVisualStickyJar extends ShapedArcaneRecipe { List stacks = RegisteredItems.getStickyJarStacks(Minecraft.getMinecraft().thePlayer); if(stacks.size() > 0) { ItemStack stack = stacks.get((int)(System.currentTimeMillis() / 1000L % stacks.size())); - output = stack.copy(); - NBTHelper.getData(output).setBoolean("isStickyJar", true); + this.output = stack.copy(); + NBTHelper.getData(this.output).setBoolean("isStickyJar", true); - input = new Object[9]; - input[4] = stack; - input[7] = new ItemStack(Items.slime_ball, 1, 0); + this.input = new Object[9]; + this.input[4] = stack; + this.input[7] = new ItemStack(Items.slime_ball, 1, 0); } } } diff --git a/src/main/java/makeo/gadomancy/common/data/AbstractData.java b/src/main/java/makeo/gadomancy/common/data/AbstractData.java index d6cf16c..960e575 100644 --- a/src/main/java/makeo/gadomancy/common/data/AbstractData.java +++ b/src/main/java/makeo/gadomancy/common/data/AbstractData.java @@ -18,7 +18,7 @@ public abstract class AbstractData { private byte providerId; public final void markDirty() { - AbstractDataProvider provider = Registry.getProvider(getProviderID()); + AbstractDataProvider provider = Registry.getProvider(this.getProviderID()); if(provider != null) { SyncDataHolder.markForUpdate(provider.getKey()); } @@ -29,7 +29,7 @@ public abstract class AbstractData { } public final byte getProviderID() { - return providerId; + return this.providerId; } public abstract boolean needsUpdate(); @@ -47,11 +47,11 @@ public abstract class AbstractData { private static Map> registry = new HashMap>(); public static void register(AbstractDataProvider provider) { - registry.put(provider.getProviderId(), provider); + Registry.registry.put(provider.getProviderId(), provider); } public static AbstractDataProvider getProvider(Byte id) { - return registry.get(id); + return Registry.registry.get(id); } } @@ -68,11 +68,11 @@ public abstract class AbstractData { public abstract T provideNewInstance(); public final String getKey() { - return key; + return this.key; } public final byte getProviderId() { - return providerId; + return this.providerId; } } diff --git a/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java b/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java index 7dbb4a8..e7a56c9 100644 --- a/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java +++ b/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java @@ -26,7 +26,7 @@ public class DataAchromatic extends AbstractData { private List removeClientQueue = new ArrayList(); public boolean isAchromatic(EntityPlayer player) { - return achromaticEntities.contains(player.getEntityId()); + return this.achromaticEntities.contains(player.getEntityId()); } public void handleApplication(EntityLivingBase entity) { @@ -35,18 +35,18 @@ public class DataAchromatic extends AbstractData { int entityId = entity.getEntityId(); boolean needsUpdate = false; - if(!addClientQueue.contains(entityId) && !achromaticEntities.contains(entityId)) { - addClientQueue.add(entityId); - achromaticEntities.add(entityId); + if(!this.addClientQueue.contains(entityId) && !this.achromaticEntities.contains(entityId)) { + this.addClientQueue.add(entityId); + this.achromaticEntities.add(entityId); needsUpdate = true; } - if(removeClientQueue.contains(entityId)) { - removeClientQueue.remove(Integer.valueOf(entityId)); - addClientQueue.remove(Integer.valueOf(entityId)); + if(this.removeClientQueue.contains(entityId)) { + this.removeClientQueue.remove(Integer.valueOf(entityId)); + this.addClientQueue.remove(Integer.valueOf(entityId)); needsUpdate = false; } if(needsUpdate) { - markDirty(); + this.markDirty(); } } @@ -56,37 +56,37 @@ public class DataAchromatic extends AbstractData { int entityId = entity.getEntityId(); boolean needsUpdate = false; - if(!removeClientQueue.contains(entityId) && achromaticEntities.contains(entityId)) { - removeClientQueue.add(entityId); - achromaticEntities.remove(Integer.valueOf(entityId)); + if(!this.removeClientQueue.contains(entityId) && this.achromaticEntities.contains(entityId)) { + this.removeClientQueue.add(entityId); + this.achromaticEntities.remove(Integer.valueOf(entityId)); needsUpdate = true; } - if(addClientQueue.contains(entityId)) { - addClientQueue.remove(Integer.valueOf(entityId)); - removeClientQueue.remove(Integer.valueOf(entityId)); + if(this.addClientQueue.contains(entityId)) { + this.addClientQueue.remove(Integer.valueOf(entityId)); + this.removeClientQueue.remove(Integer.valueOf(entityId)); needsUpdate = false; } if(needsUpdate) { - markDirty(); + this.markDirty(); } } public void checkPotionEffect(EntityPlayerMP p) { if(p.isPotionActive(RegisteredPotions.ACHROMATIC)) { - handleApplication(p); + this.handleApplication(p); } } @Override public boolean needsUpdate() { - return !addClientQueue.isEmpty() || !removeClientQueue.isEmpty(); + return !this.addClientQueue.isEmpty() || !this.removeClientQueue.isEmpty(); } @Override public void writeAllDataToPacket(NBTTagCompound compound) { - int[] array = new int[achromaticEntities.size()]; - for (int i = 0; i < achromaticEntities.size(); i++) { - array[i] = achromaticEntities.get(i); + int[] array = new int[this.achromaticEntities.size()]; + for (int i = 0; i < this.achromaticEntities.size(); i++) { + array[i] = this.achromaticEntities.get(i); } compound.setTag("additions", new NBTTagIntArray(array)); compound.setTag("removals", new NBTTagIntArray(new int[0])); @@ -94,19 +94,19 @@ public class DataAchromatic extends AbstractData { @Override public void writeToPacket(NBTTagCompound compound) { - int[] array = new int[removeClientQueue.size()]; - for (int i = 0; i < removeClientQueue.size(); i++) { - array[i] = removeClientQueue.get(i); + int[] array = new int[this.removeClientQueue.size()]; + for (int i = 0; i < this.removeClientQueue.size(); i++) { + array[i] = this.removeClientQueue.get(i); } compound.setTag("removals", new NBTTagIntArray(array)); - array = new int[addClientQueue.size()]; - for (int i = 0; i < addClientQueue.size(); i++) { - array[i] = addClientQueue.get(i); + array = new int[this.addClientQueue.size()]; + for (int i = 0; i < this.addClientQueue.size(); i++) { + array[i] = this.addClientQueue.get(i); } compound.setTag("additions", new NBTTagIntArray(array)); - removeClientQueue.clear(); - addClientQueue.clear(); + this.removeClientQueue.clear(); + this.addClientQueue.clear(); } @Override @@ -114,13 +114,13 @@ public class DataAchromatic extends AbstractData { int[] array = compound.getIntArray("removals"); if(array != null && array.length > 0) { for(int i : array) { - removeClientQueue.add(i); + this.removeClientQueue.add(i); } } array = compound.getIntArray("additions"); if(array != null && array.length > 0) { for(int i : array) { - addClientQueue.add(i); + this.addClientQueue.add(i); } } } @@ -129,12 +129,12 @@ public class DataAchromatic extends AbstractData { public void handleIncomingData(AbstractData serverData) { DataAchromatic achromatic = (DataAchromatic) serverData; List toRemove = achromatic.removeClientQueue; - achromaticEntities.removeAll(toRemove); + this.achromaticEntities.removeAll(toRemove); List toAdd = achromatic.addClientQueue; - achromaticEntities.addAll(toAdd); + this.achromaticEntities.addAll(toAdd); } - public static class Provider extends ProviderAutoAllocate { + public static class Provider extends AbstractData.ProviderAutoAllocate { public Provider(String key) { super(key); diff --git a/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java b/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java index 672168c..78c5f87 100644 --- a/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java @@ -2,10 +2,8 @@ package makeo.gadomancy.common.data; import baubles.api.BaublesApi; import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.common.familiar.FamiliarAIController_Old; import makeo.gadomancy.common.familiar.FamiliarController; import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; -import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -36,7 +34,7 @@ public class DataFamiliar extends AbstractData { private List removeClientQueue = new ArrayList(); public boolean hasFamiliar(EntityPlayer player) { - for(FamiliarData fam : playersWithFamiliar) { + for(FamiliarData fam : this.playersWithFamiliar) { if(fam.owner.equals(player.getCommandSenderName())) return true; } return false; @@ -48,13 +46,13 @@ public class DataFamiliar extends AbstractData { String playerName = player.getCommandSenderName(); FamiliarData data = new FamiliarData(playerName, aspect.getTag()); - if(!addClientQueue.contains(data)) addClientQueue.add(data); - if(!playersWithFamiliar.contains(data)) playersWithFamiliar.add(data); - markDirty(); + if(!this.addClientQueue.contains(data)) this.addClientQueue.add(data); + if(!this.playersWithFamiliar.contains(data)) this.playersWithFamiliar.add(data); + this.markDirty(); - if(!familiarControllers.containsKey(player)) { + if(!this.familiarControllers.containsKey(player)) { FamiliarController controller = new FamiliarController(player); - familiarControllers.put(player, controller); + this.familiarControllers.put(player, controller); } } @@ -64,11 +62,11 @@ public class DataFamiliar extends AbstractData { String playerName = player.getCommandSenderName(); FamiliarData data = new FamiliarData(playerName, aspect.getTag()); - if(!removeClientQueue.contains(data)) removeClientQueue.add(data); - if(playersWithFamiliar.contains(data)) playersWithFamiliar.remove(data); - markDirty(); + if(!this.removeClientQueue.contains(data)) this.removeClientQueue.add(data); + this.playersWithFamiliar.remove(data); + this.markDirty(); - familiarControllers.remove(player); + this.familiarControllers.remove(player); } public void equipTick(World world, EntityPlayer player, Aspect aspect) { @@ -78,15 +76,15 @@ public class DataFamiliar extends AbstractData { IInventory baublesInv = BaublesApi.getBaubles(player); if(baublesInv.getStackInSlot(0) == null) { - handleUnequip(world, player, aspect); + this.handleUnequip(world, player, aspect); return; } - if(familiarControllers.get(player) == null || !playersWithFamiliar.contains(data)) { - handleEquip(world, player, aspect); + if(this.familiarControllers.get(player) == null || !this.playersWithFamiliar.contains(data)) { + this.handleEquip(world, player, aspect); } - familiarControllers.get(player).tick(); + this.familiarControllers.get(player).tick(); } public void checkPlayerEquipment(EntityPlayer p) { @@ -96,7 +94,7 @@ public class DataFamiliar extends AbstractData { if(amulet.getItem() != null && amulet.getItem() instanceof ItemEtherealFamiliar) { Aspect a = ItemEtherealFamiliar.getFamiliarAspect(amulet); if(a != null) { - handleEquip(p.worldObj, p, a); + this.handleEquip(p.worldObj, p, a); } } } @@ -110,7 +108,7 @@ public class DataFamiliar extends AbstractData { @Override public void writeAllDataToPacket(NBTTagCompound compound) { NBTTagList list = new NBTTagList(); - for(FamiliarData data : playersWithFamiliar) { + for(FamiliarData data : this.playersWithFamiliar) { NBTTagCompound cmp = new NBTTagCompound(); cmp.setString("owner", data.owner); cmp.setString("aspect", data.aspectTag); @@ -123,7 +121,7 @@ public class DataFamiliar extends AbstractData { @Override public void writeToPacket(NBTTagCompound compound) { NBTTagList removal = new NBTTagList(); - for(FamiliarData data : removeClientQueue) { + for(FamiliarData data : this.removeClientQueue) { NBTTagCompound cmp = new NBTTagCompound(); cmp.setString("owner", data.owner); cmp.setString("aspect", data.aspectTag); @@ -132,7 +130,7 @@ public class DataFamiliar extends AbstractData { compound.setTag("removals", removal); NBTTagList additions = new NBTTagList(); - for(FamiliarData data : addClientQueue) { + for(FamiliarData data : this.addClientQueue) { NBTTagCompound cmp = new NBTTagCompound(); cmp.setString("owner", data.owner); cmp.setString("aspect", data.aspectTag); @@ -140,8 +138,8 @@ public class DataFamiliar extends AbstractData { } compound.setTag("additions", additions); - removeClientQueue.clear(); - addClientQueue.clear(); + this.removeClientQueue.clear(); + this.addClientQueue.clear(); } @Override @@ -151,14 +149,14 @@ public class DataFamiliar extends AbstractData { NBTTagCompound cmp = remove.getCompoundTagAt(i); String owner = cmp.getString("owner"); String aspect = cmp.getString("aspect"); - removeClientQueue.add(new FamiliarData(owner, aspect)); + this.removeClientQueue.add(new FamiliarData(owner, aspect)); } NBTTagList additions = compound.getTagList("additions", new NBTTagCompound().getId()); for (int i = 0; i < additions.tagCount(); i++) { NBTTagCompound cmp = additions.getCompoundTagAt(i); String owner = cmp.getString("owner"); String aspect = cmp.getString("aspect"); - addClientQueue.add(new FamiliarData(owner, aspect)); + this.addClientQueue.add(new FamiliarData(owner, aspect)); } } @@ -166,22 +164,22 @@ public class DataFamiliar extends AbstractData { public void handleIncomingData(AbstractData serverData) { DataFamiliar familiarData = (DataFamiliar) serverData; List toAdd = familiarData.addClientQueue; - playersWithFamiliar.addAll(toAdd); + this.playersWithFamiliar.addAll(toAdd); FamiliarHandlerClient.handleAdditions(toAdd); List toRemove = familiarData.removeClientQueue; - playersWithFamiliar.removeAll(toRemove); + this.playersWithFamiliar.removeAll(toRemove); FamiliarHandlerClient.handleRemovals(toRemove); } public void handleUnsafeUnequip(EntityPlayer player) { FamiliarData data = null; - for(FamiliarData fam : playersWithFamiliar) { + for(FamiliarData fam : this.playersWithFamiliar) { if(fam.owner.equals(player.getCommandSenderName())) { data = fam; } } if(data != null) { - handleUnequip(player.worldObj, player, Aspect.getAspect(data.aspectTag)); + this.handleUnequip(player.worldObj, player, Aspect.getAspect(data.aspectTag)); } } @@ -198,23 +196,23 @@ public class DataFamiliar extends AbstractData { @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (o == null || this.getClass() != o.getClass()) return false; FamiliarData that = (FamiliarData) o; - return !(aspectTag != null ? !aspectTag.equals(that.aspectTag) : that.aspectTag != null) && !(owner != null ? !owner.equals(that.owner) : that.owner != null); + return (this.aspectTag != null ? this.aspectTag.equals(that.aspectTag) : that.aspectTag == null) && (this.owner != null ? this.owner.equals(that.owner) : that.owner == null); } @Override public int hashCode() { - int result = owner != null ? owner.hashCode() : 0; - result = 31 * result + (aspectTag != null ? aspectTag.hashCode() : 0); + int result = this.owner != null ? this.owner.hashCode() : 0; + result = 31 * result + (this.aspectTag != null ? this.aspectTag.hashCode() : 0); return result; } } - public static class Provider extends ProviderAutoAllocate { + public static class Provider extends AbstractData.ProviderAutoAllocate { public Provider(String key) { super(key); diff --git a/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java b/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java index bbb003a..ca15cce 100644 --- a/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java +++ b/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java @@ -23,46 +23,46 @@ public class SyncDataHolder { private static Map clientData = new HashMap(); private static List dirtyData = new ArrayList(); - private static byte providerCounter = 0; + private static byte providerCounter; public static void register(AbstractData.AbstractDataProvider provider) { AbstractData.Registry.register(provider); AbstractData ad = provider.provideNewInstance(); ad.setProviderId(provider.getProviderId()); - serverData.put(provider.getKey(), ad); + SyncDataHolder.serverData.put(provider.getKey(), ad); ad = provider.provideNewInstance(); ad.setProviderId(provider.getProviderId()); - clientData.put(provider.getKey(), ad); + SyncDataHolder.clientData.put(provider.getKey(), ad); } public static byte allocateNewId() { - byte pId = providerCounter; - providerCounter++; + byte pId = SyncDataHolder.providerCounter; + SyncDataHolder.providerCounter++; return pId; } public static T getDataServer(String key) { - return (T) serverData.get(key); + return (T) SyncDataHolder.serverData.get(key); } public static T getDataClient(String key) { - return (T) clientData.get(key); + return (T) SyncDataHolder.clientData.get(key); } public static void markForUpdate(String key) { - if(!dirtyData.contains(key)) { - dirtyData.add(key); + if(!SyncDataHolder.dirtyData.contains(key)) { + SyncDataHolder.dirtyData.add(key); } } public static void syncAllDataTo(EntityPlayer player) { - PacketSyncData dataSync = new PacketSyncData(serverData, true); + PacketSyncData dataSync = new PacketSyncData(SyncDataHolder.serverData, true); PacketHandler.INSTANCE.sendTo(dataSync, (net.minecraft.entity.player.EntityPlayerMP) player); } public static void receiveServerPacket(Map data) { for(String key : data.keySet()) { - AbstractData dat = clientData.get(key); + AbstractData dat = SyncDataHolder.clientData.get(key); if(dat != null) { dat.handleIncomingData(data.get(key)); } @@ -70,22 +70,22 @@ public class SyncDataHolder { } public static void doNecessaryUpdates() { - if(dirtyData.isEmpty()) return; + if(SyncDataHolder.dirtyData.isEmpty()) return; Map pktData = new HashMap(); - for(String s : dirtyData) { - AbstractData d = getDataServer(s); + for(String s : SyncDataHolder.dirtyData) { + AbstractData d = SyncDataHolder.getDataServer(s); if(d.needsUpdate()) { pktData.put(s, d); } } - dirtyData.clear(); + SyncDataHolder.dirtyData.clear(); PacketSyncData dataSync = new PacketSyncData(pktData, false); PacketHandler.INSTANCE.sendToAll(dataSync); } public static void initialize() { - register(new DataFamiliar.Provider("FamiliarData")); - register(new DataAchromatic.Provider("AchromaticData")); + SyncDataHolder.register(new DataFamiliar.Provider("FamiliarData")); + SyncDataHolder.register(new DataAchromatic.Provider("AchromaticData")); } } diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java index 8bbf7ef..25c52a2 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java @@ -45,45 +45,45 @@ public class ModConfig { public static boolean enableAdditionalNodeTypes; //Skyblock stuff - public static boolean ancientStoneRecipes = false; + public static boolean ancientStoneRecipes; private ModConfig() {} public static void init(File file) { - config = new Configuration(file); + ModConfig.config = new Configuration(file); - config.load(); + ModConfig.config.load(); - loadFromConfig(); + ModConfig.loadFromConfig(); - config.save(); + ModConfig.config.save(); } private static void loadFromConfig() { //Datawatcher entity stuff - entityNoClipItemDatawatcherMasterId = config.getInt("itemNoClipDatawatcherMasterId", "entities", 19, 0, 31, "Do not edit unless you know what are you doing! - Datawatcher ID of the Master-Coordinates for EntityNoClipItem"); - entityNoClipItemDatawatcherFixedId = config.getInt("itemNoClipDatawatcherFixId", "entities", 20, 0, 31, "Do not edit unless you know what are you doing! - Datawatcher ID of the Fixed-Coordinates for EntityNoClipItem"); + ModConfig.entityNoClipItemDatawatcherMasterId = ModConfig.config.getInt("itemNoClipDatawatcherMasterId", "entities", 19, 0, 31, "Do not edit unless you know what are you doing! - Datawatcher ID of the Master-Coordinates for EntityNoClipItem"); + ModConfig.entityNoClipItemDatawatcherFixedId = ModConfig.config.getInt("itemNoClipDatawatcherFixId", "entities", 20, 0, 31, "Do not edit unless you know what are you doing! - Datawatcher ID of the Fixed-Coordinates for EntityNoClipItem"); - entityAuraCoreDatawatcherAspectsId = config.getInt("auraCoreDatawatcherAuraId", "entities", 21, 0, 31, "Do not edit unless you know what are you doing! - Datawatcher ID of the Auracore's current aspects"); + ModConfig.entityAuraCoreDatawatcherAspectsId = ModConfig.config.getInt("auraCoreDatawatcherAuraId", "entities", 21, 0, 31, "Do not edit unless you know what are you doing! - Datawatcher ID of the Auracore's current aspects"); - golemDatawatcherId = config.getInt("datawatcherId", "golem", 29, 0, 31, "Do not edit unless you know what are you doing!"); + ModConfig.golemDatawatcherId = ModConfig.config.getInt("datawatcherId", "golem", 29, 0, 31, "Do not edit unless you know what are you doing!"); //Dimension stuff - dimOuterId = config.getInt("dimOuterId", "dimension", -73, Integer.MIN_VALUE, Integer.MAX_VALUE, "Dimension Id for the eldrich mazes accessed via Node Manipulator"); - doLightCalculations = config.getBoolean("calculateEldritchLight", "dimension", true, "TRUE = Calculating Light values for the Gadomancy-Eldritch Mazes; FALSE = No calculation, but some Light Bugs - Calculating the Light takes ~2 seconds -> Can be measured when trying to enter the eldritch mazed via Gadomancy Eldritch portal."); - maxMazeCount = config.getInt("maxMazeCount", "dimension", -1, -1, Integer.MAX_VALUE, "Defines how many Eldritch mazes may exist at the same time using the Gadomancy Eldritch ritual. (-1 = infinite) Note that 1 maze = 1 player; Once the player finishes the maze, the maze closes itself and teleports the player out."); + ModConfig.dimOuterId = ModConfig.config.getInt("dimOuterId", "dimension", -73, Integer.MIN_VALUE, Integer.MAX_VALUE, "Dimension Id for the eldrich mazes accessed via Node Manipulator"); + ModConfig.doLightCalculations = ModConfig.config.getBoolean("calculateEldritchLight", "dimension", true, "TRUE = Calculating Light values for the Gadomancy-Eldritch Mazes; FALSE = No calculation, but some Light Bugs - Calculating the Light takes ~2 seconds -> Can be measured when trying to enter the eldritch mazed via Gadomancy Eldritch portal."); + ModConfig.maxMazeCount = ModConfig.config.getInt("maxMazeCount", "dimension", -1, -1, Integer.MAX_VALUE, "Defines how many Eldritch mazes may exist at the same time using the Gadomancy Eldritch ritual. (-1 = infinite) Note that 1 maze = 1 player; Once the player finishes the maze, the maze closes itself and teleports the player out."); //Skyblock stuff - ancientStoneRecipes = config.getBoolean("ancientStoneRecipes", "skyblock", false, "TRUE = Adds recipes for Ancient Stone and Ancient Stone Pedestal (This may be usefull for severs and skyblock packs to craft the Node Manipulator and get more primodial pearls). You have to change this client- and server-side!"); + ModConfig.ancientStoneRecipes = ModConfig.config.getBoolean("ancientStoneRecipes", "skyblock", false, "TRUE = Adds recipes for Ancient Stone and Ancient Stone Pedestal (This may be usefull for severs and skyblock packs to craft the Node Manipulator and get more primodial pearls). You have to change this client- and server-side!"); //General stuff - renderParticleDistance = config.getInt("particleRenderDistance", "general", 100, 5, 1000, "Defines, how close a player has to be towards the particle origin to see the particles created by it."); - enableAdditionalNodeTypes = config.getBoolean("enableAdditionalNodeTypes", "general", true, "Enables our custom node types. This might solve some compatibility issues (e.g. WitchingGadgets). You have to change this client- and server-side! Only change when you experience issues with special mods' features ONLY not working when using the mod together with Gadomancy."); - String listOfAspects = config.getString("auraPylonBlacklist", "general", "", "Write a list of aspects (e.g. aura,aer) here that should not be active/obtainable with the aura pylon. Multiple aspects can be seperated with ','. Leave it empty to blacklist nothing"); - blacklistAuraEffects = refactorAspects(listOfAspects); + ModConfig.renderParticleDistance = ModConfig.config.getInt("particleRenderDistance", "general", 100, 5, 1000, "Defines, how close a player has to be towards the particle origin to see the particles created by it."); + ModConfig.enableAdditionalNodeTypes = ModConfig.config.getBoolean("enableAdditionalNodeTypes", "general", true, "Enables our custom node types. This might solve some compatibility issues (e.g. WitchingGadgets). You have to change this client- and server-side! Only change when you experience issues with special mods' features ONLY not working when using the mod together with Gadomancy."); + String listOfAspects = ModConfig.config.getString("auraPylonBlacklist", "general", "", "Write a list of aspects (e.g. aura,aer) here that should not be active/obtainable with the aura pylon. Multiple aspects can be seperated with ','. Leave it empty to blacklist nothing"); + ModConfig.blacklistAuraEffects = ModConfig.refactorAspects(listOfAspects); - config.addCustomCategoryComment("potions", "Use the following if you have problems with conflicting potion ids. If the entry is set to '-1' it will try to automatically find the lowest free potion id."); - config.addCustomCategoryComment("enchantments", "Use the following if you have problems with conflicting enchantment ids. If the entry is set to '-1' it will try to automatically find the lowest free enchantment id."); + ModConfig.config.addCustomCategoryComment("potions", "Use the following if you have problems with conflicting potion ids. If the entry is set to '-1' it will try to automatically find the lowest free potion id."); + ModConfig.config.addCustomCategoryComment("enchantments", "Use the following if you have problems with conflicting enchantment ids. If the entry is set to '-1' it will try to automatically find the lowest free enchantment id."); RegisteredPotions.createConfigEntries(); RegisteredEnchantments.createConfigEntries(); @@ -101,21 +101,21 @@ public class ModConfig { } public static int loadPotionId(String name) { - return loadId("potions", name); + return ModConfig.loadId("potions", name); } public static int loadEnchantmentId(String name) { - return loadId("enchantments", name); + return ModConfig.loadId("enchantments", name); } public static int loadId(String category, String name) { - Property prop = config.get(category, name, -1); + Property prop = ModConfig.config.get(category, name, -1); prop.setLanguageKey(name); int result = prop.getInt(-1); return result < -1 ? -1 : result; } public static void save() { - config.save(); + ModConfig.config.save(); } } diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModData.java b/src/main/java/makeo/gadomancy/common/data/config/ModData.java index 6e0f9e3..280609a 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModData.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModData.java @@ -3,17 +3,11 @@ package makeo.gadomancy.common.data.config; import com.google.gson.Gson; import com.google.gson.JsonIOException; import com.google.gson.JsonSyntaxException; - import cpw.mods.fml.common.FMLLog; import makeo.gadomancy.common.Gadomancy; import net.minecraft.server.MinecraftServer; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import java.util.HashMap; import java.util.Map; @@ -43,7 +37,7 @@ public class ModData { } public ModData(String name) { - this(name, geDefaultDirectory()); + this(name, ModData.geDefaultDirectory()); } private static File geDefaultDirectory() { @@ -58,33 +52,33 @@ public class ModData { } public T get(String key, T defaultValue) { - if(data.containsKey(key)) { - return (T) data.get(key); + if(this.data.containsKey(key)) { + return (T) this.data.get(key); } - data.put(key, defaultValue); + this.data.put(key, defaultValue); return defaultValue; } public T get(String key) { - return get(key, null); + return this.get(key, null); } public void set(String key, Object value) { - data.put(key, value); + this.data.put(key, value); } public boolean contains(String key) { - return data.containsKey(key); + return this.data.containsKey(key); } public boolean load() { - if(file != null && file.exists()) { + if(this.file != null && this.file.exists()) { ObjectInputStream inOBJ = null; FileInputStream in = null; try { - in = new FileInputStream(file); + in = new FileInputStream(this.file); inOBJ = new ObjectInputStream(in); - data = (Map) inOBJ.readObject(); + this.data = (Map) inOBJ.readObject(); } catch (IOException | ClassCastException | JsonSyntaxException | ClassNotFoundException e) { // e.printStackTrace(); try { @@ -110,20 +104,20 @@ public class ModData { } public boolean save() { - if(!file.getParentFile().exists() && !file.getParentFile().mkdirs()) { - FMLLog.warning("Failed to create directory: \"" + file.toString() + "\"!"); + if(!this.file.getParentFile().exists() && !this.file.getParentFile().mkdirs()) { + FMLLog.warning("Failed to create directory: \"" + this.file.toString() + "\"!"); return false; } FileOutputStream out = null; ObjectOutputStream outOBJ = null; try { - if(!file.exists()) - file.createNewFile(); + if(!this.file.exists()) + this.file.createNewFile(); - out = new FileOutputStream(file); + out = new FileOutputStream(this.file); outOBJ = new ObjectOutputStream(out); - outOBJ.writeObject(data); + outOBJ.writeObject(this.data); } catch (JsonIOException | IOException e) { e.printStackTrace(); try { diff --git a/src/main/java/makeo/gadomancy/common/data/config/Sync.java b/src/main/java/makeo/gadomancy/common/data/config/Sync.java index 2fa2438..42aa2ce 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/Sync.java +++ b/src/main/java/makeo/gadomancy/common/data/config/Sync.java @@ -3,6 +3,7 @@ package makeo.gadomancy.common.data.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.FIELD; /** @@ -14,6 +15,6 @@ import static java.lang.annotation.ElementType.FIELD; * Created by makeo @ 15.11.2015 22:00 */ @Retention(RetentionPolicy.RUNTIME) -@Target(value={FIELD}) +@Target(FIELD) public @interface Sync { } diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java index 376749f..f6bdd65 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java @@ -33,8 +33,11 @@ import thaumcraft.api.research.ScanResult; import thaumcraft.common.lib.research.ScanManager; import thaumcraft.common.lib.utils.BlockUtils; -import java.awt.Color; -import java.util.*; +import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; /** * This class is part of the Gadomancy Mod @@ -53,18 +56,18 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn private static final int GATHER_RANGE = 4; private static final int CLUSTER_WEIGHT = 10; //Counts as 10 'blocks' 'scanned' with the given aspect. public static final int CLUSTER_RANGE = 10; //Defines how close the clicked cluster has to be. - private static final int REQUIRED_BLOCKS = (int) Math.round(Math.pow(GATHER_RANGE*2+1, 3) * 0.15); + private static final int REQUIRED_BLOCKS = (int) Math.round(Math.pow(EntityAuraCore.GATHER_RANGE *2+1, 3) * 0.15); public PrimalAspectList internalAuraList = new PrimalAspectList(); - public Orbital auraOrbital = null; + public Orbital auraOrbital; //Effect stuff ResidentSleeper private Aspect[] effectAspects = new Aspect[6]; private Orbital.OrbitalRenderProperties[] effectProperties = new Orbital.OrbitalRenderProperties[6]; private FXFlow[] flows = new FXFlow[6]; - private String oldAspectDataSent = null; - public ChunkCoordinates activationLocation = null; + private String oldAspectDataSent; + public ChunkCoordinates activationLocation; private int blockCount; @@ -76,43 +79,43 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn super(world, x, y, z, stack); this.activationLocation = startingCoords; if(aspects.length == 1) { - this.internalAuraList.add(aspects[0], CLUSTER_WEIGHT * 6); + this.internalAuraList.add(aspects[0], EntityAuraCore.CLUSTER_WEIGHT * 6); } else { for(Aspect a : aspects) { if(a == null) continue; - this.internalAuraList.add(a, CLUSTER_WEIGHT); + this.internalAuraList.add(a, EntityAuraCore.CLUSTER_WEIGHT); } } - sendAspectData(electParliament()); + this.sendAspectData(this.electParliament()); - initGathering(); + this.initGathering(); } @Override protected void entityInit() { super.entityInit(); - getDataWatcher().addObjectByDataType(ModConfig.entityAuraCoreDatawatcherAspectsId, 4); + this.getDataWatcher().addObjectByDataType(ModConfig.entityAuraCoreDatawatcherAspectsId, 4); - getDataWatcher().updateObject(ModConfig.entityAuraCoreDatawatcherAspectsId, ""); + this.getDataWatcher().updateObject(ModConfig.entityAuraCoreDatawatcherAspectsId, ""); } @Override public void onUpdate() { super.onUpdate(); - if(auraOrbital == null && !MiscUtils.getPositionVector(this).equals(Vector3.ZERO) - && worldObj.isRemote) { - auraOrbital = new Orbital(MiscUtils.getPositionVector(this), worldObj); + if(this.auraOrbital == null && !MiscUtils.getPositionVector(this).equals(Vector3.ZERO) + && this.worldObj.isRemote) { + this.auraOrbital = new Orbital(MiscUtils.getPositionVector(this), this.worldObj); } - if(auraOrbital != null && worldObj.isRemote) { - if(!auraOrbital.registered) { - EffectHandler.getInstance().registerOrbital(auraOrbital); + if(this.auraOrbital != null && this.worldObj.isRemote) { + if(!this.auraOrbital.registered) { + EffectHandler.getInstance().registerOrbital(this.auraOrbital); } - auraOrbital.updateCenter(MiscUtils.getPositionVector(this)); - if(ticksExisted > PRE_GATHER_EFFECT_LENGTH) { - int part = ticksExisted - PRE_GATHER_EFFECT_LENGTH; - float perc = ((float) GATHER_EFFECT_LENGTH - part) / ((float) GATHER_EFFECT_LENGTH); - auraOrbital.reduceAllOffsets(perc); + this.auraOrbital.updateCenter(MiscUtils.getPositionVector(this)); + if(this.ticksExisted > EntityAuraCore.PRE_GATHER_EFFECT_LENGTH) { + int part = this.ticksExisted - EntityAuraCore.PRE_GATHER_EFFECT_LENGTH; + float perc = ((float) EntityAuraCore.GATHER_EFFECT_LENGTH - part) / ((float) EntityAuraCore.GATHER_EFFECT_LENGTH); + this.auraOrbital.reduceAllOffsets(perc); } } @@ -120,25 +123,25 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn this.age = 0; } - if(!worldObj.isRemote) { - if(ticksExisted > GATHER_EFFECT_LENGTH) { - finishCore(); - } else if(ticksExisted > PRE_GATHER_EFFECT_LENGTH) { - auraGatherCycle(); + if(!this.worldObj.isRemote) { + if(this.ticksExisted > EntityAuraCore.GATHER_EFFECT_LENGTH) { + this.finishCore(); + } else if(this.ticksExisted > EntityAuraCore.PRE_GATHER_EFFECT_LENGTH) { + this.auraGatherCycle(); } } else { - boolean changed = recieveAspectData(); - for (int i = 0; i < effectProperties.length; i++) { - Orbital.OrbitalRenderProperties node = effectProperties[i]; + boolean changed = this.recieveAspectData(); + for (int i = 0; i < this.effectProperties.length; i++) { + Orbital.OrbitalRenderProperties node = this.effectProperties[i]; if(node == null) { - if(effectAspects[i] == null) { + if(this.effectAspects[i] == null) { continue; } node = new Orbital.OrbitalRenderProperties(Orbital.Axis.persisentRandomAxis(), 1D);//rand.nextDouble() - node.setColor(new Color(effectAspects[i].getColor())).setTicksForFullCircle(120 + rand.nextInt(40)); - node.setOffsetTicks(rand.nextInt(80)); - Color c = getSubParticleColor(effectAspects[i]); + node.setColor(new Color(this.effectAspects[i].getColor())).setTicksForFullCircle(120 + this.rand.nextInt(40)); + node.setOffsetTicks(this.rand.nextInt(80)); + Color c = this.getSubParticleColor(this.effectAspects[i]); node.setSubParticleColor(c); node.setParticleSize(0.1f); node.setSubSizeRunnable(new Orbital.OrbitalSubSizeRunnable() { @@ -148,44 +151,44 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn } }); //node.setMultiplier() - effectProperties[i] = node; + this.effectProperties[i] = node; } - if(flows[i] == null && ticksExisted < PRE_GATHER_EFFECT_LENGTH) { - Vector3 v = new Vector3(activationLocation.posX + 0.5D, activationLocation.posY + 0.5D, activationLocation.posZ + 0.5D); - flows[i] = EffectHandler.getInstance().effectFlow(worldObj, + if(this.flows[i] == null && this.ticksExisted < EntityAuraCore.PRE_GATHER_EFFECT_LENGTH) { + Vector3 v = new Vector3(this.activationLocation.posX + 0.5D, this.activationLocation.posY + 0.5D, this.activationLocation.posZ + 0.5D); + this.flows[i] = EffectHandler.getInstance().effectFlow(this.worldObj, v, new FXFlow.EntityFlowProperties().setPolicy(EntityFXFlowPolicy.Policies.DEFAULT) - .setTarget(auraOrbital.getOrbitalStartPoints(node)[0]) - .setColor(new Color(effectAspects[i].getColor())).setFading(getSubParticleColor(effectAspects[i]))); - flows[i].setLivingTicks(PRE_GATHER_EFFECT_LENGTH - ticksExisted); + .setTarget(this.auraOrbital.getOrbitalStartPoints(node)[0]) + .setColor(new Color(this.effectAspects[i].getColor())).setFading(this.getSubParticleColor(this.effectAspects[i]))); + this.flows[i].setLivingTicks(EntityAuraCore.PRE_GATHER_EFFECT_LENGTH - this.ticksExisted); } - if(flows[i] != null) flows[i].applyTarget(auraOrbital.getOrbitalStartPoints(node)[0]); + if(this.flows[i] != null) this.flows[i].applyTarget(this.auraOrbital.getOrbitalStartPoints(node)[0]); if(changed) { - if(effectProperties[i] != null) { - effectProperties[i].setColor(new Color(effectAspects[i].getColor())); - Color c = getSubParticleColor(effectAspects[i]); + if(this.effectProperties[i] != null) { + this.effectProperties[i].setColor(new Color(this.effectAspects[i].getColor())); + Color c = this.getSubParticleColor(this.effectAspects[i]); node.setSubParticleColor(c); } - if(flows[i] != null) { - flows[i].setColor(getSubParticleColor(effectAspects[i])); - flows[i].setColor(new Color(effectAspects[i].getColor())); + if(this.flows[i] != null) { + this.flows[i].setColor(this.getSubParticleColor(this.effectAspects[i])); + this.flows[i].setColor(new Color(this.effectAspects[i].getColor())); } } } - if(ticksExisted >= (PRE_GATHER_EFFECT_LENGTH - 1)) { - if(auraOrbital.orbitalsSize() == 0) { + if(this.ticksExisted >= (EntityAuraCore.PRE_GATHER_EFFECT_LENGTH - 1)) { + if(this.auraOrbital.orbitalsSize() == 0) { for (int i = 0; i < 6; i++) { - Orbital.OrbitalRenderProperties node = effectProperties[i]; - auraOrbital.addOrbitalPoint(node); + Orbital.OrbitalRenderProperties node = this.effectProperties[i]; + this.auraOrbital.addOrbitalPoint(node); } } } else { for (int i = 0; i < 6; i++) { - if(flows[i] != null) { - flows[i].lastUpdateCall = System.currentTimeMillis(); + if(this.flows[i] != null) { + this.flows[i].lastUpdateCall = System.currentTimeMillis(); } } } @@ -195,7 +198,7 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn private void finishCore() { ItemStack auraCore = new ItemStack(RegisteredItems.itemAuraCore, 1, 0); boolean success = false; - if(blockCount >= REQUIRED_BLOCKS) { + if(this.blockCount >= EntityAuraCore.REQUIRED_BLOCKS) { double avg = ((double) this.internalAuraList.visSize()) / ((double) this.internalAuraList.size()); Aspect[] sortedHtL = this.internalAuraList.getAspectsSortedAmount(); AspectList al = new AspectList(); @@ -213,7 +216,7 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn rand.add(new AspectWRItem(al.getAmount(a), a)); } - Aspect aura = ((AspectWRItem) WeightedRandom.getRandomItem(worldObj.rand, rand)).getAspect(); + Aspect aura = ((AspectWRItem) WeightedRandom.getRandomItem(this.worldObj.rand, rand)).getAspect(); for(ItemAuraCore.AuraCoreType type : ItemAuraCore.AuraCoreType.values()) { if(type.isAspect() && type.getAspect().equals(aura)) { RegisteredItems.itemAuraCore.setCoreType(auraCore, type); @@ -224,99 +227,100 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn PacketStartAnimation animationPacket; if(!success) { - animationPacket = new PacketStartAnimation(PacketStartAnimation.ID_SMOKE_SPREAD, (int) posX, (int) posY, (int) posZ, Float.floatToIntBits(2F)); + animationPacket = new PacketStartAnimation(PacketStartAnimation.ID_SMOKE_SPREAD, (int) this.posX, (int) this.posY, (int) this.posZ, Float.floatToIntBits(2F)); } else { - animationPacket = new PacketStartAnimation(PacketStartAnimation.ID_SPARKLE_SPREAD, (int) posX, (int) posY, (int) posZ, (byte) 0); + animationPacket = new PacketStartAnimation(PacketStartAnimation.ID_SPARKLE_SPREAD, (int) this.posX, (int) this.posY, (int) this.posZ, (byte) 0); } - PacketHandler.INSTANCE.sendToAllAround(animationPacket, MiscUtils.getTargetPoint(worldObj, this, 32)); + PacketHandler.INSTANCE.sendToAllAround(animationPacket, MiscUtils.getTargetPoint(this.worldObj, this, 32)); - EntityItem ei = new EntityItem(worldObj, posX, posY, posZ, auraCore); + EntityItem ei = new EntityItem(this.worldObj, this.posX, this.posY, this.posZ, auraCore); ei.motionX = 0; ei.motionY = 0; ei.motionZ = 0; - worldObj.spawnEntityInWorld(ei); - setDead(); + this.worldObj.spawnEntityInWorld(ei); + this.setDead(); } private List markedLocations; private void initGathering() { - markedLocations = new ArrayList((int) Math.pow(GATHER_RANGE*2+1, 3)); - for(int x = -GATHER_RANGE; x <= GATHER_RANGE; x++) { - for(int y = -GATHER_RANGE; y <= GATHER_RANGE; y++) { - for(int z = -GATHER_RANGE; z <= GATHER_RANGE; z++) { - markedLocations.add(new ChunkCoordinates(x, y, z)); + this.markedLocations = new ArrayList((int) Math.pow(EntityAuraCore.GATHER_RANGE *2+1, 3)); + for(int x = -EntityAuraCore.GATHER_RANGE; x <= EntityAuraCore.GATHER_RANGE; x++) { + for(int y = -EntityAuraCore.GATHER_RANGE; y <= EntityAuraCore.GATHER_RANGE; y++) { + for(int z = -EntityAuraCore.GATHER_RANGE; z <= EntityAuraCore.GATHER_RANGE; z++) { + this.markedLocations.add(new ChunkCoordinates(x, y, z)); } } } - Collections.shuffle(markedLocations, new Random(activationLocation.hashCode())); + Collections.shuffle(this.markedLocations, new Random(this.activationLocation.hashCode())); } private void auraGatherCycle() { - if(ticksExisted >= PRE_GATHER_EFFECT_LENGTH) { - int elapsed = ticksExisted - PRE_GATHER_EFFECT_LENGTH - 1; - float dist = (GATHER_EFFECT_LENGTH - PRE_GATHER_EFFECT_LENGTH) / (float)markedLocations.size(); + if(this.ticksExisted >= EntityAuraCore.PRE_GATHER_EFFECT_LENGTH) { + int elapsed = this.ticksExisted - EntityAuraCore.PRE_GATHER_EFFECT_LENGTH - 1; + float dist = (EntityAuraCore.GATHER_EFFECT_LENGTH - EntityAuraCore.PRE_GATHER_EFFECT_LENGTH) / (float) this.markedLocations.size(); int index = (int) (elapsed / dist); int lastIndex = (int)((elapsed - 1) / dist); - if(index < markedLocations.size() && index > lastIndex) { + if(index < this.markedLocations.size() && index > lastIndex) { int diff = index - lastIndex; for(int i = 0; i < diff; i++) { - ChunkCoordinates coord = markedLocations.get(index + i); + ChunkCoordinates coord = this.markedLocations.get(index + i); - int x = (int) (coord.posX + posX); - int y = (int) (coord.posY + posY); - int z = (int) (coord.posZ + posZ); + int x = (int) (coord.posX + this.posX); + int y = (int) (coord.posY + this.posY); + int z = (int) (coord.posZ + this.posZ); - Block block = worldObj.getBlock(x, y, z); + Block block = this.worldObj.getBlock(x, y, z); if(block != Blocks.air) { - int meta = worldObj.getBlockMetadata(x, y, z); + int meta = this.worldObj.getBlockMetadata(x, y, z); ScanResult result = null; MovingObjectPosition pos = new MovingObjectPosition(x, y, z, ForgeDirection.UP.ordinal(), Vec3.createVectorHelper(0, 0, 0), true); ItemStack is = null; try { - is = block.getPickBlock(pos, worldObj, x, y, z); - } catch (Throwable tr) {} + is = block.getPickBlock(pos, this.worldObj, x, y, z); + } catch (Throwable ignored) { + } try { if(is == null) { is = BlockUtils.createStackedBlock(block, meta); } + } catch (Exception ignored) { } - catch (Exception e) {} try { if (is == null) { result = new ScanResult((byte)1, Block.getIdFromBlock(block), meta, null, ""); } else { result = new ScanResult((byte)1, Item.getIdFromItem(is.getItem()), is.getItemDamage(), null, ""); } + } catch (Exception ignored) { } - catch (Exception e) {} if(result == null) continue; //We can't scan it BibleThump - AspectList aspects = ScanManager.getScanAspects(result, worldObj); + AspectList aspects = ScanManager.getScanAspects(result, this.worldObj); if(aspects.size() > 0) { - internalAuraList.add(aspects); - blockCount++; + this.internalAuraList.add(aspects); + this.blockCount++; } } } } - sendAspectData(electParliament()); + this.sendAspectData(this.electParliament()); } } private Aspect[] electParliament() { Aspect[] colors = new Aspect[6]; - Aspect[] aspects = internalAuraList.getAspectsSortedAmount(); + Aspect[] aspects = this.internalAuraList.getAspectsSortedAmount(); - int totalSize = internalAuraList.visSize(); + int totalSize = this.internalAuraList.visSize(); int availableSeats = 6; for(Aspect aspect : aspects) { - float percent = internalAuraList.getAmount(aspect) / (float)totalSize; + float percent = this.internalAuraList.getAmount(aspect) / (float)totalSize; int seats = (int) Math.ceil(availableSeats * percent); seats = Math.min(seats, availableSeats); @@ -362,22 +366,22 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn //Client side only. private boolean recieveAspectData() { - String rec = getDataWatcher().getWatchableObjectString(ModConfig.entityAuraCoreDatawatcherAspectsId); - if(oldAspectDataSent == null || !this.oldAspectDataSent.equals(rec)) { - oldAspectDataSent = rec; + String rec = this.getDataWatcher().getWatchableObjectString(ModConfig.entityAuraCoreDatawatcherAspectsId); + if(this.oldAspectDataSent == null || !this.oldAspectDataSent.equals(rec)) { + this.oldAspectDataSent = rec; } else { return false; } if(rec.equals("")) return false; - String[] arr = rec.split(SPLIT); + String[] arr = rec.split(EntityAuraCore.SPLIT); if(arr.length != 6) throw new IllegalStateException("Server sent wrong Aura Data! '" + rec + "' Please report this error to the mod authors!"); for (int i = 0; i < arr.length; i++) { String s = arr[i]; Aspect a = Aspect.getAspect(s); - effectAspects[i] = a; + this.effectAspects[i] = a; } return true; } @@ -386,16 +390,16 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn StringBuilder sb = new StringBuilder(); for (Aspect aspect : aspects) { if (sb.length() > 0) { - sb.append(SPLIT); + sb.append(EntityAuraCore.SPLIT); } sb.append(aspect.getTag()); } String toSend = sb.toString(); - if(this.oldAspectDataSent == null || !this.oldAspectDataSent.equals(toSend)) { + if(!toSend.equals(this.oldAspectDataSent)) { this.oldAspectDataSent = toSend; - getDataWatcher().updateObject(ModConfig.entityAuraCoreDatawatcherAspectsId, toSend); + this.getDataWatcher().updateObject(ModConfig.entityAuraCoreDatawatcherAspectsId, toSend); } } @@ -405,67 +409,67 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn this.internalAuraList = new PrimalAspectList(); - ticksExisted = compound.getInteger("ticksExisted"); + this.ticksExisted = compound.getInteger("ticksExisted"); NBTTagList list = compound.getTagList("auraList", compound.getId()); for (int i = 0; i < list.tagCount(); i++) { NBTTagCompound cmp = list.getCompoundTagAt(i); if(cmp.hasKey("tag") && cmp.hasKey("amt")) { - internalAuraList.add(Aspect.getAspect(cmp.getString("tag")), cmp.getInteger("amt")); + this.internalAuraList.add(Aspect.getAspect(cmp.getString("tag")), cmp.getInteger("amt")); } } if(compound.hasKey("activationVecX") && compound.hasKey("activationVecY") && compound.hasKey("activationVecZ")) { int x = compound.getInteger("activationVecX"); int y = compound.getInteger("activationVecY"); int z = compound.getInteger("activationVecZ"); - activationLocation = new ChunkCoordinates(x, y, z); + this.activationLocation = new ChunkCoordinates(x, y, z); } - sendAspectData(electParliament()); + this.sendAspectData(this.electParliament()); - initGathering(); + this.initGathering(); - blockCount = compound.getInteger("blockCount"); + this.blockCount = compound.getInteger("blockCount"); } @Override public void writeEntityToNBT(NBTTagCompound compound) { super.writeEntityToNBT(compound); - compound.setInteger("ticksExisted", ticksExisted); + compound.setInteger("ticksExisted", this.ticksExisted); NBTTagList list = new NBTTagList(); - for(Aspect a : internalAuraList.getAspects()) { + for(Aspect a : this.internalAuraList.getAspects()) { if(a == null) continue; NBTTagCompound aspectCompound = new NBTTagCompound(); aspectCompound.setString("tag", a.getTag()); - aspectCompound.setInteger("amt", internalAuraList.getAmount(a)); + aspectCompound.setInteger("amt", this.internalAuraList.getAmount(a)); list.appendTag(aspectCompound); } compound.setTag("auraList", list); - if(activationLocation != null) { - compound.setInteger("activationVecX", activationLocation.posX); - compound.setInteger("activationVecY", activationLocation.posY); - compound.setInteger("activationVecZ", activationLocation.posZ); + if(this.activationLocation != null) { + compound.setInteger("activationVecX", this.activationLocation.posX); + compound.setInteger("activationVecY", this.activationLocation.posY); + compound.setInteger("activationVecZ", this.activationLocation.posZ); } - compound.setInteger("blockCount", blockCount); + compound.setInteger("blockCount", this.blockCount); } @Override public void writeSpawnData(ByteBuf buffer) { - buffer.writeInt(ticksExisted); + buffer.writeInt(this.ticksExisted); - buffer.writeInt(activationLocation.posX); - buffer.writeInt(activationLocation.posY); - buffer.writeInt(activationLocation.posZ); + buffer.writeInt(this.activationLocation.posX); + buffer.writeInt(this.activationLocation.posY); + buffer.writeInt(this.activationLocation.posZ); } @Override public void readSpawnData(ByteBuf buffer) { - ticksExisted = buffer.readInt(); + this.ticksExisted = buffer.readInt(); - activationLocation = new ChunkCoordinates(); - activationLocation.posX = buffer.readInt(); - activationLocation.posY = buffer.readInt(); - activationLocation.posZ = buffer.readInt(); + this.activationLocation = new ChunkCoordinates(); + this.activationLocation.posX = buffer.readInt(); + this.activationLocation.posY = buffer.readInt(); + this.activationLocation.posZ = buffer.readInt(); } public static final class AspectWRItem extends WeightedRandom.Item { @@ -478,7 +482,7 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn } public Aspect getAspect() { - return aspect; + return this.aspect; } } diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java b/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java index 66ccc1e..de45984 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java @@ -4,14 +4,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import makeo.gadomancy.common.items.ItemElement; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFlameFX; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import thaumcraft.client.fx.bolt.FXLightningBolt; -import thaumcraft.common.Thaumcraft; import java.util.List; @@ -38,21 +36,21 @@ public class EntityItemElement extends EntityItem { @Override public void onUpdate() { super.onUpdate(); - ItemStack stack = getEntityItem(); + ItemStack stack = this.getEntityItem(); if(stack == null || !(stack.getItem() instanceof ItemElement)) return; int meta = stack.getItemDamage(); ItemElement.EnumElementType element = ItemElement.EnumElementType.values()[meta % ItemElement.EnumElementType.values().length]; - if(!worldObj.isRemote && (ticksExisted & 15) == 0) { - doElementServerEffects(element, worldObj, posX, posY, posZ); + if(!this.worldObj.isRemote && (this.ticksExisted & 15) == 0) { + EntityItemElement.doElementServerEffects(element, this.worldObj, this.posX, this.posY, this.posZ); } if (this.age + 5 >= this.lifespan) { this.age = 0; } - if(worldObj.isRemote && worldObj.rand.nextInt(4) == 0) { - playClientElementEffect(element, worldObj, posX, posY, posZ); + if(this.worldObj.isRemote && this.worldObj.rand.nextInt(4) == 0) { + EntityItemElement.playClientElementEffect(element, this.worldObj, this.posX, this.posY, this.posZ); } } diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java b/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java index 5ea34c3..a2052c5 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java @@ -38,64 +38,64 @@ public class EntityPermNoClipItem extends EntityPermanentItem { this.masterZ = masterZ; ChunkCoordinates masterCoords = new ChunkCoordinates(this.masterX, this.masterY, this.masterZ); - getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherMasterId, masterCoords); + this.getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherMasterId, masterCoords); int fixX = Float.floatToIntBits(x); int fixY = Float.floatToIntBits(y); int fixZ = Float.floatToIntBits(z); ChunkCoordinates fixCoords = new ChunkCoordinates(fixX, fixY, fixZ); - getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherFixedId, fixCoords); + this.getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherFixedId, fixCoords); } @Override protected void entityInit() { super.entityInit(); - getDataWatcher().addObjectByDataType(ModConfig.entityNoClipItemDatawatcherMasterId, 6); - getDataWatcher().addObjectByDataType(ModConfig.entityNoClipItemDatawatcherFixedId, 6); + this.getDataWatcher().addObjectByDataType(ModConfig.entityNoClipItemDatawatcherMasterId, 6); + this.getDataWatcher().addObjectByDataType(ModConfig.entityNoClipItemDatawatcherFixedId, 6); - getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherMasterId, new ChunkCoordinates(0, 0, 0)); - getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherFixedId, new ChunkCoordinates(0, 0, 0)); + this.getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherMasterId, new ChunkCoordinates(0, 0, 0)); + this.getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherFixedId, new ChunkCoordinates(0, 0, 0)); } @Override public void onUpdate() { - noClip = true; + this.noClip = true; super.onUpdate(); - motionX = 0; - motionY = 0; - motionZ = 0; - if (getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherFixedId).getObject() == null) + this.motionX = 0; + this.motionY = 0; + this.motionZ = 0; + if (this.getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherFixedId).getObject() == null) return; - if((ticksExisted & 1) == 0) { - ChunkCoordinates cc = (ChunkCoordinates) getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherMasterId).getObject(); + if((this.ticksExisted & 1) == 0) { + ChunkCoordinates cc = (ChunkCoordinates) this.getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherMasterId).getObject(); if(cc == null) return; - TileEntity te = worldObj.getTileEntity(cc.posX, cc.posY, cc.posZ); - if(te != null && te instanceof IItemMasterTile) { + TileEntity te = this.worldObj.getTileEntity(cc.posX, cc.posY, cc.posZ); + if (te instanceof IItemMasterTile) { ((IItemMasterTile) te).informMaster(); ItemChangeTask task = ((IItemMasterTile) te).getAndRemoveScheduledChangeTask(); if(task != null) { task.changeItem(this); } - ((IItemMasterTile) te).broadcastItemStack(getEntityItem()); + ((IItemMasterTile) te).broadcastItemStack(this.getEntityItem()); } } - ChunkCoordinates fixC = (ChunkCoordinates) getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherFixedId).getObject(); + ChunkCoordinates fixC = (ChunkCoordinates) this.getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherFixedId).getObject(); float fX = Float.intBitsToFloat(fixC.posX); float fY = Float.intBitsToFloat(fixC.posY); float fZ = Float.intBitsToFloat(fixC.posZ); - setPositionAndRotation(fX, fY, fZ, 0, 0); + this.setPositionAndRotation(fX, fY, fZ, 0, 0); - if ((ticksExisted & 7) == 0 && !worldObj.isRemote) { - ChunkCoordinates masterCoords = (ChunkCoordinates) getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherMasterId).getObject(); - TileEntity te = worldObj.getTileEntity(masterCoords.posX, masterCoords.posY, masterCoords.posZ); - if (te == null || !(te instanceof IItemMasterTile) || !((IItemMasterTile) te).canStillHoldItem()) { - EntityItem item = new EntityItem(worldObj, posX, posY, posZ, getEntityItem()); - worldObj.spawnEntityInWorld(item); - setDead(); + if ((this.ticksExisted & 7) == 0 && !this.worldObj.isRemote) { + ChunkCoordinates masterCoords = (ChunkCoordinates) this.getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherMasterId).getObject(); + TileEntity te = this.worldObj.getTileEntity(masterCoords.posX, masterCoords.posY, masterCoords.posZ); + if (!(te instanceof IItemMasterTile) || !((IItemMasterTile) te).canStillHoldItem()) { + EntityItem item = new EntityItem(this.worldObj, this.posX, this.posY, this.posZ, this.getEntityItem()); + this.worldObj.spawnEntityInWorld(item); + this.setDead(); } } } @@ -124,39 +124,39 @@ public class EntityPermNoClipItem extends EntityPermanentItem { this.masterY = com.getInteger("mY"); this.masterZ = com.getInteger("mZ"); - getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherMasterId, new ChunkCoordinates(masterX, masterY, masterZ)); - ChunkCoordinates cc = new ChunkCoordinates(Float.floatToIntBits(fixPosX), Float.floatToIntBits(fixPosY), Float.floatToIntBits(fixPosZ)); - getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherFixedId, cc); + this.getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherMasterId, new ChunkCoordinates(this.masterX, this.masterY, this.masterZ)); + ChunkCoordinates cc = new ChunkCoordinates(Float.floatToIntBits(this.fixPosX), Float.floatToIntBits(this.fixPosY), Float.floatToIntBits(this.fixPosZ)); + this.getDataWatcher().updateObject(ModConfig.entityNoClipItemDatawatcherFixedId, cc); } @Override public void writeEntityToNBT(NBTTagCompound com) { super.writeEntityToNBT(com); - com.setFloat("fX", fixPosX); - com.setFloat("fY", fixPosY); - com.setFloat("fZ", fixPosZ); + com.setFloat("fX", this.fixPosX); + com.setFloat("fY", this.fixPosY); + com.setFloat("fZ", this.fixPosZ); - com.setInteger("mX", masterX); - com.setInteger("mY", masterY); - com.setInteger("mZ", masterZ); + com.setInteger("mX", this.masterX); + com.setInteger("mY", this.masterY); + com.setInteger("mZ", this.masterZ); } - public static interface IItemMasterTile { + public interface IItemMasterTile { - public boolean canStillHoldItem(); + boolean canStillHoldItem(); - public void informMaster(); + void informMaster(); - public void informItemRemoval(); + void informItemRemoval(); - public ItemChangeTask getAndRemoveScheduledChangeTask(); + ItemChangeTask getAndRemoveScheduledChangeTask(); - public void broadcastItemStack(ItemStack itemStack); + void broadcastItemStack(ItemStack itemStack); } - public static abstract class ItemChangeTask { + public abstract static class ItemChangeTask { public abstract void changeItem(EntityPermNoClipItem item); diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java index 55bde47..55a5c87 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java @@ -18,7 +18,6 @@ import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.Marker; import thaumcraft.common.lib.utils.InventoryUtils; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -39,10 +38,10 @@ public class AIBreakBlock extends EntityAIBase { private AdvancedFakePlayer player; private Marker currentMarker; - private boolean hasValidTool = false; + private boolean hasValidTool; - private Map blacklist = new HashMap(); - private int blacklistCount = 0; + private Map blacklist = new HashMap<>(); + private int blacklistCount; public AIBreakBlock(EntityGolemBase golem) { this.golem = golem; @@ -51,76 +50,73 @@ public class AIBreakBlock extends EntityAIBase { this.player = new GolemFakePlayer((WorldServer) golem.worldObj, golem); } - setMutexBits(3); + this.setMutexBits(3); } @Override public boolean shouldExecute() { - if (golem.ticksExisted % Config.golemDelay > 0) { + if (this.golem.ticksExisted % Config.golemDelay > 0) { return false; } - currentMarker = getNextMarker(); + this.currentMarker = this.getNextMarker(); - if(!hasValidTool()) { - if(isInHomeRange()) { - return true; - } - return false; + if(!this.hasValidTool()) { + return this.isInHomeRange(); } - return currentMarker != null; + return this.currentMarker != null; } - private int count = 0; - private int clickCount = 0; + private int count; + private int clickCount; @Override public boolean continueExecuting() { - if(hasValidTool) { - if(!hasBlock(currentMarker)) { + if(this.hasValidTool) { + if(!this.hasBlock(this.currentMarker)) { return false; } - if(distanceSquaredToGolem(currentMarker) < 1) { - if(golem.getCarried() == null) { - golem.startActionTimer(); + if(this.distanceSquaredToGolem(this.currentMarker) < 1) { + if(this.golem.getCarried() == null) { + this.golem.startActionTimer(); } else { - golem.startRightArmTimer(); + this.golem.startRightArmTimer(); } - if(clickCount % (7 - Math.min(6, golem.getGolemStrength())) == 0) { - doLeftClick(); + if(this.clickCount % (7 - Math.min(6, this.golem.getGolemStrength())) == 0) { + this.doLeftClick(); } - clickCount++; + this.clickCount++; - golem.getLookHelper().setLookPosition(currentMarker.x + 0.5D, currentMarker.y + 0.5D, currentMarker.z + 0.5D, 30.0F, 30.0F); + this.golem.getLookHelper().setLookPosition(this.currentMarker.x + 0.5D, this.currentMarker.y + 0.5D, this.currentMarker.z + 0.5D, 30.0F, 30.0F); - count = 0; + this.count = 0; } else { - if(count == 20) { - count = 0; + if(this.count == 20) { + this.count = 0; - ForgeDirection dir = ForgeDirection.getOrientation(currentMarker.side); - boolean path = golem.getNavigator().tryMoveToXYZ(currentMarker.x + 0.5D + dir.offsetX, currentMarker.y + 0.5D + dir.offsetY, currentMarker.z + 0.5D + dir.offsetZ, golem.getAIMoveSpeed()); + ForgeDirection dir = ForgeDirection.getOrientation(this.currentMarker.side); + boolean path = this.golem.getNavigator().tryMoveToXYZ(this.currentMarker.x + 0.5D + dir.offsetX, this.currentMarker.y + 0.5D + dir.offsetY, this.currentMarker.z + 0.5D + dir.offsetZ, this.golem.getAIMoveSpeed()); if(!path) { - if (blacklistCount > 10) { - blacklist.put(currentMarker, golem.ticksExisted); + if (this.blacklistCount > 10) { + this.blacklist.put(this.currentMarker, this.golem.ticksExisted); return false; } - blacklistCount++; + this.blacklistCount++; } } - count++; - clickCount = 0; + this.count++; + this.clickCount = 0; } } else { - if(golem.ticksExisted % Config.golemDelay > 0) { - if(isInHomeRange()) { - IInventory homeChest = getHomeChest(); + if(this.golem.ticksExisted % Config.golemDelay > 0) { + if(this.isInHomeRange()) { + IInventory homeChest = this.getHomeChest(); if(homeChest != null) { - trySwitchTool(homeChest); + this.trySwitchTool(homeChest); } } else { return false; @@ -133,53 +129,48 @@ public class AIBreakBlock extends EntityAIBase { @Override public void resetTask() { - currentMarker = null; - blacklistCount = 0; - cancelLeftClick(); + this.currentMarker = null; + this.blacklistCount = 0; + this.cancelLeftClick(); } - public void doLeftClick() { - ItemStack tool = golem.getCarried(); - player.setHeldItem(tool); + private void doLeftClick() { + ItemStack tool = this.golem.getCarried(); + this.player.setHeldItem(tool); - player.theItemInWorldManager.updateBlockRemoving(); + this.player.theItemInWorldManager.updateBlockRemoving(); if (this.player.theItemInWorldManager.durabilityRemainingOnBlock == -1 || !this.player.theItemInWorldManager.isDestroyingBlock) { - this.player.theItemInWorldManager.onBlockClicked(currentMarker.x, currentMarker.y, currentMarker.z, currentMarker.side); + this.player.theItemInWorldManager.onBlockClicked(this.currentMarker.x, this.currentMarker.y, this.currentMarker.z, this.currentMarker.side); } else if (this.player.theItemInWorldManager.durabilityRemainingOnBlock >= 9) { - this.player.theItemInWorldManager.uncheckedTryHarvestBlock(currentMarker.x, currentMarker.y, currentMarker.z); + this.player.theItemInWorldManager.uncheckedTryHarvestBlock(this.currentMarker.x, this.currentMarker.y, this.currentMarker.z); this.player.theItemInWorldManager.durabilityRemainingOnBlock = -1; if (tool != null) { - Block block = golem.worldObj.getBlock(currentMarker.x, currentMarker.y, currentMarker.z); - tool.getItem().onBlockDestroyed(tool, golem.worldObj, block, currentMarker.x, currentMarker.y, currentMarker.z, this.player); + Block block = this.golem.worldObj.getBlock(this.currentMarker.x, this.currentMarker.y, this.currentMarker.z); + tool.getItem().onBlockDestroyed(tool, this.golem.worldObj, block, this.currentMarker.x, this.currentMarker.y, this.currentMarker.z, this.player); } } - hasValidTool(); - golem.updateCarried(); + this.hasValidTool(); + this.golem.updateCarried(); } - public void cancelLeftClick() { - ItemInWorldManager manager = player.theItemInWorldManager; + private void cancelLeftClick() { + ItemInWorldManager manager = this.player.theItemInWorldManager; if(manager.isDestroyingBlock) - player.theItemInWorldManager.cancelDestroyingBlock(manager.partiallyDestroyedBlockX, manager.partiallyDestroyedBlockY, manager.partiallyDestroyedBlockZ); + this.player.theItemInWorldManager.cancelDestroyingBlock(manager.partiallyDestroyedBlockX, manager.partiallyDestroyedBlockY, manager.partiallyDestroyedBlockZ); } private Marker getNextMarker() { - List markers = golem.getMarkers(); + List markers = this.golem.getMarkers(); - Collections.sort(markers, new Comparator() { - @Override - public int compare(Marker m1, Marker m2) { - return (int) (distanceSquaredToGolem(m1) - distanceSquaredToGolem(m2)); - } - }); + markers.sort(Comparator.comparingDouble(this::distanceSquaredToGolem)); for(Marker marker : markers) { - if(isValid(marker)) { + if(this.isValid(marker)) { return marker; } } @@ -187,7 +178,7 @@ public class AIBreakBlock extends EntityAIBase { } private double distanceSquaredToGolem(Marker marker) { - return distanceSquaredToGolem(marker.x, marker.y, marker.z, marker.side); + return this.distanceSquaredToGolem(marker.x, marker.y, marker.z, marker.side); } private double distanceSquaredToGolem(double x, double y, double z, int facing) { @@ -197,60 +188,57 @@ public class AIBreakBlock extends EntityAIBase { } private boolean isInHomeRange() { - ChunkCoordinates home = golem.getHomePosition(); - return golem.getDistanceSq(home.posX + 0.5, home.posY + 0.5, home.posZ + 0.5) < 3; + ChunkCoordinates home = this.golem.getHomePosition(); + return this.golem.getDistanceSq(home.posX + 0.5, home.posY + 0.5, home.posZ + 0.5) < 3; } private boolean hasBlock(Marker marker) { - return marker != null && !golem.worldObj.isAirBlock(marker.x, marker.y, marker.z); + return marker != null && !this.golem.worldObj.isAirBlock(marker.x, marker.y, marker.z); } private boolean isValid(Marker marker) { if(marker == null) return false; - if(blacklist.containsKey(marker)) { - if(blacklist.get(marker) + BLACKLIST_TICKS >= golem.ticksExisted) { + if(this.blacklist.containsKey(marker)) { + if(this.blacklist.get(marker) + AIBreakBlock.BLACKLIST_TICKS >= this.golem.ticksExisted) { return false; } else { - blacklist.remove(marker); + this.blacklist.remove(marker); } } - float range = golem.getRange(); - if(golem.getHomePosition().getDistanceSquared(marker.x, marker.y, marker.z) > range * range) { + float range = this.golem.getRange(); + if(this.golem.getHomePosition().getDistanceSquared(marker.x, marker.y, marker.z) > range * range) { return false; } - Block block = golem.worldObj.getBlock(marker.x, marker.y, marker.z); + Block block = this.golem.worldObj.getBlock(marker.x, marker.y, marker.z); - if(!block.isAir(golem.worldObj, marker.x, marker.y, marker.z)) { + if(!block.isAir(this.golem.worldObj, marker.x, marker.y, marker.z)) { ItemStack blockStack = new ItemStack(Item.getItemFromBlock(block)); boolean empty = true; - for(int slot = 0; slot < golem.inventory.slotCount; slot++) { - ItemStack stack = golem.inventory.inventory[slot]; + for(int slot = 0; slot < this.golem.inventory.slotCount; slot++) { + ItemStack stack = this.golem.inventory.inventory[slot]; if(stack != null && Block.getBlockFromItem(stack.getItem()) != Blocks.air) { empty = false; - if((marker.color == -1 || marker.color == golem.colors[slot]) + if((marker.color == -1 || marker.color == this.golem.colors[slot]) && InventoryUtils.areItemStacksEqual(blockStack, stack, - golem.checkOreDict(), golem.ignoreDamage(), golem.ignoreNBT())) { + this.golem.checkOreDict(), this.golem.ignoreDamage(), this.golem.ignoreNBT())) { return true; } } } - - if(empty) { - return true; - } + return empty; } return false; } private IInventory getHomeChest() { - ChunkCoordinates coords = golem.getHomePosition(); - ForgeDirection facing = ForgeDirection.getOrientation(golem.homeFacing); - TileEntity tile = golem.worldObj.getTileEntity(coords.posX - facing.offsetX, coords.posY - facing.offsetY, coords.posZ - facing.offsetZ); - if(tile != null && tile instanceof IInventory) { + ChunkCoordinates coords = this.golem.getHomePosition(); + ForgeDirection facing = ForgeDirection.getOrientation(this.golem.homeFacing); + TileEntity tile = this.golem.worldObj.getTileEntity(coords.posX - facing.offsetX, coords.posY - facing.offsetY, coords.posZ - facing.offsetZ); + if (tile instanceof IInventory) { return (IInventory) tile; } return null; @@ -260,32 +248,32 @@ public class AIBreakBlock extends EntityAIBase { for(int slot = 0; slot < inv.getSizeInventory(); slot++) { ItemStack stack = inv.getStackInSlot(slot); - ItemStack current = golem.getCarried(); + ItemStack current = this.golem.getCarried(); if(current != null) { - current = InventoryUtils.insertStack(inv, current, golem.homeFacing, true); + current = InventoryUtils.insertStack(inv, current, this.golem.homeFacing, true); if(current != null) { return; } - golem.setCarried(null); + this.golem.setCarried(null); - if(hasValidTool()) { - hasValidTool = true; + if(this.hasValidTool()) { + this.hasValidTool = true; return; } } - if(stack != null && isValidTool(stack)) { + if(stack != null && this.isValidTool(stack)) { stack = stack.copy(); stack.stackSize = 1; - stack = InventoryUtils.extractStack(inv, stack, golem.homeFacing, false, false, false, true); + stack = InventoryUtils.extractStack(inv, stack, this.golem.homeFacing, false, false, false, true); if(stack != null) { - golem.setCarried(stack); - golem.updateCarried(); - player.setHeldItem(stack); + this.golem.setCarried(stack); + this.golem.updateCarried(); + this.player.setHeldItem(stack); - hasValidTool = true; + this.hasValidTool = true; break; } } @@ -293,17 +281,17 @@ public class AIBreakBlock extends EntityAIBase { } private boolean hasValidTool() { - hasValidTool = isValidTool(golem.getCarried()); - return hasValidTool; + this.hasValidTool = this.isValidTool(this.golem.getCarried()); + return this.hasValidTool; } private boolean isValidTool(ItemStack tool) { if(tool == null || Block.getBlockFromItem(tool.getItem()) == Blocks.air) { boolean empty = true; - for(int slot = 0; slot < golem.inventory.slotCount; slot++) { - ItemStack stack = golem.inventory.inventory[slot]; + for(int slot = 0; slot < this.golem.inventory.slotCount; slot++) { + ItemStack stack = this.golem.inventory.inventory[slot]; if(stack != null && Block.getBlockFromItem(stack.getItem()) == Blocks.air - && (currentMarker == null || golem.colors[slot] == -1 || currentMarker.color == -1 || golem.colors[slot] == currentMarker.color)) { + && (this.currentMarker == null || this.golem.colors[slot] == -1 || this.currentMarker.color == -1 || this.golem.colors[slot] == this.currentMarker.color)) { empty = false; if(tool == null) { @@ -311,15 +299,12 @@ public class AIBreakBlock extends EntityAIBase { } if(InventoryUtils.areItemStacksEqual(tool, stack, - golem.checkOreDict(), golem.ignoreDamage(), golem.ignoreNBT())) { + this.golem.checkOreDict(), this.golem.ignoreDamage(), this.golem.ignoreNBT())) { return true; } } } - - if(empty && tool == null) { - return true; - } + return empty && tool == null; } return false; } diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AIFollowOwner.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIFollowOwner.java index 4aa1f7a..efe4619 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIFollowOwner.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIFollowOwner.java @@ -12,7 +12,7 @@ import net.minecraft.entity.passive.EntityTameable; * Created by makeo @ 31.10.2015 15:55 */ public class AIFollowOwner extends EntityAIFollowOwner { - EntityTameable entity; + private EntityTameable entity; public AIFollowOwner(EntityTameable entity, float minDist, float maxDist) { super(entity, 0, minDist, maxDist); @@ -21,21 +21,21 @@ public class AIFollowOwner extends EntityAIFollowOwner { @Override public void startExecuting() { - boolean avoidWater = entity.getNavigator().getAvoidsWater(); + boolean avoidWater = this.entity.getNavigator().getAvoidsWater(); super.startExecuting(); - entity.getNavigator().setAvoidsWater(avoidWater); + this.entity.getNavigator().setAvoidsWater(avoidWater); } @Override public void resetTask() { - boolean avoidWater = entity.getNavigator().getAvoidsWater(); + boolean avoidWater = this.entity.getNavigator().getAvoidsWater(); super.resetTask(); - entity.getNavigator().setAvoidsWater(avoidWater); + this.entity.getNavigator().setAvoidsWater(avoidWater); } @Override public void updateTask() { - super.field_75336_f = entity.getAIMoveSpeed(); + super.field_75336_f = this.entity.getAIMoveSpeed(); super.updateTask(); } } diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java b/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java index dc5608a..65db026 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java @@ -20,24 +20,24 @@ public class AISit extends EntityAIBase { public AISit(EntityGolemBase golem) { this.golem = golem; this.properties = (ExtendedGolemProperties) golem.getExtendedProperties(Gadomancy.MODID); - setMutexBits(7); + this.setMutexBits(7); } @Override public boolean shouldExecute() { - return properties.isSitting(); + return this.properties.isSitting(); } @Override public void startExecuting() { - golem.getNavigator().clearPathEntity(); + this.golem.getNavigator().clearPathEntity(); } @Override public boolean continueExecuting() { - golem.setTarget(null); + this.golem.setTarget(null); - golem.getLookHelper().setLookPosition(0, 0, 0, 0, -45); - return properties.isSitting(); + this.golem.getLookHelper().setLookPosition(0, 0, 0, 0, -45); + return this.properties.isSitting(); } } diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java index ba35e3c..da78dc8 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java @@ -25,16 +25,16 @@ public class AIUncheckedAttackOnCollide extends AIGolemAttackOnCollide { @Override public boolean shouldExecute() { - EntityLivingBase target = golem.getAttackTarget(); + EntityLivingBase target = this.golem.getAttackTarget(); if (target == null) { return false; } - PathEntity pathEntity = golem.getNavigator().getPathToEntityLiving(target); + PathEntity pathEntity = this.golem.getNavigator().getPathToEntityLiving(target); if(pathEntity != null) { - INJECTOR.setObject(this); - INJECTOR.setField("entityPathEntity", pathEntity); - INJECTOR.setField("entityTarget", target); + AIUncheckedAttackOnCollide.INJECTOR.setObject(this); + AIUncheckedAttackOnCollide.INJECTOR.setField("entityPathEntity", pathEntity); + AIUncheckedAttackOnCollide.INJECTOR.setField("entityTarget", target); return true; } diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java index bf7b237..72b44b9 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java @@ -24,18 +24,18 @@ public class AIUncheckedDartAttack extends AIDartAttack { @Override public boolean shouldExecute() { - EntityLivingBase target = golem.getAttackTarget(); + EntityLivingBase target = this.golem.getAttackTarget(); if (target == null) { return false; } - double ra = golem.getDistanceSq(target.posX, target.boundingBox.minY, target.posZ); + double ra = this.golem.getDistanceSq(target.posX, target.boundingBox.minY, target.posZ); if (ra < 9.0D) { return false; } - INJECTOR.setObject(this); - INJECTOR.setField("attackTarget", target); + AIUncheckedDartAttack.INJECTOR.setObject(this); + AIUncheckedDartAttack.INJECTOR.setField("attackTarget", target); return true; diff --git a/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java b/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java index 975ad03..30ae81f 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java +++ b/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java @@ -33,12 +33,12 @@ public class AdvancedFakePlayer extends FakePlayer { } public AdvancedFakePlayer(WorldServer world) { - this(world, DEFAULT_UUID); + this(world, AdvancedFakePlayer.DEFAULT_UUID); } public void setHeldItem(ItemStack item) { - inventory.currentItem = 0; - inventory.mainInventory[0] = item; + this.inventory.currentItem = 0; + this.inventory.mainInventory[0] = item; } public static boolean isFakePlayer(EntityPlayer player) { diff --git a/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java b/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java index e3b3032..51f9706 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java +++ b/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java @@ -4,32 +4,8 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.util.concurrent.GenericFutureListener; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.EnumConnectionState; -import net.minecraft.network.INetHandler; -import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.client.C00PacketKeepAlive; -import net.minecraft.network.play.client.C01PacketChatMessage; -import net.minecraft.network.play.client.C02PacketUseEntity; -import net.minecraft.network.play.client.C03PacketPlayer; -import net.minecraft.network.play.client.C07PacketPlayerDigging; -import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement; -import net.minecraft.network.play.client.C09PacketHeldItemChange; -import net.minecraft.network.play.client.C0APacketAnimation; -import net.minecraft.network.play.client.C0BPacketEntityAction; -import net.minecraft.network.play.client.C0CPacketInput; -import net.minecraft.network.play.client.C0DPacketCloseWindow; -import net.minecraft.network.play.client.C0EPacketClickWindow; -import net.minecraft.network.play.client.C0FPacketConfirmTransaction; -import net.minecraft.network.play.client.C10PacketCreativeInventoryAction; -import net.minecraft.network.play.client.C11PacketEnchantItem; -import net.minecraft.network.play.client.C12PacketUpdateSign; -import net.minecraft.network.play.client.C13PacketPlayerAbilities; -import net.minecraft.network.play.client.C14PacketTabComplete; -import net.minecraft.network.play.client.C15PacketClientSettings; -import net.minecraft.network.play.client.C16PacketClientStatus; -import net.minecraft.network.play.client.C17PacketCustomPayload; +import net.minecraft.network.*; +import net.minecraft.network.play.client.*; import net.minecraft.server.MinecraftServer; import net.minecraft.util.IChatComponent; diff --git a/src/main/java/makeo/gadomancy/common/entities/fake/GolemFakePlayer.java b/src/main/java/makeo/gadomancy/common/entities/fake/GolemFakePlayer.java index f9bb04d..689f3c7 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/GolemFakePlayer.java +++ b/src/main/java/makeo/gadomancy/common/entities/fake/GolemFakePlayer.java @@ -32,52 +32,52 @@ public class GolemFakePlayer extends AdvancedFakePlayer { @Override public Collection getActivePotionEffects() { - return golem.getActivePotionEffects(); + return this.golem.getActivePotionEffects(); } @Override public boolean isPotionActive(int p_82165_1_) { - return golem.isPotionActive(p_82165_1_); + return this.golem.isPotionActive(p_82165_1_); } @Override public boolean isPotionActive(Potion p_70644_1_) { - return golem.isPotionActive(p_70644_1_); + return this.golem.isPotionActive(p_70644_1_); } @Override public void clearActivePotions() { - golem.clearActivePotions(); + this.golem.clearActivePotions(); } @Override public void addPotionEffect(PotionEffect p_70690_1_) { - golem.addPotionEffect(p_70690_1_); + this.golem.addPotionEffect(p_70690_1_); } @Override public boolean isPotionApplicable(PotionEffect p_70687_1_) { - return golem.isPotionApplicable(p_70687_1_); + return this.golem.isPotionApplicable(p_70687_1_); } @Override public void removePotionEffect(int p_82170_1_) { - golem.removePotionEffect(p_82170_1_); + this.golem.removePotionEffect(p_82170_1_); } @Override public void removePotionEffectClient(int p_70618_1_) { - golem.removePotionEffectClient(p_70618_1_); + this.golem.removePotionEffectClient(p_70618_1_); } @Override public PotionEffect getActivePotionEffect(Potion p_70660_1_) { - return golem.getActivePotionEffect(p_70660_1_); + return this.golem.getActivePotionEffect(p_70660_1_); } @Override public void curePotionEffects(ItemStack curativeItem) { - golem.curePotionEffects(curativeItem); + this.golem.curePotionEffects(curativeItem); } @Override diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java b/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java index d5958fe..01f6295 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java @@ -28,15 +28,15 @@ public class ItemAdditionalGolemPlacer extends Item { private final AdditionalGolemType type; public ItemAdditionalGolemPlacer(AdditionalGolemType type) { - setCreativeTab(RegisteredItems.creativeTab); - setMaxStackSize(1); + this.setCreativeTab(RegisteredItems.creativeTab); + this.setMaxStackSize(1); this.type = type; } @Override public void registerIcons(IIconRegister ir) { - placer.registerIcons(ir); - type.registerIcons(ir); + this.placer.registerIcons(ir); + this.type.registerIcons(ir); } @Override @@ -46,25 +46,25 @@ public class ItemAdditionalGolemPlacer extends Item { @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - list.add(new ItemStack(type.getPlacerItem(), 1, type.getEnumEntry().ordinal())); + list.add(new ItemStack(this.type.getPlacerItem(), 1, this.type.getEnumEntry().ordinal())); } public IIcon getIcon(ItemStack stack, int pass) { - int typePasses = type.getRenderPasses(); + int typePasses = this.type.getRenderPasses(); if(pass < typePasses) { - return type.getIcon(stack, pass); + return this.type.getIcon(stack, pass); } - return placer.getIcon(stack, pass - typePasses + 1); + return this.placer.getIcon(stack, pass - typePasses + 1); } @SideOnly(Side.CLIENT) public int getRenderPasses(int metadata) { - return type.getRenderPasses() + placer.getRenderPasses(metadata) - 1; + return this.type.getRenderPasses() + this.placer.getRenderPasses(metadata) - 1; } @Override public IIcon getIconFromDamage(int damage) { - return type.getIcon(new ItemStack(this, 1, damage), 0); + return this.type.getIcon(new ItemStack(this, 1, damage), 0); } @SideOnly(Side.CLIENT) @@ -73,29 +73,29 @@ public class ItemAdditionalGolemPlacer extends Item { } public String getUnlocalizedName(ItemStack stack) { - return getUnlocalizedName(); + return this.getUnlocalizedName(); } @Override public String getUnlocalizedName() { - return type.getUnlocalizedName(); + return this.type.getUnlocalizedName(); } public boolean getShareTag() { - return placer.getShareTag(); + return this.placer.getShareTag(); } @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - placer.addInformation(stack, player, list, par4); + this.placer.addInformation(stack, player, list, par4); } public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { - return placer.doesSneakBypassUse(world, x, y, z, player); + return this.placer.doesSneakBypassUse(world, x, y, z, player); } @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - return placer.onItemUseFirst(stack, player, world, x, y, z, side, hitX, hitY, hitZ); + return this.placer.onItemUseFirst(stack, player, world, x, y, z, side, hitX, hitY, hitZ); } } \ No newline at end of file diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java index 9cdfc61..572d897 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java @@ -11,13 +11,7 @@ import makeo.gadomancy.common.registration.RegisteredItems; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIHurtByTarget; -import net.minecraft.entity.ai.EntityAILookIdle; -import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget; -import net.minecraft.entity.ai.EntityAIOwnerHurtTarget; -import net.minecraft.entity.ai.EntityAIWatchClosest; -import net.minecraft.entity.ai.EntityLookHelper; -import net.minecraft.entity.ai.EntitySenses; +import net.minecraft.entity.ai.*; import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.EntityTameable; @@ -85,40 +79,40 @@ public class BodyguardGolemCore extends AdditionalGolemCore { @Override public float getAIMoveSpeed() { - return golem.getAIMoveSpeed(); + return this.golem.getAIMoveSpeed(); } @Override public Random getRNG() { - return golem.getRNG(); + return this.golem.getRNG(); } @Override public EntityLivingBase getAttackTarget() { - return golem.getAttackTarget(); + return this.golem.getAttackTarget(); } @Override public boolean canAttackClass(Class p_70686_1_) { - return golem.canAttackClass(p_70686_1_); + return this.golem.canAttackClass(p_70686_1_); } @Override public EntitySenses getEntitySenses() { - return golem.getEntitySenses(); + return this.golem.getEntitySenses(); } @Override public IAttributeInstance getEntityAttribute(IAttribute p_110148_1_) { - if(golem != null) { - return golem.getEntityAttribute(p_110148_1_); + if(this.golem != null) { + return this.golem.getEntityAttribute(p_110148_1_); } return super.getEntityAttribute(p_110148_1_); } @Override public void setAttackTarget(EntityLivingBase p_70624_1_) { - golem.setAttackTarget(p_70624_1_); + this.golem.setAttackTarget(p_70624_1_); } @Override @@ -128,7 +122,7 @@ public class BodyguardGolemCore extends AdditionalGolemCore { @Override public PathNavigate getNavigator() { - return golem.getNavigator(); + return this.golem.getNavigator(); } @Override @@ -138,34 +132,34 @@ public class BodyguardGolemCore extends AdditionalGolemCore { @Override public EntityLivingBase getOwner() { - return golem.getOwner(); + return this.golem.getOwner(); } @Override public EntityLookHelper getLookHelper() { - return golem.getLookHelper(); + return this.golem.getLookHelper(); } @Override public double getDistanceSqToEntity(Entity entity) { - return golem.getDistanceSqToEntity(entity); + return this.golem.getDistanceSqToEntity(entity); } @Override public boolean getLeashed() { - return golem.getLeashed(); + return this.golem.getLeashed(); } @Override public int getVerticalFaceSpeed() { - return golem.getVerticalFaceSpeed(); + return this.golem.getVerticalFaceSpeed(); } @Override public void setLocationAndAngles(double x, double y, double z, float rotationYaw, float rotationPitch) { - rotationYaw = golem.rotationYaw; - rotationPitch = golem.rotationPitch; - golem.setLocationAndAngles(x, y, z, rotationYaw, rotationPitch); + rotationYaw = this.golem.rotationYaw; + rotationPitch = this.golem.rotationPitch; + this.golem.setLocationAndAngles(x, y, z, rotationYaw, rotationPitch); this.worldObj.playSoundEffect(x, y, z, "mob.endermen.portal", 0.5F, 1.0F); } } diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java b/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java index e74aeea..5147d09 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java @@ -31,7 +31,7 @@ public class EntityAITasksWrapper extends EntityAITasks { this.golem = golem; this.original = tasks; - this.taskEntries = new WrapperList(original.taskEntries); + this.taskEntries = new WrapperList(this.original.taskEntries); this.original.taskEntries = this.taskEntries; this.scheduleUpdate = scheduleUpdate; @@ -44,40 +44,40 @@ public class EntityAITasksWrapper extends EntityAITasks { @Override public void clear() { - if(!isLocked()) { + if(!EntityAITasksWrapper.this.isLocked()) { super.clear(); - } else if(scheduleUpdate) { - ((ExtendedGolemProperties)golem.getExtendedProperties(Gadomancy.MODID)).updateGolem(); + } else if(EntityAITasksWrapper.this.scheduleUpdate) { + ((ExtendedGolemProperties) EntityAITasksWrapper.this.golem.getExtendedProperties(Gadomancy.MODID)).updateGolem(); } } } public void unlock() { - locked = false; + this.locked = false; } public void lock() { - locked = true; + this.locked = true; } public boolean isLocked() { - return locked && GadomancyApi.getAdditionalGolemCore(golem) != null; + return this.locked && GadomancyApi.getAdditionalGolemCore(this.golem) != null; } @Override public void addTask(int index, EntityAIBase ai) { - if(!isLocked()) { - original.addTask(index, ai); + if(!this.isLocked()) { + this.original.addTask(index, ai); } } @Override public void removeTask(EntityAIBase ai) { - original.removeTask(ai); + this.original.removeTask(ai); } @Override public void onUpdateTasks() { - original.onUpdateTasks(); + this.original.onUpdateTasks(); } } diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java index 1d9bb9b..dc3b927 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java @@ -27,32 +27,32 @@ public class ExtendedGolemProperties implements IExtendedEntityProperties { private EntityGolemBase golem; - private boolean updateHealth = false; + private boolean updateHealth; private float health; - private boolean isSitting = false; + private boolean isSitting; - private EntityAITasksWrapper taskWrapper = null; - private EntityAITasksWrapper targetWrapper = null; + private EntityAITasksWrapper taskWrapper; + private EntityAITasksWrapper targetWrapper; public ExtendedGolemProperties(EntityGolemBase golem) { this.golem = golem; } public boolean shouldUpdateHealth() { - return updateHealth; + return this.updateHealth; } public void resetUpdateHealth() { - updateHealth = false; + this.updateHealth = false; } public float getHealth() { - return health; + return this.health; } public boolean isSitting() { - return isSitting; + return this.isSitting; } public void setSitting(boolean isSitting) { @@ -61,21 +61,21 @@ public class ExtendedGolemProperties implements IExtendedEntityProperties { @Override public void saveNBTData(NBTTagCompound compound) { - AdditionalGolemType type = GadomancyApi.getAdditionalGolemType(golem.getGolemType()); + AdditionalGolemType type = GadomancyApi.getAdditionalGolemType(this.golem.getGolemType()); if(type != null) { NBTTagCompound entityData; - if(compound.hasKey(FORGE_TAG)) { - entityData = compound.getCompoundTag(FORGE_TAG); + if(compound.hasKey(ExtendedGolemProperties.FORGE_TAG)) { + entityData = compound.getCompoundTag(ExtendedGolemProperties.FORGE_TAG); } else { entityData = new NBTTagCompound(); - compound.setTag(FORGE_TAG, entityData); + compound.setTag(ExtendedGolemProperties.FORGE_TAG, entityData); } - writeAdvancedGolemType(entityData, type); - golem.ridingEntity = new OverrideRidingEntity(golem, compound, golem.ridingEntity); + ExtendedGolemProperties.writeAdvancedGolemType(entityData, type); + this.golem.ridingEntity = new OverrideRidingEntity(this.golem, compound, this.golem.ridingEntity); } - compound.setBoolean(Gadomancy.MODID + ":sitting", isSitting); + compound.setBoolean(Gadomancy.MODID + ":sitting", this.isSitting); } private static void writeAdvancedGolemType(NBTTagCompound base, AdditionalGolemType type) { @@ -86,35 +86,35 @@ public class ExtendedGolemProperties implements IExtendedEntityProperties { compound = new NBTTagCompound(); base.setTag(Gadomancy.MODID, compound); } - compound.setString(TYPE_TAG, type.getEnumEntry().name()); + compound.setString(ExtendedGolemProperties.TYPE_TAG, type.getEnumEntry().name()); } @Override public void loadNBTData(NBTTagCompound compound) { if(compound.hasKey("GolemType")) { - AdditionalGolemType type = readAdvancedGolemType(golem.getEntityData()); + AdditionalGolemType type = ExtendedGolemProperties.readAdvancedGolemType(this.golem.getEntityData()); if(type != null) { byte lastType = compound.getByte("GolemType"); compound.setTag("GolemType", new OverrideNBTTagByte(lastType, (byte)type.getEnumEntry().ordinal())); - health = compound.getFloat("HealF") * -1; - updateHealth = true; + this.health = compound.getFloat("HealF") * -1; + this.updateHealth = true; } } - isSitting = compound.getBoolean(Gadomancy.MODID + ":sitting"); + this.isSitting = compound.getBoolean(Gadomancy.MODID + ":sitting"); - updateGolemCore(); + this.updateGolemCore(); } public void updateGolemCore() { - if(!golem.worldObj.isRemote) { - if(NBTHelper.hasPersistentData(golem)) { - NBTTagCompound persistent = NBTHelper.getPersistentData(golem); + if(!this.golem.worldObj.isRemote) { + if(NBTHelper.hasPersistentData(this.golem)) { + NBTTagCompound persistent = NBTHelper.getPersistentData(this.golem); if(persistent.hasKey("Core")) { for(AdditionalGolemCore core : GadomancyApi.getAdditionalGolemCores()) { if(core.getName().equals(persistent.getString("Core"))) { - golem.getDataWatcher().updateObject(ModConfig.golemDatawatcherId, core.getName()); + this.golem.getDataWatcher().updateObject(ModConfig.golemDatawatcherId, core.getName()); break; } } @@ -125,49 +125,49 @@ public class ExtendedGolemProperties implements IExtendedEntityProperties { public void setWrapperIfNeeded() { boolean needsUpdate = false; - if(taskWrapper == null) { - taskWrapper = new EntityAITasksWrapper(golem, golem.tasks, true); - golem.tasks = taskWrapper; + if(this.taskWrapper == null) { + this.taskWrapper = new EntityAITasksWrapper(this.golem, this.golem.tasks, true); + this.golem.tasks = this.taskWrapper; needsUpdate = true; } - if(targetWrapper == null) { - targetWrapper = new EntityAITasksWrapper(golem, golem.targetTasks, false); - golem.targetTasks = targetWrapper; + if(this.targetWrapper == null) { + this.targetWrapper = new EntityAITasksWrapper(this.golem, this.golem.targetTasks, false); + this.golem.targetTasks = this.targetWrapper; needsUpdate = true; } if(needsUpdate) { - updateGolem(); + this.updateGolem(); } } public void updateGolem() { - taskWrapper.unlock(); - targetWrapper.unlock(); + this.taskWrapper.unlock(); + this.targetWrapper.unlock(); - golem.setupGolem(); - golem.setupGolemInventory(); + this.golem.setupGolem(); + this.golem.setupGolemInventory(); - AdditionalGolemCore core = GadomancyApi.getAdditionalGolemCore(golem); + AdditionalGolemCore core = GadomancyApi.getAdditionalGolemCore(this.golem); if(core != null) { - taskWrapper.taskEntries.clear(); - targetWrapper.taskEntries.clear(); + this.taskWrapper.taskEntries.clear(); + this.targetWrapper.taskEntries.clear(); - core.setupGolem(golem); + core.setupGolem(this.golem); - taskWrapper.lock(); - targetWrapper.lock(); + this.taskWrapper.lock(); + this.targetWrapper.lock(); } } private static AdditionalGolemType readAdvancedGolemType(NBTTagCompound base) { if(base.hasKey(Gadomancy.MODID)) { NBTTagCompound compound = base.getCompoundTag(Gadomancy.MODID); - if(compound.hasKey(TYPE_TAG)) { - return GadomancyApi.getAdditionalGolemType(compound.getString(TYPE_TAG)); + if(compound.hasKey(ExtendedGolemProperties.TYPE_TAG)) { + return GadomancyApi.getAdditionalGolemType(compound.getString(ExtendedGolemProperties.TYPE_TAG)); } } return null; diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideNBTTagByte.java b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideNBTTagByte.java index de6080e..a0d1d67 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideNBTTagByte.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideNBTTagByte.java @@ -22,9 +22,9 @@ public class OverrideNBTTagByte extends NBTTagByte { @Override public byte func_150290_f() { - if(override) { - override = false; - return overrideData; + if(this.override) { + this.override = false; + return this.overrideData; } return super.func_150290_f(); } diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideRidingEntity.java b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideRidingEntity.java index 92cc388..4436abf 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideRidingEntity.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/OverrideRidingEntity.java @@ -31,15 +31,15 @@ public class OverrideRidingEntity extends Entity { @Override public boolean writeMountToNBT(NBTTagCompound compound) { - this.compound.setFloat("HealF", golem.getHealth() * -1); - this.compound.setByte("GolemType", (byte) DEFAULT_TYPE.ordinal()); + this.compound.setFloat("HealF", this.golem.getHealth() * -1); + this.compound.setByte("GolemType", (byte) OverrideRidingEntity.DEFAULT_TYPE.ordinal()); boolean result = false; - if(ridingEntity != null) { - result = ridingEntity.writeMountToNBT(compound); + if(this.ridingEntity != null) { + result = this.ridingEntity.writeMountToNBT(compound); } - golem.ridingEntity = ridingEntity; + this.golem.ridingEntity = this.ridingEntity; return result; } diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java index 6123e67..07e4ea1 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java @@ -29,12 +29,12 @@ public class ObsidianGolemType extends AdditionalGolemType { private IIcon icon; @Override public void registerIcons(IIconRegister ir) { - icon = ir.registerIcon(Gadomancy.MODID + ":golem_obsidian"); + this.icon = ir.registerIcon(Gadomancy.MODID + ":golem_obsidian"); } @Override public IIcon getIcon(ItemStack stack, int pass) { - return icon; + return this.icon; } @Override diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java index 269d382..4f392cb 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java @@ -27,12 +27,12 @@ public class RemovedGolemType extends AdditionalGolemType { private IIcon icon; @Override public void registerIcons(IIconRegister ir) { - icon = ir.registerIcon(""); + this.icon = ir.registerIcon(""); } @Override public IIcon getIcon(ItemStack stack, int pass) { - return icon; + return this.icon; } @Override diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java index 2e50fc0..5990b94 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java @@ -29,12 +29,12 @@ public class SilverwoodGolemType extends AdditionalGolemType { private IIcon icon; @Override public void registerIcons(IIconRegister ir) { - icon = ir.registerIcon(Gadomancy.MODID + ":golem_silverwood"); + this.icon = ir.registerIcon(Gadomancy.MODID + ":golem_silverwood"); } @Override public IIcon getIcon(ItemStack stack, int pass) { - return icon; + return this.icon; } @Override diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java index fd61152..6e893fa 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java @@ -22,11 +22,11 @@ public abstract class GolemUpgrade { public abstract String getName(); public String getTagName() { - return getName(); + return this.getName(); } public String getText() { - return Gadomancy.MODID.toLowerCase() + ".upgrades." + getName().toLowerCase(); + return Gadomancy.MODID.toLowerCase() + ".upgrades." + this.getName().toLowerCase(); } public ItemStack getUpgradeItem() { @@ -38,69 +38,69 @@ public abstract class GolemUpgrade { } protected T getUpgradeData(ItemStack stack) { - return getUpgradeData(NBTHelper.getPersistentData(stack)); + return this.getUpgradeData(NBTHelper.getPersistentData(stack)); } protected T getUpgradeData(EntityGolemBase golem) { - return getUpgradeData(NBTHelper.getPersistentData(golem)); + return this.getUpgradeData(NBTHelper.getPersistentData(golem)); } protected T getUpgradeData(NBTTagCompound compound) { - if(compound.hasKey(UPGRADE_COMPOUND)) { - NBTTagCompound upgrades = compound.getCompoundTag(UPGRADE_COMPOUND); + if(compound.hasKey(GolemUpgrade.UPGRADE_COMPOUND)) { + NBTTagCompound upgrades = compound.getCompoundTag(GolemUpgrade.UPGRADE_COMPOUND); try { - return (T) upgrades.getTag(getTagName()); + return (T) upgrades.getTag(this.getTagName()); } catch (ClassCastException ignored) {} } return null; } public boolean hasUpgrade(ItemStack stack) { - return hasUpgrade(NBTHelper.getPersistentData(stack)); + return this.hasUpgrade(NBTHelper.getPersistentData(stack)); } public boolean hasUpgrade(EntityGolemBase golem) { - return hasUpgrade(NBTHelper.getPersistentData(golem)); + return this.hasUpgrade(NBTHelper.getPersistentData(golem)); } protected boolean hasUpgrade(NBTTagCompound compound) { - return getUpgradeData(compound) != null; + return this.getUpgradeData(compound) != null; } public void addUpgrade(ItemStack stack) { - addUpgrade(NBTHelper.getPersistentData(stack)); + this.addUpgrade(NBTHelper.getPersistentData(stack)); } public void addUpgrade(EntityGolemBase golem) { - addUpgrade(NBTHelper.getPersistentData(golem)); + this.addUpgrade(NBTHelper.getPersistentData(golem)); } protected void addUpgrade(NBTTagCompound compound) { - NBTTagCompound upgrades = compound.getCompoundTag(UPGRADE_COMPOUND); - if(!compound.hasKey(UPGRADE_COMPOUND)) { - compound.setTag(UPGRADE_COMPOUND, upgrades); + NBTTagCompound upgrades = compound.getCompoundTag(GolemUpgrade.UPGRADE_COMPOUND); + if(!compound.hasKey(GolemUpgrade.UPGRADE_COMPOUND)) { + compound.setTag(GolemUpgrade.UPGRADE_COMPOUND, upgrades); } - NBTBase data = createUpgradeData(); - upgrades.setTag(getTagName(), data == null ? new NBTTagByte((byte)1) : data); + NBTBase data = this.createUpgradeData(); + upgrades.setTag(this.getTagName(), data == null ? new NBTTagByte((byte)1) : data); } public void removeUpgrade(ItemStack stack) { - removeUpgrade(NBTHelper.getPersistentData(stack)); + this.removeUpgrade(NBTHelper.getPersistentData(stack)); } public void removeUpgrade(EntityGolemBase golem) { - removeUpgrade(NBTHelper.getPersistentData(golem)); + this.removeUpgrade(NBTHelper.getPersistentData(golem)); } protected void removeUpgrade(NBTTagCompound compound) { - if(compound.hasKey(UPGRADE_COMPOUND)) { - compound.removeTag(getTagName()); + if(compound.hasKey(GolemUpgrade.UPGRADE_COMPOUND)) { + compound.removeTag(this.getTagName()); } } @Override public boolean equals(Object obj) { - return obj instanceof GolemUpgrade && ((GolemUpgrade) obj).getName().equals(getName()); + return obj instanceof GolemUpgrade && ((GolemUpgrade) obj).getName().equals(this.getName()); } } diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java index b9ceeff..c647b46 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java @@ -27,19 +27,19 @@ public class GolemUpgradeRunicShield extends GolemUpgrade { } public float absorb(EntityGolemBase golem, float amount, DamageSource source) { - float charge = getCharge(golem); + float charge = this.getCharge(golem); if(Math.floor(charge) > 0) { - sendShieldEffect(golem, source); + this.sendShieldEffect(golem, source); float rest = (float)(Math.floor(charge) - amount); float chargeRest = charge - (float)Math.floor(charge); if(rest <= 0) { - setCharge(golem, chargeRest); + this.setCharge(golem, chargeRest); return rest * -1; } else { - setCharge(golem, (float)Math.floor(rest) + chargeRest); + this.setCharge(golem, (float)Math.floor(rest) + chargeRest); return 0; } } @@ -61,28 +61,28 @@ public class GolemUpgradeRunicShield extends GolemUpgrade { } public float getCharge(EntityGolemBase golem) { - int elapsed = golem.ticksExisted - getLastDischarge(golem); - float charge = elapsed * getRechargeSpeed(golem); - float limit = getChargeLimit(golem); + int elapsed = golem.ticksExisted - this.getLastDischarge(golem); + float charge = elapsed * this.getRechargeSpeed(golem); + float limit = this.getChargeLimit(golem); return charge > limit ? limit : charge; } private void setCharge(EntityGolemBase golem, float charge) { - int ticksNeeded = Math.round(charge / getRechargeSpeed(golem)); - setLastDischarge(golem, golem.ticksExisted - ticksNeeded); + int ticksNeeded = Math.round(charge / this.getRechargeSpeed(golem)); + this.setLastDischarge(golem, golem.ticksExisted - ticksNeeded); } private void setLastDischarge(EntityGolemBase golem, Integer ticks) { - golem.getEntityData().setInteger(LAST_DISCHARGE_TAG, ticks); + golem.getEntityData().setInteger(GolemUpgradeRunicShield.LAST_DISCHARGE_TAG, ticks); } private int getLastDischarge(EntityGolemBase golem) { NBTTagCompound compound = golem.getEntityData(); - if(!compound.hasKey(LAST_DISCHARGE_TAG)) { - compound.setInteger(LAST_DISCHARGE_TAG, golem.ticksExisted); + if(!compound.hasKey(GolemUpgradeRunicShield.LAST_DISCHARGE_TAG)) { + compound.setInteger(GolemUpgradeRunicShield.LAST_DISCHARGE_TAG, golem.ticksExisted); return golem.ticksExisted; } - return compound.getInteger(LAST_DISCHARGE_TAG); + return compound.getInteger(GolemUpgradeRunicShield.LAST_DISCHARGE_TAG); } private float getRechargeSpeed(EntityGolemBase golem) { @@ -90,7 +90,7 @@ public class GolemUpgradeRunicShield extends GolemUpgrade { } public int getChargeLimit(EntityGolemBase golem) { - return getChargeLimit(golem.getGolemType(), golem.getMaxHealth()); + return this.getChargeLimit(golem.getGolemType(), golem.getMaxHealth()); } public int getChargeLimit(ItemStack stack) { @@ -100,7 +100,7 @@ public class GolemUpgradeRunicShield extends GolemUpgrade { && stack.getTagCompound().getString("deco").contains("H")) { maxHealth += 5; } - return getChargeLimit(type, maxHealth); + return this.getChargeLimit(type, maxHealth); } private int getChargeLimit(EnumGolemType type, float maxHealth) { diff --git a/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java b/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java index 1bebf51..c3b87b4 100644 --- a/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java +++ b/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java @@ -22,7 +22,7 @@ public class ExtendedPlayerProperties implements IExtendedEntityProperties { private final EntityPlayer player; - private boolean isTransformed = false; + private boolean isTransformed; public ExtendedPlayerProperties(EntityPlayer player) { this.player = player; @@ -32,20 +32,20 @@ public class ExtendedPlayerProperties implements IExtendedEntityProperties { public void saveNBTData(NBTTagCompound compound) { NBTTagCompound modData = NBTHelper.getPersistentData(compound); - modData.setBoolean("isTransformed", isTransformed); + modData.setBoolean("isTransformed", this.isTransformed); } @Override public void loadNBTData(NBTTagCompound compound) { NBTTagCompound modData = NBTHelper.getPersistentData(compound); - isTransformed = NBTHelper.getBoolean(modData, "isTransformed", DEFAULTS.isTransformed); - player.getDataWatcher().updateObject(TRANSFORM_INDEX, isTransformed); + this.isTransformed = NBTHelper.getBoolean(modData, "isTransformed", ExtendedPlayerProperties.DEFAULTS.isTransformed); + this.player.getDataWatcher().updateObject(ExtendedPlayerProperties.TRANSFORM_INDEX, this.isTransformed); } @Override public void init(Entity entity, World world) { - player.getDataWatcher().addObject(TRANSFORM_INDEX, isTransformed); + this.player.getDataWatcher().addObject(ExtendedPlayerProperties.TRANSFORM_INDEX, this.isTransformed); } public static boolean isTransformed(EntityPlayer player) { diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java index a49e016..1edc712 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java @@ -4,11 +4,9 @@ import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import makeo.gadomancy.common.aura.AuraEffects; import makeo.gadomancy.common.blocks.tiles.TileAIShutdown; -import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.entities.EntityPermNoClipItem; -import makeo.gadomancy.common.familiar.FamiliarAIController_Old; import makeo.gadomancy.common.utils.MiscUtils; import makeo.gadomancy.common.utils.Vector3; import makeo.gadomancy.common.utils.world.TCMazeHandler; @@ -24,7 +22,6 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import thaumcraft.common.items.armor.Hover; @@ -56,7 +53,7 @@ public class EventHandlerEntity { if(event.entityLiving.isCreatureType(EnumCreatureType.monster, false)) { double rangeSq = AuraEffects.LUX.getRange() * AuraEffects.LUX.getRange(); Vector3 entityPos = MiscUtils.getPositionVector(event.entity); - for(ChunkCoordinates luxPylons : registeredLuxPylons) { + for(ChunkCoordinates luxPylons : EventHandlerEntity.registeredLuxPylons) { Vector3 pylon = Vector3.fromCC(luxPylons); if(entityPos.distanceSquared(pylon) <= rangeSq) { event.setResult(Event.Result.DENY); @@ -97,11 +94,11 @@ public class EventHandlerEntity { @SubscribeEvent public void on(EntityItemPickupEvent event) { if (!event.entityPlayer.worldObj.isRemote) { - if (event.item != null && event.item instanceof EntityPermNoClipItem) { + if (event.item instanceof EntityPermNoClipItem) { EntityPermNoClipItem item = (EntityPermNoClipItem) event.item; ChunkCoordinates master = (ChunkCoordinates) item.getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherMasterId).getObject(); TileEntity te = event.entityPlayer.worldObj.getTileEntity(master.posX, master.posY, master.posZ); - if (te == null || !(te instanceof EntityPermNoClipItem.IItemMasterTile)) return; + if (!(te instanceof EntityPermNoClipItem.IItemMasterTile)) return; ((EntityPermNoClipItem.IItemMasterTile) te).informItemRemoval(); } } @@ -109,7 +106,7 @@ public class EventHandlerEntity { @SubscribeEvent public void on(LivingEvent.LivingUpdateEvent event) { - if (event.entityLiving == null || !(event.entityLiving instanceof EntityPlayer)) return; + if (!(event.entityLiving instanceof EntityPlayer)) return; EntityPlayer player = (EntityPlayer) event.entity; if ((event.entity.worldObj.provider.dimensionId == ModConfig.dimOuterId) && ((player.ticksExisted & 7) == 0) && ((player.capabilities.isFlying) || (Hover.getHover(player.getEntityId())))) { if(player.capabilities.isCreativeMode && MiscUtils.isANotApprovedOrMisunderstoodPersonFromMoreDoor(player)) return; diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java index 4dcc93c..6522fd0 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java @@ -15,7 +15,6 @@ import makeo.gadomancy.common.entities.golems.ItemAdditionalGolemPlacer; import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; import makeo.gadomancy.common.registration.RegisteredGolemStuff; import makeo.gadomancy.common.registration.RegisteredPotions; -import makeo.gadomancy.common.utils.MiscUtils; import makeo.gadomancy.common.utils.NBTHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -23,8 +22,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityEvent; @@ -152,9 +149,9 @@ public class EventHandlerGolem { if(!event.entity.worldObj.isRemote && event.entity instanceof EntityGolemBase && event.name.equals("thaumcraft:zap") && event.volume == 0.5F && event.pitch == 1.0F) { EntityGolemBase golem = (EntityGolemBase) event.entity; - if(markedGolems.containsKey(golem)) { - EntityPlayer player = markedGolems.get(golem); - markedGolems.remove(golem); + if(this.markedGolems.containsKey(golem)) { + EntityPlayer player = this.markedGolems.get(golem); + this.markedGolems.remove(golem); AdditionalGolemCore core = GadomancyApi.getAdditionalGolemCore(golem); @@ -197,7 +194,7 @@ public class EventHandlerGolem { if(heldItem != null && heldItem.getItem() == ConfigItems.itemGolemBell && event.target instanceof EntityGolemBase && !event.target.worldObj.isRemote && !event.target.isDead) { event.target.captureDrops = true; - markedGolems.put((EntityGolemBase) event.target, event.entityPlayer); + this.markedGolems.put((EntityGolemBase) event.target, event.entityPlayer); } } diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java index cf60a8f..6dfa688 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java @@ -32,22 +32,22 @@ import java.util.List; public class EventHandlerRedirect { private static final ItemStack ITEM_GOGGLES = new ItemStack(ConfigItems.itemGoggles); - private static boolean hasChanged = false; + private static boolean hasChanged; private static ItemStack oldItem; public static void addGoggles(Entity entity) { - if(entity instanceof EntityPlayer && hasGoggles((EntityPlayer) entity)) { + if(entity instanceof EntityPlayer && EventHandlerRedirect.hasGoggles((EntityPlayer) entity)) { ItemStack[] armorInv = ((EntityPlayer)entity).inventory.armorInventory; - oldItem = armorInv[3]; - hasChanged = true; - armorInv[3] = ITEM_GOGGLES; + EventHandlerRedirect.oldItem = armorInv[3]; + EventHandlerRedirect.hasChanged = true; + armorInv[3] = EventHandlerRedirect.ITEM_GOGGLES; } } public static void removeGoggles(Entity entity) { - if(hasChanged && entity instanceof EntityPlayer) { - ((EntityPlayer)entity).inventory.armorInventory[3] = oldItem; - oldItem = null; - hasChanged = false; + if(EventHandlerRedirect.hasChanged && entity instanceof EntityPlayer) { + ((EntityPlayer)entity).inventory.armorInventory[3] = EventHandlerRedirect.oldItem; + EventHandlerRedirect.oldItem = null; + EventHandlerRedirect.hasChanged = false; } } @@ -59,20 +59,20 @@ public class EventHandlerRedirect { @SideOnly(Side.CLIENT) public static void preNodeRender(TileEntity tile) { - addGoggles(Minecraft.getMinecraft().renderViewEntity); + EventHandlerRedirect.addGoggles(Minecraft.getMinecraft().renderViewEntity); } @SideOnly(Side.CLIENT) public static void postNodeRender(TileEntity tile) { - removeGoggles(Minecraft.getMinecraft().renderViewEntity); + EventHandlerRedirect.removeGoggles(Minecraft.getMinecraft().renderViewEntity); } public static void preBlockHighlight(DrawBlockHighlightEvent event) { - addGoggles(event.player); + EventHandlerRedirect.addGoggles(event.player); } public static void postBlockHighlight(DrawBlockHighlightEvent event) { - removeGoggles(event.player); + EventHandlerRedirect.removeGoggles(event.player); } public static int getAdditionalVisDiscount(EntityPlayer player, Aspect aspect, int currentTotalDiscount) { @@ -83,7 +83,7 @@ public class EventHandlerRedirect { } public static int getFortuneLevel(EntityLivingBase entity) { - int fortuneLevel = getRealEnchantmentLevel(Enchantment.fortune.effectId, entity.getHeldItem()); + int fortuneLevel = EventHandlerRedirect.getRealEnchantmentLevel(Enchantment.fortune.effectId, entity.getHeldItem()); if(entity.isPotionActive(RegisteredPotions.POTION_LUCK)) { int lvl = entity.getActivePotionEffect(RegisteredPotions.POTION_LUCK).getAmplifier() + 1; //Amplifier 0-indexed fortuneLevel += lvl; @@ -92,7 +92,7 @@ public class EventHandlerRedirect { } public static int getLootingLevel(EntityLivingBase entity) { - int lootingLevel = getRealEnchantmentLevel(Enchantment.looting.effectId, entity.getHeldItem()); + int lootingLevel = EventHandlerRedirect.getRealEnchantmentLevel(Enchantment.looting.effectId, entity.getHeldItem()); if(entity.isPotionActive(RegisteredPotions.POTION_LUCK)) { int lvl = entity.getActivePotionEffect(RegisteredPotions.POTION_LUCK).getAmplifier() + 1; //Amplifier 0-indexed lootingLevel += lvl; @@ -116,14 +116,14 @@ public class EventHandlerRedirect { if(possiblePlayer != null) { if(enchantmentId == Enchantment.fortune.effectId) { - return getFortuneLevel(possiblePlayer); + return EventHandlerRedirect.getFortuneLevel(possiblePlayer); } else if(enchantmentId == Enchantment.looting.effectId) { - return getLootingLevel(possiblePlayer); + return EventHandlerRedirect.getLootingLevel(possiblePlayer); } } - return getRealEnchantmentLevel(enchantmentId, stack); + return EventHandlerRedirect.getRealEnchantmentLevel(enchantmentId, stack); } private static int getRealEnchantmentLevel(int enchantmentId, ItemStack stack) { diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java index 7b9fc45..ce76059 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java @@ -14,11 +14,7 @@ import makeo.gadomancy.common.entities.EntityItemElement; import makeo.gadomancy.common.items.ItemElement; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.GolemEnumHelper; -import makeo.gadomancy.common.utils.ItemUtils; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.NBTHelper; -import makeo.gadomancy.common.utils.WandHandler; +import makeo.gadomancy.common.utils.*; import makeo.gadomancy.common.utils.world.TCMazeHandler; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -42,12 +38,13 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.event.world.WorldEvent; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.tiles.TileJarFillable; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; /** * This class is part of the Gadomancy Mod @@ -64,9 +61,9 @@ public class EventHandlerWorld { public void on(EntityJoinWorldEvent event) { if(!event.world.isRemote && event.entity instanceof EntityItem) { ItemStack stack = ((EntityItem) event.entity).getEntityItem(); - if(isDisguised(stack)) { + if(this.isDisguised(stack)) { long time = event.world.getTotalWorldTime() + event.world.rand.nextInt(60) + 40; - trackedItems.put((EntityItem) event.entity, time); + this.trackedItems.put((EntityItem) event.entity, time); } if(stack.getItem() instanceof ItemElement && !(event.entity instanceof EntityItemElement)) { event.setCanceled(true); @@ -86,13 +83,13 @@ public class EventHandlerWorld { public void on(TickEvent.WorldTickEvent event) { if(event.phase == TickEvent.Phase.START && !event.world.isRemote && event.world.getTotalWorldTime() % 10 == 0) { - Iterator> iterator = trackedItems.entrySet().iterator(); + Iterator> iterator = this.trackedItems.entrySet().iterator(); while(iterator.hasNext()) { Map.Entry entry = iterator.next(); EntityItem entity = entry.getKey(); if(event.world == entity.worldObj) { - if(entity.isDead || !isDisguised(entity.getEntityItem())) { + if(entity.isDead || !this.isDisguised(entity.getEntityItem())) { iterator.remove(); continue; } @@ -133,13 +130,13 @@ public class EventHandlerWorld { return NBTHelper.hasPersistentData(stack) && NBTHelper.getPersistentData(stack).hasKey("disguise"); } - private int serverTick = 0; + private int serverTick; private Entity lastUpdated; @SubscribeEvent(priority = EventPriority.LOWEST) public void on(LivingEvent.LivingUpdateEvent e) { if(!e.entityLiving.worldObj.isRemote) { - lastUpdated = e.entityLiving; + this.lastUpdated = e.entityLiving; } } @@ -186,21 +183,21 @@ public class EventHandlerWorld { TCMazeHandler.scheduleTick(); SyncDataHolder.doNecessaryUpdates(); - serverTick++; - if((serverTick & 15) == 0) { + this.serverTick++; + if((this.serverTick & 15) == 0) { EventHandlerEntity.registeredLuxPylons.clear(); } } - private Map interacts = null; + private Map interacts; @SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true) public void on(BlockEvent.PlaceEvent e) { if (e.isCanceled()) { - if (interacts != null) - interacts.remove(e.player); + if (this.interacts != null) + this.interacts.remove(e.player); } else { - if (!e.world.isRemote && isStickyJar(e.itemInHand)) { + if (!e.world.isRemote && this.isStickyJar(e.itemInHand)) { TileEntity parent = e.world.getTileEntity(e.x, e.y, e.z); if (parent instanceof TileJarFillable) { int metadata = e.world.getBlockMetadata(e.x, e.y, e.z); @@ -208,7 +205,7 @@ public class EventHandlerWorld { TileEntity tile = e.world.getTileEntity(e.x, e.y, e.z); if (tile instanceof TileStickyJar) { - Integer sideHit = interacts.get(e.player); + Integer sideHit = this.interacts.get(e.player); ((TileStickyJar) tile).init((TileJarFillable) parent, e.placedBlock, metadata, ForgeDirection.getOrientation(sideHit == null ? 1 : sideHit).getOpposite()); RegisteredBlocks.blockStickyJar.onBlockPlacedBy(e.world, e.x, e.y, e.z, e.player, e.itemInHand); @@ -244,11 +241,11 @@ public class EventHandlerWorld { @SubscribeEvent(priority = EventPriority.LOWEST) public void on(PlayerInteractEvent e) { if (!e.world.isRemote && e.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK - && isStickyJar(e.entityPlayer.getHeldItem())) { - if (interacts == null) { - interacts = new HashMap(); + && this.isStickyJar(e.entityPlayer.getHeldItem())) { + if (this.interacts == null) { + this.interacts = new HashMap(); } - interacts.put(e.entityPlayer, e.face); + this.interacts.put(e.entityPlayer, e.face); } if (e.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { @@ -299,7 +296,7 @@ public class EventHandlerWorld { public boolean getGameRuleBooleanValue() { boolean mobGriefing = super.getGameRuleBooleanValue(); if(mobGriefing) { - Entity lastUpdated = handler.lastUpdated; + Entity lastUpdated = this.handler.lastUpdated; if(lastUpdated != null) { StackTraceElement[] elements = Thread.currentThread().getStackTrace(); for(StackTraceElement element : elements) { diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java index 50c6c00..3d86e91 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java @@ -6,13 +6,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; /** * This class is part of the Gadomancy Mod @@ -45,76 +39,76 @@ public class FamiliarAIController_Old { } public void scheduleTick() { - reduceRunningCooldowns(); - if(runningTask == null) { - selectNewTask(); + this.reduceRunningCooldowns(); + if(this.runningTask == null) { + this.selectNewTask(); } else { - ItemStack famStack = BaublesApi.getBaubles(owningPlayer).getStackInSlot(0); - runningTask.tick(ticksInTask, owningPlayer.worldObj, owningPlayer, famStack); - ticksInTask++; - if(ticksInTask >= runningTask.getDuration()) { - if(runningTask.getCooldownDuration(famStack) > 0) cooldownProcesses.put(runningTask, runningTask.getCooldownDuration(famStack)); - if(runningTask.tryLoop() && !requestedLoop.contains(runningTask)) requestedLoop.addLast(runningTask); - runningTask = null; - ticksInTask = 0; + ItemStack famStack = BaublesApi.getBaubles(this.owningPlayer).getStackInSlot(0); + this.runningTask.tick(this.ticksInTask, this.owningPlayer.worldObj, this.owningPlayer, famStack); + this.ticksInTask++; + if(this.ticksInTask >= this.runningTask.getDuration()) { + if(this.runningTask.getCooldownDuration(famStack) > 0) this.cooldownProcesses.put(this.runningTask, this.runningTask.getCooldownDuration(famStack)); + if(this.runningTask.tryLoop() && !this.requestedLoop.contains(this.runningTask)) this.requestedLoop.addLast(this.runningTask); + this.runningTask = null; + this.ticksInTask = 0; } } } private void selectNewTask() { - if(!requestedLoop.isEmpty()) { - Iterator it = requestedLoop.iterator(); + if(!this.requestedLoop.isEmpty()) { + Iterator it = this.requestedLoop.iterator(); while(it.hasNext()) { FamiliarAIProcess_Old process = it.next(); - if(!cooldownProcesses.containsKey(process)) { - runningTask = process; + if(!this.cooldownProcesses.containsKey(process)) { + this.runningTask = process; it.remove(); return; } } } - int size = availableTasks.size(); - int randIndex = RAND.nextInt(size); + int size = this.availableTasks.size(); + int randIndex = FamiliarAIController_Old.RAND.nextInt(size); for (int i = 0; i < size; i++) { int index = (randIndex + i) % size; - FamiliarAIProcess_Old process = availableTasks.get(index); - if(process.canRun(owningPlayer.worldObj, owningPlayer.posX, owningPlayer.posY, owningPlayer.posZ, owningPlayer, BaublesApi.getBaubles(owningPlayer).getStackInSlot(0)) && - !cooldownProcesses.containsKey(process)) { - runningTask = process; + FamiliarAIProcess_Old process = this.availableTasks.get(index); + if(process.canRun(this.owningPlayer.worldObj, this.owningPlayer.posX, this.owningPlayer.posY, this.owningPlayer.posZ, this.owningPlayer, BaublesApi.getBaubles(this.owningPlayer).getStackInSlot(0)) && + !this.cooldownProcesses.containsKey(process)) { + this.runningTask = process; } } } private void reduceRunningCooldowns() { - Iterator itProcesses = cooldownProcesses.keySet().iterator(); + Iterator itProcesses = this.cooldownProcesses.keySet().iterator(); while(itProcesses.hasNext()) { FamiliarAIProcess_Old process = itProcesses.next(); - int cd = cooldownProcesses.get(process) - 1; + int cd = this.cooldownProcesses.get(process) - 1; if(cd <= 0) { itProcesses.remove(); } else { - cooldownProcesses.put(process, cd); + this.cooldownProcesses.put(process, cd); } } } public EntityPlayer getOwningPlayer() { - return owningPlayer; + return this.owningPlayer; } public static boolean hasLastTargetter(EntityPlayer player) { - return targetMap.containsKey(player) && targetMap.get(player).size() >= 1; + return FamiliarAIController_Old.targetMap.containsKey(player) && FamiliarAIController_Old.targetMap.get(player).size() >= 1; } public static LinkedList getLastTargetters(EntityPlayer player) { - if(!targetMap.containsKey(player)) return null; - if(targetMap.get(player).size() < 1) return null; - return targetMap.get(player); + if(!FamiliarAIController_Old.targetMap.containsKey(player)) return null; + if(FamiliarAIController_Old.targetMap.get(player).size() < 1) return null; + return FamiliarAIController_Old.targetMap.get(player); } public static void cleanTargetterList(EntityPlayer player) { - if(!targetMap.containsKey(player)) return; - Iterator it = targetMap.get(player).iterator(); + if(!FamiliarAIController_Old.targetMap.containsKey(player)) return; + Iterator it = FamiliarAIController_Old.targetMap.get(player).iterator(); while(it.hasNext()) { EntityLivingBase living = it.next(); if(living.isDead) it.remove(); @@ -124,8 +118,8 @@ public class FamiliarAIController_Old { public static void notifyTargetEvent(EntityLivingBase targetter, EntityPlayer targetted) { LinkedList targetters; boolean needsUpdate = false; - if(targetMap.containsKey(targetted)) { - targetters = targetMap.get(targetted); + if(FamiliarAIController_Old.targetMap.containsKey(targetted)) { + targetters = FamiliarAIController_Old.targetMap.get(targetted); } else { targetters = new LinkedList(); needsUpdate = true; @@ -135,7 +129,7 @@ public class FamiliarAIController_Old { targetters.addLast(targetter); } if(needsUpdate) { - targetMap.put(targetted, targetters); + FamiliarAIController_Old.targetMap.put(targetted, targetters); } } } diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIProcess_Old.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIProcess_Old.java index 5419dac..24d65dd 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIProcess_Old.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIProcess_Old.java @@ -14,13 +14,13 @@ import net.minecraft.world.World; */ public abstract class FamiliarAIProcess_Old { - private static int sessionProcessIdCounter = 0; + private static int sessionProcessIdCounter; private int id; private int duration; public FamiliarAIProcess_Old(int durationTicks) { this.duration = durationTicks; - this.id = sessionProcessIdCounter++; + this.id = FamiliarAIProcess_Old.sessionProcessIdCounter++; } public abstract boolean canRun(World world, double x, double y, double z, EntityPlayer parent, ItemStack itemStack); @@ -34,20 +34,20 @@ public abstract class FamiliarAIProcess_Old { } public final int getDuration() { - return duration; + return this.duration; } @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (o == null || this.getClass() != o.getClass()) return false; FamiliarAIProcess_Old that = (FamiliarAIProcess_Old) o; - return id == that.id; + return this.id == that.id; } @Override public int hashCode() { - return id; + return this.id; } } diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAugment.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAugment.java index 3bd02a5..79a9247 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAugment.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAugment.java @@ -23,14 +23,14 @@ public class FamiliarAugment { //Main effects public static final FamiliarAugment SHOCK = new FamiliarAugment("shock", new AspectList().add(Aspect.AIR, 3).add(Aspect.ENTROPY, 2)); - public static final FamiliarAugment POISON = new FamiliarAugment("poison", new AspectList().add(Aspect.WATER, 3).add(Aspect.ENTROPY, 4)).addConflict(SHOCK); - public static final FamiliarAugment FIRE = new FamiliarAugment("fire", new AspectList().add(Aspect.FIRE, 4).add(Aspect.ORDER, 2)).addConflict(SHOCK, POISON); - public static final FamiliarAugment WEAKNESS = new FamiliarAugment("weakness", new AspectList().add(Aspect.ENTROPY, 3).add(Aspect.EARTH, 3)).addConflict(SHOCK, POISON, FIRE); + public static final FamiliarAugment POISON = new FamiliarAugment("poison", new AspectList().add(Aspect.WATER, 3).add(Aspect.ENTROPY, 4)).addConflict(FamiliarAugment.SHOCK); + public static final FamiliarAugment FIRE = new FamiliarAugment("fire", new AspectList().add(Aspect.FIRE, 4).add(Aspect.ORDER, 2)).addConflict(FamiliarAugment.SHOCK, FamiliarAugment.POISON); + public static final FamiliarAugment WEAKNESS = new FamiliarAugment("weakness", new AspectList().add(Aspect.ENTROPY, 3).add(Aspect.EARTH, 3)).addConflict(FamiliarAugment.SHOCK, FamiliarAugment.POISON, FamiliarAugment.FIRE); //Side effects - public static final FamiliarAugment DAMAGE_INCREASE = new FamiliarAugment("damage", new AspectList().add(Aspect.FIRE, 3)).addCondition(new PreconditionAny(SHOCK, POISON, FIRE, WEAKNESS)); - public static final FamiliarAugment RANGE_INCREASE = new FamiliarAugment("range", new AspectList().add(Aspect.AIR, 2).add(Aspect.ORDER, 1)).addConflict(DAMAGE_INCREASE).addCondition(new PreconditionAny(SHOCK, POISON, FIRE, WEAKNESS)); - public static final FamiliarAugment ATTACK_SPEED = new FamiliarAugment("speed", new AspectList().add(Aspect.ORDER, 2).add(Aspect.FIRE, 1)).addConflict(DAMAGE_INCREASE, RANGE_INCREASE).addCondition(new PreconditionAny(SHOCK, POISON, FIRE, WEAKNESS)); + public static final FamiliarAugment DAMAGE_INCREASE = new FamiliarAugment("damage", new AspectList().add(Aspect.FIRE, 3)).addCondition(new PreconditionAny(FamiliarAugment.SHOCK, FamiliarAugment.POISON, FamiliarAugment.FIRE, FamiliarAugment.WEAKNESS)); + public static final FamiliarAugment RANGE_INCREASE = new FamiliarAugment("range", new AspectList().add(Aspect.AIR, 2).add(Aspect.ORDER, 1)).addConflict(FamiliarAugment.DAMAGE_INCREASE).addCondition(new PreconditionAny(FamiliarAugment.SHOCK, FamiliarAugment.POISON, FamiliarAugment.FIRE, FamiliarAugment.WEAKNESS)); + public static final FamiliarAugment ATTACK_SPEED = new FamiliarAugment("speed", new AspectList().add(Aspect.ORDER, 2).add(Aspect.FIRE, 1)).addConflict(FamiliarAugment.DAMAGE_INCREASE, FamiliarAugment.RANGE_INCREASE).addCondition(new PreconditionAny(FamiliarAugment.SHOCK, FamiliarAugment.POISON, FamiliarAugment.FIRE, FamiliarAugment.WEAKNESS)); private final String unlocalizedName; @@ -52,47 +52,47 @@ public class FamiliarAugment { } private FamiliarAugment addCondition(FamiliarAugmentPrecondition condition) { - preconditions.add(condition); + this.preconditions.add(condition); return this; } private FamiliarAugment addConflict(FamiliarAugment... others) { for(FamiliarAugment augment : others) { if(augment == null) continue; - addConflict(augment); + this.addConflict(augment); } return this; } private FamiliarAugment addConflict(FamiliarAugment other) { - if(!conflicts.contains(other)) conflicts.add(other); + if(!this.conflicts.contains(other)) this.conflicts.add(other); if(!other.conflicts.contains(this)) other.conflicts.add(this); return this; } public AspectList getCostsPerLevel() { - return costsPerLevel; + return this.costsPerLevel; } public String getUnlocalizedName() { - return unlocalizedName; + return this.unlocalizedName; } public String getLocalizedName() { - return StatCollector.translateToLocal(String.format(FORMAT_NAME, unlocalizedName)); + return StatCollector.translateToLocal(String.format(FamiliarAugment.FORMAT_NAME, this.unlocalizedName)); } public static FamiliarAugment getByUnlocalizedName(String name) { - return BY_NAME.get(name.toLowerCase()); + return FamiliarAugment.BY_NAME.get(name.toLowerCase()); } //Returns true, if the current conditions for application are fulfilled for a familiar with given augments. public boolean checkConditions(FamiliarAugmentList currentAugments, int levelToSet) { if(levelToSet <= 0) return false; for(FamiliarAugmentPair current : currentAugments) { - if(conflicts.contains(current.augment)) return false; + if(this.conflicts.contains(current.augment)) return false; } - if(requiresPrevLevel) { + if(this.requiresPrevLevel) { boolean containsAtAll = false; int foundLevel = -1; for(FamiliarAugmentPair pair : currentAugments) { @@ -107,7 +107,7 @@ public class FamiliarAugment { if(foundLevel != (levelToSet - 1)) return false; } } - for(FamiliarAugmentPrecondition precondition : preconditions) { + for(FamiliarAugmentPrecondition precondition : this.preconditions) { if(precondition == null) continue; if(!precondition.isFulfilled(currentAugments, levelToSet)) return false; } @@ -115,18 +115,18 @@ public class FamiliarAugment { } static { - addNameEntry(SHOCK, SHOCK.unlocalizedName); - addNameEntry(FIRE, FIRE.unlocalizedName); - addNameEntry(POISON, POISON.unlocalizedName); - addNameEntry(WEAKNESS, WEAKNESS.unlocalizedName); + FamiliarAugment.addNameEntry(FamiliarAugment.SHOCK, FamiliarAugment.SHOCK.unlocalizedName); + FamiliarAugment.addNameEntry(FamiliarAugment.FIRE, FamiliarAugment.FIRE.unlocalizedName); + FamiliarAugment.addNameEntry(FamiliarAugment.POISON, FamiliarAugment.POISON.unlocalizedName); + FamiliarAugment.addNameEntry(FamiliarAugment.WEAKNESS, FamiliarAugment.WEAKNESS.unlocalizedName); - addNameEntry(DAMAGE_INCREASE, DAMAGE_INCREASE.unlocalizedName); - addNameEntry(RANGE_INCREASE, RANGE_INCREASE.unlocalizedName); - addNameEntry(ATTACK_SPEED, ATTACK_SPEED.unlocalizedName); + FamiliarAugment.addNameEntry(FamiliarAugment.DAMAGE_INCREASE, FamiliarAugment.DAMAGE_INCREASE.unlocalizedName); + FamiliarAugment.addNameEntry(FamiliarAugment.RANGE_INCREASE, FamiliarAugment.RANGE_INCREASE.unlocalizedName); + FamiliarAugment.addNameEntry(FamiliarAugment.ATTACK_SPEED, FamiliarAugment.ATTACK_SPEED.unlocalizedName); } private static void addNameEntry(FamiliarAugment augment, String name) { - BY_NAME.put(name.toLowerCase(), augment); + FamiliarAugment.BY_NAME.put(name.toLowerCase(), augment); } private abstract static class FamiliarAugmentPrecondition { @@ -145,8 +145,8 @@ public class FamiliarAugment { @Override public boolean isFulfilled(FamiliarAugmentList currentAugments, int levelToSet) { - if(anyPrevAugment == null) return true; - for(FamiliarAugment augment : anyPrevAugment) { + if(this.anyPrevAugment == null) return true; + for(FamiliarAugment augment : this.anyPrevAugment) { if(augment == null) continue; if(currentAugments.contains(augment)) return true; } @@ -164,8 +164,8 @@ public class FamiliarAugment { @Override public boolean isFulfilled(FamiliarAugmentList currentAugments, int levelToSet) { - if(prevAugments == null) return true; - for(FamiliarAugment augment : prevAugments) { + if(this.prevAugments == null) return true; + for(FamiliarAugment augment : this.prevAugments) { if(augment == null) continue; if(!currentAugments.contains(augment)) return false; } @@ -176,7 +176,7 @@ public class FamiliarAugment { public static class FamiliarAugmentList extends ArrayList { public boolean contains(FamiliarAugment augment) { - return getAugmentPair(augment) != null; + return this.getAugmentPair(augment) != null; } public FamiliarAugmentPair getAugmentPair(FamiliarAugment augment) { @@ -187,8 +187,8 @@ public class FamiliarAugment { } public int getLevel(FamiliarAugment augment) { - if(!contains(augment)) return -1; - return getAugmentPair(augment).level; + if(!this.contains(augment)) return -1; + return this.getAugmentPair(augment).level; } } @@ -206,17 +206,17 @@ public class FamiliarAugment { @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (o == null || this.getClass() != o.getClass()) return false; FamiliarAugmentPair that = (FamiliarAugmentPair) o; - return level == that.level && !(augment != null ? !augment.equals(that.augment) : that.augment != null); + return this.level == that.level && (this.augment != null ? this.augment.equals(that.augment) : that.augment == null); } @Override public int hashCode() { - int result = augment != null ? augment.hashCode() : 0; - result = 31 * result + level; + int result = this.augment != null ? this.augment.hashCode() : 0; + result = 31 * result + this.level; return result; } } diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java index 6625f14..5e15b49 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java @@ -50,7 +50,7 @@ public class FamiliarController { public static final double WEAKNESS_DMG_DEC = 0.3; private static final Random RAND = new Random(); - private int tickLastEffect = 0; + private int tickLastEffect; private final EntityPlayer owningPlayer; public FamiliarController(EntityPlayer owner) { @@ -58,12 +58,12 @@ public class FamiliarController { } public void tick() { - IInventory baubles = BaublesApi.getBaubles(owningPlayer); + IInventory baubles = BaublesApi.getBaubles(this.owningPlayer); ItemStack stack = baubles.getStackInSlot(0); if (stack == null || !(stack.getItem() instanceof ItemEtherealFamiliar)) return; - if (tickLastEffect > 0) { - tickLastEffect--; + if (this.tickLastEffect > 0) { + this.tickLastEffect--; return; } @@ -71,8 +71,8 @@ public class FamiliarController { if (augments == null) return; if (augments.isEmpty()) { - doDefaultAttack(); - tickLastEffect = AS_DELAY_DEF; + this.doDefaultAttack(); + this.tickLastEffect = FamiliarController.AS_DELAY_DEF; } else { FamiliarAugment.FamiliarAugmentPair effectElement = null; for (FamiliarAugment.FamiliarAugmentPair pair : augments) { @@ -107,9 +107,9 @@ public class FamiliarController { } } - double damage = DMG_DEF + (dmgLevel != -1 ? DMG_INC * dmgLevel : 0); - int ticksUntilNextAttack = AS_DELAY_DEF - (attackSpeedLevel != -1 ? AS_INC * attackSpeedLevel : 0); - double range = RANGE_DEF + (rangeLevel != -1 ? RANGE_INC * rangeLevel : 0); + double damage = FamiliarController.DMG_DEF + (dmgLevel != -1 ? FamiliarController.DMG_INC * dmgLevel : 0); + int ticksUntilNextAttack = FamiliarController.AS_DELAY_DEF - (attackSpeedLevel != -1 ? FamiliarController.AS_INC * attackSpeedLevel : 0); + double range = FamiliarController.RANGE_DEF + (rangeLevel != -1 ? FamiliarController.RANGE_INC * rangeLevel : 0); if(effectElement != null) { for (int i = 0; i < effectElement.level; i++) { @@ -117,22 +117,22 @@ public class FamiliarController { } } - if (!owningPlayer.capabilities.isCreativeMode && !consumeVisFromInventory(owningPlayer, costs, false)) { + if (!this.owningPlayer.capabilities.isCreativeMode && !FamiliarController.consumeVisFromInventory(this.owningPlayer, costs, false)) { return; } if (effectElement == null) { - if (doEnhancedDefaultAttack(damage, range)) { - tickLastEffect = ticksUntilNextAttack; - if(!owningPlayer.capabilities.isCreativeMode && RAND.nextInt(3) == 0) { - consumeVisFromInventory(owningPlayer, costs, true); + if (this.doEnhancedDefaultAttack(damage, range)) { + this.tickLastEffect = ticksUntilNextAttack; + if(!this.owningPlayer.capabilities.isCreativeMode && FamiliarController.RAND.nextInt(3) == 0) { + FamiliarController.consumeVisFromInventory(this.owningPlayer, costs, true); } } } else { - if (doAttack(effectElement, damage, range)) { - tickLastEffect = ticksUntilNextAttack; - if(!owningPlayer.capabilities.isCreativeMode && RAND.nextInt(3) == 0) { - consumeVisFromInventory(owningPlayer, costs, true); + if (this.doAttack(effectElement, damage, range)) { + this.tickLastEffect = ticksUntilNextAttack; + if(!this.owningPlayer.capabilities.isCreativeMode && FamiliarController.RAND.nextInt(3) == 0) { + FamiliarController.consumeVisFromInventory(this.owningPlayer, costs, true); } } } @@ -146,28 +146,28 @@ public class FamiliarController { int boltType = 6; if (augment.equals(FamiliarAugment.SHOCK)) { boltType = 1; - damage += effectLevel * SHOCK_DMG_INC; + damage += effectLevel * FamiliarController.SHOCK_DMG_INC; } else if (augment.equals(FamiliarAugment.FIRE)) { boltType = 4; - damage += effectLevel * FIRE_DMG_INC; + damage += effectLevel * FamiliarController.FIRE_DMG_INC; } else if (augment.equals(FamiliarAugment.POISON)) { boltType = 3; - range += effectLevel * POISON_RANGE_INC; + range += effectLevel * FamiliarController.POISON_RANGE_INC; } else if (augment.equals(FamiliarAugment.WEAKNESS)) { boltType = 5; - damage -= effectLevel * WEAKNESS_DMG_DEC; + damage -= effectLevel * FamiliarController.WEAKNESS_DMG_DEC; if (effectLevel == 3) toSelect = 3; } - List toAttack = selectEntityToAttack(range, toSelect); + List toAttack = this.selectEntityToAttack(range, toSelect); if (toAttack == null || toAttack.isEmpty()) return false; for (EntityLivingBase entity : toAttack) { - attack(entity, damage, boltType); + this.attack(entity, damage, boltType); } if (augment.equals(FamiliarAugment.SHOCK)) { for (EntityLivingBase entity : toAttack) { - if (RAND.nextBoolean()) { - Vector3 vel = MiscUtils.getPositionVector(entity).subtract(MiscUtils.getPositionVector(owningPlayer)) + if (FamiliarController.RAND.nextBoolean()) { + Vector3 vel = MiscUtils.getPositionVector(entity).subtract(MiscUtils.getPositionVector(this.owningPlayer)) .normalize().divide(2).multiply(0.8 * effectLevel); if (vel.getY() < 0) vel.setY(-vel.getY()); entity.motionX += vel.getX(); @@ -230,48 +230,48 @@ public class FamiliarController { } private boolean doEnhancedDefaultAttack(double damage, double range) { - List toAttack = selectEntityToAttack(range, 1); + List toAttack = this.selectEntityToAttack(range, 1); if (toAttack == null || toAttack.isEmpty()) return false; - attack(toAttack.get(0), damage, 6); + this.attack(toAttack.get(0), damage, 6); return true; } private boolean doDefaultAttack() { - List toAttack = selectEntityToAttack(RANGE_DEF, 1); + List toAttack = this.selectEntityToAttack(FamiliarController.RANGE_DEF, 1); if (toAttack == null || toAttack.isEmpty()) return false; - attack(toAttack.get(0), DMG_DEF, 6); + this.attack(toAttack.get(0), FamiliarController.DMG_DEF, 6); return true; } private void attack(EntityLivingBase toAttack, double damage, int boltType) { toAttack.attackEntityFrom(DamageSource.magic, (float) damage); toAttack.worldObj.playSoundEffect(toAttack.posX + 0.5, toAttack.posY + 0.5, toAttack.posZ + 0.5, "thaumcraft:zap", 0.8F, 1.0F); - PacketFamiliarBolt bolt = new PacketFamiliarBolt(owningPlayer.getCommandSenderName(), (float) toAttack.posX, (float) toAttack.posY, (float) toAttack.posZ, boltType, true); - PacketHandler.INSTANCE.sendToAllAround(bolt, new NetworkRegistry.TargetPoint(toAttack.worldObj.provider.dimensionId, owningPlayer.posX, - owningPlayer.posY, owningPlayer.posZ, 16)); + PacketFamiliarBolt bolt = new PacketFamiliarBolt(this.owningPlayer.getCommandSenderName(), (float) toAttack.posX, (float) toAttack.posY, (float) toAttack.posZ, boltType, true); + PacketHandler.INSTANCE.sendToAllAround(bolt, new NetworkRegistry.TargetPoint(toAttack.worldObj.provider.dimensionId, this.owningPlayer.posX, + this.owningPlayer.posY, this.owningPlayer.posZ, 16)); } private List selectEntityToAttack(double rad, int amountToSelectMax) { - List attackable = getAttackableEntities(rad); + List attackable = this.getAttackableEntities(rad); if (attackable.size() <= 0) return null; List entities = new ArrayList(); if (attackable.size() <= amountToSelectMax) { entities.addAll(attackable); } else { for (int i = 0; i < amountToSelectMax; i++) { - entities.add(attackable.remove(RAND.nextInt(attackable.size()))); + entities.add(attackable.remove(FamiliarController.RAND.nextInt(attackable.size()))); } } return entities; } private List getAttackableEntities(double rad) { - double x = owningPlayer.posX; - double y = owningPlayer.posY; - double z = owningPlayer.posZ; - List entities = owningPlayer.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, + double x = this.owningPlayer.posX; + double y = this.owningPlayer.posY; + double z = this.owningPlayer.posZ; + List entities = this.owningPlayer.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(x - 0.5, y - 0.5, z - 0.5, x + 0.5, y + 0.5, z + 0.5).expand(rad, rad, rad)); Iterator it = entities.iterator(); diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java index 7593c9c..09c4a22 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java @@ -57,7 +57,7 @@ public class IntegrationAutomagy extends IntegrationMod { } public boolean handleNodeJarVisCost(ItemStack wandStack, EntityPlayer player) { - return ThaumcraftApiHelper.consumeVisFromWandCrafting(wandStack, player, visCostAdvNodeJar, true); + return ThaumcraftApiHelper.consumeVisFromWandCrafting(wandStack, player, IntegrationAutomagy.visCostAdvNodeJar, true); } public void tryFillGolemCrafttable(ChunkCoordinates cc, World world) { diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationMod.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationMod.java index 5d1f071..6f98b9c 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationMod.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationMod.java @@ -13,16 +13,16 @@ import cpw.mods.fml.common.Loader; public abstract class IntegrationMod { public abstract String getModId(); - private boolean isPresent = false; + private boolean isPresent; public final boolean isPresent() { - return isPresent; + return this.isPresent; } public final void init() { - if(Loader.isModLoaded(getModId())) { - isPresent = true; - doInit(); + if(Loader.isModLoaded(this.getModId())) { + this.isPresent = true; + this.doInit(); } } diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java index 63b0aeb..ed273d9 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java @@ -19,7 +19,7 @@ import java.lang.reflect.Method; public class IntegrationMorph extends IntegrationMod { private static final Injector INJECTOR = new Injector(); - private Method methodHasMorph = null; + private Method methodHasMorph; @Override public String getModId() { @@ -37,9 +37,9 @@ public class IntegrationMorph extends IntegrationMod { @SideOnly(Side.CLIENT) public boolean isMorphed() { - if(methodHasMorph != null) { + if(this.methodHasMorph != null) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - Boolean result = INJECTOR.invokeMethod(methodHasMorph, player.getCommandSenderName(), true); + Boolean result = IntegrationMorph.INJECTOR.invokeMethod(this.methodHasMorph, player.getCommandSenderName(), true); return result != null ? result : false; } return false; diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java index 9ada86e..9f4f822 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java @@ -29,17 +29,17 @@ public class IntegrationNEI extends IntegrationMod { @Override protected void doInit() { - nei = new Injector("codechicken.nei.api.API"); + this.nei = new Injector("codechicken.nei.api.API"); - hideItem(new ItemStack(RegisteredItems.itemFakeModIcon)); - hideItem(new ItemStack(RegisteredBlocks.blockStickyJar, 1, Short.MAX_VALUE)); - hideItem(new ItemStack(RegisteredItems.itemPackage, 1, Short.MAX_VALUE)); - hideItem(new ItemStack(RegisteredItems.itemFakeLootbag, 1, Short.MAX_VALUE)); - hideItem(new ItemStack(RegisteredBlocks.blockExtendedNodeJar, 1, Short.MAX_VALUE)); - hideItem(new ItemStack(RegisteredItems.itemExtendedNodeJar, 1, Short.MAX_VALUE)); - hideItem(new ItemStack(RegisteredItems.itemFakeGolemPlacer, 1, Short.MAX_VALUE)); //This does... nothing? ffs. - hideItem(new ItemStack(RegisteredItems.itemTransformationFocus, 1, Short.MAX_VALUE)); - hideItem(new ItemStack(RegisteredItems.itemFamiliar_old, 1, Short.MAX_VALUE)); + this.hideItem(new ItemStack(RegisteredItems.itemFakeModIcon)); + this.hideItem(new ItemStack(RegisteredBlocks.blockStickyJar, 1, Short.MAX_VALUE)); + this.hideItem(new ItemStack(RegisteredItems.itemPackage, 1, Short.MAX_VALUE)); + this.hideItem(new ItemStack(RegisteredItems.itemFakeLootbag, 1, Short.MAX_VALUE)); + this.hideItem(new ItemStack(RegisteredBlocks.blockExtendedNodeJar, 1, Short.MAX_VALUE)); + this.hideItem(new ItemStack(RegisteredItems.itemExtendedNodeJar, 1, Short.MAX_VALUE)); + this.hideItem(new ItemStack(RegisteredItems.itemFakeGolemPlacer, 1, Short.MAX_VALUE)); //This does... nothing? ffs. + this.hideItem(new ItemStack(RegisteredItems.itemTransformationFocus, 1, Short.MAX_VALUE)); + this.hideItem(new ItemStack(RegisteredItems.itemFamiliar_old, 1, Short.MAX_VALUE)); } public static void checkItems(ArrayList items) { @@ -54,14 +54,14 @@ public class IntegrationNEI extends IntegrationMod { } private void hideItem(ItemStack item) { - nei.invokeMethod("hideItem", ItemStack.class, item); + this.nei.invokeMethod("hideItem", ItemStack.class, item); } public void setItemListEntries(Block block, Iterable items) { - setItemListEntries(Item.getItemFromBlock(block), items); + this.setItemListEntries(Item.getItemFromBlock(block), items); } public void setItemListEntries(Item item, Iterable items) { - nei.invokeMethod("setItemListEntries", new Class[]{Item.class, Iterable.class}, item, items); + this.nei.invokeMethod("setItemListEntries", new Class[]{Item.class, Iterable.class}, item, items); } } diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java index 251b1bc..497881a 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java @@ -22,22 +22,22 @@ public class IntegrationThaumicTinkerer extends IntegrationMod { @Override public void doInit() { try { - infusedCropBlockClass = Class.forName("thaumic.tinkerer.common.block.BlockInfusedGrain"); - infusedCropTile = Class.forName("thaumic.tinkerer.common.block.tile.TileInfusedGrain"); - if(infusedCropBlockClass != null && infusedCropTile != null) { + IntegrationThaumicTinkerer.infusedCropBlockClass = Class.forName("thaumic.tinkerer.common.block.BlockInfusedGrain"); + IntegrationThaumicTinkerer.infusedCropTile = Class.forName("thaumic.tinkerer.common.block.tile.TileInfusedGrain"); + if(IntegrationThaumicTinkerer.infusedCropBlockClass != null && IntegrationThaumicTinkerer.infusedCropTile != null) { Gadomancy.log.info("Hooked TTinkerer magic-crops"); } } catch (Throwable tr) {} } public static boolean isCropBlock(Block block) { - if(infusedCropBlockClass == null) return false; - return block.getClass().equals(infusedCropBlockClass) || infusedCropBlockClass.isAssignableFrom(block.getClass()); + if(IntegrationThaumicTinkerer.infusedCropBlockClass == null) return false; + return block.getClass().equals(IntegrationThaumicTinkerer.infusedCropBlockClass) || IntegrationThaumicTinkerer.infusedCropBlockClass.isAssignableFrom(block.getClass()); } public static boolean isCropTile(TileEntity te) { - if(infusedCropTile == null) return false; - return te.getClass().equals(infusedCropTile) || infusedCropTile.isAssignableFrom(te.getClass()); + if(IntegrationThaumicTinkerer.infusedCropTile == null) return false; + return te.getClass().equals(IntegrationThaumicTinkerer.infusedCropTile) || IntegrationThaumicTinkerer.infusedCropTile.isAssignableFrom(te.getClass()); } } diff --git a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java index a3740e7..f775a59 100644 --- a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java +++ b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java @@ -46,28 +46,28 @@ public class IntegrationThaumicHorizions extends IntegrationMod { RenderingRegistry.registerEntityRenderingHandler(EntityGolemTH.class, new RenderAdditionalGolemTH(render.mainModel)); } - modMatrix = Block.getBlockFromName("ThaumicHorizons:modMatrix"); + IntegrationThaumicHorizions.modMatrix = Block.getBlockFromName("ThaumicHorizons:modMatrix"); RegisteredBlocks.registerClawClickBehavior(new ClickBehavior(true) { private TileVat vat; @Override public boolean isValidForBlock() { - if (block == modMatrix && metadata == 0) { - this.vat = ((TileVatMatrix) world.getTileEntity(x, y, z)).getVat(); - return vat != null; + if (this.block == IntegrationThaumicHorizions.modMatrix && this.metadata == 0) { + this.vat = ((TileVatMatrix) this.world.getTileEntity(this.x, this.y, this.z)).getVat(); + return this.vat != null; } return false; } @Override public int getComparatorOutput() { - return (vat.mode != 0 && vat.mode != 4) ? 15 : 0; + return (this.vat.mode != 0 && this.vat.mode != 4) ? 15 : 0; } @Override public void addInstability(int instability) { - vat.instability += Math.ceil(instability * 0.5); + this.vat.instability += Math.ceil(instability * 0.5); } }); } diff --git a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java index 92d260f..e76c5af 100644 --- a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java +++ b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java @@ -24,7 +24,7 @@ import thaumcraft.common.entities.golems.EntityGolemBase; */ @SideOnly(Side.CLIENT) public class RenderAdditionalGolemTH extends RenderGolemTH { - private ItemStack toolItem = null; + private ItemStack toolItem; public RenderAdditionalGolemTH(ModelBase mainModel) { super(mainModel); @@ -48,8 +48,8 @@ public class RenderAdditionalGolemTH extends RenderGolemTH { if (RenderGolemHelper.requiresRenderFix((EntityGolemBase) entity)) { RenderGolemHelper.renderCarriedItemsFix(golem); - if(toolItem != null) { - RenderGolemHelper.renderToolItem(golem, toolItem, mainModel, renderManager); + if(this.toolItem != null) { + RenderGolemHelper.renderToolItem(golem, this.toolItem, this.mainModel, this.renderManager); } } @@ -64,8 +64,8 @@ public class RenderAdditionalGolemTH extends RenderGolemTH { @Override protected void renderCarriedItems(EntityGolemBase golem, float par2) { if (!RenderGolemHelper.requiresRenderFix(golem)) { - if(toolItem != null) { - RenderGolemHelper.renderToolItem(golem, toolItem, mainModel, renderManager); + if(this.toolItem != null) { + RenderGolemHelper.renderToolItem(golem, this.toolItem, this.mainModel, this.renderManager); } super.renderCarriedItems(golem, par2); } @@ -76,7 +76,7 @@ public class RenderAdditionalGolemTH extends RenderGolemTH { AdditionalGolemCore core = GadomancyApi.getAdditionalGolemCore(golem); ItemStack carriedItem = null; if(core != null) { - toolItem = core.getToolItem(golem); + this.toolItem = core.getToolItem(golem); carriedItem = golem.getCarriedForDisplay(); golem.getDataWatcher().getWatchedObject(16).setObject(null); @@ -86,7 +86,7 @@ public class RenderAdditionalGolemTH extends RenderGolemTH { if(carriedItem != null) { golem.getDataWatcher().getWatchedObject(16).setObject(carriedItem); - toolItem = null; + this.toolItem = null; } } diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java index 7e30bea..abba5d5 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java @@ -23,7 +23,7 @@ public class IntegrationWaila extends IntegrationMod { @Override protected void doInit() { - registerProviders(ModuleRegistrar.instance()); + IntegrationWaila.registerProviders(ModuleRegistrar.instance()); } public static void registerProviders(ModuleRegistrar registrar) { diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java index 69abc4b..a7c42dc 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java @@ -34,7 +34,7 @@ public class StickyJarProvider implements IWailaDataProvider { if(stickyJar.isValid()) { ItemStack stack = new ItemStack(stickyJar.getParentBlock(), 1, stickyJar.getBlockMetadata()); - for(IWailaDataProvider provider : getParentProviders(ModuleRegistrar.instance().stackBlockProviders, stickyJar.getParentBlock().getClass(), stickyJar.getParent().getClass())) { + for(IWailaDataProvider provider : this.getParentProviders(ModuleRegistrar.instance().stackBlockProviders, stickyJar.getParentBlock().getClass(), stickyJar.getParent().getClass())) { stack = provider.getWailaStack(data, config); } return stack; @@ -57,7 +57,7 @@ public class StickyJarProvider implements IWailaDataProvider { public List getWailaHead(final ItemStack stack, final List strings, final IWailaDataAccessor data, final IWailaConfigHandler config) { TileStickyJar tile = (TileStickyJar) data.getTileEntity(); if(tile != null && tile.isValid()) { - callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { + this.callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { @Override public void call(IWailaDataProvider provider) { provider.getWailaHead(stack, strings, data, config); @@ -71,7 +71,7 @@ public class StickyJarProvider implements IWailaDataProvider { public List getWailaBody(final ItemStack stack, final List strings, final IWailaDataAccessor data, final IWailaConfigHandler config) { TileStickyJar tile = (TileStickyJar) data.getTileEntity(); if(tile != null && tile.isValid()) { - callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { + this.callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { @Override public void call(IWailaDataProvider provider) { provider.getWailaBody(stack, strings, data, config); @@ -85,7 +85,7 @@ public class StickyJarProvider implements IWailaDataProvider { public List getWailaTail(final ItemStack stack, final List strings, final IWailaDataAccessor data, final IWailaConfigHandler config) { TileStickyJar tile = (TileStickyJar) data.getTileEntity(); if(tile != null && tile.isValid()) { - callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { + this.callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { @Override public void call(IWailaDataProvider provider) { provider.getWailaTail(stack, strings, data, config); diff --git a/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java b/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java index b75fe0a..845e6d9 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java @@ -33,7 +33,7 @@ public class ItemArcanePackage extends ItemFakeLootbag { private static final int MAX_PACKAGE_SIZE = 65536; public ItemArcanePackage() { - setUnlocalizedName("ItemArcanePackage"); + this.setUnlocalizedName("ItemArcanePackage"); } @Override @@ -75,7 +75,7 @@ public class ItemArcanePackage extends ItemFakeLootbag { //Prevent depth of more then 2 packages if(item.getItem() == RegisteredItems.itemPackage || item.getItem() == RegisteredItems.itemFakeLootbag) { - List packedItems = getContents(item); + List packedItems = this.getContents(item); for(ItemStack packedItem : packedItems) { if(packedItem.getItem() == RegisteredItems.itemPackage) { return false; @@ -90,7 +90,7 @@ public class ItemArcanePackage extends ItemFakeLootbag { try { byte[] data = CompressedStreamTools.compress(compound); //If the compound is too long it will not work to prevent lag - if(data.length > MAX_PACKAGE_SIZE) { + if(data.length > ItemArcanePackage.MAX_PACKAGE_SIZE) { return false; } NBTHelper.getData(stack).setByteArray("items", data); @@ -124,7 +124,7 @@ public class ItemArcanePackage extends ItemFakeLootbag { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (!world.isRemote) { - List contents = getContents(stack); + List contents = this.getContents(stack); for (ItemStack content : contents) { world.spawnEntityInWorld(new EntityItem(world, player.posX, player.posY, player.posZ, content)); } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java b/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java index fef838b..1c63f33 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java @@ -28,11 +28,11 @@ import java.util.List; public class ItemAuraCore extends Item { public ItemAuraCore() { - setUnlocalizedName("ItemAuraCore"); - setMaxDamage(0); - setMaxStackSize(1); - setHasSubtypes(true); - setCreativeTab(RegisteredItems.creativeTab); + this.setUnlocalizedName("ItemAuraCore"); + this.setMaxDamage(0); + this.setMaxStackSize(1); + this.setHasSubtypes(true); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override @@ -42,7 +42,7 @@ public class ItemAuraCore extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean flag) { - AuraCoreType type = getCoreType(stack); + AuraCoreType type = this.getCoreType(stack); if(type != null) { list.add(EnumChatFormatting.GRAY + type.getLocalizedName()); } @@ -52,7 +52,7 @@ public class ItemAuraCore extends Item { public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i < AuraCoreType.values().length; i++) { ItemStack stack = new ItemStack(item); - setCoreType(stack, AuraCoreType.values()[i]); + this.setCoreType(stack, AuraCoreType.values()[i]); list.add(stack); } } @@ -63,9 +63,9 @@ public class ItemAuraCore extends Item { @Override public void registerIcons(IIconRegister ir) { - coreBlankIcon = ir.registerIcon(Gadomancy.MODID + ":core_core_blank"); - coreIcon = ir.registerIcon(Gadomancy.MODID + ":core_core"); - borderIcon = ir.registerIcon(Gadomancy.MODID + ":core_border"); + this.coreBlankIcon = ir.registerIcon(Gadomancy.MODID + ":core_core_blank"); + this.coreIcon = ir.registerIcon(Gadomancy.MODID + ":core_core"); + this.borderIcon = ir.registerIcon(Gadomancy.MODID + ":core_border"); } @Override @@ -74,10 +74,10 @@ public class ItemAuraCore extends Item { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(getCoreType(stack) == AuraCoreType.BLANK && pass == 0) { - return coreBlankIcon; + if(this.getCoreType(stack) == AuraCoreType.BLANK && pass == 0) { + return this.coreBlankIcon; } - return pass == 0 ? coreIcon : borderIcon; + return pass == 0 ? this.coreIcon : this.borderIcon; } @Override @@ -88,7 +88,7 @@ public class ItemAuraCore extends Item { @Override public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) { - AuraCoreType type = getCoreType(stack); + AuraCoreType type = this.getCoreType(stack); if(type.isAspect()) { if(type.ordinal() < 7) { return BlockCustomOreItem.colors[type.ordinal()]; @@ -109,11 +109,11 @@ public class ItemAuraCore extends Item { } public boolean isBlank(ItemStack itemStack) { - AuraCoreType type = getCoreType(itemStack); + AuraCoreType type = this.getCoreType(itemStack); return type == AuraCoreType.BLANK || type == null; } - public static enum AuraCoreType { + public enum AuraCoreType { BLANK("blank"), AIR(Aspect.AIR), @@ -144,20 +144,20 @@ public class ItemAuraCore extends Item { } public boolean isUnused() { - return unused; + return this.unused; } public boolean isAspect() { - return aspect != null; + return this.aspect != null; } public Aspect getAspect() { - return aspect; + return this.aspect; } public String getLocalizedName() { - String name = isAspect() ? aspect.getName() : StatCollector.translateToLocal("gadomancy.auracore." + unlocName); - if(unused) { + String name = this.isAspect() ? this.aspect.getName() : StatCollector.translateToLocal("gadomancy.auracore." + this.unlocName); + if(this.unused) { name += " " + StatCollector.translateToLocal("gadomancy.auracore.unused"); } return name; diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java index 9badc1d..7fef5e6 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java @@ -30,7 +30,7 @@ public class ItemBlockAdditionalEldritchPortal extends ItemBlock { @Override public void registerIcons(IIconRegister ir) { super.registerIcons(ir); - portalIcon = ir.registerIcon(Gadomancy.MODID + ":eldritch_portal"); + this.portalIcon = ir.registerIcon(Gadomancy.MODID + ":eldritch_portal"); } @Override @@ -41,6 +41,6 @@ public class ItemBlockAdditionalEldritchPortal extends ItemBlock { @Override public IIcon getIconFromDamage(int damage) { - return portalIcon; + return this.portalIcon; } } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java index 60a25a6..7dc28de 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java @@ -18,8 +18,8 @@ public class ItemBlockAuraPylon extends ItemBlock { public ItemBlockAuraPylon(Block block) { super(block); - setMaxDamage(0); - setHasSubtypes(true); + this.setMaxDamage(0); + this.setHasSubtypes(true); } @Override @@ -29,7 +29,7 @@ public class ItemBlockAuraPylon extends ItemBlock { @Override public String getUnlocalizedName(ItemStack stack) { - return getUnlocalizedName() + "." + stack.getItemDamage(); + return this.getUnlocalizedName() + "." + stack.getItemDamage(); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java index 75803ca..e2b008c 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java @@ -16,8 +16,8 @@ public class ItemBlockEssentiaCompressor extends ItemBlock { public ItemBlockEssentiaCompressor(Block block) { super(block); - setMaxDamage(0); - setCreativeTab(RegisteredItems.creativeTab); + this.setMaxDamage(0); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java index 94975dc..891725b 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java @@ -20,8 +20,8 @@ public class ItemBlockKnowledgeBook extends ItemBlock { public ItemBlockKnowledgeBook(Block block) { super(block); - setMaxDamage(0); - setCreativeTab(RegisteredItems.creativeTab); + this.setMaxDamage(0); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java index 163a3bc..93cc379 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java @@ -95,9 +95,7 @@ public class ItemBlockRemoteJar extends ItemBlock { } return true; } else { - if(player.isSneaking()) { - return true; - } + return player.isSneaking(); } } return false; @@ -135,7 +133,7 @@ public class ItemBlockRemoteJar extends ItemBlock { if (stack.hasTagCompound()) { UUID networkId = NBTHelper.getUUID(stack.getTagCompound(), "networkId"); if(networkId != null) { - list.add(String.format(StatCollector.translateToLocal("gadomancy.lore.remotejar"), generateName(networkId))); + list.add(String.format(StatCollector.translateToLocal("gadomancy.lore.remotejar"), ItemBlockRemoteJar.generateName(networkId))); } } ConfigItems.itemJarFilled.addInformation(stack, player, list, advancedItemTooltips); @@ -153,7 +151,7 @@ public class ItemBlockRemoteJar extends ItemBlock { String[] split = values.get(entryIndex).split(" "); String part = split[random.nextInt(split.length)]; - if(!isValidName(part)) { + if(!ItemBlockRemoteJar.isValidName(part)) { i--; continue; } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java index c5c0529..42031f8 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java @@ -16,8 +16,8 @@ import net.minecraft.util.IIcon; public class ItemBlockStoneMachine extends ItemBlock { public ItemBlockStoneMachine(Block block) { super(block); - setMaxDamage(0); - setHasSubtypes(true); + this.setMaxDamage(0); + this.setHasSubtypes(true); } @Override @@ -30,7 +30,7 @@ public class ItemBlockStoneMachine extends ItemBlock { @Override public String getUnlocalizedName(ItemStack stack) { - return getUnlocalizedName() + "." + stack.getItemDamage(); + return this.getUnlocalizedName() + "." + stack.getItemDamage(); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java b/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java index 3ed1f33..fcbfb37 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java @@ -29,9 +29,9 @@ import java.util.List; */ public class ItemCreativeNode extends Item { public ItemCreativeNode() { - setCreativeTab(RegisteredItems.creativeTab); - setUnlocalizedName("nodePlacer"); - setTextureName(Gadomancy.MODID + ":transparent"); + this.setCreativeTab(RegisteredItems.creativeTab); + this.setUnlocalizedName("nodePlacer"); + this.setTextureName(Gadomancy.MODID + ":transparent"); } @Override @@ -53,7 +53,7 @@ public class ItemCreativeNode extends Item { y += dir.offsetY; z += dir.offsetZ; - if(placeRandomNode(world, x, y, z)) { + if(this.placeRandomNode(world, x, y, z)) { int metadata = stack.getItemDamage(); TileNode node = (TileNode) world.getTileEntity(x, y, z); diff --git a/src/main/java/makeo/gadomancy/common/items/ItemElement.java b/src/main/java/makeo/gadomancy/common/items/ItemElement.java index e66ae71..55698bb 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemElement.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemElement.java @@ -6,7 +6,6 @@ import makeo.gadomancy.common.registration.RegisteredItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -25,16 +24,16 @@ import java.util.List; public class ItemElement extends Item { public ItemElement() { - setMaxStackSize(1); - setHasSubtypes(true); - setUnlocalizedName("ItemElement"); - setTextureName(Gadomancy.MODID + ":element"); - setCreativeTab(RegisteredItems.creativeTab); + this.setMaxStackSize(1); + this.setHasSubtypes(true); + this.setUnlocalizedName("ItemElement"); + this.setTextureName(Gadomancy.MODID + ":element"); + this.setCreativeTab(RegisteredItems.creativeTab); } @Override public String getUnlocalizedName(ItemStack stack) { - return getUnlocalizedName() + "." + stack.getItemDamage(); + return this.getUnlocalizedName() + "." + stack.getItemDamage(); } @Override @@ -76,13 +75,13 @@ public class ItemElement extends Item { return 0xFFFFFF; } - public static abstract class ElementRunnable { + public abstract static class ElementRunnable { public abstract void affectEntity(EntityLivingBase livingBase); } - public static enum EnumElementType { + public enum EnumElementType { DARKNESS(0x000000, new ElementRunnable() { @Override @@ -106,17 +105,17 @@ public class ItemElement extends Item { private final int renderColor; private final ElementRunnable runnable; - private EnumElementType(int color, ElementRunnable runnable) { + EnumElementType(int color, ElementRunnable runnable) { this.renderColor = color; this.runnable = runnable; } public ElementRunnable getRunnable() { - return runnable; + return this.runnable; } public int getRenderColor() { - return renderColor; + return this.renderColor; } } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java index b59bf8b..e2c0546 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java @@ -40,9 +40,9 @@ import java.util.List; public class ItemExtendedNodeJar extends Item implements IEssentiaContainerItem { public ItemExtendedNodeJar() { - setMaxDamage(0); - setMaxStackSize(1); - setUnlocalizedName("BlockJarNodeItem"); + this.setMaxDamage(0); + this.setMaxStackSize(1); + this.setUnlocalizedName("BlockJarNodeItem"); } @Override @@ -65,15 +65,15 @@ public class ItemExtendedNodeJar extends Item implements IEssentiaContainerItem @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - String desc = "§9" + StatCollector.translateToLocal("nodetype." + getNodeType(stack) + ".name"); - if(getExtendedNodeType(stack) != null) { - desc = desc + ", " + StatCollector.translateToLocal("gadomancy.nodes." + getExtendedNodeType(stack)); + String desc = "§9" + StatCollector.translateToLocal("nodetype." + this.getNodeType(stack) + ".name"); + if(this.getExtendedNodeType(stack) != null) { + desc = desc + ", " + StatCollector.translateToLocal("gadomancy.nodes." + this.getExtendedNodeType(stack)); } - if (getNodeModifier(stack) != null) { - desc = desc + ", " + StatCollector.translateToLocal("nodemod." + getNodeModifier(stack) + ".name"); + if (this.getNodeModifier(stack) != null) { + desc = desc + ", " + StatCollector.translateToLocal("nodemod." + this.getNodeModifier(stack) + ".name"); } list.add(desc); - AspectList aspects = getAspects(stack); + AspectList aspects = this.getAspects(stack); if ((aspects != null) && (aspects.size() > 0)) { for (Aspect tag : aspects.getAspectsSorted()) { if (Thaumcraft.proxy.playerKnowledge.hasDiscoveredAspect(player.getCommandSenderName(), tag)) { @@ -123,19 +123,19 @@ public class ItemExtendedNodeJar extends Item implements IEssentiaContainerItem Block var12 = RegisteredBlocks.blockExtendedNodeJar; int var13 = 2; int var14 = RegisteredBlocks.blockExtendedNodeJar.onBlockPlaced(world, x, y, z, side, par8, par9, par10, var13); - if (placeBlockAt(stack, player, world, x, y, z, side, par8, par9, par10, var14)) { + if (this.placeBlockAt(stack, player, world, x, y, z, side, par8, par9, par10, var14)) { TileEntity te = world.getTileEntity(x, y, z); if ((te != null) && ((te instanceof TileExtendedNodeJar))) { if (stack.hasTagCompound()) { - AspectList aspects = getAspects(stack); + AspectList aspects = this.getAspects(stack); if (aspects != null) { ((TileExtendedNodeJar) te).setAspects(aspects); - ((TileExtendedNodeJar) te).setNodeType(getNodeType(stack)); - ((TileExtendedNodeJar) te).setNodeModifier(getNodeModifier(stack)); - ((TileExtendedNodeJar) te).setExtendedNodeType(getExtendedNodeType(stack)); - ((TileExtendedNodeJar) te).setId(getNodeId(stack)); - ((TileExtendedNodeJar) te).setBehaviorSnapshot(getBehaviorSnapshot(stack)); + ((TileExtendedNodeJar) te).setNodeType(this.getNodeType(stack)); + ((TileExtendedNodeJar) te).setNodeModifier(this.getNodeModifier(stack)); + ((TileExtendedNodeJar) te).setExtendedNodeType(this.getExtendedNodeType(stack)); + ((TileExtendedNodeJar) te).setId(this.getNodeId(stack)); + ((TileExtendedNodeJar) te).setBehaviorSnapshot(this.getBehaviorSnapshot(stack)); } } } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java index 0acc5ae..04bf649 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java @@ -27,7 +27,7 @@ public class ItemFakeGolemPlacer extends Item { @SideOnly(Side.CLIENT) public int getRenderPasses(int metadata) { - return PLACER.getRenderPasses(metadata); + return ItemFakeGolemPlacer.PLACER.getRenderPasses(metadata); } @SideOnly(Side.CLIENT) @@ -51,7 +51,7 @@ public class ItemFakeGolemPlacer extends Item { @Override public void registerIcons(IIconRegister ir) { - PLACER.registerIcons(ir); + ItemFakeGolemPlacer.PLACER.registerIcons(ir); for(AdditionalGolemType type : GadomancyApi.getAdditionalGolemTypes()) { type.registerIcons(ir); } @@ -59,11 +59,11 @@ public class ItemFakeGolemPlacer extends Item { @Override public IIcon getIcon(ItemStack stack, int pass) { - AdditionalGolemType type = getAdditonalType(stack); + AdditionalGolemType type = this.getAdditonalType(stack); if(type != null) { return type.getPlacerItem().getIcon(stack, pass); } - return PLACER.getIcon(stack, pass); + return ItemFakeGolemPlacer.PLACER.getIcon(stack, pass); } private AdditionalGolemType getAdditonalType(ItemStack stack) { diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java index 8ca87ea..4722830 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java @@ -24,22 +24,22 @@ public class ItemFakeGolemShield extends Item { private IIcon shieldIcon; public ItemFakeGolemShield() { - setCreativeTab(null); + this.setCreativeTab(null); } @SideOnly(Side.CLIENT) public int getRenderPasses(int metadata) { - return golemItem.getRenderPasses(metadata) + 1; + return this.golemItem.getRenderPasses(metadata) + 1; } @Override public boolean getHasSubtypes() { - return golemItem.getHasSubtypes(); + return this.golemItem.getHasSubtypes(); } @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - golemItem.getSubItems(item, tab, list); + this.golemItem.getSubItems(item, tab, list); } @SideOnly(Side.CLIENT) @@ -49,16 +49,16 @@ public class ItemFakeGolemShield extends Item { @Override public void registerIcons(IIconRegister ir) { - shieldIcon = ir.registerIcon(Gadomancy.MODID + ":r_runicupg"); - golemItem.registerIcons(ir); + this.shieldIcon = ir.registerIcon(Gadomancy.MODID + ":r_runicupg"); + this.golemItem.registerIcons(ir); } @Override public IIcon getIcon(ItemStack stack, int pass) { - if(pass == getRenderPasses(stack.getItemDamage()) - 1) { - return shieldIcon; + if(pass == this.getRenderPasses(stack.getItemDamage()) - 1) { + return this.shieldIcon; } else { - return golemItem.getIcon(stack, pass); + return this.golemItem.getIcon(stack, pass); } } } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java index 6e34c29..bcb2489 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java @@ -21,8 +21,8 @@ import java.util.List; */ public class ItemFakeLootbag extends ItemLootBag { public ItemFakeLootbag() { - setCreativeTab(null); - setUnlocalizedName("ItemLootBag"); + this.setCreativeTab(null); + this.setUnlocalizedName("ItemLootBag"); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java index 42fd744..1e524f7 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java @@ -16,25 +16,25 @@ import net.minecraft.util.IIcon; public class ItemFakeModIcon extends Item { public ItemFakeModIcon() { - setTextureName(Gadomancy.MODID + ":category_icon"); + this.setTextureName(Gadomancy.MODID + ":category_icon"); } public IIcon[] icons = new IIcon[6]; @Override public void registerIcons(IIconRegister ir) { - icons[0] = ir.registerIcon(Gadomancy.MODID + ":category_icon"); - icons[1] = ir.registerIcon(Gadomancy.MODID + ":Attack1"); - icons[2] = ir.registerIcon(Gadomancy.MODID + ":Attack2"); - icons[3] = ir.registerIcon(Gadomancy.MODID + ":Attack3"); - icons[4] = ir.registerIcon(Gadomancy.MODID + ":Range1"); - icons[5] = ir.registerIcon(Gadomancy.MODID + ":Cooldown1"); + this.icons[0] = ir.registerIcon(Gadomancy.MODID + ":category_icon"); + this.icons[1] = ir.registerIcon(Gadomancy.MODID + ":Attack1"); + this.icons[2] = ir.registerIcon(Gadomancy.MODID + ":Attack2"); + this.icons[3] = ir.registerIcon(Gadomancy.MODID + ":Attack3"); + this.icons[4] = ir.registerIcon(Gadomancy.MODID + ":Range1"); + this.icons[5] = ir.registerIcon(Gadomancy.MODID + ":Cooldown1"); } @Override public IIcon getIconFromDamage(int damage) { - if(damage < 0 || damage >= icons.length) return null; - return icons[damage]; + if(damage < 0 || damage >= this.icons.length) return null; + return this.icons[damage]; } } diff --git a/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java b/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java index 3914645..7e91a6e 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java @@ -25,8 +25,8 @@ import java.util.List; public class ItemGolemCoreBreak extends Item { public ItemGolemCoreBreak() { - setHasSubtypes(true); - setCreativeTab(RegisteredItems.creativeTab); + this.setHasSubtypes(true); + this.setCreativeTab(RegisteredItems.creativeTab); } private IIcon breakIcon; @@ -34,16 +34,16 @@ public class ItemGolemCoreBreak extends Item { @Override public void registerIcons(IIconRegister ir) { - breakIcon = ir.registerIcon(Gadomancy.MODID + ":golem_core_break"); - bodyguardIcon = ir.registerIcon("thaumcraft:golem_core_bodyguard"); + this.breakIcon = ir.registerIcon(Gadomancy.MODID + ":golem_core_break"); + this.bodyguardIcon = ir.registerIcon("thaumcraft:golem_core_bodyguard"); } @Override public IIcon getIconFromDamage(int damage) { if(damage == 0) { - return breakIcon; + return this.breakIcon; } else if(damage == 1) { - return bodyguardIcon; + return this.bodyguardIcon; } return super.getIconFromDamage(damage); @@ -62,7 +62,7 @@ public class ItemGolemCoreBreak extends Item { @Override public String getUnlocalizedName(ItemStack stack) { - return getUnlocalizedName(); + return this.getUnlocalizedName(); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java b/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java index 4d06227..e1bf6ce 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java @@ -31,8 +31,8 @@ public class ItemTransformationFocus extends ItemFocusBasic { public ItemTransformationFocus() { //setCreativeTab(RegisteredItems.creativeTab); - setCreativeTab(null); - setUnlocalizedName("ItemTransformationFocus"); + this.setCreativeTab(null); + this.setUnlocalizedName("ItemTransformationFocus"); } @Override @@ -59,12 +59,12 @@ public class ItemTransformationFocus extends ItemFocusBasic { @Override public AspectList getVisCost(ItemStack item) { - return VIS_USAGE; + return ItemTransformationFocus.VIS_USAGE; } @Override public IIcon getOrnament(ItemStack item) { - return iconOrnament; + return this.iconOrnament; } @Override @@ -79,7 +79,7 @@ public class ItemTransformationFocus extends ItemFocusBasic { @Override public IIcon getFocusDepthLayerIcon(ItemStack item) { - return iconDepth; + return this.iconDepth; } @SideOnly(Side.CLIENT) @@ -95,9 +95,9 @@ public class ItemTransformationFocus extends ItemFocusBasic { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister ir) { - iconOrnament = ir.registerIcon("thaumcraft:focus_whatever_orn"); - iconDepth = ir.registerIcon(Gadomancy.MODID + ":focus_transformation_depth"); - icon = ir.registerIcon(Gadomancy.MODID + ":focus_transformation"); + this.iconOrnament = ir.registerIcon("thaumcraft:focus_whatever_orn"); + this.iconDepth = ir.registerIcon(Gadomancy.MODID + ":focus_transformation_depth"); + this.icon = ir.registerIcon(Gadomancy.MODID + ":focus_transformation"); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java index 2f1902e..f6f11de 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java @@ -37,42 +37,42 @@ import java.util.Set; public class ItemEtherealFamiliar extends Item implements IBauble { public ItemEtherealFamiliar() { - setUnlocalizedName("ItemEtherealFamiliar"); - setMaxStackSize(1); - setFull3D(); - setCreativeTab(RegisteredItems.creativeTab); + this.setUnlocalizedName("ItemEtherealFamiliar"); + this.setMaxStackSize(1); + this.setFull3D(); + this.setCreativeTab(RegisteredItems.creativeTab); - setTextureName(Gadomancy.MODID + ":category_icon"); + this.setTextureName(Gadomancy.MODID + ":category_icon"); } @Override public void getSubItems(Item item, CreativeTabs tab, List list) { ItemStack stack = new ItemStack(item); - setFamiliarAspect(stack, Aspect.MAGIC); + ItemEtherealFamiliar.setFamiliarAspect(stack, Aspect.MAGIC); list.add(stack); stack = new ItemStack(item); - setFamiliarAspect(stack, Aspect.FIRE); - addAugmentUnsafe(stack, FamiliarAugment.FIRE, 3); - addAugmentUnsafe(stack, FamiliarAugment.DAMAGE_INCREASE, 3); + ItemEtherealFamiliar.setFamiliarAspect(stack, Aspect.FIRE); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.FIRE, 3); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.DAMAGE_INCREASE, 3); list.add(stack); stack = new ItemStack(item); - setFamiliarAspect(stack, Aspect.WEATHER); - addAugmentUnsafe(stack, FamiliarAugment.SHOCK, 3); - addAugmentUnsafe(stack, FamiliarAugment.ATTACK_SPEED, 2); + ItemEtherealFamiliar.setFamiliarAspect(stack, Aspect.WEATHER); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.SHOCK, 3); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.ATTACK_SPEED, 2); list.add(stack); stack = new ItemStack(item); - setFamiliarAspect(stack, Aspect.POISON); - addAugmentUnsafe(stack, FamiliarAugment.POISON, 3); - addAugmentUnsafe(stack, FamiliarAugment.ATTACK_SPEED, 2); + ItemEtherealFamiliar.setFamiliarAspect(stack, Aspect.POISON); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.POISON, 3); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.ATTACK_SPEED, 2); list.add(stack); stack = new ItemStack(item); - setFamiliarAspect(stack, Aspect.WEAPON); - addAugmentUnsafe(stack, FamiliarAugment.WEAKNESS, 3); - addAugmentUnsafe(stack, FamiliarAugment.RANGE_INCREASE, 2); + ItemEtherealFamiliar.setFamiliarAspect(stack, Aspect.WEAPON); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.WEAKNESS, 3); + ItemEtherealFamiliar.addAugmentUnsafe(stack, FamiliarAugment.RANGE_INCREASE, 2); list.add(stack); } @@ -80,11 +80,11 @@ public class ItemEtherealFamiliar extends Item implements IBauble { public void addInformation(ItemStack stack, EntityPlayer player, List lore, boolean flag) { List newLore = new ArrayList(); - if(hasFamiliarAspect(stack)) { - newLore.add(EnumChatFormatting.GRAY + getFamiliarAspect(stack).getName()); + if(ItemEtherealFamiliar.hasFamiliarAspect(stack)) { + newLore.add(EnumChatFormatting.GRAY + ItemEtherealFamiliar.getFamiliarAspect(stack).getName()); } - List augments = getAugments(stack); + List augments = ItemEtherealFamiliar.getAugments(stack); for (FamiliarAugment.FamiliarAugmentPair pair : augments) { newLore.add(EnumChatFormatting.GRAY + pair.augment.getLocalizedName() + " " + MiscUtils.toRomanNumeral(pair.level)); } @@ -108,7 +108,7 @@ public class ItemEtherealFamiliar extends Item implements IBauble { } public static boolean hasFamiliarAspect(ItemStack stack) { - return getFamiliarAspect(stack) != null; + return ItemEtherealFamiliar.getFamiliarAspect(stack) != null; } public static void setFamiliarAspect(ItemStack stack, Aspect aspect) { @@ -124,7 +124,7 @@ public class ItemEtherealFamiliar extends Item implements IBauble { } public static boolean hasAugment(ItemStack stack, FamiliarAugment augment) { - List pairs = getAugments(stack); + List pairs = ItemEtherealFamiliar.getAugments(stack); for (FamiliarAugment.FamiliarAugmentPair pair : pairs) { if(pair.augment.equals(augment)) return true; } @@ -155,11 +155,11 @@ public class ItemEtherealFamiliar extends Item implements IBauble { }*/ public static boolean incrementAugmentLevel(ItemStack stack, FamiliarAugment toAdd) { - if(!hasAugment(stack, toAdd)) { - return addAugmentUnsafe(stack, toAdd, 1); + if(!ItemEtherealFamiliar.hasAugment(stack, toAdd)) { + return ItemEtherealFamiliar.addAugmentUnsafe(stack, toAdd, 1); } else { - int current = getAugments(stack).getLevel(toAdd); - return addAugmentUnsafe(stack, toAdd, current + 1); + int current = ItemEtherealFamiliar.getAugments(stack).getLevel(toAdd); + return ItemEtherealFamiliar.addAugmentUnsafe(stack, toAdd, current + 1); } } @@ -184,7 +184,7 @@ public class ItemEtherealFamiliar extends Item implements IBauble { if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemEtherealFamiliar) { DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData"); - Aspect a = getFamiliarAspect(itemStack); + Aspect a = ItemEtherealFamiliar.getFamiliarAspect(itemStack); if (a != null) { familiarData.equipTick(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a); } @@ -196,7 +196,7 @@ public class ItemEtherealFamiliar extends Item implements IBauble { if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemEtherealFamiliar) { DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData"); - Aspect a = getFamiliarAspect(itemStack); + Aspect a = ItemEtherealFamiliar.getFamiliarAspect(itemStack); if(a != null) { familiarData.handleEquip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a); } @@ -208,7 +208,7 @@ public class ItemEtherealFamiliar extends Item implements IBauble { if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemEtherealFamiliar) { DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData"); - Aspect a = getFamiliarAspect(itemStack); + Aspect a = ItemEtherealFamiliar.getFamiliarAspect(itemStack); if(a != null) { familiarData.handleUnequip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a); } diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java index e40b5cb..b290d60 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java @@ -3,8 +3,6 @@ package makeo.gadomancy.common.items.baubles; import baubles.api.BaubleType; import baubles.api.IBauble; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.data.DataFamiliar; -import makeo.gadomancy.common.data.SyncDataHolder; import makeo.gadomancy.common.crafting.DeprecationItemPaybacks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.NBTHelper; @@ -18,7 +16,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; import thaumcraft.api.aspects.Aspect; -import thaumcraft.common.Thaumcraft; import java.util.ArrayList; import java.util.List; @@ -34,13 +31,13 @@ import java.util.List; public class ItemFamiliar_Old extends Item implements IBauble { public ItemFamiliar_Old() { - setUnlocalizedName("ItemFamiliar"); - setMaxStackSize(1); - setFull3D(); - setCreativeTab(RegisteredItems.creativeTab); + this.setUnlocalizedName("ItemFamiliar"); + this.setMaxStackSize(1); + this.setFull3D(); + this.setCreativeTab(RegisteredItems.creativeTab); //Shut up FML. - setTextureName(Gadomancy.MODID + ":category_icon"); + this.setTextureName(Gadomancy.MODID + ":category_icon"); } @Override @@ -51,28 +48,28 @@ public class ItemFamiliar_Old extends Item implements IBauble { lore.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("gadomancy.lore.deprecation.back")); if(stack.hasTagCompound()) { - if(hasAspect(stack)) { - lore.add(getAspect(stack).getName()); + if(this.hasAspect(stack)) { + lore.add(this.getAspect(stack).getName()); } if(Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)) { - if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_2) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) { + if(this.hasUpgrade(stack, FamiliarUpgrade.ATTACK_1) || this.hasUpgrade(stack, FamiliarUpgrade.ATTACK_2) || this.hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) { String strength = EnumChatFormatting.DARK_RED + "Strength "; - if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1)) strength += "I"; - if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_2)) strength += "I"; - if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) strength += "I"; + if(this.hasUpgrade(stack, FamiliarUpgrade.ATTACK_1)) strength += "I"; + if(this.hasUpgrade(stack, FamiliarUpgrade.ATTACK_2)) strength += "I"; + if(this.hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) strength += "I"; lore.add(strength); } - if(hasUpgrade(stack, FamiliarUpgrade.RANGE_1)) { + if(this.hasUpgrade(stack, FamiliarUpgrade.RANGE_1)) { lore.add(EnumChatFormatting.GOLD + "Reach I"); } - if(hasUpgrade(stack, FamiliarUpgrade.COOLDOWN_1)) { + if(this.hasUpgrade(stack, FamiliarUpgrade.COOLDOWN_1)) { lore.add(EnumChatFormatting.AQUA + "Swiftness I"); } } else { - if(hasAnyUpgrade(stack)) { + if(this.hasAnyUpgrade(stack)) { lore.add(EnumChatFormatting.DARK_GRAY + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("gadomancy.lore.hasAdditionalLore")); } } @@ -82,7 +79,7 @@ public class ItemFamiliar_Old extends Item implements IBauble { public boolean hasAnyUpgrade(ItemStack stack) { for(FamiliarUpgrade upgrade : FamiliarUpgrade.values()) { - if(hasUpgrade(stack, upgrade)) return true; + if(this.hasUpgrade(stack, upgrade)) return true; } return false; } @@ -98,7 +95,7 @@ public class ItemFamiliar_Old extends Item implements IBauble { } public Aspect getAspect(ItemStack stack) { - if(!hasAspect(stack)) return null; + if(!this.hasAspect(stack)) return null; if(stack == null || !(stack.getItem() instanceof ItemFamiliar_Old)) return null; if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("aspect")) return null; return Aspect.getAspect(stack.getTagCompound().getString("aspect")); @@ -180,7 +177,7 @@ public class ItemFamiliar_Old extends Item implements IBauble { int range = 0; - if(hasUpgrade(itemStack, FamiliarUpgrade.RANGE_1)) { + if(this.hasUpgrade(itemStack, FamiliarUpgrade.RANGE_1)) { range += 3; } return range; @@ -188,7 +185,7 @@ public class ItemFamiliar_Old extends Item implements IBauble { public int getAttackCooldownReduction(ItemStack itemStack) { if(!(itemStack.getItem() instanceof ItemFamiliar_Old)) return 0; - return hasUpgrade(itemStack, FamiliarUpgrade.COOLDOWN_1) ? 10 : 0; + return this.hasUpgrade(itemStack, FamiliarUpgrade.COOLDOWN_1) ? 10 : 0; } public float getAttackStrength(ItemStack itemStack) { @@ -196,13 +193,13 @@ public class ItemFamiliar_Old extends Item implements IBauble { float attack = 1F; - if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_1)) { + if(this.hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_1)) { attack += 1F; } - if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_2)) { + if(this.hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_2)) { attack += 2F; } - if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_3)) { + if(this.hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_3)) { attack += 4F; } return attack; @@ -249,32 +246,32 @@ public class ItemFamiliar_Old extends Item implements IBauble { return arcPackage; } - public static enum FamiliarUpgrade { + public enum FamiliarUpgrade { ATTACK_1("AttackUpgrade1"), - ATTACK_2("AttackUpgrade2", ATTACK_1), - ATTACK_3("AttackUpgrade3", ATTACK_2), + ATTACK_2("AttackUpgrade2", FamiliarUpgrade.ATTACK_1), + ATTACK_3("AttackUpgrade3", FamiliarUpgrade.ATTACK_2), COOLDOWN_1("CdUpgrade1"), RANGE_1("RangeUpgrade1"); private String tag; private FamiliarUpgrade neededUpgrade; - private FamiliarUpgrade(String tagStr) { + FamiliarUpgrade(String tagStr) { this(tagStr, null); } - private FamiliarUpgrade(String tagStr, FamiliarUpgrade neededUpgrade) { + FamiliarUpgrade(String tagStr, FamiliarUpgrade neededUpgrade) { this.tag = tagStr; this.neededUpgrade = neededUpgrade; } public String getTag() { - return tag; + return this.tag; } public FamiliarUpgrade getNeededPreviousUpgrade() { - return neededUpgrade; + return this.neededUpgrade; } } diff --git a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java index fa8bf98..0c77b56 100644 --- a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java +++ b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java @@ -21,21 +21,21 @@ public class PacketHandler { int id = 0; //Random stuff - INSTANCE.registerMessage(PacketUpdateGolemTypeOrder.class, PacketUpdateGolemTypeOrder.class, id++, Side.CLIENT); - INSTANCE.registerMessage(PacketStartAnimation.class, PacketStartAnimation.class, id++, Side.CLIENT); - INSTANCE.registerMessage(PacketAnimationAbsorb.class, PacketAnimationAbsorb.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketUpdateGolemTypeOrder.class, PacketUpdateGolemTypeOrder.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketStartAnimation.class, PacketStartAnimation.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketAnimationAbsorb.class, PacketAnimationAbsorb.class, id++, Side.CLIENT); //Using TC Clientside content - INSTANCE.registerMessage(PacketTCNodeBolt.class, PacketTCNodeBolt.class, id++, Side.CLIENT); - INSTANCE.registerMessage(PacketTCWispyLine.class, PacketTCWispyLine.class, id++, Side.CLIENT); - INSTANCE.registerMessage(PacketTCNotificationText.class, PacketTCNotificationText.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketTCNodeBolt.class, PacketTCNodeBolt.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketTCWispyLine.class, PacketTCWispyLine.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketTCNotificationText.class, PacketTCNotificationText.class, id++, Side.CLIENT); //Familiar - INSTANCE.registerMessage(PacketFamiliarBolt.class, PacketFamiliarBolt.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketFamiliarBolt.class, PacketFamiliarBolt.class, id++, Side.CLIENT); //Sync data - INSTANCE.registerMessage(PacketSyncConfigs.class, PacketSyncConfigs.class, id++, Side.CLIENT); - INSTANCE.registerMessage(PacketSyncData.class, PacketSyncData.class, id++, Side.CLIENT); - INSTANCE.registerMessage(PacketUpdateOnlineState.class, PacketUpdateOnlineState.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketSyncConfigs.class, PacketSyncConfigs.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketSyncData.class, PacketSyncData.class, id++, Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketUpdateOnlineState.class, PacketUpdateOnlineState.class, id++, Side.CLIENT); } } diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java index 79da376..b0b3593 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java @@ -26,27 +26,27 @@ public class PacketAbortTransform implements IMessage, IMessageHandler { private Map data = new HashMap(); - private boolean shouldSyncAll = false; + private boolean shouldSyncAll; public PacketSyncData() {} @@ -65,18 +65,18 @@ public class PacketSyncData implements IMessage, IMessageHandler { private static final World WORLD = new FakeWorld(); - private EntityGolemBase golem = null; + private EntityGolemBase golem; public PacketTransformationInfo(EntityGolemBase golem) { this.golem = golem; @@ -34,13 +34,13 @@ public class PacketTransformationInfo implements IMessage, IMessageHandler) new ObjectInputStream(in).readObject(); + this.mapping = (Map) new ObjectInputStream(in).readObject(); in.close(); } catch (Exception ignored) { }//IOException | ClassNotFoundException ignored } @@ -45,7 +41,7 @@ public class PacketUpdateGolemTypeOrder implements IMessage, IMessageHandler aspectSaturation = new LinkedHashMap(); //Ensures that the node gets fed up faster if you feed it the same aspect over and over again. - private Aspect lastFedAspect = null; - private int lastFedRow = 0; + private Aspect lastFedAspect; + private int lastFedRow; //If this is true, the node stops growing. - private boolean isSaturated = false; + private boolean isSaturated; public GrowingNodeBehavior(TileExtendedNode owningNode) { this.owningNode = owningNode; } public void addAspect(AspectType type, Aspect aspect, int value) { - if(isSaturated) return; + if(this.isSaturated) return; - double increasedSaturation = getSaturation(type, aspect); - addSaturation(aspect, increasedSaturation); - owningNode.getAspectsBase().add(aspect, value); + double increasedSaturation = this.getSaturation(type, aspect); + this.addSaturation(aspect, increasedSaturation); + this.owningNode.getAspectsBase().add(aspect, value); - ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", owningNode.getWorldObj(), owningNode.xCoord, owningNode.yCoord, owningNode.zCoord, 6); + ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", this.owningNode.getWorldObj(), this.owningNode.xCoord, this.owningNode.yCoord, this.owningNode.zCoord, 6); - computeOverallSaturation(); + this.computeOverallSaturation(); } //Computes the saturation of all current aspects and calculates the overall happiness as well as if the //Node will stop growing. private void computeOverallSaturation() { - if(isSaturated) return; + if(this.isSaturated) return; double completeSaturation = 0D; - int aspects = aspectSaturation.keySet().size(); - for(Aspect a : aspectSaturation.keySet()) { - completeSaturation += aspectSaturation.get(a); + int aspects = this.aspectSaturation.keySet().size(); + for(Aspect a : this.aspectSaturation.keySet()) { + completeSaturation += this.aspectSaturation.get(a); } //Not just 0.0-1.0! //Values vary from 0.0 to SATURATION_CAP (or a bit higher) double percentSaturation = completeSaturation / ((double) aspects); - double satCmp = SATURATION_CAP; + double satCmp = GrowingNodeBehavior.SATURATION_CAP; satCmp *= 8.5; satCmp /= 10; - if(overallHappiness > HAPPINESS_CAP) { - overallHappiness /= 10; - owningNode.triggerVortexExplosion(); + if(this.overallHappiness > GrowingNodeBehavior.HAPPINESS_CAP) { + this.overallHappiness /= 10; + this.owningNode.triggerVortexExplosion(); } //If the saturation is in the upper 85% @@ -104,26 +104,26 @@ public class GrowingNodeBehavior { } public boolean mayZapNow() { - return overallHappiness > owningNode.getWorldObj().rand.nextInt(HAPPINESS_CAP * HAPPINESS_CAP); + return this.overallHappiness > this.owningNode.getWorldObj().rand.nextInt(GrowingNodeBehavior.HAPPINESS_CAP * GrowingNodeBehavior.HAPPINESS_CAP); } public float getZapDamage() { - float happinessPerc = ((float) overallHappiness) / ((float) HAPPINESS_CAP); + float happinessPerc = ((float) this.overallHappiness) / ((float) GrowingNodeBehavior.HAPPINESS_CAP); return happinessPerc > 0.3 ? happinessPerc > 0.6 ? happinessPerc > 0.9 ? 12 : 8 : 5 : 2; } private void addSaturation(Aspect aspect, double increasedSaturation) { - double overallReduction = 1D / SATURATION_DIFFICULTY; - if(aspectSaturation.containsKey(aspect)) { - aspectSaturation.put(aspect, aspectSaturation.get(aspect) + increasedSaturation); + double overallReduction = 1D / GrowingNodeBehavior.SATURATION_DIFFICULTY; + if(this.aspectSaturation.containsKey(aspect)) { + this.aspectSaturation.put(aspect, this.aspectSaturation.get(aspect) + increasedSaturation); } else { - aspectSaturation.put(aspect, increasedSaturation); + this.aspectSaturation.put(aspect, increasedSaturation); } - for(Aspect a : aspectSaturation.keySet()) { + for(Aspect a : this.aspectSaturation.keySet()) { if(a.equals(aspect)) continue; - double newSaturation = aspectSaturation.get(a) - overallReduction; + double newSaturation = this.aspectSaturation.get(a) - overallReduction; newSaturation = newSaturation < 0 ? 0 : newSaturation; - aspectSaturation.put(a, newSaturation); + this.aspectSaturation.put(a, newSaturation); } } @@ -143,55 +143,55 @@ public class GrowingNodeBehavior { case CRYSTAL_ESSENCE: mult += 0.4D; //Mana beans are hard to breed but easy to multiply.. thus growing node doesn't like. Same goes for crystallized essentia } - if(lastFedAspect != null) { - if(lastFedAspect.equals(aspect)) { + if(this.lastFedAspect != null) { + if(this.lastFedAspect.equals(aspect)) { mult += 0.4D; - lastFedRow++; + this.lastFedRow++; } } - lastFedAspect = aspect; + this.lastFedAspect = aspect; double sat = aspect.isPrimal() ? 1.4D : 1D; return sat * mult; } public boolean updateBehavior(boolean needUpdate) { - if(fixedNode != null && owningNode.ticksExisted % 3 == 0) { - if(owningNode.getWorldObj().getBlock(fixedNode.xCoord, fixedNode.yCoord, fixedNode.zCoord) != RegisteredBlocks.blockNode || - owningNode.getWorldObj().getTileEntity(fixedNode.xCoord, fixedNode.yCoord, fixedNode.zCoord) == null || - fixedNode.isInvalid()) { - fixedNode = null; + if(this.fixedNode != null && this.owningNode.ticksExisted % 3 == 0) { + if(this.owningNode.getWorldObj().getBlock(this.fixedNode.xCoord, this.fixedNode.yCoord, this.fixedNode.zCoord) != RegisteredBlocks.blockNode || + this.owningNode.getWorldObj().getTileEntity(this.fixedNode.xCoord, this.fixedNode.yCoord, this.fixedNode.zCoord) == null || + this.fixedNode.isInvalid()) { + this.fixedNode = null; return needUpdate; } - AspectList currentAspects = fixedNode.getAspects(); - AspectList baseAspects = fixedNode.getAspectsBase(); + AspectList currentAspects = this.fixedNode.getAspects(); + AspectList baseAspects = this.fixedNode.getAspectsBase(); if(baseAspects.getAspects().length == 0) { - int x = fixedNode.xCoord; - int y = fixedNode.yCoord; - int z = fixedNode.zCoord; - removeFixedNode(x, y, z); + int x = this.fixedNode.xCoord; + int y = this.fixedNode.yCoord; + int z = this.fixedNode.zCoord; + this.removeFixedNode(x, y, z); return needUpdate; } - Aspect a = baseAspects.getAspects()[owningNode.getWorldObj().rand.nextInt(baseAspects.getAspects().length)]; + Aspect a = baseAspects.getAspects()[this.owningNode.getWorldObj().rand.nextInt(baseAspects.getAspects().length)]; if(baseAspects.getAmount(a) > 0) { if(baseAspects.reduce(a, 1)) { - World world = owningNode.getWorldObj(); - int fx = fixedNode.xCoord; - int fy = fixedNode.yCoord; - int fz = fixedNode.zCoord; - int ox = owningNode.xCoord; - int oy = owningNode.yCoord; - int oz = owningNode.zCoord; + World world = this.owningNode.getWorldObj(); + int fx = this.fixedNode.xCoord; + int fy = this.fixedNode.yCoord; + int fz = this.fixedNode.zCoord; + int ox = this.owningNode.xCoord; + int oy = this.owningNode.yCoord; + int oz = this.owningNode.zCoord; currentAspects.reduce(a, 1); - ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_ATTACK", owningNode.getWorldObj(), owningNode.xCoord, owningNode.yCoord, owningNode.zCoord, 16); + ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_ATTACK", this.owningNode.getWorldObj(), this.owningNode.xCoord, this.owningNode.yCoord, this.owningNode.zCoord, 16); EntityAspectOrb aspectOrb = new EntityAspectOrb(world, fx + 0.5D, fy + 0.5D, fz + 0.5D, a, 1); Vec3 dir = Vec3.createVectorHelper(fx + 0.5D, fy + 0.5D, fz + 0.5D).subtract(Vec3.createVectorHelper(ox + 0.5D, oy + 0.5D, oz + 0.5D)).normalize(); - dir.addVector(randOffset(), randOffset(), randOffset()).normalize(); + dir.addVector(this.randOffset(), this.randOffset(), this.randOffset()).normalize(); aspectOrb.motionX = dir.xCoord; aspectOrb.motionY = dir.yCoord; aspectOrb.motionZ = dir.zCoord; - fixedNode.getWorldObj().spawnEntityInWorld(aspectOrb); + this.fixedNode.getWorldObj().spawnEntityInWorld(aspectOrb); NetworkRegistry.TargetPoint point = new NetworkRegistry.TargetPoint(world.provider.dimensionId, ox + 0.5F, oy + 0.5F, oz + 0.5F, 32); PacketTCNodeBolt bolt = new PacketTCNodeBolt(ox + 0.5F, oy + 0.5F, oz + 0.5F, fx + 0.5F, fy + 0.5F, fz + 0.5F, 0, false); @@ -201,14 +201,14 @@ public class GrowingNodeBehavior { PacketHandler.INSTANCE.sendToAllAround(packet, point); world.markBlockForUpdate(fx, fy, fz); - fixedNode.markDirty(); + this.fixedNode.markDirty(); needUpdate = true; } else { if(baseAspects.size() <= 1) { - int x = fixedNode.xCoord; - int y = fixedNode.yCoord; - int z = fixedNode.zCoord; - removeFixedNode(x, y, z); + int x = this.fixedNode.xCoord; + int y = this.fixedNode.yCoord; + int z = this.fixedNode.zCoord; + this.removeFixedNode(x, y, z); needUpdate = true; } baseAspects.remove(a); @@ -217,10 +217,10 @@ public class GrowingNodeBehavior { } } else { if(baseAspects.size() <= 1) { - int x = fixedNode.xCoord; - int y = fixedNode.yCoord; - int z = fixedNode.zCoord; - removeFixedNode(x, y, z); + int x = this.fixedNode.xCoord; + int y = this.fixedNode.yCoord; + int z = this.fixedNode.zCoord; + this.removeFixedNode(x, y, z); needUpdate = true; } baseAspects.remove(a); @@ -232,33 +232,33 @@ public class GrowingNodeBehavior { } private void removeFixedNode(int x, int y, int z) { - owningNode.getWorldObj().setBlockToAir(x, y, z); - owningNode.getWorldObj().removeTileEntity(x, y, z); - owningNode.getWorldObj().markBlockForUpdate(x, y, z); + this.owningNode.getWorldObj().setBlockToAir(x, y, z); + this.owningNode.getWorldObj().removeTileEntity(x, y, z); + this.owningNode.getWorldObj().markBlockForUpdate(x, y, z); this.fixedNode = null; } private float randOffset() { - return owningNode.getWorldObj().rand.nextFloat() / 3; + return this.owningNode.getWorldObj().rand.nextFloat() / 3; } public boolean doesAccept(Aspect aspect) { - if(isSaturated) { - handleOverfeed(); + if(this.isSaturated) { + this.handleOverfeed(); return false; } - if(aspectSaturation.containsKey(aspect)) { - double percentageToSaturation = aspectSaturation.get(aspect) / SATURATION_CAP; // 0.0 - 1.0 - boolean mayAdd = owningNode.getWorldObj().rand.nextFloat() > percentageToSaturation; + if(this.aspectSaturation.containsKey(aspect)) { + double percentageToSaturation = this.aspectSaturation.get(aspect) / GrowingNodeBehavior.SATURATION_CAP; // 0.0 - 1.0 + boolean mayAdd = this.owningNode.getWorldObj().rand.nextFloat() > percentageToSaturation; if(mayAdd) { double inc = 1D / (1D - percentageToSaturation); - if(lastFedAspect != null) { - if(aspect.equals(lastFedAspect)) { - inc *= evaluateFeedingDenialFunc((lastFedRow > 0 ? lastFedRow : 1)); + if(this.lastFedAspect != null) { + if(aspect.equals(this.lastFedAspect)) { + inc *= this.evaluateFeedingDenialFunc((this.lastFedRow > 0 ? this.lastFedRow : 1)); } else { inc *= -10; - lastFedRow = 0; + this.lastFedRow = 0; } } this.overallHappiness += inc; //The node doesn't like to be forced to eat the same every time. @@ -268,7 +268,7 @@ public class GrowingNodeBehavior { } else { //The node does not know that aspect yet/hasn't created an immunity to it yet. //The node gets to know a new aspect, thus the happiness increases. - this.overallHappiness = overallHappiness / SATURATION_DIFFICULTY; + this.overallHappiness = this.overallHappiness / GrowingNodeBehavior.SATURATION_DIFFICULTY; return true; } } @@ -297,22 +297,22 @@ public class GrowingNodeBehavior { double saturation = aspectCompound.getDouble("aspectSaturation"); Aspect a = Aspect.getAspect(name); if(a != null) { - aspectSaturation.put(a, saturation); + this.aspectSaturation.put(a, saturation); } } } public void writeToNBT(NBTTagCompound nbtTagCompound) { - nbtTagCompound.setBoolean("overallSaturated", isSaturated); - nbtTagCompound.setDouble("overallHappiness", overallHappiness); - if(lastFedAspect != null) { - nbtTagCompound.setString("lastFedAspect", lastFedAspect.getTag()); - nbtTagCompound.setInteger("lastFedRow", lastFedRow); + nbtTagCompound.setBoolean("overallSaturated", this.isSaturated); + nbtTagCompound.setDouble("overallHappiness", this.overallHappiness); + if(this.lastFedAspect != null) { + nbtTagCompound.setString("lastFedAspect", this.lastFedAspect.getTag()); + nbtTagCompound.setInteger("lastFedRow", this.lastFedRow); } NBTTagList list = new NBTTagList(); - for(Aspect a : aspectSaturation.keySet()) { - double saturation = aspectSaturation.get(a); + for(Aspect a : this.aspectSaturation.keySet()) { + double saturation = this.aspectSaturation.get(a); NBTTagCompound compound = new NBTTagCompound(); compound.setString("aspectName", a.getTag()); compound.setDouble("aspectSaturation", saturation); @@ -322,7 +322,7 @@ public class GrowingNodeBehavior { } public boolean lookingForNode() { - return fixedNode == null; + return this.fixedNode == null; } public void lockOnTo(TileNode node) { @@ -330,7 +330,7 @@ public class GrowingNodeBehavior { this.fixedNode = node; } - public static enum AspectType { + public enum AspectType { WISP, WISP_ESSENCE, ASPECT_ORB, MANA_BEAN, CRYSTAL_ESSENCE diff --git a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResult.java b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResult.java index 8c5dc62..1ece391 100644 --- a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResult.java +++ b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResult.java @@ -1,6 +1,5 @@ package makeo.gadomancy.common.node; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import net.minecraft.util.WeightedRandom; import net.minecraft.world.World; import thaumcraft.api.nodes.INode; @@ -23,7 +22,7 @@ public abstract class NodeManipulatorResult extends WeightedRandom.Item { } public NodeManipulatorResultHandler.ResultType getResultType() { - return resultType; + return this.resultType; } public boolean canAffect(World world, INode node) { diff --git a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java index f674c0d..e0d6d39 100644 --- a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java +++ b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java @@ -27,13 +27,13 @@ public class NodeManipulatorResultHandler { private NodeManipulatorResultHandler() {} public static NodeManipulatorResult getRandomResult(World world, INode affectedNode, int percChance) { - return getRandomResult(world, world.rand, affectedNode, percChance); + return NodeManipulatorResultHandler.getRandomResult(world, world.rand, affectedNode, percChance); } public static NodeManipulatorResult getRandomResult(World world, Random random, INode affectedNode, int percChance) { int resultPositiveChance = Math.round(((float) percChance) / 5F); List localResults = new ArrayList(); - for(NodeManipulatorResult result : possibleResults) { + for(NodeManipulatorResult result : NodeManipulatorResultHandler.possibleResults) { if(result.canAffect(world, affectedNode)) { ResultType type = result.getResultType(); if(type == ResultType.NEGATIVE) { @@ -48,7 +48,7 @@ public class NodeManipulatorResultHandler { } public static void combine(AspectList containingList, Aspect a, Aspect b, int addition) { - if(!canCombine(a, b)) return; + if(!NodeManipulatorResultHandler.canCombine(a, b)) return; Aspect combination = NodeManipulatorResultHandler.getCombination(a, b); int lowerAmount; if(containingList.getAmount(a) < containingList.getAmount(b)) { @@ -62,7 +62,7 @@ public class NodeManipulatorResultHandler { } public static boolean canCombine(Aspect a, Aspect b) { - return getCombination(a, b) != null; + return NodeManipulatorResultHandler.getCombination(a, b) != null; } public static Aspect getCombination(Aspect a, Aspect b) { @@ -78,26 +78,26 @@ public class NodeManipulatorResultHandler { static { //Aspect combination pair - possibleResults.add(RegisteredManipulations.resultBreakCompounds); - possibleResults.add(RegisteredManipulations.resultCombineAspects); + NodeManipulatorResultHandler.possibleResults.add(RegisteredManipulations.resultBreakCompounds); + NodeManipulatorResultHandler.possibleResults.add(RegisteredManipulations.resultCombineAspects); //Modifier pair - possibleResults.add(RegisteredManipulations.resultIncreaseModifier); - possibleResults.add(RegisteredManipulations.resultDecreaseModifier); + NodeManipulatorResultHandler.possibleResults.add(RegisteredManipulations.resultIncreaseModifier); + NodeManipulatorResultHandler.possibleResults.add(RegisteredManipulations.resultDecreaseModifier); //Switch node Type - possibleResults.add(RegisteredManipulations.resultSwitchType); + NodeManipulatorResultHandler.possibleResults.add(RegisteredManipulations.resultSwitchType); if(ModConfig.enableAdditionalNodeTypes) { //Almighty Growing - possibleResults.add(RegisteredManipulations.resultApplyGrowing); + NodeManipulatorResultHandler.possibleResults.add(RegisteredManipulations.resultApplyGrowing); } //Let the node gain primals - possibleResults.add(RegisteredManipulations.resultGainPrimal); + NodeManipulatorResultHandler.possibleResults.add(RegisteredManipulations.resultGainPrimal); } - public static enum ResultType { + public enum ResultType { POSITIVE, NEGATIVE, diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java b/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java index 872381c..38cb6a0 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java @@ -4,12 +4,10 @@ import makeo.gadomancy.common.data.DataAchromatic; import makeo.gadomancy.common.data.SyncDataHolder; import makeo.gadomancy.common.utils.Vector3; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.ai.attributes.BaseAttributeMap; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Vec3; import thaumcraft.api.aspects.Aspect; import java.util.List; @@ -25,7 +23,7 @@ import java.util.List; public class PotionAchromatic extends PotionCustomTexture { public PotionAchromatic(int id) { super(id, false, Aspect.CRYSTAL.getColor(), Aspect.CRYSTAL.getImage()); - setPotionName("potion.achromatic"); + this.setPotionName("potion.achromatic"); } @Override diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionBuffGolem.java b/src/main/java/makeo/gadomancy/common/potions/PotionBuffGolem.java index e7f2f1e..1533d35 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionBuffGolem.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionBuffGolem.java @@ -24,13 +24,13 @@ public class PotionBuffGolem extends PotionCustomTexture { public static final double HEALTH_INCREASE = 0.5; public static final double DAMAGE_INCREASE = 1; - public static final AttributeModifier SPEED_INC_PERCENT = new AttributeModifier(UUID.fromString("9f76335f-2952-46e9-b91a-c555ca983ada"), "POTION_GOLEM_SPEED", SPEED_INCREASE, 1); - public static final AttributeModifier HEALTH_INC_PERCENT = new AttributeModifier(UUID.fromString("fafcbdc2-9c24-45a1-b832-4b6c4a5df9c7"), "POTION_GOLEM_HEALTH", HEALTH_INCREASE, 1); - public static final AttributeModifier DAMAGE_INC_PERCENT = new AttributeModifier(UUID.fromString("6e562261-dccf-4421-ac6f-c742989c7dfb"), "POTION_GOLEM_DAMAGE", DAMAGE_INCREASE, 1); + public static final AttributeModifier SPEED_INC_PERCENT = new AttributeModifier(UUID.fromString("9f76335f-2952-46e9-b91a-c555ca983ada"), "POTION_GOLEM_SPEED", PotionBuffGolem.SPEED_INCREASE, 1); + public static final AttributeModifier HEALTH_INC_PERCENT = new AttributeModifier(UUID.fromString("fafcbdc2-9c24-45a1-b832-4b6c4a5df9c7"), "POTION_GOLEM_HEALTH", PotionBuffGolem.HEALTH_INCREASE, 1); + public static final AttributeModifier DAMAGE_INC_PERCENT = new AttributeModifier(UUID.fromString("6e562261-dccf-4421-ac6f-c742989c7dfb"), "POTION_GOLEM_DAMAGE", PotionBuffGolem.DAMAGE_INCREASE, 1); public PotionBuffGolem(int id) { super(id, false, Aspect.CRAFT.getColor(), Aspect.CRAFT.getImage()); - setPotionName("potion.buffGolem"); + this.setPotionName("potion.buffGolem"); } @Override @@ -41,18 +41,18 @@ public class PotionBuffGolem extends PotionCustomTexture { EntityGolemBase golem = (EntityGolemBase) entity; IAttributeInstance inst = golem.getEntityAttribute(SharedMonsterAttributes.movementSpeed); - if(inst.getModifier(SPEED_INC_PERCENT.getID()) != null) { - inst.applyModifier(SPEED_INC_PERCENT); + if(inst.getModifier(PotionBuffGolem.SPEED_INC_PERCENT.getID()) != null) { + inst.applyModifier(PotionBuffGolem.SPEED_INC_PERCENT); } inst = golem.getEntityAttribute(SharedMonsterAttributes.maxHealth); - if(inst.getModifier(HEALTH_INC_PERCENT.getID()) != null) { - inst.applyModifier(HEALTH_INC_PERCENT); + if(inst.getModifier(PotionBuffGolem.HEALTH_INC_PERCENT.getID()) != null) { + inst.applyModifier(PotionBuffGolem.HEALTH_INC_PERCENT); } inst = golem.getEntityAttribute(SharedMonsterAttributes.attackDamage); - if(inst.getModifier(DAMAGE_INC_PERCENT.getID()) != null) { - inst.applyModifier(DAMAGE_INC_PERCENT); + if(inst.getModifier(PotionBuffGolem.DAMAGE_INC_PERCENT.getID()) != null) { + inst.applyModifier(PotionBuffGolem.DAMAGE_INC_PERCENT); } } } @@ -65,18 +65,18 @@ public class PotionBuffGolem extends PotionCustomTexture { EntityGolemBase golem = (EntityGolemBase) entity; IAttributeInstance inst = golem.getEntityAttribute(SharedMonsterAttributes.movementSpeed); - if(inst.getModifier(SPEED_INC_PERCENT.getID()) != null) { - inst.removeModifier(SPEED_INC_PERCENT); + if(inst.getModifier(PotionBuffGolem.SPEED_INC_PERCENT.getID()) != null) { + inst.removeModifier(PotionBuffGolem.SPEED_INC_PERCENT); } inst = golem.getEntityAttribute(SharedMonsterAttributes.maxHealth); - if(inst.getModifier(HEALTH_INC_PERCENT.getID()) != null) { - inst.removeModifier(HEALTH_INC_PERCENT); + if(inst.getModifier(PotionBuffGolem.HEALTH_INC_PERCENT.getID()) != null) { + inst.removeModifier(PotionBuffGolem.HEALTH_INC_PERCENT); } inst = golem.getEntityAttribute(SharedMonsterAttributes.attackDamage); - if(inst.getModifier(DAMAGE_INC_PERCENT.getID()) != null) { - inst.removeModifier(DAMAGE_INC_PERCENT); + if(inst.getModifier(PotionBuffGolem.DAMAGE_INC_PERCENT.getID()) != null) { + inst.removeModifier(PotionBuffGolem.DAMAGE_INC_PERCENT); } } } diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java b/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java index 9d968e8..4719a40 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java @@ -6,7 +6,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; -import java.awt.Color; +import java.awt.*; /** * This class is part of the Gadomancy Mod @@ -33,9 +33,9 @@ public abstract class PotionCustomTexture extends Potion { @Override public void renderInventoryEffect(int x, int y, PotionEffect effect, Minecraft mc) { Tessellator tes = Tessellator.instance; - mc.renderEngine.bindTexture(texture); + mc.renderEngine.bindTexture(this.texture); tes.startDrawingQuads(); - Color c = new Color(getLiquidColor()); + Color c = new Color(this.getLiquidColor()); tes.setColorRGBA(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()); tes.addVertexWithUV(x + 6, y + 7, 0, 0, 0); tes.addVertexWithUV(x + 6, y + 7 + 18, 0, 0, 1); diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionEldritch.java b/src/main/java/makeo/gadomancy/common/potions/PotionEldritch.java index 0b557fd..cc261d9 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionEldritch.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionEldritch.java @@ -13,6 +13,6 @@ import thaumcraft.api.aspects.Aspect; public class PotionEldritch extends PotionCustomTexture { public PotionEldritch(int id) { super(id, false, Aspect.ELDRITCH.getColor(), Aspect.ELDRITCH.getImage()); - setPotionName("potion.eldritch"); + this.setPotionName("potion.eldritch"); } } diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionMiningLuck.java b/src/main/java/makeo/gadomancy/common/potions/PotionMiningLuck.java index 7a44bfe..13d16d0 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionMiningLuck.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionMiningLuck.java @@ -14,7 +14,7 @@ public class PotionMiningLuck extends PotionCustomTexture { public PotionMiningLuck(int id) { super(id, false, Aspect.GREED.getColor(), Aspect.GREED.getImage()); - setPotionName("potion.luck"); + this.setPotionName("potion.luck"); } } diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionVisAffinity.java b/src/main/java/makeo/gadomancy/common/potions/PotionVisAffinity.java index 93ac798..48857ba 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionVisAffinity.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionVisAffinity.java @@ -14,7 +14,7 @@ public class PotionVisAffinity extends PotionCustomTexture { public PotionVisAffinity(int id) { super(id, false, Aspect.MAGIC.getColor(), Aspect.MAGIC.getImage()); - setPotionName("potion.visdiscount"); + this.setPotionName("potion.visdiscount"); } } diff --git a/src/main/java/makeo/gadomancy/common/registration/AIShutdownWhitelist.java b/src/main/java/makeo/gadomancy/common/registration/AIShutdownWhitelist.java index 9761513..9490260 100644 --- a/src/main/java/makeo/gadomancy/common/registration/AIShutdownWhitelist.java +++ b/src/main/java/makeo/gadomancy/common/registration/AIShutdownWhitelist.java @@ -27,23 +27,23 @@ public class AIShutdownWhitelist { new HashMap, List>>(); public static void whitelistAIClass(Class entityClass, Class aiClass) { - if(!whitelistedAI.containsKey(entityClass)) { - whitelistedAI.put(entityClass, new LinkedList>()); + if(!AIShutdownWhitelist.whitelistedAI.containsKey(entityClass)) { + AIShutdownWhitelist.whitelistedAI.put(entityClass, new LinkedList>()); } - whitelistedAI.get(entityClass).add(aiClass); + AIShutdownWhitelist.whitelistedAI.get(entityClass).add(aiClass); } public static void whitelistAIClass(EntityLiving entity, Class aiClass) { - whitelistAIClass(entity.getClass(), aiClass); + AIShutdownWhitelist.whitelistAIClass(entity.getClass(), aiClass); } public static List> getWhitelistedAIClasses(EntityLiving entity) { - if(!whitelistedAI.containsKey(entity.getClass())) return Lists.newArrayList(); - return whitelistedAI.get(entity.getClass()); + if(!AIShutdownWhitelist.whitelistedAI.containsKey(entity.getClass())) return Lists.newArrayList(); + return AIShutdownWhitelist.whitelistedAI.get(entity.getClass()); } static { - whitelistAIClass(EntitySheep.class, EntityAIEatGrass.class); + AIShutdownWhitelist.whitelistAIClass(EntitySheep.class, EntityAIEatGrass.class); } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index 9187625..c775d2a 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -2,27 +2,10 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.common.blocks.BlockAdditionalEldritchPortal; -import makeo.gadomancy.common.blocks.BlockArcaneDropper; -import makeo.gadomancy.common.blocks.BlockAuraPylon; -import makeo.gadomancy.common.blocks.BlockEssentiaCompressor; -import makeo.gadomancy.common.blocks.BlockExtendedNodeJar; -import makeo.gadomancy.common.blocks.BlockInfusionClaw; -import makeo.gadomancy.common.blocks.BlockKnowledgeBook; -import makeo.gadomancy.common.blocks.BlockNode; -import makeo.gadomancy.common.blocks.BlockNodeManipulator; -import makeo.gadomancy.common.blocks.BlockRemoteJar; -import makeo.gadomancy.common.blocks.BlockStickyJar; -import makeo.gadomancy.common.blocks.BlockStoneMachine; +import makeo.gadomancy.common.blocks.*; import makeo.gadomancy.common.blocks.tiles.*; import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.items.ItemBlockAdditionalEldritchPortal; -import makeo.gadomancy.common.items.ItemBlockAuraPylon; -import makeo.gadomancy.common.items.ItemBlockEssentiaCompressor; -import makeo.gadomancy.common.items.ItemBlockKnowledgeBook; -import makeo.gadomancy.common.items.ItemBlockRemoteJar; -import makeo.gadomancy.common.items.ItemBlockStoneMachine; -import makeo.gadomancy.common.items.ItemNodeManipulator; +import makeo.gadomancy.common.items.*; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -64,28 +47,28 @@ public class RegisteredBlocks { public static BlockEssentiaCompressor blockEssentiaCompressor; public static void init() { - registerBlocks(); + RegisteredBlocks.registerBlocks(); - registerTileEntities(); + RegisteredBlocks.registerTileEntities(); - registerDefaultStickyJars(); - registerDefaultClawBehaviors(); + RegisteredBlocks.registerDefaultStickyJars(); + RegisteredBlocks.registerDefaultClawBehaviors(); } //Blocks private static void registerBlocks() { - blockStickyJar = registerBlock(new BlockStickyJar()); - blockArcaneDropper = registerBlock(new BlockArcaneDropper()); - blockInfusionClaw = registerBlock(new BlockInfusionClaw()); - blockRemoteJar = registerBlock(new BlockRemoteJar(), ItemBlockRemoteJar.class); - blockNode = ModConfig.enableAdditionalNodeTypes ? (BlockAiry) new BlockNode().setBlockName("blockAiry") : (BlockAiry) ConfigBlocks.blockAiry; - blockExtendedNodeJar = registerBlock(new BlockExtendedNodeJar()); - blockNodeManipulator = registerBlock(new BlockNodeManipulator(), ItemNodeManipulator.class); - blockStoneMachine = registerBlock(new BlockStoneMachine(), ItemBlockStoneMachine.class); - blockAdditionalEldrichPortal = registerBlock(new BlockAdditionalEldritchPortal(), ItemBlockAdditionalEldritchPortal.class); - blockAuraPylon = registerBlock(new BlockAuraPylon(), ItemBlockAuraPylon.class); - blockKnowledgeBook = registerBlock(new BlockKnowledgeBook(), ItemBlockKnowledgeBook.class); - blockEssentiaCompressor = registerBlock(new BlockEssentiaCompressor(), ItemBlockEssentiaCompressor.class); + RegisteredBlocks.blockStickyJar = RegisteredBlocks.registerBlock(new BlockStickyJar()); + RegisteredBlocks.blockArcaneDropper = RegisteredBlocks.registerBlock(new BlockArcaneDropper()); + RegisteredBlocks.blockInfusionClaw = RegisteredBlocks.registerBlock(new BlockInfusionClaw()); + RegisteredBlocks.blockRemoteJar = RegisteredBlocks.registerBlock(new BlockRemoteJar(), ItemBlockRemoteJar.class); + RegisteredBlocks.blockNode = ModConfig.enableAdditionalNodeTypes ? (BlockAiry) new BlockNode().setBlockName("blockAiry") : (BlockAiry) ConfigBlocks.blockAiry; + RegisteredBlocks.blockExtendedNodeJar = RegisteredBlocks.registerBlock(new BlockExtendedNodeJar()); + RegisteredBlocks.blockNodeManipulator = RegisteredBlocks.registerBlock(new BlockNodeManipulator(), ItemNodeManipulator.class); + RegisteredBlocks.blockStoneMachine = RegisteredBlocks.registerBlock(new BlockStoneMachine(), ItemBlockStoneMachine.class); + RegisteredBlocks.blockAdditionalEldrichPortal = RegisteredBlocks.registerBlock(new BlockAdditionalEldritchPortal(), ItemBlockAdditionalEldritchPortal.class); + RegisteredBlocks.blockAuraPylon = RegisteredBlocks.registerBlock(new BlockAuraPylon(), ItemBlockAuraPylon.class); + RegisteredBlocks.blockKnowledgeBook = RegisteredBlocks.registerBlock(new BlockKnowledgeBook(), ItemBlockKnowledgeBook.class); + RegisteredBlocks.blockEssentiaCompressor = RegisteredBlocks.registerBlock(new BlockEssentiaCompressor(), ItemBlockEssentiaCompressor.class); } private static T registerBlock(String name, T block) { @@ -101,33 +84,33 @@ public class RegisteredBlocks { } private static T registerBlock(T block, Class itemClass) { - registerBlock(block.getClass().getSimpleName(), block, itemClass); + RegisteredBlocks.registerBlock(block.getClass().getSimpleName(), block, itemClass); return block; } private static T registerBlock(T block) { - registerBlock(block.getClass().getSimpleName(), block); + RegisteredBlocks.registerBlock(block.getClass().getSimpleName(), block); return block; } //Tiles private static void registerTileEntities() { - registerTile(TileStickyJar.class); - registerTile(TileArcaneDropper.class); - registerTile(TileInfusionClaw.class); - registerTile(TileRemoteJar.class); - registerTile(TileExtendedNode.class); - registerTile(TileExtendedNodeJar.class); - registerTile(TileNodeManipulator.class); - registerTile(TileManipulatorPillar.class); - registerTile(TileManipulationFocus.class); - registerTile(TileAdditionalEldritchPortal.class); - registerTile(TileBlockProtector.class); - registerTile(TileAuraPylon.class); - registerTile(TileAuraPylonTop.class); - registerTile(TileArcanePackager.class); - registerTile(TileKnowledgeBook.class); - registerTile(TileEssentiaCompressor.class); + RegisteredBlocks.registerTile(TileStickyJar.class); + RegisteredBlocks.registerTile(TileArcaneDropper.class); + RegisteredBlocks.registerTile(TileInfusionClaw.class); + RegisteredBlocks.registerTile(TileRemoteJar.class); + RegisteredBlocks.registerTile(TileExtendedNode.class); + RegisteredBlocks.registerTile(TileExtendedNodeJar.class); + RegisteredBlocks.registerTile(TileNodeManipulator.class); + RegisteredBlocks.registerTile(TileManipulatorPillar.class); + RegisteredBlocks.registerTile(TileManipulationFocus.class); + RegisteredBlocks.registerTile(TileAdditionalEldritchPortal.class); + RegisteredBlocks.registerTile(TileBlockProtector.class); + RegisteredBlocks.registerTile(TileAuraPylon.class); + RegisteredBlocks.registerTile(TileAuraPylonTop.class); + RegisteredBlocks.registerTile(TileArcanePackager.class); + RegisteredBlocks.registerTile(TileKnowledgeBook.class); + RegisteredBlocks.registerTile(TileEssentiaCompressor.class); //registerTile(TileAIShutdown.class); } @@ -136,26 +119,26 @@ public class RegisteredBlocks { } private static void registerTile(Class tile) { - registerTile(tile, tile.getSimpleName()); + RegisteredBlocks.registerTile(tile, tile.getSimpleName()); } //Sticky Jars private static void registerDefaultStickyJars() { - registerStickyJar(ConfigBlocks.blockJar, 0, true, true); - registerStickyJar(ConfigBlocks.blockJar, 3, true, true); + RegisteredBlocks.registerStickyJar(ConfigBlocks.blockJar, 0, true, true); + RegisteredBlocks.registerStickyJar(ConfigBlocks.blockJar, 3, true, true); - registerStickyJar(RegisteredBlocks.blockRemoteJar, 0, false, false); + RegisteredBlocks.registerStickyJar(RegisteredBlocks.blockRemoteJar, 0, false, false); } private static List stickyJars = new ArrayList(); public static void registerStickyJar(Block block, int metadata, boolean isLabelable, boolean isPhialable) { - stickyJars.add(0, new StickyJarInfo(block, metadata, isLabelable, isPhialable)); + RegisteredBlocks.stickyJars.add(0, new StickyJarInfo(block, metadata, isLabelable, isPhialable)); } public static StickyJarInfo getStickyJarInfo(Block block, int metadata) { - for(StickyJarInfo info : stickyJars) { + for(StickyJarInfo info : RegisteredBlocks.stickyJars) { if(info.getBlock() == block && info.getMetadata() == metadata) { return info; } @@ -165,21 +148,21 @@ public class RegisteredBlocks { //Infusion Claw private static void registerDefaultClawBehaviors() { - registerClawClickBehavior(new ClickBehavior() { + RegisteredBlocks.registerClawClickBehavior(new ClickBehavior() { @Override public boolean isValidForBlock() { - return (block == Blocks.bookshelf && metadata == 0) - || (block == Blocks.cauldron && metadata == 0); + return (this.block == Blocks.bookshelf && this.metadata == 0) + || (this.block == Blocks.cauldron && this.metadata == 0); } }); - registerClawClickBehavior(new ClickBehavior(true) { + RegisteredBlocks.registerClawClickBehavior(new ClickBehavior(true) { private TileInfusionMatrix matrix; @Override public boolean isValidForBlock() { - if(block == ConfigBlocks.blockStoneDevice && metadata == 2) { - matrix = (TileInfusionMatrix) world.getTileEntity(x, y, z); + if(this.block == ConfigBlocks.blockStoneDevice && this.metadata == 2) { + this.matrix = (TileInfusionMatrix) this.world.getTileEntity(this.x, this.y, this.z); return true; } return false; @@ -187,12 +170,12 @@ public class RegisteredBlocks { @Override public void addInstability(int instability) { - matrix.instability += instability; + this.matrix.instability += instability; } @Override public int getComparatorOutput() { - return matrix.crafting ? 15 : 0; + return this.matrix.crafting ? 15 : 0; } }); @@ -212,14 +195,14 @@ public class RegisteredBlocks { private static List clawBehaviors = new ArrayList(); public static void registerClawClickBehavior(ClickBehavior behavior) { - clawBehaviors.add(behavior); + RegisteredBlocks.clawBehaviors.add(behavior); } public static ClickBehavior getClawClickBehavior(World world, int x, int y, int z) { Block block = world.getBlock(x, y, z); int metadata = world.getBlockMetadata(x, y, z); - for(ClickBehavior behavior : clawBehaviors) { + for(ClickBehavior behavior : RegisteredBlocks.clawBehaviors) { behavior.init(world, block, x, y, z, metadata); if(behavior.isValidForBlock()) { return behavior; @@ -229,6 +212,6 @@ public class RegisteredBlocks { } public static List getClawClickBehaviors() { - return clawBehaviors; + return RegisteredBlocks.clawBehaviors; } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java index 570ed2a..5187786 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java @@ -20,7 +20,7 @@ public class RegisteredEnchantments { public static EnchantmentRevealer revealer; public static void init() { - revealer = registerEnchantment(EnchantmentRevealer.class); + RegisteredEnchantments.revealer = RegisteredEnchantments.registerEnchantment(EnchantmentRevealer.class); } public static void createConfigEntries() { @@ -34,7 +34,7 @@ public class RegisteredEnchantments { public static T registerEnchantment(Class enchClass) { int id = ModConfig.loadEnchantmentId(enchClass.getSimpleName()); if(id == -1) { - id = getUnassignedId(enchClass); + id = RegisteredEnchantments.getUnassignedId(enchClass); } return new Injector(enchClass).invokeConstructor(int.class, id); } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java index 2abc4ac..34848ce 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java @@ -19,10 +19,10 @@ import net.minecraft.entity.Entity; public class RegisteredEntities { public static void init() { - registerEntity(EntityPermNoClipItem.class, "EntityPermItem", 32, 40, false); - registerEntity(EntityAuraCore.class, "EntityAuraCore", 32, 10, true); - registerEntity(FakePlayerEntity.class, "FakePlayerEntity", 32, 20, true); - registerEntity(EntityItemElement.class, "EntityItemElement", 32, 40, true); + RegisteredEntities.registerEntity(EntityPermNoClipItem.class, "EntityPermItem", 32, 40, false); + RegisteredEntities.registerEntity(EntityAuraCore.class, "EntityAuraCore", 32, 10, true); + RegisteredEntities.registerEntity(FakePlayerEntity.class, "FakePlayerEntity", 32, 20, true); + RegisteredEntities.registerEntity(EntityItemElement.class, "EntityItemElement", 32, 40, true); } private static void registerEntity(Class entityClass, String name, int trackingRange, int updateFreq, boolean sendVelUpdates) { diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java index f5be380..f19b2d1 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java @@ -48,14 +48,14 @@ public class RegisteredFamiliarAI_Old { @Override public boolean canRun(World world, double x, double y, double z, EntityPlayer parent, ItemStack itemStack) { int rangeInc = ((ItemFamiliar_Old) itemStack.getItem()).getAttackRangeIncrease(itemStack); - return getPotentialTargets(world, parent, rangeInc).size() > 0; + return this.getPotentialTargets(world, parent, rangeInc).size() > 0; } @Override public void tick(int ticksSoFar, World world, EntityPlayer parent, ItemStack itemStack) { int rangeInc = ((ItemFamiliar_Old) itemStack.getItem()).getAttackRangeIncrease(itemStack); - List lastTargetters = getPotentialTargets(world, parent, rangeInc); + List lastTargetters = this.getPotentialTargets(world, parent, rangeInc); if(lastTargetters.size() == 0) { FamiliarAIController_Old.cleanTargetterList(parent); return; @@ -76,7 +76,7 @@ public class RegisteredFamiliarAI_Old { } private List getPotentialTargets(World world, EntityPlayer player, int rangeInc) { - List validTargets = getCloseEnoughTargetters(world, player, rangeInc); + List validTargets = this.getCloseEnoughTargetters(world, player, rangeInc); EntityLivingBase attacker = player.getLastAttacker(); int range = 8 + rangeInc; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java index b01bdb2..2f97a67 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java @@ -6,7 +6,6 @@ import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.golems.cores.BodyguardGolemCore; import makeo.gadomancy.common.entities.golems.cores.BreakGolemCore; -import makeo.gadomancy.common.entities.golems.types.ObsidianGolemType; import makeo.gadomancy.common.entities.golems.types.SilverwoodGolemType; import makeo.gadomancy.common.entities.golems.upgrades.GolemUpgrade; import makeo.gadomancy.common.entities.golems.upgrades.GolemUpgradeRunicShield; @@ -35,13 +34,13 @@ public class RegisteredGolemStuff { public static AdditionalGolemCore bodyguardCore; public static void init() { - typeSilverwood = registerGolemType("SILVERWOOD", new SilverwoodGolemType()); + RegisteredGolemStuff.typeSilverwood = RegisteredGolemStuff.registerGolemType("SILVERWOOD", new SilverwoodGolemType()); //typeObsidian = registerGolemType("OBSIDIAN", new ObsidianGolemType()); - breakCore = registerGolemCore("breakCore", new BreakGolemCore()); - bodyguardCore = registerGolemCore("bodyguardCore", new BodyguardGolemCore()); + RegisteredGolemStuff.breakCore = RegisteredGolemStuff.registerGolemCore("breakCore", new BreakGolemCore()); + RegisteredGolemStuff.bodyguardCore = RegisteredGolemStuff.registerGolemCore("bodyguardCore", new BodyguardGolemCore()); - upgradeRunicShield = registerGolemUpgrade(new GolemUpgradeRunicShield()); + RegisteredGolemStuff.upgradeRunicShield = RegisteredGolemStuff.registerGolemUpgrade(new GolemUpgradeRunicShield()); } private static T registerGolemType(String name, T type) { @@ -55,7 +54,7 @@ public class RegisteredGolemStuff { } private static T registerGolemUpgrade(T upgrade) { - UPGRADES.add(upgrade); + RegisteredGolemStuff.UPGRADES.add(upgrade); return upgrade; } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java index 8662e0c..c1f4770 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java @@ -1,6 +1,5 @@ package makeo.gadomancy.common.registration; -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.integration.*; @@ -26,15 +25,15 @@ public class RegisteredIntegrations { private RegisteredIntegrations() {} public static void init() { - morph = registerIndependent(IntegrationMorph.class); - thaumicExploration = registerIndependent(IntegrationThaumicExploration.class); - automagy = registerIndependent(IntegrationAutomagy.class); - nei = registerIndependent(IntegrationNEI.class); - mystcraft = registerIndependent(IntegrationMystcraft.class); - thaumicTinkerer = registerIndependent(IntegrationThaumicTinkerer.class); + RegisteredIntegrations.morph = RegisteredIntegrations.registerIndependent(IntegrationMorph.class); + RegisteredIntegrations.thaumicExploration = RegisteredIntegrations.registerIndependent(IntegrationThaumicExploration.class); + RegisteredIntegrations.automagy = RegisteredIntegrations.registerIndependent(IntegrationAutomagy.class); + RegisteredIntegrations.nei = RegisteredIntegrations.registerIndependent(IntegrationNEI.class); + RegisteredIntegrations.mystcraft = RegisteredIntegrations.registerIndependent(IntegrationMystcraft.class); + RegisteredIntegrations.thaumicTinkerer = RegisteredIntegrations.registerIndependent(IntegrationThaumicTinkerer.class); - registerDependent("ThaumicHorizons", "makeo.gadomancy.common.integration.thaumichorizions.IntegrationThaumicHorizions"); - registerDependent("Waila", "makeo.gadomancy.common.integration.waila.IntegrationWaila"); + RegisteredIntegrations.registerDependent("ThaumicHorizons", "makeo.gadomancy.common.integration.thaumichorizions.IntegrationThaumicHorizions"); + RegisteredIntegrations.registerDependent("Waila", "makeo.gadomancy.common.integration.waila.IntegrationWaila"); } private static void registerDependent(String modId, String clazz) { diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index ef843dd..18d9e30 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -59,40 +59,40 @@ public class RegisteredItems { public static ItemElement itemElement; public static void preInit() { - creativeTab = new CreativeTabs(Gadomancy.MODID) { + RegisteredItems.creativeTab = new CreativeTabs(Gadomancy.MODID) { @Override public Item getTabIconItem() { - return itemFakeModIcon; + return RegisteredItems.itemFakeModIcon; } }; } public static void init() { - registerItems(); + RegisteredItems.registerItems(); - registerDefaultStickyJars(); + RegisteredItems.registerDefaultStickyJars(); } public static void postInit() { - registerItemAspects(); + RegisteredItems.registerItemAspects(); } //Items private static void registerItems() { - itemTransformationFocus = registerItem(new ItemTransformationFocus()); - itemGolemCoreBreak = registerItem(new ItemGolemCoreBreak()); - itemFamiliar_old = registerItem(new ItemFamiliar_Old(), "ItemFamiliar"); - itemEtherealFamiliar = registerItem(new ItemEtherealFamiliar()); - itemAuraCore = registerItem(new ItemAuraCore()); - itemElement = registerItem(new ItemElement()); + RegisteredItems.itemTransformationFocus = RegisteredItems.registerItem(new ItemTransformationFocus()); + RegisteredItems.itemGolemCoreBreak = RegisteredItems.registerItem(new ItemGolemCoreBreak()); + RegisteredItems.itemFamiliar_old = RegisteredItems.registerItem(new ItemFamiliar_Old(), "ItemFamiliar"); + RegisteredItems.itemEtherealFamiliar = RegisteredItems.registerItem(new ItemEtherealFamiliar()); + RegisteredItems.itemAuraCore = RegisteredItems.registerItem(new ItemAuraCore()); + RegisteredItems.itemElement = RegisteredItems.registerItem(new ItemElement()); - itemCreativeNode = registerItem(new ItemCreativeNode()); - itemPackage = registerItem(new ItemArcanePackage()); - itemFakeLootbag = registerItem(Thaumcraft.MODID, new ItemFakeLootbag()); - itemFakeGolemPlacer = registerItem(new ItemFakeGolemPlacer()); - itemFakeGolemShield = registerItem(new ItemFakeGolemShield()); - itemExtendedNodeJar = registerItem(new ItemExtendedNodeJar()); - itemFakeModIcon = registerItem(new ItemFakeModIcon()); + RegisteredItems.itemCreativeNode = RegisteredItems.registerItem(new ItemCreativeNode()); + RegisteredItems.itemPackage = RegisteredItems.registerItem(new ItemArcanePackage()); + RegisteredItems.itemFakeLootbag = RegisteredItems.registerItem(Thaumcraft.MODID, new ItemFakeLootbag()); + RegisteredItems.itemFakeGolemPlacer = RegisteredItems.registerItem(new ItemFakeGolemPlacer()); + RegisteredItems.itemFakeGolemShield = RegisteredItems.registerItem(new ItemFakeGolemShield()); + RegisteredItems.itemExtendedNodeJar = RegisteredItems.registerItem(new ItemExtendedNodeJar()); + RegisteredItems.itemFakeModIcon = RegisteredItems.registerItem(new ItemFakeModIcon()); } private static T registerItem(T item, String name) { @@ -101,11 +101,11 @@ public class RegisteredItems { } private static T registerItem(T item) { - return registerItem(item, item.getClass().getSimpleName()); + return RegisteredItems.registerItem(item, item.getClass().getSimpleName()); } private static T registerItem(String modId, T item) { - return registerItem(modId, item, item.getClass().getSimpleName()); + return RegisteredItems.registerItem(modId, item, item.getClass().getSimpleName()); } private static T registerItem(String modId, T item, String name) { @@ -153,21 +153,21 @@ public class RegisteredItems { //Sticky jars private static void registerDefaultStickyJars() { - registerStickyJar(ConfigItems.itemJarFilled, 0); - registerStickyJar(ConfigItems.itemJarFilled, 3); + RegisteredItems.registerStickyJar(ConfigItems.itemJarFilled, 0); + RegisteredItems.registerStickyJar(ConfigItems.itemJarFilled, 3); Item itemBlockJar = Item.getItemFromBlock(ConfigBlocks.blockJar); - registerStickyJar(itemBlockJar, 0, new ItemStack(itemBlockJar, 1, 0), "JARLABEL"); - registerStickyJar(itemBlockJar, 3, new ItemStack(itemBlockJar, 1, 3), "JARVOID"); + RegisteredItems.registerStickyJar(itemBlockJar, 0, new ItemStack(itemBlockJar, 1, 0), "JARLABEL"); + RegisteredItems.registerStickyJar(itemBlockJar, 3, new ItemStack(itemBlockJar, 1, 3), "JARVOID"); Item itemRemoteJar = Item.getItemFromBlock(RegisteredBlocks.blockRemoteJar); - registerStickyJar(itemRemoteJar, 0, new ItemStack(itemRemoteJar), SimpleResearchItem.getFullName("REMOTEJAR")); + RegisteredItems.registerStickyJar(itemRemoteJar, 0, new ItemStack(itemRemoteJar), SimpleResearchItem.getFullName("REMOTEJAR")); } private static List stickyJarItems = new ArrayList(); public static void registerStickyJar(Item item, int damage, ItemStack recipeStack) { - registerStickyJar(item, damage, recipeStack, null); + RegisteredItems.registerStickyJar(item, damage, recipeStack, null); } public static void registerStickyJar(Item item, int damage, ItemStack recipeStack, String research) { @@ -176,19 +176,19 @@ public class RegisteredItems { info.damage = damage; info.recipeStack = recipeStack; info.research = research; - stickyJarItems.add(info); + RegisteredItems.stickyJarItems.add(info); } public static void registerStickyJar(Item item, int damage) { - registerStickyJar(item, damage, null); + RegisteredItems.registerStickyJar(item, damage, null); } public static void registerStickyJar(Item item) { - registerStickyJar(item, Short.MAX_VALUE); + RegisteredItems.registerStickyJar(item, Short.MAX_VALUE); } public static boolean isStickyableJar(Item item, int damage) { - for(StickyJarItemInfo info : stickyJarItems) { + for(StickyJarItemInfo info : RegisteredItems.stickyJarItems) { if(info.item == item && (info.damage == damage || info.damage == Short.MAX_VALUE)) { return true; } @@ -197,16 +197,16 @@ public class RegisteredItems { } public static boolean isStickyableJar(ItemStack stack) { - return stack != null && isStickyableJar(stack.getItem(), stack.getItemDamage()); + return stack != null && RegisteredItems.isStickyableJar(stack.getItem(), stack.getItemDamage()); } public static List getStickyJarStacks() { - return getStickyJarStacks(null); + return RegisteredItems.getStickyJarStacks(null); } public static List getStickyJarStacks(EntityPlayer player) { List stacks = new ArrayList(); - for(StickyJarItemInfo info : stickyJarItems) { + for(StickyJarItemInfo info : RegisteredItems.stickyJarItems) { if(info.recipeStack != null && (player == null || info.research == null || ResearchManager.isResearchComplete(player.getCommandSenderName(), info.research))) { stacks.add(info.recipeStack); @@ -219,6 +219,6 @@ public class RegisteredItems { public Item item; public int damage; public ItemStack recipeStack; - public String research = null; + public String research; } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java index 3b37e98..ad7aba1 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java @@ -91,7 +91,7 @@ public class RegisteredManipulations { } combineCount--; } while (combineCount > 0); - if(actuallyCombined > 0) return true; + return actuallyCombined > 0; } return false; } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java index 7aaa2a5..c756c36 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.registration; import makeo.gadomancy.common.utils.MultiblockHelper; -import net.minecraft.init.Blocks; import thaumcraft.common.config.ConfigBlocks; /** diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java index 6b4ef59..8f5cc7f 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java @@ -4,7 +4,6 @@ import cpw.mods.fml.common.FMLLog; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.potions.*; -import makeo.gadomancy.common.potions.PotionEldritch; import makeo.gadomancy.common.utils.Injector; import net.minecraft.potion.Potion; @@ -26,11 +25,11 @@ public class RegisteredPotions { public static PotionVisAffinity VIS_DISCOUNT; public static void init() { - POTION_LUCK = registerPotion(PotionMiningLuck.class); - BUFF_GOLEM = registerPotion(PotionBuffGolem.class); - ACHROMATIC = registerPotion(PotionAchromatic.class); - ELDRITCH = registerPotion(PotionEldritch.class); - VIS_DISCOUNT = registerPotion(PotionVisAffinity.class); + RegisteredPotions.POTION_LUCK = RegisteredPotions.registerPotion(PotionMiningLuck.class); + RegisteredPotions.BUFF_GOLEM = RegisteredPotions.registerPotion(PotionBuffGolem.class); + RegisteredPotions.ACHROMATIC = RegisteredPotions.registerPotion(PotionAchromatic.class); + RegisteredPotions.ELDRITCH = RegisteredPotions.registerPotion(PotionEldritch.class); + RegisteredPotions.VIS_DISCOUNT = RegisteredPotions.registerPotion(PotionVisAffinity.class); } public static void createConfigEntries() { diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index 6691179..27ddcd7 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -3,11 +3,7 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.crafting.EtherealFamiliarUpgradeRecipe; -import makeo.gadomancy.common.crafting.FamiliarUndoRecipe; -import makeo.gadomancy.common.crafting.InfusionDisguiseArmor; -import makeo.gadomancy.common.crafting.InfusionUpgradeRecipe; -import makeo.gadomancy.common.crafting.RecipeStickyJar; +import makeo.gadomancy.common.crafting.*; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.familiar.FamiliarAugment; import makeo.gadomancy.common.items.ItemAuraCore; @@ -23,7 +19,10 @@ import net.minecraft.item.crafting.IRecipe; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.*; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.IArcaneRecipe; +import thaumcraft.api.crafting.InfusionEnchantmentRecipe; +import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.common.config.Config; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; @@ -78,8 +77,8 @@ public class RegisteredRecipes { public static IArcaneRecipe recipeAncientPedestal; public static IArcaneRecipe[] recipeBlockProtector; - public static CrucibleRecipe recipeAncientStonePedestal = null; - public static IArcaneRecipe recipeAncientStone = null; + public static CrucibleRecipe recipeAncientStonePedestal; + public static IArcaneRecipe recipeAncientStone; public static CrucibleRecipe[] recipesWashAuraCore; public static IRecipe[] recipesUndoAuraCore; @@ -94,67 +93,67 @@ public class RegisteredRecipes { public static void init() { AdditionalGolemType typeSilverwood = RegisteredGolemStuff.typeSilverwood; - recipeGolemSilverwood = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("GOLEMSILVERWOOD"), + RegisteredRecipes.recipeGolemSilverwood = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("GOLEMSILVERWOOD"), /*new ItemStack(Items.bread, 1, 0),*/new ItemStack(typeSilverwood.getPlacerItem(), 1, typeSilverwood.getEnumEntry().ordinal()), 7, new AspectList().add(Aspect.MOTION, 16).add(Aspect.MAGIC, 16).add(Aspect.MAN, 16).add(Aspect.SENSES, 16), new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), new ItemStack[]{ new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(ConfigItems.itemResource, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(ConfigItems.itemResource, 1, 3)}); - recipesGolemRunicShield = InfusionUpgradeRecipe.createRecipes(SimpleResearchItem.getFullName("GOLEMRUNICSHIELD"), RegisteredGolemStuff.upgradeRunicShield, 5, + RegisteredRecipes.recipesGolemRunicShield = InfusionUpgradeRecipe.createRecipes(SimpleResearchItem.getFullName("GOLEMRUNICSHIELD"), RegisteredGolemStuff.upgradeRunicShield, 5, new AspectList().add(Aspect.MAGIC, 16).add(Aspect.ENERGY, 16).add(Aspect.ARMOR, 8).add(Aspect.AURA, 4), new ItemStack[]{new ItemStack(ConfigItems.itemGirdleRunic, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14)}); - ThaumcraftApi.getCraftingRecipes().addAll(Arrays.asList(recipesGolemRunicShield)); + ThaumcraftApi.getCraftingRecipes().addAll(Arrays.asList(RegisteredRecipes.recipesGolemRunicShield)); - recipeStickyJar = new RecipeStickyJar(); - ThaumcraftApi.getCraftingRecipes().add(recipeStickyJar); + RegisteredRecipes.recipeStickyJar = new RecipeStickyJar(); + ThaumcraftApi.getCraftingRecipes().add(RegisteredRecipes.recipeStickyJar); - recipeArcaneDropper = ThaumcraftApi.addArcaneCraftingRecipe(SimpleResearchItem.getFullName("ARCANEDROPPER"), new ItemStack(RegisteredBlocks.blockArcaneDropper), new AspectList().add(Aspect.ORDER, 14).add(Aspect.AIR, 14).add(Aspect.EARTH, 10), + RegisteredRecipes.recipeArcaneDropper = ThaumcraftApi.addArcaneCraftingRecipe(SimpleResearchItem.getFullName("ARCANEDROPPER"), new ItemStack(RegisteredBlocks.blockArcaneDropper), new AspectList().add(Aspect.ORDER, 14).add(Aspect.AIR, 14).add(Aspect.EARTH, 10), "SDS", "BAB", "SSS", 'S', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), 'D', new ItemStack(Blocks.dropper), 'A', new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), 'B', new ItemStack(ConfigBlocks.blockWoodenDevice)); - recipeGolemCoreBreak = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("GOLEMCOREBREAK"), + RegisteredRecipes.recipeGolemCoreBreak = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("GOLEMCOREBREAK"), new ItemStack(RegisteredItems.itemGolemCoreBreak), 3, new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.TOOL, 24).add(Aspect.MECHANISM, 16), new ItemStack(ConfigItems.itemGolemCore, 1, 3), new ItemStack[] {new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemAxeElemental)}); - recipeInfusionClaw = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("INFUSIONCLAW"), + RegisteredRecipes.recipeInfusionClaw = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("INFUSIONCLAW"), new ItemStack(RegisteredBlocks.blockInfusionClaw), 10, new AspectList().add(Aspect.ELDRITCH, 25).add(Aspect.MECHANISM, 20).add(Aspect.MAGIC, 16).add(Aspect.ORDER, 20).add(Aspect.DARKNESS, 12), new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{new ItemStack(ConfigItems.itemFocusPrimal), /*new ItemStack(Items.redstone),*/ new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemGolemCore, 1, 8), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 15), /*new ItemStack(Items.redstone),*/ new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6)}); - recipeRemoteJar = ThaumcraftApi.addArcaneCraftingRecipe(SimpleResearchItem.getFullName("REMOTEJAR"), new ItemStack(RegisteredBlocks.blockRemoteJar), new AspectList().add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10), "GJG", "GMG", 'G', new ItemStack(ConfigBlocks.blockMagicalLog), 'J', new ItemStack(ConfigBlocks.blockJar), 'M', (Config.allowMirrors ? new ItemStack(ConfigBlocks.blockMirror, 1, 6) : new ItemStack(ConfigItems.itemResource, 1, 10) )); + RegisteredRecipes.recipeRemoteJar = ThaumcraftApi.addArcaneCraftingRecipe(SimpleResearchItem.getFullName("REMOTEJAR"), new ItemStack(RegisteredBlocks.blockRemoteJar), new AspectList().add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10), "GJG", "GMG", 'G', new ItemStack(ConfigBlocks.blockMagicalLog), 'J', new ItemStack(ConfigBlocks.blockJar), 'M', (Config.allowMirrors ? new ItemStack(ConfigBlocks.blockMirror, 1, 6) : new ItemStack(ConfigItems.itemResource, 1, 10) )); - recipeNodeManipulator = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", + RegisteredRecipes.recipeNodeManipulator = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), 10, new AspectList().add(Aspect.AURA, 42).add(Aspect.ELDRITCH, 22).add(Aspect.MAGIC, 38).add(Aspect.MECHANISM, 28).add(Aspect.DARKNESS, 14), new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[] {new ItemStack(ConfigBlocks.blockStoneDevice, 1, 9), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 17), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 3), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 17), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 15)}); - recipeRandomizationFocus = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", + RegisteredRecipes.recipeRandomizationFocus = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 0), 7, new AspectList().add(Aspect.ELDRITCH, 18).add(Aspect.MAGIC, 18).add(Aspect.MECHANISM, 20).add(Aspect.DARKNESS, 28).add(Aspect.ORDER, 30), new ItemStack(ConfigBlocks.blockStoneDevice, 1, 8), new ItemStack[] {new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16)}); - recipePortalFocus = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", + RegisteredRecipes.recipePortalFocus = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 3), 7, new AspectList().add(Aspect.ELDRITCH, 22).add(Aspect.VOID, 38).add(Aspect.MECHANISM, 30).add(Aspect.DARKNESS, 28).add(Aspect.EXCHANGE, 38), new ItemStack(ConfigBlocks.blockStoneDevice, 1, 8), new ItemStack[] {new ItemStack(ConfigItems.itemEldritchObject, 1, 0), new ItemStack(ConfigBlocks.blockCrystal, 1, 5), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 5), new ItemStack(ConfigItems.itemEldritchObject, 1, 0), new ItemStack(ConfigBlocks.blockCrystal, 1, 5), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 5)} ); - multiblockNodeManipulator = Arrays.asList(costsNodeManipulatorMultiblock, 3, 3, 3, + RegisteredRecipes.multiblockNodeManipulator = Arrays.asList(RegisteredRecipes.costsNodeManipulatorMultiblock, 3, 3, 3, Arrays.asList( null, null, null, null, new ItemStack(RegisteredBlocks.blockNode, 1, 5), null, null, null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 0), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15))); // x y z - multiblockEldritchPortalCreator = Arrays.asList(costsEldritchPortalCreatorMultiblock, 7, 3, 7, + RegisteredRecipes.multiblockEldritchPortalCreator = Arrays.asList(RegisteredRecipes.costsEldritchPortalCreatorMultiblock, 7, 3, 7, Arrays.asList( null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(RegisteredBlocks.blockNode, 1, 5), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, null, null, null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 3), null, null, null, null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, null )); - multiblockAuraPylon = Arrays.asList(costsAuraPylonMultiblock, 1, 4, 1, + RegisteredRecipes.multiblockAuraPylon = Arrays.asList(RegisteredRecipes.costsAuraPylonMultiblock, 1, 4, 1, Arrays.asList( new ItemStack(RegisteredBlocks.blockAuraPylon, 1, 1), new ItemStack(RegisteredBlocks.blockAuraPylon), @@ -162,43 +161,43 @@ public class RegisteredRecipes { new ItemStack(RegisteredBlocks.blockAuraPylon) )); - recipeGolemCoreBodyguard = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".GOLEMCOREBODYGUARD", new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), 3, new AspectList().add(Aspect.TOOL, 28).add(Aspect.MECHANISM, 20).add(Aspect.WEAPON, 10).add(Aspect.ARMOR, 16), + RegisteredRecipes.recipeGolemCoreBodyguard = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".GOLEMCOREBODYGUARD", new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), 3, new AspectList().add(Aspect.TOOL, 28).add(Aspect.MECHANISM, 20).add(Aspect.WEAPON, 10).add(Aspect.ARMOR, 16), new ItemStack(ConfigItems.itemGolemCore, 1, 4), new ItemStack[] { new ItemStack(ConfigItems.itemBootsTraveller, 1, 0), new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(ConfigItems.itemSwordElemental, 1, 0), new ItemStack(Items.ender_pearl, 1, 0) } ); - recipeAncientPedestal = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), + RegisteredRecipes.recipeAncientPedestal = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.ORDER, 25), "SPS", " S ", "SPS", 'S', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), 'P', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15)); - recipesFamiliar = createFamiliarRecipes(); - recipesFamiliarAugmentation = createEtherealFamiliarUpgradeRecipes(); + RegisteredRecipes.recipesFamiliar = RegisteredRecipes.createFamiliarRecipes(); + RegisteredRecipes.recipesFamiliarAugmentation = RegisteredRecipes.createEtherealFamiliarUpgradeRecipes(); - recipeBlockProtector = new IArcaneRecipe[4]; - recipeBlockProtector[0] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), + RegisteredRecipes.recipeBlockProtector = new IArcaneRecipe[4]; + RegisteredRecipes.recipeBlockProtector[0] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), new AspectList().add(Aspect.ORDER, 120).add(Aspect.EARTH, 120), "WNW", "PJP", "GRG", 'W', new ItemStack(Items.potionitem, 1, 8232), 'N', new ItemStack(ConfigItems.itemResource, 1, 1), 'P', new ItemStack(ConfigBlocks.blockTube), 'J', new ItemStack(ConfigBlocks.blockJar), 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'R', new ItemStack(Items.redstone)); - recipeBlockProtector[1] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), + RegisteredRecipes.recipeBlockProtector[1] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), new AspectList().add(Aspect.ORDER, 120).add(Aspect.EARTH, 120), "WNW", "PJP", "GRG", 'W', new ItemStack(Items.potionitem, 1, 8200), 'N', new ItemStack(ConfigItems.itemResource, 1, 1), 'P', new ItemStack(ConfigBlocks.blockTube), 'J', new ItemStack(ConfigBlocks.blockJar), 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'R', new ItemStack(Items.redstone)); - recipeBlockProtector[2] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), + RegisteredRecipes.recipeBlockProtector[2] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), new AspectList().add(Aspect.ORDER, 120).add(Aspect.EARTH, 120), "WNV", "PJP", "GRG", 'W', new ItemStack(Items.potionitem, 1, 8232), 'V', new ItemStack(Items.potionitem, 1, 8200), 'N', new ItemStack(ConfigItems.itemResource, 1, 1), 'P', new ItemStack(ConfigBlocks.blockTube), 'J', new ItemStack(ConfigBlocks.blockJar), 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'R', new ItemStack(Items.redstone)); - recipeBlockProtector[3] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), + RegisteredRecipes.recipeBlockProtector[3] = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), new AspectList().add(Aspect.ORDER, 120).add(Aspect.EARTH, 120), "WNV", "PJP", "GRG", 'W', new ItemStack(Items.potionitem, 1, 8200), 'V', new ItemStack(Items.potionitem, 1, 8232), 'N', new ItemStack(ConfigItems.itemResource, 1, 1), 'P', new ItemStack(ConfigBlocks.blockTube), 'J', new ItemStack(ConfigBlocks.blockJar), 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'R', new ItemStack(Items.redstone)); if(ModConfig.ancientStoneRecipes) { - recipeAncientStone = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", new ItemStack(ConfigBlocks.blockCosmeticSolid, 4, 11), new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.EARTH, 8), + RegisteredRecipes.recipeAncientStone = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", new ItemStack(ConfigBlocks.blockCosmeticSolid, 4, 11), new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.EARTH, 8), "SSS", "SES", "SSS", 'S', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), 'E', new ItemStack(ConfigItems.itemEldritchObject)); - recipeAncientStonePedestal = ThaumcraftApi.addCrucibleRecipe(Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.EXCHANGE, 8).add(Aspect.ENTROPY, 12)); + RegisteredRecipes.recipeAncientStonePedestal = ThaumcraftApi.addCrucibleRecipe(Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.EXCHANGE, 8).add(Aspect.ENTROPY, 12)); } ItemAuraCore.AuraCoreType[] auraCoreTypes = ItemAuraCore.AuraCoreType.values(); - recipesWashAuraCore = new CrucibleRecipe[auraCoreTypes.length - 1]; + RegisteredRecipes.recipesWashAuraCore = new CrucibleRecipe[auraCoreTypes.length - 1]; List recipesUndoAuraCore = new ArrayList(); for(int i = 1; i < auraCoreTypes.length; i++) { - recipesWashAuraCore[i-1] = ThaumcraftApi.addCrucibleRecipe(Gadomancy.MODID.toUpperCase() + ".CLEAN_AURA_CORE", new ItemStack(RegisteredItems.itemAuraCore), new ItemStack(RegisteredItems.itemAuraCore, 1, i), new AspectList().add(Aspect.MAGIC, 12).add(Aspect.WATER, 12).add(Aspect.HEAL, 18)); //damn those heal potions + RegisteredRecipes.recipesWashAuraCore[i-1] = ThaumcraftApi.addCrucibleRecipe(Gadomancy.MODID.toUpperCase() + ".CLEAN_AURA_CORE", new ItemStack(RegisteredItems.itemAuraCore), new ItemStack(RegisteredItems.itemAuraCore, 1, i), new AspectList().add(Aspect.MAGIC, 12).add(Aspect.WATER, 12).add(Aspect.HEAL, 18)); //damn those heal potions if(auraCoreTypes[i].isUnused()) { GameRegistry.addShapelessRecipe(new ItemStack(RegisteredItems.itemAuraCore), new ItemStack(RegisteredItems.itemAuraCore, 1, i)); @@ -212,7 +211,7 @@ public class RegisteredRecipes { ItemStack blankCore = new ItemStack(RegisteredItems.itemAuraCore); RegisteredItems.itemAuraCore.setCoreType(blankCore, ItemAuraCore.AuraCoreType.BLANK); - recipeAuraCore = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AURA_CORE", blankCore, 6, + RegisteredRecipes.recipeAuraCore = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AURA_CORE", blankCore, 6, new RandomizedAspectList().setHalfCap(true).addAspectRandomBase(Aspect.AURA, 9).addAspectRandomBase(Aspect.MAGIC, 19).addAspectRandomBase(Aspect.ELDRITCH, 17).addAspectRandomBase(Aspect.VOID, 34), new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 2), @@ -220,19 +219,19 @@ public class RegisteredRecipes { new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 2)}); - recipeAuraPylon = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AURA_PYLON", new ItemStack(RegisteredBlocks.blockAuraPylon, 1, 0), + RegisteredRecipes.recipeAuraPylon = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AURA_PYLON", new ItemStack(RegisteredBlocks.blockAuraPylon, 1, 0), new AspectList().add(Aspect.ORDER, 80).add(Aspect.WATER, 50).add(Aspect.FIRE, 50).add(Aspect.AIR, 50), "TST", "S S", "TJT", 'T', new ItemStack(ConfigBlocks.blockTube, 1, 6), 'S', new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), 'J', new ItemStack(ConfigBlocks.blockJar, 1, 0)); ItemStack ignisCore = new ItemStack(RegisteredItems.itemAuraCore); RegisteredItems.itemAuraCore.setCoreType(ignisCore, ItemAuraCore.AuraCoreType.FIRE); - recipeAuraPylonPeak = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AURA_PYLON", new ItemStack(RegisteredBlocks.blockAuraPylon, 1, 1), + RegisteredRecipes.recipeAuraPylonPeak = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AURA_PYLON", new ItemStack(RegisteredBlocks.blockAuraPylon, 1, 1), new AspectList().add(Aspect.ORDER, 90).add(Aspect.FIRE, 120).add(Aspect.AIR, 70), " N ", "ACA", " P ", 'A', new ItemStack(ConfigItems.itemResource, 1, 0), 'N', new ItemStack(ConfigItems.itemResource, 1, 1), 'C', ignisCore, 'P', new ItemStack(RegisteredBlocks.blockAuraPylon, 1, 0)); ItemStack aerCore = new ItemStack(RegisteredItems.itemAuraCore); RegisteredItems.itemAuraCore.setCoreType(aerCore, ItemAuraCore.AuraCoreType.AIR); - recipeArcanePackager = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ARCANE_PACKAGER", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 4), + RegisteredRecipes.recipeArcanePackager = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ARCANE_PACKAGER", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 4), new AspectList().add(Aspect.AIR, 100).add(Aspect.ORDER, 60).add(Aspect.ENTROPY, 50), "PSP", "GCG", "JTJ", 'P', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'S', new ItemStack(Blocks.piston), @@ -242,7 +241,7 @@ public class RegisteredRecipes { ItemStack ordoCore = new ItemStack(RegisteredItems.itemAuraCore); RegisteredItems.itemAuraCore.setCoreType(ordoCore, ItemAuraCore.AuraCoreType.ORDER); - recipeKnowledgeBook = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".KNOWLEDGE_BOOK", new ItemStack(RegisteredBlocks.blockKnowledgeBook), + RegisteredRecipes.recipeKnowledgeBook = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".KNOWLEDGE_BOOK", new ItemStack(RegisteredBlocks.blockKnowledgeBook), new AspectList().add(Aspect.ORDER, 70).add(Aspect.ENTROPY, 20).add(Aspect.AIR, 20).add(Aspect.FIRE, 30), "STS", "BOB", "MGM", 'S', new ItemStack(ConfigItems.itemInkwell), 'T', new ItemStack(ConfigItems.itemThaumonomicon), @@ -252,7 +251,7 @@ public class RegisteredRecipes { ItemStack voidMetalIngot = new ItemStack(ConfigItems.itemResource, 1, 16); ItemStack salisMundus = new ItemStack(ConfigItems.itemResource, 1, 14); ItemStack alumentum = new ItemStack(ConfigItems.itemResource); - recipeElementVoid = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ESSENTIA_COMPRESSOR", new ItemStack(RegisteredItems.itemElement, 1, ItemElement.EnumElementType.DARKNESS.ordinal()), 6, + RegisteredRecipes.recipeElementVoid = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ESSENTIA_COMPRESSOR", new ItemStack(RegisteredItems.itemElement, 1, ItemElement.EnumElementType.DARKNESS.ordinal()), 6, new RandomizedAspectList().setHalfCap(true).addAspectRandomBase(Aspect.VOID, 22).addAspectRandomBase(Aspect.DARKNESS, 18).addAspectRandomBase(Aspect.ELDRITCH, 20).addAspectRandomBase(Aspect.AURA, 10), new ItemStack(ConfigItems.itemResource, 1, 17), new ItemStack[] { alumentum, voidMetalIngot, voidMetalIngot, salisMundus, alumentum, voidMetalIngot, voidMetalIngot, salisMundus }); @@ -260,7 +259,7 @@ public class RegisteredRecipes { ItemStack waterCore = new ItemStack(RegisteredItems.itemAuraCore); RegisteredItems.itemAuraCore.setCoreType(waterCore, ItemAuraCore.AuraCoreType.WATER); - recipeEssentiaCompressor = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ESSENTIA_COMPRESSOR", new ItemStack(RegisteredBlocks.blockEssentiaCompressor, 3), + RegisteredRecipes.recipeEssentiaCompressor = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".ESSENTIA_COMPRESSOR", new ItemStack(RegisteredBlocks.blockEssentiaCompressor, 3), new AspectList().add(Aspect.WATER, 190).add(Aspect.ORDER, 150).add(Aspect.ENTROPY, 120).add(Aspect.FIRE, 100).add(Aspect.AIR, 160).add(Aspect.EARTH, 60), "LRL", "TET", "LCL", 'L', new ItemStack(ConfigBlocks.blockMagicalLog), @@ -269,7 +268,7 @@ public class RegisteredRecipes { 'E', new ItemStack(RegisteredItems.itemElement, 1, ItemElement.EnumElementType.DARKNESS.ordinal()), 'C', waterCore); - multiblockEssentiaCompressor = Arrays.asList(costsCompressorMultiblock, 1, 3, 1, + RegisteredRecipes.multiblockEssentiaCompressor = Arrays.asList(RegisteredRecipes.costsCompressorMultiblock, 1, 3, 1, Arrays.asList( new ItemStack(RegisteredBlocks.blockEssentiaCompressor), new ItemStack(RegisteredBlocks.blockEssentiaCompressor), @@ -291,11 +290,11 @@ public class RegisteredRecipes { });*/ - auraCoreRecipes = createAuraCoreRecipes(); + RegisteredRecipes.auraCoreRecipes = RegisteredRecipes.createAuraCoreRecipes(); ThaumcraftApi.getCraftingRecipes().add(new InfusionDisguiseArmor()); - recipeRevealer = ThaumcraftApi.addInfusionEnchantmentRecipe(Gadomancy.MODID.toUpperCase() + ".REVEALER", RegisteredEnchantments.revealer, 4, new AspectList().add(Aspect.SENSES, 16).add(Aspect.MAGIC, 8), new ItemStack[]{new ItemStack(ConfigItems.itemGoggles), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14)}); + RegisteredRecipes.recipeRevealer = ThaumcraftApi.addInfusionEnchantmentRecipe(Gadomancy.MODID.toUpperCase() + ".REVEALER", RegisteredEnchantments.revealer, 4, new AspectList().add(Aspect.SENSES, 16).add(Aspect.MAGIC, 8), new ItemStack[]{new ItemStack(ConfigItems.itemGoggles), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14)}); CraftingManager.getInstance().getRecipeList().add(new FamiliarUndoRecipe()); } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 840e62e..c9e39a1 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -8,17 +8,13 @@ import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.items.ItemAuraCore; import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; import makeo.gadomancy.common.research.*; -import makeo.gadomancy.common.utils.NBTHelper; import makeo.gadomancy.common.utils.SimpleResourceLocation; import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; @@ -88,23 +84,23 @@ public class RegisteredResearches { public static void init() { - ResearchCategories.registerCategory(Gadomancy.MODID, CATEGORY_ICON, CATEGORY_BACKGROUND); + ResearchCategories.registerCategory(Gadomancy.MODID, RegisteredResearches.CATEGORY_ICON, RegisteredResearches.CATEGORY_BACKGROUND); ResearchItem researchTallowGolem = PseudoResearchItem.create("GOLEMTALLOW", 0, -5).registerResearchItem(); - researchGolemSilverwood = new SimpleResearchItem("GOLEMSILVERWOOD", 1, -2, 3, (ItemStack) RegisteredRecipes.recipeGolemSilverwood.getRecipeOutput(), + RegisteredResearches.researchGolemSilverwood = new SimpleResearchItem("GOLEMSILVERWOOD", 1, -2, 3, (ItemStack) RegisteredRecipes.recipeGolemSilverwood.getRecipeOutput(), new AspectList().add(Aspect.MOTION, 10).add(Aspect.TREE, 10).add(Aspect.MAGIC, 8).add(Aspect.ORDER, 8).add(Aspect.FLESH, 6).add(Aspect.EXCHANGE, 5)) .setParents(researchTallowGolem.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMSILVERWOOD.1"), new ResearchPage(RegisteredRecipes.recipeGolemSilverwood)).registerResearchItem(); - researchGolemRunicShield = new SimpleResearchItem("GOLEMRUNICSHIELD", 0, 0, 4, new ItemStack(RegisteredItems.itemFakeGolemShield, 1, 32767), + RegisteredResearches.researchGolemRunicShield = new SimpleResearchItem("GOLEMRUNICSHIELD", 0, 0, 4, new ItemStack(RegisteredItems.itemFakeGolemShield, 1, 32767), new AspectList().add(Aspect.AURA, 16).add(Aspect.ARMOR, 6).add(Aspect.MAGIC, 4).add(Aspect.MOTION, 8)) - .setParents(researchGolemSilverwood.key).setConcealed() + .setParents(RegisteredResearches.researchGolemSilverwood.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMRUNICSHIELD.1"), new ResearchPage(RegisteredRecipes.recipesGolemRunicShield)).registerResearchItem(); ResearchItem researchBellows = PseudoResearchItem.create("BELLOWS", -2, -5).registerResearchItem(); - researchArcaneDropper = new SimpleResearchItem("ARCANEDROPPER", -1, -3, 2, new ItemStack(RegisteredBlocks.blockArcaneDropper), + RegisteredResearches.researchArcaneDropper = new SimpleResearchItem("ARCANEDROPPER", -1, -3, 2, new ItemStack(RegisteredBlocks.blockArcaneDropper), new AspectList().add(Aspect.ORDER, 4).add(Aspect.AIR, 6).add(Aspect.EARTH, 5).add(Aspect.SENSES, 5).add(Aspect.MECHANISM, 7)) .setParents("DISTILESSENTIA", researchBellows.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.ARCANEDROPPER.1"), new ResearchPage(RegisteredRecipes.recipeArcaneDropper)).registerResearchItem(); @@ -117,14 +113,14 @@ public class RegisteredResearches { ResearchItem researchVEleToolShovel = new ResearchItem("ELEMENTALSHOVEL", Gadomancy.MODID).registerResearchItem(); ResearchItem researchVEleSword = new ResearchItem("ELEMENTALSWORD", Gadomancy.MODID).registerResearchItem(); - researchGolemCoreBreak = new SimpleResearchItem("GOLEMCOREBREAK", 3, -3, 3, new ItemStack(RegisteredItems.itemGolemCoreBreak), + RegisteredResearches.researchGolemCoreBreak = new SimpleResearchItem("GOLEMCOREBREAK", 3, -3, 3, new ItemStack(RegisteredItems.itemGolemCoreBreak), new AspectList().add(Aspect.TOOL, 8).add(Aspect.ENTROPY, 8).add(Aspect.MECHANISM, 8)) .setParents(researchHarvestGather.key, researchVEleToolAxe.key, researchVEleToolPick.key, researchVEleToolShovel.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMCOREBREAK.1"), new ResearchPage(RegisteredRecipes.recipeGolemCoreBreak)).registerResearchItem(); ResearchItem researchVBootsTraveller = new ResearchItem("BOOTSTRAVELLER", Gadomancy.MODID).registerResearchItem(); - researchGolemCoreBodyguard = new SimpleResearchItem("GOLEMCOREBODYGUARD", 5, -3, 2, new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), + RegisteredResearches.researchGolemCoreBodyguard = new SimpleResearchItem("GOLEMCOREBODYGUARD", 5, -3, 2, new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), new AspectList().add(Aspect.TOOL, 8).add(Aspect.ORDER, 8).add(Aspect.MECHANISM, 10).add(Aspect.ARMOR, 8).add(Aspect.WEAPON, 8)) .setParents(researchVBootsTraveller.key, researchVEleSword.key, researchCoreGuard.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMCOREBODYGUARD.1"), new ResearchPage(RegisteredRecipes.recipeGolemCoreBodyguard)).registerResearchItem(); @@ -139,31 +135,31 @@ public class RegisteredResearches { ResearchItem researchOculus = PseudoResearchItem.create("OCULUS", -11, -2).setRound().setSpecial().registerResearchItem(); - researchInfusionClaw = new SimpleResearchItem("INFUSIONCLAW", -6, -7, 5, new ItemStack(RegisteredBlocks.blockInfusionClaw), + RegisteredResearches.researchInfusionClaw = new SimpleResearchItem("INFUSIONCLAW", -6, -7, 5, new ItemStack(RegisteredBlocks.blockInfusionClaw), new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.MECHANISM, 8).add(Aspect.MAGIC, 8).add(Aspect.ORDER, 8).add(Aspect.DARKNESS, 4)) .setParents(researchVFocusPrimal.key, researchItemVoidMetal.key, researchWandPedestal.key, researchVCoreUse.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.INFUSIONCLAW.1"), new ResearchPage(RegisteredRecipes.recipeInfusionClaw), new ResearchPage("gadomancy.research_page.INFUSIONCLAW.2")).registerResearchItem(); - researchNodeManipulator = new SimpleResearchItem("NODE_MANIPULATOR", -9, -4, 2, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), + RegisteredResearches.researchNodeManipulator = new SimpleResearchItem("NODE_MANIPULATOR", -9, -4, 2, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.AURA, 6).add(Aspect.DARKNESS, 4).add(Aspect.MAGIC, 8).add(Aspect.GREED, 4).add(Aspect.VOID, 10).add(Aspect.MECHANISM, 6).add(Aspect.EXCHANGE, 4)) .setConcealed().setSpecial() .setParents(researchItemVoidMetal.key, researchVNodeStabilizer.key, researchVWardingStone.key, researchWandPedestal.key) .setPages(new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.1"), new ResearchPage(RegisteredRecipes.recipeNodeManipulator), new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.3"), new ResearchPage(RegisteredRecipes.recipeRandomizationFocus), new ResearchPage(RegisteredRecipes.multiblockNodeManipulator), new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.6")).registerResearchItem(); - researchEldritchPortalCreator = new SimpleResearchItem("E_PORTAL_CREATOR", -10, 0, 2, new ItemStack(RegisteredBlocks.blockAdditionalEldrichPortal, 1, 0), + RegisteredResearches.researchEldritchPortalCreator = new SimpleResearchItem("E_PORTAL_CREATOR", -10, 0, 2, new ItemStack(RegisteredBlocks.blockAdditionalEldrichPortal, 1, 0), new AspectList().add(Aspect.ELDRITCH, 6).add(Aspect.DARKNESS, 10).add(Aspect.TRAVEL, 8).add(Aspect.AURA, 10).add(Aspect.VOID, 6).add(Aspect.MECHANISM, 4)) .setConcealed().setSpecial() - .setParents(researchNodeManipulator.key, researchOculus.key) + .setParents(RegisteredResearches.researchNodeManipulator.key, researchOculus.key) .setPages(new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.1"), new ResearchPage(RegisteredRecipes.recipeAncientPedestal), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.3"), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.4"), new ResearchPage(RegisteredRecipes.recipePortalFocus), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.6"), new ResearchPage(RegisteredRecipes.multiblockEldritchPortalCreator), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.8")).registerResearchItem(); - researchBlockProtector = new SimpleResearchItem("BLOCK_PROTECTOR", -6, -2, 2, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), + RegisteredResearches.researchBlockProtector = new SimpleResearchItem("BLOCK_PROTECTOR", -6, -2, 2, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), new AspectList().add(Aspect.ORDER, 10).add(Aspect.ARMOR, 8).add(Aspect.EARTH, 12).add(Aspect.LIGHT, 10).add(Aspect.AURA, 8)) .setConcealed() .setPages(new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.1"), new ResearchPage(RegisteredRecipes.recipeBlockProtector), new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.3"), new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.4")).registerResearchItem(); ItemStack displayFamiliar = new ItemStack(RegisteredItems.itemEtherealFamiliar); ItemEtherealFamiliar.setFamiliarAspect(displayFamiliar, Aspect.MAGIC); - researchEtherealFamiliar = new SimpleResearchItem("ETHEREAL_FAMILIAR", 5, 1, 2, displayFamiliar, + RegisteredResearches.researchEtherealFamiliar = new SimpleResearchItem("ETHEREAL_FAMILIAR", 5, 1, 2, displayFamiliar, new AspectList().add(Aspect.MAGIC, 8).add(Aspect.FIRE, 6).add(Aspect.AURA, 4)) .setConcealed().setSpecial() .setParents(researchVRunicShielding.key) @@ -171,89 +167,89 @@ public class RegisteredResearches { new ResearchPage("gadomancy.research_page.ETHEREAL_FAMILIAR.3")) .registerResearchItem(); - researchFamiliarElementLightning = new SimpleResearchItem("FAMILIAR_SHOCK", 4, -1, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Lightning.png"), + RegisteredResearches.researchFamiliarElementLightning = new SimpleResearchItem("FAMILIAR_SHOCK", 4, -1, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Lightning.png"), new AspectList().add(Aspect.WEATHER, 4).add(Aspect.WEAPON, 4).add(Aspect.AIR, 8)) .setConcealed() - .setParents(researchEtherealFamiliar.key) + .setParents(RegisteredResearches.researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_SHOCK.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[0]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[1]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[2])) .registerResearchItem(); - researchFamiliarElementFire = new SimpleResearchItem("FAMILIAR_FIRE", 6, -1, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Fire.png"), + RegisteredResearches.researchFamiliarElementFire = new SimpleResearchItem("FAMILIAR_FIRE", 6, -1, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Fire.png"), new AspectList().add(Aspect.FIRE, 8).add(Aspect.WEAPON, 4).add(Aspect.MAGIC, 4)) .setConcealed() - .setParents(researchEtherealFamiliar.key) + .setParents(RegisteredResearches.researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_FIRE.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[3]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[4]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[5])) .registerResearchItem(); - researchFamiliarElementPoison = new SimpleResearchItem("FAMILIAR_POISON", 3, 2, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Poison.png"), + RegisteredResearches.researchFamiliarElementPoison = new SimpleResearchItem("FAMILIAR_POISON", 3, 2, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Poison.png"), new AspectList().add(Aspect.POISON, 8).add(Aspect.WEAPON, 4).add(Aspect.ENTROPY, 4)) .setConcealed() - .setParents(researchEtherealFamiliar.key) + .setParents(RegisteredResearches.researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_POISON.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[6]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[7]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[8])) .registerResearchItem(); - researchFamiliarElementWeakness = new SimpleResearchItem("FAMILIAR_WEAKNESS", 2, 0, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Enervation.png"), + RegisteredResearches.researchFamiliarElementWeakness = new SimpleResearchItem("FAMILIAR_WEAKNESS", 2, 0, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Enervation.png"), new AspectList().add(Aspect.TRAP, 8).add(Aspect.WEAPON, 8).add(Aspect.TAINT, 6)) .setConcealed() - .setParents(researchEtherealFamiliar.key) + .setParents(RegisteredResearches.researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_WEAKNESS.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[9]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[10]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[11])) .registerResearchItem(); - researchFamiliarAugmentDamage = new IfAnyParentResearchItem("FAMILIAR_DAMAGE", 8, 2, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Damage.png"), + RegisteredResearches.researchFamiliarAugmentDamage = new IfAnyParentResearchItem("FAMILIAR_DAMAGE", 8, 2, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Damage.png"), new AspectList().add(Aspect.WEAPON, 8).add(Aspect.ENERGY, 8).add(Aspect.MAGIC, 4)) - .setAnyParents(researchFamiliarElementFire.key, researchFamiliarElementLightning.key, - researchFamiliarElementPoison.key, researchFamiliarElementWeakness.key) + .setAnyParents(RegisteredResearches.researchFamiliarElementFire.key, RegisteredResearches.researchFamiliarElementLightning.key, + RegisteredResearches.researchFamiliarElementPoison.key, RegisteredResearches.researchFamiliarElementWeakness.key) .setConcealed() - .setParents(researchEtherealFamiliar.key, "VOIDMETAL") + .setParents(RegisteredResearches.researchEtherealFamiliar.key, "VOIDMETAL") .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_DAMAGE.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[12]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[13]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[14])) .registerResearchItem(); - researchFamiliarAugmentRange = new IfAnyParentResearchItem("FAMILIAR_RANGE", 6, 4, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Range.png"), + RegisteredResearches.researchFamiliarAugmentRange = new IfAnyParentResearchItem("FAMILIAR_RANGE", 6, 4, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Range.png"), new AspectList().add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 8).add(Aspect.ORDER, 4)) - .setAnyParents(researchFamiliarElementFire.key, researchFamiliarElementLightning.key, - researchFamiliarElementPoison.key, researchFamiliarElementWeakness.key) + .setAnyParents(RegisteredResearches.researchFamiliarElementFire.key, RegisteredResearches.researchFamiliarElementLightning.key, + RegisteredResearches.researchFamiliarElementPoison.key, RegisteredResearches.researchFamiliarElementWeakness.key) .setConcealed() - .setParents(researchEtherealFamiliar.key) + .setParents(RegisteredResearches.researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_RANGE.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[15]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[16])) .registerResearchItem(); - researchFamiliarAugmentSpeed = new SimpleResearchItem("FAMILIAR_SPEED", 8, 5, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Speed.png"), + RegisteredResearches.researchFamiliarAugmentSpeed = new SimpleResearchItem("FAMILIAR_SPEED", 8, 5, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Speed.png"), new AspectList().add(Aspect.MOTION, 10).add(Aspect.MAGIC, 4).add(Aspect.AURA, 4)) .setConcealed() - .setParents(researchFamiliarAugmentDamage.key, researchFamiliarAugmentRange.key, "PRIMPEARL") + .setParents(RegisteredResearches.researchFamiliarAugmentDamage.key, RegisteredResearches.researchFamiliarAugmentRange.key, "PRIMPEARL") .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_SPEED.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[17]), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[18])) .registerResearchItem(); if(ModConfig.enableAdditionalNodeTypes) { - researchGrowingNodes = new SimpleResearchItem("GROWING", -8, -1, 5, new ResourceLocation("thaumcraft", "textures/misc/r_nodes.png"), new AspectList()) + RegisteredResearches.researchGrowingNodes = new SimpleResearchItem("GROWING", -8, -1, 5, new ResourceLocation("thaumcraft", "textures/misc/r_nodes.png"), new AspectList()) .setSpecial().setLost().setConcealed() .setParents(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR") .setPages(new ResearchPage("gadomancy.research_page.GROWING.1"), new ResearchPage("gadomancy.research_page.GROWING.2")).registerResearchItem(); - researchGrowingNodeAgression = new SimpleResearchItem("GROWING_AGGRESSION", -5, 0, 6, new ItemStack(ConfigBlocks.blockAiry, 1, 5), new AspectList()) + RegisteredResearches.researchGrowingNodeAgression = new SimpleResearchItem("GROWING_AGGRESSION", -5, 0, 6, new ItemStack(ConfigBlocks.blockAiry, 1, 5), new AspectList()) .setLost() .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING") .setPages(new ResearchPage("gadomancy.research_page.GROWING_AGGRESSION.1")).registerResearchItem(); - researchGrowingNodeGrowth = new SimpleResearchItem("GROWING_GROWTH", -7, 2, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_star.png"), new AspectList()) + RegisteredResearches.researchGrowingNodeGrowth = new SimpleResearchItem("GROWING_GROWTH", -7, 2, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_star.png"), new AspectList()) .setLost() .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING") .setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTH.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTH.2")).registerResearchItem(); - researchGrowingNodeAttackNodes = new SimpleResearchItem("GROWING_ATTACK", -6, 1, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_dark.png"), new AspectList()) + RegisteredResearches.researchGrowingNodeAttackNodes = new SimpleResearchItem("GROWING_ATTACK", -6, 1, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_dark.png"), new AspectList()) .setLost() .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING") .setPages(new ResearchPage("gadomancy.research_page.GROWING_ATTACK.1")).registerResearchItem(); - researchGrowingNodeGrowthClue = new SimpleResearchItem("GROWING_GROWTHCLUE", -4, 3, 2, new ItemStack(ConfigBlocks.blockAiry, 1, 5), + RegisteredResearches.researchGrowingNodeGrowthClue = new SimpleResearchItem("GROWING_GROWTHCLUE", -4, 3, 2, new ItemStack(ConfigBlocks.blockAiry, 1, 5), new AspectList().add(Aspect.AURA, 10).add(Aspect.MAGIC, 15).add(Aspect.ELDRITCH, 5).add(Aspect.VOID, 12).add(Aspect.ENERGY, 12).add(Aspect.ENTROPY, 8).add(Aspect.DEATH, 3) .add(Aspect.GREED, 10).add(Aspect.HUNGER, 10).add(Aspect.MECHANISM, 12).add(Aspect.DARKNESS, 12)) .setSpecial().setRound().setConcealed() @@ -263,7 +259,7 @@ public class RegisteredResearches { } if(ModConfig.ancientStoneRecipes) - researchAncientStones = new AlternatingResearchItem("ANCIENT_STONES", + RegisteredResearches.researchAncientStones = new AlternatingResearchItem("ANCIENT_STONES", -12, 1, 3, new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EARTH, 8).add(Aspect.EXCHANGE, 6).add(Aspect.ENTROPY, 8), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15)) @@ -280,7 +276,7 @@ public class RegisteredResearches { } //Cores and stuff related to it. - researchAuraCore = new AlternatingResearchItem("AURA_CORE", + RegisteredResearches.researchAuraCore = new AlternatingResearchItem("AURA_CORE", -1, 6, 2, new AspectList().add(Aspect.AURA, 22).add(Aspect.MAGIC, 10).add(Aspect.AIR, 8).add(Aspect.WATER, 8) .add(Aspect.EARTH, 8).add(Aspect.FIRE, 8).add(Aspect.ORDER, 8).add(Aspect.ENTROPY, 8), @@ -289,44 +285,44 @@ public class RegisteredResearches { .setParents("INFUSION", "THAUMIUM") .setPages(new ResearchPage("gadomancy.research_page.AURA_CORE.1"), new ResearchPage(RegisteredRecipes.recipeAuraCore), new ResearchPage("gadomancy.research_page.AURA_CORE.3"), new MultiResearchPage(RegisteredRecipes.auraCoreRecipes)).registerResearchItem(); - researchCleanAuraCore = new SimpleResearchItem("CLEAN_AURA_CORE", + RegisteredResearches.researchCleanAuraCore = new SimpleResearchItem("CLEAN_AURA_CORE", 1, 5, 0, new ItemStack(RegisteredItems.itemAuraCore), new AspectList().add(Aspect.HEAL, 8).add(Aspect.AURA, 6).add(Aspect.MAGIC, 8).add(Aspect.WATER, 10)) .setConcealed().setSecondary() - .setParents(researchAuraCore.key) + .setParents(RegisteredResearches.researchAuraCore.key) .setPages(new ResearchPage("gadomancy.research_page.CLEAN_AURA_CORE.1"), new ResearchPage(RegisteredRecipes.recipesWashAuraCore), new ResearchPage(RegisteredRecipes.recipesUndoAuraCore)).registerResearchItem(); - researchAuraPylon = new SimpleResearchItem("AURA_PYLON", + RegisteredResearches.researchAuraPylon = new SimpleResearchItem("AURA_PYLON", 0, 9, 2, new ItemStack(RegisteredBlocks.blockAuraPylon, 1, 1), new AspectList().add(Aspect.ORDER, 12).add(Aspect.AURA, 20).add(Aspect.MAGIC, 12).add(Aspect.MECHANISM, 8)) .setHidden() - .setParents(researchAuraCore.key, "TUBEFILTER") + .setParents(RegisteredResearches.researchAuraCore.key, "TUBEFILTER") .setItemTriggers(new ItemStack(RegisteredItems.itemAuraCore, 1, ItemAuraCore.AuraCoreType.FIRE.ordinal())) .setPages(new ResearchPage("gadomancy.research_page.AURA_PYLON.1"), new ResearchPage(RegisteredRecipes.recipeAuraPylon), new ResearchPage(RegisteredRecipes.recipeAuraPylonPeak), new ResearchPage("gadomancy.research_page.AURA_PYLON.4"), new ResearchPage(RegisteredRecipes.multiblockAuraPylon)).registerResearchItem(); - researchAuraEffects = new SimpleResearchItem("AURA_EFFECTS", + RegisteredResearches.researchAuraEffects = new SimpleResearchItem("AURA_EFFECTS", 1, 10, 2, new ResourceLocation("thaumcraft", "textures/misc/r_aspects.png"), new AspectList().add(Aspect.AURA, 6).add(Aspect.MIND, 8).add(Aspect.MAGIC, 4).add(Aspect.ORDER, 4)) .setConcealed().setSecondary() - .setParents(researchAuraPylon.key) + .setParents(RegisteredResearches.researchAuraPylon.key) .setPages(new ResearchPage("gadomancy.research_page.AURA_EFFECTS.1")).registerResearchItem(); - researchKnowledgeBook = new SimpleResearchItem("KNOWLEDGE_BOOK", + RegisteredResearches.researchKnowledgeBook = new SimpleResearchItem("KNOWLEDGE_BOOK", -2, 8, 2, new ItemStack(RegisteredBlocks.blockKnowledgeBook), new AspectList().add(Aspect.MIND, 12).add(Aspect.MAGIC, 8).add(Aspect.MOTION, 6).add(Aspect.ORDER, 10).add(Aspect.MECHANISM, 8).add(Aspect.CRAFT, 8)) .setHidden() - .setParents(researchAuraCore.key, "GOGGLES", "THAUMATORIUM") + .setParents(RegisteredResearches.researchAuraCore.key, "GOGGLES", "THAUMATORIUM") .setItemTriggers(new ItemStack(RegisteredItems.itemAuraCore, 1, ItemAuraCore.AuraCoreType.ORDER.ordinal())) .setPages(new ResearchPage("gadomancy.research_page.KNOWLEDGE_BOOK.1"), new ResearchPage(RegisteredRecipes.recipeKnowledgeBook), new ResearchPage("gadomancy.research_page.KNOWLEDGE_BOOK.3"), new ResearchPage("gadomancy.research_page.KNOWLEDGE_BOOK.4")).registerResearchItem(); ResearchItem researchVReservoir = PseudoResearchItem.create("ESSENTIARESERVOIR", -5, 9).registerResearchItem(); - researchEssentiaCompressor = new SimpleResearchItem("ESSENTIA_COMPRESSOR", + RegisteredResearches.researchEssentiaCompressor = new SimpleResearchItem("ESSENTIA_COMPRESSOR", -4, 7, 2, new ItemStack(RegisteredBlocks.blockEssentiaCompressor), new AspectList().add(Aspect.VOID, 12).add(Aspect.WATER, 10).add(Aspect.ENTROPY, 12).add(Aspect.MAGIC, 6).add(Aspect.MECHANISM, 12)) .setHidden() - .setParents(researchAuraCore.key, researchVReservoir.key) + .setParents(RegisteredResearches.researchAuraCore.key, researchVReservoir.key) .setItemTriggers(new ItemStack(RegisteredItems.itemAuraCore, 1, ItemAuraCore.AuraCoreType.WATER.ordinal())) .setPages(new ResearchPage("gadomancy.research_page.ESSENTIA_COMPRESSOR.1"), new ResearchPage("gadomancy.research_page.ESSENTIA_COMPRESSOR.2"), new ResearchPage(RegisteredRecipes.recipeElementVoid), new ResearchPage("gadomancy.research_page.ESSENTIA_COMPRESSOR.4"), @@ -343,8 +339,8 @@ public class RegisteredResearches { .setPages(new ResearchPage("gadomancy.research_page.AI_SHUTDOWN.1"), new ResearchPage(RegisteredRecipes.recipeAiShutdown)) .registerResearchItem();*/ - String[] packagerParents = Config.wardedStone ? new String[] { researchAuraCore.key, "WARDEDARCANA" } : new String[] { researchAuraCore.key }; - researchArcanePackager = new SimpleResearchItem("ARCANE_PACKAGER", + String[] packagerParents = Config.wardedStone ? new String[] {RegisteredResearches.researchAuraCore.key, "WARDEDARCANA" } : new String[] {RegisteredResearches.researchAuraCore.key }; + RegisteredResearches.researchArcanePackager = new SimpleResearchItem("ARCANE_PACKAGER", 2, 7, 2, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 4), new AspectList().add(Aspect.AIR, 12).add(Aspect.MECHANISM, 16).add(Aspect.VOID, 10).add(Aspect.MAGIC, 10)) .setHidden() @@ -357,11 +353,11 @@ public class RegisteredResearches { ItemStack goggles = new ItemStack(ConfigItems.itemGoggles); goggles.addEnchantment(Enchantment.protection, 1); - researchRevealer = new SimpleResearchItem("REVEALER", 1, 3, 1, goggles, new AspectList().add(Aspect.SENSES, 4).add(Aspect.MAGIC, 4)) + RegisteredResearches.researchRevealer = new SimpleResearchItem("REVEALER", 1, 3, 1, goggles, new AspectList().add(Aspect.SENSES, 4).add(Aspect.MAGIC, 4)) .setParents(researchInfusionEnch.key, "GOGGLES").setConcealed() .setPages(new ResearchPage("gadomancy.research_page.REVEALER.1"), new ResearchPage(RegisteredRecipes.recipeRevealer)).registerResearchItem(); - researchArmorDisguise = new DisguiseResearchItem("ARMORDISGUISE", -2, 0, 1, new AspectList().add(Aspect.SLIME, 8).add(Aspect.MAGIC, 4).add(Aspect.ARMOR, 4)) + RegisteredResearches.researchArmorDisguise = new DisguiseResearchItem("ARMORDISGUISE", -2, 0, 1, new AspectList().add(Aspect.SLIME, 8).add(Aspect.MAGIC, 4).add(Aspect.ARMOR, 4)) .setParents(researchInfusionEnch.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.ARMORDISGUISE.1"), new ResearchPage(new InfusionVisualDisguiseArmor(false)), new ResearchPage(new InfusionVisualDisguiseArmor(true)), new ResearchPage("gadomancy.research_page.ARMORDISGUISE.4")).registerResearchItem(); @@ -379,17 +375,17 @@ public class RegisteredResearches { RecipeVisualStickyJar visualRecipe = new RecipeVisualStickyJar(); ResearchPage page = new ResearchPage(visualRecipe); - researchStickyJar = new StickyJarResearchItem("STICKYJAR", -5, -5, 2, + RegisteredResearches.researchStickyJar = new StickyJarResearchItem("STICKYJAR", -5, -5, 2, new AspectList().add(Aspect.SLIME, 8).add(Aspect.EARTH, 8)) .setParents(researchJar.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.STICKYJAR.1"), page).registerResearchItem(); - if(researchBlockProtector != null) { - researchBlockProtector.setParents(researchStickyJar.key); + if(RegisteredResearches.researchBlockProtector != null) { + RegisteredResearches.researchBlockProtector.setParents(RegisteredResearches.researchStickyJar.key); } String[] parents = Config.allowMirrors ? new String[] { researchJar.key, "MIRRORESSENTIA" } : new String[] { researchJar.key }; - researchRemoteJar = new SimpleResearchItem("REMOTEJAR", -4, -3, 3, + RegisteredResearches.researchRemoteJar = new SimpleResearchItem("REMOTEJAR", -4, -3, 3, RegisteredRecipes.recipeRemoteJar.getRecipeOutput(), new AspectList().add(Aspect.WATER, 4).add(Aspect.MECHANISM, 8).add(Aspect.EARTH, 4).add(Aspect.ORDER, 8)) .setParents(parents).setConcealed() diff --git a/src/main/java/makeo/gadomancy/common/registration/StickyJarInfo.java b/src/main/java/makeo/gadomancy/common/registration/StickyJarInfo.java index 228178a..e16f360 100644 --- a/src/main/java/makeo/gadomancy/common/registration/StickyJarInfo.java +++ b/src/main/java/makeo/gadomancy/common/registration/StickyJarInfo.java @@ -24,18 +24,18 @@ public class StickyJarInfo { } public Block getBlock() { - return block; + return this.block; } public int getMetadata() { - return metadata; + return this.metadata; } public boolean needsLabelHandling() { - return needsLabelHandling; + return this.needsLabelHandling; } public boolean needsPhialHandling() { - return needsPhialHandling; + return this.needsPhialHandling; } } diff --git a/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java b/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java index 082d68b..d5bbcd5 100644 --- a/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java @@ -21,7 +21,7 @@ public class AlternatingResearchItem extends SimpleResearchItem { private static final Field ICON_FIELD = Injector.getField("icon_item", ResearchItem.class); private final Injector injector = new Injector(this, ResearchItem.class); - protected List itemIcons = null; + protected List itemIcons; public AlternatingResearchItem(String key, int col, int row, int complex, AspectList tags, List icons) { super(key, col, row, complex, icons.get(0), tags); @@ -33,11 +33,11 @@ public class AlternatingResearchItem extends SimpleResearchItem { } private void updateIcon() { - injector.setField(ICON_FIELD, getIcon()); + this.injector.setField(AlternatingResearchItem.ICON_FIELD, this.getIcon()); } protected ItemStack getIcon() { - return itemIcons.get(calcIndex(itemIcons.size())); + return this.itemIcons.get(this.calcIndex(this.itemIcons.size())); } private int calcIndex(int max) { @@ -46,7 +46,7 @@ public class AlternatingResearchItem extends SimpleResearchItem { @Override public boolean isSpecial() { - updateIcon(); + this.updateIcon(); return super.isSpecial(); } } diff --git a/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java b/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java index bcb9b24..bfc17d2 100644 --- a/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java @@ -24,7 +24,7 @@ public class DisguiseResearchItem extends AlternatingResearchItem { @Override protected ItemStack getIcon() { - return recipe == null ? new ItemStack(Items.cookie) : recipe.getRecipeInput(); + return this.recipe == null ? new ItemStack(Items.cookie) : this.recipe.getRecipeInput(); } @Override @@ -32,7 +32,7 @@ public class DisguiseResearchItem extends AlternatingResearchItem { for(ResearchPage page : pages) { if(page.type == ResearchPage.PageType.INFUSION_CRAFTING && page.recipe instanceof InfusionVisualDisguiseArmor) { - recipe = (InfusionVisualDisguiseArmor) page.recipe; + this.recipe = (InfusionVisualDisguiseArmor) page.recipe; } } return super.setPages(pages); diff --git a/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java b/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java index 1c0c3bc..aaf4cf9 100644 --- a/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java @@ -20,25 +20,25 @@ import thaumcraft.client.gui.GuiResearchBrowser; */ public class IfAnyParentResearchItem extends SimpleResearchItem { - private String[] anyParents = null; + private String[] anyParents; public IfAnyParentResearchItem(String key, int col, int row, int complex, ItemStack icon, AspectList tags) { super(key, col, row, complex, icon, tags); - setHidden(); + this.setHidden(); } public IfAnyParentResearchItem(String key, int col, int row, int complex, ResourceLocation icon, AspectList tags) { super(key, col, row, complex, icon, tags); - setHidden(); + this.setHidden(); } @Override @SideOnly(Side.CLIENT) public boolean isHidden() { - if(anyParents != null) { + if(this.anyParents != null) { boolean hasFoundAny = false; boolean doesAnyExist = false; - for(String res : anyParents) { + for(String res : this.anyParents) { ResearchItem ri = ResearchCategories.getResearch(res); if(ri != null) { doesAnyExist = true; diff --git a/src/main/java/makeo/gadomancy/common/research/MultiResearchPage.java b/src/main/java/makeo/gadomancy/common/research/MultiResearchPage.java index 50e6a2c..f0280d8 100644 --- a/src/main/java/makeo/gadomancy/common/research/MultiResearchPage.java +++ b/src/main/java/makeo/gadomancy/common/research/MultiResearchPage.java @@ -16,7 +16,7 @@ import java.util.List; public class MultiResearchPage extends ResearchPage { public MultiResearchPage(List... recipes) { super(recipes[0]); - recipe = new OverrideList(recipes); + this.recipe = new OverrideList(recipes); } private class OverrideList extends ArrayList { @@ -31,18 +31,18 @@ public class MultiResearchPage extends ResearchPage { @Override public Object get(int index) { int calcIndex; - if(index == 0 && (calcIndex = calcIndex()) != recipeIndex) { + if(index == 0 && (calcIndex = this.calcIndex()) != this.recipeIndex) { this.clear(); - for(Object o : recipes[calcIndex]) { + for(Object o : this.recipes[calcIndex]) { this.add(o); } - recipeIndex = calcIndex; + this.recipeIndex = calcIndex; } return super.get(index); } private int calcIndex() { - return (int)(System.currentTimeMillis() / 1000L % recipes.length); + return (int)(System.currentTimeMillis() / 1000L % this.recipes.length); } } } diff --git a/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java b/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java index 26810c6..71bce7b 100644 --- a/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java @@ -28,30 +28,30 @@ public class PseudoResearchItem extends SimpleResearchItem { private final ResearchItem original; private PseudoResearchItem(ResearchItem original, String key, int col, int row, ResourceLocation icon, boolean doubleThisPage) { - super(PSEUDO_PREFIX + key + (doubleThisPage ? ".2" : ""), col, row, original.getComplexity(), icon, new AspectList()); + super(PseudoResearchItem.PSEUDO_PREFIX + key + (doubleThisPage ? ".2" : ""), col, row, original.getComplexity(), icon, new AspectList()); this.original = original; - setStub().setHidden(); + this.setStub().setHidden(); } private PseudoResearchItem(ResearchItem original, String key, int col, int row, ItemStack icon, boolean doubleThisPage) { - super(PSEUDO_PREFIX + key + (doubleThisPage ? ".2" : ""), col, row, original.getComplexity(), icon, new AspectList()); + super(PseudoResearchItem.PSEUDO_PREFIX + key + (doubleThisPage ? ".2" : ""), col, row, original.getComplexity(), icon, new AspectList()); this.original = original; - setStub().setHidden(); + this.setStub().setHidden(); } @Override public ResearchPage[] getPages() { - return original.getPages(); + return this.original.getPages(); } @Override public String getName() { - return original.getName(); + return this.original.getName(); } @Override public String getText() { - return original.getText(); + return this.original.getText(); } @Override @@ -67,7 +67,7 @@ public class PseudoResearchItem extends SimpleResearchItem { } public static ResearchItem create(String original, int col, int row) { - return create(original, col, row, false); + return PseudoResearchItem.create(original, col, row, false); } public static ResearchItem create(String original, int col, int row, boolean doubleInThisPage) { diff --git a/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java b/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java index a1c6e72..acb0e87 100644 --- a/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java @@ -19,15 +19,15 @@ public class SimpleResearchItem extends ResearchItem { private static final String PREFIX = Gadomancy.MODID.toUpperCase() + "."; public SimpleResearchItem(String key, int col, int row, int complex, ResourceLocation icon, AspectList tags) { - super(PREFIX + key, Gadomancy.MODID, tags, col, row, complex, icon); + super(SimpleResearchItem.PREFIX + key, Gadomancy.MODID, tags, col, row, complex, icon); } public SimpleResearchItem(String key, int col, int row, int complex, ItemStack icon, AspectList tags) { - super(PREFIX + key, Gadomancy.MODID, tags, col, row, complex, icon); + super(SimpleResearchItem.PREFIX + key, Gadomancy.MODID, tags, col, row, complex, icon); } public static String getFullName(String name) { - return PREFIX + name; + return SimpleResearchItem.PREFIX + name; } } diff --git a/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java b/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java index aec2e59..76c8925 100644 --- a/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java @@ -30,7 +30,7 @@ public class StickyJarResearchItem extends AlternatingResearchItem { if(Gadomancy.proxy.getSide() == Side.CLIENT) { List items = RegisteredItems.getStickyJarStacks(Minecraft.getMinecraft().thePlayer); if(items.size() > 0) { - itemIcons = items; + this.itemIcons = items; } } return super.isSpecial(); diff --git a/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java b/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java index 9ab0e2d..a6ffb6d 100644 --- a/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java @@ -20,7 +20,7 @@ public class ColorHelper { } public static int toHex(Color color) { - return toHex(color.getRed(), color.getGreen(), color.getBlue()); + return ColorHelper.toHex(color.getRed(), color.getGreen(), color.getBlue()); } public static String extractColors(String input) { @@ -28,11 +28,11 @@ public class ColorHelper { boolean isColor = false; for(char c : input.toCharArray()) { - if(c == COLOR_CHAR) { + if(c == ColorHelper.COLOR_CHAR) { isColor = true; } else if(isColor) { isColor = false; - output.append(COLOR_CHAR).append(c); + output.append(ColorHelper.COLOR_CHAR).append(c); } } return output.toString(); diff --git a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java index ae9f21e..0c0c7b7 100644 --- a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java @@ -37,7 +37,7 @@ import java.util.List; public class ExplosionHelper { public static void taintplosion(World world, int x, int y, int z, boolean taintBiome, int chanceToTaint) { - taintplosion(world, x, y, z, taintBiome, chanceToTaint, 3.0F, 10, 80); + ExplosionHelper.taintplosion(world, x, y, z, taintBiome, chanceToTaint, 3.0F, 10, 80); } public static void taintplosion(World world, int x, int y, int z, boolean taintBiome, int chanceToTaint, float str, int size, int blocksAffected) { @@ -69,7 +69,7 @@ public class ExplosionHelper { private int phase; private World world; private int x, y, z; - private List pastTickBlocks = null; + private List pastTickBlocks; public VortexExplosion(TileExtendedNode exNode) { this.causingNode = exNode; @@ -82,78 +82,78 @@ public class ExplosionHelper { } public void update() { - List livingEntities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(6.0D, 6.0D, 6.0D)); + List livingEntities = this.world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(this.x, this.y, this.z, this.x + 1, this.y + 1, this.z + 1).expand(6.0D, 6.0D, 6.0D)); if ((livingEntities != null) && (livingEntities.size() > 0)) { for (Object e : livingEntities) { EntityLivingBase livingEntity = (EntityLivingBase) e; if ((livingEntity.isEntityAlive()) && (!livingEntity.isEntityInvulnerable())) { if(livingEntity instanceof EntityPlayer && ((EntityPlayer) livingEntity).capabilities.isCreativeMode) continue; - if(world.rand.nextInt(16) != 0) continue; + if(this.world.rand.nextInt(16) != 0) continue; livingEntity.attackEntityFrom(DamageSource.magic, 4F); - PacketTCNodeBolt packet = new PacketTCNodeBolt(x + 0.5F, y + 0.5F, z + 0.5F, (float) livingEntity.posX, (float) (livingEntity.posY + livingEntity.height), (float) livingEntity.posZ, 0, false); - PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32.0D)); + PacketTCNodeBolt packet = new PacketTCNodeBolt(this.x + 0.5F, this.y + 0.5F, this.z + 0.5F, (float) livingEntity.posX, (float) (livingEntity.posY + livingEntity.height), (float) livingEntity.posZ, 0, false); + PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(this.world.provider.dimensionId, this.x, this.y, this.z, 32.0D)); } } } - if(phase < 2 && world.rand.nextInt(phase == 0 ? 8 : 4) == 0) { - PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_BURST, x, y, z); - PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32.0D)); - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "thaumcraft:ice", 0.8F, 1.0F); + if(this.phase < 2 && this.world.rand.nextInt(this.phase == 0 ? 8 : 4) == 0) { + PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_BURST, this.x, this.y, this.z); + PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(this.world.provider.dimensionId, this.x, this.y, this.z, 32.0D)); + this.world.playSoundEffect(this.x + 0.5, this.y + 0.5, this.z + 0.5, "thaumcraft:ice", 0.8F, 1.0F); } - switch (phase) { + switch (this.phase) { case 0: { - tick++; - if(tick > 200) { - tick = 0; - phase = 1; - taintplosion(world, x, y, z, false, 1); + this.tick++; + if(this.tick > 200) { + this.tick = 0; + this.phase = 1; + ExplosionHelper.taintplosion(this.world, this.x, this.y, this.z, false, 1); } - sendRandomVortexLightningPacket(world, x, y, z); + this.sendRandomVortexLightningPacket(this.world, this.x, this.y, this.z); break; } case 1: { - tick++; - int range = tick > 50 ? tick > 75 ? tick > 100 ? tick > 200 ? tick > 300 ? 9 : 7 : 6 : 5 : 4 : 3; - if(pastTickBlocks != null) { - for(Vec3 v : pastTickBlocks) { - sendRandomVortexLightningPacket(world, x, y, z); - world.setBlockToAir((int) v.xCoord, (int) v.yCoord, (int) v.zCoord); + this.tick++; + int range = this.tick > 50 ? this.tick > 75 ? this.tick > 100 ? this.tick > 200 ? this.tick > 300 ? 9 : 7 : 6 : 5 : 4 : 3; + if(this.pastTickBlocks != null) { + for(Vec3 v : this.pastTickBlocks) { + this.sendRandomVortexLightningPacket(this.world, this.x, this.y, this.z); + this.world.setBlockToAir((int) v.xCoord, (int) v.yCoord, (int) v.zCoord); } } - int ct = world.rand.nextInt(4); + int ct = this.world.rand.nextInt(4); while(ct > 0) { ct--; - sendRandomVortexLightningPacket(world, x, y, z); + this.sendRandomVortexLightningPacket(this.world, this.x, this.y, this.z); } - pastTickBlocks = new ArrayList(); + this.pastTickBlocks = new ArrayList(); int cnt = 10; do { - int xx = x + world.rand.nextInt(range) - world.rand.nextInt(range); - int yy = y + world.rand.nextInt(range) - world.rand.nextInt(range); - int zz = z + world.rand.nextInt(range) - world.rand.nextInt(range); - Block b = world.getBlock(xx, yy, zz); - float hardness = b.getBlockHardness(world, xx, yy, zz); + int xx = this.x + this.world.rand.nextInt(range) - this.world.rand.nextInt(range); + int yy = this.y + this.world.rand.nextInt(range) - this.world.rand.nextInt(range); + int zz = this.z + this.world.rand.nextInt(range) - this.world.rand.nextInt(range); + Block b = this.world.getBlock(xx, yy, zz); + float hardness = b.getBlockHardness(this.world, xx, yy, zz); if(b != Blocks.air && hardness > 0 && hardness <= 50 && b != RegisteredBlocks.blockNode) { - PacketAnimationAbsorb absorb = new PacketAnimationAbsorb(x, y, z, xx, yy, zz, 7); - PacketHandler.INSTANCE.sendToAllAround(absorb, new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32D)); - pastTickBlocks.add(Vec3.createVectorHelper(xx, yy, zz)); + PacketAnimationAbsorb absorb = new PacketAnimationAbsorb(this.x, this.y, this.z, xx, yy, zz, 7); + PacketHandler.INSTANCE.sendToAllAround(absorb, new NetworkRegistry.TargetPoint(this.world.provider.dimensionId, this.x, this.y, this.z, 32D)); + this.pastTickBlocks.add(Vec3.createVectorHelper(xx, yy, zz)); } cnt--; } while (cnt > 0); - if(tick == 200) { - taintplosion(world, x, y, z, false, 1); + if(this.tick == 200) { + ExplosionHelper.taintplosion(this.world, this.x, this.y, this.z, false, 1); } - if(tick == 300) { - taintplosion(world, x, y, z, false, 1); + if(this.tick == 300) { + ExplosionHelper.taintplosion(this.world, this.x, this.y, this.z, false, 1); } - if(tick > 400) { - phase = 2; - reduceAspects(causingNode); - taintplosion(world, x, y, z, true, 3); + if(this.tick > 400) { + this.phase = 2; + this.reduceAspects(this.causingNode); + ExplosionHelper.taintplosion(this.world, this.x, this.y, this.z, true, 3); } break; } @@ -164,7 +164,7 @@ public class ExplosionHelper { List lostAspects = new ArrayList(); AspectList list = node.getAspectsBase(); for(Aspect a : list.getAspects()) { - if(world.rand.nextInt(4) == 0) { + if(this.world.rand.nextInt(4) == 0) { lostAspects.add(a); } else { list.reduce(a, list.getAmount(a) / 2); @@ -203,7 +203,7 @@ public class ExplosionHelper { } public boolean isFinished() { - return phase > 1; + return this.phase > 1; } } diff --git a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java index 55fd1b6..d3d0d6a 100644 --- a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java @@ -28,65 +28,65 @@ public class GolemEnumHelper { private static final Injector ENUM_INJECTOR = new Injector(Enum.class); private static final Injector HELPER_INJECTOR = new Injector(EnumHelper.class); - private static Field valuesField = null; + private static Field valuesField; private static Field getValuesField() { - if(valuesField == null) { + if(GolemEnumHelper.valuesField == null) { for(Field field : EnumGolemType.class.getDeclaredFields()) { String name = field.getName(); if (name.equals("$VALUES") || name.equals("ENUM$VALUES")) //Added 'ENUM$VALUES' because Eclipse's internal compiler doesn't follow standards { - valuesField = field; - valuesField.setAccessible(true); + GolemEnumHelper.valuesField = field; + GolemEnumHelper.valuesField.setAccessible(true); break; } } } - return valuesField; + return GolemEnumHelper.valuesField; } private static final Class[] ENUM_PARAMS = {int.class, int.class, float.class, boolean.class, int.class, int.class, int.class, int.class}; - private static Field ordinalField = null; + private static Field ordinalField; public static Field getOrdinalField() { - if(ordinalField == null) { + if(GolemEnumHelper.ordinalField == null) { try { - ordinalField = Enum.class.getDeclaredField("ordinal"); + GolemEnumHelper.ordinalField = Enum.class.getDeclaredField("ordinal"); } catch (NoSuchFieldException ignored) { } } - return ordinalField; + return GolemEnumHelper.ordinalField; } - private static final Class[] MAKE_ENUM_PARAMS = new Class[]{ Class.class, String.class, int.class, Class[].class, Object[].class }; + private static final Class[] MAKE_ENUM_PARAMS = { Class.class, String.class, int.class, Class[].class, Object[].class }; private static EnumGolemType createEnum(String name, int ordinal, AdditionalGolemType type) { - return HELPER_INJECTOR.invokeMethod("makeEnum", MAKE_ENUM_PARAMS, - EnumGolemType.class, name, ordinal, ENUM_PARAMS, new Object[]{ type.maxHealth, type.armor, type.movementSpeed, + return GolemEnumHelper.HELPER_INJECTOR.invokeMethod("makeEnum", GolemEnumHelper.MAKE_ENUM_PARAMS, + EnumGolemType.class, name, ordinal, GolemEnumHelper.ENUM_PARAMS, new Object[]{ type.maxHealth, type.armor, type.movementSpeed, type.fireResist, type.upgradeAmount, type.carryLimit, type.regenDelay, type.strength }); } private static void addEnum(int ordinal, EnumGolemType type) { - EnumGolemType[] values = resizeValues(ordinal + 1);; + EnumGolemType[] values = GolemEnumHelper.resizeValues(ordinal + 1); values[ordinal] = type; } private static EnumGolemType addEnum(String name, int ordinal, AdditionalGolemType type) { - EnumGolemType enumEntry = createEnum(name, ordinal, type); - addEnum(ordinal, enumEntry); + EnumGolemType enumEntry = GolemEnumHelper.createEnum(name, ordinal, type); + GolemEnumHelper.addEnum(ordinal, enumEntry); type.setEnumEntry(enumEntry); return enumEntry; } private static EnumGolemType[] resizeValues(int size) { - EnumGolemType[] values = INJECTOR.getField(getValuesField()); + EnumGolemType[] values = GolemEnumHelper.INJECTOR.getField(GolemEnumHelper.getValuesField()); if(size > values.length) { EnumGolemType[] newValues = new EnumGolemType[size]; System.arraycopy(values, 0, newValues, 0, values.length); for(int i = values.length; i < newValues.length; i++) { - newValues[i] = createEnum("REMOVED", i, REMOVED_GOLEM_TYPE); + newValues[i] = GolemEnumHelper.createEnum("REMOVED", i, GolemEnumHelper.REMOVED_GOLEM_TYPE); } - setValues(newValues); + GolemEnumHelper.setValues(newValues); return newValues; } return values; @@ -94,23 +94,23 @@ public class GolemEnumHelper { private static void setValues(EnumGolemType[] values) { try { - EnumHelper.setFailsafeFieldValue(getValuesField(), null, values); + EnumHelper.setFailsafeFieldValue(GolemEnumHelper.getValuesField(), null, values); } catch (Exception ignored) { } } public static EnumGolemType addGolemType(String name, AdditionalGolemType type) { - return addEnum(name, getOrdinal(name), type); + return GolemEnumHelper.addEnum(name, GolemEnumHelper.getOrdinal(name), type); } private static int getOrdinal(String name) { - Map map = getCurrentMapping(); + Map map = GolemEnumHelper.getCurrentMapping(); if(map.containsKey(name)) { return map.get(name); } int returnVal = -1; - int i = calcDefaultGolemCount(); + int i = GolemEnumHelper.calcDefaultGolemCount(); do { boolean contains = false; for(Map.Entry entry : map.entrySet()) { @@ -126,24 +126,24 @@ public class GolemEnumHelper { } while (returnVal < 0); map.put(name, returnVal); - saveCurrentMapping(map); + GolemEnumHelper.saveCurrentMapping(map); return returnVal; } public static void reorderEnum() { - reorderEnum(getCurrentMapping()); + GolemEnumHelper.reorderEnum(GolemEnumHelper.getCurrentMapping()); } public static void reorderEnum(Map mapping) { EnumGolemType[] oldValues = EnumGolemType.values(); - resetEnum(); + GolemEnumHelper.resetEnum(); for(Map.Entry entry : mapping.entrySet()) { for(EnumGolemType type : oldValues) { if(type.name().equals(entry.getKey())) { - ENUM_INJECTOR.setObject(type); - ENUM_INJECTOR.setField(getOrdinalField(), entry.getValue()); - addEnum(entry.getValue(), type); + GolemEnumHelper.ENUM_INJECTOR.setObject(type); + GolemEnumHelper.ENUM_INJECTOR.setField(GolemEnumHelper.getOrdinalField(), entry.getValue()); + GolemEnumHelper.addEnum(entry.getValue(), type); } } } @@ -155,8 +155,8 @@ public class GolemEnumHelper { } private static void resetEnum() { - EnumGolemType[] newValues = Arrays.copyOfRange(EnumGolemType.values(), 0, calcDefaultGolemCount()); - setValues(newValues); + EnumGolemType[] newValues = Arrays.copyOfRange(EnumGolemType.values(), 0, GolemEnumHelper.calcDefaultGolemCount()); + GolemEnumHelper.setValues(newValues); } private static int calcDefaultGolemCount() { @@ -170,11 +170,11 @@ public class GolemEnumHelper { } public static void validateSavedMapping() { - if(hasCurrentMapping()) { - Map mapping = getCurrentMapping(); - for(Map.Entry entry : defaultMapping.entrySet()) { + if(GolemEnumHelper.hasCurrentMapping()) { + Map mapping = GolemEnumHelper.getCurrentMapping(); + for(Map.Entry entry : GolemEnumHelper.defaultMapping.entrySet()) { if(!mapping.containsKey(entry.getKey())) { - mapping.put(entry.getKey(), getOrdinal(entry.getKey())); + mapping.put(entry.getKey(), GolemEnumHelper.getOrdinal(entry.getKey())); } } } @@ -183,12 +183,12 @@ public class GolemEnumHelper { private static Map defaultMapping = new HashMap(); public static Map getCurrentMapping() { - if(hasCurrentMapping()) { + if(GolemEnumHelper.hasCurrentMapping()) { return Gadomancy.getModData().get("GolemTypeMapping", new HashMap()); } else if(Gadomancy.getModData() != null) { - Gadomancy.getModData().set("GolemTypeMapping", defaultMapping); + Gadomancy.getModData().set("GolemTypeMapping", GolemEnumHelper.defaultMapping); } - return defaultMapping; + return GolemEnumHelper.defaultMapping; } public static boolean hasCurrentMapping() { diff --git a/src/main/java/makeo/gadomancy/common/utils/Injector.java b/src/main/java/makeo/gadomancy/common/utils/Injector.java index 3eef76f..1ad518d 100644 --- a/src/main/java/makeo/gadomancy/common/utils/Injector.java +++ b/src/main/java/makeo/gadomancy/common/utils/Injector.java @@ -33,7 +33,7 @@ public class Injector { } public Injector(Class clazz) { - object = null; + this.object = null; this.clazz = clazz; } @@ -51,7 +51,7 @@ public class Injector { } public Class getObjectClass() { - return clazz; + return this.clazz; } public void setObject(Object object) { @@ -59,22 +59,22 @@ public class Injector { } public Object getObject() { - return object; + return this.object; } public T invokeConstructor(Object... params) { - return invokeConstructor(extractClasses(params), params); + return this.invokeConstructor(this.extractClasses(params), params); } public T invokeConstructor(Class clazz, Object param) { - return invokeConstructor(new Class[]{clazz}, param); + return this.invokeConstructor(new Class[]{clazz}, param); } public T invokeConstructor(Class[] classes, Object... params) { try { - Constructor constructor = clazz.getDeclaredConstructor(classes); - object = constructor.newInstance(params); - return (T) object; + Constructor constructor = this.clazz.getDeclaredConstructor(classes); + this.object = constructor.newInstance(params); + return (T) this.object; } catch (Exception e) {//NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e.printStackTrace(); } @@ -82,17 +82,17 @@ public class Injector { } public T invokeMethod(String name, Object... params) { - return invokeMethod(name, extractClasses(params), params); + return this.invokeMethod(name, this.extractClasses(params), params); } public T invokeMethod(String name, Class clazz, Object param) { - return invokeMethod(name, new Class[]{clazz}, param); + return this.invokeMethod(name, new Class[]{clazz}, param); } public T invokeMethod(String name, Class[] classes, Object... params) { try { - Method method = clazz.getDeclaredMethod(name, classes); - return invokeMethod(method, params); + Method method = this.clazz.getDeclaredMethod(name, classes); + return this.invokeMethod(method, params); } catch (Exception e) {//NoSuchMethodException | ClassCastException e.printStackTrace(); } @@ -102,7 +102,7 @@ public class Injector { public T invokeMethod(Method method, Object... params) { try { method.setAccessible(true); - Object result = method.invoke(object, params); + Object result = method.invoke(this.object, params); if(result != null) return (T) result; } catch (Exception e) {//InvocationTargetException | IllegalAccessException | ClassCastException @@ -120,7 +120,7 @@ public class Injector { public boolean setField(String name, Object value) { try { - return setField(clazz.getDeclaredField(name), value); + return this.setField(this.clazz.getDeclaredField(name), value); } catch (NoSuchFieldException e) { e.printStackTrace(); } @@ -136,7 +136,7 @@ public class Injector { } field.setAccessible(true); - field.set(object, value); + field.set(this.object, value); return true; } catch (Exception e) {//IllegalAccessException | NoSuchFieldException e.printStackTrace(); @@ -146,7 +146,7 @@ public class Injector { public T getField(String name) { try { - return getField(clazz.getDeclaredField(name)); + return this.getField(this.clazz.getDeclaredField(name)); } catch (NoSuchFieldException e) { e.printStackTrace(); } @@ -156,7 +156,7 @@ public class Injector { public T getField(Field field) { try { field.setAccessible(true); - Object result = field.get(object); + Object result = field.get(this.object); if(result != null) return (T) result; } catch (Exception e) {//IllegalAccessException | ClassCastException @@ -166,11 +166,11 @@ public class Injector { } public Method findMethod(Class returnType, Class... paramTypes) { - return findMethod(clazz, returnType, paramTypes); + return Injector.findMethod(this.clazz, returnType, paramTypes); } public Field findField(Class type) { - return findField(clazz, type); + return Injector.findField(this.clazz, type); } public static Method findMethod(Class clazz, Class returnType, Class[] paramTypes) { @@ -221,7 +221,7 @@ public class Injector { } public static Method getMethod(String name, String clazz, Class... classes) { - return getMethod(name, Injector.getClass(clazz), classes); + return Injector.getMethod(name, Injector.getClass(clazz), classes); } public static Field getField(String name, Class clazz) { diff --git a/src/main/java/makeo/gadomancy/common/utils/MiscUtils.java b/src/main/java/makeo/gadomancy/common/utils/MiscUtils.java index b3fc004..9835c73 100644 --- a/src/main/java/makeo/gadomancy/common/utils/MiscUtils.java +++ b/src/main/java/makeo/gadomancy/common/utils/MiscUtils.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.utils; import cpw.mods.fml.common.network.NetworkRegistry; -import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +13,6 @@ import net.minecraftforge.common.util.FakePlayer; import java.util.ArrayList; import java.util.List; -import java.util.UUID; /** * This class is part of the Gadomancy Mod @@ -36,10 +34,10 @@ public final class MiscUtils { return String.valueOf(number); } String roman = ""; - for (int i = 0; i < R_NUMBERS.length; i++) { - while (number >= R_NUMBERS[i]) { - roman += R_CHARS[i]; - number -= R_NUMBERS[i]; + for (int i = 0; i < MiscUtils.R_NUMBERS.length; i++) { + while (number >= MiscUtils.R_NUMBERS[i]) { + roman += MiscUtils.R_CHARS[i]; + number -= MiscUtils.R_NUMBERS[i]; } } return roman; @@ -53,15 +51,15 @@ public final class MiscUtils { } public static int ticksForDays(int days) { - return ticksForHours(days * 24); + return MiscUtils.ticksForHours(days * 24); } public static int ticksForHours(int hours) { - return ticksForMinutes(hours * 60); + return MiscUtils.ticksForMinutes(hours * 60); } public static int ticksForMinutes(int minutes) { - return ticksForSeconds(minutes * 60); + return MiscUtils.ticksForSeconds(minutes * 60); } public static int ticksForSeconds(int seconds) { @@ -81,11 +79,11 @@ public final class MiscUtils { } public static NetworkRegistry.TargetPoint getTargetPoint(World world, Entity entity, double range) { - return getTargetPoint(world, range, getPositionVector(entity)); + return MiscUtils.getTargetPoint(world, range, MiscUtils.getPositionVector(entity)); } public static NetworkRegistry.TargetPoint getTargetPoint(World world, TileEntity tileEntity, double range) { - return getTargetPoint(world, range, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord)); + return MiscUtils.getTargetPoint(world, range, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord)); } public static NetworkRegistry.TargetPoint getTargetPoint(World world, double range, Vector3 target) { @@ -94,7 +92,7 @@ public final class MiscUtils { //Nothing to see here. Please move on. public static boolean isANotApprovedOrMisunderstoodPersonFromMoreDoor(EntityPlayer player) { - return isNotApproved(player) || isMisunderstood(player); + return MiscUtils.isNotApproved(player) || MiscUtils.isMisunderstood(player); } public static boolean isNotApproved(EntityPlayer player) { @@ -109,7 +107,7 @@ public final class MiscUtils { //For ppl we like. OK?!?!?!!!111111ELEVEN!!111 public static boolean isPrivilegedUser(EntityPlayer player) { - if(isANotApprovedOrMisunderstoodPersonFromMoreDoor(player)) return true; + if(MiscUtils.isANotApprovedOrMisunderstoodPersonFromMoreDoor(player)) return true; int uuHashOther = player.getUniqueID().hashCode(); switch (uuHashOther) { case -1899266570: //SH_F diff --git a/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java b/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java index 50a1d0c..323db09 100644 --- a/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java @@ -18,7 +18,7 @@ public class MultiblockHelper { public static boolean isAnyMultiblockPresent(World world, int x, int y, int z, List patternList) { for(MultiblockPattern pattern : patternList) { - if(isMultiblockPresent(world, x, y, z, pattern)) return true; + if(MultiblockHelper.isMultiblockPresent(world, x, y, z, pattern)) return true; } return false; } @@ -36,11 +36,11 @@ public class MultiblockHelper { public static class MultiblockPattern extends LinkedHashMap { public MultiblockPattern(Block originBlock, int originMeta) { - put(createIntVec3(0, 0, 0), new BlockInfo(originBlock, originMeta)); + this.put(this.createIntVec3(0, 0, 0), new BlockInfo(originBlock, originMeta)); } public MultiblockPattern addBlock(int relativeX, int relativeY, int relativeZ, Block expectedBlock, int expectedMeta) { - put(createIntVec3(relativeX, relativeY, relativeZ), new BlockInfo(expectedBlock, expectedMeta)); + this.put(this.createIntVec3(relativeX, relativeY, relativeZ), new BlockInfo(expectedBlock, expectedMeta)); return this; } @@ -62,17 +62,17 @@ public class MultiblockHelper { @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (o == null || this.getClass() != o.getClass()) return false; IntVec3 intVec3 = (IntVec3) o; - return x == intVec3.x && y == intVec3.y && z == intVec3.z; + return this.x == intVec3.x && this.y == intVec3.y && this.z == intVec3.z; } @Override public int hashCode() { - int result = x; - result = 31 * result + y; - result = 31 * result + z; + int result = this.x; + result = 31 * result + this.y; + result = 31 * result + this.z; return result; } } diff --git a/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java b/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java index 31ddfc3..b2c633e 100644 --- a/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java @@ -22,16 +22,16 @@ public class NBTHelper { private NBTHelper() {} public static NBTTagCompound getPersistentData(Entity entity) { - return getPersistentData(entity.getEntityData()); + return NBTHelper.getPersistentData(entity.getEntityData()); } public static NBTTagCompound getPersistentData(ItemStack item) { - return getPersistentData(getData(item)); + return NBTHelper.getPersistentData(NBTHelper.getData(item)); } public static NBTTagCompound getPersistentData(NBTTagCompound base) { NBTTagCompound compound; - if(hasPersistentData(base)) { + if(NBTHelper.hasPersistentData(base)) { compound = base.getCompoundTag(Gadomancy.MODID); } else { compound = new NBTTagCompound(); @@ -41,11 +41,11 @@ public class NBTHelper { } public static boolean hasPersistentData(Entity entity) { - return hasPersistentData(entity.getEntityData()); + return NBTHelper.hasPersistentData(entity.getEntityData()); } public static boolean hasPersistentData(ItemStack item) { - return item.getTagCompound() != null && hasPersistentData(item.getTagCompound()); + return item.getTagCompound() != null && NBTHelper.hasPersistentData(item.getTagCompound()); } public static boolean hasPersistentData(NBTTagCompound base) { @@ -55,10 +55,10 @@ public class NBTHelper { public static void removePersistentData(Entity entity) { - removePersistentData(entity.getEntityData()); + NBTHelper.removePersistentData(entity.getEntityData()); } public static void removePersistentData(ItemStack item) { - if(item.hasTagCompound()) removePersistentData(item.getTagCompound()); + if(item.hasTagCompound()) NBTHelper.removePersistentData(item.getTagCompound()); } public static void removePersistentData(NBTTagCompound base) { @@ -92,7 +92,7 @@ public class NBTHelper { } public static AspectList getAspectList(NBTTagCompound compound, String tag) { - return getAspectList(compound, tag, null); + return NBTHelper.getAspectList(compound, tag, null); } public static AspectList getAspectList(NBTTagCompound compound, String tag, AspectList defaultValue) { @@ -117,11 +117,11 @@ public class NBTHelper { } public static ItemStack getStack(NBTTagCompound compound, String tag) { - return getStack(compound, tag, null); + return NBTHelper.getStack(compound, tag, null); } public static UUID getUUID(NBTTagCompound compound, String tag) { - return getUUID(compound, tag, null); + return NBTHelper.getUUID(compound, tag, null); } //Get tags with default value diff --git a/src/main/java/makeo/gadomancy/common/utils/PrimalAspectList.java b/src/main/java/makeo/gadomancy/common/utils/PrimalAspectList.java index fc01d71..d22a6d2 100644 --- a/src/main/java/makeo/gadomancy/common/utils/PrimalAspectList.java +++ b/src/main/java/makeo/gadomancy/common/utils/PrimalAspectList.java @@ -15,7 +15,7 @@ import thaumcraft.common.lib.research.ResearchManager; public class PrimalAspectList extends AspectList { public AspectList addOne(Aspect a) { - return add(a, 1); + return this.add(a, 1); } @Override diff --git a/src/main/java/makeo/gadomancy/common/utils/RandomizedAspectList.java b/src/main/java/makeo/gadomancy/common/utils/RandomizedAspectList.java index 274aa2b..d538f91 100644 --- a/src/main/java/makeo/gadomancy/common/utils/RandomizedAspectList.java +++ b/src/main/java/makeo/gadomancy/common/utils/RandomizedAspectList.java @@ -19,11 +19,11 @@ public class RandomizedAspectList extends AspectList { private static final Random RANDOM = new Random(); private Map aspectMap = new HashMap(); - private long lastRandomization = 0; - private boolean halfCap = false; + private long lastRandomization; + private boolean halfCap; public RandomizedAspectList addAspectRandomBase(Aspect aspect, int amount) { - aspectMap.put(aspect, amount); + this.aspectMap.put(aspect, amount); return this; } @@ -33,52 +33,52 @@ public class RandomizedAspectList extends AspectList { } private void checkRandomization() { - if((System.currentTimeMillis() - lastRandomization) > 500) { + if((System.currentTimeMillis() - this.lastRandomization) > 500) { super.aspects.clear(); - for(Aspect a : aspectMap.keySet()) { + for(Aspect a : this.aspectMap.keySet()) { if(a == null) continue; int am; - if(halfCap) { - int c = aspectMap.get(a); - am = (c / 2) + RANDOM.nextInt(c / 2); + if(this.halfCap) { + int c = this.aspectMap.get(a); + am = (c / 2) + RandomizedAspectList.RANDOM.nextInt(c / 2); } else { - am = RANDOM.nextInt(aspectMap.get(a)); + am = RandomizedAspectList.RANDOM.nextInt(this.aspectMap.get(a)); } if(am > 0) { super.add(a, am); } } - lastRandomization = System.currentTimeMillis(); + this.lastRandomization = System.currentTimeMillis(); } } @Override public Aspect[] getAspects() { - checkRandomization(); + this.checkRandomization(); return super.getAspects(); } @Override public Aspect[] getAspectsSorted() { - checkRandomization(); + this.checkRandomization(); return super.getAspectsSorted(); } @Override public Aspect[] getAspectsSortedAmount() { - checkRandomization(); + this.checkRandomization(); return super.getAspectsSortedAmount(); } @Override public int getAmount(Aspect key) { - checkRandomization(); + this.checkRandomization(); return super.getAmount(key); } @Override public Aspect[] getPrimalAspects() { - checkRandomization(); + this.checkRandomization(); return super.getPrimalAspects(); } diff --git a/src/main/java/makeo/gadomancy/common/utils/Vector3.java b/src/main/java/makeo/gadomancy/common/utils/Vector3.java index 2db8fac..4586cd8 100644 --- a/src/main/java/makeo/gadomancy/common/utils/Vector3.java +++ b/src/main/java/makeo/gadomancy/common/utils/Vector3.java @@ -98,26 +98,26 @@ public class Vector3 { } public double length() { - return Math.sqrt(lengthSquared()); + return Math.sqrt(this.lengthSquared()); } public double lengthSquared() { - return x * x + y * y + z * z; + return this.x * this.x + this.y * this.y + this.z * this.z; } public double distance(Vector3 o) { - return Math.sqrt(distanceSquared(o)); + return Math.sqrt(this.distanceSquared(o)); } public double distanceSquared(Vector3 o) { - double difX = x - o.x; - double difY = y - o.y; - double difZ = z - o.z; + double difX = this.x - o.x; + double difY = this.y - o.y; + double difZ = this.z - o.z; return difX * difX + difY * difY + difZ * difZ; } public float angle(Vector3 other) { - double dot = dot(other) / (length() * other.length()); + double dot = this.dot(other) / (this.length() * other.length()); return (float) Math.acos(dot); } @@ -174,9 +174,9 @@ public class Vector3 { public Vector3 perpendicular() { if (this.z == 0.0D) { - return zCrossProduct(); + return this.zCrossProduct(); } - return xCrossProduct(); + return this.xCrossProduct(); } public Vector3 xCrossProduct() { @@ -213,7 +213,7 @@ public class Vector3 { } public Vector3 normalize() { - double length = length(); + double length = this.length(); this.x /= length; this.y /= length; this.z /= length; @@ -228,11 +228,11 @@ public class Vector3 { } public static Vector3 random() { - return new Vector3(RAND.nextDouble() * (RAND.nextBoolean() ? 1 : -1), RAND.nextDouble() * (RAND.nextBoolean() ? 1 : -1), RAND.nextDouble() * (RAND.nextBoolean() ? 1 : -1)); + return new Vector3(Vector3.RAND.nextDouble() * (Vector3.RAND.nextBoolean() ? 1 : -1), Vector3.RAND.nextDouble() * (Vector3.RAND.nextBoolean() ? 1 : -1), Vector3.RAND.nextDouble() * (Vector3.RAND.nextBoolean() ? 1 : -1)); } public static Vector3 positiveYRandom() { - return random().setY(Math.abs(random().getY())); + return Vector3.random().setY(Math.abs(Vector3.random().getY())); } public static Vector3 fromCC(ChunkCoordinates cc) { @@ -259,7 +259,7 @@ public class Vector3 { } public Vector3 vectorFromHereTo(Vector3 target) { - return new Vector3(target.x - x, target.y - y, target.z - z); + return new Vector3(target.x - this.x, target.y - this.y, target.z - this.z); } public double getX() { @@ -337,7 +337,7 @@ public class Vector3 { } Vector3 other = (Vector3) obj; - return (Math.abs(this.x - other.x) < 1.0E-006D) && (Math.abs(this.y - other.y) < 1.0E-006D) && (Math.abs(this.z - other.z) < 1.0E-006D) && (getClass().equals(obj.getClass())); + return (Math.abs(this.x - other.x) < 1.0E-006D) && (Math.abs(this.y - other.y) < 1.0E-006D) && (Math.abs(this.z - other.z) < 1.0E-006D) && (this.getClass().equals(obj.getClass())); } public int hashCode() { @@ -350,7 +350,7 @@ public class Vector3 { } public Vector3 clone() { - return new Vector3(x, y, z); + return new Vector3(this.x, this.y, this.z); } public String toString() { @@ -425,7 +425,7 @@ public class Vector3 { } public void normalize() { - double d = mag(); + double d = this.mag(); if (d == 0.0D) { return; } @@ -456,7 +456,7 @@ public class Vector3 { } public static Quat aroundAxis(Vector3 axis, double angle) { - return aroundAxis(axis.x, axis.y, axis.z, angle); + return Quat.aroundAxis(axis.x, axis.y, axis.z, angle); } } diff --git a/src/main/java/makeo/gadomancy/common/utils/WandHandler.java b/src/main/java/makeo/gadomancy/common/utils/WandHandler.java index e1bb2b3..4cea380 100644 --- a/src/main/java/makeo/gadomancy/common/utils/WandHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/WandHandler.java @@ -58,19 +58,19 @@ public class WandHandler { if(ModConfig.enableAdditionalNodeTypes) { if (target.equals(Blocks.glass)) { if (ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), "NODEJAR")) { - tryTCJarNodeCreation(i, entityPlayer, world, x, y, z); + WandHandler.tryTCJarNodeCreation(i, entityPlayer, world, x, y, z); } } else if (target.equals(ConfigBlocks.blockWarded)) { if (RegisteredIntegrations.automagy.isPresent() && ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), "ADVNODEJAR")) { - tryAutomagyJarNodeCreation(i, entityPlayer, world, x, y, z); + WandHandler.tryAutomagyJarNodeCreation(i, entityPlayer, world, x, y, z); } } } if(target.equals(ConfigBlocks.blockCrystal)) { if (ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), Gadomancy.MODID.toUpperCase() + ".AURA_CORE")) - tryAuraCoreCreation(i, entityPlayer, world, x, y, z); + WandHandler.tryAuraCoreCreation(i, entityPlayer, world, x, y, z); } } @@ -151,7 +151,7 @@ public class WandHandler { public boolean isValidPieceAt(World world, int absX, int absY, int absZ, EntityPlayer player) { Block block = world.getBlock(absX, absY, absZ); int md = world.getBlockMetadata(absX, absY, absZ); - return containsMatch(false, OreDictionary.getOres("slabWood"), new ItemStack(block, 1, md)); + return WandHandler.containsMatch(false, OreDictionary.getOres("slabWood"), new ItemStack(block, 1, md)); } }; WandHandler.JarPieceEvaluationRunnable glassRunnable = new WandHandler.JarPieceEvaluationRunnable() { @@ -164,10 +164,7 @@ public class WandHandler { @Override public boolean isValidPieceAt(World world, int absX, int absY, int absZ, EntityPlayer player) { TileEntity tile = world.getTileEntity(absX, absY, absZ); - if ((tile == null) || (!(tile instanceof INode)) || ((tile instanceof TileJarNode))) { - return false; - } - return true; + return (tile != null) && (tile instanceof INode) && ((!(tile instanceof TileJarNode))); } }; int[] result = WandHandler.evaluateIfValidJarIsPresent(world, x, y, z, player, slabRunnable, glassRunnable, nodeRunnable); @@ -180,7 +177,7 @@ public class WandHandler { return; if(world.isRemote) return; - replaceJar(world, result[0], result[1], result[2], true); + WandHandler.replaceJar(world, result[0], result[1], result[2], true); } private static void tryAutomagyJarNodeCreation(ItemStack wandStack, EntityPlayer player, World world, int x, int y, int z) { @@ -213,10 +210,7 @@ public class WandHandler { @Override public boolean isValidPieceAt(World world, int absX, int absY, int absZ, EntityPlayer player) { TileEntity tile = world.getTileEntity(absX, absY, absZ); - if ((tile == null) || (!(tile instanceof INode)) || ((tile instanceof TileJarNode))) { - return false; - } - return true; + return (tile != null) && (tile instanceof INode) && ((!(tile instanceof TileJarNode))); } }; int[] result = WandHandler.evaluateIfValidJarIsPresent(world, x, y, z, player, silverWoodRunnable, glassRunnable, nodeRunnable); @@ -229,7 +223,7 @@ public class WandHandler { if(world.isRemote) return; if(!RegisteredIntegrations.automagy.isPresent()) return; - replaceJar(world, result[0], result[1], result[2], false); + WandHandler.replaceJar(world, result[0], result[1], result[2], false); } private static boolean containsMatch(boolean strict, List inputs, ItemStack... targets) { @@ -247,7 +241,7 @@ public class WandHandler { for (int xx = x - 2; xx <= x; xx++) { for (int yy = y - 3; yy <= y; yy++) { for (int zz = z - 2; zz <= z; zz++) { - if (isValidJarAt(world, xx, yy, zz, player, topRunnable, glassRunnable, centerRunnable)) { + if (WandHandler.isValidJarAt(world, xx, yy, zz, player, topRunnable, glassRunnable, centerRunnable)) { return new int[] {xx, yy, zz}; } } @@ -283,7 +277,7 @@ public class WandHandler { for (int xx = 0; xx < 3; xx++) { for (int zz = 0; zz < 3; zz++) { if (blueprint[yy][xx][zz] == 3) { - handleJarForming(world, x, y, z, xx, yy, zz, isThaumcraft); + WandHandler.handleJarForming(world, x, y, z, xx, yy, zz, isThaumcraft); } else { world.setBlockToAir(x + xx, y - yy + 2, z + zz); } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java b/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java index c7fce1d..336af74 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java @@ -50,7 +50,7 @@ public class ChunkProviderTCOuter implements IChunkProvider { } public Chunk loadChunk(int x, int z) { - return provideChunk(x, z); + return this.provideChunk(x, z); } public Chunk provideChunk(int x, int z) { @@ -67,19 +67,19 @@ public class ChunkProviderTCOuter implements IChunkProvider { TCMazeHandler.GEN.chunks.remove(key); - chunk = new Chunk(worldObj, buf.blockData, buf.metaBuffer, x, z); + chunk = new Chunk(this.worldObj, buf.blockData, buf.metaBuffer, x, z); byte[] abyte = chunk.getBiomeArray(); - System.arraycopy(biomeArr, 0, abyte, 0, biomeArr.length); + System.arraycopy(ChunkProviderTCOuter.biomeArr, 0, abyte, 0, ChunkProviderTCOuter.biomeArr.length); for(Integer[] pos : buf.tiles) { - TileEntity te = buf.blockData[pos[3]].createTileEntity(worldObj, buf.metaBuffer[pos[3]]); + TileEntity te = buf.blockData[pos[3]].createTileEntity(this.worldObj, buf.metaBuffer[pos[3]]); if(te != null) { if(te instanceof TileEldritchLock) { te = new TileOverrideEldritchLock(); } - worldObj.addTileEntity(te); + this.worldObj.addTileEntity(te); chunk.func_150812_a(pos[0] & 15, pos[1], pos[2] & 15, te); te.blockMetadata = buf.metaBuffer[pos[3]]; } @@ -147,7 +147,7 @@ public class ChunkProviderTCOuter implements IChunkProvider { if(bufE instanceof FakeWorldTCGeneration.EntityPermItem) { FakeWorldTCGeneration.EntityPermItem i = (FakeWorldTCGeneration.EntityPermItem) bufE; if(((int) i.x >> 4) != x || ((int) i.z >> 4) != z) continue; - EntityPermanentItem item = new EntityPermanentItem(worldObj, i.x, i.y, i.z, i.buffItemStack); + EntityPermanentItem item = new EntityPermanentItem(this.worldObj, i.x, i.y, i.z, i.buffItemStack); item.motionX = 0; item.motionY = 0; item.motionZ = 0; @@ -156,7 +156,7 @@ public class ChunkProviderTCOuter implements IChunkProvider { } else if(bufE instanceof FakeWorldTCGeneration.EntityGuardianBuf) { FakeWorldTCGeneration.EntityGuardianBuf b = (FakeWorldTCGeneration.EntityGuardianBuf) bufE; if(((int) b.x >> 4) != x || ((int) b.z >> 4) != z) continue; - EntityEldritchGuardian guardian = new EntityEldritchGuardian(worldObj); + EntityEldritchGuardian guardian = new EntityEldritchGuardian(this.worldObj); guardian.setPosition(b.x, b.y, b.z); guardian.setHomeArea(b.coordinates.posX, b.coordinates.posY, b.coordinates.posZ, (int) b.dst); chunk.addEntity(guardian); @@ -179,14 +179,14 @@ public class ChunkProviderTCOuter implements IChunkProvider { } } else { - Block[] ablock = new Block[blockArr.length]; - System.arraycopy(blockArr, 0, ablock, 0, blockArr.length); - byte[] meta = new byte[metaArr.length]; - System.arraycopy(metaArr, 0, meta, 0, metaArr.length); + Block[] ablock = new Block[ChunkProviderTCOuter.blockArr.length]; + System.arraycopy(ChunkProviderTCOuter.blockArr, 0, ablock, 0, ChunkProviderTCOuter.blockArr.length); + byte[] meta = new byte[ChunkProviderTCOuter.metaArr.length]; + System.arraycopy(ChunkProviderTCOuter.metaArr, 0, meta, 0, ChunkProviderTCOuter.metaArr.length); chunk = new Chunk(this.worldObj, ablock, meta, x, z); byte[] abyte = chunk.getBiomeArray(); - System.arraycopy(biomeArr, 0, abyte, 0, biomeArr.length); + System.arraycopy(ChunkProviderTCOuter.biomeArr, 0, abyte, 0, ChunkProviderTCOuter.biomeArr.length); } chunk.generateSkylightMap(); @@ -250,19 +250,19 @@ public class ChunkProviderTCOuter implements IChunkProvider { static { blockArr = new Block[32768]; - metaArr = new byte[blockArr.length]; + metaArr = new byte[ChunkProviderTCOuter.blockArr.length]; biomeArr = new byte[16 * 16]; for (int x = 0; x < 16; x++) { for (int z = 0; z < 16; z++) { for (int y = 127; y >= 0; y--) { int index = (x << 4 | z) << 7 | y; - blockArr[index] = null; - metaArr[index] = 0; + ChunkProviderTCOuter.blockArr[index] = null; + ChunkProviderTCOuter.metaArr[index] = 0; } } } - for(int i = 0; i < biomeArr.length; i++) { - biomeArr[i] = (byte) ThaumcraftWorldGenerator.biomeEldritchLands.biomeID; + for(int i = 0; i < ChunkProviderTCOuter.biomeArr.length; i++) { + ChunkProviderTCOuter.biomeArr[i] = (byte) ThaumcraftWorldGenerator.biomeEldritchLands.biomeID; } } } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java index a5eaa0c..1695aad 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java @@ -8,11 +8,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.*; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; @@ -22,12 +18,7 @@ import thaumcraft.common.lib.world.dim.GenCommon; import thaumcraft.common.lib.world.dim.MazeHandler; import thaumcraft.common.lib.world.dim.MazeThread; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** @@ -48,7 +39,7 @@ public class TCMazeHandler { //Our map to work with. public static ConcurrentHashMap labyrinthCopy = new ConcurrentHashMap(); public static final int TELEPORT_LAYER_Y = 55; - private static int tickCounter = 0; + private static int tickCounter; public static final FakeWorldTCGeneration GEN = new FakeWorldTCGeneration(); @@ -58,12 +49,12 @@ public class TCMazeHandler { private static Map watchedBosses = new HashMap(); public static void closeAllSessionsAndCleanup() { - for (EntityPlayer pl : runningSessions.keySet()) { - TCMazeSession session = runningSessions.get(pl); + for (EntityPlayer pl : TCMazeHandler.runningSessions.keySet()) { + TCMazeSession session = TCMazeHandler.runningSessions.get(pl); session.closeSession(false); - watchedBosses.remove(session); + TCMazeHandler.watchedBosses.remove(session); } - init(); + TCMazeHandler.init(); } public static void tick() { @@ -75,14 +66,14 @@ public class TCMazeHandler { List playerObjects = w.playerEntities; for (int i = 0; i < playerObjects.size(); i++) { EntityPlayer player = (EntityPlayer) playerObjects.get(i); - if (!hasOpenSession(player)) { + if (!TCMazeHandler.hasOpenSession(player)) { WorldUtil.tryTeleportBack((EntityPlayerMP) player, 0); ChunkCoordinates cc = out.getSpawnPoint(); int y = out.getTopSolidOrLiquidBlock(cc.posX, cc.posZ); player.setPositionAndUpdate(cc.posX + 0.5, y, cc.posZ + 0.5); } } - Iterator> it = runningSessions.entrySet().iterator(); + Iterator> it = TCMazeHandler.runningSessions.entrySet().iterator(); while(it.hasNext()) { Map.Entry entry = it.next(); EntityPlayer player = entry.getKey(); @@ -110,40 +101,40 @@ public class TCMazeHandler { * Coordinates wanted here are the absolute Portal coordinates. */ public static boolean createSessionWaitForTeleport(EntityPlayer player) { - if (hasOpenSession(player) || !hasFreeSessionSpace()) return false; + if (TCMazeHandler.hasOpenSession(player) || !TCMazeHandler.hasFreeSessionSpace()) return false; WorldServer w = MinecraftServer.getServer().worldServerForDimension(ModConfig.dimOuterId); - reserveSessionSpace(player); - setupSession(player, w); + TCMazeHandler.reserveSessionSpace(player); + TCMazeHandler.setupSession(player, w); return true; } private static void reserveSessionSpace(EntityPlayer player) { - runningSessions.put(player, TCMazeSession.placeholder()); + TCMazeHandler.runningSessions.put(player, TCMazeSession.placeholder()); } private static void setupSession(EntityPlayer player, WorldServer world) { Vec3 currentPos = Vec3.createVectorHelper(player.posX, player.posY, player.posZ); int originDim = player.worldObj.provider.dimensionId; - Map locs = calculateCellLocs(world); + Map locs = TCMazeHandler.calculateCellLocs(world); MazeBuilderThread t = new MazeBuilderThread((EntityPlayerMP) player, locs, originDim, currentPos); t.start(); } private static Map calculateCellLocs(WorldServer world) { ConcurrentHashMap oldDat = MazeHandler.labyrinth; - ConcurrentHashMap bufferOld = new ConcurrentHashMap(labyrinthCopy); - MazeHandler.labyrinth = labyrinthCopy; - int chX = getHighestPossibleRandWH(); //To ensure we're always +x and +z - int chZ = getHighestPossibleRandWH(); - int w = randWH(world.rand); - int h = randWH(world.rand); + ConcurrentHashMap bufferOld = new ConcurrentHashMap(TCMazeHandler.labyrinthCopy); + MazeHandler.labyrinth = TCMazeHandler.labyrinthCopy; + int chX = TCMazeHandler.getHighestPossibleRandWH(); //To ensure we're always +x and +z + int chZ = TCMazeHandler.getHighestPossibleRandWH(); + int w = TCMazeHandler.randWH(world.rand); + int h = TCMazeHandler.randWH(world.rand); while (MazeHandler.mazesInRange(chX, chZ, w, h)) { chX++; //We grow the mazes in +x direction! } MazeThread mt = new MazeThread(chX, chZ, w, h, world.rand.nextLong()); mt.run(); - Map locs = calculateDifferences(bufferOld); - labyrinthCopy = MazeHandler.labyrinth; + Map locs = TCMazeHandler.calculateDifferences(bufferOld); + TCMazeHandler.labyrinthCopy = MazeHandler.labyrinth; MazeHandler.labyrinth = oldDat; return locs; } @@ -160,7 +151,7 @@ public class TCMazeHandler { } private static boolean hasFreeSessionSpace() { - return ModConfig.maxMazeCount == -1 || runningSessions.size() < ModConfig.maxMazeCount; + return ModConfig.maxMazeCount == -1 || TCMazeHandler.runningSessions.size() < ModConfig.maxMazeCount; } /* @@ -176,46 +167,46 @@ public class TCMazeHandler { } public static void init() { - runningSessions = new HashMap(); + TCMazeHandler.runningSessions = new HashMap(); } public static boolean hasOpenSession(EntityPlayer player) { - return !player.worldObj.isRemote && runningSessions.get(player) != null; + return !player.worldObj.isRemote && TCMazeHandler.runningSessions.get(player) != null; } public static void closeSession(EntityPlayer player, boolean teleport) { if (player.worldObj.isRemote) return; - if (runningSessions.containsKey(player)) { - runningSessions.get(player).closeSession(teleport); - runningSessions.remove(player); + if (TCMazeHandler.runningSessions.containsKey(player)) { + TCMazeHandler.runningSessions.get(player).closeSession(teleport); + TCMazeHandler.runningSessions.remove(player); } } public static Map getSessions() { - return runningSessions; + return TCMazeHandler.runningSessions; } public static void free(Map locations) { if (locations == null) return; for (CellLoc loc : locations.keySet()) { - labyrinthCopy.remove(loc); + TCMazeHandler.labyrinthCopy.remove(loc); } } public static void scheduleTick() { - tickCounter++; + TCMazeHandler.tickCounter++; - Iterator it = flaggedSessions.iterator(); + Iterator it = TCMazeHandler.flaggedSessions.iterator(); while(it.hasNext()) { TCMazeSession s = it.next(); it.remove(); s.startSession(); - runningSessions.put(s.player, s); + TCMazeHandler.runningSessions.put(s.player, s); } - if((tickCounter & 15) == 0) { - Iterator> iterator = watchedBosses.entrySet().iterator(); + if((TCMazeHandler.tickCounter & 15) == 0) { + Iterator> iterator = TCMazeHandler.watchedBosses.entrySet().iterator(); labelWhile: while (iterator.hasNext()) { Map.Entry entry = iterator.next(); TCMazeSession session = entry.getKey(); @@ -230,15 +221,15 @@ public class TCMazeHandler { } } - tick(); + TCMazeHandler.tick(); } public static void flagSessionForStart(TCMazeSession session) { - flaggedSessions.add(session); + TCMazeHandler.flaggedSessions.add(session); } public static void putBosses(TCMazeSession session, Entity[] bosses) { - watchedBosses.put(session, bosses); + TCMazeHandler.watchedBosses.put(session, bosses); } public static class MazeBuilderThread extends Thread { @@ -253,20 +244,20 @@ public class TCMazeHandler { this.chunksAffected = chunksAffected; this.originDimId = originDimId; this.originLocation = originLocation; - setName("GadomancyEldritchGen (SERVER/ThreadID=" + getId() + ")"); + this.setName("GadomancyEldritchGen (SERVER/ThreadID=" + this.getId() + ")"); } @Override public void run() { ConcurrentHashMap old = MazeHandler.labyrinth; - MazeHandler.labyrinth = labyrinthCopy; - for (CellLoc l : chunksAffected.keySet()) { - MazeHandler.generateEldritch(GEN, GEN.rand, l.x, l.z); + MazeHandler.labyrinth = TCMazeHandler.labyrinthCopy; + for (CellLoc l : this.chunksAffected.keySet()) { + MazeHandler.generateEldritch(TCMazeHandler.GEN, TCMazeHandler.GEN.rand, l.x, l.z); } MazeHandler.labyrinth = old; if(ModConfig.doLightCalculations) { - for(CellLoc l : chunksAffected.keySet()) { + for(CellLoc l : this.chunksAffected.keySet()) { for(int cX = 0; cX < 16; cX++) { for(int cY = 51; cY < 61; cY++) { for(int cZ = 0; cZ < 16; cZ++) { @@ -277,13 +268,13 @@ public class TCMazeHandler { } } - finishBuild(); + this.finishBuild(); } private void finishBuild() { - TileAdditionalEldritchPortal.informSessionStart(player); - TCMazeSession session = new TCMazeSession(player, chunksAffected, originDimId, originLocation); - flagSessionForStart(session); + TileAdditionalEldritchPortal.informSessionStart(this.player); + TCMazeSession session = new TCMazeSession(this.player, this.chunksAffected, this.originDimId, this.originLocation); + TCMazeHandler.flagSessionForStart(session); } } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java index 6dba915..a8f434b 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java @@ -39,20 +39,20 @@ public class TCMazeSession { this.chunksAffected = locations; this.originDimId = dim; this.originLocation = origin; - this.portalCell = findPortal(); + this.portalCell = this.findPortal(); } TCMazeSession() { - player = null; - chunksAffected = null; - portalCell = null; - originDimId = 0; - originLocation = null; + this.player = null; + this.chunksAffected = null; + this.portalCell = null; + this.originDimId = 0; + this.originLocation = null; } private CellLoc findPortal() { - for(CellLoc loc : chunksAffected.keySet()) { - Short s = chunksAffected.get(loc); + for(CellLoc loc : this.chunksAffected.keySet()) { + Short s = this.chunksAffected.get(loc); Cell c = new Cell(s); if(c.feature == 1) { return loc; @@ -62,17 +62,17 @@ public class TCMazeSession { } final void closeSession(boolean teleport) { - TCMazeHandler.free(chunksAffected); + TCMazeHandler.free(this.chunksAffected); if(teleport) { - WorldUtil.tryTeleportBack(player, originDimId); - player.setPositionAndUpdate(originLocation.xCoord, originLocation.yCoord, originLocation.zCoord); + WorldUtil.tryTeleportBack(this.player, this.originDimId); + this.player.setPositionAndUpdate(this.originLocation.xCoord, this.originLocation.yCoord, this.originLocation.zCoord); } } final void startSession() { WorldServer ws = MinecraftServer.getServer().worldServerForDimension(ModConfig.dimOuterId); - for(CellLoc loc : chunksAffected.keySet()) { + for(CellLoc loc : this.chunksAffected.keySet()) { long k = ChunkCoordIntPair.chunkXZ2Int(loc.x, loc.z); if(ws.theChunkProviderServer.loadedChunkHashMap.containsItem(k)) { Chunk c = (Chunk) ws.theChunkProviderServer.loadedChunkHashMap.getValueByKey(k); @@ -81,16 +81,16 @@ public class TCMazeSession { } } - if(portalCell == null) { + if(this.portalCell == null) { LogManager.getLogger().error("Thaumcraft didn't generate a portal! Stopping instance! PLEASE REPORT THIS ERROR!", new IllegalStateException()); - closeSession(false); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Thaumcraft didn't generate a portal in the Eldritch dimension. Sorry, we can't teleport you..")); + this.closeSession(false); + this.player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Thaumcraft didn't generate a portal in the Eldritch dimension. Sorry, we can't teleport you..")); } else { - WorldUtil.teleportToFakeOuter(player); - int x = portalCell.x * 16 + 8; - int z = portalCell.z * 16 + 8; - player.setPositionAndUpdate(x + 0.5, TCMazeHandler.TELEPORT_LAYER_Y, z + 0.5); - Thaumcraft.proxy.getResearchManager().completeResearch(player, "ENTEROUTER"); //badumm tss + WorldUtil.teleportToFakeOuter(this.player); + int x = this.portalCell.x * 16 + 8; + int z = this.portalCell.z * 16 + 8; + this.player.setPositionAndUpdate(x + 0.5, TCMazeHandler.TELEPORT_LAYER_Y, z + 0.5); + Thaumcraft.proxy.getResearchManager().completeResearch(this.player, "ENTEROUTER"); //badumm tss } } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java index 7f0d0e0..ce8c73a 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java @@ -5,11 +5,7 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.profiler.Profiler; -import net.minecraft.world.EnumDifficulty; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.MinecraftException; -import net.minecraft.world.World; -import net.minecraft.world.WorldProvider; +import net.minecraft.world.*; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.chunk.storage.IChunkLoader; import net.minecraft.world.storage.IPlayerFileData; @@ -30,13 +26,13 @@ public class FakeWorld extends World { public FakeWorld(WorldProvider provider) { super(FakeSaveHandler.instance, "", null, provider, new Profiler()); - theProfiler.profilingEnabled = false; - difficultySetting = EnumDifficulty.NORMAL; + this.theProfiler.profilingEnabled = false; + this.difficultySetting = EnumDifficulty.NORMAL; } public FakeWorld() { super(FakeSaveHandler.instance, "", null, FakeWorldProvider.instance, null); - difficultySetting = EnumDifficulty.NORMAL; + this.difficultySetting = EnumDifficulty.NORMAL; } @Override diff --git a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java index f4f5740..62ec4f4 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java @@ -38,27 +38,25 @@ public class FakeWorldTCGeneration extends FakeWorld { public ChunkMap chunks = new ChunkMap(); public List bufferedEntities = new ArrayList(); public Map gettedTE = new HashMap(); - public int blockCount = 0, blockOverwriteCount = 0; + public int blockCount, blockOverwriteCount; @Override public boolean setBlock(int x, int y, int z, Block block, int meta, int flags) { if(block == ConfigBlocks.blockEldritchPortal) return true; if(block == ConfigBlocks.blockEldritch && (meta == 1 || meta == 2 || meta == 3)) return true; - blockCount++; + this.blockCount++; long chKey = ((long) x >> 4) | ((long) z >> 4) << 32; - ChunkBuffer buf = chunks.get(chKey); + ChunkBuffer buf = this.chunks.get(chKey); int keyX = (x & 15) << 7 << 4; int keyZ = (z & 15) << 7; int key = keyX | keyZ | y; if(buf.blockData[key] != null) { - blockOverwriteCount++; + this.blockOverwriteCount++; ChunkCoordinates cc = new ChunkCoordinates(x, y, z); - if(gettedTE.containsKey(cc)) { - gettedTE.remove(cc); - } + this.gettedTE.remove(cc); } /*if(block == ConfigBlocks.blockEldritchNothing) { @@ -76,7 +74,7 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public boolean setBlockMetadataWithNotify(int x, int y, int z, int metadata, int flags) { long chKey = ((long) x >> 4) | ((long) z >> 4) << 32; - ChunkBuffer buf = chunks.get(chKey); + ChunkBuffer buf = this.chunks.get(chKey); int keyX = (x & 15) << 7 << 4; int keyZ = (z & 15) << 7; int key = keyX | keyZ | y; @@ -88,7 +86,7 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public Block getBlock(int x, int y, int z) { long chKey = ((long) x >> 4) | ((long) z >> 4) << 32; - ChunkBuffer buf = chunks.get(chKey); + ChunkBuffer buf = this.chunks.get(chKey); int keyX = (x & 15) << 7 << 4; int keyZ = (z & 15) << 7; int key = keyX | keyZ | y; @@ -101,7 +99,7 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public int getBlockMetadata(int x, int y, int z) { long chKey = ((long) x >> 4) | ((long) z >> 4) << 32; - ChunkBuffer buf = chunks.get(chKey); + ChunkBuffer buf = this.chunks.get(chKey); int keyX = (x & 15) << 7 << 4; int keyZ = (z & 15) << 7; int key = keyX | keyZ | y; @@ -122,7 +120,7 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public Chunk getChunkFromChunkCoords(int x, int z) { long key = ((long)x) | (((long)z) << 32); - return new FakeChunk(this, x, z, chunks.get(key)); + return new FakeChunk(this, x, z, this.chunks.get(key)); } private static class FakeChunk extends Chunk { @@ -137,7 +135,7 @@ public class FakeWorldTCGeneration extends FakeWorld { public void setLightValue(EnumSkyBlock type, int x, int y, int z, int light) { if(type == EnumSkyBlock.Block) { int key = ((x & 15) << 4 | (z & 15)) << 7 | y; - buf.lightData[key] = light; + this.buf.lightData[key] = light; } } } @@ -145,7 +143,7 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public int getSavedLightValue(EnumSkyBlock type, int x, int y, int z) { if(type == EnumSkyBlock.Block) { - ChunkBuffer buf = chunks.get(((long) x >> 4) | ((long) z >> 4) << 32); + ChunkBuffer buf = this.chunks.get(((long) x >> 4) | ((long) z >> 4) << 32); int keyX = (x & 15) << 7 << 4; int keyZ = (z & 15) << 7; @@ -157,12 +155,12 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public boolean isAirBlock(int x, int y, int z) { - return getBlock(x, y, z) == Blocks.air; + return this.getBlock(x, y, z) == Blocks.air; } @Override public boolean isSideSolid(int x, int y, int z, ForgeDirection side) { - return getBlock(x, y, z).isSideSolid(this, x, y, z, side); + return this.getBlock(x, y, z).isSideSolid(this, x, y, z, side); } @Override @@ -172,10 +170,10 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public TileEntity getTileEntity(int x, int y, int z) { - TileEntity te = getBlock(x, y, z).createTileEntity(null, getBlockMetadata(x, y, z)); + TileEntity te = this.getBlock(x, y, z).createTileEntity(null, this.getBlockMetadata(x, y, z)); if(te == null) return null; ChunkCoordinates cc = new ChunkCoordinates(x, y, z); - if(!gettedTE.containsKey(cc)) gettedTE.put(cc, te); + if(!this.gettedTE.containsKey(cc)) this.gettedTE.put(cc, te); te.setWorldObj(this); te.xCoord = x; te.yCoord = y; @@ -192,9 +190,9 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public boolean spawnEntityInWorld(Entity entity) { if(entity instanceof EntityPermanentItem) { - bufferedEntities.add(new EntityPermItem(entity.posX, entity.posY, entity.posZ, ((EntityPermanentItem) entity).getEntityItem())); + this.bufferedEntities.add(new EntityPermItem(entity.posX, entity.posY, entity.posZ, ((EntityPermanentItem) entity).getEntityItem())); } else if(entity instanceof EntityEldritchGuardian) { - bufferedEntities.add(new EntityGuardianBuf(((EntityEldritchGuardian) entity).getHomePosition(), entity.posX, entity.posY, entity.posZ, ((EntityEldritchGuardian) entity).func_110174_bM())); + this.bufferedEntities.add(new EntityGuardianBuf(((EntityEldritchGuardian) entity).getHomePosition(), entity.posX, entity.posY, entity.posZ, ((EntityEldritchGuardian) entity).func_110174_bM())); } return true; } @@ -254,22 +252,22 @@ public class FakeWorldTCGeneration extends FakeWorld { @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (o == null || this.getClass() != o.getClass()) return false; ChunkBuffer that = (ChunkBuffer) o; - return key == that.key; + return this.key == that.key; } @Override public int hashCode() { - return (int) (key ^ (key >>> 32)); + return (int) (this.key ^ (this.key >>> 32)); } } public static class ChunkMap extends HashMap { @Override public ChunkBuffer get(Object key) { - if(!containsKey(key)) { - put((Long) key, new ChunkBuffer((Long) key)); + if(!this.containsKey(key)) { + this.put((Long) key, new ChunkBuffer((Long) key)); } return super.get(key); } @@ -279,9 +277,9 @@ public class FakeWorldTCGeneration extends FakeWorld { private static TCFakeWorldProvider instance; static { - instance = new TCFakeWorldProvider(); - instance.dimensionId = ModConfig.dimOuterId; - instance.hasNoSky = true; + TCFakeWorldProvider.instance = new TCFakeWorldProvider(); + TCFakeWorldProvider.instance.dimensionId = ModConfig.dimOuterId; + TCFakeWorldProvider.instance.hasNoSky = true; } @Override diff --git a/src/main/java/makeo/gadomancy/coremod/GadomancyCore.java b/src/main/java/makeo/gadomancy/coremod/GadomancyCore.java index 213c8cb..ea9c56b 100644 --- a/src/main/java/makeo/gadomancy/coremod/GadomancyCore.java +++ b/src/main/java/makeo/gadomancy/coremod/GadomancyCore.java @@ -13,7 +13,7 @@ import java.util.Map; *

* Created by makeo @ 07.12.2015 21:17 */ -@IFMLLoadingPlugin.TransformerExclusions({"makeo.gadomancy.coremod"}) +@IFMLLoadingPlugin.TransformerExclusions("makeo.gadomancy.coremod") public class GadomancyCore implements IFMLLoadingPlugin, IFMLCallHook { @Override public Void call() throws Exception { diff --git a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java index c015c38..2a4c956 100644 --- a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java +++ b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java @@ -30,10 +30,10 @@ public class GadomancyTransformer extends AccessTransformer { @Override public byte[] transform(String name, String transformedName, byte[] bytes) { - boolean needsTransform = transformedName.equalsIgnoreCase(NAME_ENCHANTMENT_HELPER) || - transformedName.equalsIgnoreCase(NAME_WANDMANAGER) || transformedName.equalsIgnoreCase(NAME_NODE_RENDERER) - || transformedName.equalsIgnoreCase(NAME_RENDER_EVENT_HANDLER) || transformedName.equals(NAME_NEI_ITEMPANEL) || - transformedName.equalsIgnoreCase(NAME_ENTITY_LIVING_BASE); + boolean needsTransform = transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_ENCHANTMENT_HELPER) || + transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_WANDMANAGER) || transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_NODE_RENDERER) + || transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_RENDER_EVENT_HANDLER) || transformedName.equals(GadomancyTransformer.NAME_NEI_ITEMPANEL) || + transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_ENTITY_LIVING_BASE); if(!needsTransform) return super.transform(name, transformedName, bytes); FMLLog.info("[GadomancyTransformer] Transforming " + name + ": " + transformedName); @@ -42,7 +42,7 @@ public class GadomancyTransformer extends AccessTransformer { ClassReader reader = new ClassReader(bytes); reader.accept(node, 0); - if(transformedName.equalsIgnoreCase(NAME_ENCHANTMENT_HELPER)) { + if(transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_ENCHANTMENT_HELPER)) { for (MethodNode mn : node.methods) { if(mn.name.equals("getFortuneModifier") || mn.name.equals("func_77517_e")) { mn.instructions = new InsnList(); @@ -62,7 +62,7 @@ public class GadomancyTransformer extends AccessTransformer { mn.instructions.add(new InsnNode(Opcodes.IRETURN)); } } - } else if(transformedName.equalsIgnoreCase(NAME_WANDMANAGER)) { + } else if(transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_WANDMANAGER)) { for(MethodNode mn : node.methods) { if(mn.name.equals("getTotalVisDiscount")) { InsnList updateTotal = new InsnList(); @@ -76,7 +76,7 @@ public class GadomancyTransformer extends AccessTransformer { mn.instructions.insertBefore(mn.instructions.get(mn.instructions.size() - 5), updateTotal); } } - } else if(transformedName.equalsIgnoreCase(NAME_NODE_RENDERER)) { + } else if(transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_NODE_RENDERER)) { for (MethodNode mn : node.methods) { if (mn.name.equals("renderTileEntityAt")) { InsnList setBefore = new InsnList(); @@ -101,7 +101,7 @@ public class GadomancyTransformer extends AccessTransformer { } } } - } else if(transformedName.equalsIgnoreCase(NAME_RENDER_EVENT_HANDLER)) { + } else if(transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_RENDER_EVENT_HANDLER)) { for(MethodNode mn : node.methods) { if (mn.name.equals("blockHighlight")) { InsnList setBefore = new InsnList(); @@ -126,7 +126,7 @@ public class GadomancyTransformer extends AccessTransformer { } } } - } else if(transformedName.equalsIgnoreCase(NAME_NEI_ITEMPANEL)) { + } else if(transformedName.equalsIgnoreCase(GadomancyTransformer.NAME_NEI_ITEMPANEL)) { for (MethodNode mn : node.methods) { if(mn.name.equals("updateItemList")) { InsnList newInstructions = new InsnList();