diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 995545809..40576bddd 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -30,13 +30,12 @@ import com.volmit.iris.core.link.OraxenLink; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.engine.platform.BukkitChunkGenerator; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeCustom; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.compat.IrisCompat; import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.platform.BukkitChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.format.C; @@ -69,7 +68,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.Plugin; @@ -77,7 +75,6 @@ import java.io.*; import java.lang.annotation.Annotation; import java.net.URL; import java.util.Date; -import java.util.UUID; @SuppressWarnings("CanBeFinal") public class Iris extends VolmitPlugin implements Listener { @@ -172,13 +169,9 @@ public class Iris extends VolmitPlugin implements Listener { } public static void callEvent(Event e) { - if(!e.isAsynchronous()) - { + if (!e.isAsynchronous()) { J.s(() -> Bukkit.getPluginManager().callEvent(e)); - } - - else - { + } else { Bukkit.getPluginManager().callEvent(e); } } @@ -457,18 +450,13 @@ public class Iris extends VolmitPlugin implements Listener { IrisDimension d = IrisData.loadAnyDimension(dimension); - if(d == null) - { + if (d == null) { Iris.warn("Unable to find dimension type " + id + " Looking for online packs..."); d = IrisData.loadAnyDimension(dimension); - if(d == null) - { + if (d == null) { throw new RuntimeException("Can't find dimension " + dimension + "!"); - } - - else - { + } else { Iris.info("Resolved missing dimension, proceeding with generation."); } } @@ -482,7 +470,7 @@ public class Iris extends VolmitPlugin implements Listener { .maxHeight(256) .build(); - return new BukkitChunkGenerator(w, false, new File(w.worldFolder(), "iris"), dimension); + return new BukkitChunkGenerator(w, false, new File(w.worldFolder(), "iris"), dimension); } public static void msg(String string) { @@ -727,13 +715,9 @@ public class Iris extends VolmitPlugin implements Listener { } static { - try - { + try { InstanceState.updateInstanceId(); - } - - catch(Throwable e) - { + } catch (Throwable e) { } } diff --git a/src/main/java/com/volmit/iris/core/TreeManager.java b/src/main/java/com/volmit/iris/core/TreeManager.java index d22d63bfc..2cf1b0a2d 100644 --- a/src/main/java/com/volmit/iris/core/TreeManager.java +++ b/src/main/java/com/volmit/iris/core/TreeManager.java @@ -21,7 +21,6 @@ package com.volmit.iris.core; 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.biome.IrisBiome; import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.objects.IrisObject; diff --git a/src/main/java/com/volmit/iris/core/command/CommandIrisDebugSpawnerBoost.java b/src/main/java/com/volmit/iris/core/command/CommandIrisDebugSpawnerBoost.java index c75e91a3e..5a262a390 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIrisDebugSpawnerBoost.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisDebugSpawnerBoost.java @@ -20,7 +20,6 @@ package com.volmit.iris.core.command; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.IrisEngine; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; @@ -42,7 +41,7 @@ public class CommandIrisDebugSpawnerBoost extends MortarCommand { @Override public boolean handle(VolmitSender sender, String[] args) { - IrisToolbelt.access(sender.player().getWorld()).getEngine().getWorldManager().chargeEnergy(); + IrisToolbelt.access(sender.player().getWorld()).getEngine().getWorldManager().chargeEnergy(); return true; } diff --git a/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java b/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java index c0d14e912..67391bed4 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java @@ -20,7 +20,6 @@ package com.volmit.iris.core.command; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.IrisEngine; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; diff --git a/src/main/java/com/volmit/iris/core/command/pregen/CommandIrisPregenStart.java b/src/main/java/com/volmit/iris/core/command/pregen/CommandIrisPregenStart.java index 003e60c1e..bed3c7c70 100644 --- a/src/main/java/com/volmit/iris/core/command/pregen/CommandIrisPregenStart.java +++ b/src/main/java/com/volmit/iris/core/command/pregen/CommandIrisPregenStart.java @@ -11,8 +11,6 @@ import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Bukkit; import org.bukkit.World; -import java.util.Objects; - public class CommandIrisPregenStart extends MortarCommand { @@ -28,7 +26,7 @@ public class CommandIrisPregenStart extends MortarCommand { @Override public void addTabOptions(VolmitSender sender, String[] args, KList list) { - if (args.length == 0){ + if (args.length == 0) { return; } @@ -81,7 +79,7 @@ public class CommandIrisPregenStart extends MortarCommand { @Override public boolean handle(VolmitSender sender, String[] args) { - if (args.length == 0){ + if (args.length == 0) { sender.sendMessage(getHelp()); return true; } @@ -282,6 +280,7 @@ public class CommandIrisPregenStart extends MortarCommand { /** * Get command help + * * @return help string */ private String getHelp() { diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExecute.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExecute.java index 46462ae46..e9c68a0ce 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExecute.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExecute.java @@ -22,8 +22,6 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; 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.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; @@ -60,12 +58,12 @@ public class CommandIrisStudioExecute extends MortarCommand { return true; } - if (!sender.isPlayer() || !IrisToolbelt.isIrisWorld(sender.player().getWorld())){ + if (!sender.isPlayer() || !IrisToolbelt.isIrisWorld(sender.player().getWorld())) { sender.sendMessage("To execute scripts you must be in an Iris world as a player"); return true; } - if (args.length == 0){ + if (args.length == 0) { sender.sendMessage("You need to specify a script name (use auto-completions to see which are available)"); return true; } @@ -74,7 +72,7 @@ public class CommandIrisStudioExecute extends MortarCommand { try { IrisToolbelt.access(sender.player().getWorld()).getEngine().getExecution().execute(args[0]); - } catch (Throwable e){ + } catch (Throwable e) { Iris.reportError(e); sender.sendMessage("Failed to execute script " + args[0] + "!"); } diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java index ef78640c4..0146a3a6f 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java @@ -32,7 +32,6 @@ import com.volmit.iris.util.format.Form; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; -import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java index 48febaa33..399f0c7a9 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java @@ -23,11 +23,8 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.format.C; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; -import com.volmit.iris.util.scheduling.J; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java index f4589db46..f72adaab8 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java @@ -53,7 +53,7 @@ public class CommandIrisWhatFeatures extends MortarCommand { if (IrisToolbelt.isIrisWorld(c.getWorld())) { int m = 1; - for (IrisFeaturePositional i : ((Engine) IrisToolbelt.access(c.getWorld()).getEngine()).getMantle().getFeaturesInChunk(c)) { + for (IrisFeaturePositional i : IrisToolbelt.access(c.getWorld()).getEngine().getMantle().getFeaturesInChunk(c)) { sender.sendMessage("#" + m++ + " " + new JSONObject(new Gson().toJson(i)).toString(4)); } } else { diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java index a3af610ae..a7409f4b5 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java @@ -56,30 +56,30 @@ public class CommandIrisCreate extends MortarCommand { packsFolder.mkdirs(); for (String arg : args) { - if (arg.equals("seed=")){ + if (arg.equals("seed=")) { list.add("seed=random"); list.add("seed=1234"); - } else if (arg.startsWith("seed=")){ + } else if (arg.startsWith("seed=")) { seed = true; - } else if (arg.equals("type=")){ - for (File dim : packsFolder.listFiles()){ + } else if (arg.equals("type=")) { + for (File dim : packsFolder.listFiles()) { if (dim.isDirectory()) { list.add("type=" + dim.getName()); } } type = true; - } else if (arg.startsWith("type=")){ + } else if (arg.startsWith("type=")) { type = true; } } - if (!seed){ + if (!seed) { list.add("seed=random"); list.add("seed=1234"); } - if (!type){ - for (File dim : packsFolder.listFiles()){ + if (!type) { + for (File dim : packsFolder.listFiles()) { if (dim.isDirectory()) { list.add("type=" + dim.getName()); } @@ -131,7 +131,7 @@ public class CommandIrisCreate extends MortarCommand { return true; } - if (dimension.getEnvironment() == null){ + if (dimension.getEnvironment() == null) { dimension.setEnvironment(World.Environment.NORMAL); } @@ -149,10 +149,11 @@ public class CommandIrisCreate extends MortarCommand { /** * Ran when world is created + * * @param sender The sender to send updates to - * @param world The created world + * @param world The created world */ - private void onDone(VolmitSender sender, World world){ + private void onDone(VolmitSender sender, World world) { sender.sendMessage(world.getName() + " Spawn Area generated."); sender.sendMessage("You must remember to either have multiverse installed or use the Bukkit method to load this world with the Iris Generator on startup."); sender.sendMessage("Wiki: https://volmitsoftware.gitbook.io/iris/getting-started"); @@ -184,13 +185,14 @@ public class CommandIrisCreate extends MortarCommand { /** * Create a world with either Multiverse (preferred, if supported) or NMS - * @param sender The sender to send updates to + * + * @param sender The sender to send updates to * @param worldName The name of the world to create * @param dimension The dimension to create the world with - * @param seed The seed to use to generate + * @param seed The seed to use to generate * @return The created world */ - private World createWorld(VolmitSender sender, String worldName, IrisDimension dimension, long seed){ + private World createWorld(VolmitSender sender, String worldName, IrisDimension dimension, long seed) { if (Iris.linkMultiverseCore.isSupported()) { return createMultiverseWorld(sender, worldName, dimension, seed); } else { @@ -200,15 +202,16 @@ public class CommandIrisCreate extends MortarCommand { /** * Create a world with Multiverse - * @param sender The sender to send updates to + * + * @param sender The sender to send updates to * @param worldName The name of the world to create * @param dimension The dimension to create the world with - * @param seed The seed to use to generate + * @param seed The seed to use to generate * @return The created world */ - public World createMultiverseWorld(VolmitSender sender, String worldName, IrisDimension dimension, long seed){ + public World createMultiverseWorld(VolmitSender sender, String worldName, IrisDimension dimension, long seed) { - if (!Iris.linkMultiverseCore.isSupported()){ + if (!Iris.linkMultiverseCore.isSupported()) { sender.sendMessage("A world was attempted to be created with Multiverse but it is not supported!"); return null; } @@ -231,13 +234,14 @@ public class CommandIrisCreate extends MortarCommand { /** * Create a world using NMS - * @param sender The sender to send updates to + * + * @param sender The sender to send updates to * @param worldName The name of the world to create * @param dimension The dimension to create the world with - * @param seed The seed to use to generate + * @param seed The seed to use to generate * @return The created world */ - public World createNMSWorld(VolmitSender sender, String worldName, IrisDimension dimension, long seed){ + public World createNMSWorld(VolmitSender sender, String worldName, IrisDimension dimension, long seed) { WorldCreator wc = new IrisWorldCreator() .dimension(dimension.getLoadKey()) @@ -247,7 +251,7 @@ public class CommandIrisCreate extends MortarCommand { .create(); PlatformChunkGenerator gen = (PlatformChunkGenerator) wc.generator(); - if (gen == null){ + if (gen == null) { sender.sendMessage("Failed to create generator! Gen is null!"); return null; } diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java index 32595a2f2..42bb4aef4 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java @@ -21,7 +21,6 @@ package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.nbt.mca.Chunk; import com.volmit.iris.util.nbt.mca.MCAFile; diff --git a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java index 58c226c6d..4992b90cb 100644 --- a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java +++ b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java @@ -21,9 +21,6 @@ package com.volmit.iris.core.edit; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.framework.PlacedObject; -import com.volmit.iris.engine.mantle.EngineMantle; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/core/link/IrisPapiExpansion.java b/src/main/java/com/volmit/iris/core/link/IrisPapiExpansion.java index ba7412503..c7159483e 100644 --- a/src/main/java/com/volmit/iris/core/link/IrisPapiExpansion.java +++ b/src/main/java/com/volmit/iris/core/link/IrisPapiExpansion.java @@ -20,7 +20,6 @@ package com.volmit.iris.core.link; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.Location; @@ -90,7 +89,7 @@ public class IrisPapiExpansion extends PlaceholderExpansion { } } else if (p.equalsIgnoreCase("terrain_height")) { if (a != null) { - return (int) Math.round(a.getEngine().getHeight(l.getBlockX(), l.getBlockZ())) + ""; + return Math.round(a.getEngine().getHeight(l.getBlockX(), l.getBlockZ())) + ""; } } else if (p.equalsIgnoreCase("world_mode")) { if (a != null) { diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java index 941a49c7c..3229ccade 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.pregenerator.methods; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; -import com.volmit.iris.engine.platform.HeadlessGenerator; import com.volmit.iris.engine.object.common.HeadlessWorld; +import com.volmit.iris.engine.platform.HeadlessGenerator; import lombok.Getter; public class HeadlessPregenMethod implements PregeneratorMethod { diff --git a/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java b/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java index 0c2de5548..83d60aacc 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.pregenerator.syndicate; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.syndicate.command.*; -import com.volmit.iris.engine.platform.HeadlessGenerator; import com.volmit.iris.engine.object.common.HeadlessWorld; +import com.volmit.iris.engine.platform.HeadlessGenerator; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.scheduling.J; import org.zeroturnaround.zip.ZipUtil; 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 227201dac..61858d0b5 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -24,13 +24,9 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.project.loader.ResourceLoader; -import com.volmit.iris.core.report.Report; -import com.volmit.iris.core.report.ReportType; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.core.tools.IrisWorldCreator; -import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; import com.volmit.iris.engine.object.block.IrisBlockData; import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.object.entity.IrisEntity; @@ -50,7 +46,6 @@ import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONArray; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.M; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java index b08562ce4..37f299248 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java @@ -207,7 +207,7 @@ public class IrisCreator { sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generation Complete")); }); - ((HeadlessGenerator)finalAccess).getWorld().load(); + ((HeadlessGenerator) finalAccess).getWorld().load(); done.set(true); } }).get(); diff --git a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java index dbed05e77..e096bd505 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java @@ -118,13 +118,13 @@ public class IrisToolbelt { * Start a pregenerator task. If the supplied generator is headless, headless mode is used, * otherwise Hybrid mode is used. * - * @param task the scheduled task - * @param gen the Iris Generator + * @param task the scheduled task + * @param gen the Iris Generator * @return the pregenerator job (already started) */ public static PregeneratorJob pregenerate(PregenTask task, PlatformChunkGenerator gen) { if (gen.isHeadless()) { - return pregenerate(task, new HeadlessPregenMethod(((HeadlessGenerator)gen).getWorld(), (HeadlessGenerator) gen)); + return pregenerate(task, new HeadlessPregenMethod(((HeadlessGenerator) gen).getWorld(), (HeadlessGenerator) gen)); } return pregenerate(task, new HybridPregenMethod(gen.getEngine().getWorld().realWorld(), IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getPregenThreadCount()))); diff --git a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java index 66ba19e17..be4e718a4 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java @@ -18,12 +18,10 @@ package com.volmit.iris.core.tools; -import com.sun.jna.Platform; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.platform.BukkitChunkGenerator; -import com.volmit.iris.engine.platform.PlatformChunkGenerator; import org.bukkit.World; import org.bukkit.WorldCreator; import org.bukkit.generator.ChunkGenerator; @@ -89,7 +87,7 @@ public class IrisWorldCreator { .environment(findEnvironment()) .build(); ChunkGenerator g = new BukkitChunkGenerator(w, studio, studio - ? IrisData.loadAnyDimension(dimensionName).getLoader().getDataFolder(): + ? IrisData.loadAnyDimension(dimensionName).getLoader().getDataFolder() : new File(w.worldFolder(), "iris/pack"), dimensionName); return new WorldCreator(name) diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index e61da4ed6..f085099e4 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -22,7 +22,6 @@ import com.google.common.util.concurrent.AtomicDouble; import com.google.gson.Gson; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.core.events.IrisEngineHotloadEvent; import com.volmit.iris.engine.actuator.IrisBiomeActuator; import com.volmit.iris.engine.actuator.IrisDecorantActuator; import com.volmit.iris.engine.actuator.IrisTerrainIslandActuator; @@ -41,7 +40,6 @@ import com.volmit.iris.engine.object.engine.IrisEngineData; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.util.atomics.AtomicRollingSequence; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.documentation.BlockCoordinates; @@ -49,8 +47,6 @@ 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.hunk.storage.AtomicDoubleHunk; -import com.volmit.iris.util.hunk.storage.AtomicLongHunk; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; @@ -123,7 +119,7 @@ public class IrisEngine extends BlockPopulator implements Engine { generated = new AtomicInteger(0); execution = new IrisExecutionEnvironment(this); // TODO: HEIGHT ------------------------------------------------------------------------------------------------------> - Iris.info("Initializing Engine: " + target.getWorld().name() + "/" + target.getDimension().getLoadKey() + " (" + 256+ " height)"); + Iris.info("Initializing Engine: " + target.getWorld().name() + "/" + target.getDimension().getLoadKey() + " (" + 256 + " height)"); metrics = new EngineMetrics(32); this.target = target; getData().setEngine(this); @@ -187,19 +183,17 @@ public class IrisEngine extends BlockPopulator implements Engine { @Override public double getGeneratedPerSecond() { - if(perSecondLatch.flip()) - { + if (perSecondLatch.flip()) { double g = generated.get() - generatedLast.get(); generatedLast.set(generated.get()); - if(g == 0) - { + if (g == 0) { return 0; } long dur = M.ms() - lastGPS.get(); lastGPS.set(M.ms()); - perSecond.set(1000D / ((double)dur / g)); + perSecond.set(1000D / ((double) dur / g)); } return perSecond.get(); @@ -250,7 +244,7 @@ public class IrisEngine extends BlockPopulator implements Engine { } for (String j : timings.k()) { - weights.put(getName() + "." + j, (wallClock / totalWeight) * timings.get(j)); + weights.put(getName() + "." + j, (wallClock / totalWeight) * timings.get(j)); } totals.put(getName(), wallClock); @@ -328,18 +322,18 @@ public class IrisEngine extends BlockPopulator implements Engine { cleaning.set(true); - J.a(() -> { - try { - getMantle().trim(); - getData().getObjectLoader().clean(); - } catch (Throwable e) { - Iris.reportError(e); - Iris.error("Cleanup failed!"); - e.printStackTrace(); - } + J.a(() -> { + try { + getMantle().trim(); + getData().getObjectLoader().clean(); + } catch (Throwable e) { + Iris.reportError(e); + Iris.error("Cleanup failed!"); + e.printStackTrace(); + } - cleaning.lazySet(false); - }); + cleaning.lazySet(false); + }); } public EngineActuator getTerrainActuator() { @@ -372,14 +366,14 @@ public class IrisEngine extends BlockPopulator implements Engine { switch (getDimension().getTerrainMode()) { case NORMAL -> { - getMantle().generateMatter(x>>4, z>>4); + getMantle().generateMatter(x >> 4, z >> 4); getTerrainActuator().actuate(x, z, vblocks, multicore); getBiomeActuator().actuate(x, z, vbiomes, multicore); getCaveModifier().modify(x, z, vblocks, multicore); getRavineModifier().modify(x, z, vblocks, multicore); getPostModifier().modify(x, z, vblocks, multicore); getDecorantActuator().actuate(x, z, blocks, multicore); - getMantle().insertMatter(x>>4, z>>4, BlockData.class, blocks); + getMantle().insertMatter(x >> 4, z >> 4, BlockData.class, blocks); getDepositModifier().modify(x, z, blocks, multicore); } case ISLANDS -> { diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index 92ad6ee35..132056578 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -21,7 +21,6 @@ package com.volmit.iris.engine; import com.volmit.iris.Iris; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.EngineMantle; -import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleComponent; import com.volmit.iris.engine.mantle.components.MantleFeatureComponent; import com.volmit.iris.engine.mantle.components.MantleJigsawComponent; @@ -287,10 +286,7 @@ public class IrisEngineMantle implements EngineMantle { z = Math.max(max, z); } } - } - - else - { + } else { return 0; } 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 78aa8134e..f46de7481 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -47,7 +47,6 @@ import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; 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; @@ -129,8 +128,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat void setMinHeight(int min); - default int getMinHeight() - { + default int getMinHeight() { return getTarget().getWorld().minHeight(); } @@ -245,7 +243,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat updateLighting(x, y, z, c); } } - }, MantleFlag.UPDATE); + }, MantleFlag.UPDATE); getMetrics().getUpdates().put(p.getMilliseconds()); } @@ -448,28 +446,23 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat int getGenerated(); - default IrisPosition lookForStreamResult(T find, ProceduralStream stream, Function2 matcher, long timeout) - { + default IrisPosition lookForStreamResult(T find, ProceduralStream stream, Function2 matcher, long timeout) { AtomicInteger checked = new AtomicInteger(); AtomicLong time = new AtomicLong(M.ms()); AtomicReference r = new AtomicReference<>(); BurstExecutor b = burst().burst(); - while(M.ms() - time.get() < timeout && r.get() == null) - { + while (M.ms() - time.get() < timeout && r.get() == null) { b.queue(() -> { - for(int i = 0; i < 1000; i++) - { - if(M.ms() - time.get() > timeout) - { + for (int i = 0; i < 1000; i++) { + if (M.ms() - time.get() > timeout) { return; } int x = RNG.r.i(-29999970, 29999970); int z = RNG.r.i(-29999970, 29999970); checked.incrementAndGet(); - if(matcher.apply(stream.get(x, z), find)) - { + if (matcher.apply(stream.get(x, z), find)) { r.set(new IrisPosition(x, 120, z)); time.set(0); } @@ -618,8 +611,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat double getGeneratedPerSecond(); - default int getHeight() - { + default int getHeight() { return getWorld().getHeight(); } @@ -633,12 +625,10 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat return getSurfaceBiome(x, z); } - default String getObjectPlacementKey(int x, int y, int z) - { - PlacedObject o = getObjectPlacement(x,y,z); + default String getObjectPlacementKey(int x, int y, int z) { + PlacedObject o = getObjectPlacement(x, y, z); - if(o != null && o.getObject() != null) - { + if (o != null && o.getObject() != null) { return o.getObject().getLoadKey() + "@" + o.getId(); } @@ -646,7 +636,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat } default PlacedObject getObjectPlacement(int x, int y, int z) { - String objectAt = getMantle().getMantle().get(x,y,z, String.class); + String objectAt = getMantle().getMantle().get(x, y, z, String.class); if (objectAt == null || objectAt.isEmpty()) { return null; 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 753192e5f..9041d6b31 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -55,8 +55,7 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent @EventHandler public void on(IrisEngineHotloadEvent e) { - for(Player i : e.getEngine().getWorld().getPlayers()) - { + for (Player i : e.getEngine().getWorld().getPlayers()) { i.playSound(i.getLocation(), Sound.ITEM_TRIDENT_RETURN, 1f, 1.6f); VolmitSender s = new VolmitSender(i); s.sendTitle(C.IRIS + "Engine " + C.AQUA + "Hotloaded", 70, 60, 410); 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 8e1b647da..4bdaa0ebe 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -41,8 +41,7 @@ public class EngineTarget { IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getEngineThreadCount())); } - public int getHeight() - { + public int getHeight() { return world.maxHeight() - world.minHeight(); } 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 a44549c1d..6b681a72a 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -120,7 +120,7 @@ public class PlannedStructure { int id = rng.i(0, Integer.MAX_VALUE); int h = vo.place(xx, height, zz, placer, options, rng, (b) - -> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData()); + -> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData()); for (IrisJigsawPieceConnector j : i.getAvailableConnectors()) { 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 225d2ce1b..b0e364f28 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -31,7 +31,6 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.B; 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.hunk.Hunk; import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.mantle.MantleFlag; @@ -46,7 +45,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; // TODO: MOVE PLACER OUT OF MATTER INTO ITS OWN THING @@ -156,28 +154,23 @@ public interface EngineMantle extends IObjectPlacer { getMantle().close(); } - default void saveAllNow() - { + default void saveAllNow() { getMantle().saveAll(); } - default void save() - { + default void save() { } - default void trim() - { + default void trim() { getMantle().trim(60000); } - default MultiBurst burst() - { + default MultiBurst burst() { return getEngine().burst(); } - default int getRealRadius() - { + default int getRealRadius() { try { return (int) Math.ceil(getRadius().get() / 2D); } catch (InterruptedException e) { @@ -191,8 +184,7 @@ public interface EngineMantle extends IObjectPlacer { @ChunkCoordinates - default void generateMatter(int x, int z) - { + default void generateMatter(int x, int z) { if (!getEngine().getDimension().isUseMantle()) { return; } @@ -217,14 +209,12 @@ public interface EngineMantle extends IObjectPlacer { burst().burst(post); } - default void generateMantleComponent(int x, int z, MantleComponent c, Consumer post) - { + default void generateMantleComponent(int x, int z, MantleComponent c, Consumer post) { getMantle().raiseFlag(x, z, c.getFlag(), () -> c.generateLayer(x, z, post)); } @ChunkCoordinates - default void insertMatter(int x, int z, Class t, Hunk blocks) - { + default void insertMatter(int x, int z, Class t, Hunk blocks) { if (!getEngine().getDimension().isUseMantle()) { return; } @@ -233,23 +223,20 @@ public interface EngineMantle extends IObjectPlacer { } @BlockCoordinates - default void updateBlock(int x, int y, int z) - { - getMantle().flag(x>>4, z>>4, MantleFlag.UPDATE, true); - getMantle().set(x,y,z,true); + default void updateBlock(int x, int y, int z) { + getMantle().flag(x >> 4, z >> 4, MantleFlag.UPDATE, true); + getMantle().set(x, y, z, true); } @ChunkCoordinates - default KList getFeaturesInChunk(Chunk c) - { + default KList getFeaturesInChunk(Chunk c) { return getFeaturesInChunk(c.getX(), c.getZ()); } @ChunkCoordinates - default KList getFeaturesInChunk(int x, int z) - { + default KList getFeaturesInChunk(int x, int z) { KList pos = new KList<>(); - getMantle().iterateChunk(x, z, IrisFeaturePositional.class, (a,b,c,f) -> pos.add(f), MantleFlag.FEATURE); + getMantle().iterateChunk(x, z, IrisFeaturePositional.class, (a, b, c, f) -> pos.add(f), MantleFlag.FEATURE); return pos; } diff --git a/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java b/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java index b7e24aeeb..b4dc5b044 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java @@ -22,7 +22,7 @@ import com.volmit.iris.util.mantle.MantleFlag; import lombok.Data; @Data -public abstract class IrisMantleComponent implements MantleComponent{ +public abstract class IrisMantleComponent implements MantleComponent { private final EngineMantle engineMantle; private final MantleFlag flag; } diff --git a/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java b/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java index accbdc4f1..d2755f897 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java @@ -27,44 +27,35 @@ import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.parallel.BurstExecutor; import java.util.function.Consumer; -import java.util.function.Supplier; -public interface MantleComponent -{ - default int getRadius() - { +public interface MantleComponent { + default int getRadius() { return getEngineMantle().getRealRadius(); } - default IrisData getData() - { + default IrisData getData() { return getEngineMantle().getData(); } - default IrisDimension getDimension() - { + default IrisDimension getDimension() { return getEngineMantle().getEngine().getDimension(); } - default IrisComplex getComplex() - { + default IrisComplex getComplex() { return getEngineMantle().getComplex(); } - default long seed() - { + default long seed() { return getEngineMantle().getEngine().getTarget().getWorld().seed(); } - default BurstExecutor burst() - { + default BurstExecutor burst() { return getEngineMantle().getEngine().burst().burst(); } EngineMantle getEngineMantle(); - default Mantle getMantle() - { + default Mantle getMantle() { return getEngineMantle().getMantle(); } diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java index 340be30c8..098e76ca8 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java @@ -29,7 +29,6 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.parallel.BurstExecutor; import java.util.function.Consumer; diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index 2e7d474f6..9462ca83a 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -33,13 +33,11 @@ import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.parallel.BurstExecutor; import java.util.List; import java.util.function.Consumer; -public class MantleJigsawComponent extends IrisMantleComponent -{ +public class MantleJigsawComponent extends IrisMantleComponent { public MantleJigsawComponent(EngineMantle engineMantle) { super(engineMantle, MantleFlag.JIGSAW); } diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java index bb119a9c9..b0eb8b7b2 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java @@ -31,11 +31,8 @@ import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.regional.IrisRegion; 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.MantleFlag; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.parallel.BurstExecutor; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; import java.util.function.Consumer; @@ -111,12 +108,12 @@ public class MantleObjectComponent extends IrisMantleComponent { f.setInterpolationRadius(objectPlacement.getVacuumInterpolationRadius()); f.setInterpolator(objectPlacement.getVacuumInterpolationMethod()); f.setStrength(1D); - getMantle().set(xx,0,zz,new IrisFeaturePositional(xx, zz, f)); + getMantle().set(xx, 0, zz, new IrisFeaturePositional(xx, zz, f)); } for (IrisFeaturePotential j : objectPlacement.getAddFeatures()) { if (j.hasZone(rng, xx >> 4, zz >> 4)) { - getMantle().set(xx,0,zz,new IrisFeaturePositional(xx, zz, j.getZone())); + getMantle().set(xx, 0, zz, new IrisFeaturePositional(xx, zz, j.getZone())); } } } @@ -124,10 +121,7 @@ public class MantleObjectComponent extends IrisMantleComponent { if (objectPlacement.usesFeatures()) { r.run(); - } - - else - { + } else { post.accept(r); } } 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 fe1c3572e..05cb8144d 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 @@ -22,7 +22,6 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.gui.components.RenderType; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.project.loader.IrisRegistrant; -import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; 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 b066c900f..13c342bf5 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 @@ -21,9 +21,9 @@ package com.volmit.iris.engine.object.common; 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.platform.HeadlessGenerator; -import com.volmit.iris.engine.platform.BukkitChunkGenerator; import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.platform.BukkitChunkGenerator; +import com.volmit.iris.engine.platform.HeadlessGenerator; import com.volmit.iris.util.plugin.VolmitSender; import lombok.Data; import org.bukkit.Bukkit; 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 539378c7e..2066ca736 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 @@ -81,9 +81,8 @@ public class IrisWorld { } public void bind(World world) { - if(hasRealWorld()) - { - return; + if (hasRealWorld()) { + return; } bindWorld(this, world); diff --git a/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java index 5146d97d5..e10177de6 100644 --- a/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java @@ -29,7 +29,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import net.minecraft.world.level.GeneratorAccess; import org.bukkit.Location; import org.bukkit.Particle; import org.bukkit.Sound; 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 f051e5f9c..9e16f961d 100644 --- a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java @@ -19,21 +19,13 @@ package com.volmit.iris.engine.platform; import com.volmit.iris.Iris; -import com.volmit.iris.core.events.IrisEngineHotloadEvent; -import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.IrisEngine; 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.object.common.IrisWorld; -import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.io.IO; import com.volmit.iris.util.io.ReactiveFolder; -import com.volmit.iris.util.parallel.MultiBurst; 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 org.bukkit.Bukkit; @@ -48,7 +40,6 @@ import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.List; import java.util.Random; -import java.util.concurrent.atomic.AtomicBoolean; public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChunkGenerator { private final EngineProvider provider; @@ -61,8 +52,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun private final Looper hotloader; private final boolean studio; - public BukkitChunkGenerator(IrisWorld world, boolean studio, File dataLocation, String dimensionKey) - { + public BukkitChunkGenerator(IrisWorld world, boolean studio, File dataLocation, String dimensionKey) { populators = new KList<>(); this.world = world; this.hotloadChecker = new ChronoLatch(1000, false); @@ -76,8 +66,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun this.hotloader = new Looper() { @Override protected long loop() { - if(hotloadChecker.flip()) - { + if (hotloadChecker.flip()) { folder.check(); } @@ -89,8 +78,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun hotloader.setName(getTarget().getWorld().name() + " Hotloader"); } - public Engine getEngine() - { + public Engine getEngine() { return provider.getEngine(); } @@ -115,8 +103,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun initialize(); } - private void initialize() - { + private void initialize() { provider.provideEngine(world, dimensionKey, dataLocation, isStudio(), (e) -> { populators.clear(); populators.add((BlockPopulator) e); @@ -126,8 +113,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun @Override public @NotNull ChunkData generateChunkData(@NotNull World world, @NotNull Random ignored, int x, int z, @NotNull BiomeGrid biome) { - try - { + try { Iris.debug("Generated " + x + " " + z); PrecisionStopwatch ps = PrecisionStopwatch.start(); TerrainChunk tc = TerrainChunk.create(world, biome); @@ -136,10 +122,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun this.world.bind(world); getEngine().generate(x * 16, z * 16, blocks, biomes, true); return tc.getRaw(); - } - - catch(Throwable e) - { + } catch (Throwable e) { Iris.error("======================================"); e.printStackTrace(); Iris.reportErrorChunk(x, z, e, "CHUNK"); diff --git a/src/main/java/com/volmit/iris/engine/platform/EngineProvider.java b/src/main/java/com/volmit/iris/engine/platform/EngineProvider.java index 76c70ed23..5dd8859e3 100644 --- a/src/main/java/com/volmit/iris/engine/platform/EngineProvider.java +++ b/src/main/java/com/volmit/iris/engine/platform/EngineProvider.java @@ -27,7 +27,6 @@ import com.volmit.iris.engine.framework.EngineTarget; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.util.parallel.MultiBurst; -import org.bukkit.generator.BlockPopulator; import java.io.File; import java.util.concurrent.CompletableFuture; @@ -51,13 +50,11 @@ public class EngineProvider { engine.get().whenComplete((e, x) -> Iris.callEvent(new IrisEngineHotloadEvent(e))); } - public Engine getEngine() - { + public Engine getEngine() { try { Engine e = engine.get().get(); - if(e == null) - { + if (e == null) { throw new RuntimeException("NULL"); } @@ -72,12 +69,10 @@ public class EngineProvider { } public void close() { - if(engine.get() != null && engine.get().isDone()) - { + if (engine.get() != null && engine.get().isDone()) { Engine e = getEngine(); - if(e != null) - { + if (e != null) { e.close(); } } 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 15fff1660..8c12c414c 100644 --- a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java @@ -23,11 +23,9 @@ 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.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.object.common.HeadlessWorld; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.ChunkCoordinates; @@ -61,7 +59,8 @@ public class HeadlessGenerator implements PlatformChunkGenerator { burst = new MultiBurst("Iris Headless Generator", 9, IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getPregenThreadCount())); writer = new NBTWorld(world.getWorld().worldFolder()); provider = new EngineProvider(); - provider.provideEngine(world.getWorld(), world.getDimension().getLoadKey(), world.getDimension().getLoader().getDataFolder(), isStudio(), (e) -> {}); + provider.provideEngine(world.getWorld(), world.getDimension().getLoadKey(), world.getDimension().getLoader().getDataFolder(), isStudio(), (e) -> { + }); } @ChunkCoordinates diff --git a/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java index 4d2321557..a11d6d348 100644 --- a/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java @@ -24,21 +24,17 @@ import com.volmit.iris.engine.framework.EngineTarget; import com.volmit.iris.engine.framework.Hotloadable; import com.volmit.iris.util.data.DataProvider; -import java.io.File; - public interface PlatformChunkGenerator extends Hotloadable, DataProvider { Engine getEngine(); boolean isHeadless(); @Override - default IrisData getData() - { + default IrisData getData() { return getEngine().getData(); } - default EngineTarget getTarget() - { + default EngineTarget getTarget() { return getEngine().getTarget(); } diff --git a/src/main/java/com/volmit/iris/util/collection/StateList.java b/src/main/java/com/volmit/iris/util/collection/StateList.java index 62490d7f2..dccace950 100644 --- a/src/main/java/com/volmit/iris/util/collection/StateList.java +++ b/src/main/java/com/volmit/iris/util/collection/StateList.java @@ -18,109 +18,87 @@ package com.volmit.iris.util.collection; -public class StateList -{ - private final KList states; +public class StateList { + private final KList states; - public StateList(String... states) - { - this.states = new KList(states); + public StateList(String... states) { + this.states = new KList(states); - if(getBits() > 64) - { - throw new RuntimeException("StateLists cannot exceed 64 bits! You are trying to use " + getBits() + " bits!"); - } - } + if (getBits() > 64) { + throw new RuntimeException("StateLists cannot exceed 64 bits! You are trying to use " + getBits() + " bits!"); + } + } - public StateList(Enum... states) - { - this.states = new KList>().convert(Enum::name); + public StateList(Enum... states) { + this.states = new KList>().convert(Enum::name); - if(getBits() > 64) - { - throw new RuntimeException("StateLists cannot exceed 64 bits! You are trying to use " + getBits() + " bits!"); - } - } + if (getBits() > 64) { + throw new RuntimeException("StateLists cannot exceed 64 bits! You are trying to use " + getBits() + " bits!"); + } + } - public long max() - { - return (long) (Math.pow(2, getBits()) - 1); - } + public long max() { + return (long) (Math.pow(2, getBits()) - 1); + } - public KList getEnabled(long list) - { - KList f = new KList<>(); + public KList getEnabled(long list) { + KList f = new KList<>(); - for(String i : states) - { - if(is(list, i)) - { - f.add(i); - } - } + for (String i : states) { + if (is(list, i)) { + f.add(i); + } + } - return f; - } + return f; + } - public long of(String... enabledStates) - { - long b = 0; + public long of(String... enabledStates) { + long b = 0; - for(String i : enabledStates) - { - b |= getBit(i); - } + for (String i : enabledStates) { + b |= getBit(i); + } - return b; - } + return b; + } - public long set(long list, String state, boolean enabled) - { - long bit = getBit(state); - boolean is = is(list, state); + public long set(long list, String state, boolean enabled) { + long bit = getBit(state); + boolean is = is(list, state); - if(enabled && !is) - { - return list | bit; - } + if (enabled && !is) { + return list | bit; + } else if (!enabled && is) { + return list ^ bit; + } - else if(!enabled && is) - { - return list ^ bit; - } + return list; + } - return list; - } + public boolean is(long list, String state) { + long bit = getBit(state); - public boolean is(long list, String state) - { - long bit = getBit(state); + return bit > 0 && (list & bit) == bit; + } - return bit > 0 && (list & bit) == bit; - } + public boolean hasBit(String state) { + return getBit(state) > 0; + } - public boolean hasBit(String state) - { - return getBit(state) > 0; - } + public long getBit(String state) { + return getBit(states.indexOf(state)); + } - public long getBit(String state) - { - return getBit(states.indexOf(state)); - } + public long getBit(int index) { + return (long) (index < 0 ? -1 : Math.pow(2, index)); + } - public long getBit(int index) - { - return (long) (index < 0 ? -1 : Math.pow(2, index)); - } + public int getBytes() { + return getBits() == 0 ? 0 : ((getBits() >> 2) + 1); + } - public int getBytes() - { - return getBits() == 0 ? 0 : ((getBits() >> 2) + 1); - } - - public int getBits() - { - return states.size(); - } + public int getBits() { + return states.size(); + } } diff --git a/src/main/java/com/volmit/iris/util/format/C.java b/src/main/java/com/volmit/iris/util/format/C.java index eab2ae239..e5619e1fe 100644 --- a/src/main/java/com/volmit/iris/util/format/C.java +++ b/src/main/java/com/volmit/iris/util/format/C.java @@ -384,13 +384,9 @@ public enum C { C o = C.getByChar(i); if (hrad != 0 || srad != 0 || vrad != 0) { - if(pulse > 0) - { + if (pulse > 0) { b.append(VolmitSender.pulse(spinToHex(o, hrad, srad, vrad), spinToHex(o, -hrad, -srad, -vrad), pulse)); - } - - else - { + } else { b.append("> 5, z >> 5).get().getOrCreate(x & 31, z & 31).flag(flag, flagged); } catch (InterruptedException | ExecutionException e) { @@ -111,12 +103,9 @@ public class Mantle { } @ChunkCoordinates - public void iterateChunk(int x, int z, Class type, Consumer4 iterator, MantleFlag... requiredFlags) - { - for(MantleFlag i : requiredFlags) - { - if(!hasFlag(x, z, i)) - { + public void iterateChunk(int x, int z, Class type, Consumer4 iterator, MantleFlag... requiredFlags) { + for (MantleFlag i : requiredFlags) { + if (!hasFlag(x, z, i)) { return; } } @@ -129,8 +118,7 @@ public class Mantle { } @ChunkCoordinates - public boolean hasFlag(int x, int z, MantleFlag flag) - { + public boolean hasFlag(int x, int z, MantleFlag flag) { try { return get(x >> 5, z >> 5).get().getOrCreate(x & 31, z & 31).isFlagged(flag); } catch (InterruptedException | ExecutionException e) { @@ -274,7 +262,7 @@ public class Mantle { } for (Long i : unload) { - hyperLock.withLong(i, () ->{ + hyperLock.withLong(i, () -> { TectonicPlate m = loadedRegions.remove(i); lastUse.remove(i); @@ -302,8 +290,7 @@ public class Mantle { Long k = key(x, z); TectonicPlate p = loadedRegions.get(k); - if(p != null) - { + if (p != null) { lastUse.put(k, M.ms()); return CompletableFuture.completedFuture(p); } 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 fa8712dde..ba3940d2a 100644 --- a/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java +++ b/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java @@ -18,10 +18,6 @@ package com.volmit.iris.util.mantle; -import com.volmit.iris.Iris; -import com.volmit.iris.util.collection.KSet; -import com.volmit.iris.util.collection.StateList; -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; @@ -52,8 +48,7 @@ public class MantleChunk { sections = new AtomicReferenceArray<>(sectionHeight); flags = new AtomicIntegerArray(MantleFlag.values().length); - for (int i = 0; i < flags.length(); i++) - { + for (int i = 0; i < flags.length(); i++) { flags.set(i, 0); } } @@ -70,8 +65,7 @@ public class MantleChunk { this(sectionHeight); int s = din.readByte(); - for(int i = 0; i < flags.length(); i++) - { + for (int i = 0; i < flags.length(); i++) { flags.set(i, din.readBoolean() ? 1 : 0); } @@ -176,38 +170,30 @@ public class MantleChunk { } private void trimSlice(int i) { - if(exists(i)) - { + if (exists(i)) { Matter m = get(i); - if(m.getSliceMap().isEmpty()) - { + if (m.getSliceMap().isEmpty()) { sections.set(i, null); - } - - else{ + } else { m.trimSlices(); - if(m.getSliceMap().isEmpty()) - { + if (m.getSliceMap().isEmpty()) { sections.set(i, null); } } } } - public void iterate(Class type, Consumer4 iterator) { - for(int i = 0; i < sections.length(); i++) - { + public void iterate(Class type, Consumer4 iterator) { + for (int i = 0; i < sections.length(); i++) { int bs = (i << 4); Matter matter = get(i); - if(matter != null) - { + if (matter != null) { MatterSlice t = matter.getSlice(type); - if(t != null) - { - t.iterateSync((a, b, c, f) -> iterator.accept(a,b + bs, c, f)); + if (t != null) { + t.iterateSync((a, b, c, f) -> iterator.accept(a, b + bs, c, f)); } } } diff --git a/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java b/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java index e14e19806..351882140 100644 --- a/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java +++ b/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java @@ -24,10 +24,9 @@ public enum MantleFlag { OBJECT, UPDATE, JIGSAW, - FEATURE - ; - static StateList getStateList() - { + FEATURE; + + static StateList getStateList() { return new StateList(MantleFlag.values()); } } 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 76f390d7f..b78a32f2f 100644 --- a/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java +++ b/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java @@ -172,10 +172,7 @@ public class TectonicPlate { if (chunk != null) { dos.writeBoolean(true); chunk.write(dos); - } - - else - { + } else { dos.writeBoolean(false); } } 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 84aefb1b9..621ced544 100644 --- a/src/main/java/com/volmit/iris/util/matter/Matter.java +++ b/src/main/java/com/volmit/iris/util/matter/Matter.java @@ -33,8 +33,6 @@ import java.io.*; import java.util.Map; import java.util.Set; import java.util.function.Function; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; /** * When Red Matter isn't enough diff --git a/src/main/java/com/volmit/iris/util/matter/MatterSlice.java b/src/main/java/com/volmit/iris/util/matter/MatterSlice.java index 2b3aa44c3..f5906f498 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterSlice.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterSlice.java @@ -18,9 +18,7 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.util.data.NibbleDataPalette; import com.volmit.iris.util.data.Varint; import com.volmit.iris.util.hunk.Hunk; import org.bukkit.Location; @@ -108,8 +106,7 @@ public interface MatterSlice extends Hunk { return readFrom(mediumType) != null; } - default int getBitsPer(int needed) - { + default int getBitsPer(int needed) { int target = 1; for (int i = 1; i < 8; i++) { if (Math.pow(2, i) > needed) { diff --git a/src/main/java/com/volmit/iris/util/matter/slices/PlayerMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/PlayerMatter.java index 41eeb2401..f298a4335 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/PlayerMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/PlayerMatter.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.Varint; import com.volmit.iris.util.matter.Sliced; import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/util/parallel/HyperLock.java b/src/main/java/com/volmit/iris/util/parallel/HyperLock.java index 03138b339..52dae27c8 100644 --- a/src/main/java/com/volmit/iris/util/parallel/HyperLock.java +++ b/src/main/java/com/volmit/iris/util/parallel/HyperLock.java @@ -127,8 +127,7 @@ public class HyperLock { } public void lock(int x, int z) { - if(!enabled) - { + if (!enabled) { return; } @@ -136,8 +135,7 @@ public class HyperLock { } public void unlock(int x, int z) { - if(!enabled) - { + if (!enabled) { return; } 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 5e81d74da..043835e1b 100644 --- a/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.parallel; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.io.InstanceState; import com.volmit.iris.util.math.M; import com.volmit.iris.util.scheduling.J; @@ -55,8 +54,7 @@ public class MultiBurst { heartbeat = new Looper() { @Override protected long loop() { - if(instance != InstanceState.getInstanceId()) - { + if (instance != InstanceState.getInstanceId()) { shutdownNow(); return -1; } diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java index a311b2906..c5fb3e30d 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.plugin; -import com.google.common.collect.Comparators; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; @@ -27,8 +26,6 @@ import org.bukkit.Sound; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Collections; import java.util.Comparator; /** 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 fae890b28..b158336ad 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -28,8 +28,6 @@ import lombok.Getter; import lombok.Setter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.minimessage.transformation.inbuild.GradientTransformation; -import net.kyori.adventure.text.minimessage.transformation.inbuild.RainbowTransformation; import net.kyori.adventure.title.Title; import org.bukkit.Server; import org.bukkit.command.CommandSender; @@ -45,7 +43,6 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; /** @@ -193,95 +190,79 @@ public class VolmitSender implements CommandSender { s.sendMessage("========================================================"); } - public void sendTitle(String title, String subtitle, int i, int s, int o) - { + public void sendTitle(String title, String subtitle, int i, int s, int o) { Iris.audiences.player(player()).showTitle(Title.title( createComponent(title), createComponent(subtitle), Title.Times.of(Duration.ofMillis(i), Duration.ofMillis(s), Duration.ofMillis(o)))); } - public static long getTick() - { + public static long getTick() { return M.ms() / 16; } - public void sendProgress(double percent, String thing) - { - if(percent < 0) - { + public void sendProgress(double percent, String thing) { + if (percent < 0) { int l = 44; int g = (int) (1D * l); sendTitle(C.IRIS + thing + " ", 0, 500, 250); - sendActionNoProcessing("" + "" + pulse("#00ff80","#00373d",1D)+" " + Form.repeat(" ", g) + "" + Form.repeat(" ", l - g)); - } - - else - { + sendActionNoProcessing("" + "" + pulse("#00ff80", "#00373d", 1D) + " " + Form.repeat(" ", g) + "" + Form.repeat(" ", l - g)); + } else { int l = 44; int g = (int) (percent * l); sendTitle(C.IRIS + thing + " " + C.BLUE + "" + Form.pc(percent, 0), 0, 500, 250); - sendActionNoProcessing("" + "" + pulse("#00ff80","#00373d",1D)+" " + Form.repeat(" ", g) + "" + Form.repeat(" ", l - g)); + sendActionNoProcessing("" + "" + pulse("#00ff80", "#00373d", 1D) + " " + Form.repeat(" ", g) + "" + Form.repeat(" ", l - g)); } } - public static String pulse(String colorA, String colorB, double speed) - { + public static String pulse(String colorA, String colorB, double speed) { return ""; } public static String pulse(double speed) { - return Form.f(invertSpread((((getTick()*15D * speed)%1000D)/1000D)), 3).replaceAll("\\Q,\\E", "."); + return Form.f(invertSpread((((getTick() * 15D * speed) % 1000D) / 1000D)), 3).replaceAll("\\Q,\\E", "."); } public static double invertSpread(double v) { return ((1D - v) * 2D) - 1D; } - public void sendAction(String action) - { + public void sendAction(String action) { Iris.audiences.player(player()).sendActionBar(createNoPrefixComponent(action)); } - public void sendActionNoProcessing(String action) - { + public void sendActionNoProcessing(String action) { Iris.audiences.player(player()).sendActionBar(createNoPrefixComponentNoProcessing(action)); } - public void sendTitle(String subtitle, int i, int s, int o) - { + public void sendTitle(String subtitle, int i, int s, int o) { Iris.audiences.player(player()).showTitle(Title.title( createNoPrefixComponent(" "), createNoPrefixComponent(subtitle), Title.Times.of(Duration.ofMillis(i), Duration.ofMillis(s), Duration.ofMillis(o)))); } - private Component createNoPrefixComponent(String message) - { + private Component createNoPrefixComponent(String message) { String t = C.translateAlternateColorCodes('&', message); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb(), 0.36); return MiniMessage.get().parse(a); } - private Component createNoPrefixComponentNoProcessing(String message) - { + private Component createNoPrefixComponentNoProcessing(String message) { return MiniMessage.get().parse(message); } - private Component createComponent(String message) - { + private Component createComponent(String message) { String t = C.translateAlternateColorCodes('&', getTag() + message); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb()); return MiniMessage.get().parse(a); } - public void showWaiting(String passive, CompletableFuture f) - { + public void showWaiting(String passive, CompletableFuture f) { AtomicInteger v = new AtomicInteger(); AtomicReference g = new AtomicReference<>(); v.set(J.ar(() -> { - if(f.isDone() && g.get() != null) - { + if (f.isDone() && g.get() != null) { J.car(v.get()); sendAction(" "); return;