diff options
Diffstat (limited to 'src/main/java/tectech')
23 files changed, 61 insertions, 88 deletions
diff --git a/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java b/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java index b779a2c897..8e918fad7e 100644 --- a/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java +++ b/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java @@ -28,7 +28,7 @@ public class InventoryDataPacket extends DataPacket<ItemStack[]> { stacks.add(stack); } } - return stacks.size() > 0 ? stacks.toArray(TTRecipeAdder.nullItem) : null; + return !stacks.isEmpty() ? stacks.toArray(TTRecipeAdder.nullItem) : null; } return null; } diff --git a/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java b/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java index d6182794b7..515812548e 100644 --- a/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java +++ b/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java @@ -48,9 +48,9 @@ public class EnderWorldSavedData extends WorldSavedData { ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); EnderLiquidTagLink = (Map<EnderLinkTag, EnderFluidContainer>) data; - } catch (IOException | ClassNotFoundException ignored) { + } catch (IOException | ClassNotFoundException e) { System.out.println("ENDER_LIQUID_TAG_LINK LOAD FAILED"); - System.out.println(ignored); + e.printStackTrace(); } try { @@ -59,9 +59,9 @@ public class EnderWorldSavedData extends WorldSavedData { ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); EnderLiquidTankLink = (Map<EnderLinkTank, EnderLinkTag>) data; - } catch (IOException | ClassNotFoundException ignored) { + } catch (IOException | ClassNotFoundException e) { System.out.println("ENDER_LIQUID_TANK_LINK LOAD FAILED"); - System.out.println(ignored); + e.printStackTrace(); } } @@ -74,9 +74,9 @@ public class EnderWorldSavedData extends WorldSavedData { oos.flush(); byte[] data = bos.toByteArray(); nbtTagCompound.setByteArray(ENDER_LIQUID_TAG_LINK, data); - } catch (IOException ignored) { + } catch (IOException e) { System.out.println("ENDER_LIQUID_TAG_LINK SAVE FAILED"); - System.out.println(ignored); + e.printStackTrace(); } try { @@ -86,9 +86,9 @@ public class EnderWorldSavedData extends WorldSavedData { oos.flush(); byte[] data = bos.toByteArray(); nbtTagCompound.setByteArray(ENDER_LIQUID_TANK_LINK, data); - } catch (IOException ignored) { + } catch (IOException e) { System.out.println("ENDER_LIQUID_TANK_LINK SAVE FAILED"); - System.out.println(ignored); + e.printStackTrace(); } } diff --git a/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java index 30671dc919..9d891fd3ad 100644 --- a/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -40,11 +40,11 @@ public class EyeOfHarmonyRecipeStorage { private static final long serialVersionUID = -1634011860327553337L; { - ModBlocks.blocks.forEach((dimString, dimBlock) -> { put(dimBlock, dimString); }); + ModBlocks.blocks.forEach((dimString, dimBlock) -> put(dimBlock, dimString)); } }; - private final HashMap<String, EyeOfHarmonyRecipe> recipeHashMap = new HashMap<String, EyeOfHarmonyRecipe>() { + private final HashMap<String, EyeOfHarmonyRecipe> recipeHashMap = new HashMap<>() { private static final long serialVersionUID = -3501819612517400500L; @@ -175,7 +175,7 @@ public class EyeOfHarmonyRecipeStorage { double mainMultiplier = (timeCalculator(10) * (6 * 64)); double probability = 1.0 / validMaterialList.size(); - validMaterialList.forEach((material) -> { processHelper(outputMap, material, mainMultiplier, probability); }); + validMaterialList.forEach((material) -> processHelper(outputMap, material, mainMultiplier, probability)); ArrayList<Pair<Materials, Long>> outputList = new ArrayList<>(); diff --git a/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java b/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java index 5c8b4f6d94..c3b401fb74 100644 --- a/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java +++ b/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java @@ -60,7 +60,7 @@ public class EOHTileEntitySR extends TileEntitySpecialRenderer { if (EOHRenderTile.getOrbitingObjects() != null) { if (EOHRenderTile.getOrbitingObjects() - .size() == 0) { + .isEmpty()) { EOHRenderTile.generateImportantInfo(); } diff --git a/src/main/java/tectech/thing/block/RenderForgeOfGods.java b/src/main/java/tectech/thing/block/RenderForgeOfGods.java index 7a38b253ef..a911ab378f 100644 --- a/src/main/java/tectech/thing/block/RenderForgeOfGods.java +++ b/src/main/java/tectech/thing/block/RenderForgeOfGods.java @@ -37,12 +37,12 @@ public class RenderForgeOfGods extends TileEntitySpecialRenderer { private static ShaderProgram starProgram; private static IModelCustom starModel; - private static float modelNormalize = .0067f * 2; + private static final float modelNormalize = .0067f * 2; private static boolean initialized = false; private static boolean failedInit = false; private static int u_Color = -1, u_ModelMatrix = -1, u_Gamma = -1; - private Matrix4fStack starModelMatrix = new Matrix4fStack(3); + private final Matrix4fStack starModelMatrix = new Matrix4fStack(3); private static ShaderProgram beamProgram; private static int a_VertexID = -1; @@ -52,7 +52,7 @@ public class RenderForgeOfGods extends TileEntitySpecialRenderer { private static int beam_vboID = -1; private static int maxSegments = -1; private static final int beamSegmentQuads = 16; - private static Matrix4fStack beamModelMatrix = new Matrix4fStack(2); + private static final Matrix4fStack beamModelMatrix = new Matrix4fStack(2); private VertexBuffer ringOne, ringTwo, ringThree; // These are nudges/translations for each ring to align with the structure diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java index e226162312..30af3d838b 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java @@ -133,13 +133,12 @@ public class MTEHatchCapacitor extends MTEHatch implements IAddUIWidgets { long tier = -1; long tCurrent = 0; long tEnergyMax = 0; - for (int i = 0; i < mInventory.length; i++) { - if (mInventory[i] == null || mInventory[i].stackSize != 1) { - continue; - } - CapacitorComponent cap = componentBinds.get(TTUtility.getUniqueIdentifier(mInventory[i])); - if (cap != null && cap.tier > tier) { - tier = cap.tier; + for (ItemStack stack : mInventory) { + if (stack != null && stack.stackSize == 1) { + CapacitorComponent cap = componentBinds.get(TTUtility.getUniqueIdentifier(stack)); + if (cap != null && cap.tier > tier) { + tier = cap.tier; + } } } if (tier >= 0) { diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java index 4db38300d4..2532070421 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java @@ -179,7 +179,7 @@ public class MTEHatchDataItemsInput extends MTEHatchDataAccess implements IConne stacks.add(stack); } } - if (stacks.size() > 0) { + if (!stacks.isEmpty()) { this.stacks = stacks.toArray(TTRecipeAdder.nullItem); } } diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java index a9c2ef40cd..bb9be3aa03 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java @@ -258,8 +258,8 @@ public class MTEHatchParamText extends MTEHatchParam { parse(str); return str; } catch (Exception e) { - return widget.getLastText() - .size() > 0 ? widget.getLastText() + return !widget.getLastText() + .isEmpty() ? widget.getLastText() .get(0) : ""; } }) diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java index bf77847d50..4decc0a4a8 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java @@ -190,7 +190,6 @@ public class MTEHatchRack extends MTEHatch implements IAddGregtechLogo, IAddUIWi if (tickingComponents) { if (this.heat > comp.maxHeat) { mInventory[i] = null; - continue; } else if (comp.subZero || this.heat >= 0) { heat += (1f + comp.coolConstant * this.heat / 100000f) * (comp.heatConstant > 0 ? comp.heatConstant * overclock * overvolt * overvolt : -10f); diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java index 0118127670..9bec05fa27 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java @@ -156,7 +156,7 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa @Override @NotNull protected CheckRecipeResult checkProcessing_EM() { - if (eDataAccessHatches.size() > 0 && (eStacksDataOutputs.size() > 0 || eWirelessStacksDataOutputs.size() > 0)) { + if (!eDataAccessHatches.isEmpty() && (!eStacksDataOutputs.isEmpty() || !eWirelessStacksDataOutputs.isEmpty())) { mEUt = -(int) V[slave ? 6 : 4]; eAmpereFlow = 1 + (long) (eStacksDataOutputs.size() + eWirelessStacksDataOutputs.size()) * eDataAccessHatches.size(); @@ -179,7 +179,7 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa } } } - if (stacks.size() > 0) { + if (!stacks.isEmpty()) { ItemStack[] arr = stacks.toArray(TTRecipeAdder.nullItem); for (MTEHatchDataItemsOutput hatch : eStacksDataOutputs) { hatch.q = new InventoryDataPacket(arr); diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java index 238116cdc6..21d175c837 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java @@ -913,21 +913,17 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, // Make sure there are no energy hatches. { - if (mEnergyHatches.size() > 0) { + if (!mEnergyHatches.isEmpty()) { return false; } - if (mExoticEnergyHatches.size() > 0) { + if (!mExoticEnergyHatches.isEmpty()) { return false; } } // Make sure there are 2 input hatches. - if (mInputHatches.size() != 2) { - return false; - } - - return true; + return mInputHatches.size() == 2; } private boolean animationsEnabled = true; diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java index d3ac393927..c26322d11f 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java @@ -343,11 +343,11 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, } // Make sure there are no energy hatches { - if (mEnergyHatches.size() > 0) { + if (!mEnergyHatches.isEmpty()) { return false; } - if (mExoticEnergyHatches.size() > 0) { + if (!mExoticEnergyHatches.isEmpty()) { return false; } } @@ -410,7 +410,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, startRecipeProcessing(); FluidStack[] fluidInHatch = null; boolean fuelDrained = false; - if (mInputHatches != null && mInputHatches.size() != 0) { + if (mInputHatches != null && !mInputHatches.isEmpty()) { fluidInHatch = this.getStoredFluids() .toArray(new FluidStack[0]); } @@ -422,7 +422,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, if (upgrades[29]) { maxModuleCount += 4; } - if (mInputBusses.size() != 0) { + if (!mInputBusses.isEmpty()) { if (internalBattery == 0) { MTEHatchInputBus inputBus = mInputBusses.get(0); ItemStack[] inputBusInventory = inputBus.getRealInventory(); @@ -496,7 +496,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, } // Do module calculations and checks - if (moduleHatches.size() > 0 && internalBattery > 0 && moduleHatches.size() <= maxModuleCount) { + if (!moduleHatches.isEmpty() && internalBattery > 0 && moduleHatches.size() <= maxModuleCount) { for (MTEBaseModule module : moduleHatches) { if (allowModuleConnection(module, this)) { module.connect(); @@ -734,7 +734,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, @Override public void onRemoval() { - if (moduleHatches != null && moduleHatches.size() > 0) { + if (moduleHatches != null && !moduleHatches.isEmpty()) { for (MTEBaseModule module : moduleHatches) { module.disconnect(); } @@ -1404,11 +1404,11 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, private int currentColorCode = 0; private int currentMilestoneBG = 0; private int gravitonShardCost = 0; - private int[][] prereqUpgrades = new int[31][]; + private final int[][] prereqUpgrades = new int[31][]; private int[] followupUpgrades = new int[] {}; private boolean isUpradeSplitStart = false; private boolean doesCurrentUpgradeRequireExtraMats = false; - private boolean[] allPrereqRequired = new boolean[31]; + private final boolean[] allPrereqRequired = new boolean[31]; private boolean[] upgrades = new boolean[31]; private boolean[] materialPaidUpgrades = new boolean[7]; @@ -2347,22 +2347,21 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, IItemHandlerModifiable upgradeMatsHandler = new ItemStackHandler(12); int uniqueItems = inputs.length; for (int i = 0; i < 12; i++) { - int index = i; - int cleanDiv4 = index / 4; + int cleanDiv4 = i / 4; if (i < uniqueItems) { - ItemStack stack = inputs[index]; + ItemStack stack = inputs[i]; if (stack != null) { stack = stack.copy(); stack.stackSize = 1; - upgradeMatsHandler.setStackInSlot(index, stack); + upgradeMatsHandler.setStackInSlot(i, stack); } builder.widget( new DrawableWidget().setDrawable(GTUITextures.BUTTON_STANDARD_PRESSED) - .setPos(5 + cleanDiv4 * 36, 6 + index % 4 * 18) + .setPos(5 + cleanDiv4 * 36, 6 + i % 4 * 18) .setSize(18, 18)); columnList.get(cleanDiv4) .addChild( - new SlotWidget(upgradeMatsHandler, index).setAccess(false, false) + new SlotWidget(upgradeMatsHandler, i).setAccess(false, false) .disableInteraction()); columnList.get(cleanDiv4 + 3) .addChild( @@ -2372,7 +2371,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, } else { builder.widget( new DrawableWidget().setDrawable(GTUITextures.BUTTON_STANDARD_DISABLED) - .setPos(5 + cleanDiv4 * 36, 6 + index % 4 * 18) + .setPos(5 + cleanDiv4 * 36, 6 + i % 4 * 18) .setSize(18, 18)); } } @@ -3275,7 +3274,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, public void reduceBattery(int amount) { if (internalBattery - amount <= 0) { internalBattery = 0; - if (moduleHatches.size() > 0) { + if (!moduleHatches.isEmpty()) { for (MTEBaseModule module : moduleHatches) { module.disconnect(); } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java index 6d7b9d6f0d..f797304fa6 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java @@ -77,7 +77,6 @@ import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. */ -@SuppressWarnings("unchecked") public class MTEResearchStation extends TTMultiblockBase implements ISurvivalConstructable { public static final String machine = "EM Machinery"; diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java index 022408f688..0f7f42ee2e 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java @@ -1,5 +1,6 @@ package tectech.thing.metaTileEntity.multi.base; +import java.util.Arrays; import java.util.function.Supplier; import net.minecraft.util.EnumChatFormatting; @@ -41,9 +42,7 @@ public enum LedStatus { public static LedStatus[] makeArray(int count, LedStatus defaultValue) { LedStatus[] statuses = new LedStatus[count]; - for (int i = 0; i < count; i++) { - statuses[i] = defaultValue; - } + Arrays.fill(statuses, defaultValue); return statuses; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java index 15b08afb5c..d5a3642bf0 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java @@ -18,9 +18,9 @@ public class SoundLoopAnyBlock extends MovingSound { private final boolean stopWhenBlockInactive; private final int worldID; private boolean fadeOut = false; - private int tileX; - private int tileY; - private int tileZ; + private final int tileX; + private final int tileY; + private final int tileZ; private Block blockToTriggerEnd = null; /** diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index 8ee6eb3863..6251dcf1e8 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -1700,9 +1700,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT @Override public List<MTEHatch> getExoticEnergyHatches() { - List<MTEHatch> list = new ArrayList<>(); - list.addAll(eEnergyMulti); - return list; + return new ArrayList<>(eEnergyMulti); } @Override @@ -1858,10 +1856,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return false; } @@ -2006,10 +2000,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return false; } @@ -2019,10 +2009,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return false; } @@ -2611,7 +2597,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT break; } setBackground(texture); - super.draw(partialTicks); GL11.glColor4f(1f, 1f, 1f, 1f); } }.setOnClick((clickData, widget) -> { diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java index c5d546d448..24e570f9b5 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java @@ -270,12 +270,10 @@ public class MTEBaseModule extends TTMultiblockBase { } if (this instanceof MTEExoticModule) { - if (mOutputHatches.size() < 1) { - return false; - } - if (mOutputBusses.size() < 1) { + if (mOutputHatches.isEmpty()) { return false; } + return !mOutputBusses.isEmpty(); } return true; diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java index ee8b5396ad..94c4c1b8fa 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java @@ -91,7 +91,7 @@ public class MTEExoticModule extends MTEBaseModule { List<FluidStack> inputPlasmas = new ArrayList<>(); private GTRecipe plasmaRecipe = null; private BigInteger powerForRecipe = BigInteger.ZERO; - private static RecipeMap<RecipeMapBackend> tempRecipeMap = RecipeMapBuilder.of("godforgeExoticTempRecipeMap") + private static final RecipeMap<RecipeMapBackend> tempRecipeMap = RecipeMapBuilder.of("godforgeExoticTempRecipeMap") .maxIO(0, 0, 7, 2) .disableRegisterNEI() .build(); diff --git a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java index 419c240096..91fdc3e3a1 100644 --- a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java +++ b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java @@ -31,7 +31,7 @@ import tectech.util.CommonValues; public class MTEPipeEnergyMirror extends MTEPipeEnergy { private static Textures.BlockIcons.CustomIcon EMpipe; - private ForgeDirection[] connectedSides = { null, null }; + private final ForgeDirection[] connectedSides = { null, null }; private ForgeDirection chainedFrontFacing = null; private boolean active; diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java index 0a2a8d756e..eaa0b3cb17 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java @@ -41,7 +41,7 @@ public class MTEBuckConverter extends MTETieredMachineBlock implements IAddUIWid private static GTRenderedTexture BUCK, BUCK_ACTIVE; public int EUT = 0, AMP = 0; - private static NumberFormatMUI numberFormat = new NumberFormatMUI(); + private static final NumberFormatMUI numberFormat = new NumberFormatMUI(); public MTEBuckConverter(int aID, String aName, String aNameRegional, int aTier) { super( diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java index a03266ac89..5248cf1b80 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java @@ -273,7 +273,7 @@ public class MTEDebugStructureWriter extends MTETieredMachineBlock implements IA xPos, 40); builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> { size = !size; }) + new ButtonWidget().setOnClick((clickData, widget) -> size = !size) .setBackground(GTUITextures.BUTTON_STANDARD, overlay) .setSize(18, 18) .setPos(xPos, 58)); @@ -283,8 +283,7 @@ public class MTEDebugStructureWriter extends MTETieredMachineBlock implements IA int changeNumberShift, int changeNumber, int xPos, int yPos) { builder.widget( new ButtonWidget() - .setOnClick( - (clickData, widget) -> { setter.accept(clickData.shift ? changeNumberShift : changeNumber); }) + .setOnClick((clickData, widget) -> setter.accept(clickData.shift ? changeNumberShift : changeNumber)) .setBackground(GTUITextures.BUTTON_STANDARD, overlay) .setSize(18, 18) .setPos(xPos, yPos)); diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java index 72547cc613..bdf3e249b9 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java @@ -109,7 +109,7 @@ public class MTEOwnerDetector extends MTETieredMachineBlock { @Override public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { if (aBaseMetaTileEntity.isServerSide()) { - if (uuid == null || uuid.length() == 0) { + if (uuid == null || uuid.isEmpty()) { String name = aBaseMetaTileEntity.getOwnerName(); if (!("Player".equals(name))) { uuid = TecTech.proxy.getUUID(name); diff --git a/src/main/java/tectech/util/StructureVBO.java b/src/main/java/tectech/util/StructureVBO.java index 1e1206d4c9..2b07d06643 100644 --- a/src/main/java/tectech/util/StructureVBO.java +++ b/src/main/java/tectech/util/StructureVBO.java @@ -18,8 +18,8 @@ public class StructureVBO { private String[][] structure; - private HashSet<Character> values = new HashSet<>(); - private HashMap<Character, Pair<Block, Integer>> mapper = new HashMap<>(); + private final HashSet<Character> values = new HashSet<>(); + private final HashMap<Character, Pair<Block, Integer>> mapper = new HashMap<>(); public StructureVBO assignStructure(String[][] structure) { this.structure = structure; |