diff options
| author | Alexdoru <57050655+Alexdoru@users.noreply.github.com> | 2024-10-02 07:31:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-02 05:31:08 +0000 |
| commit | 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 (patch) | |
| tree | 107d9d2442891990ef1cdef1d8bb2df6bb96952a /src/main/java/gtPlusPlus/xmod/gregtech/api/items | |
| parent | bfc7b2b07f72d0903a70791ff96f9c837ddd5ff0 (diff) | |
| download | GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.gz GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.bz2 GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.zip | |
Cleanup the codebase (#3311)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/items')
3 files changed, 4 insertions, 10 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java index c98023bad7..befca0975f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java @@ -106,7 +106,6 @@ public abstract class GTMetaItem extends GTMetaItemBase { } if (tRandomData == SubTag.NO_UNIFICATION) { GTOreDictUnificator.addToBlacklist(rStack); - continue; } } } @@ -140,7 +139,6 @@ public abstract class GTMetaItem extends GTMetaItemBase { } if (tUseOreDict) { GTOreDictUnificator.registerOre(tRandomData, rStack); - continue; } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java index 3e7fcf1486..09c6d4467a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java @@ -64,11 +64,8 @@ public abstract class GTMetaItemBase extends GTGenericItem if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { return this; } - ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) aMetaValue); - if (tList == null) { - tList = new ArrayList<>(1); - this.mItemBehaviors.put((short) aMetaValue, tList); - } + ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors + .computeIfAbsent((short) aMetaValue, k -> new ArrayList<>(1)); tList.add(aBehavior); return this; } @@ -278,8 +275,7 @@ public abstract class GTMetaItemBase extends GTGenericItem EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY); } else { aList.add( - EnumChatFormatting.AQUA + "" - + GTUtility.formatNumbers(tCharge) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(tCharge) + " / " + GTUtility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java index 31cdac4770..102a3cc0b7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java @@ -101,7 +101,7 @@ public abstract class GTMetaItemX32 extends GTMetaItem { // You have to check for at least these Conditions in every Case! So add a super Call like the following for // this before executing your Code: // if (!super.doesMaterialAllowGeneration(aPrefix, aMaterial)) return false; - return (aPrefix != null) && (aMaterial != null) && aPrefix.doGenerateItem(aMaterial); + return aPrefix != null && aPrefix.doGenerateItem(aMaterial); } /* ---------- OVERRIDEABLE FUNCTIONS ---------- */ |