diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..be050ff0c --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..aa00ffab7 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..02fe0b3e4 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml new file mode 100644 index 000000000..2888f96d1 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sk89q_worldedit_worldedit_bukkit_7_2_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_sk89q_worldedit_worldedit_bukkit_7_2_0_SNAPSHOT.xml new file mode 100644 index 000000000..54f7acca6 --- /dev/null +++ b/.idea/libraries/Maven__com_sk89q_worldedit_worldedit_bukkit_7_2_0_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bstats_bstats_bukkit_1_7.xml b/.idea/libraries/Maven__org_bstats_bstats_bukkit_1_7.xml new file mode 100644 index 000000000..104f4168c --- /dev/null +++ b/.idea/libraries/Maven__org_bstats_bstats_bukkit_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_14_4_1_14_4.xml b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_14_4_1_14_4.xml new file mode 100644 index 000000000..8df2ec71e --- /dev/null +++ b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_14_4_1_14_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_15_1_1_15_1.xml b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_15_1_1_15_1.xml new file mode 100644 index 000000000..b7e5baeba --- /dev/null +++ b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_15_1_1_15_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_16_1_1_16_1.xml b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_16_1_1_16_1.xml new file mode 100644 index 000000000..ebdd6d85c --- /dev/null +++ b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_16_1_1_16_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_16_2_1_16_2.xml b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_16_2_1_16_2.xml new file mode 100644 index 000000000..ff1859ef7 --- /dev/null +++ b/.idea/libraries/Maven__org_bukkit_craftbukkit_cb_1_16_2_1_16_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml new file mode 100644 index 000000000..0ce7ba636 --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_16_1_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_16_1_R0_1_SNAPSHOT.xml new file mode 100644 index 000000000..9b24410ea --- /dev/null +++ b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_16_1_R0_1_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..6f08141f0 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..b3113a971 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..2b8c7bd7e --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 1602572902189 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Iris.iml b/Iris.iml new file mode 100644 index 000000000..e156f43ab --- /dev/null +++ b/Iris.iml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 88ef43393..588d13be6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 bytecode.ninja Iris - 1.0.9 + 1.0.12 Iris false diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index b57bbc414..df9121e96 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -76,7 +76,7 @@ public class Iris extends MortarPlugin public Iris() { IO.delete(new File("iris")); - lowMemoryMode = Runtime.getRuntime().maxMemory() < 4 * 1000 * 1000 * 1000; + lowMemoryMode = Runtime.getRuntime().maxMemory() < 4000000000L; // 4 * 1000 * 1000 * 1000 // 4gb } private static String findNMSTag() @@ -107,21 +107,21 @@ public class Iris extends MortarPlugin private static boolean doesSupport3DBiomes() { - int v = Integer.valueOf(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); + int v = Integer.parseInt(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); return v >= 15; } private static boolean doesSupportCustomModels() { - int v = Integer.valueOf(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); + int v = Integer.parseInt(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); return v >= 14; } private static boolean doesSupportAwareness() { - int v = Integer.valueOf(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); + int v = Integer.parseInt(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); return v >= 15; } @@ -158,9 +158,9 @@ public class Iris extends MortarPlugin linkMultiverseCore = new MultiverseCoreLink(); edit = new EditManager(); J.a(() -> IO.delete(getTemp())); - J.a(() -> bstats()); + J.a(this::bstats); J.s(this::splash, 20); - J.sr(() -> tickQueue(syncJobs), 0); + J.sr(this::tickQueue, 0); super.onEnable(); } @@ -172,22 +172,22 @@ public class Iris extends MortarPlugin } } - private void tickQueue(Queue q) + private void tickQueue() { - synchronized(q) + synchronized(Iris.syncJobs) { - if(!q.hasNext()) + if(!Iris.syncJobs.hasNext()) { return; } long ms = M.ms(); - while(q.hasNext() && M.ms() - ms < 25) + while(Iris.syncJobs.hasNext() && M.ms() - ms < 25) { try { - q.next().run(); + Iris.syncJobs.next().run(); } catch(Throwable e) @@ -271,7 +271,7 @@ public class Iris extends MortarPlugin { try(BufferedInputStream in = new BufferedInputStream(new URL(url).openStream()); FileOutputStream fileOutputStream = new FileOutputStream(f)) { - byte dataBuffer[] = new byte[1024]; + byte[] dataBuffer = new byte[1024]; int bytesRead; while((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) { @@ -280,7 +280,7 @@ public class Iris extends MortarPlugin } } - catch(IOException e) + catch(IOException ignored) { } @@ -296,7 +296,7 @@ public class Iris extends MortarPlugin try(BufferedInputStream in = new BufferedInputStream(new URL(url).openStream()); FileOutputStream fileOutputStream = new FileOutputStream(f)) { - byte dataBuffer[] = new byte[1024]; + byte[] dataBuffer = new byte[1024]; int bytesRead; while((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) { @@ -304,7 +304,7 @@ public class Iris extends MortarPlugin } } - catch(IOException e) + catch(IOException ignored) { } @@ -314,7 +314,7 @@ public class Iris extends MortarPlugin return IO.readAll(f); } - catch(IOException e) + catch(IOException ignored) { } @@ -329,7 +329,7 @@ public class Iris extends MortarPlugin try(BufferedInputStream in = new BufferedInputStream(new URL(url).openStream()); FileOutputStream fileOutputStream = new FileOutputStream(f)) { - byte dataBuffer[] = new byte[1024]; + byte[] dataBuffer = new byte[1024]; int bytesRead; while((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) { @@ -337,7 +337,7 @@ public class Iris extends MortarPlugin } } - catch(IOException e) + catch(IOException ignored) { } @@ -395,7 +395,7 @@ public class Iris extends MortarPlugin splash[i] += info[i]; } - Iris.info("\n\n " + new KList(splash).toString("\n") + "\n"); + Iris.info("\n\n " + new KList<>(splash).toString("\n") + "\n"); if(lowMemoryMode) { diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index 355d51054..6a62341f1 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -146,7 +146,7 @@ public class IrisSettings Iris.info("Updated Configuration Files"); } - catch(Throwable e) + catch(Throwable ignored) { } @@ -157,6 +157,7 @@ public class IrisSettings catch(JSONException | IOException e) { e.printStackTrace(); + //noinspection ResultOfMethodCallIgnored s.delete(); } } diff --git a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java index 036820dcd..d56d2a7a4 100644 --- a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java @@ -202,6 +202,7 @@ public abstract class ContextualTerrainProvider implements TerrainProvider, List if(getNoLoot().size() > 1024) { + //noinspection ListRemoveInLoop for(int i = 0; i < 64; i++) { getNoLoot().remove(0); @@ -358,7 +359,7 @@ public abstract class ContextualTerrainProvider implements TerrainProvider, List onClose(); } - protected void generateFailure(Random no, int x, int z, TerrainChunk chunk) + protected void generateFailure(TerrainChunk chunk) { for(int i = 0; i < 16; i++) { @@ -391,7 +392,7 @@ public abstract class ContextualTerrainProvider implements TerrainProvider, List if(failing) { - generateFailure(no, x, z, terrain); + generateFailure(terrain); return; } @@ -414,7 +415,7 @@ public abstract class ContextualTerrainProvider implements TerrainProvider, List } setHotloadable(true); - generateFailure(no, x, z, terrain); + generateFailure(terrain); } private void doCheckHotload() @@ -432,11 +433,7 @@ public abstract class ContextualTerrainProvider implements TerrainProvider, List if(getPushLatch().flip()) { Iris.hotloader.check((IrisContext) this); - - if(this instanceof IrisContext) - { - IrisContext.pushContext((IrisContext) this); - } + IrisContext.pushContext((IrisContext) this); } } diff --git a/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java b/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java index 3de9b987d..720a1ce64 100644 --- a/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java @@ -93,7 +93,7 @@ public abstract class DimensionalTerrainProvider extends ContextualTerrainProvid getData().preferFolder(getDimension().getLoadFile().getParentFile().getParentFile().getName()); } - catch(Throwable e) + catch(Throwable ignored) { } @@ -176,11 +176,11 @@ public abstract class DimensionalTerrainProvider extends ContextualTerrainProvid public double getZoomed(double modified) { - return (double) (modified) / getDimension().getTerrainZoom(); + return modified / getDimension().getTerrainZoom(); } public double getUnzoomed(double modified) { - return (double) (modified) * getDimension().getTerrainZoom(); + return modified * getDimension().getTerrainZoom(); } } diff --git a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java index 24bde4f6f..d8cadb05f 100644 --- a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java @@ -257,7 +257,7 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte public Renderer createRenderer() { - return (x, z) -> render(x, z); + return this::render; } public Color render(double x, double z) @@ -281,9 +281,7 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte float s = 0.25f + shift + sat; float b = (float) (Math.max(0, Math.min(height + getFluidHeight(), 255)) / 255); - Color c = Color.getHSBColor(h, s, b); - - return c; + return Color.getHSBColor(h, s, b); } @@ -323,7 +321,7 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte IrisBiome bio = sampleTrueBiome(x, z); IrisBiome cbio = y < getFluidHeight() ? sampleTrueBiome(x, y, z) : null; - if(cbio != null && bio.equals(cbio)) + if(bio.equals(cbio)) { cbio = null; } @@ -337,7 +335,7 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte KList drops = new KList<>(); boolean skipParents = false; - if(!skipParents && cbio != null) + if(cbio != null) { for(IrisBlockDrops i : cbio.getBlockDrops()) { diff --git a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java index b3273294d..8d7bafde3 100644 --- a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java @@ -242,7 +242,7 @@ public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider p.end(); getMetrics().getParallax().put(p.getMilliseconds()); super.onPostParallaxPostGenerate(random, x, z, terrain, height, biomeMap, map); - getParallaxMap().clean(getTicks()); + getParallaxMap().clean(); getData().getObjectLoader().clean(); } diff --git a/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java index 1997ebe92..867bebad4 100644 --- a/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java @@ -34,7 +34,6 @@ public abstract class ParallelTerrainProvider extends DimensionalTerrainProvider setThreads(tc); GroupedExecutor e = getAccelerant(); setAccelerant(new GroupedExecutor(threads, Thread.MAX_PRIORITY, "Iris Generator - " + getTarget().getName())); - ; Iris.executors.add(getAccelerant()); if(e != null) diff --git a/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java b/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java index 75ec05df0..0569fa0df 100644 --- a/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java @@ -90,7 +90,7 @@ public abstract class PostBlockTerrainProvider extends ParallaxTerrainProvider i getPostLock().lock(); BlockData d = currentData.getBlockData(x & 15, y, z & 15); getPostLock().unlock(); - return d == null ? AIR : d; + return d; } return sampleSliver(x, z).get(y); diff --git a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java b/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java index 06a1bd74b..6c8a758c5 100644 --- a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java @@ -54,13 +54,17 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider private RNG rockRandom; private IrisLock regionLock; private KMap generators; + private KList generatorList; private CNG masterFracture; + private int generatorSize; private ChronoLatch cwarn = new ChronoLatch(1000); public TopographicTerrainProvider(TerrainTarget t, String dimensionName, int threads) { super(t, dimensionName, threads); + setGeneratorSize(0); setGenerators(new KMap<>()); + setGeneratorList(new KList<>()); setRegionLock(new IrisLock("BiomeChunkGenerator")); } @@ -132,7 +136,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider int depth = 0; double noise = getTerrainHeight(rx, rz); int height = (int) Math.round(noise); - boolean carvable = getGlCarve().couldCarveBelow(rx, height, rz); + boolean carvable = getGlCarve().couldCarveBelow(height); IrisRegion region = sampleRegion(rx, rz); IrisBiome biome = sampleTrueBiome(rx, rz); IrisBiome carveBiome = null; @@ -264,7 +268,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider // Decorate underwater surface if(!cavernSurface && (k == height && B.isSolid(block.getMaterial()) && k < fluidHeight)) { - decorateUnderwater(crand, biome, sliver, wx, k, wz, rx, rz, block); + decorateUnderwater(crand, biome, sliver, k, rx, rz); } // Decorate Cavern surfaces, but not the true surface @@ -275,7 +279,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider carveBiome = biome.getRealCarvingBiome(getData()); } - decorateLand(crand, carveBiome, sliver, wx, k, wz, rx, rz, block); + decorateLand(crand, carveBiome, sliver, k, rx, rz, block); } } @@ -323,7 +327,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider if(blockc != null && !sliver.isSolid(i.getFloor() + 1)) { - decorateCave(crand, caveBiome, sliver, wx, i.getFloor(), wz, rx, rz, blockc); + decorateCave(crand, caveBiome, sliver, i.getFloor(), rx, rz, blockc); } } } @@ -333,7 +337,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider // Decorate True Surface if(block.getMaterial().isSolid()) { - decorateLand(crand, biome, sliver, wx, Math.max(height, fluidHeight), wz, rx, rz, block); + decorateLand(crand, biome, sliver, Math.max(height, fluidHeight), rx, rz, block); } } @@ -348,7 +352,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider } } - private void decorateLand(RNG rng, IrisBiome biome, AtomicSliver sliver, double wx, int k, double wz, int rx, int rz, BlockData block) + private void decorateLand(RNG rng, IrisBiome biome, AtomicSliver sliver, int k, int rx, int rz, BlockData block) { if(!getDimension().isDecorate()) { @@ -364,7 +368,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider continue; } - BlockData d = i.getBlockData(biome, rng.nextParallelRNG((int) (38888 + biome.getRarity() + biome.getName().length() + j++)), rx, rz, getData()); + BlockData d = i.getBlockData(biome, rng.nextParallelRNG(38888 + biome.getRarity() + biome.getName().length() + j++), rx, rz, getData()); if(d != null) { @@ -422,7 +426,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider } } - private void decorateCave(RNG rng, IrisBiome biome, AtomicSliver sliver, double wx, int k, double wz, int rx, int rz, BlockData block) + private void decorateCave(RNG rng, IrisBiome biome, AtomicSliver sliver, int k, int rx, int rz, BlockData block) { if(!getDimension().isDecorate()) { @@ -488,7 +492,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider } } - private void decorateUnderwater(RNG random, IrisBiome biome, AtomicSliver sliver, double wx, int y, double wz, int rx, int rz, BlockData block) + private void decorateUnderwater(RNG random, IrisBiome biome, AtomicSliver sliver, int y, int rx, int rz) { if(!getDimension().isDecorate()) { @@ -580,9 +584,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider public double getNoiseHeight(int rx, int rz) { - double h = getBiomeHeight(rx, rz); - - return h; + return getBiomeHeight(rx, rz); } public IrisBiome sampleTrueBiomeBase(int x, int z) @@ -728,7 +730,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider buildGenLayers(getMasterRandom()); } - public void registerGenerator(IrisGenerator g, IrisDimension dim) + public void registerGenerator(IrisGenerator g) { KMap generators = this.generators; @@ -739,6 +741,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider return; } + generatorList.add(g); getRegionLock().unlock(); generators.put(g.getLoadKey(), g); } @@ -750,13 +753,11 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider protected double getRawBiomeHeight(double rrx, double rrz) { - double rx = rrx; - double rz = rrz; double h = 0; - for(IrisGenerator i : getGenerators().values()) + for(int j = 0; j < generatorSize; j++) { - h += interpolateGenerator(rx, rz, i); + h += interpolateGenerator(rrx, rrz, generatorList.get(j)); } return h; @@ -782,8 +783,9 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider { IrisBiome b = sampleBiome((int) xx, (int) zz); - for(IrisBiomeGeneratorLink i : b.getGenerators()) + for(int j = 0; j < b.getGenerators().size(); j++) { + IrisBiomeGeneratorLink i = b.getGenerators().get(j); if(i.getGenerator().equals(gen.getLoadKey())) { return i.getMax(); @@ -805,8 +807,9 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider { IrisBiome b = sampleBiome((int) xx, (int) zz); - for(IrisBiomeGeneratorLink i : b.getGenerators()) + for(int j = 0; j < b.getGenerators().size(); j++) { + IrisBiomeGeneratorLink i = b.getGenerators().get(j); if(i.getGenerator().equals(gen.getLoadKey())) { return i.getMin(); @@ -828,8 +831,10 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider protected void loadGenerators() { + generatorList.clear(); generators.clear(); loadGenerators(getDimension()); + generatorSize = generatorList.size(); } protected void loadGenerators(IrisDimension dim) @@ -865,7 +870,7 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider { touch.add(next); IrisBiome biome = loadBiome(next); - biome.getGenerators().forEach((i) -> registerGenerator(i.getCachedGenerator(this), dim)); + biome.getGenerators().forEach((i) -> registerGenerator(i.getCachedGenerator(this))); loadQueue.addAll(biome.getChildren()); } } @@ -908,9 +913,8 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider double wx = getModifiedX(x, z); double wz = getModifiedZ(x, z); IrisRegion region = glBiome.getRegion(wx, wz); - IrisBiome res = glBiome.generateRegionData(wx, wz, x, z, region); - return res; + return glBiome.generateRegionData(wx, wz, x, z, region); } public IrisBiome sampleBiome(int x, int z) diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java index fdd3d88e4..9e8e9c346 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java @@ -42,8 +42,8 @@ public class AtomicRegionData for(String i : tags.keySet()) { - int x = Integer.valueOf(i.split("\\Q.\\E")[0]); - int z = Integer.valueOf(i.split("\\Q.\\E")[1]); + int x = Integer.parseInt(i.split("\\Q.\\E")[0]); + int z = Integer.parseInt(i.split("\\Q.\\E")[1]); tag[(z << 5) | x] = tags.get(i); } @@ -104,8 +104,7 @@ public class AtomicRegionData tag[(rz << 5) | rx] = new ByteArrayTag(rx + "." + rz, b); } - public AtomicSliverMap get(int rx, int rz) throws IOException - { + public AtomicSliverMap get(int rx, int rz) { AtomicSliverMap data = new AtomicSliverMap(); if(!contains(rx, rz)) diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java index 1a28db0df..6f87b1230 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java @@ -53,7 +53,7 @@ public class AtomicSliver public Material getTypeSafe(int h) { - return get(h > 255 ? 255 : h < 0 ? 0 : h).getMaterial(); + return get(h > 255 ? 255 : Math.max(h, 0)).getMaterial(); } public KList getUpdatables() @@ -125,7 +125,7 @@ public class AtomicSliver setSilently(h, d); modified = true; lock.lock(); - highestBlock = h > highestBlock ? h : highestBlock; + highestBlock = Math.max(h, highestBlock); lock.unlock(); } diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java index 15b9b2837..8f0032c46 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java @@ -74,7 +74,7 @@ public class AtomicSliverMap return null; } - return new IrisStructureResult(s.getTiles().get(Integer.valueOf(a[1])), s); + return new IrisStructureResult(s.getTiles().get(Integer.parseInt(a[1])), s); } public void write(OutputStream out) throws IOException diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java index bc976489c..f344f2c1d 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java @@ -15,14 +15,14 @@ import com.volmit.iris.util.M; public class AtomicWorldData { - private TerrainTarget world; - private KMap loadedChunks; - private KMap loadedSections; - private KMap lastRegion; - private KMap lastChunk; - private KList unloadRegions; - private KList unloadChunks; - private IrisLock lock = new IrisLock("ULLock"); + private final TerrainTarget world; + private final KMap loadedChunks; + private final KMap loadedSections; + private final KMap lastRegion; + private final KMap lastChunk; + private final KList unloadRegions; + private final KList unloadChunks; + private final IrisLock lock = new IrisLock("ULLock"); private long last = M.ms(); public AtomicWorldData(TerrainTarget world) @@ -34,6 +34,7 @@ public class AtomicWorldData lastChunk = new KMap<>(); unloadRegions = new KList<>(); unloadChunks = new KList<>(); + //noinspection ResultOfMethodCallIgnored getSubregionFolder().mkdirs(); } @@ -83,6 +84,7 @@ public class AtomicWorldData public void deleteSection(int x, int z) throws IOException { unloadSection(x, z, false); + //noinspection ResultOfMethodCallIgnored getSubregionFile(x, z).delete(); } @@ -263,7 +265,7 @@ public class AtomicWorldData return loadedChunks; } - public void clean(int j) + public void clean() { lock.lock(); if(M.ms() - last < getUnloadBatchSpeed()) diff --git a/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java b/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java index 733575a76..a5b2134b7 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java +++ b/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java @@ -5,8 +5,8 @@ import com.volmit.iris.util.KMap; public class MasterLock { - private KMap locks; - private IrisLock lock; + private final KMap locks; + private final IrisLock lock; private boolean enabled; public MasterLock() diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java index 584c2e676..cf5c29146 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java @@ -59,10 +59,7 @@ public class GenLayerBiome extends GenLayer return null; } - double x = bx; - double z = bz; - - return regionGenerator.fitRarity(iris.getDimension().getAllRegions(iris), x, z); + return regionGenerator.fitRarity(iris.getDimension().getAllRegions(iris), bx, bz); } public IrisBiome generateData(double bx, double bz, int rawX, int rawZ) @@ -127,8 +124,6 @@ public class GenLayerBiome extends GenLayer public InferredType getType(double bx, double bz, IrisRegion region) { - double x = bx; - double z = bz; double c = iris.getDimension().getLandChance(); InferredType bridge; @@ -142,14 +137,14 @@ public class GenLayerBiome extends GenLayer bridge = InferredType.SEA; } - bridge = bridgeGenerator.fitDouble(0, 1, x, z) < c ? InferredType.LAND : InferredType.SEA; + bridge = bridgeGenerator.fitDouble(0, 1, bx, bz) < c ? InferredType.LAND : InferredType.SEA; - if(bridge.equals(InferredType.LAND) && region.isLake(lakeRandom, x, z)) + if(bridge.equals(InferredType.LAND) && region.isLake(lakeRandom, bx, bz)) { bridge = InferredType.LAKE; } - if(bridge.equals(InferredType.LAND) && region.isRiver(riverRandom, x, z)) + if(bridge.equals(InferredType.LAND) && region.isRiver(riverRandom, bx, bz)) { bridge = InferredType.RIVER; } diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java index 5ab97d5b4..5311d5412 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java @@ -14,7 +14,7 @@ public class GenLayerCarve extends GenLayer private static final KList EMPTY_LIST = new KList<>(); @Getter - private boolean couldCarve; + private final boolean couldCarve; @Getter private int minimum; @@ -37,12 +37,12 @@ public class GenLayerCarve extends GenLayer } } - public boolean couldCarve(int x, int y, int z) + public boolean couldCarve(int y) { return couldCarve && y >= minimum && y <= maximum; } - public boolean couldCarveBelow(int x, int y, int z) + public boolean couldCarveBelow(int y) { return couldCarve && y <= maximum; } @@ -89,7 +89,7 @@ public class GenLayerCarve extends GenLayer public int getSurfaceCarve(int x, int y, int z) { - if(couldCarveBelow(x, y, z)) + if(couldCarveBelow(y)) { int h = y; @@ -111,17 +111,14 @@ public class GenLayerCarve extends GenLayer public boolean isCarved(int xc, int y, int zc) { - if(!couldCarve(xc, y, zc)) + if(!couldCarve(y)) { return false; } - double x = ((double) xc); - double z = ((double) zc); - for(IrisCarveLayer i : iris.getDimension().getCarveLayers()) { - if(i.isCarved(rng, x, y, z)) + if(i.isCarved(rng, xc, y, zc)) { return true; } diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java index 56f4c651a..cd49f0444 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java @@ -5,7 +5,6 @@ import java.util.function.Function; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import com.volmit.iris.gen.IrisTerrainProvider; import com.volmit.iris.gen.TopographicTerrainProvider; import com.volmit.iris.gen.atomics.AtomicSliver; import com.volmit.iris.noise.FastNoiseDouble; @@ -25,7 +24,7 @@ public class GenLayerCave extends GenLayer public static final BlockData CAVE_AIR = B.getBlockData("CAVE_AIR"); public static final BlockData AIR = B.getBlockData("AIR"); private static final KList EMPTY = new KList<>(); - private FastNoiseDouble gg; + private final FastNoiseDouble gg; public GenLayerCave(TopographicTerrainProvider iris, RNG rng) { @@ -76,7 +75,7 @@ public class GenLayerCave extends GenLayer return CAVE_AIR; }; - int surface = (int) Math.round(((IrisTerrainProvider) iris).getTerrainHeight((int) wxx, (int) wzz)); + int surface = (int) Math.round(iris.getTerrainHeight((int) wxx, (int) wzz)); double wx = wxx + layer.getHorizontalSlope().get(rng, wxx, wzz); double wz = wzz + layer.getHorizontalSlope().get(rng, -wzz, -wxx); double baseWidth = (14 * scale); @@ -118,15 +117,15 @@ public class GenLayerCave extends GenLayer if(data == null) { - ceiling = pu > ceiling ? pu : ceiling; - floor = pu < floor ? pu : floor; - ceiling = pd > ceiling ? pd : ceiling; - floor = pd < floor ? pd : floor; + ceiling = Math.max(pu, ceiling); + floor = Math.min(pu, floor); + ceiling = Math.max(pd, ceiling); + floor = Math.min(pd, floor); if(tunnelHeight == 1) { - ceiling = caveHeight > ceiling ? caveHeight : ceiling; - floor = caveHeight < floor ? caveHeight : floor; + ceiling = Math.max(caveHeight, ceiling); + floor = Math.min(caveHeight, floor); } } @@ -134,22 +133,22 @@ public class GenLayerCave extends GenLayer { if(dig(x, pu, z, data, fluid)) { - ceiling = pu > ceiling ? pu : ceiling; - floor = pu < floor ? pu : floor; + ceiling = Math.max(pu, ceiling); + floor = Math.min(pu, floor); } if(dig(x, pd, z, data, fluid)) { - ceiling = pd > ceiling ? pd : ceiling; - floor = pd < floor ? pd : floor; + ceiling = Math.max(pd, ceiling); + floor = Math.min(pd, floor); } if(tunnelHeight == 1) { - if(dig(x, (int) (caveHeight), z, data, fluid)) + if(dig(x, caveHeight, z, data, fluid)) { - ceiling = caveHeight > ceiling ? caveHeight : ceiling; - floor = caveHeight < floor ? caveHeight : floor; + ceiling = Math.max(caveHeight, ceiling); + floor = Math.min(caveHeight, floor); } } } diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java index 737956880..bf1db2001 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java @@ -56,7 +56,7 @@ public class GenLayerRavine extends GenLayer return pos.getBlockData(x, y, z); } - private BlockData getSurfaceBlock(TerrainChunk pos, BiomeMap map, int n6, int i, RNG rmg) + private BlockData getSurfaceBlock(BiomeMap map, int n6, int i, RNG rmg) { return map.getBiome(n6, i).getSurfaceBlock(n6, i, rmg, iris.getData()); } @@ -93,15 +93,15 @@ public class GenLayerRavine extends GenLayer } while(n3 < n4) { - double d7 = 1.5 + (double) (MathHelper.sin((float) ((float) n3 * 3.1415927f / (float) n4)) * f * 1.0f); + double d7 = 1.5 + (double) (MathHelper.sin((float) n3 * 3.1415927f / (float) n4) * f * 1.0f); double d8 = d7 * d4; d7 *= (double) random.nextFloat() * 0.25 + 0.75; d8 *= (double) random.nextFloat() * 0.25 + 0.75; - float f7 = MathHelper.cos((float) f3); - float f8 = MathHelper.sin((float) f3); - sx += (double) (MathHelper.cos((float) f2) * f7); - sy += (double) f8; - sz += (double) (MathHelper.sin((float) f2) * f7); + float f7 = MathHelper.cos(f3); + float f8 = MathHelper.sin(f3); + sx = sx + (double) (MathHelper.cos(f2) * f7); + sy += f8; + sz += MathHelper.sin(f2) * f7; f3 *= 0.7f; f3 += f5 * 0.05f; f2 += f4 * 0.05f; @@ -122,12 +122,12 @@ public class GenLayerRavine extends GenLayer if(sx >= x - 16.0 - d7 * 2.0 && sz >= z - 16.0 - d7 * 2.0 && sx <= x + 16.0 + d7 * 2.0 && sz <= z + 16.0 + d7 * 2.0) { int n6; - int n7 = MathHelper.floor((double) (sx - d7)) - tx * 16 - 1; - int n8 = MathHelper.floor((double) (sx + d7)) - tx * 16 + 1; - int n9 = MathHelper.floor((double) (sy - d8)) - 1; - int n10 = MathHelper.floor((double) (sy + d8)) + 1; - int n11 = MathHelper.floor((double) (sz - d7)) - tz * 16 - 1; - int n12 = MathHelper.floor((double) (sz + d7)) - tz * 16 + 1; + int n7 = MathHelper.floor(sx - d7) - tx * 16 - 1; + int n8 = MathHelper.floor(sx + d7) - tx * 16 + 1; + int n9 = MathHelper.floor(sy - d8) - 1; + int n10 = MathHelper.floor(sy + d8) + 1; + int n11 = MathHelper.floor(sz - d7) - tz * 16 - 1; + int n12 = MathHelper.floor(sz + d7) - tz * 16 + 1; if(n7 < 0) { n7 = 0; @@ -221,7 +221,7 @@ public class GenLayerRavine extends GenLayer } cSet(bps, n6 + tx * 16, 0, i + tz * 16); - set(terrain, n6, j - 1, i, getSurfaceBlock(terrain, biomeMap, n6, i, rng), height, map); + set(terrain, n6, j - 1, i, getSurfaceBlock(biomeMap, n6, i, rng), height, map); } } } diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java index e104b3142..133d085ba 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java @@ -20,7 +20,7 @@ public class GenLayerText extends GenLayer { public static final BlockData AIR = B.getBlockData("AIR"); - private AtomicCache debug = new AtomicCache<>(); + private final AtomicCache debug = new AtomicCache<>(); public GenLayerText(TopographicTerrainProvider iris, RNG rng) { @@ -30,9 +30,7 @@ public class GenLayerText extends GenLayer public IrisObject getDebug() { return debug.aquire(() -> - { - return createTextObject("Test", "Impact", 24, B.get("STONE")); - }); + createTextObject("Test", "Impact", 24, B.get("STONE"))); } public IrisObject createTextObject(String text, String font, int size, BlockData b) diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java index d6d1877d5..f1e6b8ae6 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java @@ -32,8 +32,8 @@ import com.volmit.iris.util.RNG; public class GenLayerUpdate extends BlockPopulator { - private ParallaxTerrainProvider gen; - private RNG rng; + private final ParallaxTerrainProvider gen; + private final RNG rng; public GenLayerUpdate(ParallaxTerrainProvider gen) { @@ -52,7 +52,7 @@ public class GenLayerUpdate extends BlockPopulator generateDepositsWithVanillaSaftey(w, rx, c); } - updateBlocks(w, rx, c, map); + updateBlocks(rx, c, map); spawnInitials(c, rx); } @@ -103,7 +103,7 @@ public class GenLayerUpdate extends BlockPopulator gen.getMetrics().getDeposits().put(p.getMilliseconds()); } - private void updateBlocks(World w, RNG rx, Chunk c, AtomicSliverMap map) + private void updateBlocks(RNG rx, Chunk c, AtomicSliverMap map) { PrecisionStopwatch p = PrecisionStopwatch.start(); for(int i = 0; i < 16; i++) @@ -159,7 +159,7 @@ public class GenLayerUpdate extends BlockPopulator IrisRegion region = gen.sampleRegion(rx, rz); IrisBiome biomeSurface = gen.sampleTrueBiome(rx, rz); IrisBiome biomeUnder = gen.sampleTrueBiome(rx, b.getY(), rz); - KList tables = new KList(); + KList tables = new KList<>(); IrisStructureResult structure = gen.getStructure(rx, b.getY(), rz); double multiplier = 1D * gen.getDimension().getLoot().getMultiplier() * region.getLoot().getMultiplier() * biomeSurface.getLoot().getMultiplier() * biomeUnder.getLoot().getMultiplier(); injectTables(tables, gen.getDimension().getLoot()); @@ -238,7 +238,7 @@ public class GenLayerUpdate extends BlockPopulator addItems(false, m.getInventory(), rng, tables, slot, rx, b.getY(), rz, 15); } - catch(Throwable e) + catch(Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java b/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java index c04d1bfa4..21eea8d6a 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java +++ b/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java @@ -21,7 +21,7 @@ public class PostMasterPatcher extends IrisPostBlockFilter { private static final BlockData WATER = B.getBlockData("WATER"); private static final BlockData AIR = B.getBlockData("AIR"); - private RNG rng; + private final RNG rng; @DontObfuscate public PostMasterPatcher(PostBlockTerrainProvider gen, int phase) diff --git a/src/main/java/com/volmit/iris/util/ChunkPosition.java b/src/main/java/com/volmit/iris/util/ChunkPosition.java index f477baa48..a11deb628 100644 --- a/src/main/java/com/volmit/iris/util/ChunkPosition.java +++ b/src/main/java/com/volmit/iris/util/ChunkPosition.java @@ -1,7 +1,5 @@ package com.volmit.iris.util; -import java.util.Objects; - public class ChunkPosition { private int x; @@ -36,7 +34,11 @@ public class ChunkPosition @Override public int hashCode() { - return Objects.hash(x, z); + final int prime = 31; + int result = 1; + result = prime * result + x; + result = prime * result + z; + return result; } @Override diff --git a/src/main/java/com/volmit/iris/util/MathHelper.java b/src/main/java/com/volmit/iris/util/MathHelper.java index 9218f70f8..65b383e25 100644 --- a/src/main/java/com/volmit/iris/util/MathHelper.java +++ b/src/main/java/com/volmit/iris/util/MathHelper.java @@ -2,20 +2,26 @@ package com.volmit.iris.util; import java.util.Random; import java.util.UUID; +import java.util.function.Consumer; import java.util.function.IntPredicate; -import net.minecraft.server.v1_16_R2.BaseBlockPosition; -import net.minecraft.server.v1_16_R2.SystemUtils; public class MathHelper { public static final float a = MathHelper.c(2.0f); - private static final float[] b = (float[]) SystemUtils.a((Object) new float[65536], var0 -> + private static final float[] b = (float[]) a((Object) new float[65536], var0 -> { for(int var1 = 0; var1 < ((float[]) var0).length; ++var1) { ((float[]) var0)[var1] = (float) Math.sin((double) var1 * 3.141592653589793 * 2.0 / 65536.0); } }); + + public static T a(T var0, Consumer var1) + { + var1.accept(var0); + return var0; + } + private static final Random c = new Random(); private static final int[] d = new int[] {0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9}; private static final double e = Double.longBitsToDouble(4805340802404319232L); @@ -319,9 +325,9 @@ public class MathHelper return var0 - (double) MathHelper.d(var0); } - public static long a(BaseBlockPosition var0) + public static long a(BlockPosition var0) { - return MathHelper.c(var0.getX(), var0.getY(), var0.getZ()); + return c(var0.getX(), var0.getY(), var0.getZ()); } public static long c(int var0, int var1, int var2) @@ -359,16 +365,19 @@ public class MathHelper { return Double.NaN; } + @SuppressWarnings("unused") boolean bl = var6 = var0 < 0.0; if(var6) { var0 = -var0; } + @SuppressWarnings("unused") boolean bl2 = var7 = var2 < 0.0; if(var7) { var2 = -var2; } + @SuppressWarnings("unused") boolean bl3 = var8 = var0 > var2; if(var8) {