diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java index adf40555..82c5cd1d 100644 --- a/src/main/java/tconstruct/achievements/TAchievements.java +++ b/src/main/java/tconstruct/achievements/TAchievements.java @@ -13,7 +13,7 @@ import tconstruct.util.config.PHConstruct; public class TAchievements { private static AchievementPage achievementsPage; - private static HashMap achievementsList = new HashMap<>(); + private static final HashMap achievementsList = new HashMap<>(); /** * Adds an achievement and registers it, so there is no need to call .registerStat diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index f2a5d893..b01f2339 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -30,7 +30,7 @@ public class TPlayerHandler { /* Player */ // public int hunger; - private ConcurrentHashMap playerStats = new ConcurrentHashMap<>(); + private final ConcurrentHashMap playerStats = new ConcurrentHashMap<>(); @SubscribeEvent public void PlayerLoggedInEvent(PlayerLoggedInEvent event) { @@ -284,7 +284,7 @@ public class TPlayerHandler { private final String serverLocation = "https://dl.dropboxusercontent.com/u/42769935/sticks.txt"; private final int timeout = 1000; - private HashSet stickUsers = new HashSet<>(); + private final HashSet stickUsers = new HashSet<>(); public void buildStickURLDatabase(String location) { URL url; diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 50a1c272..fc0689e1 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -22,7 +22,7 @@ import tconstruct.library.TConstructRegistry; public class Landmine extends MantleBlock { /** The mob type that can trigger this pressure plate. */ - private EnumCreatureType triggerMobType; + private final EnumCreatureType triggerMobType; public Landmine(EnumCreatureType par3EnumCreatureType, Material par4Material) { super(par4Material); diff --git a/src/main/java/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java index 4d990900..e71ec5db 100644 --- a/src/main/java/tconstruct/client/CustomBowRenderer.java +++ b/src/main/java/tconstruct/client/CustomBowRenderer.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.*; public class CustomBowRenderer implements IItemRenderer { Minecraft mc = Minecraft.getMinecraft(); - private RenderBlocks renderBlocksInstance = new RenderBlocks(); + private final RenderBlocks renderBlocksInstance = new RenderBlocks(); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { diff --git a/src/main/java/tconstruct/client/CustomFont.java b/src/main/java/tconstruct/client/CustomFont.java index 1dad2859..a5bdddfa 100644 --- a/src/main/java/tconstruct/client/CustomFont.java +++ b/src/main/java/tconstruct/client/CustomFont.java @@ -18,11 +18,11 @@ import org.lwjgl.opengl.GL11; */ public class CustomFont { private int texID; - private int[] xPos; - private int[] yPos; - private int startChar; - private int endChar; - private FontMetrics metrics; + private final int[] xPos; + private final int[] yPos; + private final int startChar; + private final int endChar; + private final FontMetrics metrics; /** * Instantiates the font, filling in default start and end character diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index 85e68174..9a42655b 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -13,7 +13,7 @@ import tconstruct.world.TinkerWorld; @SideOnly(Side.CLIENT) public class ExplosiveRender extends Render { - private RenderBlocks blockRenderer = new RenderBlocks(); + private final RenderBlocks blockRenderer = new RenderBlocks(); public ExplosiveRender() { this.shadowSize = 0.5F; diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index 3bdb5b1a..67e70366 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -19,10 +19,10 @@ import tconstruct.tools.entity.ArrowEntity; public class ArrowRender extends Render { private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); - private RenderBlocks itemRenderBlocks = new RenderBlocks(); + private final RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ - private Random random = new Random(); + private final Random random = new Random(); public boolean renderWithColor = true; diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 811f981a..17e94c65 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -15,8 +15,8 @@ import tconstruct.tools.entity.ArrowEntity; @SideOnly(Side.CLIENT) @Deprecated public class ArrowRenderCustom extends Render { - private static RenderItem renderer = new RenderItem(); - private Random random = new Random(); + private static final RenderItem renderer = new RenderItem(); + private final Random random = new Random(); public ArrowRenderCustom() {} diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index b2bc42d8..11f58bc3 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -21,10 +21,10 @@ import tconstruct.tools.entity.DaggerEntity; public class DaggerRender extends Render { private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); - private RenderBlocks itemRenderBlocks = new RenderBlocks(); + private final RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ - private Random random = new Random(); + private final Random random = new Random(); public boolean renderWithColor = true; diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index 7d9069c8..f530b572 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -16,9 +16,9 @@ import tconstruct.tools.entity.DaggerEntity; @SideOnly(Side.CLIENT) @Deprecated public class DaggerRenderCustom extends Render { - private static RenderItem renderer = new RenderItem(); - private static ToolCoreRenderer toolCoreRenderer = new ToolCoreRenderer(true, true); - private Random random = new Random(); + private static final RenderItem renderer = new RenderItem(); + private static final ToolCoreRenderer toolCoreRenderer = new ToolCoreRenderer(true, true); + private final Random random = new Random(); public DaggerRenderCustom() { this.shadowSize = 0.15F; diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index 0e24583e..86232b0e 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -13,8 +13,8 @@ import tconstruct.tools.entity.LaunchedPotion; @SideOnly(Side.CLIENT) public class LaunchedItemRender extends Render { - private Item field_94151_a; - private int field_94150_f; + private final Item field_94151_a; + private final int field_94150_f; public LaunchedItemRender(Item par1Item, int par2) { this.field_94151_a = par1Item; diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 308baec2..7a854b59 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -13,7 +13,7 @@ import net.minecraft.network.play.client.C0DPacketCloseWindow; import net.minecraftforge.client.event.GuiScreenEvent; public class TabRegistry { - private static ArrayList tabList = new ArrayList<>(); + private static final ArrayList tabList = new ArrayList<>(); public static void registerTab(AbstractTab tab) { tabList.add(tab); @@ -38,7 +38,7 @@ public class TabRegistry { } } - private static Minecraft mc = FMLClientHandler.instance().getClient(); + private static final Minecraft mc = FMLClientHandler.instance().getClient(); public static void openInventoryGui() { mc.thePlayer.sendQueue.addToSendQueue(new C0DPacketCloseWindow(mc.thePlayer.openContainer.windowId)); diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index e1013ee9..53e91c5e 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -22,8 +22,8 @@ public class TProxyCommon implements IGuiHandler { return null; } - private static HashMap serverGuiHandlers = new HashMap<>(); - private static HashMap clientGuiHandlers = new HashMap<>(); + private static final HashMap serverGuiHandlers = new HashMap<>(); + private static final HashMap clientGuiHandlers = new HashMap<>(); public static void registerServerGuiHandler(int gui, IGuiHandler handler) { serverGuiHandlers.put(gui, handler); diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index f1218a78..7cc75ef8 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -345,7 +345,7 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod return tags.getCompoundTag(getBaseTagName()).getInteger("Damage"); } - private DecimalFormat df = new DecimalFormat("##.#"); + private final DecimalFormat df = new DecimalFormat("##.#"); @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 10486d57..25f55836 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -27,8 +27,8 @@ public class TankLayerScan extends LogicComponent { protected ArrayList validAirCoords = new ArrayList<>(); protected CoordTuple returnStone; - private static boolean debug = System.getenv("DBG_MANTLE_TankLayerScan") != null; - private static int MAX_LAYER_RECURSION_DEPTH = System.getProperty("os.arch").equals("amd64") + private static final boolean debug = System.getenv("DBG_MANTLE_TankLayerScan") != null; + private static final int MAX_LAYER_RECURSION_DEPTH = System.getProperty("os.arch").equals("amd64") ? 4000 : 2000; // Recursion causes overflows on 32-bit, so reduce if not 64-bit diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 2a0900dd..98a28651 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -480,7 +480,7 @@ public class AbilityHelper { tags.setInteger("Energy", max - missing); } - private static boolean equalityOverrideLoaded = + private static final boolean equalityOverrideLoaded = Loader.isModLoaded("CoFHCore"); // Mods should be loaded far enough before this is ever initialized public static void breakTool(ItemStack stack, NBTTagCompound tags, Entity entity) { diff --git a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java index 1e10040c..10663d69 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java @@ -13,12 +13,12 @@ import tconstruct.TConstruct; modsRequired = "appliedenergistics2", forced = true) public class TinkerAE2 { - private static List spatialIOLogics = Arrays.asList( + private static final List spatialIOLogics = Arrays.asList( "EssenceExtractorLogic", "GolemPedestalLogic", // TODO What happened to these? "MultiServantLogic"); // TODO Should Mantle handle this? - private static List spatialIOSmelteryLogics = Arrays.asList( + private static final List spatialIOSmelteryLogics = Arrays.asList( "AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", @@ -31,7 +31,7 @@ public class TinkerAE2 { "TankAirLogic", "TowerFurnaceLogic"); - private static List spatialIOToolLogics = Arrays.asList( + private static final List spatialIOToolLogics = Arrays.asList( "CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", diff --git a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java index 953f6d6a..7457db84 100644 --- a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java +++ b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java @@ -7,9 +7,9 @@ import net.minecraft.world.World; import powercrystals.minefactoryreloaded.api.*; public class HarvestableOreBerry implements IFactoryHarvestable { - private Block _sourceBlock; - private Item _berryItem; - private int _metaOffset; + private final Block _sourceBlock; + private final Item _berryItem; + private final int _metaOffset; public HarvestableOreBerry(Block sourceBlock, Item berryItem, int metaOffset) { _sourceBlock = sourceBlock; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index feac1db7..0893ce4a 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -17,7 +17,7 @@ public class RecipeHandlerAlloying extends RecipeHandlerBase { public static final Rectangle OUTPUT_TANK = new Rectangle(118, 9, 18, 32); public class CachedAlloyingRecipe extends CachedBaseRecipe { - private List fluidTanks; + private final List fluidTanks; private int minAmount; public CachedAlloyingRecipe(AlloyMix recipe) { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java index 665e5c95..535187bf 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java @@ -14,8 +14,8 @@ public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase { public static final Rectangle MOLTEN_FLOW_NO_ITEM = new Rectangle(60, 8, 6, 27); public class CachedCastingRecipe extends CachedBaseRecipe { - private List resources; - private FluidTankElement metal; + private final List resources; + private final FluidTankElement metal; private PositionedStack output = null; public CachedCastingRecipe(CastingRecipe recipe) { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index ca755ea8..d659ebcb 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -19,9 +19,9 @@ public class RecipeHandlerMelting extends RecipeHandlerBase { public static final Rectangle MOLTEN_TANK = new Rectangle(115, 20, 18, 18); public class CachedMeltingRecipe extends CachedBaseRecipe { - private PositionedStack input; - private int temperature; - private FluidTankElement output; + private final PositionedStack input; + private final int temperature; + private final FluidTankElement output; public CachedMeltingRecipe(ItemStack input) { this.input = new PositionedStack(input, 28, 21); diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index 4144fa88..a5375993 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -16,9 +16,9 @@ import tconstruct.util.config.PHConstruct; */ public class GlassBlockConnected extends MantleBlock { protected IIcon[] icons = new IIcon[16]; - private boolean shouldRenderSelectionBox = true; + private final boolean shouldRenderSelectionBox = true; protected String folder; - private int renderPass; + private final int renderPass; public GlassBlockConnected(String location, boolean hasAlpha) { super(Material.glass); diff --git a/src/main/java/tconstruct/tools/gui/BattlesignGui.java b/src/main/java/tconstruct/tools/gui/BattlesignGui.java index 2b6f5093..06e73cb9 100644 --- a/src/main/java/tconstruct/tools/gui/BattlesignGui.java +++ b/src/main/java/tconstruct/tools/gui/BattlesignGui.java @@ -13,13 +13,13 @@ import tconstruct.tools.logic.BattlesignLogic; import tconstruct.util.network.SignDataPacket; public class BattlesignGui extends GuiScreen { - private BattlesignLogic battlesign; + private final BattlesignLogic battlesign; private float bgColR = 1F; private float bgColG = 1F; private float bgColB = 1F; - private static ResourceLocation background = new ResourceLocation("tinker:textures/gui/battlesignText.png"); - private String[] text = {"", "", "", "", ""}; + private static final ResourceLocation background = new ResourceLocation("tinker:textures/gui/battlesignText.png"); + private final String[] text = {"", "", "", "", ""}; int currentLine = 0; public BattlesignGui(BattlesignLogic logic) { diff --git a/src/main/java/tconstruct/tools/gui/ChestSlot.java b/src/main/java/tconstruct/tools/gui/ChestSlot.java index 84716f0b..310b7147 100644 --- a/src/main/java/tconstruct/tools/gui/ChestSlot.java +++ b/src/main/java/tconstruct/tools/gui/ChestSlot.java @@ -13,8 +13,8 @@ public class ChestSlot extends Slot { * A Slot, used for adjacent Chest Inventories, that can be disabled. */ public boolean enabled = true; - private int accessSide; - private int visualIndex; + private final int accessSide; + private final int visualIndex; public ChestSlot(IInventory inventory, int index, int visualIndex, int xPosition, int yPosition, int accessSide) { super(inventory, index, xPosition, yPosition); diff --git a/src/main/java/tconstruct/tools/gui/FurnaceGui.java b/src/main/java/tconstruct/tools/gui/FurnaceGui.java index b9d6a857..c32bc921 100644 --- a/src/main/java/tconstruct/tools/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/tools/gui/FurnaceGui.java @@ -13,7 +13,7 @@ import tconstruct.tools.logic.FurnaceLogic; public class FurnaceGui extends GuiContainer { private static final ResourceLocation furnaceGuiTextures = new ResourceLocation("textures/gui/container/furnace.png"); - private FurnaceLogic logic; + private final FurnaceLogic logic; public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace) { super(new FurnaceContainer(inventory, furnace)); diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java index 9d65cbb9..eb89affa 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java @@ -18,7 +18,7 @@ public class GuiButtonTool extends GuiButton { int textureY; public String texture; public ToolGuiElement element; - private ResourceLocation background; // = new + private final ResourceLocation background; // = new // ResourceLocation("tinker", // "textures/gui/armorextended.png"); diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index 0988e434..0508fd5f 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import tconstruct.tools.logic.FurnaceLogic; public class FurnaceContainer extends Container { - private FurnaceLogic furnace; + private final FurnaceLogic furnace; private int lastCookTime; private int lastBurnTime; private int lastItemBurnTime; diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java index 39727056..9914c74e 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java @@ -7,15 +7,15 @@ import net.minecraft.item.ItemStack; public class InventoryCraftingStation extends InventoryCrafting { /** the width of the crafting inventory */ - private int inventoryWidth; + private final int inventoryWidth; /** * Class containing the callbacks for the events on_GUIClosed and * on_CraftMaxtrixChanged. */ - private Container eventHandler; + private final Container eventHandler; - private InventoryLogic logic; + private final InventoryLogic logic; public InventoryCraftingStation(Container par1Container, int size, int height, InventoryLogic logic) { super(par1Container, size, height); diff --git a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java index b83720f0..59c0135a 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java @@ -8,7 +8,7 @@ import tconstruct.library.tools.AbilityHelper; public class SlotCraftingStation extends SlotCrafting { private final IInventory matrix; - private EntityPlayer player; + private final EntityPlayer player; public SlotCraftingStation( EntityPlayer par1EntityPlayer, diff --git a/src/main/java/tconstruct/tools/model/FancyItemRender.java b/src/main/java/tconstruct/tools/model/FancyItemRender.java index 27b5b6b7..5272a51e 100644 --- a/src/main/java/tconstruct/tools/model/FancyItemRender.java +++ b/src/main/java/tconstruct/tools/model/FancyItemRender.java @@ -19,10 +19,10 @@ import org.lwjgl.opengl.*; public class FancyItemRender extends Render { private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png"); - private RenderBlocks itemRenderBlocks = new RenderBlocks(); + private final RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ - private Random random = new Random(); + private final Random random = new Random(); public boolean renderWithColor = true; diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index e75bf433..7c8e7cfe 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -23,7 +23,7 @@ import net.minecraft.network.*; public class PacketPipeline extends MessageToMessageCodec { private EnumMap channels; - private LinkedList> packets = new LinkedList<>(); + private final LinkedList> packets = new LinkedList<>(); private boolean isPostInitialised = false; /** diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java index 5a371534..78066e97 100644 --- a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java +++ b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java @@ -13,15 +13,15 @@ import tconstruct.library.weaponry.IWindup; import tconstruct.util.Reference; public class CrosshairHandler { - private static Minecraft mc = Minecraft.getMinecraft(); + private static final Minecraft mc = Minecraft.getMinecraft(); - private static ResourceLocation crossHairSquare = + private static final ResourceLocation crossHairSquare = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair.png"); - private static ResourceLocation crossHairTip = + private static final ResourceLocation crossHairTip = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair2.png"); - private static ResourceLocation crossHairWeird = + private static final ResourceLocation crossHairWeird = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair3.png"); - private static ResourceLocation crossHairSpike = + private static final ResourceLocation crossHairSpike = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair4.png"); @SubscribeEvent diff --git a/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java b/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java index ba16f2d9..0367221f 100644 --- a/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java @@ -11,7 +11,7 @@ import tconstruct.client.AmmoItemRenderer; import tconstruct.library.weaponry.IWindup; public class ThrowingKnifeRenderer extends AmmoItemRenderer { - private static Minecraft mc = Minecraft.getMinecraft(); + private static final Minecraft mc = Minecraft.getMinecraft(); @Override protected void specialAnimation(ItemRenderType type, ItemStack item) { diff --git a/src/main/java/tconstruct/world/MiningExplosion.java b/src/main/java/tconstruct/world/MiningExplosion.java index c8ccfb14..aba6bf57 100644 --- a/src/main/java/tconstruct/world/MiningExplosion.java +++ b/src/main/java/tconstruct/world/MiningExplosion.java @@ -12,9 +12,9 @@ import net.minecraft.world.*; public class MiningExplosion extends Explosion { World world; - private Random random = new Random(); - private int field_77289_h = 16; - private Map field_77288_k = new HashMap(); + private final Random random = new Random(); + private final int field_77289_h = 16; + private final Map field_77288_k = new HashMap(); public MiningExplosion(World par1World, Entity par2Entity, double par3, double par5, double par7, float par9) { super(par1World, par2Entity, par3, par5, par7, par9); diff --git a/src/main/java/tconstruct/world/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java index 497463bd..375f4a06 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java @@ -27,7 +27,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable { public String[] textureNames; public String[] oreTypes; public int itemMeat; - private int subitems; + private final int subitems; public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes) { super(Material.leaves, false); diff --git a/src/main/java/tconstruct/world/gen/OreberryBushGen.java b/src/main/java/tconstruct/world/gen/OreberryBushGen.java index bf613883..8311d0e5 100644 --- a/src/main/java/tconstruct/world/gen/OreberryBushGen.java +++ b/src/main/java/tconstruct/world/gen/OreberryBushGen.java @@ -8,9 +8,9 @@ import net.minecraft.world.gen.feature.WorldGenerator; public class OreberryBushGen extends WorldGenerator { private Block blockB; - private int metadata; + private final int metadata; int chance; - private Block[] replaceBlocks; + private final Block[] replaceBlocks; public OreberryBushGen(Block block, int meta, int chance) { this( diff --git a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java index 7cf50726..ba1e77eb 100644 --- a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java @@ -15,8 +15,8 @@ import tconstruct.util.config.*; import tconstruct.world.TinkerWorld; public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { - private Block liquidBlock; - private int gelMeta; + private final Block liquidBlock; + private final int gelMeta; int randomness = 2; Random random = new Random(); Block base = TinkerTools.craftedSoil; // Block.dirt.blockID; diff --git a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java index ee7e36af..331086b8 100644 --- a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java @@ -10,15 +10,15 @@ import tconstruct.util.config.PHConstruct; public class SurfaceOreGen extends WorldGenerator { /** The block of the ore to be placed using this generator. */ - private Block minableBlock; + private final Block minableBlock; private int minableBlockMeta = 0; /** The number of blocks to generate. */ - private int numberOfBlocks; + private final int numberOfBlocks; - private Block[] replaceBlocks; - private boolean alterSize; + private final Block[] replaceBlocks; + private final boolean alterSize; public SurfaceOreGen(Block b, int meta, int number, boolean changeSize) { this( diff --git a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java index 529b908d..c2d52f01 100644 --- a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java @@ -20,7 +20,7 @@ public class TerrainGenEventHandler { private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 4, 12, true); private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 5, 30, true); - private static ImmutableCollection EXTRA_ORE_BIOMES = + private static final ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList.of(extremeHills, extremeHillsEdge); @SubscribeEvent diff --git a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java index 9ba31ec3..5a91e92a 100644 --- a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java +++ b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java @@ -10,7 +10,7 @@ import net.minecraft.util.*; import net.minecraft.world.World; public class BarricadeItem extends ItemBlock { - private Block b; + private final Block b; public BarricadeItem(Block b) { super(b); diff --git a/src/main/java/tconstruct/world/model/CrystalRender.java b/src/main/java/tconstruct/world/model/CrystalRender.java index 811db980..b4a9c7ea 100644 --- a/src/main/java/tconstruct/world/model/CrystalRender.java +++ b/src/main/java/tconstruct/world/model/CrystalRender.java @@ -10,7 +10,7 @@ import tconstruct.world.entity.Crystal; @SideOnly(Side.CLIENT) public class CrystalRender extends RenderLiving { /** The creeper model. */ - private ModelBase creeperModel = new CrystalModelSmall(); + private final ModelBase creeperModel = new CrystalModelSmall(); public CrystalRender() { super(new CrystalModelSmall(), 0.5F); diff --git a/src/main/java/tconstruct/world/model/SlimeRender.java b/src/main/java/tconstruct/world/model/SlimeRender.java index 29801bba..68e7d013 100644 --- a/src/main/java/tconstruct/world/model/SlimeRender.java +++ b/src/main/java/tconstruct/world/model/SlimeRender.java @@ -13,7 +13,7 @@ import tconstruct.world.entity.SlimeBase; @SideOnly(Side.CLIENT) public class SlimeRender extends RenderLiving { static final ResourceLocation texture = new ResourceLocation("tinker", "textures/mob/slimeedible.png"); - private ModelBase scaleAmount; + private final ModelBase scaleAmount; public SlimeRender(ModelBase par1ModelBase, ModelBase par2ModelBase, float par3) { super(par1ModelBase, par3);