From e3e6f8996f6281fd7c8165c77dbce05228f7324a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 May 2016 23:08:53 -0500 Subject: [PATCH] Cleanup --- .../vazkii/botania/api/boss/IBotaniaBoss.java | 2 - .../botania/api/corporea/CorporeaRequest.java | 4 +- .../api/internal/DummyMethodHandler.java | 1 - .../api/internal/IInternalMethodHandler.java | 1 - .../api/internal/VanillaPacketDispatcher.java | 1 - .../botania/api/item/IFloatingFlower.java | 2 +- .../botania/api/lexicon/LexiconEntry.java | 4 +- .../api/lexicon/LexiconRecipeMappings.java | 2 +- .../api/lexicon/multiblock/Multiblock.java | 6 +- .../component/MultiblockComponent.java | 2 +- .../botania/api/mana/ManaItemHandler.java | 2 +- .../client/challenge/EnumChallengeLevel.java | 2 +- .../client/core/handler/BossBarHandler.java | 1 - .../handler/CorporeaAutoCompleteHandler.java | 6 +- .../client/core/handler/HUDHandler.java | 1 - .../handler/ItemsRemainingRenderHandler.java | 4 +- .../client/core/handler/LightningHandler.java | 41 ++++++------ .../core/handler/MiscellaneousIcons.java | 2 +- .../client/core/handler/ModelHandler.java | 3 - .../core/handler/MultiblockRenderHandler.java | 2 +- .../client/core/handler/RenderLexicon.java | 10 +-- .../client/core/helper/ShaderHelper.java | 2 +- .../vazkii/botania/client/fx/FXSparkle.java | 11 ++-- .../java/vazkii/botania/client/fx/FXWisp.java | 8 +-- .../client/gui/bag/ContainerFlowerBag.java | 2 +- .../client/gui/bag/InventoryFlowerBag.java | 4 +- .../botania/client/gui/bag/SlotFlower.java | 4 +- .../client/gui/box/ContainerBaubleBox.java | 4 +- .../client/gui/box/InventoryBaubleBox.java | 4 +- .../botania/client/gui/box/SlotAnyBauble.java | 2 +- .../client/gui/lexicon/GuiLexicon.java | 6 +- .../client/gui/lexicon/GuiLexiconIndex.java | 6 +- .../gui/lexicon/button/GuiButtonBookmark.java | 2 +- .../gui/lexicon/button/GuiButtonCategory.java | 8 +-- .../button/GuiButtonChallengeIcon.java | 2 +- .../button/GuiButtonChallengeInfo.java | 2 +- .../gui/lexicon/button/GuiButtonHistory.java | 2 +- .../lexicon/button/GuiButtonInvisible.java | 2 +- .../gui/lexicon/button/GuiButtonNotes.java | 2 +- .../gui/lexicon/button/GuiButtonPage.java | 2 +- .../integration/jei/JEIBotaniaPlugin.java | 1 - .../botania/client/model/ModelAvatar.java | 12 ++-- .../botania/client/model/ModelBellows.java | 14 ++-- .../client/model/ModelBlackHoleCube.java | 24 +++---- .../botania/client/model/ModelBrewery.java | 8 +-- .../client/model/ModelCrystalCube.java | 6 +- .../botania/client/model/ModelHourglass.java | 14 ++-- .../botania/client/model/ModelPixie.java | 6 +- .../botania/client/model/ModelPylonOld.java | 32 ++++----- .../client/model/ModelSpinningCubes.java | 2 +- .../botania/client/model/ModelSpreader.java | 20 +++--- .../client/model/ModelTeruTeruBozu.java | 8 +-- .../botania/client/model/ModelTinyPotato.java | 2 +- .../model/armor/ModelArmorElementium.java | 60 ++++++++--------- .../model/armor/ModelArmorManasteel.java | 38 +++++------ .../model/armor/ModelArmorManaweave.java | 40 +++++------ .../model/armor/ModelArmorTerrasteel.java | 66 +++++++++---------- .../render/entity/RenderDoppleganger.java | 1 - .../render/entity/RenderPinkWither.java | 3 - .../client/render/entity/RenderPixie.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 2 - .../render/tile/RenderTileCorporeaIndex.java | 2 +- .../render/tile/RenderTileFloatingFlower.java | 1 - .../render/tile/RenderTileHourglass.java | 4 +- .../client/render/tile/RenderTilePool.java | 1 - .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileStarfield.java | 4 +- .../render/tile/RenderTileTeruTeruBozu.java | 2 +- .../botania/common/block/BlockCamo.java | 6 -- .../botania/common/block/BlockForestEye.java | 2 +- .../botania/common/block/BlockOpenCrate.java | 2 +- .../botania/common/block/ModFluffBlocks.java | 18 ++--- .../common/block/decor/BlockReeds.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 2 +- .../decor/quartz/BlockSpecialQuartzSlab.java | 2 +- .../block/decor/slabs/Block18StoneSlab.java | 2 +- .../decor/slabs/BlockBiomeStoneSlab.java | 2 +- .../block/decor/slabs/BlockLivingSlab.java | 2 +- .../block/decor/slabs/BlockModSlab.java | 7 +- .../block/decor/slabs/BlockPavementSlab.java | 2 +- .../block/dispenser/BehaviourSeeds.java | 2 +- .../block/subtile/SubTilePureDaisy.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 4 -- .../functional/SubTileJadedAmaranthus.java | 2 +- .../subtile/functional/SubTileOrechid.java | 2 +- .../functional/SubTileRannuncarpus.java | 2 - .../subtile/functional/SubTileSolegnolia.java | 1 - .../functional/SubTileSpectranthemum.java | 1 - .../subtile/generating/SubTileNightshade.java | 5 -- .../common/block/tile/TileAlfPortal.java | 19 +++--- .../botania/common/block/tile/TileCocoon.java | 4 +- .../common/block/tile/TileEnchanter.java | 2 +- .../botania/common/block/tile/TileMod.java | 1 - .../common/block/tile/TilePlatform.java | 1 - .../common/block/tile/TileTinyPlanet.java | 1 - .../corporea/TileCorporeaCrystalCube.java | 1 - .../common/block/tile/mana/TileBellows.java | 16 ++--- .../block/tile/mana/TileDistributor.java | 2 +- .../block/tile/mana/TileManaDetector.java | 1 - .../common/block/tile/mana/TilePool.java | 3 +- .../common/block/tile/mana/TilePrism.java | 1 - .../block/tile/mana/TileRFGenerator.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 9 ++- .../common/core/handler/ConfigHandler.java | 4 +- .../core/handler/InternalMethodHandler.java | 1 - .../common/core/helper/InventoryHelper.java | 4 +- .../core/version/ThreadDownloadMod.java | 2 +- .../common/core/version/VersionChecker.java | 1 - .../recipe/ShapelessManaUpgradeRecipe.java | 2 - .../common/entity/EntityDoppleganger.java | 2 +- .../common/entity/EntityEnderAirBottle.java | 2 +- .../common/entity/EntityFlyingCreature.java | 2 - .../common/entity/EntityManaBurst.java | 4 +- .../common/entity/EntitySignalFlare.java | 1 - .../botania/common/entity/EntitySpark.java | 5 +- .../common/entity/EntityThrowableCopy.java | 2 +- .../common/entity/EntityThrownItem.java | 18 +++-- .../buildcraft/TriggerManaLevel.java | 2 +- .../coloredlights/ColoredLightHelper.java | 6 +- .../corporea/WrappedIInventory.java | 2 +- .../corporea/WrappedStorageDrawers.java | 2 +- .../botania/common/item/ItemCacophonium.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 4 +- .../botania/common/item/ItemLaputaShard.java | 1 - .../botania/common/item/ItemManaGun.java | 2 +- .../botania/common/item/ItemTwigWand.java | 2 +- .../vazkii/botania/common/item/ItemVirus.java | 1 - .../common/item/brew/ItemBrewBase.java | 10 +-- .../armor/manasteel/ItemManasteelArmor.java | 2 +- .../equipment/bauble/ItemBaubleModifier.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 6 +- .../item/equipment/bauble/ItemItemFinder.java | 5 -- .../item/equipment/bauble/ItemMagnetRing.java | 6 +- .../item/equipment/tool/ToolCommons.java | 6 +- .../tool/elementium/ItemElementiumShovel.java | 2 +- .../tool/terrasteel/ItemTerraAxe.java | 15 ++--- .../botania/common/item/lens/ItemLens.java | 7 +- .../botania/common/item/relic/ItemDice.java | 2 - .../common/item/relic/ItemLokiRing.java | 5 +- .../common/item/relic/ItemOdinRing.java | 4 +- .../common/item/relic/ItemRelicBauble.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 3 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../botania/common/item/rod/ItemSmeltRod.java | 2 +- .../botania/common/lexicon/CLexiconEntry.java | 2 +- .../botania/common/lexicon/RLexiconEntry.java | 2 +- .../botania/common/lexicon/page/PageBrew.java | 2 +- .../lexicon/page/PageCraftingRecipe.java | 2 +- .../common/lexicon/page/PageElvenRecipe.java | 2 +- .../common/lexicon/page/PageEntity.java | 2 +- .../common/lexicon/page/PageImage.java | 2 +- .../lexicon/page/PageManaInfusionRecipe.java | 2 +- .../common/lexicon/page/PageMultiblock.java | 4 +- .../common/lexicon/page/PagePetalRecipe.java | 2 +- .../common/lexicon/page/PageShedding.java | 3 +- .../botania/common/lexicon/page/PageText.java | 2 +- .../botania/common/network/PacketHandler.java | 2 - 158 files changed, 393 insertions(+), 477 deletions(-) diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index c8b6bee65..5ba3b5f87 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -11,9 +11,7 @@ package vazkii.botania.api.boss; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.BossInfo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.ShaderCallback; diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java b/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java index b1156e584..576062879 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java @@ -10,8 +10,8 @@ package vazkii.botania.api.corporea; public class CorporeaRequest { - public Object matcher; - public boolean checkNBT; + public final Object matcher; + public final boolean checkNBT; public int count; public int foundItems = 0; public int extractedItems = 0; diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 79dd25db3..48ab9be15 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -25,7 +25,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandlerModifiable; -import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 6224b7f5b..a28793a87 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -26,7 +26,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; -import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index a9aa22a9b..3c7992ea9 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -13,7 +13,6 @@ package vazkii.botania.api.internal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.server.management.PlayerChunkMapEntry; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index 66810c502..b685b8c92 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -23,7 +23,7 @@ public interface IFloatingFlower { public void setIslandType(IslandType type); public class IslandType { - private static HashMap registry = new HashMap<>(); + private static final HashMap registry = new HashMap<>(); public static final IslandType GRASS = new IslandType("GRASS"); public static final IslandType PODZOL = new IslandType("PODZOL"); diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 4d973c9ef..22ad55673 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -28,11 +28,11 @@ public class LexiconEntry implements Comparable { private KnowledgeType type = BotaniaAPI.basicKnowledge; - public List pages = new ArrayList<>(); + public final List pages = new ArrayList<>(); private boolean priority = false; private ItemStack icon = null; - private List extraDisplayedRecipes = new ArrayList<>(); + private final List extraDisplayedRecipes = new ArrayList<>(); /** * @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display. diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 4f525effe..b955cbab6 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -23,7 +23,7 @@ import java.util.Map; */ public final class LexiconRecipeMappings { - private static Map mappings = new HashMap<>(); + private static final Map mappings = new HashMap<>(); /** * Maps the given stack to the given page of the entry. diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index dad7dd155..b37bc101d 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -29,14 +29,14 @@ import java.util.Map; */ public class Multiblock { - public List components = new ArrayList<>(); - public List materials = new ArrayList<>(); + public final List components = new ArrayList<>(); + public final List materials = new ArrayList<>(); public BlockPos minPos = BlockPos.ORIGIN; public BlockPos maxPos = BlockPos.ORIGIN; public BlockPos offPos = BlockPos.ORIGIN; - public HashMap locationCache = new HashMap<>(); + public final HashMap locationCache = new HashMap<>(); /** * Adds a multiblock component to this multiblock. The component's x y z diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 4494bb41c..43859286c 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -27,7 +27,7 @@ public class MultiblockComponent { protected BlockPos relPos; protected final IBlockState state; protected final TileEntity tileEntity; - private boolean doFancyRender; + private final boolean doFancyRender; public MultiblockComponent(BlockPos relPos, IBlockState state) { this(relPos, state, null); diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index d261d5503..6ac31a878 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -145,7 +145,7 @@ public final class ManaItemHandler { if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) continue; - int received = 0; + int received; if(manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot)) received = manaToSend; else received = manaToSend - (manaItemSlot.getMana(stackInSlot) + manaToSend - manaItemSlot.getMaxMana(stackInSlot)); diff --git a/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java b/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java index 8abb8ca4a..5fe690ac9 100644 --- a/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java +++ b/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java @@ -17,7 +17,7 @@ public enum EnumChallengeLevel { HARD("botania.challengelevel.hard"), LUNATIC("botania.challengelevel.lunatic"); - String name; + final String name; private EnumChallengeLevel(String name) { this.name = name; diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index af05aaff5..008b20a7d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -25,7 +25,6 @@ import vazkii.botania.client.lib.LibResources; import java.awt.*; import java.util.Collections; -import java.util.HashSet; import java.util.Set; import java.util.UUID; import java.util.WeakHashMap; diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 7555b313f..dd1a091e6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -40,7 +40,7 @@ public class CorporeaAutoCompleteHandler { private List completions = new ArrayList<>(); private int position; - static TreeSet itemNames = new TreeSet<>(String::compareToIgnoreCase); + static final TreeSet itemNames = new TreeSet<>(String::compareToIgnoreCase); private boolean tabLastTick = false; @@ -165,8 +165,8 @@ public class CorporeaAutoCompleteHandler { private static class CompletionData implements Comparable { - private String string; - private int prefixLength; + private final String string; + private final int prefixLength; public CompletionData(String string, int prefixLength) { this.string = string; diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index a2465c24f..0117408bb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -37,7 +37,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 74521d8ee..0a76127c5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public final class ItemsRemainingRenderHandler { - private static int maxTicks = 30; - private static int leaveTicks = 20; + private static final int maxTicks = 30; + private static final int leaveTicks = 20; private static ItemStack stack; private static int ticks, count; diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 3f23d3ef2..05280e804 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -38,7 +38,6 @@ import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.Iterator; import java.util.Random; import java.util.concurrent.ConcurrentLinkedQueue; @@ -115,7 +114,7 @@ public class LightningHandler { private void renderBolt(LightningBolt bolt, Tessellator tessellator, float partialframe, float cosyaw, float cospitch, float sinyaw, float cossinpitch, int pass, boolean inner) { ParticleRenderDispatcher.lightningCount++; float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge; - float mainalpha = 1; + float mainalpha; if(pass == 0) mainalpha = (1 - boltage) * 0.4F; else mainalpha = 1 - boltage * 0.5F; @@ -173,24 +172,24 @@ public class LightningHandler { public static class LightningBolt { public ArrayList segments = new ArrayList<>(); - public Vector3 start; - public Vector3 end; + public final Vector3 start; + public final Vector3 end; BlockPos target; - TIntIntHashMap splitparents = new TIntIntHashMap(); + final TIntIntHashMap splitparents = new TIntIntHashMap(); - public double length; + public final double length; public int numsegments0; private int numsplits; private boolean finalized; - private Random rand; - public long seed; + private final Random rand; + public final long seed; public int particleAge; - public int particleMaxAge; + public final int particleMaxAge; public boolean isDead; private AxisAlignedBB boundingBox; - private World world; + private final World world; private Entity source; public static final ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); @@ -201,8 +200,8 @@ public class LightningHandler { public static int playerdamage = 1; public static int entitydamage = 1; - public int colorOuter; - public int colorInner; + public final int colorOuter; + public final int colorInner; public static class BoltPoint { @@ -212,9 +211,9 @@ public class LightningHandler { this.offsetvec = offsetvec; } - public Vector3 point; - Vector3 basepoint; - Vector3 offsetvec; + public final Vector3 point; + final Vector3 basepoint; + final Vector3 offsetvec; } private static final Comparator SEGMENT_SORTER = (o1, o2) -> { @@ -274,8 +273,8 @@ public class LightningHandler { return startpoint.point.toString() + " " + endpoint.point.toString(); } - public BoltPoint startpoint; - public BoltPoint endpoint; + public final BoltPoint startpoint; + public final BoltPoint endpoint; public Vector3 diff; @@ -287,10 +286,10 @@ public class LightningHandler { public float sinprev; public float sinnext; - public float light; + public final float light; - public int segmentno; - public int splitno; + public final int segmentno; + public final int splitno; } public LightningBolt(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { @@ -338,7 +337,7 @@ public class LightningHandler { ArrayList oldsegments = segments; segments = new ArrayList<>(); - Segment prev = null; + Segment prev; for(Segment segment : oldsegments) { prev = segment.prev; diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 78660b1e4..1ceb73974 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -63,7 +63,7 @@ public class MiscellaneousIcons { public TextureAtlasSprite[] sparkUpgradeIcons; public TextureAtlasSprite[] kingKeyWeaponIcons; - public Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + public final Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); public TextureAtlasSprite[] tiaraWingIcons; // begin dank_memes diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 4c9d32f92..e841f47d6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -16,11 +16,9 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSkull; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -52,7 +50,6 @@ import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 3fc22e535..4739d80b6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -40,7 +40,7 @@ import vazkii.botania.common.block.ModBlocks; public final class MultiblockRenderHandler { - private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); + private static final MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); private static int dimension; public static boolean rendering = false; diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 7476cc099..b381c73a1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -30,12 +30,12 @@ import vazkii.botania.common.item.ModItems; // Hacky way to render 3D lexicon, will be reevaluated in the future. public class RenderLexicon { - ModelBook model = new ModelBook(); - ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + final ModelBook model = new ModelBook(); + final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); @SubscribeEvent public void renderItem(RenderHandEvent evt) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc; if(true || !ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon)) return; evt.setCanceled(true); @@ -127,8 +127,8 @@ public class RenderLexicon { private void doRender() { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - float opening = 0F; - float pageFlip = 0F; + float opening; + float pageFlip; float ticks = ClientTickHandler.ticksWithLexicaOpen; if(ticks > 0 && ticks < 10) { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index ec768f65c..845211ec2 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -92,7 +92,7 @@ public final class ShaderHelper { // http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL private static int createProgram(String vert, String frag) { - int vertId = 0, fragId = 0, program = 0; + int vertId = 0, fragId = 0, program; if(vert != null) vertId = createShader(vert, VERT); if(frag != null) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index d5feac72b..aa83edf12 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -36,8 +36,8 @@ public class FXSparkle extends Particle { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); - private static Queue queuedRenders = new ArrayDeque<>(); - private static Queue queuedCorruptRenders = new ArrayDeque<>(); + private static final Queue queuedRenders = new ArrayDeque<>(); + private static final Queue queuedCorruptRenders = new ArrayDeque<>(); // Queue values private float f; @@ -212,7 +212,6 @@ public class FXSparkle extends Particle { } if (var21 && 1.0D - var14 < var23) { - var23 = 1.0D - var14; var22 = 5; } @@ -256,9 +255,9 @@ public class FXSparkle extends Particle { public boolean corrupt = false; public boolean fake = false; private int multiplier = 2; - private boolean shrink = true; - public int particle = 16; + private final boolean shrink = true; + public final int particle = 16; public boolean tinkle = false; - public boolean slowdown = true; + public final boolean slowdown = true; public int currentColor = 0; } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index b92693866..a9ae72ac2 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -34,8 +34,8 @@ public class FXWisp extends Particle { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); - private static Queue queuedRenders = new ArrayDeque<>(); - private static Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); + private static final Queue queuedRenders = new ArrayDeque<>(); + private static final Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); // Queue values private float f; @@ -171,8 +171,8 @@ public class FXWisp extends Particle { private boolean depthTest = true; public boolean distanceLimit = true; - private float moteParticleScale; - private int moteHalfLife; + private final float moteParticleScale; + private final int moteHalfLife; public boolean tinkle = false; public int blendmode = 1; } diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index a986d1044..31e7ef8a4 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -21,7 +21,7 @@ import javax.annotation.Nonnull; public class ContainerFlowerBag extends Container { - InventoryFlowerBag flowerBagInv; + final InventoryFlowerBag flowerBagInv; public ContainerFlowerBag(EntityPlayer player) { int i; diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 744ae6f59..f9cab4634 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -26,8 +26,8 @@ public class InventoryFlowerBag implements IInventory { private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; - EntityPlayer player; - int slot; + final EntityPlayer player; + final int slot; ItemStack[] stacks = null; boolean invPushed = false; diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java index ba4c32378..bb40c5c6c 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java +++ b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java @@ -17,8 +17,8 @@ import vazkii.botania.common.block.ModBlocks; public class SlotFlower extends Slot { - InventoryFlowerBag inv; - int color; + final InventoryFlowerBag inv; + final int color; public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) { super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 0cb1ddfbe..e97204586 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -27,8 +27,8 @@ import javax.annotation.Nonnull; public class ContainerBaubleBox extends Container { - InventoryBaubleBox baubleBoxInv; - InventoryBaubles baubles; + final InventoryBaubleBox baubleBoxInv; + final InventoryBaubles baubles; public ContainerBaubleBox(EntityPlayer player) { int i; diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 4a141a872..85539162f 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -26,8 +26,8 @@ public class InventoryBaubleBox implements IInventory { private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; - EntityPlayer player; - int slot; + final EntityPlayer player; + final int slot; ItemStack[] stacks = null; boolean invPushed = false; diff --git a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java index 1999311b5..c721ea054 100644 --- a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java +++ b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java @@ -17,7 +17,7 @@ import vazkii.botania.api.mana.IManaItem; public class SlotAnyBauble extends Slot { - InventoryBaubleBox inv; + final InventoryBaubleBox inv; public SlotAnyBauble(InventoryBaubleBox p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) { super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index b9c3ac3a3..5e0d32170 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -110,8 +110,8 @@ public class GuiLexicon extends GuiScreen { List allCategories; String title; - int guiWidth = 146; - int guiHeight = 180; + final int guiWidth = 146; + final int guiHeight = 180; int left, top; @Override @@ -155,7 +155,7 @@ public class GuiLexicon extends GuiScreen { } else if(isCategoryIndex()) { int categories = allCategories.size(); for(int i = 0; i < categories + 1; i++) { - LexiconCategory category = null; + LexiconCategory category; category = i >= categories ? null : allCategories.get(i); int perline = 5; int x = i % perline; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 78e0e9137..ea6a12b83 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -54,7 +54,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { LexiconEntry currentEntry; float infoTime; - List entriesToDisplay = new ArrayList<>(); + final List entriesToDisplay = new ArrayList<>(); public GuiLexiconIndex() { parent = new GuiLexicon(); @@ -206,8 +206,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { infoTime = Math.max(0, infoTime - timeDelta); if(currentButton != null && infoTime == 0) { - int x = par1 + 10; - int y = par2; + int x; + int y; x = currentButton.xPosition - 20; y = currentButton.yPosition; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 434dcb2b4..cd68ef3ee 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -12,7 +12,7 @@ import java.util.List; public class GuiButtonBookmark extends GuiButtonLexicon { - GuiLexicon gui; + final GuiLexicon gui; public GuiButtonBookmark(int par1, int par2, int par3, GuiLexicon gui, String str) { super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index c3719e801..2bbf672f0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -36,13 +36,13 @@ public class GuiButtonCategory extends GuiButtonLexicon { private static boolean boundStencil = false; - GuiLexicon gui; - private LexiconCategory category; + final GuiLexicon gui; + private final LexiconCategory category; private ResourceLocation resource = null; private float ticksHovered = 0F; - private float time = 12F; + private final float time = 12F; - private ShaderCallback shaderCallback = shader -> { + private final ShaderCallback shaderCallback = shader -> { TextureManager r = Minecraft.getMinecraft().renderEngine; int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch"); int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image"); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 145ebb69a..ae2633e65 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -23,7 +23,7 @@ import java.util.List; public class GuiButtonChallengeIcon extends GuiButtonLexicon { - public Challenge challenge; + public final Challenge challenge; public GuiButtonChallengeIcon(int id, int x, int y, Challenge challenge) { super(id, x, y, 16, 16, ""); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index ecabe2f4d..ffbbc1176 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -21,7 +21,7 @@ import java.util.List; public class GuiButtonChallengeInfo extends GuiButtonLexicon { - GuiLexicon gui; + final GuiLexicon gui; public GuiButtonChallengeInfo(int par1, int par2, int par3, String str, GuiLexicon gui) { super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index 7dc3c1972..ff9d0fb54 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -22,7 +22,7 @@ import java.util.List; public class GuiButtonHistory extends GuiButtonLexicon { - GuiLexicon gui; + final GuiLexicon gui; public GuiButtonHistory(int par1, int par2, int par3, String str, GuiLexicon gui) { super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 69be381b5..156174922 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -30,7 +30,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); - GuiLexiconIndex gui; + final GuiLexiconIndex gui; public ItemStack displayStack = null; public boolean dog = false; float timeHover = 0; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 058404dec..f4ff7e83d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -23,7 +23,7 @@ import java.util.List; public class GuiButtonNotes extends GuiButtonLexicon { - GuiLexicon parent; + final GuiLexicon parent; public GuiButtonNotes(GuiLexicon parent, int id, int x, int y) { super(id, x, y, 11, 11, ""); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 2957d2f65..85b06bf25 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -21,7 +21,7 @@ import java.util.Collections; public class GuiButtonPage extends GuiButtonLexicon { - boolean right; + final boolean right; public GuiButtonPage(int par1, int par2, int par3, boolean right) { super(par1, par2, par3, 18, 10, ""); diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index c1a62ff2c..cc6c64b00 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -33,7 +33,6 @@ import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/model/ModelAvatar.java b/src/main/java/vazkii/botania/client/model/ModelAvatar.java index 934471b34..a3805d704 100644 --- a/src/main/java/vazkii/botania/client/model/ModelAvatar.java +++ b/src/main/java/vazkii/botania/client/model/ModelAvatar.java @@ -15,12 +15,12 @@ import net.minecraft.client.model.ModelRenderer; public class ModelAvatar extends ModelBase { - public ModelRenderer body; - public ModelRenderer rightarm; - public ModelRenderer leftarm; - public ModelRenderer rightleg; - public ModelRenderer leftleg; - public ModelRenderer head; + public final ModelRenderer body; + public final ModelRenderer rightarm; + public final ModelRenderer leftarm; + public final ModelRenderer rightleg; + public final ModelRenderer leftleg; + public final ModelRenderer head; public ModelAvatar() { textureWidth = 32; diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index dcc3d67d2..528518b05 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -16,13 +16,13 @@ import net.minecraft.client.renderer.GlStateManager; public class ModelBellows extends ModelBase { - ModelRenderer Base; - ModelRenderer Top; - ModelRenderer Funnel; - ModelRenderer Pipe; - ModelRenderer Handle1; - ModelRenderer Handle2; - ModelRenderer Handle3; + final ModelRenderer Base; + final ModelRenderer Top; + final ModelRenderer Funnel; + final ModelRenderer Pipe; + final ModelRenderer Handle1; + final ModelRenderer Handle2; + final ModelRenderer Handle3; public ModelBellows() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java index 1c770b3b3..56ff033e7 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java +++ b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java @@ -15,18 +15,18 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelBlackHoleCube extends ModelBase { - public ModelRenderer shape1; - public ModelRenderer shape1_1; - public ModelRenderer shape1_2; - public ModelRenderer shape1_3; - public ModelRenderer shape1_4; - public ModelRenderer shape1_5; - public ModelRenderer shape1_6; - public ModelRenderer shape1_7; - public ModelRenderer shape1_8; - public ModelRenderer shape1_9; - public ModelRenderer shape1_10; - public ModelRenderer shape1_11; + public final ModelRenderer shape1; + public final ModelRenderer shape1_1; + public final ModelRenderer shape1_2; + public final ModelRenderer shape1_3; + public final ModelRenderer shape1_4; + public final ModelRenderer shape1_5; + public final ModelRenderer shape1_6; + public final ModelRenderer shape1_7; + public final ModelRenderer shape1_8; + public final ModelRenderer shape1_9; + public final ModelRenderer shape1_10; + public final ModelRenderer shape1_11; public ModelBlackHoleCube() { textureWidth = 36; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index d43d1fc62..5dfd81659 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -17,10 +17,10 @@ import vazkii.botania.client.render.tile.RenderTileBrewery; public class ModelBrewery extends ModelBase { - ModelRenderer Pole; - ModelRenderer Top; - ModelRenderer Bottom; - ModelRenderer Plate; + final ModelRenderer Pole; + final ModelRenderer Top; + final ModelRenderer Bottom; + final ModelRenderer Plate; public ModelBrewery() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java index 80addf965..d2d1c582e 100644 --- a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java +++ b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java @@ -14,9 +14,9 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; public class ModelCrystalCube extends ModelBase { - public ModelRenderer cube; - public ModelRenderer base1; - public ModelRenderer base2; + public final ModelRenderer cube; + public final ModelRenderer base1; + public final ModelRenderer base2; public ModelCrystalCube() { textureWidth = 48; diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index c51b5bc13..d9c902261 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -19,13 +19,13 @@ import java.awt.*; public class ModelHourglass extends ModelBase { - public ModelRenderer ring; - public ModelRenderer base1; - public ModelRenderer base2; - public ModelRenderer glass1; - public ModelRenderer sand1; - public ModelRenderer glass2; - public ModelRenderer sand2; + public final ModelRenderer ring; + public final ModelRenderer base1; + public final ModelRenderer base2; + public final ModelRenderer glass1; + public final ModelRenderer sand1; + public final ModelRenderer glass2; + public final ModelRenderer sand2; public ModelHourglass() { textureWidth = 48; diff --git a/src/main/java/vazkii/botania/client/model/ModelPixie.java b/src/main/java/vazkii/botania/client/model/ModelPixie.java index 36bfe0277..a4d2ddde4 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPixie.java +++ b/src/main/java/vazkii/botania/client/model/ModelPixie.java @@ -17,9 +17,9 @@ import net.minecraft.util.math.MathHelper; public class ModelPixie extends ModelBase { - ModelRenderer Body; - ModelRenderer LeftWing; - ModelRenderer RightWing; + final ModelRenderer Body; + final ModelRenderer LeftWing; + final ModelRenderer RightWing; public ModelPixie() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java index a6e664923..3c55c446e 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java @@ -16,22 +16,22 @@ import vazkii.botania.api.state.enums.PylonVariant; public class ModelPylonOld extends ModelBase implements IPylonModel { - ModelRenderer crystal1; - ModelRenderer crystal2; - ModelRenderer crystal3; - ModelRenderer crystal4; - ModelRenderer crystal5; - ModelRenderer crystal6; - ModelRenderer crystal7; - ModelRenderer crystal8; - ModelRenderer outside1; - ModelRenderer outside2; - ModelRenderer outside3; - ModelRenderer outside4; - ModelRenderer outside5; - ModelRenderer outside6; - ModelRenderer outside7; - ModelRenderer outside8; + final ModelRenderer crystal1; + final ModelRenderer crystal2; + final ModelRenderer crystal3; + final ModelRenderer crystal4; + final ModelRenderer crystal5; + final ModelRenderer crystal6; + final ModelRenderer crystal7; + final ModelRenderer crystal8; + final ModelRenderer outside1; + final ModelRenderer outside2; + final ModelRenderer outside3; + final ModelRenderer outside4; + final ModelRenderer outside5; + final ModelRenderer outside6; + final ModelRenderer outside7; + final ModelRenderer outside8; public ModelPylonOld() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index 2a68fef4a..0fa96db73 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -19,7 +19,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; public class ModelSpinningCubes extends ModelBase { - ModelRenderer spinningCube; + final ModelRenderer spinningCube; public ModelSpinningCubes() { spinningCube = new ModelRenderer(this, 42, 0); diff --git a/src/main/java/vazkii/botania/client/model/ModelSpreader.java b/src/main/java/vazkii/botania/client/model/ModelSpreader.java index f0f2161db..dc52e7f91 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpreader.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpreader.java @@ -15,16 +15,16 @@ import net.minecraft.client.model.ModelRenderer; public class ModelSpreader extends ModelBase { - ModelRenderer cubeSide1; - ModelRenderer cubeSide2; - ModelRenderer cubeSide3; - ModelRenderer cubeSide4; - ModelRenderer cubeSide5; - ModelRenderer cubeHole1; - ModelRenderer cubeHole2; - ModelRenderer cubeHole3; - ModelRenderer cubeHole4; - ModelRenderer cubeInside; + final ModelRenderer cubeSide1; + final ModelRenderer cubeSide2; + final ModelRenderer cubeSide3; + final ModelRenderer cubeSide4; + final ModelRenderer cubeSide5; + final ModelRenderer cubeHole1; + final ModelRenderer cubeHole2; + final ModelRenderer cubeHole3; + final ModelRenderer cubeHole4; + final ModelRenderer cubeInside; public ModelSpreader() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index 06817df7c..374ef7bfe 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -16,10 +16,10 @@ import net.minecraft.client.model.ModelRenderer; public class ModelTeruTeruBozu extends ModelBase { - public ModelRenderer thread; - public ModelRenderer cloth; - public ModelRenderer happyFace; - public ModelRenderer sadFace; + public final ModelRenderer thread; + public final ModelRenderer cloth; + public final ModelRenderer happyFace; + public final ModelRenderer sadFace; public ModelTeruTeruBozu() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java index 5415f00d0..cfeba1f5a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java +++ b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java @@ -15,7 +15,7 @@ import net.minecraft.client.model.ModelRenderer; public class ModelTinyPotato extends ModelBase { - ModelRenderer potato; + final ModelRenderer potato; public ModelTinyPotato() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 81b1be771..350b8a4b5 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -22,36 +22,36 @@ import javax.annotation.Nonnull; public class ModelArmorElementium extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm1; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer fairy; - public ModelRenderer helmWing1; - public ModelRenderer helmWing2; - public ModelRenderer helmWing3; - public ModelRenderer helmWing4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer wing1; - public ModelRenderer wing2; - public ModelRenderer armLpauldron; - public ModelRenderer wing1_1; - public ModelRenderer wing2_1; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR1; - public ModelRenderer wing1_2; - public ModelRenderer wing2_2; - public ModelRenderer bootL1; - public ModelRenderer wing1_3; - public ModelRenderer wing2_3; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armR; + public final ModelRenderer armL; + public final ModelRenderer belt; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm1; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer fairy; + public final ModelRenderer helmWing1; + public final ModelRenderer helmWing2; + public final ModelRenderer helmWing3; + public final ModelRenderer helmWing4; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer wing1; + public final ModelRenderer wing2; + public final ModelRenderer armLpauldron; + public final ModelRenderer wing1_1; + public final ModelRenderer wing2_1; + public final ModelRenderer legR; + public final ModelRenderer legL; + public final ModelRenderer bootR1; + public final ModelRenderer wing1_2; + public final ModelRenderer wing2_2; + public final ModelRenderer bootL1; + public final ModelRenderer wing1_3; + public final ModelRenderer wing2_3; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index ca237daf4..dce198dd3 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -23,25 +23,25 @@ import javax.annotation.Nonnull; public class ModelArmorManasteel extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm1; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helm5; - public ModelRenderer helm6; - public ModelRenderer helm7; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer legR; - public ModelRenderer legL; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armR; + public final ModelRenderer armL; + public final ModelRenderer belt; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm1; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer helm4; + public final ModelRenderer helm5; + public final ModelRenderer helm6; + public final ModelRenderer helm7; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer armLpauldron; + public final ModelRenderer legR; + public final ModelRenderer legL; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 9030d1851..21cf91296 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -22,26 +22,26 @@ import javax.annotation.Nonnull; public class ModelArmorManaweave extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helmSeam1; - public ModelRenderer helmSeam2; - public ModelRenderer helmSeam3; - public ModelRenderer helmSeam4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer skirtR; - public ModelRenderer skirtL; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armR; + public final ModelRenderer armL; + public final ModelRenderer legR; + public final ModelRenderer legL; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer helm4; + public final ModelRenderer helmSeam1; + public final ModelRenderer helmSeam2; + public final ModelRenderer helmSeam3; + public final ModelRenderer helmSeam4; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer armLpauldron; + public final ModelRenderer skirtR; + public final ModelRenderer skirtL; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 44f3a76fb..6b6df2720 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -22,39 +22,39 @@ import javax.annotation.Nonnull; public class ModelArmorTerrasteel extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armr; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helmLeaf1; - public ModelRenderer helmLeaf2; - public ModelRenderer helmLeaf3; - public ModelRenderer helmLeaf4; - public ModelRenderer helmLeaf5; - public ModelRenderer helmLeaf6; - public ModelRenderer helmbranch1; - public ModelRenderer helmbranch2; - public ModelRenderer helmbranch3; - public ModelRenderer helmbranch4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armRbranch1; - public ModelRenderer armRbranch2; - public ModelRenderer armLpauldron; - public ModelRenderer armLbranch1; - public ModelRenderer armLbranch2; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR1; - public ModelRenderer bootRbranch; - public ModelRenderer bootL2; - public ModelRenderer bootLbranch; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armr; + public final ModelRenderer armL; + public final ModelRenderer belt; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer helm4; + public final ModelRenderer helmLeaf1; + public final ModelRenderer helmLeaf2; + public final ModelRenderer helmLeaf3; + public final ModelRenderer helmLeaf4; + public final ModelRenderer helmLeaf5; + public final ModelRenderer helmLeaf6; + public final ModelRenderer helmbranch1; + public final ModelRenderer helmbranch2; + public final ModelRenderer helmbranch3; + public final ModelRenderer helmbranch4; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer armRbranch1; + public final ModelRenderer armRbranch2; + public final ModelRenderer armLpauldron; + public final ModelRenderer armLbranch1; + public final ModelRenderer armLbranch2; + public final ModelRenderer legR; + public final ModelRenderer legL; + public final ModelRenderer bootR1; + public final ModelRenderer bootRbranch; + public final ModelRenderer bootL2; + public final ModelRenderer bootLbranch; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 72b7bc770..77f2125b2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -17,7 +17,6 @@ import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.internal.ShaderCallback; -import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index da82da2a8..c648ddc2d 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -14,9 +14,6 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.lib.LibResources; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index ea6306d07..6e994257a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; public class RenderPixie extends RenderLiving { - ShaderCallback callback = shader -> { + final ShaderCallback callback = shader -> { // Frag Uniforms int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 8b6a492c4..dc918cd54 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); - ModelBrewery model = new ModelBrewery(); + final ModelBrewery model = new ModelBrewery(); public TileBrewery brewery; @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 8057859fd..a84aae581 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -39,7 +38,6 @@ import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.MethodHandles; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 9de4681a6..6efd32834 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -24,7 +24,7 @@ import javax.annotation.Nonnull; public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); - ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false); + final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false); public static boolean move = true; @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index a00e75634..56d7083f9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.model.FloatingFlowerModel; import javax.annotation.Nonnull; import java.util.Random; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 59ba82aea..236fe9e33 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -26,8 +26,8 @@ import java.util.Random; public class RenderTileHourglass extends TileEntitySpecialRenderer { - ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); - ModelHourglass model = new ModelHourglass(); + final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); + final ModelHourglass model = new ModelHourglass(); @Override public void renderTileEntityAt(@Nonnull TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 3574af857..06b07a256 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.item.EnumDyeColor; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index c5516cec4..bf89a9883 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -25,7 +25,7 @@ import javax.annotation.Nonnull; public class RenderTileRuneAltar extends TileEntitySpecialRenderer { - ModelSpinningCubes cubes = new ModelSpinningCubes(); + final ModelSpinningCubes cubes = new ModelSpinningCubes(); @Override public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index dd9166295..c475a28c7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -32,7 +32,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer DUMMY = PropertyEnum.create("dummy", DummyEnum.class); @@ -84,11 +84,6 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { return Item.getItemFromBlock(getSingleBlock()); } - @Override - public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { - return super.quantityDropped(state, fortune, random); - } - @Override public ItemStack createStackedBlock(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index 2cdc8393d..43eaefc78 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockPavementSlab extends BlockLivingSlab { - int index; + final int index; public BlockPavementSlab(boolean full, EnumDyeColor color, int index) { super(full, ModFluffBlocks.pavement.getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color)); diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index 7545e67d1..c3492adc1 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -23,7 +23,7 @@ import javax.annotation.Nonnull; public class BehaviourSeeds extends BehaviorDefaultDispenseItem { - Block block; + private final Block block; public BehaviourSeeds(Block block) { this.block = block; diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 83eda0309..c239dd854 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -41,7 +41,7 @@ public class SubTilePureDaisy extends SubTileEntity { }; int positionAt = 0; - int[] ticksRemaining = { -1, -1, -1, -1, -1, -1, -1, -1}; + final int[] ticksRemaining = { -1, -1, -1, -1, -1, -1, -1, -1}; @Override public void onUpdate() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index a8fac4453..c267a428e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -40,10 +40,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Set; -import java.util.WeakHashMap; public class SubTileHopperhock extends SubTileFunctional { @@ -110,7 +107,6 @@ public class SubTileHopperhock extends SubTileFunctional { invToPutItemIn = inv.handler; priorityInv = priority; - sideToPutItemIn = dir.getOpposite(); amountToPutIn = availablePut; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index 87d48de6f..71fab2cba 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -26,7 +26,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class SubTileJadedAmaranthus extends SubTileFunctional { private static final int COST = 100; - int RANGE = 4; + final int RANGE = 4; @Override public void onUpdate() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 1bb9c9d45..44ce95006 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -164,7 +164,7 @@ public class SubTileOrechid extends SubTileFunctional { private static class StringRandomItem extends WeightedRandom.Item { - public String s; + public final String s; public StringRandomItem(int par1, String s) { super(par1); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index fb569cc31..43b6bba5e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -26,8 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index a91b73af2..1bb5bf51a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import java.util.Collections; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index c808e2c90..b906047ab 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -17,7 +17,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java index 66351d792..706f6e797 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java @@ -17,11 +17,6 @@ import vazkii.botania.common.lexicon.LexiconData; @PassiveFlower public class SubTileNightshade extends SubTileDaybloom { - @Override - public int getDelayBetweenPassiveGeneration() { - return super.getDelayBetweenPassiveGeneration(); - } - @Override public boolean canGeneratePassively() { return !super.canGeneratePassively() && !supertile.getWorld().isDaytime(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 69c02698c..a92a7059f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import com.google.common.base.Function; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -43,6 +42,7 @@ import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import java.util.function.Function; public class TileAlfPortal extends TileMod { @@ -76,10 +76,10 @@ public class TileAlfPortal extends TileMod { private static final String TAG_STACK = "portalStack"; private static final String TAG_PORTAL_FLAG = "_elvenPortal"; - List stacksIn = new ArrayList<>(); + private final List stacksIn = new ArrayList<>(); public int ticksOpen = 0; - int ticksSinceLastItem = 0; + private int ticksSinceLastItem = 0; private boolean closeNow = false; private boolean hasUnloadedParts = false; @@ -137,7 +137,7 @@ public class TileAlfPortal extends TileMod { continue; ItemStack stack = item.getEntityItem(); - if(stack != null && (!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack)) && !item.getEntityData().hasKey(TAG_PORTAL_FLAG)) { + if((!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack)) && !item.getEntityData().hasKey(TAG_PORTAL_FLAG)) { item.setDead(); addItem(stack); ticksSinceLastItem = 0; @@ -191,7 +191,7 @@ public class TileAlfPortal extends TileMod { return false; } - AxisAlignedBB getPortalAABB() { + private AxisAlignedBB getPortalAABB() { AxisAlignedBB aabb = new AxisAlignedBB(pos.add(-1, 1, 0), pos.add(2, 4, 1)); if(worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.ON_X) aabb = new AxisAlignedBB(pos.add(0, 1, -1), pos.add(1, 4, 2)); @@ -199,14 +199,14 @@ public class TileAlfPortal extends TileMod { return aabb; } - void addItem(ItemStack stack) { + private void addItem(ItemStack stack) { int size = stack.stackSize; stack.stackSize = 1; for(int i = 0; i < size; i++) stacksIn.add(stack.copy()); } - void resolveRecipes() { + private void resolveRecipes() { int i = 0; for(ItemStack stack : stacksIn) { if(stack != null && stack.getItem() instanceof ILexicon) { @@ -228,7 +228,7 @@ public class TileAlfPortal extends TileMod { } } - void spawnItem(ItemStack stack) { + private void spawnItem(ItemStack stack) { EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); item.getEntityData().setBoolean(TAG_PORTAL_FLAG, true); worldObj.spawnEntityInWorld(item); @@ -338,7 +338,8 @@ public class TileAlfPortal extends TileMod { } } - private boolean check2DArray(BlockPos[] positions, IBlockState state, boolean onlyCheckBlock, Function... converters) { + @SafeVarargs + private final boolean check2DArray(BlockPos[] positions, IBlockState state, boolean onlyCheckBlock, Function... converters) { for(BlockPos pos : positions) { for(Function f : converters) if(f != null) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index a5a8933a2..5320fe9f5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -43,9 +43,9 @@ public class TileCocoon extends TileMod { hatch(); } - public void hatch() { + private void hatch() { if(!worldObj.isRemote) { - worldObj.playEvent(2001, pos, Block.getIdFromBlock(getBlockType())); + worldObj.playEvent(2001, pos, Block.getStateId(getBlockType().getStateFromMeta(getBlockMetadata()))); worldObj.setBlockToAir(pos); EntityAgeable entity = null; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 5b3eafcdc..e10d6db4f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -72,7 +72,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { int mana = 0; public ItemStack itemToEnchant = null; - List enchants = new ArrayList<>(); + final List enchants = new ArrayList<>(); private static final BlockPos[] OBSIDIAN_LOCATIONS = { new BlockPos(0, -1, 0), diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index 94dc73cd9..8330eff47 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index ddec5590d..3c4f81190 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import vazkii.botania.api.mana.IManaCollisionGhost; public class TilePlatform extends TileCamo { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 80c46346b..6e5e46c65 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; public class TileTinyPlanet extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 9ef86faf7..e8906d9cb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.model.animation.IAnimationStateMachine; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 4d0732e27..79daa002b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -79,20 +79,20 @@ public class TileBellows extends TileMod { switch (enumfacing) { case WEST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case EAST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case NORTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); break; case SOUTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 4b746c8bf..e9794dcc5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -22,7 +22,7 @@ import java.util.List; public class TileDistributor extends TileMod implements IManaReceiver { - List validPools = new ArrayList<>(); + final List validPools = new ArrayList<>(); @Override public void updateEntity() { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index a88c44f18..b6e21c257 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -14,7 +14,6 @@ import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 5dd4e2e4e..56847a1c4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -66,7 +66,6 @@ import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { @@ -100,7 +99,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt int ticksDoingTransfer = 0; private String inputKey = ""; - private String outputKey = ""; + private final String outputKey = ""; private int ticks = 0; private boolean sendPacket = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 0b4e0e586..f8b790512 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -16,7 +16,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; -import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 4972253eb..74bc605b6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -34,7 +34,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo int mana = 0; // Thanks to skyboy for help with this cuz I'm a noob with RF - private EnumMap receiverCache = new EnumMap<>(EnumFacing.class); + private final EnumMap receiverCache = new EnumMap<>(EnumFacing.class); private boolean deadCache; @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index f65d7f0ef..f05e55fb0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -116,13 +116,13 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, float mmForcedVelocityMultiplier = 1F; String inputKey = ""; - String outputKey = ""; + final String outputKey = ""; // End Map Maker Tags - public static boolean staticRedstone = false; - public static boolean staticDreamwood = false; - public static boolean staticUltra = false; + public static final boolean staticRedstone = false; + public static final boolean staticDreamwood = false; + public static final boolean staticUltra = false; UUID identity; @@ -187,7 +187,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, boolean wasInNetwork = inNetwork; if(!inNetwork && !isInvalid()) { ManaNetworkEvent.addCollector(this); - inNetwork = true; } boolean redstone = false; diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 537c4497c..b35a0e091 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -319,8 +319,8 @@ public final class ConfigHandler { private int lastBuild; private int currentBuild; - private Map> adaptableValues = new HashMap<>(); - private List changes = new ArrayList<>(); + private final Map> adaptableValues = new HashMap<>(); + private final List changes = new ArrayList<>(); public ConfigAdaptor(boolean enabled) { this.enabled = enabled; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 54079f1c3..abe7c233c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -33,7 +33,6 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.BotaniaAPIClient; -import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index fdf59bdcc..a645b373d 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -160,10 +160,10 @@ public class InventoryHelper { public static class GenericInventory implements IInventory { - protected String inventoryTitle; + protected final String inventoryTitle; protected int slotsCount; protected ItemStack[] inventoryContents; - protected boolean isInvNameLocalized; + protected final boolean isInvNameLocalized; public GenericInventory(String name, boolean isInvNameLocalized, int size) { this.isInvNameLocalized = isInvNameLocalized; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 8f0f943e3..9029c4c6a 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -26,7 +26,7 @@ import java.net.URL; public class ThreadDownloadMod extends Thread { - private String fileName; + private final String fileName; private byte[] buffer = new byte[10240]; diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index a25821051..6593d2665 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -15,7 +15,6 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java index 7be988dcd..0ed3c7fdd 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java @@ -12,9 +12,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import vazkii.botania.api.mana.IManaItem; public class ShapelessManaUpgradeRecipe extends ShapelessOreRecipe { public ShapelessManaUpgradeRecipe(ItemStack output, Object... inputs) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 462bcd17f..c9026e397 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -136,7 +136,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private boolean spawnPixies = false; private boolean anyWithArmor = false; - private List playersWhoAttacked = new ArrayList<>(); + private final List playersWhoAttacked = new ArrayList<>(); public EntityPlayer trueKiller = null; private static boolean isPlayingMusic = false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index e11e5467e..71add9d03 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -45,7 +45,7 @@ public class EntityEnderAirBottle extends EntityThrowable { for(BlockPos coords : coordsList) { worldObj.setBlockState(coords, Blocks.END_STONE.getDefaultState()); if(Math.random() < 0.1) - worldObj.playEvent(2001, coords, Block.getIdFromBlock(Blocks.END_STONE)); + worldObj.playEvent(2001, coords, Block.getStateId(Blocks.END_STONE.getDefaultState())); } setDead(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index 2af233082..ffb72fac0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -53,7 +53,6 @@ public class EntityFlyingCreature extends EntityAmbientCreature { float f2 = 0.91F; if (onGround) { - f2 = 0.54600006F; Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); f2 = block.slipperiness * 0.91F; } @@ -63,7 +62,6 @@ public class EntityFlyingCreature extends EntityAmbientCreature { f2 = 0.91F; if (onGround) { - f2 = 0.54600006F; Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); f2 = block.slipperiness * 0.91F; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index bb317befe..1b2b5d347 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -89,12 +89,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float accumulatedManaLoss = 0; boolean fake = false; - Set alreadyCollidedAt = new HashSet<>(); + final Set alreadyCollidedAt = new HashSet<>(); boolean fullManaLastTick = true; UUID shooterIdentity = null; int _ticksExisted = 0; boolean scanBeam = false; - public List propsList = new ArrayList<>(); + public final List propsList = new ArrayList<>(); public EntityManaBurst(World world) { super(world); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 394ef4f4f..b19736686 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index ee306542d..44a2fa50b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -54,10 +54,10 @@ public class EntitySpark extends Entity implements ISparkEntity { public static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); - Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); + final Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); int removeTransferants = 2; - boolean firstTick = false; + final boolean firstTick = false; public EntitySpark(World world) { super(world); @@ -89,7 +89,6 @@ public class EntitySpark extends Entity implements ISparkEntity { allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); if(first) - first = true; Collection transfers = getTransfers(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 42f1a7d3c..3a73143c7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -309,7 +309,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile for (int j = 0; j < 4; ++j) { float f3 = 0.25F; - this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ, new int[0]); + this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ); } f1 = 0.8F; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index e99c26e64..4e802fd32 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -66,27 +66,25 @@ public class EntityThrownItem extends EntityItem { List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; - for (int j = 0; j < list.size(); ++j) - { - Entity entity1 = (Entity)list.get(j); + for (Object aList : list) { + Entity entity1 = (Entity) aList; int pickupDelay; try { pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(this); - } catch (Throwable ignored) { continue; } + } catch (Throwable ignored) { + continue; + } - if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0)) - { + if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0)) { float f = 1.0F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); RayTraceResult RayTraceResult1 = axisalignedbb.calculateIntercept(vec3, vec31); - if (RayTraceResult1 != null) - { + if (RayTraceResult1 != null) { double d1 = vec3.distanceTo(RayTraceResult1.hitVec); - if (d1 < d0 || d0 == 0.0D) - { + if (d1 < d0 || d0 == 0.0D) { entity = entity1; d0 = d1; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 1f6bd7d50..462527a7e 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -23,7 +23,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal FULL }; - private State state; + private final State state; public TriggerManaLevel(State state) { this.state = state; diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java index 6fda3e7fc..d60697f2f 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java @@ -25,9 +25,9 @@ public class ColoredLightHelper { // Begin API Copypasta // https://github.com/CptSpaceToaster/CptsModdingLight/blob/1.7.2/src/main/java/coloredlightscore/src/api/CLApi.java - public static int r[] = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 }; - public static int g[] = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 }; - public static int b[] = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 }; + public static final int[] r = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 }; + public static final int[] g = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 }; + public static final int[] b = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 }; public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) { // Clamp color channels diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 710ccd8c9..af10215bb 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -20,7 +20,7 @@ import java.util.List; public class WrappedIInventory extends WrappedInventoryBase{ - private InvWithLocation inv; + private final InvWithLocation inv; private WrappedIInventory(InvWithLocation inv, ICorporeaSpark spark) { this.inv = inv; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index f9dedec9b..19973269b 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -28,7 +28,7 @@ import java.util.List; */ public class WrappedStorageDrawers extends WrappedInventoryBase { - private IDrawerGroup invRaw; + private final IDrawerGroup invRaw; private WrappedStorageDrawers(IDrawerGroup inv, ICorporeaSpark spark) { this.invRaw = inv; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index b9b40cf9c..210b71bc3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -61,7 +61,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity instanceof EntityLiving) { EntityLiving living = (EntityLiving) entity; - String sound = null; + String sound; try { if(living instanceof EntityCreeper) sound = "creeper.primed"; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index a2079b934..6fcd2b2a5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -37,11 +37,9 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Random; import java.util.Set; @@ -247,7 +245,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { private final Random rand; private final IBlockState stateToSet; - private BlockPos startCoords; + private final BlockPos startCoords; private int ticksExisted = 0; /** diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 66c79a0e0..dddbc7c92 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -134,7 +134,6 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet IBlockState state = world.getBlockState(pos_); Block block = state.getBlock(); if(!block.isAir(state, world, pos_) && !block.isReplaceable(world, pos_) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, pos_)) && state.getBlockHardness(world, pos_) != -1) { - int id = Block.getIdFromBlock(block); TileEntity tile = world.getTileEntity(pos_); if(tile != null) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 058894c8e..783b72684 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -224,7 +224,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { int pos = getClipPos(par1ItemStack); addStringToTooltip(I18n.format("botaniamisc.hasClip"), par3List); for(int i = 0; i < CLIP_SLOTS; i++) { - String name = ""; + String name; TextFormatting formatting = i == pos ? TextFormatting.GREEN : TextFormatting.GRAY; ItemStack lensAt = getLensAtPos(par1ItemStack, i); if(lensAt == null) diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 1b78fcc36..1e4524afc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -132,7 +132,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { TileEntity tile = par3World.getTileEntity(pos); boolean bindable = tile instanceof IWandBindable; - boolean wanded = false; + boolean wanded; if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, pos, side)) { if(boundTile.equals(pos)) setBoundTile(par1ItemStack, UNBOUND_POS); diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 3e4d3cc31..1ec70b110 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -17,7 +17,6 @@ import net.minecraft.entity.ai.attributes.AbstractAttributeMap; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.entity.passive.HorseArmorType; import net.minecraft.entity.passive.HorseType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index e7804c02c..88d896190 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -49,11 +49,11 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; - private String name; - private String texName; - private int swigs; - private int drinkSpeed; - private ItemStack baseItem; + private final String name; + private final String texName; + private final int swigs; + private final int drinkSpeed; + private final ItemStack baseItem; public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) { super(name); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 94145f2fc..8423c9f9e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -55,7 +55,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan private static final String TAG_PHANTOM_INK = "phantomInk"; protected Map models = null; - public EntityEquipmentSlot type; + public final EntityEquipmentSlot type; public ItemManasteelArmor(EntityEquipmentSlot type, String name) { this(type, name, BotaniaAPI.manasteelArmorMaterial); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java index 5e45e0070..c0e27d830 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; public abstract class ItemBaubleModifier extends ItemBauble { - Multimap attributes = HashMultimap.create(); + final Multimap attributes = HashMultimap.create(); public ItemBaubleModifier(String name) { super(name); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 3f9490fa8..374c4556f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -68,8 +68,8 @@ import java.util.List; public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender, ICraftAchievement { - private static ResourceLocation textureHud = new ResourceLocation(LibResources.GUI_HUD_ICONS); - private static ResourceLocation textureHalo = new ResourceLocation(LibResources.MISC_HALO); + private static final ResourceLocation textureHud = new ResourceLocation(LibResources.GUI_HUD_ICONS); + private static final ResourceLocation textureHalo = new ResourceLocation(LibResources.MISC_HALO); private static final String TAG_FLYING = "flying"; private static final String TAG_TIME_LEFT = "timeLeft"; @@ -131,7 +131,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub // Might as well be called sugar given it's not secure at all :D String salt(String str) { - str = str += "wowsuchsaltmuchsecurityverywow"; + str = str + "wowsuchsaltmuchsecurityverywow"; SecureRandom rand = new SecureRandom(str.getBytes()); int l = str.length(); int steps = rand.nextInt(l); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 177c7312d..6f0df1577 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -24,10 +24,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.AnimalChest; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -39,8 +37,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fml.common.FMLLog; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; @@ -52,7 +48,6 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibObfuscation; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index e8c57eac5..b39ea6b84 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; +import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.IItemPropertyGetter; @@ -37,16 +38,15 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.util.Arrays; import java.util.List; public class ItemMagnetRing extends ItemBauble { private static final String TAG_COOLDOWN = "cooldown"; - private static final List BLACKLIST = Arrays.asList(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); + private static final List BLACKLIST = ImmutableList.of(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); - final int range; + private final int range; public ItemMagnetRing() { this(LibItemNames.MAGNET_RING, 6); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index b123734e0..44a922aff 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -36,9 +36,9 @@ import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; public final class ToolCommons { - public static Material[] materialsPick = new Material[]{ Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL }; - public static Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; - public static Material[] materialsAxe = new Material[]{ Material.CORAL, Material.LEAVES, Material.PLANTS, Material.WOOD, Material.GOURD }; + public static final Material[] materialsPick = new Material[]{ Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL }; + public static final Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; + public static final Material[] materialsAxe = new Material[]{ Material.CORAL, Material.LEAVES, Material.PLANTS, Material.WOOD, Material.GOURD }; public static void damageItem(ItemStack stack, int dmg, EntityLivingBase entity, int manaPerDamage) { int manaToRequest = dmg * manaPerDamage; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java index 3180e6ef8..2f41b7764 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java @@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumShovel extends ItemManasteelShovel { - public static Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; + public static final Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; public ItemElementiumShovel() { super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_SHOVEL); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 2944fc613..b8c2b44e9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -38,11 +38,9 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.PriorityQueue; import java.util.Set; @@ -77,7 +75,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); + private static final TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); @@ -163,14 +161,13 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * @param steps The range of the block swapper, in blocks. * @param leaves If true, will treat leaves specially (see the BlockSwapper * documentation). - * @return The created block swapper. */ - private static BlockSwapper addBlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, int steps, boolean leaves) { + private static void addBlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, int steps, boolean leaves) { BlockSwapper swapper = new BlockSwapper(world, player, stack, origCoords, steps, leaves); // Block swapper registration should only occur on the server if(world.isRemote) - return swapper; + return; // If the mapping for this dimension doesn't exist, create it. int dim = world.provider.getDimension(); @@ -179,8 +176,6 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker // Add the swapper blockSwappers.get(dim).add(swapper); - - return swapper; } /** @@ -239,13 +234,13 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker /** * The priority queue of all possible candidates for swapping. */ - private PriorityQueue candidateQueue; + private final PriorityQueue candidateQueue; /** * The set of already swaps coordinates which do not have * to be revisited. */ - private Set completedCoords; + private final Set completedCoords; /** * Creates a new block swapper with the provided parameters. diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index e9e58a0a6..06df18f17 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -82,8 +82,8 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens private static final int[] props = new int[SUBTYPES]; private static final Lens[] lenses = new Lens[SUBTYPES]; - private static Lens fallbackLens = new Lens(); - private static Lens stormLens = new LensStorm(); + private static final Lens fallbackLens = new Lens(); + private static final Lens stormLens = new LensStorm(); static { setProps(NORMAL, PROP_NONE); @@ -244,9 +244,8 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return ItemNBTHelper.getInt(stack, TAG_COLOR, -1); } - public static ItemStack setLensColor(ItemStack stack, int color) { + public static void setLensColor(ItemStack stack, int color) { ItemNBTHelper.setInt(stack, TAG_COLOR, color); - return stack; } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index edcac7ddb..c845baf6b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -30,8 +30,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; public class ItemDice extends ItemRelic { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 9a70fceaa..8d703eccf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -147,11 +147,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); boolean dispose = breaker.disposeOfTrashBlocks(stack); - for(int i = 0; i < cursors.size(); i++) { - BlockPos coords = cursors.get(i); + for (BlockPos coords : cursors) { IBlockState state = world.getBlockState(coords); breaker.breakOtherBlock(player, stack, coords, coords, side); - ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, state.getBlock(), new Material[] { state.getMaterial() }, silk, fortune, state.getBlockHardness(world, coords), dispose); + ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, state.getBlock(), new Material[]{state.getMaterial()}, silk, fortune, state.getBlockHardness(world, coords), dispose); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index d333d37ea..ad7e66e41 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -33,9 +33,9 @@ import java.util.List; public class ItemOdinRing extends ItemRelicBauble { - private static List damageNegations = new ArrayList<>(); + private static final List damageNegations = new ArrayList<>(); - private Multimap attributes = HashMultimap.create(); + private final Multimap attributes = HashMultimap.create(); public ItemOdinRing() { super(LibItemNames.ODIN_RING); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 1986873ba..977c7dabf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -30,7 +30,7 @@ import java.util.UUID; public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; - private ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff + private final ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff @Override protected boolean shouldRegister() { return false; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 11401445f..c8add78c8 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -364,10 +364,9 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return ItemNBTHelper.getInt(stack, TAG_BLOCK_META, 0); } - private boolean setTargetBlock(ItemStack stack, Block block, int meta) { + private void setTargetBlock(ItemStack stack, Block block, int meta) { ItemNBTHelper.setString(stack, TAG_TARGET_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_TARGET_BLOCK_META, meta); - return true; } public static String getTargetBlockName(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index d03caedeb..369f03b31 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -191,7 +191,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(stack != null && stack.getItem() == ModItems.gravityRod) { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); ItemNBTHelper.getDouble(stack, TAG_DIST, -1); - Entity item = null; + Entity item; if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { Entity taritem = player.worldObj.getEntityByID(targetID); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index b0fdb825c..62e5a49c7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -137,7 +137,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } static class SmeltData { - public RayTraceResult pos; + public final RayTraceResult pos; public int progress; public SmeltData(RayTraceResult pos, int progress) { diff --git a/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java index 6a200cbff..f7920c3fc 100644 --- a/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java @@ -16,7 +16,7 @@ import vazkii.botania.common.lib.LibMisc; public class CLexiconEntry extends BLexiconEntry implements IAddonEntry { - String mod; + final String mod; public CLexiconEntry(String unlocalizedName, LexiconCategory category, String mod) { super(unlocalizedName, category); diff --git a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java index 9d05978ad..f2757fce5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java @@ -20,7 +20,7 @@ import vazkii.botania.api.lexicon.LexiconCategory; public class RLexiconEntry extends BLexiconEntry { - Achievement a; + final Achievement a; public RLexiconEntry(String unlocalizedName, LexiconCategory category, Achievement a) { super(unlocalizedName, category); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 1288b2f62..c7e324b3b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -32,7 +32,7 @@ import java.util.List; public class PageBrew extends PageRecipe implements ITwoNamedPage { - RecipeBrew recipe; + final RecipeBrew recipe; String text; public PageBrew(RecipeBrew recipe, String unlocalizedName, String bottomText) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index baec81940..40776c448 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -40,7 +40,7 @@ public class PageCraftingRecipe extends PageRecipe { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); - List recipes; + final List recipes; int ticksElapsed = 0; int recipeAt = 0; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 26850d841..8f84d67e0 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -27,7 +27,7 @@ public class PageElvenRecipe extends PageRecipe { private static final ResourceLocation elvenTradeOverlay = new ResourceLocation(LibResources.GUI_ELVEN_TRADE_OVERLAY); - List recipes; + final List recipes; int ticksElapsed = 0; int recipeAt = 0; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 16b274f9c..89d17e710 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -30,7 +30,7 @@ public class PageEntity extends LexiconPage{ Entity dummyEntity; int relativeMouseX, relativeMouseY; boolean tooltipEntity; - int size; + final int size; Constructor entityConstructor; public PageEntity(String unlocalizedName, String entity, int size) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index 1abcf4474..2dae4ee89 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -23,7 +23,7 @@ import vazkii.botania.api.lexicon.LexiconPage; public class PageImage extends LexiconPage { - ResourceLocation resource; + final ResourceLocation resource; public PageImage(String unlocalizedName, String resource) { super(unlocalizedName); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index ada3dae29..882ee8161 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -45,7 +45,7 @@ public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); - private List recipes; + private final List recipes; private int ticksElapsed = 0; private int recipeAt = 0; private final ItemStack renderStack; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java index 50bff1a54..793170b0d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -41,8 +41,8 @@ public class PageMultiblock extends LexiconPage { private static final ResourceLocation multiblockOverlay = new ResourceLocation(LibResources.GUI_MULTIBLOCK_OVERLAY); GuiButton button; - MultiblockSet set; - Multiblock mb; + final MultiblockSet set; + final Multiblock mb; int ticksElapsed; public PageMultiblock(String unlocalizedName, MultiblockSet set) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 8319ed722..854a98a2f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -39,7 +39,7 @@ public class PagePetalRecipe extends PageRecipe { private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); - List recipes; + final List recipes; int ticksElapsed = 0; int recipeAt = 0; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 380897e20..0e7ba0d54 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -40,7 +40,7 @@ public class PageShedding extends PageEntity { private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY); - ItemStack shedStack; + final ItemStack shedStack; ItemStack tooltipStack; boolean tooltipEntry; @@ -94,7 +94,6 @@ public class PageShedding extends PageEntity { if(tooltipEntry) { vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.format("botaniamisc.clickToRecipe"))); - tooltipY += 18; } } else if(tooltipEntity) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 40b3fc7ee..38eddeb17 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -57,7 +57,7 @@ public class PageText extends LexiconPage { List> lines = new ArrayList<>(); - String controlCodes = ""; + String controlCodes; for(String s : textEntries) { List words = new ArrayList<>(); String lineStr = ""; diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 89075fdb8..fbc995599 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -2,8 +2,6 @@ package vazkii.botania.common.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.management.PlayerChunkMap; -import net.minecraft.server.management.PlayerChunkMapEntry; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer;