Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

8 files changed, 16 insertions, 21 deletions

diff --git a/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java b/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java
index db838d059a..533f16089f 100644
--- a/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java
+++ b/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java
@@ -86,7 +86,7 @@ public abstract class BWMetaGeneratedBlocks extends BWTileEntityContainer {
     @Override
     public int getRenderType() {
         if (BWBlockOreRenderer.INSTANCE == null) return super.getRenderType();
-        return BWBlockOreRenderer.INSTANCE.renderID;
+        return BWBlockOreRenderer.renderID;
     }
 
     @Override
diff --git a/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java b/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java
index bdeab62cfd..cd8e360da6 100644
--- a/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java
+++ b/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java
@@ -100,17 +100,15 @@ public class BWMetaGeneratedItems extends MetaGeneratedItem implements IRadMater
                                     OrePrefixes.dust,
                                     aMaterial,
                                     aItemEntity.getEntityItem().stackSize));
-                            aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
-                            return true;
                         } else {
                             aItemEntity.setEntityItemStack(
                                 WerkstoffLoader.getCorrespondingItemStack(
                                     OrePrefixes.crushedPurified,
                                     aMaterial,
                                     aItemEntity.getEntityItem().stackSize));
-                            aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
-                            return true;
                         }
+                        aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
+                        return true;
                     }
                 }
             }
diff --git a/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java b/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java
index 8764c7891e..737b486cf9 100644
--- a/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java
+++ b/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java
@@ -90,7 +90,7 @@ public class BWTileEntityMetaGeneratedSmallOre extends BWTileEntityMetaGenerated
                     tSelector.add(tStack);
                 }
             }
-            if (tSelector.size() > 0) {
+            if (!tSelector.isEmpty()) {
                 int i = 0;
 
                 for (int j = Math.max(1, aFortune > 0 ? tRandom.nextInt(1 + aFortune) : 0); i < j; ++i) {
diff --git a/src/main/java/bartworks/system/material/Werkstoff.java b/src/main/java/bartworks/system/material/Werkstoff.java
index d9b6b4503c..5ae7136934 100644
--- a/src/main/java/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/bartworks/system/material/Werkstoff.java
@@ -278,7 +278,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
         this.mID = (short) mID;
         this.defaultName = defaultName;
         // Ensure that localization key are written to the lang file
-        GregTechAPI.sAfterGTPreload.add(() -> { this.getLocalizedName(); });
+        GregTechAPI.sAfterGTPreload.add(() -> this.getLocalizedName());
         this.stats = stats;
         this.type = type;
         this.generationFeatures = generationFeatures;
@@ -316,7 +316,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
         // this.toolTip = "The formula is to long...";
 
         // Ensure that localization key are written to the lang file
-        GregTechAPI.sAfterGTPreload.add(() -> { this.getLocalizedToolTip(); });
+        GregTechAPI.sAfterGTPreload.add(() -> this.getLocalizedToolTip());
 
         if (this.stats.protons == 0) {
             long tmpprotons = 0;
@@ -427,13 +427,12 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
     public List<TCAspects.TC_AspectStack> getGTWrappedTCAspects() {
         final List<TCAspects.TC_AspectStack> ret = new ArrayList<>();
         Arrays.stream(this.getTCAspects())
-            .forEach(objectIntegerPair -> {
-                new TCAspects.TC_AspectStack(
+            .forEach(
+                objectIntegerPair -> new TCAspects.TC_AspectStack(
                     TCAspects.valueOf(
                         ((Aspect) objectIntegerPair.getKey()).getName()
                             .toUpperCase(Locale.US)),
-                    objectIntegerPair.getValue()).addToAspectList(ret);
-            });
+                    objectIntegerPair.getValue()).addToAspectList(ret));
         return ret;
     }
 
@@ -476,7 +475,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
     }
 
     public ISubTagContainer getOreByProductRaw(int aNumber) {
-        if (this.mOreByProducts.size() == 0) return null;
+        if (this.mOreByProducts.isEmpty()) return null;
         if (aNumber < 0) aNumber = this.mOreByProducts.size() + aNumber;
         while (aNumber >= this.mOreByProducts.size()) aNumber--;
         ISubTagContainer o = this.mOreByProducts.get(aNumber);
@@ -485,7 +484,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
     }
 
     public ItemStack getOreByProduct(int aNumber, OrePrefixes prefixes) {
-        if (this.mOreByProducts.size() == 0) return null;
+        if (this.mOreByProducts.isEmpty()) return null;
         if (aNumber < 0) aNumber = this.mOreByProducts.size() + aNumber;
         while (aNumber >= this.mOreByProducts.size()) aNumber--;
         Object o = this.mOreByProducts.get(aNumber);
diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
index e3504a4e9c..1d0c6fa140 100644
--- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
+++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
@@ -1030,7 +1030,6 @@ public class PlatinumSludgeOverHaul {
         PlatinumSludgeOverHaul.runHelperrecipes();
     }
 
-    @SuppressWarnings("deprecation")
     private static void replaceHVCircuitMaterials() {
         GTValues.RA.stdBuilder()
             .itemInputs(Materials.Redstone.getDust(1), Materials.Electrum.getDust(1), GTUtility.getIntegratedCircuit(1))
diff --git a/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java
index ab331d2ba6..d103312e55 100644
--- a/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java
+++ b/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java
@@ -274,7 +274,6 @@ public class AdditionalRecipes {
             .addTo(BartWorksRecipeMaps.acidGenFuels);
     }
 
-    @SuppressWarnings("deprecation")
     public static void run() {
         runBWRecipes();
 
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java
index 32aa00bd41..5b24b1e6ee 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java
@@ -166,7 +166,7 @@ public class CellLoader implements IWerkstoffRunnable {
                         null,
                         null,
                         new FluidStack[] { null },
-                        new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null },
+                        new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null },
                         (int) Math.max(
                             1L,
                             Math.abs(
@@ -192,7 +192,7 @@ public class CellLoader implements IWerkstoffRunnable {
                         null,
                         null,
                         new FluidStack[] { null },
-                        new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null },
+                        new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null },
                         (int) Math.max(
                             1L,
                             Math.abs(
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
index bcc5d422b0..04db75e0d3 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
@@ -190,7 +190,7 @@ public class DustLoader implements IWerkstoffRunnable {
                         null,
                         null,
                         new FluidStack[] { null },
-                        new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null },
+                        new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null },
                         (int) Math.max(
                             1L,
                             Math.abs(
@@ -215,7 +215,7 @@ public class DustLoader implements IWerkstoffRunnable {
                             null,
                             null,
                             new FluidStack[] { null },
-                            new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null },
+                            new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null },
                             (int) Math.max(
                                 1L,
                                 Math.abs(
@@ -266,7 +266,7 @@ public class DustLoader implements IWerkstoffRunnable {
                             new ItemStack[] { input },
                             null,
                             null,
-                            new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null },
+                            new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null },
                             null,
                             (int) Math.max(
                                 1L,