diff options
Diffstat (limited to 'src/main/java/tectech/thing/metaTileEntity/multi')
9 files changed, 29 insertions, 53 deletions
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(); |