From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:31:08 +0200 Subject: Cleanup the codebase (#3311) Co-authored-by: boubou19 --- src/main/java/bartworks/system/oregen/BWOreLayer.java | 6 ++---- src/main/java/bartworks/system/oregen/BWWordGenerator.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/bartworks/system/oregen') diff --git a/src/main/java/bartworks/system/oregen/BWOreLayer.java b/src/main/java/bartworks/system/oregen/BWOreLayer.java index 5f9688e68c..80cca68d3a 100644 --- a/src/main/java/bartworks/system/oregen/BWOreLayer.java +++ b/src/main/java/bartworks/system/oregen/BWOreLayer.java @@ -173,12 +173,10 @@ public abstract class BWOreLayer extends GTWorldgen { } private boolean shouldPlace(Random aRandom, int cX, int eX, int tX, int cZ, int eZ, int tZ) { - if (aRandom.nextInt( + return aRandom.nextInt( Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0 || aRandom.nextInt( - Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0) - return true; - return false; + Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0; } public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean isSmallOre) { diff --git a/src/main/java/bartworks/system/oregen/BWWordGenerator.java b/src/main/java/bartworks/system/oregen/BWWordGenerator.java index 10a3c862af..909bb0cd94 100644 --- a/src/main/java/bartworks/system/oregen/BWWordGenerator.java +++ b/src/main/java/bartworks/system/oregen/BWWordGenerator.java @@ -97,7 +97,7 @@ public class BWWordGenerator implements IWorldGenerator { if (!BWWordGenerator.WorldGenContainer.mGenerated.contains(centerChunk) && this.surroundingChunksLoaded(xCenter, zCenter)) { BWWordGenerator.WorldGenContainer.mGenerated.add(centerChunk); - if (BWOreLayer.sWeight > 0 && BWOreLayer.sList.size() > 0) { + if (BWOreLayer.sWeight > 0 && !BWOreLayer.sList.isEmpty()) { boolean temp = true; int tRandomWeight; for (int i = 0; i < 256 && temp; i++) { -- cgit