diff options
Diffstat (limited to 'src/main/java/gregtech/api/util')
16 files changed, 64 insertions, 86 deletions
diff --git a/src/main/java/gregtech/api/util/AssemblyLineUtils.java b/src/main/java/gregtech/api/util/AssemblyLineUtils.java index 22bed1884b..b211432ca5 100644 --- a/src/main/java/gregtech/api/util/AssemblyLineUtils.java +++ b/src/main/java/gregtech/api/util/AssemblyLineUtils.java @@ -259,7 +259,7 @@ public class AssemblyLineUtils { * @return Is this Recipe Hash String valid? */ public static boolean isValidHash(String aHash) { - if (aHash != null && aHash.length() > 0) { + if (aHash != null && !aHash.isEmpty()) { // persistent hash can never be 0 return !aHash.equals("Invalid.Recipe.Hash") && !aHash.equals("Hash.0"); } diff --git a/src/main/java/gregtech/api/util/AveragePerTickCounter.java b/src/main/java/gregtech/api/util/AveragePerTickCounter.java index c9b1275deb..d51b97a6cb 100644 --- a/src/main/java/gregtech/api/util/AveragePerTickCounter.java +++ b/src/main/java/gregtech/api/util/AveragePerTickCounter.java @@ -11,7 +11,7 @@ public class AveragePerTickCounter { * Averages a value over a certain amount of ticks * * @param period amount of ticks to average (20 for 1 second) - * + * */ public AveragePerTickCounter(int period) throws InvalidParameterException { @@ -120,13 +120,13 @@ public class AveragePerTickCounter { .getTickCounter(); } - private ArrayDeque<Measurement> values; - private int period; + private final ArrayDeque<Measurement> values; + private final int period; - private double cachedAverage = 0; + private final double cachedAverage = 0; private boolean isCachedAverageValid = true; - private class Measurement { + private static class Measurement { public int TimestampInWorldTicks; public long Value; diff --git a/src/main/java/gregtech/api/util/GTBaseCrop.java b/src/main/java/gregtech/api/util/GTBaseCrop.java index 2ddf37bbeb..1b8a817a7b 100644 --- a/src/main/java/gregtech/api/util/GTBaseCrop.java +++ b/src/main/java/gregtech/api/util/GTBaseCrop.java @@ -281,10 +281,7 @@ public class GTBaseCrop extends CropCard implements ICropCardInfo { } // return true if it's a block of the material - if (tAssociation.mPrefix == OrePrefixes.block && tAssociation.mMaterial.mMaterial == mBlock) { - return true; - } - return false; + return tAssociation.mPrefix == OrePrefixes.block && tAssociation.mMaterial.mMaterial == mBlock; } @Override diff --git a/src/main/java/gregtech/api/util/GTMusicSystem.java b/src/main/java/gregtech/api/util/GTMusicSystem.java index 362c397e67..48a78faa6f 100644 --- a/src/main/java/gregtech/api/util/GTMusicSystem.java +++ b/src/main/java/gregtech/api/util/GTMusicSystem.java @@ -298,7 +298,7 @@ public final class GTMusicSystem { } static synchronized void onPauseMs(long pauseDurationMs) { - musicSources.forEach((uuid, source) -> { source.startedPlayingAtMs += pauseDurationMs; }); + musicSources.forEach((uuid, source) -> source.startedPlayingAtMs += pauseDurationMs); } } @@ -503,7 +503,7 @@ public final class GTMusicSystem { for (int i = 0; i < baublesSize; i++) { final ItemStack item = baubles.getStackInSlot(i); if (item != null && item.getItem() instanceof ItemWirelessHeadphones headphones) { - final UUID id = headphones.getBoundJukeboxUUID(item); + final UUID id = ItemWirelessHeadphones.getBoundJukeboxUUID(item); if (id != null) { wornHeadphones.add(id); } @@ -594,7 +594,7 @@ public final class GTMusicSystem { // We manipulate server state here, because we've checked this is singleplayer pausing. GTMusicSystem.ServerSystem.onPauseMs(pauseDurationMs); - musicSources.forEach((uuid, source) -> { source.startedPlayingAtMs += pauseDurationMs; }); + musicSources.forEach((uuid, source) -> source.startedPlayingAtMs += pauseDurationMs); activelyPlayingMusic.forEach((uuid, data) -> { data.originalStartTime += pauseDurationMs; data.clientReferenceStartTime += pauseDurationMs; diff --git a/src/main/java/gregtech/api/util/GTOreDictUnificator.java b/src/main/java/gregtech/api/util/GTOreDictUnificator.java index af7f249cec..a9527fc07b 100644 --- a/src/main/java/gregtech/api/util/GTOreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GTOreDictUnificator.java @@ -316,7 +316,7 @@ public class GTOreDictUnificator { ItemStack[] aStacks = {}; if (obj instanceof ItemStack) aStacks = new ItemStack[] { (ItemStack) obj }; else if (obj instanceof ItemStack[]) aStacks = (ItemStack[]) obj; - else if (obj instanceof List) aStacks = (ItemStack[]) ((List<?>) obj).toArray(new ItemStack[0]); + else if (obj instanceof List) aStacks = ((List<?>) obj).toArray(new ItemStack[0]); List<ItemStack> rList = new ArrayList<>(); for (ItemStack aStack : aStacks) { if (aStack == null) continue; diff --git a/src/main/java/gregtech/api/util/GTStructureUtility.java b/src/main/java/gregtech/api/util/GTStructureUtility.java index 2109a7e75b..1ee55ed200 100644 --- a/src/main/java/gregtech/api/util/GTStructureUtility.java +++ b/src/main/java/gregtech/api/util/GTStructureUtility.java @@ -76,7 +76,7 @@ public class GTStructureUtility { Block block = world.getBlock(x, y, z); if (block instanceof BlockFrameBox frameBox) { int meta = world.getBlockMetadata(x, y, z); - Materials material = frameBox.getMaterial(meta); + Materials material = BlockFrameBox.getMaterial(meta); return aFrameMaterial == material; } return false; diff --git a/src/main/java/gregtech/api/util/GTTooltipDataCache.java b/src/main/java/gregtech/api/util/GTTooltipDataCache.java index a26f7a84d8..4b0a7eb396 100644 --- a/src/main/java/gregtech/api/util/GTTooltipDataCache.java +++ b/src/main/java/gregtech/api/util/GTTooltipDataCache.java @@ -54,7 +54,7 @@ public class GTTooltipDataCache { lines.addAll(getAllLines(key + ".extended", args)); // Are extended lines enabled? If so add them to the // lines } - if (lines.size() == 0) { + if (lines.isEmpty()) { lines.add(key); // Fallback in case no lines could be found at all } return new TooltipData( diff --git a/src/main/java/gregtech/api/util/GTUtil.java b/src/main/java/gregtech/api/util/GTUtil.java index 8923bca954..0d226e4827 100644 --- a/src/main/java/gregtech/api/util/GTUtil.java +++ b/src/main/java/gregtech/api/util/GTUtil.java @@ -320,10 +320,10 @@ public class GTUtil { tag.getTagList("mDualInputHatches", Constants.NBT.TAG_COMPOUND), player, dualInputHatches)) { - if (!loadConfigurationFromDataStick( + return loadConfigurationFromDataStick( tag.getTagList("mDualInputHatches", Constants.NBT.TAG_COMPOUND), player, - dualInputHatches)) return false; + dualInputHatches); } return true; diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index 3294b0523d..bb31b86ef0 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -1643,7 +1643,7 @@ public class GTUtility { /** * Move up to maxAmount amount of fluid from source to dest, with optional filtering via allowMove. note that this * filter cannot bypass filtering done by IFluidHandlers themselves. - * + * <p> * this overload will assume the fill side is the opposite of drainSide * * @param source tank to drain from. method become noop if this is null @@ -1892,7 +1892,7 @@ public class GTUtility { tmp = aFluid.getFluid() .getID(); } catch (Exception e) { - System.err.println(e); + e.printStackTrace(); } ItemStack rStack = ItemList.Display_Fluid.getWithDamage(1, tmp); NBTTagCompound tNBT = new NBTTagCompound(); @@ -2903,7 +2903,7 @@ public class GTUtility { ItemStack rStack = copy(aStack); if (isStackInvalid(rStack)) return null; else if (aAmount < 0) aAmount = 0; - rStack.stackSize = (int) aAmount; + rStack.stackSize = aAmount; return rStack; } @@ -3344,7 +3344,7 @@ public class GTUtility { EnumChatFormatting.GOLD + GTUtility.trans("166", "Is valid Beacon Pyramid Material") + EnumChatFormatting.RESET); } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this block's info.§r")); + tList.add("§cAn exception was thrown while fetching this block's info.§r"); if (D1) e.printStackTrace(GTLog.err); } } @@ -3373,7 +3373,7 @@ public class GTUtility { } } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this tile's fluid tank info.§r")); + tList.add("§cAn exception was thrown while fetching this tile's fluid tank info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3389,7 +3389,7 @@ public class GTUtility { if (temp != null) tList.addAll(temp); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this block's debug info.§r")); + tList.add("§cAn exception was thrown while fetching this block's debug info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3444,7 +3444,7 @@ public class GTUtility { } } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this leaves' info.§r")); + tList.add("§cAn exception was thrown while fetching this leaves' info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3496,7 +3496,7 @@ public class GTUtility { } } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this crop's info.§r")); + tList.add("§cAn exception was thrown while fetching this crop's info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3508,7 +3508,7 @@ public class GTUtility { tList.addAll(Arrays.asList(info.getInfoData())); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's info.§r")); + tList.add("§cAn exception was thrown while fetching this device's info.§r"); if (D1) e.printStackTrace(GTLog.err); } } @@ -3522,7 +3522,7 @@ public class GTUtility { + EnumChatFormatting.RESET); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's owner.§r")); + tList.add("§cAn exception was thrown while fetching this device's owner.§r"); if (D1) e.printStackTrace(GTLog.err); } } @@ -3565,7 +3565,7 @@ public class GTUtility { + " EU"); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's energy info.§r")); + tList.add("§cAn exception was thrown while fetching this device's energy info.§r"); if (D1) e.printStackTrace(GTLog.err); } } @@ -3580,7 +3580,7 @@ public class GTUtility { if (tString != null && !tString.equals(E)) tList.add(tString); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's covers.§r")); + tList.add("§cAn exception was thrown while fetching this device's covers.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3612,7 +3612,7 @@ public class GTUtility { + EnumChatFormatting.RESET); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's progress.§r")); + tList.add("§cAn exception was thrown while fetching this device's progress.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3628,7 +3628,7 @@ public class GTUtility { + EnumChatFormatting.RESET); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's upgrades.§r")); + tList.add("§cAn exception was thrown while fetching this device's upgrades.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3650,7 +3650,7 @@ public class GTUtility { + " EU"); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's IC2 energy info.§r")); + tList.add("§cAn exception was thrown while fetching this device's IC2 energy info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3667,7 +3667,7 @@ public class GTUtility { + EnumChatFormatting.RESET); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's EU conduction info.§r")); + tList.add("§cAn exception was thrown while fetching this device's EU conduction info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3695,7 +3695,7 @@ public class GTUtility { + EnumChatFormatting.RESET); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's IC@ wrenchability.§r")); + tList.add("§cAn exception was thrown while fetching this device's IC@ wrenchability.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3715,7 +3715,7 @@ public class GTUtility { } } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this device's alignment info.§r")); + tList.add("§cAn exception was thrown while fetching this device's alignment info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -3740,7 +3740,7 @@ public class GTUtility { + EnumChatFormatting.RESET); } } catch (Throwable e) { - tList.add(String.format("§cAn exception was thrown while fetching this reactor's info.§r")); + tList.add("§cAn exception was thrown while fetching this reactor's info.§r"); if (D1) e.printStackTrace(GTLog.err); } return rEUAmount; @@ -4266,14 +4266,14 @@ public class GTUtility { tPageText.append((tPageText.length() == 0) ? "" : aListDelimiter) .append(list[i]); - if (tPageText.length() > 0) { + if (tPageText.length() != 0) { String tPageCounter = tTotalPages > 1 ? String.format(aPageFormatter, tPage + 1, tTotalPages) : ""; NBTTagString tPageTag = new NBTTagString(String.format(aPageHeader, tPageCounter) + tPageText); aBook.appendTag(tPageTag); } ++tPage; - } while (tPageText.length() > 0); + } while (tPageText.length() != 0); } public static void addEnchantment(ItemStack aStack, Enchantment aEnchantment, int aLevel) { diff --git a/src/main/java/gregtech/api/util/GTWaila.java b/src/main/java/gregtech/api/util/GTWaila.java index a52dd2e459..676335a760 100644 --- a/src/main/java/gregtech/api/util/GTWaila.java +++ b/src/main/java/gregtech/api/util/GTWaila.java @@ -3,21 +3,18 @@ package gregtech.api.util; public abstract class GTWaila { public static String getMachineProgressString(boolean isActive, int maxProgresstime, int progresstime) { - return getMachineProgressString(isActive, (long) maxProgresstime, (long) progresstime); + return getMachineProgressString(isActive, maxProgresstime, (long) progresstime); } public static String getMachineProgressString(boolean isActive, long maxProgresstime, long progresstime) { if (!isActive) return "Idle"; - StringBuilder ret = new StringBuilder("In progress: ") - .append(String.format("%,.2f", (double) progresstime / 20)) - .append("s / ") - .append(String.format("%,.2f", (double) maxProgresstime / 20)) - .append("s (") - .append(GTUtility.formatNumbers((Math.round((double) progresstime / maxProgresstime * 1000) / 10.0))) - .append("%)"); - - return ret.toString(); + return "In progress: " + String.format("%,.2f", (double) progresstime / 20) + + "s / " + + String.format("%,.2f", (double) maxProgresstime / 20) + + "s (" + + GTUtility.formatNumbers((Math.round((double) progresstime / maxProgresstime * 1000) / 10.0)) + + "%)"; } } diff --git a/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java b/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java index 3efbebdcbf..9ad3ff1fed 100644 --- a/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java +++ b/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java @@ -181,8 +181,7 @@ public class GT_StructureUtilityMuTE { mIcons = new IIcon[6]; Arrays.fill(mIcons, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex].getIcon()); } - final short[] RGBA = DEFAULT; - StructureLibAPI.hintParticleTinted(world, x, y, z, mIcons, RGBA); + StructureLibAPI.hintParticleTinted(world, x, y, z, mIcons, DEFAULT); return true; } @@ -219,7 +218,7 @@ public class GT_StructureUtilityMuTE { */ public static class MuTEStructureCasing { - private String registryName; + private final String registryName; private int registryId = GTValues.W; private final int defaultMeta; private final Integer[] validIds; diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java index 0e8deb285b..39ea9e902e 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java @@ -36,9 +36,7 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> { @Override public boolean equals(Object o) { if (o instanceof GasSpargingRecipe i) { - if (this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel)) { - return true; - } + return this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel); } return false; } @@ -57,39 +55,28 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> { } public boolean isValid() { - if (mInputGas == null || mInputGas.amount <= 0 - || mInputSpentFuel == null - || mInputSpentFuel.amount <= 0 - || mFluidOutputs == null - || mFluidOutputs.length < 1 - || mMaxOutputQuantity == null - || mMaxOutputQuantity.length < 1 - || mFluidOutputs.length != mMaxOutputQuantity.length) { - return false; - } - return true; + return mInputGas != null && mInputGas.amount > 0 + && mInputSpentFuel != null + && mInputSpentFuel.amount > 0 + && mFluidOutputs != null + && mFluidOutputs.length >= 1 + && mMaxOutputQuantity != null + && mMaxOutputQuantity.length >= 1 + && mFluidOutputs.length == mMaxOutputQuantity.length; } public boolean containsInputs(FluidStack aSpargeGas, FluidStack aSpentFuel) { if (aSpargeGas != null && aSpargeGas.getFluid() .equals(this.mInputGas.getFluid())) { - if (aSpentFuel != null && aSpentFuel.getFluid() - .equals(this.mInputSpentFuel.getFluid())) { - return true; - } + return aSpentFuel != null && aSpentFuel.getFluid() + .equals(this.mInputSpentFuel.getFluid()); } return false; } @Override public int compareTo(GasSpargingRecipe o) { - if (o.mFluidOutputs.length > this.mFluidOutputs.length) { - return 1; - } else if (o.mFluidOutputs.length == this.mFluidOutputs.length) { - return 0; - } else { - return -1; - } + return Integer.compare(o.mFluidOutputs.length, this.mFluidOutputs.length); } public String[] getRecipeInfo() { diff --git a/src/main/java/gregtech/api/util/HatchElementBuilder.java b/src/main/java/gregtech/api/util/HatchElementBuilder.java index 8b93861114..d5517a451e 100644 --- a/src/main/java/gregtech/api/util/HatchElementBuilder.java +++ b/src/main/java/gregtech/api/util/HatchElementBuilder.java @@ -177,7 +177,7 @@ public class HatchElementBuilder<T> { /** * Mark this hatch element as the only candidate of given structure element. (e.g. muffler hatch on top of EBF) * Currently, this will make the built IStructureElement to ignore gt_no_hatch directive from player - * + * <p> * Do note that {@link #buildAndChain(IStructureElement[])} and its overloads will force the resulting structure * element * to be non-exclusive. diff --git a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java index e51f3a0524..dd142fdf9f 100644 --- a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java +++ b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java @@ -1,5 +1,6 @@ package gregtech.api.util; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; @@ -118,9 +119,7 @@ public class MultiblockTooltipBuilder { */ public MultiblockTooltipBuilder addInfoAll(String... infoStrings) { - for (String str : infoStrings) { - iLines.add(str); - } + iLines.addAll(Arrays.asList(infoStrings)); return this; } diff --git a/src/main/java/gregtech/api/util/OverclockCalculator.java b/src/main/java/gregtech/api/util/OverclockCalculator.java index bd3b14bcc0..e6e775b397 100644 --- a/src/main/java/gregtech/api/util/OverclockCalculator.java +++ b/src/main/java/gregtech/api/util/OverclockCalculator.java @@ -444,7 +444,6 @@ public class OverclockCalculator { currentDurationDecrease = durationDecreasePerOCSupplier.apply(overclockCount + 1); } calculatedConsumption = (long) Math.max(currentConsumption, 1); - calculatedDuration = (int) Math.max(durationInDouble, 1); } else { // general overclock double recipePowerTier = calculateRecipePowerTier(heatDiscountMultiplier); double machinePowerTier = calculateMachinePowerTier(); @@ -473,8 +472,8 @@ public class OverclockCalculator { calculatedConsumption = Math.max(calculatedConsumption, 1); } calculatedConsumption = calculateFinalRecipeEUt(heatDiscountMultiplier); - calculatedDuration = (int) Math.max(durationInDouble, 1); } + calculatedDuration = (int) Math.max(durationInDouble, 1); } private double calculateRecipePower(double heatDiscountMultiplier) { diff --git a/src/main/java/gregtech/api/util/TurbineStatCalculator.java b/src/main/java/gregtech/api/util/TurbineStatCalculator.java index 48c00dfe09..3c17c6eace 100644 --- a/src/main/java/gregtech/api/util/TurbineStatCalculator.java +++ b/src/main/java/gregtech/api/util/TurbineStatCalculator.java @@ -20,8 +20,8 @@ public class TurbineStatCalculator { public TurbineStatCalculator(MetaGeneratedTool turbineItem, ItemStack aStack) { turbine = turbineItem; item = aStack; - tMaxDamage = turbine.getToolMaxDamage(aStack); - tMaterial = turbine.getPrimaryMaterial(aStack); + tMaxDamage = MetaGeneratedTool.getToolMaxDamage(aStack); + tMaterial = MetaGeneratedTool.getPrimaryMaterial(aStack); tStats = turbine.getToolStats(aStack); } @@ -32,7 +32,7 @@ public class TurbineStatCalculator { } public long getCurrentDurability() { - return getMaxDurability() - turbine.getToolDamage(item); + return getMaxDurability() - MetaGeneratedTool.getToolDamage(item); } // Efficiency in percentages |