diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 5a8a90dc7..70cfe1f44 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -37,7 +37,6 @@ import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.exceptions.IrisException; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.format.MemoryMonitor; import com.volmit.iris.util.function.NastyRunnable; import com.volmit.iris.util.io.FileWatcher; import com.volmit.iris.util.io.IO; @@ -449,7 +448,7 @@ public class Iris extends VolmitPlugin implements Listener { J.a(ServerConfigurator::configure, 20); splash(); J.a(MatterTest::test, 20); - + if (IrisSettings.get().getStudio().isAutoStartDefaultStudio()) { Iris.info("Starting up auto Studio!"); try { diff --git a/src/main/java/com/volmit/iris/core/IrisSettings.java b/src/main/java/com/volmit/iris/core/IrisSettings.java index 84fc1ba6c..dd8d32eee 100644 --- a/src/main/java/com/volmit/iris/core/IrisSettings.java +++ b/src/main/java/com/volmit/iris/core/IrisSettings.java @@ -25,8 +25,6 @@ import com.volmit.iris.util.json.JSONException; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; import lombok.Data; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.io.IOException; @@ -43,6 +41,7 @@ public class IrisSettings { private IrisSettingsConcurrency concurrency = new IrisSettingsConcurrency(); private IrisSettingsStudio studio = new IrisSettingsStudio(); private IrisSettingsPerformance performance = new IrisSettingsPerformance(); + public static int getThreadCount(int c) { return switch (c) { case -1, -2, -4 -> Runtime.getRuntime().availableProcessors() / -c; diff --git a/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/src/main/java/com/volmit/iris/core/ServerConfigurator.java index 117678f9f..daff067c6 100644 --- a/src/main/java/com/volmit/iris/core/ServerConfigurator.java +++ b/src/main/java/com/volmit/iris/core/ServerConfigurator.java @@ -41,16 +41,13 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; public class ServerConfigurator { - public static void configure() - { + public static void configure() { IrisSettings.IrisSettingsAutoconfiguration s = IrisSettings.get().getAutoConfiguration(); - if(s.isConfigureSpigotTimeoutTime()) - { + if (s.isConfigureSpigotTimeoutTime()) { J.attempt(ServerConfigurator::increaseKeepAliveSpigot); } - if(s.isConfigurePaperWatchdogDelay()) - { + if (s.isConfigurePaperWatchdogDelay()) { J.attempt(ServerConfigurator::increasePaperWatchdog); } @@ -63,8 +60,7 @@ public class ServerConfigurator { f.load(spigotConfig); long tt = f.getLong("settings.timeout-time"); - if(tt < TimeUnit.MINUTES.toSeconds(5)) - { + if (tt < TimeUnit.MINUTES.toSeconds(5)) { Iris.warn("Updating spigot.yml timeout-time: " + tt + " -> " + TimeUnit.MINUTES.toSeconds(5) + " (5 minutes)"); Iris.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value."); f.set("settings.timeout-time", TimeUnit.MINUTES.toSeconds(5)); @@ -78,8 +74,7 @@ public class ServerConfigurator { f.load(spigotConfig); long tt = f.getLong("settings.watchdog.early-warning-delay"); - if(tt < TimeUnit.MINUTES.toMillis(3)) - { + if (tt < TimeUnit.MINUTES.toMillis(3)) { Iris.warn("Updating paper.yml watchdog early-warning-delay: " + tt + " -> " + TimeUnit.MINUTES.toMillis(3) + " (3 minutes)"); Iris.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value."); f.set("settings.watchdog.early-warning-delay", TimeUnit.MINUTES.toMillis(3)); @@ -112,8 +107,7 @@ public class ServerConfigurator { return null; } - public static void installDataPacks(boolean fullInstall) - { + public static void installDataPacks(boolean fullInstall) { Iris.info("Checking Data Packs..."); boolean reboot = false; File packs = new File("plugins/Iris/packs"); @@ -153,8 +147,7 @@ public class ServerConfigurator { Iris.info("Data Packs Setup!"); - if(fullInstall) - { + if (fullInstall) { verifyDataPacksPost(IrisSettings.get().getAutoConfiguration().isAutoRestartOnCustomBiomeInstall()); } } @@ -196,14 +189,10 @@ public class ServerConfigurator { } } - if(bad) - { - if(allowRestarting) - { + if (bad) { + if (allowRestarting) { restart(); - } - - else if (INMS.get().supportsDataPacks()) { + } else if (INMS.get().supportsDataPacks()) { Iris.error("============================================================================"); Iris.error(C.ITALIC + "You need to restart your server to properly generate custom biomes."); Iris.error(C.ITALIC + "By continuing, Iris will use backup biomes in place of the custom biomes."); diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java index 7bb133722..70ac5781d 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -20,15 +20,12 @@ package com.volmit.iris.core.commands; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.core.service.PreservationSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.data.KCache; import com.volmit.iris.util.decree.DecreeContext; import com.volmit.iris.util.decree.DecreeExecutor; import com.volmit.iris.util.decree.DecreeOrigin; @@ -260,13 +257,13 @@ public class CommandIris implements DecreeExecutor { @Decree(description = "Update the pack of a world (UNSAFE!)", name = "^world", aliases = "update-world") public void updateWorld( @Param(description = "The world to update", contextual = true) - World world, + World world, @Param(description = "The pack to install into the world", contextual = true, aliases = "dimension") - IrisDimension pack, + IrisDimension pack, @Param(description = "Make sure to make a backup & read the warnings first!", defaultValue = "false", aliases = "c") - boolean confirm, + boolean confirm, @Param(description = "Should Iris download the pack again for you", defaultValue = "false", name = "fresh-download", aliases = {"fresh", "new"}) - boolean freshDownload + boolean freshDownload ) { if (!confirm) { sender().sendMessage(new String[]{ diff --git a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java index 9693d20cd..8c5e93674 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java @@ -62,7 +62,6 @@ import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.Spiraler; import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.plugin.IrisService; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.O; import com.volmit.iris.util.scheduling.PrecisionStopwatch; @@ -367,7 +366,7 @@ public class CommandStudio implements DecreeExecutor { @Decree(description = "Hotload a studio", aliases = "reload") public void hotload() { - if (!Iris.service(StudioSVC.class).isProjectOpen()){ + if (!Iris.service(StudioSVC.class).isProjectOpen()) { sender().sendMessage(C.RED + "No studio world open!"); return; } diff --git a/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java b/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java index aa60b0f1c..79ce58ae6 100644 --- a/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java +++ b/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java @@ -24,7 +24,6 @@ import com.volmit.iris.core.pregenerator.IrisPregenerator; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregenTask; import com.volmit.iris.core.pregenerator.PregeneratorMethod; -import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; @@ -35,7 +34,6 @@ import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; -import com.volmit.iris.util.scheduling.Looper; import javax.swing.JFrame; import javax.swing.JPanel; @@ -46,7 +44,6 @@ import java.awt.Graphics2D; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.image.BufferedImage; -import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; @@ -72,9 +69,9 @@ public class PregeneratorJob implements PregenListener { private JFrame frame; private PregenRenderer renderer; private int rgc = 0; - private ChronoLatch cl = new ChronoLatch(TimeUnit.MINUTES.toMillis(1)); + private final ChronoLatch cl = new ChronoLatch(TimeUnit.MINUTES.toMillis(1)); private String[] info; - private Engine engine; + private final Engine engine; public PregeneratorJob(PregenTask task, PregeneratorMethod method, Engine engine) { this.engine = engine; @@ -101,8 +98,7 @@ public class PregeneratorJob implements PregenListener { J.a(this.pregenerator::start, 20); } - public Mantle getMantle() - { + public Mantle getMantle() { return pregenerator.getMantle(); } @@ -243,8 +239,7 @@ public class PregeneratorJob implements PregenListener { @Override public void onChunkGenerating(int x, int z) { - if(engine != null) - { + if (engine != null) { return; } @@ -253,8 +248,7 @@ public class PregeneratorJob implements PregenListener { @Override public void onChunkGenerated(int x, int z) { - if(engine != null) - { + if (engine != null) { draw(x, z, engine.draw((x << 4) + 8, (z << 4) + 8)); return; } @@ -269,8 +263,7 @@ public class PregeneratorJob implements PregenListener { } private void shouldGc() { - if(cl.flip() && rgc > 16) - { + if (cl.flip() && rgc > 16) { System.gc(); } } @@ -329,8 +322,7 @@ public class PregeneratorJob implements PregenListener { @Override public void onChunkExistsInRegionGen(int x, int z) { - if(engine != null) - { + if (engine != null) { draw(x, z, engine.draw((x << 4) + 8, (z << 4) + 8)); return; } diff --git a/src/main/java/com/volmit/iris/core/loader/IrisData.java b/src/main/java/com/volmit/iris/core/loader/IrisData.java index dbee39943..79ff87dae 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisData.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisData.java @@ -55,7 +55,6 @@ import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.IrisMatter; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java index 3985f325c..62736470c 100644 --- a/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java @@ -22,14 +22,8 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.data.KCache; -import com.volmit.iris.util.format.C; -import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.math.M; -import com.volmit.iris.util.scheduling.ChronoLatch; -import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import java.io.File; @@ -127,7 +121,7 @@ public class ObjectResourceLoader extends ResourceLoader { return load(name, true); } - private IrisObject loadRaw(String name){ + private IrisObject loadRaw(String name) { for (File i : getFolders(name)) { for (File j : i.listFiles()) { if (j.isFile() && j.getName().endsWith(".iob") && j.getName().split("\\Q.\\E")[0].equals(name)) { diff --git a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java index 61e3f65af..93592b482 100644 --- a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java @@ -25,7 +25,6 @@ import com.volmit.iris.core.project.SchemaBuilder; import com.volmit.iris.core.service.PreservationSVC; import com.volmit.iris.engine.framework.MeteredCache; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.data.KCache; import com.volmit.iris.util.format.C; @@ -34,7 +33,6 @@ import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONArray; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.scheduling.ChronoLatch; -import com.volmit.iris.util.scheduling.IrisLock; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; @@ -238,8 +236,7 @@ public class ResourceLoader implements MeteredCache { return load(name, true); } - private T loadRaw(String name) - { + private T loadRaw(String name) { for (File i : getFolders(name)) { //noinspection ConstantConditions for (File j : i.listFiles()) { diff --git a/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java index 7e725c372..329756a00 100644 --- a/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java @@ -113,8 +113,7 @@ public class ScriptResourceLoader extends ResourceLoader { return null; } - private IrisScript loadRaw(String name) - { + private IrisScript loadRaw(String name) { for (File i : getFolders(name)) { for (File j : i.listFiles()) { if (j.isFile() && j.getName().endsWith(".js") && j.getName().split("\\Q.\\E")[0].equals(name)) { diff --git a/src/main/java/com/volmit/iris/core/pregenerator/PregenTask.java b/src/main/java/com/volmit/iris/core/pregenerator/PregenTask.java index 45d958489..facaf8e2e 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/PregenTask.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/PregenTask.java @@ -18,28 +18,20 @@ package com.volmit.iris.core.pregenerator; -import com.volmit.iris.Iris; -import com.volmit.iris.core.gui.PregeneratorJob; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.math.Position2; -import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.Spiraled; import com.volmit.iris.util.math.Spiraler; import lombok.Builder; import lombok.Data; -import org.checkerframework.checker.units.qual.K; -import java.util.Arrays; import java.util.Comparator; -import java.util.Set; -import java.util.function.Function; @Builder @Data public class PregenTask { - private static final Position2 ZERO = new Position2(0,0); + private static final Position2 ZERO = new Position2(0, 0); private static final KList ORDER_CENTER = computeChunkOrder(); private static final KMap> ORDERS = new KMap<>(); @@ -51,13 +43,13 @@ public class PregenTask { private int height = 1; public static void iterateRegion(int xr, int zr, Spiraled s, Position2 pull) { - for (Position2 i : ORDERS.computeIfAbsent(pull, PregenTask::computeOrder)) { + for (Position2 i : ORDERS.computeIfAbsent(pull, PregenTask::computeOrder)) { s.on(i.getX() + (xr << 5), i.getZ() + (zr << 5)); } } public static void iterateRegion(int xr, int zr, Spiraled s) { - iterateRegion(xr, zr, s, new Position2(0,0)); + iterateRegion(xr, zr, s, new Position2(0, 0)); } private static KList computeOrder(Position2 pull) { diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java index 249c21518..aa828ffd5 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java @@ -133,8 +133,7 @@ public class AsyncPregenMethod implements PregeneratorMethod { @Override public Mantle getMantle() { - if(IrisToolbelt.isIrisWorld(world)) - { + if (IrisToolbelt.isIrisWorld(world)) { return IrisToolbelt.access(world).getEngine().getMantle().getMantle(); } diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java index 23fc072cc..753610582 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java @@ -102,8 +102,7 @@ public class HybridPregenMethod implements PregeneratorMethod { @Override public Mantle getMantle() { - if (headless == null) - { + if (headless == null) { return inWorld.getMantle(); } diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/MedievalPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/MedievalPregenMethod.java index 47d911268..2ee50ea2f 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/MedievalPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/MedievalPregenMethod.java @@ -111,8 +111,7 @@ public class MedievalPregenMethod implements PregeneratorMethod { @Override public Mantle getMantle() { - if(IrisToolbelt.isIrisWorld(world)) - { + if (IrisToolbelt.isIrisWorld(world)) { return IrisToolbelt.access(world).getEngine().getMantle().getMantle(); } diff --git a/src/main/java/com/volmit/iris/core/service/PreservationSVC.java b/src/main/java/com/volmit/iris/core/service/PreservationSVC.java index c6d57940b..b3081f7dc 100644 --- a/src/main/java/com/volmit/iris/core/service/PreservationSVC.java +++ b/src/main/java/com/volmit/iris/core/service/PreservationSVC.java @@ -19,22 +19,16 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.MeteredCache; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.data.KCache; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.IrisService; import com.volmit.iris.util.scheduling.Looper; -import com.volmit.iris.util.stream.utility.CachedStream2D; -import java.util.Comparator; import java.util.List; -import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; @@ -57,27 +51,24 @@ public class PreservationSVC implements IrisService { services.add(service); } - public void printCaches() - { + public void printCaches() { long s = caches.stream().filter(i -> !i.isClosed()).mapToLong(MeteredCache::getSize).sum(); long m = caches.stream().filter(i -> !i.isClosed()).mapToLong(MeteredCache::getMaxSize).sum(); double p = 0; double mf = 0; - for(MeteredCache i : caches) - { - if(i.isClosed()) - { + for (MeteredCache i : caches) { + if (i.isClosed()) { continue; } mf++; - p+= i.getUsage(); + p += i.getUsage(); } mf = mf == 0 ? 1 : mf; - Iris.info("Cached " + Form.f(s) + " / " + Form.f(m) + " (" + Form.pc(p/mf) + ") from " + caches.size() + " Caches"); + Iris.info("Cached " + Form.f(s) + " / " + Form.f(m) + " (" + Form.pc(p / mf) + ") from " + caches.size() + " Caches"); } public void dereference() { @@ -131,8 +122,7 @@ public class PreservationSVC implements IrisService { }); } - public void updateCaches() - { + public void updateCaches() { caches.removeIf(MeteredCache::isClosed); } diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 0000487c9..1d1ccedc9 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -21,30 +21,20 @@ package com.volmit.iris.engine; import com.google.common.util.concurrent.AtomicDouble; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.events.IrisEngineHotloadEvent; import com.volmit.iris.core.gui.PregeneratorJob; import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.service.PreservationSVC; -import com.volmit.iris.engine.actuator.IrisBiomeActuator; -import com.volmit.iris.engine.actuator.IrisDecorantActuator; -import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineEffects; import com.volmit.iris.engine.framework.EngineMetrics; import com.volmit.iris.engine.framework.EngineMode; -import com.volmit.iris.engine.framework.EngineStage; import com.volmit.iris.engine.framework.EngineTarget; import com.volmit.iris.engine.framework.EngineWorldManager; import com.volmit.iris.engine.framework.SeedManager; import com.volmit.iris.engine.framework.WrongEngineBroException; import com.volmit.iris.engine.mantle.EngineMantle; -import com.volmit.iris.engine.mode.ModeOverworld; -import com.volmit.iris.engine.modifier.IrisCarveModifier; -import com.volmit.iris.engine.modifier.IrisDepositModifier; -import com.volmit.iris.engine.modifier.IrisPerfectionModifier; -import com.volmit.iris.engine.modifier.IrisPostModifier; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiomePaletteLayer; import com.volmit.iris.engine.object.IrisDecorator; @@ -53,10 +43,8 @@ import com.volmit.iris.engine.object.IrisJigsawStructure; import com.volmit.iris.engine.object.IrisObjectPlacement; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.util.atomics.AtomicRollingSequence; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.context.IrisContext; -import com.volmit.iris.util.data.B; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; @@ -65,8 +53,6 @@ import com.volmit.iris.util.io.IO; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.MatterCavern; -import com.volmit.iris.util.matter.MatterFluidBody; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; @@ -196,8 +182,7 @@ public class IrisEngine implements Engine { } private void setupMode() { - if(mode != null) - { + if (mode != null) { mode.close(); } @@ -462,7 +447,7 @@ public class IrisEngine implements Engine { mode.generate(x, z, blocks, vbiomes, multicore); } - getMantle().getMantle().flag(x>>4, z>>4, MantleFlag.REAL, true); + getMantle().getMantle().flag(x >> 4, z >> 4, MantleFlag.REAL, true); getMetrics().getTotal().put(p.getMilliseconds()); generated.incrementAndGet(); recycle(); diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index a09e055da..0dc5719b8 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -21,7 +21,6 @@ package com.volmit.iris.engine; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.engine.data.cache.Multicache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedWorldManager; import com.volmit.iris.engine.object.IRare; @@ -43,8 +42,6 @@ import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.MatterCavern; -import com.volmit.iris.util.matter.MatterFluidBody; import com.volmit.iris.util.matter.MatterMarker; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.Chunks; @@ -56,10 +53,8 @@ import com.volmit.iris.util.scheduling.jobs.QueueJob; import io.papermc.lib.PaperLib; import lombok.Data; import lombok.EqualsAndHashCode; -import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; -import org.bukkit.block.data.BlockData; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -68,7 +63,6 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.inventory.ItemStack; -import java.net.MalformedURLException; import java.util.List; import java.util.Map; import java.util.Set; @@ -76,7 +70,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -133,8 +126,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { getEngine().getWorld().tryGetRealWorld(); } - if(!IrisSettings.get().getWorld().isMarkerEntitySpawningSystem() && !IrisSettings.get().getWorld().isAnbientEntitySpawningSystem()) - { + if (!IrisSettings.get().getWorld().isMarkerEntitySpawningSystem() && !IrisSettings.get().getWorld().isAnbientEntitySpawningSystem()) { return 3000; } @@ -201,13 +193,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager { for (int z = -r; z <= r; z++) { if (c.getWorld().isChunkLoaded(c.getX() + x, c.getZ() + z) && Chunks.isSafe(getEngine().getWorld().realWorld(), c.getX() + x, c.getZ() + z)) { - if(IrisSettings.get().getWorld().isPostLoadBlockUpdates()) - { + if (IrisSettings.get().getWorld().isPostLoadBlockUpdates()) { getEngine().updateChunk(c.getWorld().getChunkAt(c.getX() + x, c.getZ() + z)); } - if(IrisSettings.get().getWorld().isMarkerEntitySpawningSystem()) - { + if (IrisSettings.get().getWorld().isMarkerEntitySpawningSystem()) { Chunk cx = getEngine().getWorld().realWorld().getChunkAt(c.getX() + x, c.getZ() + z); int finalX = c.getX() + x; int finalZ = c.getZ() + z; @@ -299,8 +289,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } private void spawnIn(Chunk c, boolean initial) { - if(getEngine().isClosed()) - { + if (getEngine().isClosed()) { return; } @@ -330,8 +319,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { .popRandom(RNG.r) : null; //@done - if(IrisSettings.get().getWorld().isMarkerEntitySpawningSystem()) - { + if (IrisSettings.get().getWorld().isMarkerEntitySpawningSystem()) { getSpawnersFromMarkers(c).forEach((block, spawners) -> { if (spawners.isEmpty()) { return; @@ -496,8 +484,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { @Override public void onChunkLoad(Chunk e, boolean generated) { - if(getEngine().isClosed()) - { + if (getEngine().isClosed()) { return; } @@ -507,8 +494,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } private void spawn(IrisPosition block, IrisSpawner spawner, boolean initial) { - if(getEngine().isClosed()) - { + if (getEngine().isClosed()) { return; } @@ -538,8 +524,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { @Override public void teleportAsync(PlayerTeleportEvent e) { - if(IrisSettings.get().getWorld().getAsyncTeleport().isEnabled()) - { + if (IrisSettings.get().getWorld().getAsyncTeleport().isEnabled()) { e.setCancelled(true); warmupAreaAsync(e.getPlayer(), e.getTo(), () -> J.s(() -> { ignoreTP.set(true); @@ -550,46 +535,43 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } private void warmupAreaAsync(Player player, Location to, Runnable r) { - J.a(() -> { - int viewDistance = IrisSettings.get().getWorld().getAsyncTeleport().getLoadViewDistance(); - KList> futures = new KList<>(); - for(int i = -viewDistance; i <= viewDistance; i++) - { - for(int j = -viewDistance; j <= viewDistance; j++) - { - int finalJ = j; - int finalI = i; + J.a(() -> { + int viewDistance = IrisSettings.get().getWorld().getAsyncTeleport().getLoadViewDistance(); + KList> futures = new KList<>(); + for (int i = -viewDistance; i <= viewDistance; i++) { + for (int j = -viewDistance; j <= viewDistance; j++) { + int finalJ = j; + int finalI = i; - if(to.getWorld().isChunkLoaded((to.getBlockX() >> 4) + i, (to.getBlockZ() >> 4) + j)) - { - futures.add(CompletableFuture.completedFuture(null)); - continue; - } + if (to.getWorld().isChunkLoaded((to.getBlockX() >> 4) + i, (to.getBlockZ() >> 4) + j)) { + futures.add(CompletableFuture.completedFuture(null)); + continue; + } - futures.add(MultiBurst.burst.completeValue(() - -> PaperLib.getChunkAtAsync(to.getWorld(), - (to.getBlockX() >> 4) + finalI, - (to.getBlockZ() >> 4) + finalJ, - true, IrisSettings.get().getWorld().getAsyncTeleport().isUrgent()).get())); - } - } + futures.add(MultiBurst.burst.completeValue(() + -> PaperLib.getChunkAtAsync(to.getWorld(), + (to.getBlockX() >> 4) + finalI, + (to.getBlockZ() >> 4) + finalJ, + true, IrisSettings.get().getWorld().getAsyncTeleport().isUrgent()).get())); + } + } - new QueueJob>() { - @Override - public void execute(Future chunkFuture) { - try { - chunkFuture.get(); - } catch (InterruptedException | ExecutionException e) { + new QueueJob>() { + @Override + public void execute(Future chunkFuture) { + try { + chunkFuture.get(); + } catch (InterruptedException | ExecutionException e) { - } - } + } + } - @Override - public String getName() { - return "Loading Chunks"; - } - }.queue(futures).execute(new VolmitSender(player), true, r); - }); + @Override + public String getName() { + return "Loading Chunks"; + } + }.queue(futures).execute(new VolmitSender(player), true, r); + }); } public Map> getSpawnersFromMarkers(Chunk c) { diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index 7805bab31..258bb6b6b 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -25,7 +25,6 @@ import com.volmit.iris.core.gui.components.Renderer; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.IrisComplex; -import com.volmit.iris.engine.IrisWorldManager; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.mantle.EngineMantle; @@ -61,7 +60,6 @@ import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; -import com.volmit.iris.util.matter.MatterFluidBody; import com.volmit.iris.util.matter.MatterUpdate; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; @@ -74,13 +72,11 @@ import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.data.BlockData; import org.bukkit.command.CommandSender; -import org.bukkit.entity.EnderSignal; import org.bukkit.entity.Player; import org.bukkit.generator.ChunkGenerator; import org.bukkit.inventory.Inventory; @@ -794,12 +790,10 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat } default void gotoJigsaw(IrisJigsawStructure s, Player player) { - if(s.getLoadKey().equals(getDimension().getStronghold())) - { + if (s.getLoadKey().equals(getDimension().getStronghold())) { KList p = getDimension().getStrongholds(getSeedManager().getSpawn()); - if(p.isEmpty()) - { + if (p.isEmpty()) { player.sendMessage(C.GOLD + "No strongholds in world."); } @@ -905,10 +899,8 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat Locator.region(r.getLoadKey()).find(player); } - default void cleanupMantleChunk(int x, int z) - { - if(IrisSettings.get().getPerformance().isTrimMantleInStudio() || !isStudio()) - { + default void cleanupMantleChunk(int x, int z) { + if (IrisSettings.get().getPerformance().isTrimMantleInStudio() || !isStudio()) { J.a(() -> getMantle().cleanupChunk(x, z)); } } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java index 7b92a95c5..6632ebf1b 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -71,26 +71,19 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void on(PlayerTeleportEvent e) { - if(ignoreTP.get()) - { + if (ignoreTP.get()) { return; } - if(!PaperLib.isPaper() || e.getTo() == null) - { + if (!PaperLib.isPaper() || e.getTo() == null) { return; } - try - { - if(e.getTo().getWorld().equals(getTarget().getWorld().realWorld())) - { + try { + if (e.getTo().getWorld().equals(getTarget().getWorld().realWorld())) { getEngine().getWorldManager().teleportAsync(e); } - } - - catch(Throwable ex) - { + } catch (Throwable ex) { } } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineMode.java b/src/main/java/com/volmit/iris/engine/framework/EngineMode.java index 22018a963..44bb57963 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineMode.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineMode.java @@ -32,19 +32,16 @@ public interface EngineMode extends Staged { Engine getEngine(); - default MultiBurst burst() - { + default MultiBurst burst() { return getEngine().burst(); } - default EngineStage burst(EngineStage... stages) - { + default EngineStage burst(EngineStage... stages) { return (x, z, blocks, biomes, multicore) -> { BurstExecutor e = burst().burst(stages.length); e.setMulticore(multicore); - for(EngineStage i : stages) - { + for (EngineStage i : stages) { e.queue(() -> i.generate(x, z, blocks, biomes, multicore)); } @@ -52,13 +49,11 @@ public interface EngineMode extends Staged { }; } - default IrisComplex getComplex() - { + default IrisComplex getComplex() { return getEngine().getComplex(); } - default EngineMantle getMantle() - { + default EngineMantle getMantle() { return getEngine().getMantle(); } @@ -67,8 +62,7 @@ public interface EngineMode extends Staged { } @BlockCoordinates - default void generate(int x, int z, Hunk blocks, Hunk biomes, boolean multicore) - { + default void generate(int x, int z, Hunk blocks, Hunk biomes, boolean multicore) { for (EngineStage i : getStages()) { i.generate(x, z, blocks, biomes, multicore); } diff --git a/src/main/java/com/volmit/iris/engine/framework/IrisEngineMode.java b/src/main/java/com/volmit/iris/engine/framework/IrisEngineMode.java index f0b9d17fa..bdc675376 100644 --- a/src/main/java/com/volmit/iris/engine/framework/IrisEngineMode.java +++ b/src/main/java/com/volmit/iris/engine/framework/IrisEngineMode.java @@ -25,18 +25,15 @@ public abstract class IrisEngineMode implements EngineMode { private final KList stages; private boolean closed; - public IrisEngineMode(Engine engine) - { + public IrisEngineMode(Engine engine) { this.engine = engine; this.stages = new KList<>(); this.closed = false; } @Override - public synchronized void close() - { - if(closed) - { + public synchronized void close() { + if (closed) { return; } diff --git a/src/main/java/com/volmit/iris/engine/framework/MeteredCache.java b/src/main/java/com/volmit/iris/engine/framework/MeteredCache.java index 1f566a861..5548ce5a2 100644 --- a/src/main/java/com/volmit/iris/engine/framework/MeteredCache.java +++ b/src/main/java/com/volmit/iris/engine/framework/MeteredCache.java @@ -20,17 +20,15 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.util.data.KCache; -public interface MeteredCache -{ +public interface MeteredCache { long getSize(); KCache getRawCache(); long getMaxSize(); - default double getUsage() - { - return (double)getSize() / (double)getMaxSize(); + default double getUsage() { + return (double) getSize() / (double) getMaxSize(); } boolean isClosed(); diff --git a/src/main/java/com/volmit/iris/engine/framework/Staged.java b/src/main/java/com/volmit/iris/engine/framework/Staged.java index 069d8af77..1a4709b74 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Staged.java +++ b/src/main/java/com/volmit/iris/engine/framework/Staged.java @@ -25,8 +25,7 @@ public interface Staged { void registerStage(EngineStage stage); - default void dump() - { + default void dump() { getStages().forEach(EngineStage::close); getStages().clear(); } diff --git a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java index bc5cd5e31..cf87b65f7 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.mantle; -import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.IrisComplex; @@ -46,12 +45,9 @@ import com.volmit.iris.util.matter.MatterMarker; import com.volmit.iris.util.matter.slices.UpdateMatter; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.scheduling.J; -import io.papermc.lib.PaperLib; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; // TODO: MOVE PLACER OUT OF MATTER INTO ITS OWN THING @@ -269,16 +265,14 @@ public interface EngineMantle extends IObjectPlacer { MantleObjectComponent getObjectComponent(); - default boolean isCovered(int x, int z) - { + default boolean isCovered(int x, int z) { int s = getRealRadius(); for (int i = -s; i <= s; i++) { for (int j = -s; j <= s; j++) { int xx = i + x; int zz = j + z; - if(!getMantle().hasFlag(xx, zz, MantleFlag.REAL)) - { + if (!getMantle().hasFlag(xx, zz, MantleFlag.REAL)) { return false; } } @@ -287,10 +281,8 @@ public interface EngineMantle extends IObjectPlacer { return true; } - default void cleanupChunk(int x, int z) - { - if(!getMantle().hasFlag(x, z, MantleFlag.CLEANED) && isCovered(x, z)) - { + default void cleanupChunk(int x, int z) { + if (!getMantle().hasFlag(x, z, MantleFlag.CLEANED) && isCovered(x, z)) { getMantle().raiseFlag(x, z, MantleFlag.CLEANED, () -> { getMantle().deleteChunkSlice(x, z, BlockData.class); getMantle().deleteChunkSlice(x, z, String.class); diff --git a/src/main/java/com/volmit/iris/engine/mode/ModeEnclosure.java b/src/main/java/com/volmit/iris/engine/mode/ModeEnclosure.java index 24def0438..3ea7e28f4 100644 --- a/src/main/java/com/volmit/iris/engine/mode/ModeEnclosure.java +++ b/src/main/java/com/volmit/iris/engine/mode/ModeEnclosure.java @@ -25,15 +25,14 @@ import com.volmit.iris.engine.framework.EngineMode; import com.volmit.iris.engine.framework.IrisEngineMode; public class ModeEnclosure extends IrisEngineMode implements EngineMode { - public ModeEnclosure(Engine engine) - { + public ModeEnclosure(Engine engine) { super(engine); var terrain = new IrisTerrainNormalActuator(getEngine()); var biome = new IrisBiomeActuator(getEngine()); registerStage(burst( - (x, z, k, p, m) -> terrain.actuate(x, z, k, m), - (x, z, k, p, m) -> biome.actuate(x, z, p, m) + (x, z, k, p, m) -> terrain.actuate(x, z, k, m), + (x, z, k, p, m) -> biome.actuate(x, z, p, m) )); } } diff --git a/src/main/java/com/volmit/iris/engine/mode/ModeIslands.java b/src/main/java/com/volmit/iris/engine/mode/ModeIslands.java index 5dd557b52..0ad388a43 100644 --- a/src/main/java/com/volmit/iris/engine/mode/ModeIslands.java +++ b/src/main/java/com/volmit/iris/engine/mode/ModeIslands.java @@ -25,15 +25,14 @@ import com.volmit.iris.engine.framework.EngineMode; import com.volmit.iris.engine.framework.IrisEngineMode; public class ModeIslands extends IrisEngineMode implements EngineMode { - public ModeIslands(Engine engine) - { + public ModeIslands(Engine engine) { super(engine); var terrain = new IrisTerrainNormalActuator(getEngine()); var biome = new IrisBiomeActuator(getEngine()); registerStage(burst( - (x, z, k, p, m) -> terrain.actuate(x, z, k, m), - (x, z, k, p, m) -> biome.actuate(x, z, p, m) + (x, z, k, p, m) -> terrain.actuate(x, z, k, m), + (x, z, k, p, m) -> biome.actuate(x, z, p, m) )); } } diff --git a/src/main/java/com/volmit/iris/engine/mode/ModeOverworld.java b/src/main/java/com/volmit/iris/engine/mode/ModeOverworld.java index 07269ca3d..9530b043d 100644 --- a/src/main/java/com/volmit/iris/engine/mode/ModeOverworld.java +++ b/src/main/java/com/volmit/iris/engine/mode/ModeOverworld.java @@ -31,8 +31,7 @@ import com.volmit.iris.engine.modifier.IrisPostModifier; import org.bukkit.block.data.BlockData; public class ModeOverworld extends IrisEngineMode implements EngineMode { - public ModeOverworld(Engine engine) - { + public ModeOverworld(Engine engine) { super(engine); var terrain = new IrisTerrainNormalActuator(getEngine()); var biome = new IrisBiomeActuator(getEngine()); @@ -43,9 +42,9 @@ public class ModeOverworld extends IrisEngineMode implements EngineMode { var perfection = new IrisPerfectionModifier(getEngine()); registerStage(burst( - (x, z, k, p, m) -> generateMatter(x >> 4, z >> 4, m), - (x, z, k, p, m) -> terrain.actuate(x, z, k, m), - (x, z, k, p, m) -> biome.actuate(x, z, p, m) + (x, z, k, p, m) -> generateMatter(x >> 4, z >> 4, m), + (x, z, k, p, m) -> terrain.actuate(x, z, k, m), + (x, z, k, p, m) -> biome.actuate(x, z, p, m) )); registerStage((x, z, k, p, m) -> cave.modify(x >> 4, z >> 4, k, m)); registerStage((x, z, k, p, m) -> deposit.modify(x, z, k, m)); diff --git a/src/main/java/com/volmit/iris/engine/mode/ModeSuperFlat.java b/src/main/java/com/volmit/iris/engine/mode/ModeSuperFlat.java index 89e3b4d64..76c450500 100644 --- a/src/main/java/com/volmit/iris/engine/mode/ModeSuperFlat.java +++ b/src/main/java/com/volmit/iris/engine/mode/ModeSuperFlat.java @@ -25,15 +25,14 @@ import com.volmit.iris.engine.framework.EngineMode; import com.volmit.iris.engine.framework.IrisEngineMode; public class ModeSuperFlat extends IrisEngineMode implements EngineMode { - public ModeSuperFlat(Engine engine) - { + public ModeSuperFlat(Engine engine) { super(engine); var terrain = new IrisTerrainNormalActuator(getEngine()); var biome = new IrisBiomeActuator(getEngine()); registerStage(burst( - (x, z, k, p, m) -> terrain.actuate(x, z, k, m), - (x, z, k, p, m) -> biome.actuate(x, z, p, m) + (x, z, k, p, m) -> terrain.actuate(x, z, k, m), + (x, z, k, p, m) -> biome.actuate(x, z, p, m) )); } } diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java index b03dac036..22d31655c 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java @@ -39,7 +39,6 @@ import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.slices.MarkerMatter; import com.volmit.iris.util.scheduling.PrecisionStopwatch; -import com.volmit.iris.util.stream.utility.CachedStream2D; import lombok.Data; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -237,8 +236,7 @@ public class IrisCarveModifier extends EngineAssignedModifier { blocks = biome.generateCeilingLayers(getDimension(), xx, zz, rng, 3, zone.ceiling, getData(), getComplex()); - if(zone.ceiling + 1 < mantle.getWorldHeight()) - { + if (zone.ceiling + 1 < mantle.getWorldHeight()) { for (int i = 0; i < zone.ceiling + 1; i++) { if (!blocks.hasIndex(i)) { break; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCommand.java b/src/main/java/com/volmit/iris/engine/object/IrisCommand.java index d9027d2a3..d64b4d213 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCommand.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCommand.java @@ -21,7 +21,6 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Snippet; import com.volmit.iris.util.collection.KList; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java b/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java index ace70422a..8dcc244a1 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java @@ -18,7 +18,12 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.*; +import com.volmit.iris.engine.object.annotations.ArrayType; +import com.volmit.iris.engine.object.annotations.DependsOn; +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.object.annotations.MaxNumber; +import com.volmit.iris.engine.object.annotations.MinNumber; +import com.volmit.iris.engine.object.annotations.Snippet; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimensionModeType.java b/src/main/java/com/volmit/iris/engine/object/IrisDimensionModeType.java index 789ae615a..09f546825 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimensionModeType.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimensionModeType.java @@ -44,13 +44,11 @@ public enum IrisDimensionModeType { ; private final Function factory; - IrisDimensionModeType(Function factory) - { + IrisDimensionModeType(Function factory) { this.factory = factory; } - public EngineMode create(Engine e) - { + public EngineMode create(Engine e) { return factory.apply(e); } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java index 8175c19f3..c8305111e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java @@ -21,8 +21,13 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.util.collection.KList; +import com.volmit.iris.engine.object.annotations.ArrayType; +import com.volmit.iris.engine.object.annotations.DependsOn; +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.object.annotations.MaxNumber; +import com.volmit.iris.engine.object.annotations.MinNumber; +import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.annotations.Snippet; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLake.java b/src/main/java/com/volmit/iris/engine/object/IrisLake.java index 7c463e553..b493ddaa3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLake.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLake.java @@ -26,10 +26,7 @@ import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; import com.volmit.iris.engine.object.annotations.Snippet; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.MatterFluidBody; -import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRiver.java b/src/main/java/com/volmit/iris/engine/object/IrisRiver.java index 6a2e76c2b..f58d2635f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRiver.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRiver.java @@ -26,10 +26,7 @@ import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; import com.volmit.iris.engine.object.annotations.Snippet; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.MatterFluidBody; -import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java index f603f0157..e698bb0cb 100644 --- a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java @@ -29,7 +29,6 @@ import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineTarget; import com.volmit.iris.engine.object.HeadlessWorld; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.documentation.RegionCoordinates; import com.volmit.iris.util.hunk.Hunk; @@ -41,7 +40,6 @@ import com.volmit.iris.util.nbt.mca.NBTWorld; import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.scheduling.J; import lombok.Data; import org.bukkit.Material; import org.bukkit.World; @@ -51,7 +49,6 @@ import org.bukkit.generator.ChunkGenerator; import java.io.File; import java.io.IOException; import java.util.List; -import java.util.Set; import java.util.function.Consumer; @Data @@ -135,21 +132,19 @@ public class HeadlessGenerator implements PlatformChunkGenerator { } private Position2 avgLast(int x, int z) { - while(last.size() > 3) - { + while (last.size() > 3) { last.remove(0); } double xx = 0; double zz = 0; - for(Position2 i : last) - { + for (Position2 i : last) { xx += 27 * (i.getX() - x); zz += 27 * (i.getZ() - z); } - return new Position2((int)xx, (int)zz); + return new Position2((int) xx, (int) zz); } @RegionCoordinates diff --git a/src/main/java/com/volmit/iris/util/collection/KMap.java b/src/main/java/com/volmit/iris/util/collection/KMap.java index a46e28e5f..8ca4c9388 100644 --- a/src/main/java/com/volmit/iris/util/collection/KMap.java +++ b/src/main/java/com/volmit/iris/util/collection/KMap.java @@ -42,12 +42,9 @@ public class KMap extends ConcurrentHashMap { put(gMap); } - public K getKey(V value) - { - for(KeyPair i : keypair()) - { - if(i.getV().equals(value)) - { + public K getKey(V value) { + for (KeyPair i : keypair()) { + if (i.getV().equals(value)) { return i.getK(); } } diff --git a/src/main/java/com/volmit/iris/util/data/B.java b/src/main/java/com/volmit/iris/util/data/B.java index 8a157a191..10e524ebf 100644 --- a/src/main/java/com/volmit/iris/util/data/B.java +++ b/src/main/java/com/volmit/iris/util/data/B.java @@ -400,13 +400,11 @@ public class B { try { String bd = bdxf.trim(); - if(bd.startsWith("minecraft:cauldron[level=")) - { + if (bd.startsWith("minecraft:cauldron[level=")) { bd = bd.replaceAll("\\Q:cauldron[\\E", ":water_cauldron["); } - if(bd.equals("minecraft:grass_path")) - { + if (bd.equals("minecraft:grass_path")) { return DIRT_PATH.createBlockData(); } diff --git a/src/main/java/com/volmit/iris/util/data/ChunkCache.java b/src/main/java/com/volmit/iris/util/data/ChunkCache.java index 6b0be1d26..9214f8e20 100644 --- a/src/main/java/com/volmit/iris/util/data/ChunkCache.java +++ b/src/main/java/com/volmit/iris/util/data/ChunkCache.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.data; import com.volmit.iris.util.function.Function2; -import java.util.Arrays; import java.util.concurrent.atomic.AtomicReferenceArray; public class ChunkCache { @@ -30,14 +29,12 @@ public class ChunkCache { cache = new AtomicReferenceArray<>(256); } - public T compute(int x, int z, Function2 function) - { - T t = get(x&15, z&15); + public T compute(int x, int z, Function2 function) { + T t = get(x & 15, z & 15); - if(t == null) - { + if (t == null) { t = function.apply(x, z); - set(x&15, z&15, t); + set(x & 15, z & 15, t); } return t; diff --git a/src/main/java/com/volmit/iris/util/data/ComplexCache.java b/src/main/java/com/volmit/iris/util/data/ComplexCache.java index 2d4db1958..801a32257 100644 --- a/src/main/java/com/volmit/iris/util/data/ComplexCache.java +++ b/src/main/java/com/volmit/iris/util/data/ComplexCache.java @@ -22,25 +22,21 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.util.collection.KMap; public class ComplexCache { - private KMap> chunks; + private final KMap> chunks; - public ComplexCache() - { + public ComplexCache() { chunks = new KMap<>(); } - public boolean has(int x, int z) - { + public boolean has(int x, int z) { return chunks.containsKey(Cache.key(x, z)); } - public void invalidate(int x, int z) - { + public void invalidate(int x, int z) { chunks.remove(Cache.key(x, z)); } - public ChunkCache chunk(int x, int z) - { + public ChunkCache chunk(int x, int z) { return chunks.computeIfAbsent(Cache.key(x, z), (f) -> new ChunkCache<>()); } } diff --git a/src/main/java/com/volmit/iris/util/data/KCache.java b/src/main/java/com/volmit/iris/util/data/KCache.java index effab2c66..99bf04cd0 100644 --- a/src/main/java/com/volmit/iris/util/data/KCache.java +++ b/src/main/java/com/volmit/iris/util/data/KCache.java @@ -24,27 +24,25 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import com.volmit.iris.engine.framework.MeteredCache; import com.volmit.iris.util.math.RollingSequence; -public class KCache implements MeteredCache { +public class KCache implements MeteredCache { private final long max; private CacheLoader loader; - private LoadingCache cache; + private final LoadingCache cache; private final boolean fastDump; private final RollingSequence msu = new RollingSequence(100); - public KCache(CacheLoader loader, long max) - { + public KCache(CacheLoader loader, long max) { this(loader, max, false); } - public KCache(CacheLoader loader, long max, boolean fastDump) - { + public KCache(CacheLoader loader, long max, boolean fastDump) { this.max = max; this.fastDump = fastDump; this.loader = loader; this.cache = create(loader); } - private LoadingCache create(CacheLoader loader) { + private LoadingCache create(CacheLoader loader) { return Caffeine .newBuilder() .maximumSize(max) @@ -54,23 +52,19 @@ public class KCache implements MeteredCache { } - public void setLoader(CacheLoader loader) - { + public void setLoader(CacheLoader loader) { this.loader = loader; } - public void invalidate(K k) - { + public void invalidate(K k) { cache.invalidate(k); } - public void invalidate() - { + public void invalidate() { cache.invalidateAll(); } - public V get(K k) - { + public V get(K k) { return cache.get(k); } diff --git a/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java b/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java index a0b664634..f79fa9a3d 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java +++ b/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java @@ -59,32 +59,26 @@ public class BitStorage { this(bits, length, (AtomicLongArray) null); } - private static AtomicLongArray atomic(long[] data) - { - if(data == null) - { + private static AtomicLongArray atomic(long[] data) { + if (data == null) { return null; } AtomicLongArray d = new AtomicLongArray(data.length); - for(int i = 0; i < data.length; i++) - { + for (int i = 0; i < data.length; i++) { d.set(i, data[i]); } return d; } - private static long[] atomic(AtomicLongArray data) - { - if(data == null) - { + private static long[] atomic(AtomicLongArray data) { + if (data == null) { return null; } long[] d = new long[data.length()]; - for(int i = 0; i < data.length(); i++) - { + for (int i = 0; i < data.length(); i++) { d[i] = data.get(i); } @@ -107,8 +101,7 @@ public class BitStorage { this.divideShift = MAGIC[var3 + 2]; int var4 = (length + this.valuesPerLong - 1) / this.valuesPerLong; if (data != null) { - if (data.length() != var4) - { + if (data.length() != var4) { throw new RuntimeException("NO!"); } this.data = data; @@ -166,8 +159,7 @@ public class BitStorage { public void getAll(IntConsumer var0) { int var1 = 0; - for(int i = 0; i < data.length(); i++) - { + for (int i = 0; i < data.length(); i++) { long var5 = data.get(i); for (int var7 = 0; var7 < this.valuesPerLong; var7++) { var0.accept((int) (var5 & this.mask)); diff --git a/src/main/java/com/volmit/iris/util/data/palette/CrudeIncrementalIntIdentityHashBiMap.java b/src/main/java/com/volmit/iris/util/data/palette/CrudeIncrementalIntIdentityHashBiMap.java index 63dce90cc..49bcf4309 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/CrudeIncrementalIntIdentityHashBiMap.java +++ b/src/main/java/com/volmit/iris/util/data/palette/CrudeIncrementalIntIdentityHashBiMap.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.data.palette; import com.google.common.collect.Iterators; -import java.util.Arrays; import java.util.Iterator; import java.util.Objects; import java.util.concurrent.atomic.AtomicIntegerArray; @@ -49,16 +48,14 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { public K byId(int var0) { - if (var0 < 0 || var0 >= this.byId.length()) - { + if (var0 < 0 || var0 >= this.byId.length()) { return null; } return this.byId.get(var0); } private int getValue(int var0) { - if (var0 == -1) - { + if (var0 == -1) { return -1; } return this.values.get(var0); @@ -79,8 +76,7 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { } private int nextId() { - while (nextId < byId.length() && byId.get(nextId) != null) - { + while (nextId < byId.length() && byId.get(nextId) != null) { nextId++; } return nextId; @@ -95,8 +91,7 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { this.nextId = 0; this.size = 0; for (int var3 = 0; var3 < var1.length(); var3++) { - if (var1.get(var3) != null) - { + if (var1.get(var3) != null) { addMapping(var1.get(var3), var2.get(var3)); } } @@ -126,8 +121,7 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { private int indexOf(K var0, int var1) { int var2; for (var2 = var1; var2 < this.keys.length(); var2++) { - if (this.keys.get(var2) == null) - { + if (this.keys.get(var2) == null) { return 0; } if (this.keys.get(var2).equals(var0)) @@ -158,11 +152,12 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { } public Iterator iterator() { - return Iterators.filter(new Iterator(){ + return Iterators.filter(new Iterator() { int i = 0; + @Override public boolean hasNext() { - return i < byId.length()-1; + return i < byId.length() - 1; } @Override @@ -174,15 +169,12 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { public void clear() { - for(int i = 0; i < Math.max(keys.length(), byId.length()); i++) - { - if(i < keys.length() - 1) - { + for (int i = 0; i < Math.max(keys.length(), byId.length()); i++) { + if (i < keys.length() - 1) { keys.set(i, null); } - if(i < byId.length() - 1) - { + if (i < byId.length() - 1) { byId.set(i, null); } } diff --git a/src/main/java/com/volmit/iris/util/data/palette/GlobalPalette.java b/src/main/java/com/volmit/iris/util/data/palette/GlobalPalette.java index 502dd5e4f..5f76e0e46 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/GlobalPalette.java +++ b/src/main/java/com/volmit/iris/util/data/palette/GlobalPalette.java @@ -18,8 +18,6 @@ package com.volmit.iris.util.data.palette; -import com.volmit.iris.util.nbt.tag.ListTag; - import java.util.List; import java.util.function.Predicate; @@ -28,11 +26,9 @@ public class GlobalPalette implements Palette { private final T defaultValue; - public GlobalPalette(T... f) - { + public GlobalPalette(T... f) { IdMapper mapper = new IdMapper<>(); - for(T i : f) - { + for (T i : f) { mapper.add(i); } registry = mapper; diff --git a/src/main/java/com/volmit/iris/util/data/palette/HashMapPalette.java b/src/main/java/com/volmit/iris/util/data/palette/HashMapPalette.java index 26c1561f4..e01bd848a 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/HashMapPalette.java +++ b/src/main/java/com/volmit/iris/util/data/palette/HashMapPalette.java @@ -20,12 +20,8 @@ package com.volmit.iris.util.data.palette; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.ListTag; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; public class HashMapPalette implements Palette { private final KMap values; @@ -41,16 +37,14 @@ public class HashMapPalette implements Palette { } public int idFor(T var0) { - if(var0 == null) - { + if (var0 == null) { return 0; } return this.values.computeIfAbsent(var0, (k) -> { int newId = id++; - if (newId >= 1 << this.bits) - { + if (newId >= 1 << this.bits) { Iris.info(newId + " to..."); newId = this.resizeHandler.onResize(this.bits + 1, var0); Iris.info(newId + ".."); diff --git a/src/main/java/com/volmit/iris/util/data/palette/IdMapper.java b/src/main/java/com/volmit/iris/util/data/palette/IdMapper.java index f5e287a8e..a9d840d60 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/IdMapper.java +++ b/src/main/java/com/volmit/iris/util/data/palette/IdMapper.java @@ -49,8 +49,7 @@ public class IdMapper implements IdMap { public void addMapping(T var0, int var1) { this.tToId.put(var0, Integer.valueOf(var1)); - while (this.idToT.size() <= var1) - { + while (this.idToT.size() <= var1) { this.idToT.add(null); } this.idToT.set(var1, var0); @@ -68,8 +67,7 @@ public class IdMapper implements IdMap { } public final T byId(int var0) { - if (var0 >= 0 && var0 < this.idToT.size()) - { + if (var0 >= 0 && var0 < this.idToT.size()) { return this.idToT.get(var0); } return null; diff --git a/src/main/java/com/volmit/iris/util/data/palette/LinearPalette.java b/src/main/java/com/volmit/iris/util/data/palette/LinearPalette.java index f95bcd113..f8dd5ca54 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/LinearPalette.java +++ b/src/main/java/com/volmit/iris/util/data/palette/LinearPalette.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.data.palette; import java.util.List; import java.util.concurrent.atomic.AtomicReferenceArray; -import java.util.function.Predicate; public class LinearPalette implements Palette { private final AtomicReferenceArray values; @@ -37,13 +36,11 @@ public class LinearPalette implements Palette { public int idFor(T var0) { int var1; for (var1 = 0; var1 < size; var1++) { - if(values.get(var1) == null && var0 == null) - { + if (values.get(var1) == null && var0 == null) { return var1; } - if (values.get(var1) != null && values.get(var1).equals(var0)) - { + if (values.get(var1) != null && values.get(var1).equals(var0)) { return var1; } } @@ -57,8 +54,7 @@ public class LinearPalette implements Palette { } public T valueFor(int var0) { - if (var0 >= 0 && var0 < size) - { + if (var0 >= 0 && var0 < size) { return this.values.get(var0); } return null; @@ -70,8 +66,7 @@ public class LinearPalette implements Palette { @Override public void read(List fromList) { - for (int i = 0; i < fromList.size(); i++) - { + for (int i = 0; i < fromList.size(); i++) { values.set(i, fromList.get(i)); } @@ -80,8 +75,7 @@ public class LinearPalette implements Palette { @Override public void write(List toList) { - for (int i = 0; i < size; i++) - { + for (int i = 0; i < size; i++) { T v = values.get(i); toList.add(v); } diff --git a/src/main/java/com/volmit/iris/util/data/palette/Palette.java b/src/main/java/com/volmit/iris/util/data/palette/Palette.java index 57c148883..38b1479f9 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/Palette.java +++ b/src/main/java/com/volmit/iris/util/data/palette/Palette.java @@ -18,11 +18,7 @@ package com.volmit.iris.util.data.palette; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.ListTag; - import java.util.List; -import java.util.function.Predicate; public interface Palette { int idFor(T paramT); diff --git a/src/main/java/com/volmit/iris/util/data/palette/PaletteType.java b/src/main/java/com/volmit/iris/util/data/palette/PaletteType.java index cd908e021..a7e2eccc0 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/PaletteType.java +++ b/src/main/java/com/volmit/iris/util/data/palette/PaletteType.java @@ -42,8 +42,7 @@ public interface PaletteType { int v = Varint.readUnsignedVarInt(din); List t = new ArrayList<>(); - for(int i = 0; i < v; i++) - { + for (int i = 0; i < v; i++) { t.add(readPaletteNode(din)); } diff --git a/src/main/java/com/volmit/iris/util/data/palette/PalettedContainer.java b/src/main/java/com/volmit/iris/util/data/palette/PalettedContainer.java index dad5291a0..075946a32 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/PalettedContainer.java +++ b/src/main/java/com/volmit/iris/util/data/palette/PalettedContainer.java @@ -21,8 +21,8 @@ package com.volmit.iris.util.data.palette; import com.volmit.iris.Iris; import com.volmit.iris.util.math.M; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; + import java.util.List; -import java.util.function.Predicate; @SuppressWarnings("DuplicatedCode") public class PalettedContainer implements PaletteResize { @@ -43,8 +43,7 @@ public class PalettedContainer implements PaletteResize { } private void setBits(int var0) { - if (var0 == this.bits) - { + if (var0 == this.bits) { return; } this.bits = var0; @@ -65,8 +64,7 @@ public class PalettedContainer implements PaletteResize { setBits(var0); for (int var4 = 0; var4 < var2.getSize(); var4++) { T var5 = var3.valueFor(var2.get(var4)); - if (var5 != null) - { + if (var5 != null) { set(var4, var5); } } @@ -95,8 +93,7 @@ public class PalettedContainer implements PaletteResize { private void set(int var0, T var1) { int var2 = this.palette.idFor(var1); - if(M.r(0.003)) - { + if (M.r(0.003)) { Iris.info("ID for " + var1 + " is " + var2 + " Palette: " + palette.getSize()); } @@ -113,8 +110,7 @@ public class PalettedContainer implements PaletteResize { public void read(List palette, long[] data) { int var2 = Math.max(4, Mth.ceillog2(palette.size())); - if (var2 != this.bits) - { + if (var2 != this.bits) { setBits(var2); } @@ -124,8 +120,7 @@ public class PalettedContainer implements PaletteResize { System.arraycopy(data, 0, this.storage.getRaw(), 0, data.length); } else { BitStorage var4 = new BitStorage(var3, 4096, data); - for (int var5 = 0; var5 < 4096; var5++) - { + for (int var5 = 0; var5 < 4096; var5++) { this.storage.set(var5, var4.get(var5)); } } diff --git a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java index 02ef2e15d..8ff7a9f25 100644 --- a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java +++ b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java @@ -34,7 +34,6 @@ import com.volmit.iris.util.decree.exceptions.DecreeParsingException; import com.volmit.iris.util.decree.exceptions.DecreeWhichException; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.CommandDummy; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.ChronoLatch; diff --git a/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java b/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java index a04146b8b..c48147adc 100644 --- a/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java +++ b/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.format; -import com.volmit.iris.Iris; import com.volmit.iris.util.math.RollingSequence; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.Looper; @@ -30,14 +29,14 @@ public class MemoryMonitor { private long garbageLast; private long garbageBin; private long pressure; - private ChronoLatch cl; - private RollingSequence pressureAvg; - private Runtime runtime; + private final ChronoLatch cl; + private final RollingSequence pressureAvg; + private final Runtime runtime; - public MemoryMonitor(int sampleDelay){ + public MemoryMonitor(int sampleDelay) { this.runtime = Runtime.getRuntime(); usedMemory = -1; - pressureAvg = new RollingSequence(Math.max(Math.min(100, 1000/sampleDelay), 3)); + pressureAvg = new RollingSequence(Math.max(Math.min(100, 1000 / sampleDelay), 3)); garbageBin = 0; garbageMemory = -1; cl = new ChronoLatch(1000); @@ -56,74 +55,55 @@ public class MemoryMonitor { looper.start(); } - public long getGarbageBytes() - { + public long getGarbageBytes() { return garbageMemory; } - public long getUsedBytes() - { + public long getUsedBytes() { return usedMemory; } - public long getMaxBytes() - { + public long getMaxBytes() { return runtime.maxMemory(); } - public long getPressure() - { + public long getPressure() { return (long) pressureAvg.getAverage(); } - public double getUsagePercent() - { - return usedMemory / (double)getMaxBytes(); + public double getUsagePercent() { + return usedMemory / (double) getMaxBytes(); } private void sample() { long used = getVMUse(); - if(usedMemory == -1) - { + if (usedMemory == -1) { usedMemory = used; garbageMemory = 0; return; } - if(used < usedMemory) - { + if (used < usedMemory) { usedMemory = used; - } - - else - { + } else { garbageMemory = used - usedMemory; } long g = garbageMemory - garbageLast; - if(g >= 0) - { - garbageBin+= g; + if (g >= 0) { + garbageBin += g; garbageLast = garbageMemory; - } - - else - { + } else { garbageMemory = 0; garbageLast = 0; } - if(cl.flip()) - { - if(garbageMemory > 0) - { + if (cl.flip()) { + if (garbageMemory > 0) { pressure = garbageBin; garbageBin = 0; - } - - else - { + } else { pressure = 0; garbageBin = 0; } @@ -136,10 +116,8 @@ public class MemoryMonitor { return runtime.totalMemory() - runtime.freeMemory(); } - public void close() - { - if(looper != null) - { + public void close() { + if (looper != null) { looper.interrupt(); looper = null; } diff --git a/src/main/java/com/volmit/iris/util/hunk/bits/DataBits.java b/src/main/java/com/volmit/iris/util/hunk/bits/DataBits.java index 7b4b67e2f..3d13c4c90 100644 --- a/src/main/java/com/volmit/iris/util/hunk/bits/DataBits.java +++ b/src/main/java/com/volmit/iris/util/hunk/bits/DataBits.java @@ -18,8 +18,6 @@ package com.volmit.iris.util.hunk.bits; -import com.volmit.iris.Iris; -import com.volmit.iris.util.data.Varint; import org.apache.commons.lang3.Validate; import java.io.DataInputStream; @@ -65,8 +63,7 @@ public class DataBits { this(bits, length, (AtomicLongArray) null); } - public DataBits(int bits, int length, DataInputStream din) throws IOException - { + public DataBits(int bits, int length, DataInputStream din) throws IOException { this(bits, length, longs(din)); } @@ -83,8 +80,7 @@ public class DataBits { int var4 = (length + valuesPerLong - 1) / valuesPerLong; if (data != null) { - if (data.length() != var4) - { + if (data.length() != var4) { throw new RuntimeException("NO! Trying to load " + data.length() + " into actual size of " + var4 + " because length: " + length + " (bits: " + bits + ")"); } this.data = data; @@ -93,36 +89,30 @@ public class DataBits { } } - public String toString() - { + public String toString() { return "DBits: " + size + "/" + bits + "[" + data.length() + "]"; } - private static int dataLength(int bits, int length) - { + private static int dataLength(int bits, int length) { return (length + ((char) (64 / bits)) - 1) / ((char) (64 / bits)); } - private static AtomicLongArray longs(DataInputStream din) throws IOException{ + private static AtomicLongArray longs(DataInputStream din) throws IOException { AtomicLongArray a = new AtomicLongArray(din.readInt()); - for(int i = 0; i < a.length(); i++) - { + for (int i = 0; i < a.length(); i++) { a.set(i, din.readLong()); } return a; } - public DataBits setBits(int newBits) - { - if(bits != newBits) - { + public DataBits setBits(int newBits) { + if (bits != newBits) { DataBits newData = new DataBits(newBits, size); AtomicInteger c = new AtomicInteger(0); - for(int i = 0; i < size; i++) - { + for (int i = 0; i < size; i++) { newData.set(i, get(i)); } @@ -183,14 +173,12 @@ public class DataBits { public void getAll(IntConsumer var0) { int var1 = 0; - for(int i = 0; i < data.length(); i++) - { + for (int i = 0; i < data.length(); i++) { long var5 = data.get(i); for (int var7 = 0; var7 < valuesPerLong; var7++) { var0.accept((int) (var5 & mask)); var5 >>= bits; - if (++var1 >= size) - { + if (++var1 >= size) { return; } } @@ -200,8 +188,7 @@ public class DataBits { public void write(DataOutputStream dos) throws IOException { dos.writeInt(data.length()); - for(int i = 0; i < data.length(); i++) - { + for (int i = 0; i < data.length(); i++) { dos.writeLong(data.get(i)); } } diff --git a/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java b/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java index 23ed74184..05e38b497 100644 --- a/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java +++ b/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java @@ -18,9 +18,6 @@ package com.volmit.iris.util.hunk.bits; -import com.volmit.iris.Iris; -import com.volmit.iris.util.data.Varint; - import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -40,8 +37,7 @@ public class DataContainer { private final int length; private final Writable writer; - public DataContainer(Writable writer, int length, T empty) - { + public DataContainer(Writable writer, int length, T empty) { this.writer = writer; this.length = length; this.bits = new AtomicInteger(INITIAL_BITS); @@ -58,25 +54,22 @@ public class DataContainer { this.bits = new AtomicInteger(palette.get().bits()); } - public String toString(){ - return "DataContainer <" + length + " x " + bits + " bits> -> Palette<"+palette.get().getClass().getSimpleName().replaceAll("\\QPalette\\E", "")+">: " + palette.get().size() + + public String toString() { + return "DataContainer <" + length + " x " + bits + " bits> -> Palette<" + palette.get().getClass().getSimpleName().replaceAll("\\QPalette\\E", "") + ">: " + palette.get().size() + " " + data.get().toString() + " PalBit: " + palette.get().bits(); } - public byte[] write() throws IOException - { + public byte[] write() throws IOException { ByteArrayOutputStream boas = new ByteArrayOutputStream(); write(boas); return boas.toByteArray(); } - public void write(OutputStream out) throws IOException - { + public void write(OutputStream out) throws IOException { writeDos(new DataOutputStream(out)); } - public void writeDos(DataOutputStream dos) throws IOException - { + public void writeDos(DataOutputStream dos) throws IOException { dos.writeInt(length); dos.writeInt(palette.get().size()); palette.get().iterateIO((data, __) -> writer.writeNodeData(dos, data)); @@ -91,38 +84,30 @@ public class DataContainer { return d; } - private Palette newPalette(int bits) - { - if(bits <= LINEAR_BITS_LIMIT) - { + private Palette newPalette(int bits) { + if (bits <= LINEAR_BITS_LIMIT) { return new LinearPalette<>(LINEAR_INITIAL_LENGTH); } return new HashPalette<>(); } - private void checkBits() - { - if(palette.get().size() >= BIT[bits.get()]) - { + private void checkBits() { + if (palette.get().size() >= BIT[bits.get()]) { setBits(bits.get() + 1); } } - public void ensurePaletted(T t) - { - if(palette.get().id(t) == -1) - { + public void ensurePaletted(T t) { + if (palette.get().id(t) == -1) { checkBits(); } } - public void set(int position, T t) - { + public void set(int position, T t) { int id = palette.get().id(t); - if(id == -1) - { + if (id == -1) { checkBits(); id = palette.get().add(t); } @@ -130,24 +115,19 @@ public class DataContainer { data.get().set(position, id); } - public T get(int position) - { - int id = data.get().get(position)+1; + public T get(int position) { + int id = data.get().get(position) + 1; - if(id <= 0) - { + if (id <= 0) { return null; } - return palette.get().get(id-1); + return palette.get().get(id - 1); } - public void setBits(int bits) - { - if(this.bits.get() != bits) - { - if(this.bits.get() <= LINEAR_BITS_LIMIT != bits <= LINEAR_BITS_LIMIT) - { + public void setBits(int bits) { + if (this.bits.get() != bits) { + if (this.bits.get() <= LINEAR_BITS_LIMIT != bits <= LINEAR_BITS_LIMIT) { palette.set(newPalette(bits).from(palette.get())); } @@ -159,25 +139,20 @@ public class DataContainer { private static int[] computeBitLimits() { int[] m = new int[16]; - for(int i = 0; i < m.length; i++) - { + for (int i = 0; i < m.length; i++) { m[i] = (int) Math.pow(2, i); } return m; } - protected static int bits(int size) - { - if(DataContainer.BIT[INITIAL_BITS] >= size) - { + protected static int bits(int size) { + if (DataContainer.BIT[INITIAL_BITS] >= size) { return INITIAL_BITS; } - for(int i = 0; i < DataContainer.BIT.length; i++) - { - if(DataContainer.BIT[i] >= size) - { + for (int i = 0; i < DataContainer.BIT.length; i++) { + if (DataContainer.BIT[i] >= size) { return i; } } diff --git a/src/main/java/com/volmit/iris/util/hunk/bits/HashPalette.java b/src/main/java/com/volmit/iris/util/hunk/bits/HashPalette.java index 091de10e9..6bed881a5 100644 --- a/src/main/java/com/volmit/iris/util/hunk/bits/HashPalette.java +++ b/src/main/java/com/volmit/iris/util/hunk/bits/HashPalette.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.hunk.bits; -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.function.Consumer2; @@ -30,8 +29,7 @@ public class HashPalette implements Palette { private final KMap lookup; private final AtomicInteger size; - public HashPalette() - { + public HashPalette() { this.size = new AtomicInteger(0); this.palette = new LinkedHashMap<>(); this.lookup = new KMap<>(); @@ -39,8 +37,7 @@ public class HashPalette implements Palette { @Override public T get(int id) { - if(id < 0 || id >= size.get()) - { + if (id < 0 || id >= size.get()) { return null; } @@ -52,8 +49,7 @@ public class HashPalette implements Palette { int index = size.getAndIncrement(); palette.put(t, index); - if(t != null) - { + if (t != null) { lookup.put(index, t); } @@ -73,8 +69,7 @@ public class HashPalette implements Palette { @Override public void iterate(Consumer2 c) { - for(T i : palette.keySet()) - { + for (T i : palette.keySet()) { c.accept(i, id(i)); } } diff --git a/src/main/java/com/volmit/iris/util/hunk/bits/LinearPalette.java b/src/main/java/com/volmit/iris/util/hunk/bits/LinearPalette.java index bce74031a..befdead96 100644 --- a/src/main/java/com/volmit/iris/util/hunk/bits/LinearPalette.java +++ b/src/main/java/com/volmit/iris/util/hunk/bits/LinearPalette.java @@ -28,16 +28,14 @@ public class LinearPalette implements Palette { private final AtomicReference> palette; private final AtomicInteger size; - public LinearPalette(int initialSize) - { + public LinearPalette(int initialSize) { this.size = new AtomicInteger(0); this.palette = new AtomicReference<>(new AtomicReferenceArray<>(initialSize)); } @Override public T get(int id) { - if(id < 0 || id >= size.get()) - { + if (id < 0 || id >= size.get()) { return null; } @@ -53,12 +51,10 @@ public class LinearPalette implements Palette { } private void grow(int newLength) { - if(newLength > palette.get().length()) - { + if (newLength > palette.get().length()) { AtomicReferenceArray a = new AtomicReferenceArray<>(newLength + size.get()); - for(int i = 0; i < palette.get().length(); i++) - { + for (int i = 0; i < palette.get().length(); i++) { a.set(i, palette.get().get(i)); } @@ -68,15 +64,12 @@ public class LinearPalette implements Palette { @Override public int id(T t) { - for(int i = 0; i < size(); i++) - { - if(t == null && palette.get().get(i) == null) - { + for (int i = 0; i < size(); i++) { + if (t == null && palette.get().get(i) == null) { return i; } - if(t != null && t.equals(palette.get().get(i))) - { + if (t != null && t.equals(palette.get().get(i))) { return i; } } @@ -91,8 +84,7 @@ public class LinearPalette implements Palette { @Override public void iterate(Consumer2 c) { - for(int i = 0; i < size(); i++) - { + for (int i = 0; i < size(); i++) { c.accept(palette.get().get(i), i); } } diff --git a/src/main/java/com/volmit/iris/util/hunk/bits/Palette.java b/src/main/java/com/volmit/iris/util/hunk/bits/Palette.java index 6c98cb228..d179572ba 100644 --- a/src/main/java/com/volmit/iris/util/hunk/bits/Palette.java +++ b/src/main/java/com/volmit/iris/util/hunk/bits/Palette.java @@ -34,18 +34,16 @@ public interface Palette { int size(); - default int bits() - { + default int bits() { return DataContainer.bits(size()); } void iterate(Consumer2 c); - default void iterateIO(Consumer2IO c) - { - iterate((a,b)-> { + default void iterateIO(Consumer2IO c) { + iterate((a, b) -> { try { - c.accept(a,b); + c.accept(a, b); } catch (IOException e) { e.printStackTrace(); } @@ -53,22 +51,19 @@ public interface Palette { } default Palette from(int size, Writable writable, DataInputStream in) throws IOException { - for(int i = 0; i < size; i++) - { + for (int i = 0; i < size; i++) { add(writable.readNodeData(in)); } return this; } - default Palette from(Palette oldPalette) - { - oldPalette.iterate((k,v) -> add(k)); + default Palette from(Palette oldPalette) { + oldPalette.iterate((k, v) -> add(k)); return this; } - default KList list() - { + default KList list() { KList t = new KList<>(); iterate((tx, __) -> t.add(tx)); return t; diff --git a/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java index 23b3726e2..4d5d9fba8 100644 --- a/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java @@ -27,7 +27,6 @@ import lombok.EqualsAndHashCode; import java.io.IOException; import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; @SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data diff --git a/src/main/java/com/volmit/iris/util/hunk/storage/PaletteHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/PaletteHunk.java index e26848a85..1be335f1d 100644 --- a/src/main/java/com/volmit/iris/util/hunk/storage/PaletteHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/PaletteHunk.java @@ -18,8 +18,6 @@ package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.data.palette.PalettedContainer; import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.function.Consumer4IO; import com.volmit.iris.util.hunk.Hunk; @@ -29,7 +27,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.IOException; -import java.util.Map; @SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data @@ -38,7 +35,7 @@ public class PaletteHunk extends StorageHunk implements Hunk { private DataContainer data; public PaletteHunk(int w, int h, int d, Writable writer, T e) { - super(w,h,d); + super(w, h, d); data = new DataContainer<>(writer, w * h * d, e); } @@ -57,16 +54,12 @@ public class PaletteHunk extends StorageHunk implements Hunk { @Override public synchronized Hunk iterateSync(Consumer4 c) { - for(int i = 0; i < getWidth(); i++) - { - for(int j = 0; j < getHeight(); j++) - { - for(int k = 0; k < getDepth(); k++) - { - T t = getRaw(i,j,k); - if(t != null) - { - c.accept(i,j,k,t); + for (int i = 0; i < getWidth(); i++) { + for (int j = 0; j < getHeight(); j++) { + for (int k = 0; k < getDepth(); k++) { + T t = getRaw(i, j, k); + if (t != null) { + c.accept(i, j, k, t); } } } @@ -76,16 +69,12 @@ public class PaletteHunk extends StorageHunk implements Hunk { @Override public synchronized Hunk iterateSyncIO(Consumer4IO c) throws IOException { - for(int i = 0; i < getWidth(); i++) - { - for(int j = 0; j < getHeight(); j++) - { - for(int k = 0; k < getDepth(); k++) - { - T t = getRaw(i,j,k); - if(t != null) - { - c.accept(i,j,k,t); + for (int i = 0; i < getWidth(); i++) { + for (int j = 0; j < getHeight(); j++) { + for (int k = 0; k < getDepth(); k++) { + T t = getRaw(i, j, k); + if (t != null) { + c.accept(i, j, k, t); } } } diff --git a/src/main/java/com/volmit/iris/util/hunk/storage/PaletteOrHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/PaletteOrHunk.java index 8a2afd5ff..3b58ea338 100644 --- a/src/main/java/com/volmit/iris/util/hunk/storage/PaletteOrHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/PaletteOrHunk.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.util.data.palette.PalettedContainer; import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.function.Consumer4IO; import com.volmit.iris.util.hunk.Hunk; @@ -26,41 +25,38 @@ import com.volmit.iris.util.hunk.bits.DataContainer; import com.volmit.iris.util.hunk.bits.Writable; import java.io.IOException; -import java.util.Map; import java.util.function.Supplier; public abstract class PaletteOrHunk extends StorageHunk implements Hunk, Writable { private final Hunk hunk; + public PaletteOrHunk(int width, int height, int depth, boolean allow, Supplier> factory, T e) { super(width, height, depth); hunk = (allow) ? new PaletteHunk<>(width, height, depth, this, e) : factory.get(); } - public DataContainer palette() - { - return isPalette() ? ((PaletteHunk)hunk).getData() : null; + public DataContainer palette() { + return isPalette() ? ((PaletteHunk) hunk).getData() : null; } public void setPalette(DataContainer c) { - if(isPalette()) - { - ((PaletteHunk)hunk).setPalette(c); + if (isPalette()) { + ((PaletteHunk) hunk).setPalette(c); } } - public boolean isPalette() - { + public boolean isPalette() { return hunk instanceof PaletteHunk; } @Override public void setRaw(int x, int y, int z, T t) { - hunk.setRaw(x,y,z,t); + hunk.setRaw(x, y, z, t); } @Override public T getRaw(int x, int y, int z) { - return hunk.getRaw(x,y,z); + return hunk.getRaw(x, y, z); } public int getEntryCount() { diff --git a/src/main/java/com/volmit/iris/util/io/IO.java b/src/main/java/com/volmit/iris/util/io/IO.java index 05db560ce..b934bf5d7 100644 --- a/src/main/java/com/volmit/iris/util/io/IO.java +++ b/src/main/java/com/volmit/iris/util/io/IO.java @@ -25,7 +25,6 @@ import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.CharArrayWriter; -import java.io.DataOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -166,16 +165,15 @@ public class IO { public static String longsToHex(long[] bytes) { byte[] v = new byte[bytes.length * 8]; - for(int i = 0; i < bytes.length; i++) - { - v[i * 8] = (byte)(bytes[i] >>> 56); - v[(i * 8) + 1] = (byte)(bytes[i] >>> 48); - v[(i * 8) + 2] = (byte)(bytes[i] >>> 40); - v[(i * 8) + 3] = (byte)(bytes[i] >>> 32); - v[(i * 8) + 4] = (byte)(bytes[i] >>> 24); - v[(i * 8) + 5] = (byte)(bytes[i] >>> 16); - v[(i * 8) + 6] = (byte)(bytes[i] >>> 8); - v[(i * 8) + 7] = (byte)(bytes[i] >>> 0); + for (int i = 0; i < bytes.length; i++) { + v[i * 8] = (byte) (bytes[i] >>> 56); + v[(i * 8) + 1] = (byte) (bytes[i] >>> 48); + v[(i * 8) + 2] = (byte) (bytes[i] >>> 40); + v[(i * 8) + 3] = (byte) (bytes[i] >>> 32); + v[(i * 8) + 4] = (byte) (bytes[i] >>> 24); + v[(i * 8) + 5] = (byte) (bytes[i] >>> 16); + v[(i * 8) + 6] = (byte) (bytes[i] >>> 8); + v[(i * 8) + 7] = (byte) (bytes[i] >>> 0); } return bytesToHex(v); diff --git a/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/src/main/java/com/volmit/iris/util/mantle/Mantle.java index 481eaa808..875d6c0ad 100644 --- a/src/main/java/com/volmit/iris/util/mantle/Mantle.java +++ b/src/main/java/com/volmit/iris/util/mantle/Mantle.java @@ -38,7 +38,6 @@ import com.volmit.iris.util.matter.MatterSlice; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.HyperLock; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.scheduling.J; import lombok.Getter; import org.bukkit.Chunk; diff --git a/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java b/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java index 403e8818f..e88ffb593 100644 --- a/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java +++ b/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java @@ -20,12 +20,9 @@ package com.volmit.iris.util.mantle; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.matter.Matter; -import com.volmit.iris.util.nbt.mca.Section; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/util/matter/MatterSlice.java b/src/main/java/com/volmit/iris/util/matter/MatterSlice.java index ad5d85693..c5994b844 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterSlice.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterSlice.java @@ -18,13 +18,10 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.util.data.Varint; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.data.palette.PaletteType; -import com.volmit.iris.util.data.palette.PalettedContainer; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.bits.DataContainer; import com.volmit.iris.util.hunk.bits.Writable; @@ -38,8 +35,6 @@ import org.bukkit.util.BlockVector; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; public interface MatterSlice extends Hunk, PaletteType, Writable { Class getType(); @@ -164,11 +159,10 @@ public interface MatterSlice extends Hunk, PaletteType, Writable { default void write(DataOutputStream dos) throws IOException { dos.writeUTF(getType().getCanonicalName()); - if((this instanceof PaletteOrHunk f && f.isPalette())) - { - f.palette().writeDos(dos); - return; - } + if ((this instanceof PaletteOrHunk f && f.isPalette())) { + f.palette().writeDos(dos); + return; + } int w = getWidth(); int h = getHeight(); @@ -189,8 +183,7 @@ public interface MatterSlice extends Hunk, PaletteType, Writable { } default void read(DataInputStream din) throws IOException { - if((this instanceof PaletteOrHunk f && f.isPalette())) - { + if ((this instanceof PaletteOrHunk f && f.isPalette())) { f.setPalette(new DataContainer<>(din, this)); return; } diff --git a/src/main/java/com/volmit/iris/util/matter/MatterTest.java b/src/main/java/com/volmit/iris/util/matter/MatterTest.java index 7e539df25..83795b6c4 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterTest.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterTest.java @@ -18,21 +18,8 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.Iris; -import com.volmit.iris.util.hunk.bits.DataContainer; -import com.volmit.iris.util.hunk.bits.Writable; -import com.volmit.iris.util.io.IO; -import com.volmit.iris.util.math.RNG; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Arrays; - public class MatterTest { - public static void test() - { + public static void test() { } } diff --git a/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java index 1290cec47..5a8a0b01a 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java @@ -24,7 +24,6 @@ import com.volmit.iris.util.matter.Sliced; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.data.BlockData; -import org.bukkit.entity.Player; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java index 220c5a937..a9936b806 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.matter.Sliced; -import org.bukkit.entity.Player; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java index 51692451e..04de23238 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.Sliced; -import org.bukkit.entity.Player; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java index 427159937..8a53edda5 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java @@ -33,7 +33,6 @@ import com.volmit.iris.util.nbt.tag.CompoundTag; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; import org.bukkit.util.BoundingBox; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java index 6da6a2876..78145821b 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.Varint; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.matter.Sliced; -import org.bukkit.entity.Player; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java index a19f1cf7d..2831fcc1e 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.Varint; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.matter.Sliced; -import org.bukkit.entity.Player; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/MarkerMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/MarkerMatter.java index 9b680d370..ccd315b70 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/MarkerMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/MarkerMatter.java @@ -22,7 +22,6 @@ import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.matter.MatterMarker; import com.volmit.iris.util.matter.Sliced; -import org.bukkit.entity.Player; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java index 9aee92288..e7274f708 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java @@ -20,10 +20,7 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.nbt.io.NBTUtil; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.IntTag; import com.volmit.iris.util.nbt.tag.Tag; -import org.bukkit.entity.Player; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java index a31f614cb..465e9044d 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java @@ -19,7 +19,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.hunk.bits.Writable; import com.volmit.iris.util.hunk.storage.MappedHunk; import com.volmit.iris.util.hunk.storage.PaletteOrHunk; import com.volmit.iris.util.matter.MatterReader; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/RegistryMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/RegistryMatter.java index 55a1122fd..3745b755e 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/RegistryMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/RegistryMatter.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.data.palette.Palette; -import com.volmit.iris.util.matter.MatterTile; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java index c24f07fa7..21479b201 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.palette.GlobalPalette; import com.volmit.iris.util.data.palette.Palette; -import com.volmit.iris.util.matter.MatterTile; import com.volmit.iris.util.matter.MatterUpdate; import com.volmit.iris.util.matter.Sliced; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java b/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java index c2a3adc11..29373637c 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java @@ -255,8 +255,7 @@ public class Chunk { public CompoundTag getBlockStateAt(int blockX, int blockY, int blockZ) { int s = MCAUtil.blockToChunk(blockY); - if(sections.length() <= s) - { + if (sections.length() <= s) { return null; } @@ -282,8 +281,7 @@ public class Chunk { public void setBlockStateAt(int blockX, int blockY, int blockZ, CompoundTag state, boolean cleanup) { int sectionIndex = MCAUtil.blockToChunk(blockY); - if(sections.length() <= sectionIndex) - { + if (sections.length() <= sectionIndex) { return; } diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java b/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java index 47eb5f630..295369c25 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.nbt.mca; -import com.volmit.iris.core.pregenerator.syndicate.SyndicateServer; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.nbt.tag.CompoundTag; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCALinearPalette.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCALinearPalette.java index 836daf3e5..05dbb427e 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCALinearPalette.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCALinearPalette.java @@ -79,8 +79,7 @@ public class MCALinearPalette implements MCAPalette { } public void read(ListTag var0) { - for (int var1 = 0; var1 < var0.size(); var1++) - { + for (int var1 = 0; var1 < var0.size(); var1++) { this.values[var1] = this.reader.apply((CompoundTag) var0.get(var1)); } this.size = var0.size(); diff --git a/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java index 4559dc672..a834bd717 100644 --- a/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java @@ -156,17 +156,12 @@ public class MultiBurst { try { while (!service.awaitTermination(1, TimeUnit.SECONDS)) { Iris.info("Still waiting to shutdown burster..."); - if(p.getMilliseconds() > 7000) - { + if (p.getMilliseconds() > 7000) { Iris.warn("Forcing Shutdown..."); - try - { + try { service.shutdownNow(); - } - - catch(Throwable e) - { + } catch (Throwable e) { } diff --git a/src/main/java/com/volmit/iris/util/scheduling/jobs/Job.java b/src/main/java/com/volmit/iris/util/scheduling/jobs/Job.java index 156328bf8..c2b3dfd10 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/jobs/Job.java +++ b/src/main/java/com/volmit/iris/util/scheduling/jobs/Job.java @@ -72,8 +72,7 @@ public interface Job { }, sender.isPlayer() ? 0 : 20); f.whenComplete((fs, ff) -> { J.car(c); - if(!silentMsg) - { + if (!silentMsg) { sender.sendMessage(C.AQUA + "Completed " + getName() + " in " + Form.duration(p.getMilliseconds(), 1)); } whenComplete.run(); diff --git a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java index 48cf0fe6b..60514a0d9 100644 --- a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java @@ -24,7 +24,6 @@ import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.IRare; import com.volmit.iris.engine.object.IrisStyledRange; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.data.ComplexCache; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; import com.volmit.iris.util.function.Function4; diff --git a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java index 203ecaf52..7f0db1487 100644 --- a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java @@ -18,16 +18,11 @@ package com.volmit.iris.util.stream.utility; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.LoadingCache; -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.service.PreservationSVC; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.MeteredCache; -import com.volmit.iris.util.data.ComplexCache; import com.volmit.iris.util.data.KCache; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; @@ -57,7 +52,7 @@ public class CachedStream2D extends BasicStream implements ProceduralStrea @Override public T get(double x, double z) { - return cache.get(Cache.key((int)x, (int)z)); + return cache.get(Cache.key((int) x, (int) z)); } @Override