diff --git a/build.gradle b/build.gradle index 1a8b92f54..f0314caac 100644 --- a/build.gradle +++ b/build.gradle @@ -91,10 +91,10 @@ file(jar.archiveFile.get().getAsFile().getParentFile().getParentFile().getParent processResources { filesMatching('**/plugin.yml') { expand( - 'name': name.toString(), - 'version': version.toString(), - 'main': main.toString(), - 'apiversion': apiVersion.toString() + 'name': name.toString(), + 'version': version.toString(), + 'main': main.toString(), + 'apiversion': apiVersion.toString() ) } } @@ -158,17 +158,17 @@ compileJava { } shadowJar -{ - minimize() - append("plugin.yml") - relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' - relocate 'io.papermc.lib', 'com.volmit.iris.util.paper' - dependencies { - include(dependency('io.papermc:paperlib')) - include(dependency('com.dfsek:Paralithic')) - include(dependency('net.kyori:')) - } -} + { + minimize() + append("plugin.yml") + relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' + relocate 'io.papermc.lib', 'com.volmit.iris.util.paper' + dependencies { + include(dependency('io.papermc:paperlib')) + include(dependency('com.dfsek:Paralithic')) + include(dependency('net.kyori:')) + } + } dependencies { // Provided or Classpath diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index da8360e3f..634e1be71 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -31,7 +31,6 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeCustom; -import com.volmit.iris.engine.object.block.IrisBlockData; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.compat.IrisCompat; import com.volmit.iris.engine.object.dimensional.IrisDimension; @@ -52,7 +51,10 @@ import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.*; import com.volmit.iris.util.reflect.ShadeFix; -import com.volmit.iris.util.scheduling.*; +import com.volmit.iris.util.scheduling.J; +import com.volmit.iris.util.scheduling.Looper; +import com.volmit.iris.util.scheduling.Queue; +import com.volmit.iris.util.scheduling.ShurikenQueue; import io.papermc.lib.PaperLib; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.serializer.ComponentSerializer; @@ -132,8 +134,7 @@ public class Iris extends VolmitPlugin implements Listener { services.values().forEach(this::registerListener); } - public void postShutdown(Runnable r) - { + public void postShutdown(Runnable r) { postShutdown.add(r); } @@ -437,18 +438,12 @@ public class Iris extends VolmitPlugin implements Listener { @Override public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) { - if(worldName.equals("test")) - { - try - { + if (worldName.equals("test")) { + try { throw new RuntimeException(); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.info(e.getStackTrace()[1].getClassName()); - if(e.getStackTrace()[1].getClassName().contains("com.onarandombox.MultiverseCore")) - { + if (e.getStackTrace()[1].getClassName().contains("com.onarandombox.MultiverseCore")) { Iris.debug("MVC Test detected, Quick! Send them the dummy!"); return new DummyChunkGenerator(); } @@ -490,8 +485,7 @@ public class Iris extends VolmitPlugin implements Listener { Iris.debug("Generator Config: " + w.toString()); File ff = new File(w.worldFolder(), "iris/pack"); - if(!ff.exists() || ff.listFiles().length == 0) - { + if (!ff.exists() || ff.listFiles().length == 0) { ff.mkdirs(); service(StudioSVC.class).installIntoWorld(sender, dim.getLoadKey(), ff.getParentFile()); } @@ -736,21 +730,17 @@ public class Iris extends VolmitPlugin implements Listener { } } - public static void dump() - { - try - { + public static void dump() { + try { File fi = Iris.instance.getDataFile("dump", "td-" + new java.sql.Date(M.ms()) + ".txt"); - FileOutputStream fos = new FileOutputStream(fi ); + FileOutputStream fos = new FileOutputStream(fi); Map f = Thread.getAllStackTraces(); PrintWriter pw = new PrintWriter(fos); - for(Thread i : f.keySet()) - { + for (Thread i : f.keySet()) { pw.println("========================================"); pw.println("Thread: '" + i.getName() + "' ID: " + i.getId() + " STATUS: " + i.getState().name()); - for(StackTraceElement j : f.get(i)) - { + for (StackTraceElement j : f.get(i)) { pw.println(" @ " + j.toString()); } @@ -761,10 +751,7 @@ public class Iris extends VolmitPlugin implements Listener { pw.close(); System.out.println("DUMPED! See " + fi.getAbsolutePath()); - } - - catch(Throwable e) - { + } catch (Throwable e) { e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/core/IrisSettings.java b/src/main/java/com/volmit/iris/core/IrisSettings.java index 7025af4e3..804e91dae 100644 --- a/src/main/java/com/volmit/iris/core/IrisSettings.java +++ b/src/main/java/com/volmit/iris/core/IrisSettings.java @@ -20,12 +20,9 @@ package com.volmit.iris.core; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.basic.IrisRange; -import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONException; import com.volmit.iris.util.json.JSONObject; -import com.volmit.iris.util.scheduling.J; import lombok.Data; import java.io.File; @@ -57,8 +54,7 @@ public class IrisSettings { return getParallax().getParallaxRegionEvictionMS(); } - public static int getPriority(int c) - { + public static int getPriority(int c) { return Math.max(Math.min(c, Thread.MAX_PRIORITY), Thread.MIN_PRIORITY); } diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java index fa8e99db0..ab9f42b73 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java @@ -21,23 +21,13 @@ package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; -import com.volmit.iris.util.scheduling.Queue; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; -import java.text.NumberFormat; -import java.util.*; -import java.util.stream.Collectors; - public class CommandIrisObjectAnalyze extends MortarCommand { public CommandIrisObjectAnalyze() { diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCompile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCompile.java index 6aacda65a..ce8d4fbdf 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCompile.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCompile.java @@ -21,13 +21,10 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.IrisProject; -import com.volmit.iris.core.service.ConversionSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; -import com.volmit.iris.util.scheduling.jobs.Job; -import com.volmit.iris.util.scheduling.jobs.JobCollection; public class CommandIrisStudioCompile extends MortarCommand { public CommandIrisStudioCompile() { @@ -49,8 +46,7 @@ public class CommandIrisStudioCompile extends MortarCommand { return true; } - if(args.length == 0) - { + if (args.length == 0) { sender.sendMessage(getArgsUsage()); return true; } diff --git a/src/main/java/com/volmit/iris/core/decrees/DecIris.java b/src/main/java/com/volmit/iris/core/decrees/DecIris.java index b86d1dc8f..d68168086 100644 --- a/src/main/java/com/volmit/iris/core/decrees/DecIris.java +++ b/src/main/java/com/volmit/iris/core/decrees/DecIris.java @@ -28,13 +28,8 @@ import com.volmit.iris.util.decree.DecreeOrigin; import com.volmit.iris.util.decree.annotations.Decree; import com.volmit.iris.util.decree.annotations.Param; import com.volmit.iris.util.format.C; -import com.volmit.iris.util.math.M; import java.io.File; -import java.io.FileOutputStream; -import java.io.PrintWriter; -import java.sql.Date; -import java.util.Map; @Decree(name = "irisd", aliases = {"ird"}, description = "Basic Command") public class DecIris implements DecreeExecutor { @@ -122,7 +117,8 @@ public class DecIris implements DecreeExecutor { case "%" -> v = value1 % value2; case ">>" -> v = value1 >> value2; case "<<" -> v = value1 << value2; - }; + } + ; if (v == null) { sender().sendMessage(C.RED + "The operator you entered: (" + operator + ") is invalid!"); return; diff --git a/src/main/java/com/volmit/iris/core/decrees/DecObject.java b/src/main/java/com/volmit/iris/core/decrees/DecObject.java index d428238eb..feef11c9e 100644 --- a/src/main/java/com/volmit/iris/core/decrees/DecObject.java +++ b/src/main/java/com/volmit/iris/core/decrees/DecObject.java @@ -23,7 +23,6 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; -import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import java.text.NumberFormat; @@ -36,7 +35,7 @@ public class DecObject implements DecreeExecutor { @Decree(description = "Check the composition of an object") public void analyze( @Param(description = "The object to analyze") - IrisObject object + IrisObject object ) { sender().sendMessage("Object Size: " + object.getW() + " * " + object.getH() + " * " + object.getD() + ""); sender().sendMessage("Blocks Used: " + NumberFormat.getIntegerInstance().format(object.getBlocks().size())); @@ -109,8 +108,8 @@ public class DecObject implements DecreeExecutor { @Decree(description = "Contract a selection based on your looking direction", aliases = "-") public void contract( @Param(description = "The amount to inset by", defaultValue = "1") - int amount - ){ + int amount + ) { if (!WandSVC.isHoldingWand(player())) { sender().sendMessage("Hold your wand."); return; @@ -134,8 +133,8 @@ public class DecObject implements DecreeExecutor { @Decree(description = "Set point 1 to look", aliases = "p1") public void position1( @Param(description = "Whether to use your current position, or where you look", defaultValue = "true") - boolean here - ){ + boolean here + ) { if (!WandSVC.isHoldingWand(player())) { sender().sendMessage("Ready your Wand."); return; @@ -160,7 +159,7 @@ public class DecObject implements DecreeExecutor { public void position2( @Param(description = "Whether to use your current position, or where you look", defaultValue = "true") boolean here - ){ + ) { if (!WandSVC.isHoldingWand(player())) { sender().sendMessage("Ready your Wand."); return; @@ -180,23 +179,25 @@ public class DecObject implements DecreeExecutor { player().setItemInHand(WandSVC.createWand(g[0], g[1])); } } + private static final Set skipBlocks = Set.of(Material.GRASS, Material.SNOW, Material.VINE, Material.TORCH, Material.DEAD_BUSH, Material.POPPY, Material.DANDELION); + @Decree(description = "Paste an object") public void paste( @Param(description = "The object to paste") - IrisObject object, + IrisObject object, @Param(description = "Whether or not to edit the object (need to hold wand)", defaultValue = "false") - boolean edit, + boolean edit, @Param(description = "The amount of degrees to rotate by", defaultValue = "0") - int rotate, + int rotate, @Param(description = "The factor by which to scale the object placement", defaultValue = "1") - double scale, + double scale, @Param(description = "The scale interpolator to use", defaultValue = "none") - IrisObjectPlacementScaleInterpolator interpolator - ){ + IrisObjectPlacementScaleInterpolator interpolator + ) { double maxScale = Double.max(10 - object.getBlocks().size() / 10000d, 1); - if (scale < maxScale){ + if (scale < maxScale) { sender().sendMessage(C.YELLOW + "Indicated scale exceeds maximum. Downscaled to maximum: " + maxScale); scale = maxScale; } diff --git a/src/main/java/com/volmit/iris/core/decrees/DecStudio.java b/src/main/java/com/volmit/iris/core/decrees/DecStudio.java index 6c4cbe873..26e535feb 100644 --- a/src/main/java/com/volmit/iris/core/decrees/DecStudio.java +++ b/src/main/java/com/volmit/iris/core/decrees/DecStudio.java @@ -76,7 +76,6 @@ import org.bukkit.util.Vector; import java.awt.*; import java.io.File; import java.io.IOException; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.function.Supplier; 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 c3f8c7169..3c329c9c1 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 @@ -28,7 +28,6 @@ import io.papermc.lib.PaperLib; import org.bukkit.Chunk; import org.bukkit.World; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; public class AsyncPregenMethod implements PregeneratorMethod { diff --git a/src/main/java/com/volmit/iris/core/project/IrisPack.java b/src/main/java/com/volmit/iris/core/project/IrisPack.java index 98822810d..613b654a4 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisPack.java +++ b/src/main/java/com/volmit/iris/core/project/IrisPack.java @@ -32,13 +32,11 @@ import java.net.MalformedURLException; public class IrisPack { private final File folder; - public IrisPack(File folder) - { + public IrisPack(File folder) { this.folder = folder; } - public void delete() - { + public void delete() { IO.delete(folder); folder.delete(); } diff --git a/src/main/java/com/volmit/iris/core/project/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java index 1a949fdc7..35b50adf6 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -39,9 +39,7 @@ 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.collection.KSet; -import com.volmit.iris.util.data.B; 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.io.IO; import com.volmit.iris.util.json.JSONArray; @@ -55,7 +53,6 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.scheduling.jobs.Job; import com.volmit.iris.util.scheduling.jobs.JobCollection; import com.volmit.iris.util.scheduling.jobs.ParallelQueueJob; -import com.volmit.iris.util.scheduling.jobs.QueueJob; import lombok.Data; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -519,18 +516,16 @@ public class IrisProject { @Override public void execute(File f) { try { - IrisObject o = new IrisObject(0,0,0); + IrisObject o = new IrisObject(0, 0, 0); o.read(f); - if(o.getBlocks().isEmpty()) - { + if (o.getBlocks().isEmpty()) { sender.sendMessageRaw("" + f.getPath() + "'>- IOB " + f.getName() + " has 0 blocks!"); } - if(o.getW() == 0 || o.getH() == 0 || o.getD() == 0) - { + if (o.getW() == 0 || o.getH() == 0 || o.getD() == 0) { sender.sendMessageRaw("" + f.getPath() + "\nThe width height or depth has a zero in it (bad format)" + "'>- IOB " + f.getName() + " is not 3D!"); @@ -558,7 +553,7 @@ public class IrisProject { } catch (Throwable e) { sender.sendMessageRaw("" + f.getPath() + - "\n" +e.getMessage() + + "\n" + e.getMessage() + "'>- JSON Error " + f.getName()); } } @@ -576,8 +571,7 @@ public class IrisProject { String key = data.toLoadKey(f); ResourceLoader loader = data.getTypedLoaderFor(f); - if(loader == null) - { + if (loader == null) { sender.sendMessageBasic("Can't find loader for " + f.getPath()); return; } @@ -587,15 +581,10 @@ public class IrisProject { load.scanForErrors(p, sender); } - public void compare(Class c, JSONObject j, VolmitSender sender, KList path) - { - try - { + public void compare(Class c, JSONObject j, VolmitSender sender, KList path) { + try { Object o = c.getClass().getConstructor().newInstance(); - } - - catch(Throwable e) - { + } catch (Throwable e) { } } diff --git a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java index 989f3126e..609ca038e 100644 --- a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java @@ -32,7 +32,6 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.potion.PotionEffectType; import java.awt.*; -import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; diff --git a/src/main/java/com/volmit/iris/core/project/loader/IrisData.java b/src/main/java/com/volmit/iris/core/project/loader/IrisData.java index 518a151ab..18d857096 100644 --- a/src/main/java/com/volmit/iris/core/project/loader/IrisData.java +++ b/src/main/java/com/volmit/iris/core/project/loader/IrisData.java @@ -19,7 +19,6 @@ package com.volmit.iris.core.project.loader; import com.volmit.iris.Iris; -import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.block.IrisBlockData; @@ -44,9 +43,8 @@ import com.volmit.iris.util.math.RNG; import lombok.Data; import java.io.File; -import java.util.*; +import java.util.Objects; import java.util.function.Function; -import java.util.stream.Collectors; @Data public class IrisData { @@ -73,9 +71,8 @@ public class IrisData { private Engine engine; private final int id; - public static IrisData get(File dataFolder) - { - return dataLoaders.compute(dataFolder, (k,v) -> v == null ? new IrisData(dataFolder) : v); + public static IrisData get(File dataFolder) { + return dataLoaders.compute(dataFolder, (k, v) -> v == null ? new IrisData(dataFolder) : v); } private IrisData(File dataFolder) { @@ -86,20 +83,16 @@ public class IrisData { hotloaded(); } - public static void dereference() - { + public static void dereference() { dataLoaders.v().forEach(IrisData::cleanupEngine); } public ResourceLoader getTypedLoaderFor(File f) { - String[] k = f.getPath().split("\\Q"+File.separator+"\\E"); + String[] k = f.getPath().split("\\Q" + File.separator + "\\E"); - for(String i : k) - { - for(ResourceLoader j : loaders.values()) - { - if(j.getFolderName().equals(i)) - { + for (String i : k) { + for (ResourceLoader j : loaders.values()) { + if (j.getFolderName().equals(i)) { return j; } } @@ -108,10 +101,8 @@ public class IrisData { return null; } - public void cleanupEngine() - { - if(engine != null && engine.isClosed()) - { + public void cleanupEngine() { + if (engine != null && engine.isClosed()) { engine = null; Iris.debug("Dereferenced Data " + getId() + " " + getDataFolder()); } @@ -119,11 +110,9 @@ public class IrisData { public static int cacheSize() { int m = 0; - for(IrisData i : dataLoaders.values()) - { - for(ResourceLoader j : i.getLoaders().values()) - { - m+=j.getLoadCache().size(); + for (IrisData i : dataLoaders.values()) { + for (ResourceLoader j : i.getLoaders().values()) { + m += j.getLoadCache().size(); } } @@ -332,18 +321,14 @@ public class IrisData { } public String toLoadKey(File f) { - if(f.getPath().startsWith(getDataFolder().getPath())) - { + if (f.getPath().startsWith(getDataFolder().getPath())) { String[] full = f.getPath().split("\\Q" + File.separator + "\\E"); String[] df = getDataFolder().getPath().split("\\Q" + File.separator + "\\E"); String g = ""; boolean m = true; - for(int i = 0; i < full.length; i++) - { - if(i >= df.length) - { - if(m) - { + for (int i = 0; i < full.length; i++) { + if (i >= df.length) { + if (m) { m = false; continue; } @@ -354,10 +339,7 @@ public class IrisData { String ff = g.toString().substring(1).split("\\Q.\\E")[0]; return ff; - } - - else - { + } else { Iris.error("Forign file from loader " + f.getPath() + " (loader realm: " + getDataFolder().getPath() + ")"); } diff --git a/src/main/java/com/volmit/iris/core/service/CommandSVC.java b/src/main/java/com/volmit/iris/core/service/CommandSVC.java index 6adaeb2b7..793100629 100644 --- a/src/main/java/com/volmit/iris/core/service/CommandSVC.java +++ b/src/main/java/com/volmit/iris/core/service/CommandSVC.java @@ -18,7 +18,6 @@ package com.volmit.iris.core.service; -import com.volmit.iris.Iris; import com.volmit.iris.core.decrees.DecIris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.util.collection.KList; 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 a6ea2ac7f..9628c8b48 100644 --- a/src/main/java/com/volmit/iris/core/service/PreservationSVC.java +++ b/src/main/java/com/volmit/iris/core/service/PreservationSVC.java @@ -28,29 +28,24 @@ import com.volmit.iris.util.scheduling.Looper; import java.util.concurrent.ExecutorService; -public class PreservationSVC implements IrisService -{ +public class PreservationSVC implements IrisService { private KList threads = new KList<>(); private KList services = new KList<>(); private Looper dereferencer; - public void register(Thread t) - { + public void register(Thread t) { threads.add(t); } - public void register(MultiBurst burst) - { + public void register(MultiBurst burst) { } - public void register(ExecutorService service) - { + public void register(ExecutorService service) { services.add(service); } - public void dereference() - { + public void dereference() { IrisContext.dereference(); IrisData.dereference(); } @@ -76,33 +71,22 @@ public class PreservationSVC implements IrisService dereference(); postShutdown(() -> { - for(Thread i : threads) - { - if(i.isAlive()) - { - try - { + for (Thread i : threads) { + if (i.isAlive()) { + try { i.interrupt(); Iris.info("Shutdown Thread " + i.getName()); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.reportError(e); } } } - for(ExecutorService i : services) - { - try - { + for (ExecutorService i : services) { + try { i.shutdownNow(); Iris.info("Shutdown Executor Service " + i); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.reportError(e); } } diff --git a/src/main/java/com/volmit/iris/core/service/StudioSVC.java b/src/main/java/com/volmit/iris/core/service/StudioSVC.java index 214c581a6..8b28a45c1 100644 --- a/src/main/java/com/volmit/iris/core/service/StudioSVC.java +++ b/src/main/java/com/volmit/iris/core/service/StudioSVC.java @@ -21,7 +21,6 @@ package com.volmit.iris.core.service; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; @@ -77,8 +76,7 @@ public class StudioSVC implements IrisService { for (World i : Bukkit.getWorlds()) { if (IrisToolbelt.isIrisWorld(i)) { - if(IrisToolbelt.isStudio(i)) - { + if (IrisToolbelt.isStudio(i)) { IrisToolbelt.evacuate(i); IrisToolbelt.access(i).close(); } @@ -165,8 +163,7 @@ public class StudioSVC implements IrisService { try { url = getListing(false).get(key); - if(url == null) - { + if (url == null) { Iris.warn("ITS ULL for " + key); } diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index cfff636a1..6b1a9394b 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -19,7 +19,6 @@ 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.project.loader.IrisData; import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator; @@ -32,13 +31,10 @@ import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.engine.object.feature.IrisFeaturePositional; import com.volmit.iris.engine.object.noise.IrisGenerator; -import com.volmit.iris.engine.object.noise.IrisInterpolator; -import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle; import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.DataProvider; -import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; @@ -49,7 +45,6 @@ import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import java.lang.reflect.Field; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 5460564f6..590648584 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -30,7 +30,10 @@ import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.*; import com.volmit.iris.engine.mantle.EngineMantle; -import com.volmit.iris.engine.modifier.*; +import com.volmit.iris.engine.modifier.IrisCaveModifier; +import com.volmit.iris.engine.modifier.IrisDepositModifier; +import com.volmit.iris.engine.modifier.IrisPostModifier; +import com.volmit.iris.engine.modifier.IrisRavineModifier; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; import com.volmit.iris.engine.object.decoration.IrisDecorator; @@ -41,22 +44,16 @@ import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.documentation.BlockCoordinates; -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.hunk.Hunk; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.math.RollingSequence; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; -import lombok.EqualsAndHashCode; -import net.minecraft.world.level.block.state.IBlockData; -import org.bukkit.Bukkit; -import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Biome; @@ -65,7 +62,6 @@ import org.bukkit.command.CommandSender; import java.io.File; import java.io.IOException; -import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -136,13 +132,12 @@ public class IrisEngine implements Engine { } private void tickRandomPlayer() { - if(effects != null) { + if (effects != null) { effects.tickRandomPlayer(); } } - private void prehotload() - { + private void prehotload() { worldManager.close(); complex.close(); execution.close(); @@ -156,10 +151,8 @@ public class IrisEngine implements Engine { effects.close(); } - private void setupEngine() - { - try - { + private void setupEngine() { + try { Iris.debug("Setup Engine " + getCacheID()); cacheId = RNG.r.nextInt(); worldManager = new IrisWorldManager(this); @@ -174,10 +167,7 @@ public class IrisEngine implements Engine { postModifier = new IrisPostModifier(this); effects = new IrisEngineEffects(this); J.a(this::computeBiomeMaxes); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.error("FAILED TO SETUP ENGINE!"); e.printStackTrace(); } @@ -400,8 +390,7 @@ public class IrisEngine implements Engine { @BlockCoordinates @Override public void generate(int x, int z, Hunk vblocks, Hunk vbiomes, boolean multicore) throws WrongEngineBroException { - if(closed) - { + if (closed) { throw new WrongEngineBroException(); } @@ -412,17 +401,13 @@ public class IrisEngine implements Engine { PrecisionStopwatch p = PrecisionStopwatch.start(); Hunk blocks = vblocks.listen((xx, y, zz, t) -> catchBlockUpdates(x + xx, y + getMinHeight(), z + zz, t)); - if(multicore) - { + if (multicore) { for (int i = 0; i < 16; i++) { for (int j = 0; j < 16; j++) { blocks.set(i, 0, j, Material.RED_GLAZED_TERRACOTTA.createBlockData()); } } - } - - else - { + } else { getMantle().generateMatter(x >> 4, z >> 4, multicore); burst().burst(multicore, @@ -444,7 +429,6 @@ public class IrisEngine implements Engine { } - getMetrics().getTotal().put(p.getMilliseconds()); generated.incrementAndGet(); recycle(); diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index 819b0f227..4ae977893 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine; -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; @@ -29,7 +28,6 @@ import com.volmit.iris.engine.mantle.components.MantleJigsawComponent; import com.volmit.iris.engine.mantle.components.MantleObjectComponent; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; import com.volmit.iris.engine.object.feature.IrisFeaturePotential; import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; import com.volmit.iris.engine.object.objects.IrisObject; @@ -39,21 +37,14 @@ import com.volmit.iris.engine.object.regional.IrisRegion; 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.documentation.BlockCoordinates; -import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.mantle.Mantle; -import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.parallel.BurstExecutor; -import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; -import com.volmit.iris.util.stream.utility.CachedStream2D; import lombok.Data; import org.bukkit.util.BlockVector; import java.io.File; import java.io.IOException; -import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index bd794b1ba..f9d261d46 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -39,7 +39,6 @@ import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.Looper; -import io.papermc.lib.PaperLib; import lombok.Data; import lombok.EqualsAndHashCode; import org.bukkit.Chunk; @@ -99,10 +98,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager { interrupt(); } - if(getEngine().getWorld().hasRealWorld()) - { - if(chunkUpdater.flip()) - { + if (getEngine().getWorld().hasRealWorld()) { + if (chunkUpdater.flip()) { updateChunks(); } @@ -152,8 +149,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } private void updateChunks() { - for(Player i : getEngine().getWorld().realWorld().getPlayers()) - { + for (Player i : getEngine().getWorld().realWorld().getPlayers()) { J.s(() -> { Chunk c = i.getLocation().getChunk(); J.a(() -> getEngine().updateChunk(c)); diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java index 347aad64c..5871fd383 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -26,12 +26,10 @@ import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeCustom; import com.volmit.iris.util.documentation.BlockCoordinates; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.view.BiomeGridHunkView; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.parallel.BurstExecutor; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java index 60cab2592..b4ce3231b 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.actuator; -import com.volmit.iris.Iris; import com.volmit.iris.engine.decorator.*; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; @@ -26,7 +25,6 @@ import com.volmit.iris.engine.framework.EngineDecorator; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.carve.IrisCaveLayer; import com.volmit.iris.util.documentation.BlockCoordinates; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.parallel.BurstExecutor; @@ -35,7 +33,6 @@ import lombok.Getter; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiPredicate; import java.util.function.Predicate; @@ -99,7 +96,7 @@ public class IrisDecorantActuator extends EngineAssignedActuator { int realX = (int) Math.round(modX(x + finalI)); int realZ; IrisBiome biome, cave; - for (int j=0; j < output.getDepth(); j++) { + for (int j = 0; j < output.getDepth(); j++) { boolean solid, liquid; int emptyFor = 0; int liquidFor = 0; @@ -113,8 +110,7 @@ public class IrisDecorantActuator extends EngineAssignedActuator { continue; } - if(height < getDimension().getFluidHeight()) - { + if (height < getDimension().getFluidHeight()) { getSeaSurfaceDecorator().decorate(finalI, j, realX, (int) Math.round(modX(x + finalI + 1)), (int) Math.round(modX(x + finalI - 1)), realZ, (int) Math.round(modZ(z + j + 1)), (int) Math.round(modZ(z + j - 1)), diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java index 56fce5f95..64341d239 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java @@ -18,11 +18,9 @@ package com.volmit.iris.engine.actuator; -import com.volmit.iris.Iris; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; @@ -66,8 +64,7 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator getEngine().getMetrics().getTerrain().put(p.getMilliseconds()); } - private int fluidOrHeight(int height) - { + private int fluidOrHeight(int height) { return Math.max(getDimension().getFluidHeight(), height); } @@ -97,7 +94,7 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator KList blocks = null; KList fblocks = null; - int depth,fdepth; + int depth, fdepth; for (int i = hf; i >= 0; i--) { if (i >= h.getHeight()) { diff --git a/src/main/java/com/volmit/iris/engine/data/cache/AtomicCache.java b/src/main/java/com/volmit/iris/engine/data/cache/AtomicCache.java index dc9981faf..19289c809 100644 --- a/src/main/java/com/volmit/iris/engine/data/cache/AtomicCache.java +++ b/src/main/java/com/volmit/iris/engine/data/cache/AtomicCache.java @@ -45,49 +45,35 @@ public class AtomicCache { public void reset() { t.set(null); - if(nullSupport) - { + if (nullSupport) { set.set(false); } } public T aquire(Supplier t) { - if(this.t.get() != null) - { + if (this.t.get() != null) { return this.t.get(); - } - - else if(nullSupport && set.get()) - { + } else if (nullSupport && set.get()) { return null; } lock.lock(); - if(this.t.get() != null) - { + if (this.t.get() != null) { lock.unlock(); return this.t.get(); - } - - else if(nullSupport && set.get()) - { + } else if (nullSupport && set.get()) { lock.unlock(); return null; } - try - { + try { this.t.set(t.get()); - if(nullSupport) - { + if (nullSupport) { set.set(true); } - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.error("Atomic cache failure!"); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java b/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java index c09941c07..a461dbb48 100644 --- a/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java +++ b/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java @@ -92,8 +92,7 @@ public class MCATerrainChunk implements TerrainChunk { return; } - if(blockData == null) - { + if (blockData == null) { Iris.error("NULL BD"); } diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java index 24bb11171..0a4298c2c 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.decorator; -import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.biome.IrisBiome; diff --git a/src/main/java/com/volmit/iris/engine/framework/BlockUpdater.java b/src/main/java/com/volmit/iris/engine/framework/BlockUpdater.java index b1050f15e..5acfb5c51 100644 --- a/src/main/java/com/volmit/iris/engine/framework/BlockUpdater.java +++ b/src/main/java/com/volmit/iris/engine/framework/BlockUpdater.java @@ -21,8 +21,6 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.util.math.RNG; import org.bukkit.Chunk; import org.bukkit.block.data.BlockData; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; public interface BlockUpdater { 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 da5799c4e..a10ae8e6d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -45,10 +45,8 @@ import com.volmit.iris.util.data.B; import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.M; @@ -60,7 +58,10 @@ import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.stream.ProceduralStream; import io.papermc.lib.PaperLib; -import org.bukkit.*; +import org.bukkit.Bukkit; +import org.bukkit.Chunk; +import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; @@ -70,7 +71,6 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import java.awt.*; -import java.awt.Color; import java.util.Arrays; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; @@ -393,8 +393,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat items.addAll(i.getLoot(debug, items.isEmpty(), rng, slot, x, y, z, b + b, mgf + b)); } - if(PaperLib.isPaper() && getWorld().hasRealWorld()) - { + if (PaperLib.isPaper() && getWorld().hasRealWorld()) { PaperLib.getChunkAtAsync(getWorld().realWorld(), x >> 4, z >> 4).thenAccept((c) -> { Runnable r = () -> { for (ItemStack i : items) { @@ -404,20 +403,13 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat scramble(inv, rng); }; - if(Bukkit.isPrimaryThread()) - { + if (Bukkit.isPrimaryThread()) { r.run(); - } - - else - { + } else { J.s(r); } }); - } - - else - { + } else { for (ItemStack i : items) { inv.addItem(i); } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java index 8460d8e3f..77eae4f29 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.Iris; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java index e69648b80..6bcbd2267 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.Iris; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; 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 593fc55f5..a3349e633 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -80,8 +80,7 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent Iris.debug("Ps: " + p.size()); - for(Position2 i : p) - { + for (Position2 i : p) { Iris.debug("- " + i.getX() + " " + i.getZ()); } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java index fb4b0a1af..47b73b49d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java @@ -33,8 +33,7 @@ public interface EngineComponent { String getName(); - default MultiBurst burst() - { + default MultiBurst burst() { return getEngine().burst(); } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java index 7a7c18b4a..c644c9e3c 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.dimensional.IrisDimension; diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index 9cdaf127b..febb334ba 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -21,11 +21,8 @@ package com.volmit.iris.engine.jigsaw; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.entity.IrisEntity; import com.volmit.iris.engine.object.feature.IrisFeature; import com.volmit.iris.engine.object.feature.IrisFeaturePositional; import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; @@ -38,9 +35,7 @@ import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.math.RNG; import lombok.Data; import org.bukkit.Axis; -import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.entity.Entity; import java.util.function.Consumer; @@ -116,20 +111,13 @@ public class PlannedStructure { int offset = i.getPosition().getY() - startHeight; int height = 0; - if(i.getStructure().getStructure().getLockY() == -1) - { - if(i.getStructure().getStructure().getOverrideYRange() != null) - { - height = (int)i.getStructure().getStructure().getOverrideYRange().get(rng, xx, zz, getData()); - } - - else - { + if (i.getStructure().getStructure().getLockY() == -1) { + if (i.getStructure().getStructure().getOverrideYRange() != null) { + height = (int) i.getStructure().getStructure().getOverrideYRange().get(rng, xx, zz, getData()); + } else { height = placer.getHighest(xx, zz, getData()); } - } - - else{ + } else { height = i.getStructure().getStructure().getLockY(); } @@ -244,8 +232,7 @@ public class PlannedStructure { } private boolean generateRotatedPiece(PlannedPiece piece, IrisJigsawPieceConnector pieceConnector, IrisJigsawPiece idea, IrisObjectRotation rotation) { - if (!idea.getPlacementOptions().getRotation().isEnabled()) - { + if (!idea.getPlacementOptions().getRotation().isEnabled()) { rotation = piece.getRotation(); } 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 597012502..b644f1c70 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -33,17 +33,13 @@ import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.mantle.Mantle; -import com.volmit.iris.util.mantle.MantleFlag; -import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Chunk; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; import java.util.List; -import java.util.concurrent.*; import java.util.function.Consumer; // TODO: MOVE PLACER OUT OF MATTER INTO ITS OWN THING @@ -181,8 +177,7 @@ public interface EngineMantle extends IObjectPlacer { KList post = new KList<>(); Consumer c = (i) -> { - synchronized (post) - { + synchronized (post) { post.add(i); } }; @@ -201,8 +196,7 @@ public interface EngineMantle extends IObjectPlacer { burst.complete(); - while(!post.isEmpty()) - { + while (!post.isEmpty()) { KList px = post.copy(); post.clear(); burst().burst(multicore, px); diff --git a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java index c304c7e5d..39353eb7a 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java +++ b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java @@ -20,7 +20,6 @@ package com.volmit.iris.engine.mantle; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.IrisEngineMantle; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.feature.IrisFeaturePositional; @@ -34,8 +33,7 @@ import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; @Data -public class MantleWriter implements IObjectPlacer -{ +public class MantleWriter implements IObjectPlacer { private final EngineMantle engineMantle; private final Mantle mantle; private final KMap cachedChunks; @@ -43,8 +41,7 @@ public class MantleWriter implements IObjectPlacer private final int x; private final int z; - public MantleWriter(EngineMantle engineMantle, Mantle mantle, int x, int z, int radius) - { + public MantleWriter(EngineMantle engineMantle, Mantle mantle, int x, int z, int radius) { this.engineMantle = engineMantle; this.mantle = mantle; this.cachedChunks = new KMap<>(); @@ -59,8 +56,7 @@ public class MantleWriter implements IObjectPlacer } } - public void setData(int x, int y, int z, T t) - { + public void setData(int x, int y, int z, T t) { int cx = x >> 4; int cz = z >> 4; @@ -68,31 +64,22 @@ public class MantleWriter implements IObjectPlacer return; } - if(cx >= this.x - radius && cx <= this.x + radius - && cz >= this.z - radius && cz <= this.z + radius) - { + if (cx >= this.x - radius && cx <= this.x + radius + && cz >= this.z - radius && cz <= this.z + radius) { MantleChunk chunk = cachedChunks.get(Cache.key(cx, cz)); - if(chunk == null) - { + if (chunk == null) { Iris.error("Mantle Writer Accessed " + cx + "," + cz + " and came up null (and yet within bounds!)"); return; } - if(t instanceof IrisFeaturePositional) - { + if (t instanceof IrisFeaturePositional) { chunk.addFeature((IrisFeaturePositional) t); - } - - else - { + } else { Matter matter = chunk.getOrCreate(y >> 4); matter.slice(matter.getClass(t)).set(x & 15, y & 15, z & 15, t); } - } - - else - { + } else { Iris.error("Mantle Writer[" + this.x + "," + this.z + ",R" + this.radius + "] Tried to access " + x + "," + y + "," + z + " (Chunk " + cx + "," + cz + ") which is OUT OF BOUNDS!"); } } @@ -144,6 +131,6 @@ public class MantleWriter implements IObjectPlacer @Override public void setTile(int xx, int yy, int zz, TileData tile) { - getEngineMantle().setTile(xx,yy,zz,tile); + getEngineMantle().setTile(xx, yy, zz, tile); } } diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java index 3e2e7bb63..634a86c02 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.modifier; -import com.volmit.iris.Iris; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; import com.volmit.iris.engine.object.biome.IrisBiome; @@ -26,11 +25,9 @@ import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.data.HeightMap; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.parallel.BurstExecutor; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java index 5b772153a..52a68a678 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -19,26 +19,14 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.Iris; -import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.B; -import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.function.*; import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.hunk.storage.ArrayHunk; -import com.volmit.iris.util.math.Average; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.math.RollingSequence; -import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.scheduling.PrecisionStopwatch; -import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Levelled; @@ -46,8 +34,6 @@ import org.bukkit.block.data.Waterlogged; import org.bukkit.block.data.type.Slab; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Consumer; -import java.util.function.Supplier; public class IrisPostModifier extends EngineAssignedModifier { private static final BlockData AIR = B.get("AIR"); diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java b/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java index e85f499b1..6e2d9deea 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java +++ b/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java @@ -54,8 +54,9 @@ public class IrisPosition { public IrisPosition(Vector v) { this(v.getBlockX(), v.getBlockY(), v.getBlockZ()); } + public IrisPosition(double x, double y, double z) { - this((int)x,(int)y,(int)z); + this((int) x, (int) y, (int) z); } diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java index c54c01a09..2696a5571 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java @@ -35,7 +35,6 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; import com.volmit.iris.engine.object.loot.IrisLootReference; import com.volmit.iris.engine.object.meta.IrisEffect; import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle; import com.volmit.iris.engine.object.noise.IrisSlopeClip; import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.objects.IrisObject; diff --git a/src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java b/src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java index 13483cd7d..4abb7bca7 100644 --- a/src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java +++ b/src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java @@ -18,26 +18,16 @@ package com.volmit.iris.engine.object.cave; -import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.project.loader.IrisRegistrant; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.noise.IrisWorm; -import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.data.B; import com.volmit.iris.util.json.JSONObject; -import com.volmit.iris.util.mantle.Mantle; -import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.noise.Worm; -import com.volmit.iris.util.noise.Worm3; -import com.volmit.iris.util.noise.WormIterator3; import com.volmit.iris.util.plugin.VolmitSender; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.bukkit.block.data.BlockData; -import org.bukkit.util.Vector; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) diff --git a/src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java b/src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java index 3f1ac227d..b31aa2389 100644 --- a/src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java @@ -33,13 +33,11 @@ import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.Worm3; import com.volmit.iris.util.noise.WormIterator3; -import com.volmit.iris.util.plugin.VolmitSender; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.bukkit.block.data.BlockData; -import org.bukkit.util.BlockVector; import org.bukkit.util.Vector; import java.util.concurrent.atomic.AtomicBoolean; @@ -66,22 +64,18 @@ public class IrisCavePlacer implements IRare { private transient final AtomicCache caveCache = new AtomicCache<>(); private transient final AtomicBoolean fail = new AtomicBoolean(false); - public IrisCave getRealCave(IrisData data) - { + public IrisCave getRealCave(IrisData data) { return caveCache.aquire(() -> data.getCaveLoader().load(getCave())); } - public void generateCave(Mantle mantle, RNG rng, IrisData data, int x, int y, int z) - { - if(fail.get()) - { + public void generateCave(Mantle mantle, RNG rng, IrisData data, int x, int y, int z) { + if (fail.get()) { return; } IrisCave cave = getRealCave(data); - if(cave == null) - { + if (cave == null) { Iris.warn("Unable to locate cave for generation!"); fail.set(true); return; @@ -90,8 +84,7 @@ public class IrisCavePlacer implements IRare { WormIterator3 w = cave.getWorm().iterate3D(rng, data, x, y, z); KList points = new KList<>(); int itr = 0; - while(w.hasNext()) - { + while (w.hasNext()) { itr++; Worm3 wx = w.next(); points.add(new Vector(wx.getX().getPosition(), wx.getY().getPosition(), wx.getZ().getPosition())); diff --git a/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java b/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java index 913c3689d..f5e4a52a5 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java +++ b/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java @@ -70,16 +70,13 @@ public class HeadlessWorld { public HeadlessGenerator generate() { Engine e = null; - if(getWorld().tryGetRealWorld()) - { - if(IrisToolbelt.isIrisWorld(getWorld().realWorld())) - { + if (getWorld().tryGetRealWorld()) { + if (IrisToolbelt.isIrisWorld(getWorld().realWorld())) { e = IrisToolbelt.access(getWorld().realWorld()).getEngine(); } } - if(e != null) - { + if (e != null) { Iris.info("Using Existing Engine " + getWorld().name() + " for Headless Pregeneration."); } diff --git a/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java b/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java index 7ba56f9c6..ba22dce05 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java +++ b/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java @@ -62,17 +62,14 @@ public class IrisWorld { .environment(world.getEnvironment()); } - public boolean tryGetRealWorld() - { - if(hasRealWorld()) - { + public boolean tryGetRealWorld() { + if (hasRealWorld()) { return true; } World w = Bukkit.getWorld(name); - if(w != null) - { + if (w != null) { realWorld = w; return true; } diff --git a/src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java index 9cb1607fe..2fb8e4ba8 100644 --- a/src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java @@ -22,7 +22,6 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.noise.IrisGenerator; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java index 0c9aa95eb..2413e3bd7 100644 --- a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java @@ -39,7 +39,6 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; import com.volmit.iris.engine.object.loot.IrisLootReference; import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisInterpolator; import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle; import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; diff --git a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java index 3ae2d9d39..2f1a829d3 100644 --- a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java @@ -105,21 +105,14 @@ public class IrisEntitySpawn implements IRare { }; if (l != null) { - if(referenceSpawner.getAllowedLightLevels().getMin() > 0 || referenceSpawner.getAllowedLightLevels().getMax() < 15) - { - if(referenceSpawner.getAllowedLightLevels().contains(l.getBlock().getLightLevel())) - { - if (spawn100(gen, l) != null) - { + if (referenceSpawner.getAllowedLightLevels().getMin() > 0 || referenceSpawner.getAllowedLightLevels().getMax() < 15) { + if (referenceSpawner.getAllowedLightLevels().contains(l.getBlock().getLightLevel())) { + if (spawn100(gen, l) != null) { s++; } } - } - - else - { - if (spawn100(gen, l) != null) - { + } else { + if (spawn100(gen, l) != null) { s++; } } diff --git a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java b/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java index 0edd0b49b..a7191cf11 100644 --- a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java +++ b/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java @@ -65,13 +65,9 @@ public class IrisFeaturePositional { public static IrisFeaturePositional read(DataInputStream s) throws IOException { String sx = s.readUTF(); - try - { + try { return new Gson().fromJson(sx, IrisFeaturePositional.class); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.error(sx); e.printStackTrace(); throw new IOException(e); diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java index f61c171db..5df9df69b 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java @@ -24,7 +24,6 @@ import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java index ea3e872e3..2bcf60bcc 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.object.noise; -import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java index 97b862308..02e85329e 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java @@ -21,17 +21,8 @@ package com.volmit.iris.engine.object.noise; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.basic.IrisRange; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisNoiseGenerator; -import com.volmit.iris.engine.object.noise.IrisStyledRange; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.noise.Worm; import com.volmit.iris.util.noise.WormIterator2; import com.volmit.iris.util.noise.WormIterator3; import lombok.AllArgsConstructor; @@ -64,13 +55,11 @@ public class IrisWorm { private transient final AtomicCache angleProviderCache = new AtomicCache<>(); - public NoiseProvider getAngleProvider(RNG rng, IrisData data) - { + public NoiseProvider getAngleProvider(RNG rng, IrisData data) { return angleProviderCache.aquire(() -> (xx, zz) -> angleStyle.create(rng, data).fitDouble(-0.5, 0.5, xx, zz) * segmentDistance.get(rng, xx, zz, data)); } - public WormIterator2 iterate2D(RNG rng, IrisData data, int x, int z) - { + public WormIterator2 iterate2D(RNG rng, IrisData data, int x, int z) { return WormIterator2.builder() .maxDistance(maxDistance) .maxIterations(maxSegments == -1 ? maxDistance : maxSegments) @@ -78,8 +67,7 @@ public class IrisWorm { .build(); } - public WormIterator3 iterate3D(RNG rng, IrisData data, int x, int y, int z) - { + public WormIterator3 iterate3D(RNG rng, IrisData data, int x, int y, int z) { return WormIterator3.builder() .maxDistance(maxDistance) .maxIterations(maxSegments == -1 ? maxDistance : maxSegments) diff --git a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java index 728d99c80..e263bd2bd 100644 --- a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java @@ -34,7 +34,6 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; import com.volmit.iris.engine.object.loot.IrisLootReference; import com.volmit.iris.engine.object.meta.IrisEffect; import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle; import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.spawners.IrisSpawner; diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java index 2a0e98687..5a0b08279 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java +++ b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java @@ -35,7 +35,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.bukkit.Bukkit; import org.bukkit.World; @EqualsAndHashCode(callSuper = true) diff --git a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java index 00de5822d..11ec5f9a0 100644 --- a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java @@ -29,13 +29,11 @@ import com.volmit.iris.engine.framework.WrongEngineBroException; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.format.C; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.io.ReactiveFolder; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.Looper; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; import lombok.EqualsAndHashCode; import org.bukkit.Bukkit; @@ -47,8 +45,6 @@ import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; -import javax.management.RuntimeErrorException; -import javax.swing.text.TableView; import java.io.File; import java.util.List; import java.util.Random; @@ -100,13 +96,11 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun IrisData data = IrisData.get(dataLocation); IrisDimension dimension = data.getDimensionLoader().load(dimensionKey); - if(dimension == null) - { + if (dimension == null) { Iris.error("Oh No! There's no pack in " + data.getDataFolder().getPath() + " or... there's no dimension for the key " + dimensionKey); IrisDimension test = IrisData.loadAnyDimension(dimensionKey); - if(test != null) - { + if (test != null) { Iris.warn("Looks like " + dimensionKey + " exists in " + test.getLoadFile().getPath()); Iris.service(StudioSVC.class).installIntoWorld(Iris.getSender(), dimensionKey, dataLocation.getParentFile().getParentFile()); Iris.warn("Attempted to install into " + data.getDataFolder().getPath()); @@ -114,21 +108,14 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun data.clearLists(); test = data.getDimensionLoader().load(dimensionKey); - if(test != null) - { + if (test != null) { Iris.success("Woo! Patched the Engine!"); dimension = test; - } - - else - { + } else { Iris.error("Failed to patch dimension!"); throw new RuntimeException("Missing Dimension: " + dimensionKey); } - } - - else - { + } else { Iris.error("Nope, you don't have an installation containing " + dimensionKey + " try downloading it?"); throw new RuntimeException("Missing Dimension: " + dimensionKey); } @@ -161,8 +148,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun withExclusiveControl(() -> getEngine().hotload()); } - public void withExclusiveControl(Runnable r) - { + public void withExclusiveControl(Runnable r) { J.a(() -> { try { loadLock.acquire(LOAD_LOCKS); @@ -179,8 +165,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun try { - if(lastSeed != world.getSeed()) - { + if (lastSeed != world.getSeed()) { Iris.warn("Seed for engine " + lastSeed + " does not match world seed if " + world.getSeed()); lastSeed = world.getSeed(); engine.getTarget().getWorld().seed(lastSeed); @@ -198,29 +183,20 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun Iris.debug("Generated " + x + " " + z); loadLock.release(); return c; - } - - catch (WrongEngineBroException e) - { + } catch (WrongEngineBroException e) { Iris.warn("Trying to generate with a shut-down engine! Did you reload? Attempting to resolve this..."); - try - { + try { setupEngine(); Iris.success("Resolved! Should generate now!"); - } - - catch(Throwable fe) - { + } catch (Throwable fe) { Iris.error("FATAL! Iris cannot generate in this world since it was reloaded! This will cause a crash, with missing chunks, so we're crashing right now!"); Bukkit.shutdown(); throw new RuntimeException(); } return generateChunkData(world, ignored, x, z, biome); - } - - catch (Throwable e) { + } catch (Throwable e) { loadLock.release(); Iris.error("======================================"); e.printStackTrace(); 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 239e96d05..9aea5b8f2 100644 --- a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java @@ -19,20 +19,16 @@ package com.volmit.iris.engine.platform; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregenTask; import com.volmit.iris.engine.IrisEngine; -import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.data.chunk.MCATerrainChunk; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineTarget; -import com.volmit.iris.engine.framework.WrongEngineBroException; import com.volmit.iris.engine.object.common.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; diff --git a/src/main/java/com/volmit/iris/util/context/IrisContext.java b/src/main/java/com/volmit/iris/util/context/IrisContext.java index 001b978fb..155db0832 100644 --- a/src/main/java/com/volmit/iris/util/context/IrisContext.java +++ b/src/main/java/com/volmit/iris/util/context/IrisContext.java @@ -49,12 +49,10 @@ public class IrisContext { } public static void dereference() { - synchronized (context) - { + synchronized (context) { for (Thread i : context.k()) { if (!i.isAlive() || context.get(i).engine.isClosed()) { - if(context.get(i).engine.isClosed()) - { + if (context.get(i).engine.isClosed()) { Iris.debug("Dereferenced Context " + i.getName() + " " + i.getId()); } 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 8b3d8ec94..ecb14eca4 100644 --- a/src/main/java/com/volmit/iris/util/data/B.java +++ b/src/main/java/com/volmit/iris/util/data/B.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.data; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.scheduling.ChronoLatch; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; @@ -284,8 +283,7 @@ public class B { return Material.valueOf(bdx.trim().toUpperCase()); } catch (Throwable e) { Iris.reportError(e); - if(clw.flip()) - { + if (clw.flip()) { Iris.warn("Unknown Material: " + bdx); } return null; @@ -295,8 +293,7 @@ public class B { public static Material getMaterial(String bdx) { Material m = getMaterialOrNull(bdx); - if(m == null) - { + if (m == null) { return AIR_MATERIAL; } @@ -313,8 +310,7 @@ public class B { BlockData bdx = parseBlockData(bd); if (bdx == null) { - if(clw.flip()) - { + if (clw.flip()) { Iris.warn("Unknown Block Data '" + bd + "'"); } return AIR; @@ -324,8 +320,7 @@ public class B { } catch (Throwable e) { Iris.reportError(e); - if(clw.flip()) - { + if (clw.flip()) { Iris.warn("Unknown Block Data '" + bdxf + "'"); } } @@ -363,8 +358,7 @@ public class B { return bx; } catch (Throwable e) { - if(clw.flip()) - { + if (clw.flip()) { Iris.warn("Unknown Block Data: " + ix); } diff --git a/src/main/java/com/volmit/iris/util/data/IrisPackRepository.java b/src/main/java/com/volmit/iris/util/data/IrisPackRepository.java index 3b4620955..854e68f23 100644 --- a/src/main/java/com/volmit/iris/util/data/IrisPackRepository.java +++ b/src/main/java/com/volmit/iris/util/data/IrisPackRepository.java @@ -20,11 +20,9 @@ package com.volmit.iris.util.data; import com.volmit.iris.Iris; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.jobs.DownloadJob; -import com.volmit.iris.util.scheduling.jobs.Job; import com.volmit.iris.util.scheduling.jobs.JobCollection; import com.volmit.iris.util.scheduling.jobs.SingleJob; import lombok.Builder; @@ -111,8 +109,7 @@ public class IrisPackRepository { public void install(VolmitSender sender) throws MalformedURLException { File pack = Iris.instance.getDataFolder(StudioSVC.WORKSPACE_NAME, getRepo()); - if(!pack.exists()) - { + if (!pack.exists()) { File dl = new File(Iris.getTemp(), "dltk-" + UUID.randomUUID() + ".zip"); File work = new File(Iris.getTemp(), "extk-" + UUID.randomUUID()); new JobCollection(Form.capitalize(getRepo()), diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java b/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java index 9a050d229..896de1713 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java @@ -44,18 +44,13 @@ public class DecreeParameter { public DecreeParameterHandler getHandler() { return handlerCache.aquire(() -> { - try - { - if(param.customHandler().equals(DummyHandler.class)) - { + try { + if (param.customHandler().equals(DummyHandler.class)) { return DecreeSystem.getHandler(getType()); } return param.customHandler().getConstructor().newInstance(); - } - - catch(Throwable e) - { + } catch (Throwable e) { e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java b/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java index c47b48f73..e980a0fba 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeParameterHandler.java @@ -32,8 +32,7 @@ public interface DecreeParameterHandler { */ KList getPossibilities(); - default boolean isDummy() - { + default boolean isDummy() { return false; } diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/VectorHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/VectorHandler.java index 64550b482..fb31842e5 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/VectorHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/VectorHandler.java @@ -25,7 +25,6 @@ import com.volmit.iris.util.decree.DecreeSystem; import com.volmit.iris.util.decree.exceptions.DecreeParsingException; import com.volmit.iris.util.decree.exceptions.DecreeWhichException; import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.math.M; import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.FluidCollisionMode; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/util/decree/specialhandlers/DummyHandler.java b/src/main/java/com/volmit/iris/util/decree/specialhandlers/DummyHandler.java index 062d3b7d7..1e0949983 100644 --- a/src/main/java/com/volmit/iris/util/decree/specialhandlers/DummyHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/specialhandlers/DummyHandler.java @@ -29,8 +29,7 @@ public class DummyHandler implements DecreeParameterHandler { return null; } - public boolean isDummy() - { + public boolean isDummy() { return true; } diff --git a/src/main/java/com/volmit/iris/util/hunk/Hunk.java b/src/main/java/com/volmit/iris/util/hunk/Hunk.java index 6d92d609c..e5b0cff02 100644 --- a/src/main/java/com/volmit/iris/util/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/Hunk.java @@ -27,7 +27,6 @@ import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.interpolation.InterpolationMethod3D; import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.math.BlockPosition; -import com.volmit.iris.util.nbt.tag.ByteArrayTag; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.stream.interpolation.Interpolated; @@ -37,9 +36,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; -import java.io.File; import java.io.IOException; -import java.io.OutputStream; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; @@ -1437,8 +1434,7 @@ public interface Hunk { return false; } - default boolean contains(int x, int y, int z) - { + default boolean contains(int x, int y, int z) { return x < getWidth() && x >= 0 && y < getHeight() && y >= 0 && z < getDepth() && z >= 0; } } diff --git a/src/main/java/com/volmit/iris/util/hunk/storage/MappedSyncHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/MappedSyncHunk.java index ee2a79228..55dd06c94 100644 --- a/src/main/java/com/volmit/iris/util/hunk/storage/MappedSyncHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/MappedSyncHunk.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.function.Consumer4IO; import com.volmit.iris.util.hunk.Hunk; @@ -49,15 +48,14 @@ public class MappedSyncHunk extends StorageHunk implements Hunk { } public boolean isEmpty() { - synchronized(data) - { + synchronized (data) { return data.isEmpty(); } } @Override public void setRaw(int x, int y, int z, T t) { - synchronized(data) { + synchronized (data) { if (t == null) { data.remove(index(x, y, z)); return; @@ -73,8 +71,7 @@ public class MappedSyncHunk extends StorageHunk implements Hunk { @Override public synchronized Hunk iterateSync(Consumer4 c) { - synchronized(data) - { + synchronized (data) { int idx, z; for (Map.Entry g : data.entrySet()) { @@ -90,8 +87,7 @@ public class MappedSyncHunk extends StorageHunk implements Hunk { @Override public synchronized Hunk iterateSyncIO(Consumer4IO c) throws IOException { - synchronized(data) - { + synchronized (data) { int idx, z; for (Map.Entry g : data.entrySet()) { @@ -107,16 +103,14 @@ public class MappedSyncHunk extends StorageHunk implements Hunk { @Override public void empty(T b) { - synchronized(data) - { + synchronized (data) { data.clear(); } } @Override public T getRaw(int x, int y, int z) { - synchronized(data) - { + synchronized (data) { return data.get(index(x, y, z)); } } 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 078ce2d44..bac9f0d8f 100644 --- a/src/main/java/com/volmit/iris/util/mantle/Mantle.java +++ b/src/main/java/com/volmit/iris/util/mantle/Mantle.java @@ -45,7 +45,6 @@ import org.bukkit.util.Vector; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -90,10 +89,11 @@ public class Mantle { /** * Raise a flag if it is lowered currently, If the flag was raised, execute the runnable - * @param x the chunk x - * @param z the chunk z + * + * @param x the chunk x + * @param z the chunk z * @param flag the flag to raise - * @param r the runnable to fire if the flag is now raised (and was previously lowered) + * @param r the runnable to fire if the flag is now raised (and was previously lowered) */ @ChunkCoordinates public void raiseFlag(int x, int z, MantleFlag flag, Runnable r) { @@ -106,23 +106,24 @@ public class Mantle { /** * Obtain a cached writer which only contains cached chunks. * This avoids locking on regions when writing to lots of chunks - * @param x the x chunk - * @param z the z chunk + * + * @param x the x chunk + * @param z the z chunk * @param radius the radius chunks * @return the writer */ @ChunkCoordinates - public MantleWriter write(EngineMantle engineMantle, int x, int z, int radius) - { + public MantleWriter write(EngineMantle engineMantle, int x, int z, int radius) { return new MantleWriter(engineMantle, this, x, z, radius); } /** * Lower a flag if it is raised. If the flag was lowered (meaning it was previously raised), execute the runnable - * @param x the chunk x - * @param z the chunk z + * + * @param x the chunk x + * @param z the chunk z * @param flag the flag to lower - * @param r the runnable that is fired if the flag was raised but is now lowered + * @param r the runnable that is fired if the flag was raised but is now lowered */ @ChunkCoordinates public void lowerFlag(int x, int z, MantleFlag flag, Runnable r) { @@ -133,16 +134,16 @@ public class Mantle { } @ChunkCoordinates - public MantleChunk getChunk(int x, int z) - { - return get(x>>5, z>>5).getOrCreate(x & 31, z & 31); + public MantleChunk getChunk(int x, int z) { + return get(x >> 5, z >> 5).getOrCreate(x & 31, z & 31); } /** * Flag or unflag a chunk - * @param x the chunk x - * @param z the chunk z - * @param flag the flag + * + * @param x the chunk x + * @param z the chunk z + * @param flag the flag * @param flagged should it be set to flagged or not */ @ChunkCoordinates @@ -152,29 +153,29 @@ public class Mantle { /** * Check very quickly if a tectonic plate exists via cached or the file system + * * @param x the x region coordinate * @param z the z region coordinate * @return true if it exists */ @RegionCoordinates - public boolean hasTectonicPlate(int x, int z) - { + public boolean hasTectonicPlate(int x, int z) { Long k = key(x, z); return loadedRegions.containsKey(k) || fileForRegion(dataFolder, k).exists(); } /** * Iterate data in a chunk - * @param x the chunk x - * @param z the chunk z - * @param type the type of data to iterate + * + * @param x the chunk x + * @param z the chunk z + * @param type the type of data to iterate * @param iterator the iterator (x,y,z,data) -> do stuff - * @param the type of data to iterate + * @param the type of data to iterate */ @ChunkCoordinates public void iterateChunk(int x, int z, Class type, Consumer4 iterator) { - if(!hasTectonicPlate(x >> 5, z >> 5)) - { + if (!hasTectonicPlate(x >> 5, z >> 5)) { return; } @@ -183,15 +184,15 @@ public class Mantle { /** * Does this chunk have a flag on it? - * @param x the x - * @param z the z + * + * @param x the x + * @param z the z * @param flag the flag to test * @return true if it's flagged */ @ChunkCoordinates public boolean hasFlag(int x, int z, MantleFlag flag) { - if(!hasTectonicPlate(x >> 5, z >> 5)) - { + if (!hasTectonicPlate(x >> 5, z >> 5)) { return false; } @@ -222,14 +223,10 @@ public class Mantle { return; } - if(t instanceof IrisFeaturePositional) - { + if (t instanceof IrisFeaturePositional) { get((x >> 4) >> 5, (z >> 4) >> 5) .getOrCreate((x >> 4) & 31, (z >> 4) & 31).addFeature((IrisFeaturePositional) t); - } - - else - { + } else { Matter matter = get((x >> 4) >> 5, (z >> 4) >> 5) .getOrCreate((x >> 4) & 31, (z >> 4) & 31) .getOrCreate(y >> 4); @@ -260,8 +257,7 @@ public class Mantle { throw new RuntimeException("The Mantle is closed"); } - if(!hasTectonicPlate((x >> 4) >> 5, (z >> 4) >> 5)) - { + if (!hasTectonicPlate((x >> 4) >> 5, (z >> 4) >> 5)) { return null; } @@ -277,10 +273,10 @@ public class Mantle { /** * Is this mantle closed + * * @return true if it is */ - public boolean isClosed() - { + public boolean isClosed() { return closed.get(); } @@ -307,13 +303,9 @@ public class Mantle { }); } - try - { + try { b.complete(); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.reportError(e); } @@ -457,9 +449,10 @@ public class Mantle { /** * Get the file for a region + * * @param folder the folder - * @param x the x coord - * @param z the z coord + * @param x the x coord + * @param z the z coord * @return the file */ public static File fileForRegion(File folder, int x, int z) { @@ -468,14 +461,14 @@ public class Mantle { /** * Get the file for the given region + * * @param folder the data folder - * @param key the region key + * @param key the region key * @return the file */ public static File fileForRegion(File folder, Long key) { File f = new File(folder, "p." + key + ".ttp"); - if(!f.getParentFile().exists()) - { + if (!f.getParentFile().exists()) { f.getParentFile().mkdirs(); } return f; @@ -483,6 +476,7 @@ public class Mantle { /** * Get the long value representing a chunk or region coordinate + * * @param x the x * @param z the z * @return the value @@ -497,33 +491,33 @@ public class Mantle { /** * Set a sphere into the mantle - * @param cx the center x - * @param cy the center y - * @param cz the center z + * + * @param cx the center x + * @param cy the center y + * @param cz the center z * @param radius the radius of this sphere - * @param fill should it be filled? or just the outer shell? - * @param data the data to set - * @param the type of data to apply to the mantle + * @param fill should it be filled? or just the outer shell? + * @param data the data to set + * @param the type of data to apply to the mantle */ - public void setSphere(int cx, int cy, int cz, double radius, boolean fill, T data) - { + public void setSphere(int cx, int cy, int cz, double radius, boolean fill, T data) { setElipsoid(cx, cy, cz, radius, radius, radius, fill, data); } /** * Set an elipsoid into the mantle - * @param cx the center x - * @param cy the center y - * @param cz the center z - * @param rx the x radius - * @param ry the y radius - * @param rz the z radius + * + * @param cx the center x + * @param cy the center y + * @param cz the center z + * @param rx the x radius + * @param ry the y radius + * @param rz the z radius * @param fill should it be filled or just the outer shell? * @param data the data to set - * @param the type of data to apply to the mantle + * @param the type of data to apply to the mantle */ - public void setElipsoid(int cx, int cy, int cz, double rx, double ry, double rz, boolean fill, T data) - { + public void setElipsoid(int cx, int cy, int cz, double rx, double ry, double rz, boolean fill, T data) { rx += 0.5; ry += 0.5; rz += 0.5; @@ -535,11 +529,13 @@ public class Mantle { final int ceilRadiusZ = (int) Math.ceil(rz); double nextXn = 0; - forX: for (int x = 0; x <= ceilRadiusX; ++x) { + forX: + for (int x = 0; x <= ceilRadiusX; ++x) { final double xn = nextXn; nextXn = (x + 1) * invRadiusX; double nextYn = 0; - forY: for (int y = 0; y <= ceilRadiusY; ++y) { + forY: + for (int y = 0; y <= ceilRadiusY; ++y) { final double yn = nextYn; nextYn = (y + 1) * invRadiusY; double nextZn = 0; @@ -564,15 +560,15 @@ public class Mantle { } } - set(x + cx,y + cy,z + cz, data); - set(-x + cx,y + cy,z + cz, data); - set(x + cx,-y + cy,z + cz, data); - set(x + cx,y + cy,-z + cz, data); - set(-x + cx,y + cy,-z + cz, data); - set(-x + cx,-y + cy,z + cz, data); - set(x + cx,-y + cy,-z + cz, data); - set(-x + cx,y + cy,-z + cz, data); - set(-x + cx,-y + cy,-z + cz, data); + set(x + cx, y + cy, z + cz, data); + set(-x + cx, y + cy, z + cz, data); + set(x + cx, -y + cy, z + cz, data); + set(x + cx, y + cy, -z + cz, data); + set(-x + cx, y + cy, -z + cz, data); + set(-x + cx, -y + cy, z + cz, data); + set(x + cx, -y + cy, -z + cz, data); + set(-x + cx, y + cy, -z + cz, data); + set(-x + cx, -y + cy, -z + cz, data); } } } @@ -580,26 +576,23 @@ public class Mantle { /** * Set a cuboid of data in the mantle - * @param x1 the min x - * @param y1 the min y - * @param z1 the min z - * @param x2 the max x - * @param y2 the max y - * @param z2 the max z + * + * @param x1 the min x + * @param y1 the min y + * @param z1 the min z + * @param x2 the max x + * @param y2 the max y + * @param z2 the max z * @param data the data to set - * @param the type of data to apply to the mantle + * @param the type of data to apply to the mantle */ - public void setCuboid(int x1, int y1, int z1, int x2, int y2, int z2, T data) - { - int j,k; + public void setCuboid(int x1, int y1, int z1, int x2, int y2, int z2, T data) { + int j, k; - for(int i = x1; i <= x2; i++) - { - for(j = x1; j <= x2; j++) - { - for(k = x1; k <= x2; k++) - { - set(i,j,k,data); + for (int i = x1; i <= x2; i++) { + for (j = x1; j <= x2; j++) { + for (k = x1; k <= x2; k++) { + set(i, j, k, data); } } } @@ -607,13 +600,14 @@ public class Mantle { /** * Set a pyramid of data in the mantle - * @param cx the center x - * @param cy the base y - * @param cz the center z - * @param data the data to set - * @param size the size of the pyramid (width of base & height) + * + * @param cx the center x + * @param cy the base y + * @param cz the center z + * @param data the data to set + * @param size the size of the pyramid (width of base & height) * @param filled should it be filled or hollow - * @param the type of data to apply to the mantle + * @param the type of data to apply to the mantle */ @SuppressWarnings("ConstantConditions") public void setPyramid(int cx, int cy, int cz, T data, int size, boolean filled) { @@ -636,10 +630,11 @@ public class Mantle { /** * Set a 3d tube spline interpolated with Kochanek Bartels + * * @param nodevectors the vector points - * @param radius the radius - * @param filled if it should be filled or hollow - * @param data the data to set + * @param radius the radius + * @param filled if it should be filled or hollow + * @param data the data to set */ public void setSpline(List nodevectors, double radius, boolean filled, T data) { setSpline(nodevectors, 0, 0, 0, 10, radius, filled, data); @@ -647,15 +642,16 @@ public class Mantle { /** * Set a 3d tube spline interpolated with Kochanek Bartels + * * @param nodevectors the spline points - * @param tension the tension 0 - * @param bias the bias 0 - * @param continuity the continuity 0 - * @param quality the quality 10 - * @param radius the radius - * @param filled filled or hollow - * @param data the data to set - * @param the type of data to apply to the mantle + * @param tension the tension 0 + * @param bias the bias 0 + * @param continuity the continuity 0 + * @param quality the quality 10 + * @param radius the radius + * @param filled filled or hollow + * @param data the data to set + * @param the type of data to apply to the mantle */ public void setSpline(List nodevectors, double tension, double bias, double continuity, double quality, double radius, boolean filled, T data) { Set vset = new KSet<>(); @@ -687,25 +683,26 @@ public class Mantle { /** * Set a 3d line - * @param a the first point - * @param b the second point + * + * @param a the first point + * @param b the second point * @param radius the radius * @param filled hollow or filled? - * @param data the data - * @param the type of data to apply to the mantle + * @param data the data + * @param the type of data to apply to the mantle */ - public void setLine(IrisPosition a, IrisPosition b, double radius, boolean filled, T data) - { + public void setLine(IrisPosition a, IrisPosition b, double radius, boolean filled, T data) { setLine(ImmutableList.of(a, b), radius, filled, data); } /** * Set lines for points + * * @param vectors the points - * @param radius the radius - * @param filled hollow or filled? - * @param data the data to set - * @param the type of data to apply to the mantle + * @param radius the radius + * @param filled hollow or filled? + * @param data the data to set + * @param the type of data to apply to the mantle */ public void setLine(List vectors, double radius, boolean filled, T data) { Set vset = new KSet<>(); @@ -770,28 +767,30 @@ public class Mantle { /** * Set a cylinder in the mantle - * @param cx the center x - * @param cy the base y - * @param cz the center z - * @param data the data to set + * + * @param cx the center x + * @param cy the base y + * @param cz the center z + * @param data the data to set * @param radius the radius * @param height the height of the cyl * @param filled filled or not */ - public void setCylinder(int cx, int cy, int cz, T data, double radius, int height, boolean filled){ + public void setCylinder(int cx, int cy, int cz, T data, double radius, int height, boolean filled) { setCylinder(cx, cy, cz, data, radius, radius, height, filled); } /** * Set a cylinder in the mantle - * @param cx the center x - * @param cy the base y - * @param cz the center z - * @param data the data to set + * + * @param cx the center x + * @param cy the base y + * @param cz the center z + * @param data the data to set * @param radiusX the x radius * @param radiusZ the z radius - * @param height the height of this cyl - * @param filled filled or hollow? + * @param height the height of this cyl + * @param filled filled or hollow? */ public void setCylinder(int cx, int cy, int cz, T data, double radiusX, double radiusZ, int height, boolean filled) { int affected = 0; @@ -817,7 +816,8 @@ public class Mantle { final int ceilRadiusZ = (int) Math.ceil(radiusZ); double nextXn = 0; - forX: for (int x = 0; x <= ceilRadiusX; ++x) { + forX: + for (int x = 0; x <= ceilRadiusX; ++x) { final double xn = nextXn; nextXn = (x + 1) * invRadiusX; double nextZn = 0; @@ -850,23 +850,18 @@ public class Mantle { } } - public void set(IrisPosition pos, T data) - { + public void set(IrisPosition pos, T data) { set(pos.getX(), pos.getY(), pos.getZ(), data); } - public void set(List positions, T data) - { - for(IrisPosition i : positions) - { + public void set(List positions, T data) { + for (IrisPosition i : positions) { set(i, data); } } - public void set(Set positions, T data) - { - for(IrisPosition i : positions) - { + public void set(Set positions, T data) { + for (IrisPosition i : positions) { set(i, data); } } diff --git a/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java b/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java index 7675d78cc..162d514c6 100644 --- a/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java +++ b/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java @@ -19,15 +19,12 @@ package com.volmit.iris.util.mantle; import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.util.data.Varint; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.matter.IrisMatter; import com.volmit.iris.util.matter.Matter; import com.volmit.iris.util.matter.MatterSlice; import com.volmit.iris.util.matter.slices.ZoneMatter; -import com.volmit.iris.util.parallel.BurstExecutor; -import com.volmit.iris.util.parallel.MultiBurst; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -87,8 +84,7 @@ public class MantleChunk { short v = din.readShort(); - for(int i = 0; i < v; i++) - { + for (int i = 0; i < v; i++) { features.add(zm.readNode(din)); } } @@ -187,8 +183,7 @@ public class MantleChunk { dos.writeShort(features.size()); - for(IrisFeaturePositional i : features) - { + for (IrisFeaturePositional i : features) { zm.writeNode(i, dos); } } 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 6df695c21..b25d5ef14 100644 --- a/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java +++ b/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java @@ -23,7 +23,6 @@ import com.volmit.iris.engine.data.cache.Cache; 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.hunk.storage.ArrayHunk; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import java.io.*; diff --git a/src/main/java/com/volmit/iris/util/math/INode.java b/src/main/java/com/volmit/iris/util/math/INode.java index cb831d5b0..d0184c01f 100644 --- a/src/main/java/com/volmit/iris/util/math/INode.java +++ b/src/main/java/com/volmit/iris/util/math/INode.java @@ -30,7 +30,7 @@ public class INode { private double continuity; public INode() { - this(new Vector(0,0,0)); + this(new Vector(0, 0, 0)); } public INode(INode other) { diff --git a/src/main/java/com/volmit/iris/util/math/KochanekBartelsInterpolation.java b/src/main/java/com/volmit/iris/util/math/KochanekBartelsInterpolation.java index 75a01b205..ba0b2190f 100644 --- a/src/main/java/com/volmit/iris/util/math/KochanekBartelsInterpolation.java +++ b/src/main/java/com/volmit/iris/util/math/KochanekBartelsInterpolation.java @@ -89,15 +89,15 @@ public class KochanekBartelsInterpolation implements PathInterpolation { * Returns the linear combination of the given coefficients with the nodes adjacent to baseIndex. * * @param baseIndex node index - * @param f1 coefficient for baseIndex-1 - * @param f2 coefficient for baseIndex - * @param f3 coefficient for baseIndex+1 - * @param f4 coefficient for baseIndex+2 + * @param f1 coefficient for baseIndex-1 + * @param f2 coefficient for baseIndex + * @param f3 coefficient for baseIndex+1 + * @param f4 coefficient for baseIndex+2 * @return linear combination of nodes[n-1..n+2] with f1..4 */ private Vector linearCombination(int baseIndex, double f1, double f2, double f3, double f4) { final Vector r1 = retrieve(baseIndex - 1).multiply(f1); - final Vector r2 = retrieve(baseIndex ).multiply(f2); + final Vector r2 = retrieve(baseIndex).multiply(f2); final Vector r3 = retrieve(baseIndex + 1).multiply(f3); final Vector r4 = retrieve(baseIndex + 2).multiply(f4); @@ -108,7 +108,7 @@ public class KochanekBartelsInterpolation implements PathInterpolation { * Retrieves a node. Indexes are clamped to the valid range. * * @param index node index to retrieve - * @return nodes[clamp(0, nodes.length-1)] + * @return nodes[clamp(0, nodes.length - 1)] */ private Vector retrieve(int index) { if (index < 0) { @@ -204,11 +204,11 @@ public class KochanekBartelsInterpolation implements PathInterpolation { case 1: // This case is merely a speed-up for a very common case return arcLengthRecursive(indexLeft, remainderLeft, 1.0) - + arcLengthRecursive(indexRight, 0.0, remainderRight); + + arcLengthRecursive(indexRight, 0.0, remainderRight); default: return arcLengthRecursive(indexLeft, remainderLeft, indexRight - 1, 1.0) - + arcLengthRecursive(indexRight, 0.0, remainderRight); + + arcLengthRecursive(indexRight, 0.0, remainderRight); } } diff --git a/src/main/java/com/volmit/iris/util/matter/Matter.java b/src/main/java/com/volmit/iris/util/matter/Matter.java index 421c9fb3f..fdf7f2a5f 100644 --- a/src/main/java/com/volmit/iris/util/matter/Matter.java +++ b/src/main/java/com/volmit/iris/util/matter/Matter.java @@ -18,16 +18,13 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.Iris; import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.data.Varint; -import com.volmit.iris.util.format.C; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.BlockPosition; import org.bukkit.World; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_17_R1.block.data.type.CraftLeaves; import org.bukkit.entity.Entity; import java.io.*; @@ -190,13 +187,9 @@ public interface Matter { slice = (MatterSlice) createSlice(c, this); if (slice == null) { - try - { + try { throw new RuntimeException("Bad slice " + c.getCanonicalName()); - } - - catch(Throwable e) - { + } catch (Throwable e) { e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java index 652ac391f..6201b08f1 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.matter.slices; -import com.volmit.iris.Iris; import com.volmit.iris.engine.object.feature.IrisFeaturePositional; import com.volmit.iris.util.matter.Sliced; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java b/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java index cc76ab1e2..7bda6369d 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java @@ -32,7 +32,6 @@ import org.bukkit.NamespacedKey; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import javax.management.RuntimeErrorException; import java.io.File; import java.io.IOException; import java.util.Map; @@ -236,8 +235,7 @@ public class NBTWorld { getChunkSection(x >> 4, y >> 4, z >> 4).setBlockStateAt(x & 15, y & 15, z & 15, getCompound(data), false); } - public int getBiomeId(Biome b) - { + public int getBiomeId(Biome b) { return biomeIds.get(b); } @@ -257,8 +255,7 @@ public class NBTWorld { return s; } - public Chunk getChunk(int x, int z) - { + public Chunk getChunk(int x, int z) { return getChunk(getMCA(x >> 5, z >> 5), x, z); } @@ -281,10 +278,10 @@ public class NBTWorld { } public long getIdleDuration(int x, int z) { - return hyperLock.withResult(x, z, () -> { - Long l = lastUse.get(Cache.key(x, z)); - return l == null ? 0 : (M.ms() - l); - }); + return hyperLock.withResult(x, z, () -> { + Long l = lastUse.get(Cache.key(x, z)); + return l == null ? 0 : (M.ms() - l); + }); } public MCAFile getMCA(int x, int z) { diff --git a/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java b/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java index e3929e467..0fbaff2e6 100644 --- a/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java +++ b/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java @@ -43,8 +43,7 @@ public class ListTag> extends Tag> implements Iterable< super(createEmptyValue(3)); } - public ListTag makeAtomic() - { + public ListTag makeAtomic() { setValue(new CopyOnWriteArrayList<>(getValue())); return this; } diff --git a/src/main/java/com/volmit/iris/util/noise/Worm.java b/src/main/java/com/volmit/iris/util/noise/Worm.java index d21802e1d..02ef9449a 100644 --- a/src/main/java/com/volmit/iris/util/noise/Worm.java +++ b/src/main/java/com/volmit/iris/util/noise/Worm.java @@ -25,19 +25,16 @@ public class Worm { private double position; private double velocity; - public Worm(double startPosition, double startVelocity) - { + public Worm(double startPosition, double startVelocity) { this.position = startPosition; this.velocity = startVelocity; } - public void unstep() - { + public void unstep() { position -= velocity; } - public void step() - { + public void step() { position += velocity; } } diff --git a/src/main/java/com/volmit/iris/util/noise/Worm2.java b/src/main/java/com/volmit/iris/util/noise/Worm2.java index a062ea98b..7f72a9881 100644 --- a/src/main/java/com/volmit/iris/util/noise/Worm2.java +++ b/src/main/java/com/volmit/iris/util/noise/Worm2.java @@ -18,34 +18,28 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.util.math.Position2; import lombok.Data; @Data -public class Worm2 -{ +public class Worm2 { private final Worm x; private final Worm z; - public Worm2(Worm x, Worm z) - { + public Worm2(Worm x, Worm z) { this.x = x; this.z = z; } - public Worm2(int x, int z, int vx, int vz) - { + public Worm2(int x, int z, int vx, int vz) { this(new Worm(x, vx), new Worm(z, vz)); } - public void step() - { + public void step() { x.step(); z.step(); } - public void unstep() - { + public void unstep() { x.unstep(); z.unstep(); } diff --git a/src/main/java/com/volmit/iris/util/noise/Worm3.java b/src/main/java/com/volmit/iris/util/noise/Worm3.java index 30c105ff4..e173af29f 100644 --- a/src/main/java/com/volmit/iris/util/noise/Worm3.java +++ b/src/main/java/com/volmit/iris/util/noise/Worm3.java @@ -21,33 +21,28 @@ package com.volmit.iris.util.noise; import lombok.Data; @Data -public class Worm3 -{ +public class Worm3 { private final Worm x; private final Worm y; private final Worm z; - public Worm3(Worm x,Worm y, Worm z) - { + public Worm3(Worm x, Worm y, Worm z) { this.x = x; this.y = y; this.z = z; } - public Worm3(int x, int y, int z, int vx, int vy, int vz) - { + public Worm3(int x, int y, int z, int vx, int vy, int vz) { this(new Worm(x, vx), new Worm(y, vy), new Worm(z, vz)); } - public void step() - { + public void step() { x.step(); y.step(); z.step(); } - public void unstep() - { + public void unstep() { x.unstep(); y.unstep(); z.unstep(); diff --git a/src/main/java/com/volmit/iris/util/noise/WormIterator2.java b/src/main/java/com/volmit/iris/util/noise/WormIterator2.java index 69655fde8..f3363e7e7 100644 --- a/src/main/java/com/volmit/iris/util/noise/WormIterator2.java +++ b/src/main/java/com/volmit/iris/util/noise/WormIterator2.java @@ -32,18 +32,15 @@ public class WormIterator2 { private int maxDistance; private int maxIterations; - public boolean hasNext() - { + public boolean hasNext() { double dist = maxDistance - (Math.max(Math.abs(worm.getX().getVelocity()), Math.abs(worm.getZ().getVelocity())) + 1); return maxIterations > 0 && ((x * x) - (worm.getX().getPosition() * worm.getX().getPosition())) - + ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist; + + ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist; } - public Worm2 next() - { - if(worm == null) - { + public Worm2 next() { + if (worm == null) { worm = new Worm2(x, z, 0, 0); return worm; } diff --git a/src/main/java/com/volmit/iris/util/noise/WormIterator3.java b/src/main/java/com/volmit/iris/util/noise/WormIterator3.java index dfe2b7e00..8b1083884 100644 --- a/src/main/java/com/volmit/iris/util/noise/WormIterator3.java +++ b/src/main/java/com/volmit/iris/util/noise/WormIterator3.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.Iris; import com.volmit.iris.util.function.NoiseProvider; import lombok.Builder; import lombok.Data; @@ -34,28 +33,24 @@ public class WormIterator3 { private int maxDistance; private int maxIterations; - public boolean hasNext() - { - if(worm == null) - { + public boolean hasNext() { + if (worm == null) { return true; } double dist = maxDistance - (Math.max(Math.max(Math.abs(worm.getX().getVelocity()), - Math.abs(worm.getZ().getVelocity())), + Math.abs(worm.getZ().getVelocity())), Math.abs(worm.getY().getVelocity())) + 1); return maxIterations > 0 && ((x * x) - (worm.getX().getPosition() * worm.getX().getPosition())) - + ((y * y) - (worm.getY().getPosition() * worm.getY().getPosition())) - + ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist; + + ((y * y) - (worm.getY().getPosition() * worm.getY().getPosition())) + + ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist; } - public Worm3 next() - { + public Worm3 next() { maxIterations--; - if(worm == null) - { + if (worm == null) { worm = new Worm3(x, y, z, 0, 0, 0); return worm; } diff --git a/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java b/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java index c81e47f77..83aa394c4 100644 --- a/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java +++ b/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java @@ -23,7 +23,9 @@ import com.volmit.iris.util.collection.KList; import lombok.Setter; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; @SuppressWarnings("ALL") public class BurstExecutor { @@ -48,10 +50,8 @@ public class BurstExecutor { } public BurstExecutor queue(List r) { - if(!multicore) - { - for(Runnable i : new KList<>(r)) - { + if (!multicore) { + for (Runnable i : new KList<>(r)) { i.run(); } @@ -68,10 +68,8 @@ public class BurstExecutor { } public BurstExecutor queue(Runnable[] r) { - if(!multicore) - { - for(Runnable i : new KList<>(r)) - { + if (!multicore) { + for (Runnable i : new KList<>(r)) { i.run(); } @@ -88,8 +86,7 @@ public class BurstExecutor { } public void complete() { - if(!multicore) - { + if (!multicore) { return; } @@ -99,8 +96,7 @@ public class BurstExecutor { } try { - for(Future i : futures) - { + for (Future i : futures) { i.get(); } 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 ce21c64f7..7eb1de959 100644 --- a/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java @@ -23,12 +23,10 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.service.PreservationSVC; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.M; -import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; public class MultiBurst { public static final MultiBurst burst = new MultiBurst(); @@ -74,13 +72,9 @@ public class MultiBurst { } public void burst(boolean multicore, Runnable... r) { - if(multicore) - { + if (multicore) { burst(r); - } - - else - { + } else { sync(r); } } @@ -90,19 +84,15 @@ public class MultiBurst { } public void burst(boolean multicore, List r) { - if(multicore) - { + if (multicore) { burst(r); - } - - else { + } else { sync(r); } } private void sync(List r) { - for(Runnable i : new KList<>(r)) - { + for (Runnable i : new KList<>(r)) { i.run(); } } diff --git a/src/main/java/com/volmit/iris/util/plugin/IrisService.java b/src/main/java/com/volmit/iris/util/plugin/IrisService.java index b9068f79e..e93e11326 100644 --- a/src/main/java/com/volmit/iris/util/plugin/IrisService.java +++ b/src/main/java/com/volmit/iris/util/plugin/IrisService.java @@ -26,8 +26,7 @@ public interface IrisService extends Listener { void onDisable(); - default void postShutdown(Runnable r) - { + default void postShutdown(Runnable r) { Iris.instance.postShutdown(r); } } diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index c74811b2a..c4b174a28 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -424,11 +424,11 @@ public class VolmitSender implements CommandSender { } } - public void sendDecreeHelpNode(VirtualDecreeCommand i){ + public void sendDecreeHelpNode(VirtualDecreeCommand i) { if (isPlayer()) { //@builder String s = ( - " "<#42ecf5>" + f).toString(", ") + "\n" + "<#3fe05a>✎ <#6ad97d>" + i.getDescription() + "\n" + "<#bbe03f>✒ <#a8e0a2>" + (i.isNode() @@ -458,7 +458,7 @@ public class VolmitSender implements CommandSender { + (f.isRequired() ? "<#db4321>⚠ <#faa796>This parameter is required." : (f.hasDefault() - ? "<#2181db>✔ <#78dcf0>Defaults to \""+f.getParam().defaultValue()+"\" if undefined." + ? "<#2181db>✔ <#78dcf0>Defaults to \"" + f.getParam().defaultValue() + "\" if undefined." : "<#a73abd>✔ <#78dcf0>This parameter is optional.")) + "\n" + (f.isContextual() ? "<#ff9900>➱ <#ffcc00>The value may be derived from environment context \n" : "") + "<#cc00ff>✢ <#ff33cc>This parameter is of type " + f.getType().getSimpleName() diff --git a/src/main/java/com/volmit/iris/util/scheduling/jobs/ParallelQueueJob.java b/src/main/java/com/volmit/iris/util/scheduling/jobs/ParallelQueueJob.java index 579b5303d..e136f56d0 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/jobs/ParallelQueueJob.java +++ b/src/main/java/com/volmit/iris/util/scheduling/jobs/ParallelQueueJob.java @@ -29,8 +29,7 @@ public abstract class ParallelQueueJob extends QueueJob { BurstExecutor b = MultiBurst.burst.burst(queue.size()); KList q = queue.copy(); queue.clear(); - for(T i : q) - { + for (T i : q) { b.queue(() -> { execute(i); completeWork(); diff --git a/src/main/java/com/volmit/iris/util/scheduling/jobs/QueueJob.java b/src/main/java/com/volmit/iris/util/scheduling/jobs/QueueJob.java index 6d0338b7e..0664f351d 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/jobs/QueueJob.java +++ b/src/main/java/com/volmit/iris/util/scheduling/jobs/QueueJob.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.scheduling.jobs; -import com.sun.jna.platform.unix.X11; import com.volmit.iris.util.collection.KList; import java.util.concurrent.atomic.AtomicInteger;