From ed9ddc0825c34ce2a9924e77aa9b5ebd068db187 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 26 Aug 2020 09:33:05 -0400 Subject: [PATCH] More fix --- src/main/java/com/volmit/iris/Iris.java | 109 ++-------- .../com/volmit/iris/IrisBoardManager.java | 117 +++++++++++ .../java/com/volmit/iris/IrisMetrics.java | 2 +- .../java/com/volmit/iris/IrisSettings.java | 4 + .../java/com/volmit/iris/ProjectManager.java | 7 +- .../java/com/volmit/iris/WandManager.java | 4 +- .../com/volmit/iris/command/CommandIris.java | 5 +- .../iris/command/CommandIrisEditBiome.java | 56 +++++ .../iris/command/CommandIrisMetrics.java | 14 +- .../iris/command/CommandIrisStudio.java | 24 +++ .../iris/command/CommandIrisStudioCreate.java | 5 +- .../volmit/iris/command/CommandIrisWhat.java | 12 +- .../iris/command/CommandIrisWhatBlock.java | 6 +- .../iris/command/CommandIrisWhatHand.java | 17 +- .../volmit/iris/command/CommandIrisWorld.java | 54 ----- .../iris/gen/ContextualChunkGenerator.java | 10 +- .../java/com/volmit/iris/noise/FastNoise.java | 4 +- .../java/com/volmit/iris/object/IrisLoot.java | 8 +- .../com/volmit/iris/object/IrisRegion.java | 5 + src/main/java/com/volmit/iris/util/Board.java | 192 ++++++++++-------- .../java/com/volmit/iris/util/BoardEntry.java | 60 +++--- .../com/volmit/iris/util/BoardManager.java | 122 +++++------ .../com/volmit/iris/util/BoardProvider.java | 23 +-- .../com/volmit/iris/util/BoardSettings.java | 13 +- src/main/java/com/volmit/iris/util/C.java | 2 +- .../java/com/volmit/iris/util/Callback.java | 2 +- .../java/com/volmit/iris/util/Element.java | 4 +- .../com/volmit/iris/util/ElementEvent.java | 2 +- .../com/volmit/iris/util/MaterialBlock.java | 2 +- .../com/volmit/iris/util/MortarCommand.java | 4 +- .../com/volmit/iris/util/MortarSender.java | 94 ++++++--- .../com/volmit/iris/util/ParallaxChunk.java | 3 +- .../com/volmit/iris/util/ParallaxRegion.java | 5 +- .../com/volmit/iris/util/ParallaxSection.java | 7 +- .../com/volmit/iris/util/ParallaxWorld.java | 3 +- .../java/com/volmit/iris/util/Point3d.java | 2 +- .../java/com/volmit/iris/util/Point3f.java | 2 +- .../java/com/volmit/iris/util/Point4d.java | 2 +- .../java/com/volmit/iris/util/Point4f.java | 2 +- .../volmit/iris/util/StructureTemplate.java | 7 - .../java/com/volmit/iris/util/Tuple2d.java | 2 +- .../java/com/volmit/iris/util/Tuple2f.java | 2 +- .../java/com/volmit/iris/util/Tuple3d.java | 2 +- .../java/com/volmit/iris/util/Tuple3f.java | 2 +- .../java/com/volmit/iris/util/Tuple4d.java | 2 +- .../java/com/volmit/iris/util/Tuple4f.java | 2 +- .../java/com/volmit/iris/util/UIElement.java | 4 +- .../volmit/iris/util/UIStaticDecorator.java | 2 +- .../com/volmit/iris/util/UIVoidDecorator.java | 2 +- .../java/com/volmit/iris/util/UIWindow.java | 5 +- .../com/volmit/iris/util/VecMathUtil.java | 2 +- .../java/com/volmit/iris/util/Vector2d.java | 2 +- .../java/com/volmit/iris/util/Vector2f.java | 2 +- .../java/com/volmit/iris/util/Vector3d.java | 2 +- .../java/com/volmit/iris/util/Vector3f.java | 2 +- .../com/volmit/iris/util/VirtualCommand.java | 3 +- .../java/com/volmit/iris/util/Window.java | 2 +- .../com/volmit/iris/util/WindowDecorator.java | 2 +- .../volmit/iris/util/WindowResolution.java | 2 +- 59 files changed, 563 insertions(+), 497 deletions(-) create mode 100644 src/main/java/com/volmit/iris/IrisBoardManager.java create mode 100644 src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java delete mode 100644 src/main/java/com/volmit/iris/command/CommandIrisWorld.java diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index a0b18a411..856fce81d 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -1,14 +1,11 @@ package com.volmit.iris; import java.io.File; -import java.util.List; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.Plugin; @@ -22,26 +19,17 @@ import com.volmit.iris.gen.post.PostPotholeFiller; import com.volmit.iris.gen.post.PostSlabber; import com.volmit.iris.gen.post.PostWallPatcher; import com.volmit.iris.gen.post.PostWaterlogger; -import com.volmit.iris.noise.CNG; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.util.BiomeResult; import com.volmit.iris.util.BoardManager; -import com.volmit.iris.util.BoardProvider; -import com.volmit.iris.util.BoardSettings; -import com.volmit.iris.util.ChronoLatch; -import com.volmit.iris.util.Form; +import com.volmit.iris.util.C; import com.volmit.iris.util.GroupedExecutor; import com.volmit.iris.util.IO; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.IrisPostBlockFilter; -import com.volmit.iris.util.IrisStructureResult; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarPlugin; import com.volmit.iris.util.Permission; -import com.volmit.iris.util.RollingSequence; -import com.volmit.iris.util.ScoreDirection; -public class Iris extends MortarPlugin implements BoardProvider +public class Iris extends MortarPlugin { public static KList executors = new KList<>(); public static Iris instance; @@ -50,13 +38,8 @@ public class Iris extends MortarPlugin implements BoardProvider public static IrisHotloadManager hotloader; public static WandManager wand; public static StructureManager struct; + public static IrisBoardManager board; private BoardManager manager; - private String mem = "..."; - private ChronoLatch cl = new ChronoLatch(1000); - private ChronoLatch clf = new ChronoLatch(1000); - private KList lines = new KList<>(); - public RollingSequence hits = new RollingSequence(20); - public RollingSequence tp = new RollingSequence(100); private static IrisLock lock = new IrisLock("Iris"); @Permission @@ -85,7 +68,7 @@ public class Iris extends MortarPlugin implements BoardProvider @Override public String getTag(String subTag) { - return ChatColor.BOLD + "" + ChatColor.DARK_GRAY + "[" + ChatColor.BOLD + "" + ChatColor.GREEN + "Iris" + ChatColor.BOLD + ChatColor.DARK_GRAY + "]" + ChatColor.RESET + "" + ChatColor.GRAY + ": "; + return C.BOLD + "" + C.DARK_GRAY + "[" + C.BOLD + "" + C.GREEN + "Iris" + C.BOLD + C.DARK_GRAY + "]" + C.RESET + "" + C.GRAY + ": "; } public void onEnable() @@ -97,7 +80,7 @@ public class Iris extends MortarPlugin implements BoardProvider wand = new WandManager(); struct = new StructureManager(); proj = new ProjectManager(); - manager = new BoardManager(this, BoardSettings.builder().boardProvider(this).scoreDirection(ScoreDirection.UP).build()); + board = new IrisBoardManager(); super.onEnable(); } @@ -124,72 +107,6 @@ public class Iris extends MortarPlugin implements BoardProvider super.onDisable(); } - @Override - public String getTitle(Player player) - { - return ChatColor.GREEN + "Iris"; - } - - @Override - public List getLines(Player player) - { - if(!clf.flip()) - { - return lines; - } - - World world = player.getWorld(); - lines.clear(); - - if(world.getGenerator() instanceof IrisChunkGenerator) - { - IrisChunkGenerator g = (IrisChunkGenerator) world.getGenerator(); - - if(cl.flip()) - { - mem = Form.memSize(g.guessMemoryUsage(), 2); - } - - int x = player.getLocation().getBlockX(); - int y = player.getLocation().getBlockY(); - int z = player.getLocation().getBlockZ(); - BiomeResult er = g.sampleTrueBiome(x, y, z); - IrisBiome b = er != null ? er.getBiome() : null; - IrisStructureResult st = g.getStructure(x, y, z); - - tp.put(g.getMetrics().getSpeed()); - lines.add("&7&m-----------------"); - lines.add(ChatColor.GREEN + "Speed" + ChatColor.GRAY + ": " + ChatColor.BOLD + "" + ChatColor.GRAY + Form.f(g.getMetrics().getPerSecond().getAverage(), 0) + "/s " + Form.duration(g.getMetrics().getTotal().getAverage(), 1) + ""); - lines.add(ChatColor.GREEN + "Generators" + ChatColor.GRAY + ": " + Form.f(CNG.creates)); - lines.add(ChatColor.GREEN + "Noise" + ChatColor.GRAY + ": " + Form.f((int) hits.getAverage())); - lines.add(ChatColor.GREEN + "Parallax Chunks" + ChatColor.GRAY + ": " + Form.f((int) g.getParallaxMap().getLoadedChunks().size())); - lines.add(ChatColor.GREEN + "Objects" + ChatColor.GRAY + ": " + Form.f(g.getData().getObjectLoader().count())); - lines.add(ChatColor.GREEN + "Memory" + ChatColor.GRAY + ": " + mem); - lines.add(ChatColor.GREEN + "Heightmap" + ChatColor.GRAY + ": " + (int) g.getTerrainHeight(x, z)); - - if(er != null && b != null) - { - lines.add(ChatColor.GREEN + "Biome" + ChatColor.GRAY + ": " + b.getName()); - lines.add(ChatColor.GREEN + "File" + ChatColor.GRAY + ": " + b.getLoadKey()); - } - - if(st != null) - { - lines.add(ChatColor.GREEN + "Structure" + ChatColor.GRAY + ": " + st.getStructure().getName()); - lines.add(ChatColor.GREEN + "Tile" + ChatColor.GRAY + ": " + st.getTile().toString()); - } - - lines.add("&7&m-----------------"); - } - - else - { - lines.add(ChatColor.GREEN + "Join an Iris World!"); - } - - return lines; - } - public static KList> loadPostProcessors() { KList> g = new KList>(); @@ -212,7 +129,7 @@ public class Iris extends MortarPlugin implements BoardProvider public void imsg(CommandSender s, String msg) { - s.sendMessage(ChatColor.GREEN + "[" + ChatColor.DARK_GRAY + "Iris" + ChatColor.GREEN + "]" + ChatColor.GRAY + ": " + msg); + s.sendMessage(C.GREEN + "[" + C.DARK_GRAY + "Iris" + C.GREEN + "]" + C.GRAY + ": " + msg); } @Override @@ -224,38 +141,38 @@ public class Iris extends MortarPlugin implements BoardProvider public static void msg(String string) { lock.lock(); - String msg = ChatColor.GREEN + "[Iris]: " + ChatColor.GRAY + string; + String msg = C.GREEN + "[Iris]: " + C.GRAY + string; Bukkit.getConsoleSender().sendMessage(msg); lock.unlock(); } public static void warn(String string) { - msg(ChatColor.YELLOW + string); + msg(C.YELLOW + string); } public static void error(String string) { - msg(ChatColor.RED + string); + msg(C.RED + string); } public static void verbose(String string) { - msg(ChatColor.GRAY + string); + msg(C.GRAY + string); } public static void success(String string) { - msg(ChatColor.GREEN + string); + msg(C.GREEN + string); } public static void info(String string) { - msg(ChatColor.WHITE + string); + msg(C.WHITE + string); } public void hit(long hits2) { - hits.put(hits2); + board.hits.put(hits2); } } diff --git a/src/main/java/com/volmit/iris/IrisBoardManager.java b/src/main/java/com/volmit/iris/IrisBoardManager.java new file mode 100644 index 000000000..b6e180d91 --- /dev/null +++ b/src/main/java/com/volmit/iris/IrisBoardManager.java @@ -0,0 +1,117 @@ +package com.volmit.iris; + +import java.util.List; + +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerChangedWorldEvent; + +import com.volmit.iris.gen.IrisChunkGenerator; +import com.volmit.iris.noise.CNG; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.util.BiomeResult; +import com.volmit.iris.util.BoardManager; +import com.volmit.iris.util.BoardProvider; +import com.volmit.iris.util.BoardSettings; +import com.volmit.iris.util.C; +import com.volmit.iris.util.ChronoLatch; +import com.volmit.iris.util.Form; +import com.volmit.iris.util.IrisStructureResult; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RollingSequence; +import com.volmit.iris.util.ScoreDirection; + +public class IrisBoardManager implements BoardProvider, Listener +{ + private BoardManager manager; + private String mem = "..."; + public RollingSequence hits = new RollingSequence(20); + public RollingSequence tp = new RollingSequence(100); + private ChronoLatch cl = new ChronoLatch(1000); + + public IrisBoardManager() + { + Iris.instance.registerListener(this); + //@builder + manager = new BoardManager(Iris.instance, BoardSettings.builder() + .boardProvider(this) + .scoreDirection(ScoreDirection.DOWN) + .build()); + //@done + } + + private boolean isIrisWorld(World w) + { + return (w.getGenerator() instanceof IrisChunkGenerator) && ((IrisChunkGenerator) w.getGenerator()).isDev(); + } + + @EventHandler + public void on(PlayerChangedWorldEvent e) + { + if(isIrisWorld(e.getPlayer().getWorld())) + { + manager.remove(e.getPlayer()); + manager.setup(e.getPlayer()); + } + } + + @Override + public String getTitle(Player player) + { + return C.GREEN + "Iris"; + } + + @Override + public List getLines(Player player) + { + KList v = new KList<>(); + + if(!isIrisWorld(player.getWorld())) + { + return v; + } + + IrisChunkGenerator g = (IrisChunkGenerator) player.getWorld().getGenerator(); + + if(cl.flip()) + { + mem = Form.memSize(g.guessMemoryUsage(), 2); + } + + int x = player.getLocation().getBlockX(); + int y = player.getLocation().getBlockY(); + int z = player.getLocation().getBlockZ(); + BiomeResult er = g.sampleTrueBiome(x, y, z); + IrisBiome b = er != null ? er.getBiome() : null; + IrisStructureResult st = g.getStructure(x, y, z); + + tp.put(g.getMetrics().getSpeed()); + v.add("&7&m------------------"); + v.add(C.GREEN + "Speed" + C.GRAY + ": " + C.BOLD + "" + C.GRAY + Form.f(g.getMetrics().getPerSecond().getAverage(), 0) + "/s " + Form.duration(g.getMetrics().getTotal().getAverage(), 1) + ""); + v.add(C.GREEN + "Generators" + C.GRAY + ": " + Form.f(CNG.creates)); + v.add(C.GREEN + "Noise" + C.GRAY + ": " + Form.f((int) hits.getAverage())); + v.add(C.GREEN + "Parallax" + C.GRAY + ": " + Form.f((int) g.getParallaxMap().getLoadedChunks().size())); + v.add(C.GREEN + "Objects" + C.GRAY + ": " + Form.f(g.getData().getObjectLoader().count())); + v.add(C.GREEN + "Memory" + C.GRAY + ": " + mem); + v.add("&7&m------------------"); + v.add(C.GREEN + "Heightmap" + C.GRAY + ": " + (int) g.getTerrainHeight(x, z)); + + if(er != null && b != null) + { + v.add(C.GREEN + "Biome" + C.GRAY + ": " + b.getName()); + } + + if(st != null) + { + v.add(C.GREEN + "Structure" + C.GRAY + ": " + st.getStructure().getName()); + v.add(C.GREEN + "Tile" + C.GRAY + ": " + st.getTile().toString()); + } + + v.add("&7&m------------------"); + + return v; + } + +} diff --git a/src/main/java/com/volmit/iris/IrisMetrics.java b/src/main/java/com/volmit/iris/IrisMetrics.java index 89628736c..fa1b8719f 100644 --- a/src/main/java/com/volmit/iris/IrisMetrics.java +++ b/src/main/java/com/volmit/iris/IrisMetrics.java @@ -28,6 +28,6 @@ public class IrisMetrics public double getSpeed() { - return (double) Iris.instance.hits.getAverage() / (double) total.getAverage(); + return (double) Iris.board.hits.getAverage() / (double) total.getAverage(); } } diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index 2dfb98b3c..e3a920f69 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -38,6 +38,10 @@ public class IrisSettings @Desc("Allows configs to be changed and hotloaded without reloading.") public boolean hotloading = true; + @DontObfuscate + @Desc("When using studio open or create, open the codeworkspace automatically.") + public boolean openVSCode = true; + public static IrisSettings get() { if(settings == null) diff --git a/src/main/java/com/volmit/iris/ProjectManager.java b/src/main/java/com/volmit/iris/ProjectManager.java index c54b5bc49..9bf0c281d 100644 --- a/src/main/java/com/volmit/iris/ProjectManager.java +++ b/src/main/java/com/volmit/iris/ProjectManager.java @@ -116,7 +116,12 @@ public class ProjectManager updateWorkspace(i); sender.sendMessage("Workspace Updated"); }); - Desktop.getDesktop().open(i); + + if(IrisSettings.get().openVSCode) + { + Desktop.getDesktop().open(i); + } + break; } } diff --git a/src/main/java/com/volmit/iris/WandManager.java b/src/main/java/com/volmit/iris/WandManager.java index 0c20d3001..9e3c345ab 100644 --- a/src/main/java/com/volmit/iris/WandManager.java +++ b/src/main/java/com/volmit/iris/WandManager.java @@ -4,7 +4,6 @@ import java.awt.Color; import java.util.Iterator; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Particle; @@ -24,6 +23,7 @@ import org.bukkit.util.BlockVector; import org.bukkit.util.Vector; import com.volmit.iris.object.IrisObject; +import com.volmit.iris.util.C; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.KList; import com.volmit.iris.util.M; @@ -268,7 +268,7 @@ public class WandManager implements Listener ItemStack is = new ItemStack(Material.BLAZE_ROD); is.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, 1); ItemMeta im = is.getItemMeta(); - im.setDisplayName(ChatColor.BOLD + "" + ChatColor.GOLD + "Wand of Iris"); + im.setDisplayName(C.BOLD + "" + C.GOLD + "Wand of Iris"); im.setUnbreakable(true); im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_PLACED_ON, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_DESTROYS, ItemFlag.HIDE_ENCHANTS); im.setLore(new KList().add(locationToString(a), locationToString(b))); diff --git a/src/main/java/com/volmit/iris/command/CommandIris.java b/src/main/java/com/volmit/iris/command/CommandIris.java index d089c0cdf..77bbfb9c8 100644 --- a/src/main/java/com/volmit/iris/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/command/CommandIris.java @@ -10,15 +10,12 @@ public class CommandIris extends MortarCommand @Command private CommandIrisStudio studio; - @Command - private CommandIrisWorld world; - @Command private CommandIrisWhat what; @Command private CommandIrisObject object; - + @Command private CommandIrisStructure structure; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java b/src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java new file mode 100644 index 000000000..6cd90277a --- /dev/null +++ b/src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java @@ -0,0 +1,56 @@ +package com.volmit.iris.command; + +import java.awt.Desktop; +import java.io.File; + +import org.bukkit.entity.Player; + +import com.volmit.iris.Iris; +import com.volmit.iris.util.MortarCommand; +import com.volmit.iris.util.MortarSender; + +public class CommandIrisEditBiome extends MortarCommand +{ + public CommandIrisEditBiome() + { + super("editbiome", "ebiome", "eb"); + setDescription("Open this biome file in vscode"); + requiresPermission(Iris.perm.studio); + setCategory("Studio"); + } + + @Override + public boolean handle(MortarSender sender, String[] args) + { + if(sender.isPlayer()) + { + Player p = sender.player(); + + try + { + File f = Iris.proj.getCurrentProject().sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ()).getBiome().getLoadFile(); + Desktop.getDesktop().open(f); + } + + catch(Throwable e) + { + sender.sendMessage("Cant find the file. Are you in an Iris world?"); + } + + return true; + } + + else + { + sender.sendMessage("Players only."); + } + + return true; + } + + @Override + protected String getArgsUsage() + { + return "[width]"; + } +} diff --git a/src/main/java/com/volmit/iris/command/CommandIrisMetrics.java b/src/main/java/com/volmit/iris/command/CommandIrisMetrics.java index e243343be..2321475b6 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisMetrics.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisMetrics.java @@ -1,12 +1,12 @@ package com.volmit.iris.command; -import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisMetrics; import com.volmit.iris.gen.IrisChunkGenerator; +import com.volmit.iris.util.C; import com.volmit.iris.util.Form; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -30,12 +30,12 @@ public class CommandIrisMetrics extends MortarCommand World world = p.getWorld(); IrisChunkGenerator g = (IrisChunkGenerator) world.getGenerator(); IrisMetrics m = g.getMetrics(); - sender.sendMessage("Thread Count: " + ChatColor.BOLD + "" + ChatColor.WHITE + g.getThreads()); - sender.sendMessage("Total : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTotal().getAverage(), 2)); - sender.sendMessage(" Terrain : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTerrain().getAverage(), 2)); - sender.sendMessage(" Parallax: " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getParallax().getAverage(), 2)); - sender.sendMessage(" Post : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getPost().getAverage(), 2)); - sender.sendMessage("Updates : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getUpdate().getAverage(), 2)); + sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreads()); + sender.sendMessage("Total : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTotal().getAverage(), 2)); + sender.sendMessage(" Terrain : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTerrain().getAverage(), 2)); + sender.sendMessage(" Parallax: " + C.BOLD + "" + C.WHITE + Form.duration(m.getParallax().getAverage(), 2)); + sender.sendMessage(" Post : " + C.BOLD + "" + C.WHITE + Form.duration(m.getPost().getAverage(), 2)); + sender.sendMessage("Updates : " + C.BOLD + "" + C.WHITE + Form.duration(m.getUpdate().getAverage(), 2)); return true; } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java index d2fe75fd9..f5c6c78ef 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java @@ -31,6 +31,30 @@ public class CommandIrisStudio extends MortarCommand @Command private CommandIrisStudioList list; + @Command + private CommandIrisGoto got0; + + @Command + private CommandIrisEditBiome ebiome; + + @Command + private CommandIrisMetrics metrics; + + @Command + private CommandIrisPregen pregen; + + @Command + private CommandIrisPregen world; + + @Command + private CommandIrisHotload hotload; + + @Command + private CommandIrisTC tc; + + @Command + private CommandIrisLoot loot; + public CommandIrisStudio() { super("studio", "std"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java index 9d6dfaf31..0cba9d236 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java @@ -1,11 +1,10 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.util.C; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -import net.md_5.bungee.api.ChatColor; - public class CommandIrisStudioCreate extends MortarCommand { public CommandIrisStudioCreate() @@ -22,7 +21,7 @@ public class CommandIrisStudioCreate extends MortarCommand if(args.length != 1) { sender.sendMessage("Please use a lowercase name with hyphens (-) for spaces."); - sender.sendMessage("I.e. /iris std new " + ChatColor.BOLD + "aether"); + sender.sendMessage("I.e. /iris std new " + C.BOLD + "aether"); return true; } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhat.java b/src/main/java/com/volmit/iris/command/CommandIrisWhat.java index 67a6eaae5..83674224a 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhat.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisWhat.java @@ -1,12 +1,12 @@ package com.volmit.iris.command; -import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisMetrics; import com.volmit.iris.gen.IrisChunkGenerator; +import com.volmit.iris.util.C; import com.volmit.iris.util.Command; import com.volmit.iris.util.Form; import com.volmit.iris.util.MortarCommand; @@ -38,11 +38,11 @@ public class CommandIrisWhat extends MortarCommand World world = p.getWorld(); IrisChunkGenerator g = (IrisChunkGenerator) world.getGenerator(); IrisMetrics m = g.getMetrics(); - sender.sendMessage("Thread Count: " + ChatColor.BOLD + "" + ChatColor.WHITE + g.getThreads()); - sender.sendMessage("Total : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTotal().getAverage(), 2)); - sender.sendMessage(" Terrain : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTerrain().getAverage(), 2)); - sender.sendMessage(" Parallax: " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getParallax().getAverage(), 2)); - sender.sendMessage(" Post : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getPost().getAverage(), 2)); + sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreads()); + sender.sendMessage("Total : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTotal().getAverage(), 2)); + sender.sendMessage(" Terrain : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTerrain().getAverage(), 2)); + sender.sendMessage(" Parallax: " + C.BOLD + "" + C.WHITE + Form.duration(m.getParallax().getAverage(), 2)); + sender.sendMessage(" Post : " + C.BOLD + "" + C.WHITE + Form.duration(m.getPost().getAverage(), 2)); return true; } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java index d90aa436b..e7815448c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java @@ -1,11 +1,11 @@ package com.volmit.iris.command; -import org.bukkit.ChatColor; import org.bukkit.FluidCollisionMode; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.util.C; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -27,8 +27,8 @@ public class CommandIrisWhatBlock extends MortarCommand { Player p = sender.player(); BlockData bd = p.getTargetBlockExact(128, FluidCollisionMode.NEVER).getBlockData(); - sender.sendMessage("Material: " + ChatColor.GREEN + bd.getMaterial().name()); - sender.sendMessage("Full: " + ChatColor.WHITE + bd.getAsString(true)); + sender.sendMessage("Material: " + C.GREEN + bd.getMaterial().name()); + sender.sendMessage("Full: " + C.WHITE + bd.getAsString(true)); } else diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java index d280d943d..390be6a85 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java @@ -1,15 +1,17 @@ package com.volmit.iris.command; -import org.bukkit.ChatColor; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.util.C; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -public class CommandIrisWhatHand extends MortarCommand { - public CommandIrisWhatHand() { +public class CommandIrisWhatHand extends MortarCommand +{ + public CommandIrisWhatHand() + { super("hand", "h"); setDescription("Get the block data for holding."); requiresPermission(Iris.perm.studio); @@ -21,11 +23,11 @@ public class CommandIrisWhatHand extends MortarCommand { public boolean handle(MortarSender sender, String[] args) { if(sender.isPlayer()) - { + { Player p = sender.player(); BlockData bd = p.getInventory().getItemInMainHand().getType().createBlockData(); - sender.sendMessage("Material: " + ChatColor.GREEN + bd.getMaterial().name()); - sender.sendMessage("Full: " + ChatColor.WHITE + bd.getAsString(true)); + sender.sendMessage("Material: " + C.GREEN + bd.getMaterial().name()); + sender.sendMessage("Full: " + C.WHITE + bd.getAsString(true)); } else @@ -37,7 +39,8 @@ public class CommandIrisWhatHand extends MortarCommand { } @Override - protected String getArgsUsage() { + protected String getArgsUsage() + { return ""; } } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWorld.java b/src/main/java/com/volmit/iris/command/CommandIrisWorld.java deleted file mode 100644 index 2e06ddbde..000000000 --- a/src/main/java/com/volmit/iris/command/CommandIrisWorld.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.volmit.iris.command; - -import com.volmit.iris.Iris; -import com.volmit.iris.util.Command; -import com.volmit.iris.util.MortarCommand; -import com.volmit.iris.util.MortarSender; - -public class CommandIrisWorld extends MortarCommand -{ - @Command - private CommandIrisGoto got0; - - @Command - private CommandIrisMetrics metrics; - - @Command - private CommandIrisPregen pregen; - - @Command - private CommandIrisPregen world; - - @Command - private CommandIrisHotload hotload; - - @Command - private CommandIrisTC tc; - - @Command - private CommandIrisLoot loot; - - public CommandIrisWorld() - { - super("world", "wrld", "w"); - setDescription("Commands while in an iris world."); - requiresPermission(Iris.perm.studio); - setCategory("World"); - setDescription("Worldly commands"); - } - - @Override - public boolean handle(MortarSender sender, String[] args) - { - sender.sendMessage("Iris In-World Commands"); - printHelp(sender); - - return true; - } - - @Override - protected String getArgsUsage() - { - return "[biome] [otherbiome] [-cave]"; - } -} diff --git a/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java b/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java index 6aba192be..cb4a96435 100644 --- a/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java @@ -34,6 +34,7 @@ import com.volmit.iris.object.IrisObject; import com.volmit.iris.object.IrisRegion; import com.volmit.iris.object.IrisStructure; import com.volmit.iris.util.B; +import com.volmit.iris.util.C; import com.volmit.iris.util.ChronoLatch; import com.volmit.iris.util.J; import com.volmit.iris.util.M; @@ -41,7 +42,6 @@ import com.volmit.iris.util.RNG; import lombok.Data; import lombok.EqualsAndHashCode; -import net.md_5.bungee.api.ChatColor; @Data @EqualsAndHashCode(callSuper = false) @@ -426,10 +426,10 @@ public abstract class ContextualChunkGenerator extends ChunkGenerator implements for(Player i : world.getPlayers()) { - Iris.instance.imsg(i, ChatColor.DARK_RED + "Iris Generator has crashed!"); - Iris.instance.imsg(i, ChatColor.RED + "- Check the console for the error."); - Iris.instance.imsg(i, ChatColor.RED + "- To Regen, use /iris std open "); - Iris.instance.imsg(i, ChatColor.RED + "- To Retry the chunk, use /iris world retry"); + Iris.instance.imsg(i, C.DARK_RED + "Iris Generator has crashed!"); + Iris.instance.imsg(i, C.RED + "- Check the console for the error."); + Iris.instance.imsg(i, C.RED + "- To Regen, use /iris std open "); + Iris.instance.imsg(i, C.RED + "- To Retry the chunk, use /iris world retry"); } }); diff --git a/src/main/java/com/volmit/iris/noise/FastNoise.java b/src/main/java/com/volmit/iris/noise/FastNoise.java index 06f815768..359b97fa3 100644 --- a/src/main/java/com/volmit/iris/noise/FastNoise.java +++ b/src/main/java/com/volmit/iris/noise/FastNoise.java @@ -27,8 +27,8 @@ // package com.volmit.iris.noise; -import com.volmit.iris.util.vec.Vector2f; -import com.volmit.iris.util.vec.Vector3f; +import com.volmit.iris.util.Vector2f; +import com.volmit.iris.util.Vector3f; public class FastNoise { diff --git a/src/main/java/com/volmit/iris/object/IrisLoot.java b/src/main/java/com/volmit/iris/object/IrisLoot.java index 4c067ae51..65bbce5ed 100644 --- a/src/main/java/com/volmit/iris/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/object/IrisLoot.java @@ -11,6 +11,7 @@ import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.B; +import com.volmit.iris.util.C; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.Form; @@ -21,7 +22,6 @@ import com.volmit.iris.util.RNG; import com.volmit.iris.util.Required; import lombok.Data; -import net.md_5.bungee.api.ChatColor; @Desc("Represents a loot entry") @Data @@ -161,11 +161,11 @@ public class IrisLoot { if(lore.isNotEmpty()) { - lore.add(ChatColor.GRAY + "--------------------"); + lore.add(C.GRAY + "--------------------"); } - lore.add(ChatColor.GRAY + "From: " + table.getName() + " (" + Form.pc(1D / table.getRarity(), 5) + ")"); - lore.add(ChatColor.GRAY + "1 in " + (table.getRarity() * getRarity()) + " Chance (" + Form.pc(1D / (table.getRarity() * getRarity()), 5) + ")"); + lore.add(C.GRAY + "From: " + table.getName() + " (" + Form.pc(1D / table.getRarity(), 5) + ")"); + lore.add(C.GRAY + "1 in " + (table.getRarity() * getRarity()) + " Chance (" + Form.pc(1D / (table.getRarity() * getRarity()), 5) + ")"); } m.setLore(lore); diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index 06268832c..0678807bb 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -14,6 +14,7 @@ import com.volmit.iris.util.KSet; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.RNG; +import com.volmit.iris.util.RegistryListBiome; import com.volmit.iris.util.Required; import lombok.Data; @@ -97,24 +98,28 @@ public class IrisRegion extends IrisRegistrant implements IRare @Desc("A list of structure tilesets") private KList structures = new KList<>(); + @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList landBiomes = new KList<>(); + @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList seaBiomes = new KList<>(); + @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList shoreBiomes = new KList<>(); + @RegistryListBiome @ArrayType(min = 1, type = String.class) @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") diff --git a/src/main/java/com/volmit/iris/util/Board.java b/src/main/java/com/volmit/iris/util/Board.java index 298599628..821e1fcd9 100644 --- a/src/main/java/com/volmit/iris/util/Board.java +++ b/src/main/java/com/volmit/iris/util/Board.java @@ -7,7 +7,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Objective; @@ -21,111 +20,128 @@ import lombok.Setter; * @author Missionary (missionarymc@gmail.com) * @since 3/23/2018 */ -public class Board { +public class Board +{ - private static final String[] CACHED_ENTRIES = new String[ChatColor.values().length]; + private static final String[] CACHED_ENTRIES = new String[C.values().length]; - private static final Function APPLY_COLOR_TRANSLATION = s -> ChatColor.translateAlternateColorCodes('&', s); + private static final Function APPLY_COLOR_TRANSLATION = s -> C.translateAlternateColorCodes('&', s); - static { - IntStream.range(0, 15).forEach(i -> CACHED_ENTRIES[i] = ChatColor.values()[i].toString() + ChatColor.RESET); - } + static + { + IntStream.range(0, 15).forEach(i -> CACHED_ENTRIES[i] = C.values()[i].toString() + C.RESET); + } - private final Player player; - private final Objective objective; - private final Team team; - @Setter private BoardSettings boardSettings; - private boolean ready; + private final Player player; + private final Objective objective; + private final Team team; + @Setter + private BoardSettings boardSettings; + private boolean ready; - @SuppressWarnings("deprecation") - public Board(@NonNull final Player player, final BoardSettings boardSettings) { - this.player = player; - this.boardSettings = boardSettings; - this.objective = this.getScoreboard().getObjective("board") == null ? this.getScoreboard().registerNewObjective("board", "dummy") : this.getScoreboard().getObjective("board"); - this.objective.setDisplaySlot(DisplaySlot.SIDEBAR); - this.team = this.getScoreboard().getTeam("board") == null ? this.getScoreboard().registerNewTeam("board") : this.getScoreboard().getTeam("board"); - this.team.setAllowFriendlyFire(true); - this.team.setCanSeeFriendlyInvisibles(false); - this.team.setPrefix(""); - this.team.setSuffix(""); - this.ready = true; - } + @SuppressWarnings("deprecation") + public Board(@NonNull final Player player, final BoardSettings boardSettings) + { + this.player = player; + this.boardSettings = boardSettings; + this.objective = this.getScoreboard().getObjective("board") == null ? this.getScoreboard().registerNewObjective("board", "dummy") : this.getScoreboard().getObjective("board"); + this.objective.setDisplaySlot(DisplaySlot.SIDEBAR); + this.team = this.getScoreboard().getTeam("board") == null ? this.getScoreboard().registerNewTeam("board") : this.getScoreboard().getTeam("board"); + this.team.setAllowFriendlyFire(true); + this.team.setCanSeeFriendlyInvisibles(false); + this.team.setPrefix(""); + this.team.setSuffix(""); + this.ready = true; + } - public Scoreboard getScoreboard() { - return (player != null) ? player.getScoreboard() : null; - } + public Scoreboard getScoreboard() + { + return (player != null) ? player.getScoreboard() : null; + } - public void remove() { - this.resetScoreboard(); - } + public void remove() + { + this.resetScoreboard(); + } - public void update() { - // Checking if we are ready to start updating the Scoreboard. - if (!ready) { - return; - } + public void update() + { + // Checking if we are ready to start updating the Scoreboard. + if(!ready) + { + return; + } - // Making sure the player is connected. - if (!player.isOnline()) { - remove(); - return; - } + // Making sure the player is connected. + if(!player.isOnline()) + { + remove(); + return; + } - // Making sure the Scoreboard Provider is set. - if (boardSettings == null) { - return; - } + // Making sure the Scoreboard Provider is set. + if(boardSettings == null) + { + return; + } - // Getting their Scoreboard display from the Scoreboard Provider. - final List entries = boardSettings.getBoardProvider().getLines(player).stream().map(APPLY_COLOR_TRANSLATION).collect(Collectors.toList()); + // Getting their Scoreboard display from the Scoreboard Provider. + final List entries = boardSettings.getBoardProvider().getLines(player).stream().map(APPLY_COLOR_TRANSLATION).collect(Collectors.toList()); - if (boardSettings.getScoreDirection() == ScoreDirection.UP) { - Collections.reverse(entries); - } + if(boardSettings.getScoreDirection() == ScoreDirection.UP) + { + Collections.reverse(entries); + } - // Setting the Scoreboard title - String title = boardSettings.getBoardProvider().getTitle(player); - if (title.length() > 32) { - Bukkit.getLogger().warning("The title " + title + " is over 32 characters in length, substringing to prevent errors."); - title = title.substring(0, 32); - } - objective.setDisplayName(ChatColor.translateAlternateColorCodes('&', title)); + // Setting the Scoreboard title + String title = boardSettings.getBoardProvider().getTitle(player); + if(title.length() > 32) + { + Bukkit.getLogger().warning("The title " + title + " is over 32 characters in length, substringing to prevent errors."); + title = title.substring(0, 32); + } + objective.setDisplayName(C.translateAlternateColorCodes('&', title)); - // Clearing previous Scoreboard values if entry sizes don't match. - if (this.getScoreboard().getEntries().size() != entries.size()) - this.getScoreboard().getEntries().forEach(this::removeEntry); + // Clearing previous Scoreboard values if entry sizes don't match. + if(this.getScoreboard().getEntries().size() != entries.size()) + this.getScoreboard().getEntries().forEach(this::removeEntry); - // Setting Scoreboard lines. - for (int i = 0; i < entries.size(); i++) { - String str = entries.get(i); - BoardEntry entry = BoardEntry.translateToEntry(str); - Team team = getScoreboard().getTeam(CACHED_ENTRIES[i]); + // Setting Scoreboard lines. + for(int i = 0; i < entries.size(); i++) + { + String str = entries.get(i); + BoardEntry entry = BoardEntry.translateToEntry(str); + Team team = getScoreboard().getTeam(CACHED_ENTRIES[i]); - if (team == null) { - team = this.getScoreboard().registerNewTeam(CACHED_ENTRIES[i]); - team.addEntry(team.getName()); - } + if(team == null) + { + team = this.getScoreboard().registerNewTeam(CACHED_ENTRIES[i]); + team.addEntry(team.getName()); + } - team.setPrefix(entry.getPrefix()); - team.setSuffix(entry.getSuffix()); + team.setPrefix(entry.getPrefix()); + team.setSuffix(entry.getSuffix()); - switch (boardSettings.getScoreDirection()) { - case UP: - objective.getScore(team.getName()).setScore(1 + i); - break; - case DOWN: - objective.getScore(team.getName()).setScore(15 - i); - break; - } - } - } + switch(boardSettings.getScoreDirection()) + { + case UP: + objective.getScore(team.getName()).setScore(1 + i); + break; + case DOWN: + objective.getScore(team.getName()).setScore(15 - i); + break; + } + } + } - public void removeEntry(String id) { - this.getScoreboard().resetScores(id); - } + public void removeEntry(String id) + { + this.getScoreboard().resetScores(id); + } - public void resetScoreboard() { - ready = false; - player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); - } + public void resetScoreboard() + { + ready = false; + player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); + } } diff --git a/src/main/java/com/volmit/iris/util/BoardEntry.java b/src/main/java/com/volmit/iris/util/BoardEntry.java index 28572318f..86d4e1124 100644 --- a/src/main/java/com/volmit/iris/util/BoardEntry.java +++ b/src/main/java/com/volmit/iris/util/BoardEntry.java @@ -1,40 +1,48 @@ package com.volmit.iris.util; -import lombok.Getter; import org.apache.commons.lang.StringUtils; -import org.bukkit.ChatColor; + +import lombok.Getter; /** * @author Missionary (missionarymc@gmail.com) * @since 3/29/2018 */ -public class BoardEntry { +public class BoardEntry +{ - @Getter - private final String prefix, suffix; + @Getter + private final String prefix, suffix; - private BoardEntry(final String prefix, final String suffix) { - this.prefix = prefix; - this.suffix = suffix; - } + private BoardEntry(final String prefix, final String suffix) + { + this.prefix = prefix; + this.suffix = suffix; + } - public static BoardEntry translateToEntry(String input) { - if (input.isEmpty()) { - return new BoardEntry("", ""); - } - if (input.length() <= 16) { - return new BoardEntry(input, ""); - } else { - String prefix = input.substring(0, 16); - String suffix = ""; + public static BoardEntry translateToEntry(String input) + { + if(input.isEmpty()) + { + return new BoardEntry("", ""); + } + if(input.length() <= 16) + { + return new BoardEntry(input, ""); + } + else + { + String prefix = input.substring(0, 16); + String suffix = ""; - if (prefix.endsWith("\u00a7")) { - prefix = prefix.substring(0, prefix.length() - 1); - suffix = "\u00a7" + suffix; - } + if(prefix.endsWith("\u00a7")) + { + prefix = prefix.substring(0, prefix.length() - 1); + suffix = "\u00a7" + suffix; + } - suffix = StringUtils.left(ChatColor.getLastColors(prefix) + suffix + input.substring(16), 16); - return new BoardEntry(prefix, suffix); - } - } + suffix = StringUtils.left(C.getLastColors(prefix) + suffix + input.substring(16), 16); + return new BoardEntry(prefix, suffix); + } + } } \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/util/BoardManager.java b/src/main/java/com/volmit/iris/util/BoardManager.java index c45e3ea0f..f2935a435 100644 --- a/src/main/java/com/volmit/iris/util/BoardManager.java +++ b/src/main/java/com/volmit/iris/util/BoardManager.java @@ -1,86 +1,72 @@ package com.volmit.iris.util; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.scheduler.BukkitTask; - import java.util.Collections; import java.util.Map; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -/** - * @author Missionary (missionarymc@gmail.com) - * @since 3/23/2018 - */ -public class BoardManager implements Listener { +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scheduler.BukkitTask; - private final JavaPlugin plugin; - private BoardSettings boardSettings; - private Map scoreboards; - private BukkitTask updateTask; +public class BoardManager +{ + private final JavaPlugin plugin; + private BoardSettings boardSettings; + private Map scoreboards; + private BukkitTask updateTask; - public BoardManager(JavaPlugin plugin, BoardSettings boardSettings) { - this.plugin = plugin; - this.boardSettings = boardSettings; - this.scoreboards = new ConcurrentHashMap<>(); - this.updateTask = new BoardUpdateTask(this).runTaskTimer(plugin, 2L, 2L); - plugin.getServer().getPluginManager().registerEvents(this, plugin); - plugin.getServer().getOnlinePlayers().forEach(this::setup); - } + public BoardManager(JavaPlugin plugin, BoardSettings boardSettings) + { + this.plugin = plugin; + this.boardSettings = boardSettings; + this.scoreboards = new ConcurrentHashMap<>(); + this.updateTask = new BoardUpdateTask(this).runTaskTimer(plugin, 2L, 2L); + plugin.getServer().getOnlinePlayers().forEach(this::setup); + } - public void setBoardSettings(BoardSettings boardSettings) { - this.boardSettings = boardSettings; - scoreboards.values().forEach(board -> board.setBoardSettings(boardSettings)); - } + public void setBoardSettings(BoardSettings boardSettings) + { + this.boardSettings = boardSettings; + scoreboards.values().forEach(board -> board.setBoardSettings(boardSettings)); + } - public boolean hasBoard(Player player) { - return scoreboards.containsKey(player.getUniqueId()); - } + public boolean hasBoard(Player player) + { + return scoreboards.containsKey(player.getUniqueId()); + } - public Optional getBoard(Player player) { - return Optional.ofNullable(scoreboards.get(player.getUniqueId())); - } + public Optional getBoard(Player player) + { + return Optional.ofNullable(scoreboards.get(player.getUniqueId())); + } - private void setup(Player player) { - Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::resetScoreboard); - if (player.getScoreboard() == Bukkit.getScoreboardManager().getMainScoreboard()) { - player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard()); - } - scoreboards.put(player.getUniqueId(), new Board(player, boardSettings)); - } + public void setup(Player player) + { + Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::resetScoreboard); + if(player.getScoreboard().equals(Bukkit.getScoreboardManager().getMainScoreboard())) + { + player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard()); + } + scoreboards.put(player.getUniqueId(), new Board(player, boardSettings)); + } - private void remove(Player player) { - Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::remove); - } + public void remove(Player player) + { + Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::remove); + } - public Map getScoreboards() { - return Collections.unmodifiableMap(scoreboards); - } + public Map getScoreboards() + { + return Collections.unmodifiableMap(scoreboards); + } - @EventHandler - public void onJoin(final PlayerJoinEvent e) { - plugin.getServer().getScheduler().runTaskLater(plugin, () -> { - if (e.getPlayer().isOnline()) { // Set this up 2 ticks later. - setup(e.getPlayer()); - } - }, 2L); - } - - @EventHandler - public void onQuit(final PlayerQuitEvent e) { - this.remove(e.getPlayer()); - } - - public void onDisable() { - updateTask.cancel(); - plugin.getServer().getOnlinePlayers().forEach(this::remove); - scoreboards.clear(); - } + public void onDisable() + { + updateTask.cancel(); + plugin.getServer().getOnlinePlayers().forEach(this::remove); + scoreboards.clear(); + } } diff --git a/src/main/java/com/volmit/iris/util/BoardProvider.java b/src/main/java/com/volmit/iris/util/BoardProvider.java index 6e56efeec..c5282beb0 100644 --- a/src/main/java/com/volmit/iris/util/BoardProvider.java +++ b/src/main/java/com/volmit/iris/util/BoardProvider.java @@ -1,25 +1,12 @@ package com.volmit.iris.util; -import org.bukkit.entity.Player; -import org.bukkit.scoreboard.Objective; - import java.util.List; -public interface BoardProvider { +import org.bukkit.entity.Player; - /** - * Gets the title for {@link Objective#getDisplayName()} - * - * @param player The {@link Player} to supply - * @return The title for the objective - */ - String getTitle(Player player); +public interface BoardProvider +{ + String getTitle(Player player); - /** - * Gets the contents to be displayed on the {@link Board} - * - * @param player The {@link Player} to supply - * @return The {@link List} of contents - */ - List getLines(Player player); + List getLines(Player player); } diff --git a/src/main/java/com/volmit/iris/util/BoardSettings.java b/src/main/java/com/volmit/iris/util/BoardSettings.java index 8e9629e3a..5d343f642 100644 --- a/src/main/java/com/volmit/iris/util/BoardSettings.java +++ b/src/main/java/com/volmit/iris/util/BoardSettings.java @@ -3,16 +3,11 @@ package com.volmit.iris.util; import lombok.Builder; import lombok.Getter; -/** - * @author Missionary (missionarymc@gmail.com) - * @since 5/31/2018 - */ @Getter @Builder -public class BoardSettings { - - private BoardProvider boardProvider; - - private ScoreDirection scoreDirection; +public class BoardSettings +{ + private BoardProvider boardProvider; + private ScoreDirection scoreDirection; } diff --git a/src/main/java/com/volmit/iris/util/C.java b/src/main/java/com/volmit/iris/util/C.java index 843c61b0c..88b48c5f6 100644 --- a/src/main/java/com/volmit/iris/util/C.java +++ b/src/main/java/com/volmit/iris/util/C.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/volmit/iris/util/Callback.java b/src/main/java/com/volmit/iris/util/Callback.java index 321b184bb..b4b0b3bfb 100644 --- a/src/main/java/com/volmit/iris/util/Callback.java +++ b/src/main/java/com/volmit/iris/util/Callback.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; /** * Callback for async workers diff --git a/src/main/java/com/volmit/iris/util/Element.java b/src/main/java/com/volmit/iris/util/Element.java index a8e451b8b..b5eb06f2d 100644 --- a/src/main/java/com/volmit/iris/util/Element.java +++ b/src/main/java/com/volmit/iris/util/Element.java @@ -1,9 +1,7 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import org.bukkit.inventory.ItemStack; -import com.volmit.iris.util.KList; - public interface Element { public MaterialBlock getMaterial(); diff --git a/src/main/java/com/volmit/iris/util/ElementEvent.java b/src/main/java/com/volmit/iris/util/ElementEvent.java index 642d4c23b..2208c1344 100644 --- a/src/main/java/com/volmit/iris/util/ElementEvent.java +++ b/src/main/java/com/volmit/iris/util/ElementEvent.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; /** * Element Event. diff --git a/src/main/java/com/volmit/iris/util/MaterialBlock.java b/src/main/java/com/volmit/iris/util/MaterialBlock.java index 4c21deea6..8073ee868 100644 --- a/src/main/java/com/volmit/iris/util/MaterialBlock.java +++ b/src/main/java/com/volmit/iris/util/MaterialBlock.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/util/MortarCommand.java b/src/main/java/com/volmit/iris/util/MortarCommand.java index c3a7e4c85..6abbf875b 100644 --- a/src/main/java/com/volmit/iris/util/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/MortarCommand.java @@ -3,8 +3,6 @@ package com.volmit.iris.util; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import org.bukkit.ChatColor; - /** * Represents a pawn command * @@ -53,7 +51,7 @@ public abstract class MortarCommand implements ICommand } } b = true; - sender.sendMessage(ChatColor.GREEN + i.getNode() + " " + ChatColor.WHITE + i.getArgsUsage() + ChatColor.GRAY + " - " + i.getDescription()); + sender.sendMessage(C.GREEN + i.getNode() + " " + C.WHITE + i.getArgsUsage() + C.GRAY + " - " + i.getDescription()); } if(!b) diff --git a/src/main/java/com/volmit/iris/util/MortarSender.java b/src/main/java/com/volmit/iris/util/MortarSender.java index 3727d72e6..d2d0ba4b6 100644 --- a/src/main/java/com/volmit/iris/util/MortarSender.java +++ b/src/main/java/com/volmit/iris/util/MortarSender.java @@ -2,7 +2,6 @@ package com.volmit.iris.util; import java.util.Set; -import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -20,7 +19,8 @@ import lombok.Setter; * @author cyberpwn * */ -public class MortarSender implements CommandSender { +public class MortarSender implements CommandSender +{ private CommandSender s; private String tag; @@ -31,14 +31,17 @@ public class MortarSender implements CommandSender { /** * Wrap a command sender * - * @param s the command sender + * @param s + * the command sender */ - public MortarSender(CommandSender s) { + public MortarSender(CommandSender s) + { tag = ""; this.s = s; } - public MortarSender(CommandSender s, String tag) { + public MortarSender(CommandSender s, String tag) + { this.tag = tag; this.s = s; } @@ -46,9 +49,11 @@ public class MortarSender implements CommandSender { /** * Set a command tag (prefix for sendMessage) * - * @param tag the tag + * @param tag + * the tag */ - public void setTag(String tag) { + public void setTag(String tag) + { this.tag = tag; } @@ -57,7 +62,8 @@ public class MortarSender implements CommandSender { * * @return the command tag */ - public String getTag() { + public String getTag() + { return tag; } @@ -66,7 +72,8 @@ public class MortarSender implements CommandSender { * * @return true if it is */ - public boolean isPlayer() { + public boolean isPlayer() + { return getS() instanceof Player; } @@ -75,7 +82,8 @@ public class MortarSender implements CommandSender { * * @return a casted player */ - public Player player() { + public Player player() + { return (Player) getS(); } @@ -84,102 +92,122 @@ public class MortarSender implements CommandSender { * * @return the command sender */ - public CommandSender getS() { + public CommandSender getS() + { return s; } @Override - public boolean isPermissionSet(String name) { + public boolean isPermissionSet(String name) + { return s.isPermissionSet(name); } @Override - public boolean isPermissionSet(Permission perm) { + public boolean isPermissionSet(Permission perm) + { return s.isPermissionSet(perm); } @Override - public boolean hasPermission(String name) { + public boolean hasPermission(String name) + { return s.hasPermission(name); } @Override - public boolean hasPermission(Permission perm) { + public boolean hasPermission(Permission perm) + { return s.hasPermission(perm); } @Override - public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) { + public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) + { return s.addAttachment(plugin, name, value); } @Override - public PermissionAttachment addAttachment(Plugin plugin) { + public PermissionAttachment addAttachment(Plugin plugin) + { return s.addAttachment(plugin); } @Override - public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) { + public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) + { return s.addAttachment(plugin, name, value, ticks); } @Override - public PermissionAttachment addAttachment(Plugin plugin, int ticks) { + public PermissionAttachment addAttachment(Plugin plugin, int ticks) + { return s.addAttachment(plugin, ticks); } @Override - public void removeAttachment(PermissionAttachment attachment) { + public void removeAttachment(PermissionAttachment attachment) + { s.removeAttachment(attachment); } @Override - public void recalculatePermissions() { + public void recalculatePermissions() + { s.recalculatePermissions(); } @Override - public Set getEffectivePermissions() { + public Set getEffectivePermissions() + { return s.getEffectivePermissions(); } @Override - public boolean isOp() { + public boolean isOp() + { return s.isOp(); } @Override - public void setOp(boolean value) { + public void setOp(boolean value) + { s.setOp(value); } - public void hr() { + public void hr() + { s.sendMessage("========================================================"); } @Override - public void sendMessage(String message) { - s.sendMessage(ChatColor.translateAlternateColorCodes('&', getTag()) + message); + public void sendMessage(String message) + { + s.sendMessage(C.translateAlternateColorCodes('&', getTag()) + message); } @Override - public void sendMessage(String[] messages) { - for (String str : messages) - s.sendMessage(ChatColor.translateAlternateColorCodes('&', getTag() + str)); + public void sendMessage(String[] messages) + { + for(String str : messages) + s.sendMessage(C.translateAlternateColorCodes('&', getTag() + str)); } @Override - public Server getServer() { + public Server getServer() + { return s.getServer(); } @Override - public String getName() { + public String getName() + { return s.getName(); } @Override - public Spigot spigot() { + public Spigot spigot() + { return s.spigot(); } } diff --git a/src/main/java/com/volmit/iris/util/ParallaxChunk.java b/src/main/java/com/volmit/iris/util/ParallaxChunk.java index c74c4446f..e687b20b6 100644 --- a/src/main/java/com/volmit/iris/util/ParallaxChunk.java +++ b/src/main/java/com/volmit/iris/util/ParallaxChunk.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.parallax; +package com.volmit.iris.util; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -10,7 +10,6 @@ import org.bukkit.generator.ChunkGenerator.ChunkData; import com.volmit.iris.Iris; import com.volmit.iris.gen.atomics.AtomicSliver; -import com.volmit.iris.util.Writable; public class ParallaxChunk implements Writable { diff --git a/src/main/java/com/volmit/iris/util/ParallaxRegion.java b/src/main/java/com/volmit/iris/util/ParallaxRegion.java index eb6e45b8c..4a18ed692 100644 --- a/src/main/java/com/volmit/iris/util/ParallaxRegion.java +++ b/src/main/java/com/volmit/iris/util/ParallaxRegion.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.parallax; +package com.volmit.iris.util; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -11,9 +11,6 @@ import java.util.zip.GZIPInputStream; import org.bukkit.block.data.BlockData; import com.volmit.iris.IrisSettings; -import com.volmit.iris.util.CustomOutputStream; -import com.volmit.iris.util.M; -import com.volmit.iris.util.Writable; public class ParallaxRegion implements Writable { diff --git a/src/main/java/com/volmit/iris/util/ParallaxSection.java b/src/main/java/com/volmit/iris/util/ParallaxSection.java index 1902b093f..9ff1284a8 100644 --- a/src/main/java/com/volmit/iris/util/ParallaxSection.java +++ b/src/main/java/com/volmit/iris/util/ParallaxSection.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.parallax; +package com.volmit.iris.util; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -6,11 +6,6 @@ import java.io.IOException; import org.bukkit.block.data.BlockData; -import com.volmit.iris.util.B; -import com.volmit.iris.util.DataPalette; -import com.volmit.iris.util.KSet; -import com.volmit.iris.util.Writable; - public class ParallaxSection implements Writable { private final DataPalette block; diff --git a/src/main/java/com/volmit/iris/util/ParallaxWorld.java b/src/main/java/com/volmit/iris/util/ParallaxWorld.java index 3414c6b5d..fdc6efab6 100644 --- a/src/main/java/com/volmit/iris/util/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/util/ParallaxWorld.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.parallax; +package com.volmit.iris.util; import java.io.File; import java.io.IOException; @@ -6,7 +6,6 @@ import java.io.IOException; import org.bukkit.block.data.BlockData; import com.volmit.iris.Iris; -import com.volmit.iris.util.KMap; public class ParallaxWorld { diff --git a/src/main/java/com/volmit/iris/util/Point3d.java b/src/main/java/com/volmit/iris/util/Point3d.java index ca763b46c..b41cc9f06 100644 --- a/src/main/java/com/volmit/iris/util/Point3d.java +++ b/src/main/java/com/volmit/iris/util/Point3d.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Point3f.java b/src/main/java/com/volmit/iris/util/Point3f.java index 1f7715507..9fbc47979 100644 --- a/src/main/java/com/volmit/iris/util/Point3f.java +++ b/src/main/java/com/volmit/iris/util/Point3f.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Point4d.java b/src/main/java/com/volmit/iris/util/Point4d.java index 71ce29ee2..6f37f3ae5 100644 --- a/src/main/java/com/volmit/iris/util/Point4d.java +++ b/src/main/java/com/volmit/iris/util/Point4d.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Point4f.java b/src/main/java/com/volmit/iris/util/Point4f.java index d120779d6..ea0b0357c 100644 --- a/src/main/java/com/volmit/iris/util/Point4f.java +++ b/src/main/java/com/volmit/iris/util/Point4f.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/StructureTemplate.java b/src/main/java/com/volmit/iris/util/StructureTemplate.java index 9f9870050..5a1dd8f06 100644 --- a/src/main/java/com/volmit/iris/util/StructureTemplate.java +++ b/src/main/java/com/volmit/iris/util/StructureTemplate.java @@ -38,13 +38,6 @@ import com.volmit.iris.object.IrisStructureTile; import com.volmit.iris.object.NoiseStyle; import com.volmit.iris.object.StructureTileCondition; import com.volmit.iris.object.TileResult; -import com.volmit.iris.util.inventory.C; -import com.volmit.iris.util.inventory.MaterialBlock; -import com.volmit.iris.util.inventory.UIElement; -import com.volmit.iris.util.inventory.UIStaticDecorator; -import com.volmit.iris.util.inventory.UIWindow; -import com.volmit.iris.util.inventory.Window; -import com.volmit.iris.util.inventory.WindowResolution; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/Tuple2d.java b/src/main/java/com/volmit/iris/util/Tuple2d.java index 697238cba..13433939c 100644 --- a/src/main/java/com/volmit/iris/util/Tuple2d.java +++ b/src/main/java/com/volmit/iris/util/Tuple2d.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Tuple2f.java b/src/main/java/com/volmit/iris/util/Tuple2f.java index 5c7dba200..69f76affa 100644 --- a/src/main/java/com/volmit/iris/util/Tuple2f.java +++ b/src/main/java/com/volmit/iris/util/Tuple2f.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Tuple3d.java b/src/main/java/com/volmit/iris/util/Tuple3d.java index 3c0cb5ec5..d7547d6b8 100644 --- a/src/main/java/com/volmit/iris/util/Tuple3d.java +++ b/src/main/java/com/volmit/iris/util/Tuple3d.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Tuple3f.java b/src/main/java/com/volmit/iris/util/Tuple3f.java index 8e722b442..1b34c2a69 100644 --- a/src/main/java/com/volmit/iris/util/Tuple3f.java +++ b/src/main/java/com/volmit/iris/util/Tuple3f.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Tuple4d.java b/src/main/java/com/volmit/iris/util/Tuple4d.java index 186597ac1..ae622f133 100644 --- a/src/main/java/com/volmit/iris/util/Tuple4d.java +++ b/src/main/java/com/volmit/iris/util/Tuple4d.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Tuple4f.java b/src/main/java/com/volmit/iris/util/Tuple4f.java index fa6f7b289..0809ffe81 100644 --- a/src/main/java/com/volmit/iris/util/Tuple4f.java +++ b/src/main/java/com/volmit/iris/util/Tuple4f.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/UIElement.java b/src/main/java/com/volmit/iris/util/UIElement.java index d3a3d056c..789f6ba5a 100644 --- a/src/main/java/com/volmit/iris/util/UIElement.java +++ b/src/main/java/com/volmit/iris/util/UIElement.java @@ -1,12 +1,10 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import com.volmit.iris.util.KList; - public class UIElement implements Element { private MaterialBlock material; diff --git a/src/main/java/com/volmit/iris/util/UIStaticDecorator.java b/src/main/java/com/volmit/iris/util/UIStaticDecorator.java index c146b87e6..a4da090da 100644 --- a/src/main/java/com/volmit/iris/util/UIStaticDecorator.java +++ b/src/main/java/com/volmit/iris/util/UIStaticDecorator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/util/UIVoidDecorator.java b/src/main/java/com/volmit/iris/util/UIVoidDecorator.java index f84b1e250..2a6f5220b 100644 --- a/src/main/java/com/volmit/iris/util/UIVoidDecorator.java +++ b/src/main/java/com/volmit/iris/util/UIVoidDecorator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; public class UIVoidDecorator implements WindowDecorator { diff --git a/src/main/java/com/volmit/iris/util/UIWindow.java b/src/main/java/com/volmit/iris/util/UIWindow.java index 98603f30e..661b46229 100644 --- a/src/main/java/com/volmit/iris/util/UIWindow.java +++ b/src/main/java/com/volmit/iris/util/UIWindow.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -12,9 +12,6 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import com.volmit.iris.Iris; -import com.volmit.iris.util.J; -import com.volmit.iris.util.KMap; -import com.volmit.iris.util.KSet; public class UIWindow implements Window, Listener { diff --git a/src/main/java/com/volmit/iris/util/VecMathUtil.java b/src/main/java/com/volmit/iris/util/VecMathUtil.java index 63c469ef6..9663f3e1c 100644 --- a/src/main/java/com/volmit/iris/util/VecMathUtil.java +++ b/src/main/java/com/volmit/iris/util/VecMathUtil.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; /** * Utility vecmath class used when computing the hash code for vecmath diff --git a/src/main/java/com/volmit/iris/util/Vector2d.java b/src/main/java/com/volmit/iris/util/Vector2d.java index c039295d3..ba837a852 100644 --- a/src/main/java/com/volmit/iris/util/Vector2d.java +++ b/src/main/java/com/volmit/iris/util/Vector2d.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Vector2f.java b/src/main/java/com/volmit/iris/util/Vector2f.java index e012b8316..c4036afea 100644 --- a/src/main/java/com/volmit/iris/util/Vector2f.java +++ b/src/main/java/com/volmit/iris/util/Vector2f.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Vector3d.java b/src/main/java/com/volmit/iris/util/Vector3d.java index c2ded562d..11fe91b01 100644 --- a/src/main/java/com/volmit/iris/util/Vector3d.java +++ b/src/main/java/com/volmit/iris/util/Vector3d.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/Vector3f.java b/src/main/java/com/volmit/iris/util/Vector3f.java index 27694daba..ae95498ea 100644 --- a/src/main/java/com/volmit/iris/util/Vector3f.java +++ b/src/main/java/com/volmit/iris/util/Vector3f.java @@ -29,7 +29,7 @@ * $State$ */ -package com.volmit.iris.util.vec; +package com.volmit.iris.util; import java.lang.Math; diff --git a/src/main/java/com/volmit/iris/util/VirtualCommand.java b/src/main/java/com/volmit/iris/util/VirtualCommand.java index c97970efb..17ecd154f 100644 --- a/src/main/java/com/volmit/iris/util/VirtualCommand.java +++ b/src/main/java/com/volmit/iris/util/VirtualCommand.java @@ -3,7 +3,6 @@ package com.volmit.iris.util; import java.lang.reflect.Field; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import com.volmit.iris.Iris; @@ -128,7 +127,7 @@ public class VirtualCommand if(!sender.hasPermission(i)) { failed = true; - Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () -> sender.sendMessage("- " + ChatColor.WHITE + i), 0); + Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () -> sender.sendMessage("- " + C.WHITE + i), 0); } } diff --git a/src/main/java/com/volmit/iris/util/Window.java b/src/main/java/com/volmit/iris/util/Window.java index 8352d4f13..c283e2071 100644 --- a/src/main/java/com/volmit/iris/util/Window.java +++ b/src/main/java/com/volmit/iris/util/Window.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/volmit/iris/util/WindowDecorator.java b/src/main/java/com/volmit/iris/util/WindowDecorator.java index 85981dd66..5b4af9301 100644 --- a/src/main/java/com/volmit/iris/util/WindowDecorator.java +++ b/src/main/java/com/volmit/iris/util/WindowDecorator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; public interface WindowDecorator { diff --git a/src/main/java/com/volmit/iris/util/WindowResolution.java b/src/main/java/com/volmit/iris/util/WindowResolution.java index b5bf1f991..581454721 100644 --- a/src/main/java/com/volmit/iris/util/WindowResolution.java +++ b/src/main/java/com/volmit/iris/util/WindowResolution.java @@ -1,4 +1,4 @@ -package com.volmit.iris.util.inventory; +package com.volmit.iris.util; import org.bukkit.event.inventory.InventoryType;