diff --git a/pom.xml b/pom.xml index 80d27f0b4..23177bf6e 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ ninja.bytecode Shuriken - 1.0.3 + 1.1 org.spigotmc diff --git a/src/main/java/ninja/bytecode/iris/CommandIris.java b/src/main/java/ninja/bytecode/iris/CommandIris.java index 9b7326a10..403c72203 100644 --- a/src/main/java/ninja/bytecode/iris/CommandIris.java +++ b/src/main/java/ninja/bytecode/iris/CommandIris.java @@ -22,10 +22,10 @@ import ninja.bytecode.iris.generator.genobject.PlacedObject; import ninja.bytecode.iris.pack.CompiledDimension; import ninja.bytecode.iris.pack.IrisBiome; import ninja.bytecode.iris.util.BiomeLayer; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.execution.ChronoLatch; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.format.Form; import ninja.bytecode.shuriken.logging.L; public class CommandIris implements CommandExecutor @@ -92,15 +92,15 @@ public class CommandIris implements CommandExecutor if(percent > 1D) { - f = (int) percent + " + " + F.pc(percent - (int) percent, percent - (int) percent >= 0.01 ? 0 : 3); + f = (int) percent + " + " + Form.pc(percent - (int) percent, percent - (int) percent >= 0.01 ? 0 : 3); } else { - f = F.pc(percent, percent >= 0.01 ? 0 : 3); + f = Form.pc(percent, percent >= 0.01 ? 0 : 3); } - msg(p, "* " + C.DARK_GREEN + i + ": " + C.BOLD + C.WHITE + f + C.RESET + C.GRAY + " (" + F.f(g.getDimension().getObjectGroup(i).size()) + " variants)"); + msg(p, "* " + C.DARK_GREEN + i + ": " + C.BOLD + C.WHITE + f + C.RESET + C.GRAY + " (" + Form.f(g.getDimension().getObjectGroup(i).size()) + " variants)"); } } @@ -231,7 +231,7 @@ public class CommandIris implements CommandExecutor { msg(sender, "=== Hotloading Pack ==="); PackController c = Iris.getController(PackController.class); - GMap f = new GMap<>(); + KMap f = new KMap<>(); for(World i : Bukkit.getWorlds()) { @@ -261,7 +261,7 @@ public class CommandIris implements CommandExecutor if(msg.contains("|")) { - GList fx = new GList<>(); + KList fx = new KList<>(); fx.add(msg.split("\\Q|\\E")); fx.remove(0); fx.remove(0); @@ -290,7 +290,7 @@ public class CommandIris implements CommandExecutor { if(cl.flip()) { - msg(p, "Regenerating " + F.pc(pct)); + msg(p, "Regenerating " + Form.pc(pct)); } }, () -> { diff --git a/src/main/java/ninja/bytecode/iris/CommandIsh.java b/src/main/java/ninja/bytecode/iris/CommandIsh.java index f9e2fdcbf..48532edae 100644 --- a/src/main/java/ninja/bytecode/iris/CommandIsh.java +++ b/src/main/java/ninja/bytecode/iris/CommandIsh.java @@ -21,7 +21,7 @@ import ninja.bytecode.iris.generator.genobject.GenObject; import ninja.bytecode.iris.util.Cuboid; import ninja.bytecode.iris.util.Cuboid.CuboidDirection; import ninja.bytecode.iris.util.Direction; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.format.Form; public class CommandIsh implements CommandExecutor { @@ -74,7 +74,7 @@ public class CommandIsh implements CommandExecutor { FileOutputStream fos = new FileOutputStream(f); s.write(fos, true); - msg(p, "Saved " + args[1] + " (" + F.f(s.getSchematic().size()) + " Entries)"); + msg(p, "Saved " + args[1] + " (" + Form.f(s.getSchematic().size()) + " Entries)"); p.playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 0.45f); } @@ -137,7 +137,7 @@ public class CommandIsh implements CommandExecutor WandController.pasteSchematic(s, at); p.playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.25f); - msg(p, "Pasted " + args[1] + " (" + F.f(s.getSchematic().size()) + " Blocks Modified)"); + msg(p, "Pasted " + args[1] + " (" + Form.f(s.getSchematic().size()) + " Blocks Modified)"); } catch(Throwable e1) diff --git a/src/main/java/ninja/bytecode/iris/IrisMetrics.java b/src/main/java/ninja/bytecode/iris/IrisMetrics.java index fe8e89e90..c61d2b6cd 100644 --- a/src/main/java/ninja/bytecode/iris/IrisMetrics.java +++ b/src/main/java/ninja/bytecode/iris/IrisMetrics.java @@ -8,9 +8,9 @@ import mortar.compute.math.M; import mortar.util.text.C; import ninja.bytecode.iris.controller.ExecutionController; import ninja.bytecode.shuriken.bench.PrecisionStopwatch; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; +import ninja.bytecode.shuriken.format.Form; import ninja.bytecode.shuriken.math.RollingSequence; public class IrisMetrics @@ -18,54 +18,54 @@ public class IrisMetrics private int size; private int generators; private double scale; - private GMap sequences; + private KMap sequences; public IrisMetrics(int generators, int size) { scale = 1; this.size = size; this.generators = generators; - sequences = new GMap<>(); + sequences = new KMap<>(); } public String avgMS(String s, int dec) { - return F.duration(get(s).getAverage(), dec); + return Form.duration(get(s).getAverage(), dec); } public String avg(String s, int dec) { - return F.f(get(s).getAverage(), dec); + return Form.f(get(s).getAverage(), dec); } public String maxMS(String s, int dec) { - return F.duration(get(s).getMax(), dec); + return Form.duration(get(s).getMax(), dec); } public String max(String s, int dec) { - return F.f(get(s).getMax(), dec); + return Form.f(get(s).getMax(), dec); } public String minMS(String s, int dec) { - return F.duration(get(s).getMin(), dec); + return Form.duration(get(s).getMin(), dec); } public String min(String s, int dec) { - return F.f(get(s).getMin(), dec); + return Form.f(get(s).getMin(), dec); } public String medianMS(String s, int dec) { - return F.duration(get(s).getMedian(), dec); + return Form.duration(get(s).getMedian(), dec); } public String median(String s, int dec) { - return F.f(get(s).getMedian(), dec); + return Form.f(get(s).getMedian(), dec); } public RollingSequence get(String s) @@ -108,12 +108,12 @@ public class IrisMetrics this.generators = generators; } - public GMap getSequences() + public KMap getSequences() { return sequences; } - public void setSequences(GMap sequences) + public void setSequences(KMap sequences) { this.sequences = sequences; } @@ -130,11 +130,11 @@ public class IrisMetrics public void send(Player p, Consumer c, String parent, int ind) { - GMap out = new GMap<>(); + KMap out = new KMap<>(); looking: for(String i : getSequences().k()) { - GList o = new GList<>(); + KList o = new KList<>(); if(i.contains(":")) { @@ -208,24 +208,24 @@ public class IrisMetrics comma = true; } - String af = ms ? F.duration(vmin, dot) : comma ? F.f((int) vmin) : F.f(vmin, dot); - String bf = ms ? F.duration(vmed, dot) : comma ? F.f((int) vmed) : F.f(vmed, dot); - String cf = ms ? F.duration(vavg, dot) : comma ? F.f((int) vavg) : F.f(vavg, dot); - String df = ms ? F.duration(vmax, dot) : comma ? F.f((int) vmax) : F.f(vmax, dot); + String af = ms ? Form.duration(vmin, dot) : comma ? Form.f((int) vmin) : Form.f(vmin, dot); + String bf = ms ? Form.duration(vmed, dot) : comma ? Form.f((int) vmed) : Form.f(vmed, dot); + String cf = ms ? Form.duration(vavg, dot) : comma ? Form.f((int) vavg) : Form.f(vavg, dot); + String df = ms ? Form.duration(vmax, dot) : comma ? Form.f((int) vmax) : Form.f(vmax, dot); out.put(pf, C.DARK_GREEN.toString() + C.ITALIC + cf + C.RESET + C.GRAY + " (" + C.DARK_AQUA + C.ITALIC + af + C.RESET + C.GRAY + " > " + C.GOLD + C.ITALIC + bf + C.RESET + C.GRAY + " < " + C.DARK_RED + C.ITALIC + df + C.RESET + C.GRAY + ")"); } if(ind == 0) { - c.accept(C.WHITE.toString() + C.BOLD + "Total Generators: " + C.RESET + C.DARK_AQUA + C.ITALIC + F.f(generators)); - c.accept(C.WHITE.toString() + C.BOLD + "Parallelism: " + C.RESET + C.DARK_PURPLE + C.ITALIC + F.pc(scale) + C.WHITE + C.BOLD + " Threads: " + C.RESET + C.BLUE + C.ITALIC + Iris.getController(ExecutionController.class).getTC()); + c.accept(C.WHITE.toString() + C.BOLD + "Total Generators: " + C.RESET + C.DARK_AQUA + C.ITALIC + Form.f(generators)); + c.accept(C.WHITE.toString() + C.BOLD + "Parallelism: " + C.RESET + C.DARK_PURPLE + C.ITALIC + Form.pc(scale) + C.WHITE + C.BOLD + " Threads: " + C.RESET + C.BLUE + C.ITALIC + Iris.getController(ExecutionController.class).getTC()); } for(String i : out.k()) { - String g = F.capitalizeWords(i.replaceAll("\\Q-\\E", " ").toLowerCase()); - c.accept(F.repeat(" ", M.iclip(ind, 0, 4)) + C.WHITE + C.BOLD + g + C.RESET + ": " + out.get(i)); + String g = Form.capitalizeWords(i.replaceAll("\\Q-\\E", " ").toLowerCase()); + c.accept(Form.repeat(" ", M.iclip(ind, 0, 4)) + C.WHITE + C.BOLD + g + C.RESET + ": " + out.get(i)); send(p, c, i, ind + 1); } diff --git a/src/main/java/ninja/bytecode/iris/command/CommandIris.java b/src/main/java/ninja/bytecode/iris/command/CommandIris.java index 008844b49..ed84e98a8 100644 --- a/src/main/java/ninja/bytecode/iris/command/CommandIris.java +++ b/src/main/java/ninja/bytecode/iris/command/CommandIris.java @@ -15,7 +15,7 @@ import ninja.bytecode.iris.controller.TimingsController; import ninja.bytecode.iris.controller.WorldController; import ninja.bytecode.iris.generator.IrisGenerator; import ninja.bytecode.iris.pack.IrisBiome; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.format.Form; public class CommandIris implements CommandExecutor { @@ -41,9 +41,9 @@ public class CommandIris implements CommandExecutor { double t = Iris.getController(TimingsController.class).getResult("terrain"); double d = Iris.getController(TimingsController.class).getResult("decor"); - msg(sender, "Generation: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t + d, 2)); - msg(sender, " \\Terrain: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t, 2)); - msg(sender, " \\Decor: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(d, 2)); + msg(sender, "Generation: " + ChatColor.BOLD + ChatColor.WHITE + Form.duration(t + d, 2)); + msg(sender, " \\Terrain: " + ChatColor.BOLD + ChatColor.WHITE + Form.duration(t, 2)); + msg(sender, " \\Decor: " + ChatColor.BOLD + ChatColor.WHITE + Form.duration(d, 2)); } if(args[0].equalsIgnoreCase("rtp")) diff --git a/src/main/java/ninja/bytecode/iris/command/CommandIsh.java b/src/main/java/ninja/bytecode/iris/command/CommandIsh.java index e9adbe44d..855b2b9c6 100644 --- a/src/main/java/ninja/bytecode/iris/command/CommandIsh.java +++ b/src/main/java/ninja/bytecode/iris/command/CommandIsh.java @@ -21,7 +21,7 @@ import ninja.bytecode.iris.generator.genobject.GenObject; import ninja.bytecode.iris.util.Cuboid; import ninja.bytecode.iris.util.Cuboid.CuboidDirection; import ninja.bytecode.iris.util.Direction; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.format.Form; public class CommandIsh implements CommandExecutor { @@ -74,7 +74,7 @@ public class CommandIsh implements CommandExecutor { FileOutputStream fos = new FileOutputStream(f); s.write(fos, true); - msg(p, "Saved " + args[1] + " (" + F.f(s.getSchematic().size()) + " Entries)"); + msg(p, "Saved " + args[1] + " (" + Form.f(s.getSchematic().size()) + " Entries)"); p.playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 0.45f); } @@ -118,7 +118,7 @@ public class CommandIsh implements CommandExecutor WandController.pasteSchematic(s, at); p.playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.25f); - msg(p, "Pasted " + args[1] + " (" + F.f(s.getSchematic().size()) + " Blocks Modified)"); + msg(p, "Pasted " + args[1] + " (" + Form.f(s.getSchematic().size()) + " Blocks Modified)"); } catch(Throwable e1) diff --git a/src/main/java/ninja/bytecode/iris/controller/DebugController.java b/src/main/java/ninja/bytecode/iris/controller/DebugController.java index 2022a167f..340df256b 100644 --- a/src/main/java/ninja/bytecode/iris/controller/DebugController.java +++ b/src/main/java/ninja/bytecode/iris/controller/DebugController.java @@ -12,8 +12,8 @@ import mortar.util.text.C; import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.generator.IrisGenerator; import ninja.bytecode.iris.util.IrisController; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GSet; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KSet; import ninja.bytecode.shuriken.execution.J; public class DebugController implements IrisController @@ -39,8 +39,8 @@ public class DebugController implements IrisController { if(Iris.settings.performance.debugMode) { - GSet ws = new GSet<>(); - GList destroy = new GList<>(); + KSet ws = new KSet<>(); + KList destroy = new KList<>(); for(World i : Bukkit.getWorlds()) { diff --git a/src/main/java/ninja/bytecode/iris/controller/ExecutionController.java b/src/main/java/ninja/bytecode/iris/controller/ExecutionController.java index 88f8ef4ef..7990a015d 100644 --- a/src/main/java/ninja/bytecode/iris/controller/ExecutionController.java +++ b/src/main/java/ninja/bytecode/iris/controller/ExecutionController.java @@ -4,17 +4,17 @@ import org.bukkit.World; import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.util.IrisController; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.execution.TaskExecutor; public class ExecutionController implements IrisController { - GMap executors; + KMap executors; @Override public void onStart() { - executors = new GMap<>(); + executors = new KMap<>(); } @Override diff --git a/src/main/java/ninja/bytecode/iris/controller/PackController.java b/src/main/java/ninja/bytecode/iris/controller/PackController.java index 62610f1e0..6cc7f4c05 100644 --- a/src/main/java/ninja/bytecode/iris/controller/PackController.java +++ b/src/main/java/ninja/bytecode/iris/controller/PackController.java @@ -15,10 +15,10 @@ import ninja.bytecode.iris.pack.IrisDimension; import ninja.bytecode.iris.pack.IrisPack; import ninja.bytecode.iris.util.IrisController; import ninja.bytecode.shuriken.bench.PrecisionStopwatch; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.execution.J; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.format.Form; import ninja.bytecode.shuriken.io.IO; import ninja.bytecode.shuriken.json.JSONException; import ninja.bytecode.shuriken.json.JSONObject; @@ -26,19 +26,19 @@ import ninja.bytecode.shuriken.logging.L; public class PackController implements IrisController { - private GMap compiledDimensions; - private GMap dimensions; - private GMap biomes; - private GMap genObjectGroups; + private KMap compiledDimensions; + private KMap dimensions; + private KMap biomes; + private KMap genObjectGroups; private boolean ready; @Override public void onStart() { - compiledDimensions = new GMap<>(); - dimensions = new GMap<>(); - biomes = new GMap<>(); - genObjectGroups = new GMap<>(); + compiledDimensions = new KMap<>(); + dimensions = new KMap<>(); + biomes = new KMap<>(); + genObjectGroups = new KMap<>(); ready = false; } @@ -53,9 +53,9 @@ public class PackController implements IrisController return ready; } - public GList getFiles(File folder) + public KList getFiles(File folder) { - GList buf = new GList(); + KList buf = new KList(); if(!folder.exists()) { @@ -83,9 +83,9 @@ public class PackController implements IrisController public void compile() { - dimensions = new GMap<>(); - biomes = new GMap<>(); - genObjectGroups = new GMap<>(); + dimensions = new KMap<>(); + biomes = new KMap<>(); + genObjectGroups = new KMap<>(); ready = false; PrecisionStopwatch p = PrecisionStopwatch.start(); File dims = new File(Iris.instance.getDataFolder(), "dimensions"); @@ -117,7 +117,7 @@ public class PackController implements IrisController for(IrisBiome j : id.getBiomes()) { d.registerBiome(j); - GList g = j.getSchematicGroups().k(); + KList g = j.getSchematicGroups().k(); g.sort(); for(String k : g) @@ -152,13 +152,13 @@ public class PackController implements IrisController CompiledDimension d = compiledDimensions.get(i); d.computeObjectSize(); L.i(ChatColor.GREEN + i + ChatColor.WHITE + " (" + d.getEnvironment().toString().toLowerCase() + ")"); - L.i(ChatColor.DARK_GREEN + " Biomes: " + ChatColor.GRAY + F.f(d.getBiomes().size())); - L.i(ChatColor.DARK_GREEN + " Objects: " + ChatColor.GRAY + F.f(d.countObjects())); + L.i(ChatColor.DARK_GREEN + " Biomes: " + ChatColor.GRAY + Form.f(d.getBiomes().size())); + L.i(ChatColor.DARK_GREEN + " Objects: " + ChatColor.GRAY + Form.f(d.countObjects())); L.flush(); } L.i(""); - L.i(ChatColor.LIGHT_PURPLE + "Compilation Time: " + ChatColor.WHITE + F.duration(p.getMilliseconds(), 2)); + L.i(ChatColor.LIGHT_PURPLE + "Compilation Time: " + ChatColor.WHITE + Form.duration(p.getMilliseconds(), 2)); L.i(ChatColor.GREEN + "Iris Dimensions Successfully Compiled!"); L.i(""); L.flush(); @@ -166,22 +166,22 @@ public class PackController implements IrisController ready = true; } - public GMap getCompiledDimensions() + public KMap getCompiledDimensions() { return compiledDimensions; } - public GMap getDimensions() + public KMap getDimensions() { return dimensions; } - public GMap getBiomes() + public KMap getBiomes() { return biomes; } - public GMap getGenObjectGroups() + public KMap getGenObjectGroups() { return genObjectGroups; } diff --git a/src/main/java/ninja/bytecode/iris/controller/WandController.java b/src/main/java/ninja/bytecode/iris/controller/WandController.java index 8b64a0981..676123bf5 100644 --- a/src/main/java/ninja/bytecode/iris/controller/WandController.java +++ b/src/main/java/ninja/bytecode/iris/controller/WandController.java @@ -34,20 +34,20 @@ import ninja.bytecode.iris.util.IrisController; import ninja.bytecode.iris.util.MB; import ninja.bytecode.iris.util.ParticleEffect; import ninja.bytecode.iris.util.ParticleRedstone; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; +import ninja.bytecode.shuriken.format.Form; public class WandController implements IrisController { - private GMap goc; - private GMap gog; + private KMap goc; + private KMap gog; @Override public void onStart() { - goc = new GMap<>(); - gog = new GMap<>(); + goc = new KMap<>(); + gog = new KMap<>(); // TODO: Optimize Bukkit.getScheduler().scheduleSyncRepeatingTask(Iris.instance, () -> { @@ -211,7 +211,7 @@ public class WandController implements IrisController p.sendMessage(" "); } - p.sendMessage(C.DARK_GREEN + C.BOLD.toString() + gg + C.GRAY + "/" + C.RESET + C.ITALIC + C.GRAY + g.getName() + C.RESET + C.WHITE + " (1 of " + F.f(generator.getDimension().getObjectGroup(gg).size()) + " variants)"); + p.sendMessage(C.DARK_GREEN + C.BOLD.toString() + gg + C.GRAY + "/" + C.RESET + C.ITALIC + C.GRAY + g.getName() + C.RESET + C.WHITE + " (1 of " + Form.f(generator.getDimension().getObjectGroup(gg).size()) + " variants)"); if(biome.getSchematicGroups().containsKey(gg)) { @@ -220,12 +220,12 @@ public class WandController implements IrisController if(percent > 1D) { - f = (int) percent + " + " + F.pc(percent - (int) percent, percent - (int) percent >= 0.01 ? 0 : 3); + f = (int) percent + " + " + Form.pc(percent - (int) percent, percent - (int) percent >= 0.01 ? 0 : 3); } else { - f = F.pc(percent, percent >= 0.01 ? 0 : 3); + f = Form.pc(percent, percent >= 0.01 ? 0 : 3); } p.sendMessage(C.GOLD + "Spawn Chance in " + C.YELLOW + biome.getName() + C.RESET + ": " + C.BOLD + C.WHITE + f); @@ -244,7 +244,7 @@ public class WandController implements IrisController } c = ((double) a / (double) b); - p.sendMessage(C.GRAY + "Grp: " + C.DARK_AQUA + F.f(a) + C.GRAY + " of " + C.AQUA + F.f(b) + C.GRAY + " placements (" + C.DARK_AQUA + F.pc(c, 0) + C.GRAY + ")"); + p.sendMessage(C.GRAY + "Grp: " + C.DARK_AQUA + Form.f(a) + C.GRAY + " of " + C.AQUA + Form.f(b) + C.GRAY + " placements (" + C.DARK_AQUA + Form.pc(c, 0) + C.GRAY + ")"); } catch(Throwable e) @@ -252,7 +252,7 @@ public class WandController implements IrisController e.printStackTrace(); } - p.sendMessage(C.GRAY + "Var: " + C.DARK_AQUA + F.f(g.getSuccesses()) + C.GRAY + " of " + C.AQUA + F.f(g.getPlaces()) + C.GRAY + " placements (" + C.DARK_AQUA + F.pc(g.getSuccess(), 0) + C.GRAY + ")"); + p.sendMessage(C.GRAY + "Var: " + C.DARK_AQUA + Form.f(g.getSuccesses()) + C.GRAY + " of " + C.AQUA + Form.f(g.getPlaces()) + C.GRAY + " placements (" + C.DARK_AQUA + Form.pc(g.getSuccess(), 0) + C.GRAY + ")"); for(String i : ggg.getFlags()) { @@ -397,7 +397,7 @@ public class WandController implements IrisController im.setDisplayName(ChatColor.BOLD + "" + ChatColor.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 GList().add(locationToString(a), locationToString(b))); + im.setLore(new KList().add(locationToString(a), locationToString(b))); is.setItemMeta(im); return is; diff --git a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java index bdea83be3..38c922e46 100644 --- a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java +++ b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java @@ -33,7 +33,7 @@ import ninja.bytecode.iris.util.MB; import ninja.bytecode.iris.util.ObjectMode; import ninja.bytecode.iris.util.SChunkVector; import ninja.bytecode.shuriken.bench.PrecisionStopwatch; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; import ninja.bytecode.shuriken.logging.L; import ninja.bytecode.shuriken.math.CNG; import ninja.bytecode.shuriken.math.M; @@ -42,7 +42,7 @@ import ninja.bytecode.shuriken.math.RNG; public class IrisGenerator extends ParallaxWorldGenerator { //@builder - public static final GList ROCK = new GList().add(new MB[] { + public static final KList ROCK = new KList().add(new MB[] { MB.of(Material.STONE), MB.of(Material.STONE), MB.of(Material.STONE), @@ -246,7 +246,7 @@ public class IrisGenerator extends ParallaxWorldGenerator @Override public List getDefaultPopulators(World world) { - GList p = new GList<>(); + KList p = new KList<>(); if(Iris.settings.performance.objectMode.equals(ObjectMode.QUICK_N_DIRTY) || Iris.settings.performance.objectMode.equals(ObjectMode.LIGHTING)) { diff --git a/src/main/java/ninja/bytecode/iris/generator/WorldReactor.java b/src/main/java/ninja/bytecode/iris/generator/WorldReactor.java index 1fe1e9728..a1acca8fa 100644 --- a/src/main/java/ninja/bytecode/iris/generator/WorldReactor.java +++ b/src/main/java/ninja/bytecode/iris/generator/WorldReactor.java @@ -15,12 +15,12 @@ import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.util.ChronoQueue; import ninja.bytecode.iris.util.ObjectMode; import ninja.bytecode.iris.util.SMCAVector; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; public class WorldReactor { - private static GList q = new GList<>(); + private static KList q = new KList<>(); private final World world; public WorldReactor(World world) @@ -41,7 +41,7 @@ public class WorldReactor WorldReactor.q.add(q); FinalDouble of = new FinalDouble(0D); FinalDouble max = new FinalDouble(0D); - GMap d = new GMap<>(); + KMap d = new KMap<>(); int mx = p.getLocation().getChunk().getX(); int mz = p.getLocation().getChunk().getZ(); for(int xx = p.getLocation().getChunk().getX() - 32; xx < p.getLocation().getChunk().getX() + 32; xx++) @@ -59,7 +59,7 @@ public class WorldReactor } } - GList v = d.k(); + KList v = d.k(); Collections.sort(v, (a, b) -> (int) (10000 * (d.get(a) - d.get(b)))); for(SMCAVector i : v) diff --git a/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicRegionData.java b/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicRegionData.java index 361e3a305..444869b50 100644 --- a/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicRegionData.java +++ b/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicRegionData.java @@ -13,23 +13,23 @@ import org.jnbt.NBTInputStream; import org.jnbt.NBTOutputStream; import org.jnbt.Tag; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KMap; public class AtomicRegionData { private final World world; - private GMap tag; + private KMap tag; public AtomicRegionData(World world) { this.world = world; - tag = new GMap<>(); + tag = new KMap<>(); } public void read(InputStream in) throws IOException { NBTInputStream nin = new NBTInputStream(in); - tag = new GMap<>(); + tag = new KMap<>(); tag.putAll(((CompoundTag) nin.readTag()).getValue()); nin.close(); } diff --git a/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicWorldData.java b/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicWorldData.java index 847b9c285..d6e7e3e0e 100644 --- a/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicWorldData.java +++ b/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicWorldData.java @@ -8,22 +8,22 @@ import java.io.IOException; import org.bukkit.World; import ninja.bytecode.iris.util.SMCAVector; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; public class AtomicWorldData { private World world; - private GMap loadedSections; + private KMap loadedSections; public AtomicWorldData(World world) { this.world = world; - loadedSections = new GMap<>(); + loadedSections = new KMap<>(); getSubregionFolder().mkdirs(); } - public GList getLoadedRegions() + public KList getLoadedRegions() { return loadedSections.k(); } diff --git a/src/main/java/ninja/bytecode/iris/generator/genobject/GenObject.java b/src/main/java/ninja/bytecode/iris/generator/genobject/GenObject.java index 6240915fa..f7de18874 100644 --- a/src/main/java/ninja/bytecode/iris/generator/genobject/GenObject.java +++ b/src/main/java/ninja/bytecode/iris/generator/genobject/GenObject.java @@ -32,8 +32,8 @@ import ninja.bytecode.iris.util.IPlacer; import ninja.bytecode.iris.util.MB; import ninja.bytecode.iris.util.SBlockVector; import ninja.bytecode.iris.util.VectorMath; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.io.CustomOutputStream; import ninja.bytecode.shuriken.logging.L; import ninja.bytecode.shuriken.math.RNG; @@ -47,7 +47,7 @@ public class GenObject private int failures; private int successes; private String name = "?"; - private GMap s; + private KMap s; private BlockVector mount; private int mountHeight; private BlockVector shift; @@ -58,7 +58,7 @@ public class GenObject this.h = h; this.d = d; shift = new BlockVector(); - s = new GMap<>(); + s = new KMap<>(); centeredHeight = false; } @@ -74,7 +74,7 @@ public class GenObject } } - GList fmount = new GList<>(); + KList fmount = new KList<>(); for(SBlockVector i : s.keySet()) { @@ -133,7 +133,7 @@ public class GenObject return d; } - public GMap getSchematic() + public KMap getSchematic() { return s; } @@ -227,7 +227,7 @@ public class GenObject s.clear(); } - public void fill(GMap b) + public void fill(KMap b) { clear(); s.putAll(b); @@ -272,7 +272,7 @@ public class GenObject } start.add(shift); - GMap undo = new GMap<>(); + KMap undo = new KMap<>(); for(SBlockVector i : s.keySet()) { @@ -349,7 +349,7 @@ public class GenObject public void rotate(Direction from, Direction to) { - GMap g = new GMap<>(); + KMap g = new KMap<>(); g.putAll(s); s.clear(); diff --git a/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectDecorator.java b/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectDecorator.java index 908704251..803278189 100644 --- a/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectDecorator.java +++ b/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectDecorator.java @@ -24,9 +24,9 @@ import ninja.bytecode.iris.util.IPlacer; import ninja.bytecode.iris.util.MB; import ninja.bytecode.iris.util.ObjectMode; import ninja.bytecode.iris.util.SMCAVector; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; -import ninja.bytecode.shuriken.collections.GSet; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; +import ninja.bytecode.shuriken.collections.KSet; import ninja.bytecode.shuriken.execution.ChronoLatch; import ninja.bytecode.shuriken.execution.J; import ninja.bytecode.shuriken.logging.L; @@ -35,9 +35,9 @@ import ninja.bytecode.shuriken.math.RNG; public class GenObjectDecorator extends BlockPopulator { - private GList placeHistory; - private GMap> orderCache; - private GMap> populationCache; + private KList placeHistory; + private KMap> orderCache; + private KMap> populationCache; private IPlacer placer; private IrisGenerator g; private ChronoLatch cl = new ChronoLatch(250); @@ -45,14 +45,14 @@ public class GenObjectDecorator extends BlockPopulator public GenObjectDecorator(IrisGenerator generator) { this.g = generator; - placeHistory = new GList<>(); - populationCache = new GMap<>(); - orderCache = new GMap<>(); + placeHistory = new KList<>(); + populationCache = new KMap<>(); + orderCache = new KMap<>(); for(IrisBiome i : generator.getDimension().getBiomes()) { - GMap gc = new GMap<>(); - GMap> or = new GMap<>(); + KMap gc = new KMap<>(); + KMap> or = new KMap<>(); int ff = 0; for(String j : i.getSchematicGroups().k()) { @@ -66,7 +66,7 @@ public class GenObjectDecorator extends BlockPopulator if(!or.containsKey(g.getPiority())) { - or.put(g.getPiority(), new GList<>()); + or.put(g.getPiority(), new KList<>()); } or.get(g.getPiority()).add(g); @@ -81,8 +81,8 @@ public class GenObjectDecorator extends BlockPopulator if(!gc.isEmpty()) { - GList g = new GList<>(); - for(GList j : or.v()) + KList g = new KList<>(); + for(KList j : or.v()) { g.addAll(j); } @@ -114,7 +114,7 @@ public class GenObjectDecorator extends BlockPopulator return; } - GSet hits = new GSet<>(); + KSet hits = new KSet<>(); int cx = source.getX(); int cz = source.getZ(); @@ -129,7 +129,7 @@ public class GenObjectDecorator extends BlockPopulator continue; } - GMap objects = populationCache.get(biome); + KMap objects = populationCache.get(biome); if(objects == null) { @@ -289,7 +289,7 @@ public class GenObjectDecorator extends BlockPopulator } ParallaxCache cache = new ParallaxCache(g); - GSet hits = new GSet<>(); + KSet hits = new KSet<>(); for(int i = 0; i < Iris.settings.performance.decorationAccuracy; i++) { @@ -302,7 +302,7 @@ public class GenObjectDecorator extends BlockPopulator continue; } - GMap objects = populationCache.get(biome); + KMap objects = populationCache.get(biome); if(objects == null) { @@ -426,7 +426,7 @@ public class GenObjectDecorator extends BlockPopulator return floor; } - public GList getHistory() + public KList getHistory() { return placeHistory; } @@ -438,7 +438,7 @@ public class GenObjectDecorator extends BlockPopulator public PlacedObject randomObject(String string) { - GList v = new GList<>(); + KList v = new KList<>(); for(PlacedObject i : placeHistory) { diff --git a/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectGroup.java b/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectGroup.java index f31f2e11e..9f25d7113 100644 --- a/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectGroup.java +++ b/src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectGroup.java @@ -10,15 +10,15 @@ import net.md_5.bungee.api.ChatColor; import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.controller.PackController; import ninja.bytecode.iris.util.Direction; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.format.Form; import ninja.bytecode.shuriken.io.IO; import ninja.bytecode.shuriken.logging.L; public class GenObjectGroup { - private GList schematics; - private GList flags; + private KList schematics; + private KList flags; private String name; private int priority; private double worldChance; @@ -26,8 +26,8 @@ public class GenObjectGroup public GenObjectGroup(String name) { - this.schematics = new GList<>(); - this.flags = new GList<>(); + this.schematics = new KList<>(); + this.flags = new KList<>(); this.name = name; priority = Integer.MIN_VALUE; worldChance = Integer.MIN_VALUE; @@ -104,7 +104,7 @@ public class GenObjectGroup public GenObjectGroup copy(String suffix) { GenObjectGroup gog = new GenObjectGroup(name + suffix); - gog.schematics = new GList<>(); + gog.schematics = new KList<>(); gog.flags = flags.copy(); for(GenObject i : schematics) @@ -127,22 +127,22 @@ public class GenObjectGroup this.name = name; } - public GList getSchematics() + public KList getSchematics() { return schematics; } - public void setSchematics(GList schematics) + public void setSchematics(KList schematics) { this.schematics = schematics; } - public GList getFlags() + public KList getFlags() { return flags; } - public void setFlags(GList flags) + public void setFlags(KList flags) { this.flags = flags; } @@ -228,7 +228,7 @@ public class GenObjectGroup if(!flags.contains("no rotation")) { - GList inject = new GList<>(); + KList inject = new KList<>(); for(GenObject i : getSchematics()) { for(Direction j : new Direction[] {Direction.S, Direction.E, Direction.W}) @@ -244,7 +244,7 @@ public class GenObjectGroup getSchematics().add(inject); } - L.i(ChatColor.LIGHT_PURPLE + "Processed " + ChatColor.WHITE + F.f(schematics.size()) + ChatColor.LIGHT_PURPLE + " Schematics in " + ChatColor.WHITE + name); + L.i(ChatColor.LIGHT_PURPLE + "Processed " + ChatColor.WHITE + Form.f(schematics.size()) + ChatColor.LIGHT_PURPLE + " Schematics in " + ChatColor.WHITE + name); } public void dispose() diff --git a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java index 3db63cef8..f0f7b5eb5 100644 --- a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java +++ b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java @@ -13,15 +13,15 @@ import ninja.bytecode.iris.pack.IrisRegion; import ninja.bytecode.iris.util.BiomeLayer; import ninja.bytecode.iris.util.GenLayer; import ninja.bytecode.iris.util.PolygonGenerator; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.logging.L; import ninja.bytecode.shuriken.math.CNG; import ninja.bytecode.shuriken.math.RNG; public class GenLayerBiome extends GenLayer { - private GMap regions; + private KMap regions; private Function factory; private CNG fracture; private CNG fuzz; @@ -29,7 +29,7 @@ public class GenLayerBiome extends GenLayer private PolygonGenerator ocean; private BiomeLayer master; - public GenLayerBiome(IrisGenerator iris, World world, Random random, RNG rng, GList biomes) + public GenLayerBiome(IrisGenerator iris, World world, Random random, RNG rng, KList biomes) { super(iris, world, random, rng); //@builder @@ -47,7 +47,7 @@ public class GenLayerBiome extends GenLayer .scale(0.04) .fractureWith(new CNG(rng.nextParallelRNG(1216), 1D, 3).scale(0.0004), 266), 66); //@done - regions = new GMap<>(); + regions = new KMap<>(); for(IrisBiome i : biomes) { diff --git a/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxCache.java b/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxCache.java index 3f1b1fb64..cf9331bfc 100644 --- a/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxCache.java +++ b/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxCache.java @@ -6,22 +6,22 @@ import ninja.bytecode.iris.pack.IrisBiome; import ninja.bytecode.iris.util.ChunkPlan; import ninja.bytecode.iris.util.MB; import ninja.bytecode.iris.util.SMCAVector; -import ninja.bytecode.shuriken.collections.GMap; -import ninja.bytecode.shuriken.collections.GSet; +import ninja.bytecode.shuriken.collections.KMap; +import ninja.bytecode.shuriken.collections.KSet; public class ParallaxCache { - private GMap cachePlan; - private GMap cacheData; - private GSet contains; + private KMap cachePlan; + private KMap cacheData; + private KSet contains; private IrisGenerator gen; public ParallaxCache(IrisGenerator gen) { this.gen = gen; - cacheData = new GMap<>(); - cachePlan = new GMap<>(); - contains = new GSet<>(); + cacheData = new KMap<>(); + cachePlan = new KMap<>(); + contains = new KSet<>(); } public MB get(int x, int y, int z) diff --git a/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxWorldGenerator.java b/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxWorldGenerator.java index db3b281a0..03812071a 100644 --- a/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxWorldGenerator.java +++ b/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxWorldGenerator.java @@ -22,7 +22,7 @@ import ninja.bytecode.iris.util.IrisWorldData; import ninja.bytecode.iris.util.ObjectMode; import ninja.bytecode.iris.util.SChunkVector; import ninja.bytecode.shuriken.bench.PrecisionStopwatch; -import ninja.bytecode.shuriken.collections.GSet; +import ninja.bytecode.shuriken.collections.KSet; import ninja.bytecode.shuriken.execution.ChronoLatch; import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup; import ninja.bytecode.shuriken.math.RNG; @@ -33,7 +33,7 @@ public abstract class ParallaxWorldGenerator extends ParallelChunkGenerator impl private IrisWorldData data; private RNG rMaster; private AtomicChunkData buffer; - private GSet fix; + private KSet fix; private ChronoLatch cl; protected boolean saving; @@ -43,7 +43,7 @@ public abstract class ParallaxWorldGenerator extends ParallelChunkGenerator impl this.world = world; saving = true; cl = new ChronoLatch(3000); - fix = new GSet<>(); + fix = new KSet<>(); buffer = new AtomicChunkData(world); this.data = new IrisWorldData(world); this.rMaster = new RNG(world.getSeed() + 1); diff --git a/src/main/java/ninja/bytecode/iris/generator/placer/NMSPlacer.java b/src/main/java/ninja/bytecode/iris/generator/placer/NMSPlacer.java index f98287dd1..bd2f8442f 100644 --- a/src/main/java/ninja/bytecode/iris/generator/placer/NMSPlacer.java +++ b/src/main/java/ninja/bytecode/iris/generator/placer/NMSPlacer.java @@ -11,17 +11,17 @@ import mortar.api.nms.NMP; import mortar.api.world.MaterialBlock; import ninja.bytecode.iris.util.MB; import ninja.bytecode.iris.util.Placer; -import ninja.bytecode.shuriken.collections.GSet; +import ninja.bytecode.shuriken.collections.KSet; import ninja.bytecode.shuriken.execution.J; public class NMSPlacer extends Placer { - private GSet c; + private KSet c; public NMSPlacer(World world) { super(world); - c = new GSet<>(); + c = new KSet<>(); } @SuppressWarnings("deprecation") diff --git a/src/main/java/ninja/bytecode/iris/pack/CompiledDimension.java b/src/main/java/ninja/bytecode/iris/pack/CompiledDimension.java index 3ace9596b..e5877f52d 100644 --- a/src/main/java/ninja/bytecode/iris/pack/CompiledDimension.java +++ b/src/main/java/ninja/bytecode/iris/pack/CompiledDimension.java @@ -17,8 +17,8 @@ import ninja.bytecode.iris.generator.genobject.GenObject; import ninja.bytecode.iris.generator.genobject.GenObjectGroup; import ninja.bytecode.iris.util.SChunkVector; import ninja.bytecode.iris.util.SBlockVector; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.io.CustomOutputStream; import ninja.bytecode.shuriken.json.JSONObject; import ninja.bytecode.shuriken.logging.L; @@ -29,18 +29,18 @@ public class CompiledDimension { public static IrisBiome theVoid = new IrisBiome("Void", Biome.VOID).height(0).seal(RNG.r); private IrisDimension dimension; - private GList biomes; - private GMap biomeCache; - private GMap objects; + private KList biomes; + private KMap biomeCache; + private KMap objects; private SBlockVector maxSize; private SChunkVector maxChunkSize; public CompiledDimension(IrisDimension dimension) { this.dimension = dimension; - biomes = new GList<>(); - biomeCache = new GMap<>(); - objects = new GMap<>(); + biomes = new KList<>(); + biomeCache = new KMap<>(); + objects = new KMap<>(); maxSize = new SBlockVector(0, 0, 0); maxChunkSize = new SChunkVector(0, 0); } @@ -132,7 +132,7 @@ public class CompiledDimension return dimension.getName(); } - public GList getBiomes() + public KList getBiomes() { return biomes; } @@ -222,12 +222,12 @@ public class CompiledDimension return dimension; } - public GMap getBiomeCache() + public KMap getBiomeCache() { return biomeCache; } - public GMap getObjects() + public KMap getObjects() { return objects; } diff --git a/src/main/java/ninja/bytecode/iris/pack/IrisBiome.java b/src/main/java/ninja/bytecode/iris/pack/IrisBiome.java index f5a398f14..c47dcfd3a 100644 --- a/src/main/java/ninja/bytecode/iris/pack/IrisBiome.java +++ b/src/main/java/ninja/bytecode/iris/pack/IrisBiome.java @@ -13,8 +13,8 @@ import ninja.bytecode.iris.generator.layer.BiomeNoiseGenerator; import ninja.bytecode.iris.util.MB; import ninja.bytecode.iris.util.ObjectMode; import ninja.bytecode.iris.util.PolygonGenerator; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.execution.J; import ninja.bytecode.shuriken.json.JSONArray; import ninja.bytecode.shuriken.json.JSONObject; @@ -28,17 +28,17 @@ public class IrisBiome public static final double MAX_HEIGHT = 0.77768; public static final double IDEAL_HEIGHT = 0.138; public static final double MIN_HEIGHT = -0.0218; - private static final GMap map = build(); + private static final KMap map = build(); private String name; private String parent; private Biome realBiome; private double height; - private GList rock; + private KList rock; private MB fluid; private int rockDepth; - private GList surface; - private GList dirt; - private GMap scatterChance; + private KList surface; + private KList dirt; + private KMap scatterChance; private boolean scatterSurface; private boolean scatterSurfaceRock; private boolean scatterSurfaceSub; @@ -62,7 +62,7 @@ public class IrisBiome private BiomeNoiseGenerator bng; private BiomeType type; private String region; - private GMap schematicGroups; + private KMap schematicGroups; private PolygonGenerator.EnumPolygonGenerator poly; private PolygonGenerator.EnumPolygonGenerator polySub; private PolygonGenerator.EnumPolygonGenerator polyRock; @@ -82,7 +82,7 @@ public class IrisBiome return MIN_HEIGHT; } - public static GMap getMap() + public static KMap getMap() { return map; } @@ -140,8 +140,8 @@ public class IrisBiome scatterSurfaceRock = true; simplexScatterSub = false; scatterSurfaceSub = true; - scatterChance = new GMap<>(); - schematicGroups = new GMap<>(); + scatterChance = new KMap<>(); + schematicGroups = new KMap<>(); //@builder surface(new MB(Material.GRASS)) .dirt(new MB(Material.DIRT), new MB(Material.DIRT, 1)) @@ -277,7 +277,7 @@ public class IrisBiome else { - schematicGroups = new GMap<>(); + schematicGroups = new KMap<>(); } if(chain) @@ -329,9 +329,9 @@ public class IrisBiome return j; } - private GList mbListFromJSON(JSONArray ja) + private KList mbListFromJSON(JSONArray ja) { - GList mb = new GList<>(); + KList mb = new KList<>(); for(int i = 0; i < ja.length(); i++) { @@ -341,7 +341,7 @@ public class IrisBiome return mb; } - private JSONArray mbListToJSON(GList mbs) + private JSONArray mbListToJSON(KList mbs) { JSONArray ja = new JSONArray(); @@ -359,9 +359,9 @@ public class IrisBiome return this; } - private GMap scatterFromJSON(JSONArray ja) + private KMap scatterFromJSON(JSONArray ja) { - GMap mb = new GMap(); + KMap mb = new KMap(); for(int i = 0; i < ja.length(); i++) { @@ -372,7 +372,7 @@ public class IrisBiome return mb; } - private JSONArray scatterToJson(GMap mbs) + private JSONArray scatterToJson(KMap mbs) { JSONArray ja = new JSONArray(); @@ -384,9 +384,9 @@ public class IrisBiome return ja; } - private GMap strFromJSON(JSONArray ja) + private KMap strFromJSON(JSONArray ja) { - GMap mb = new GMap(); + KMap mb = new KMap(); for(int i = 0; i < ja.length(); i++) { @@ -397,7 +397,7 @@ public class IrisBiome return mb; } - private JSONArray strToJson(GMap mbs) + private JSONArray strToJson(KMap mbs) { JSONArray ja = new JSONArray(); @@ -409,9 +409,9 @@ public class IrisBiome return ja; } - private static GMap build() + private static KMap build() { - GMap g = new GMap(); + KMap g = new KMap(); for(Field i : IrisBiome.class.getDeclaredFields()) { @@ -459,19 +459,19 @@ public class IrisBiome public IrisBiome surface(MB... mbs) { - surface = new GList<>(mbs); + surface = new KList<>(mbs); return this; } public IrisBiome dirt(MB... mbs) { - dirt = new GList<>(mbs); + dirt = new KList<>(mbs); return this; } public IrisBiome rock(MB... mbs) { - rock = new GList<>(mbs); + rock = new KList<>(mbs); return this; } @@ -505,17 +505,17 @@ public class IrisBiome return height; } - public GList getSurface() + public KList getSurface() { return surface; } - public GList getRock() + public KList getRock() { return rock; } - public GList getDirt() + public KList getDirt() { return dirt; } @@ -589,7 +589,7 @@ public class IrisBiome return getSurface().getRandom(); } - public GMap getScatterChance() + public KMap getScatterChance() { return scatterChance; } @@ -607,7 +607,7 @@ public class IrisBiome return MB.of(Material.AIR); } - public static GList getBiomes() + public static KList getBiomes() { return map.v(); } @@ -622,7 +622,7 @@ public class IrisBiome return null; } - public GMap getSchematicGroups() + public KMap getSchematicGroups() { return schematicGroups; } @@ -690,9 +690,9 @@ public class IrisBiome return parent; } - public GList getParents() + public KList getParents() { - GList f = new GList<>(); + KList f = new KList<>(); if(getParent().trim().isEmpty()) { @@ -815,7 +815,7 @@ public class IrisBiome this.height = height; } - public void setRock(GList rock) + public void setRock(KList rock) { this.rock = rock; } @@ -825,17 +825,17 @@ public class IrisBiome this.rockDepth = rockDepth; } - public void setSurface(GList surface) + public void setSurface(KList surface) { this.surface = surface; } - public void setDirt(GList dirt) + public void setDirt(KList dirt) { this.dirt = dirt; } - public void setScatterChance(GMap scatterChance) + public void setScatterChance(KMap scatterChance) { this.scatterChance = scatterChance; } @@ -925,7 +925,7 @@ public class IrisBiome this.region = region; } - public void setSchematicGroups(GMap schematicGroups) + public void setSchematicGroups(KMap schematicGroups) { this.schematicGroups = schematicGroups; } diff --git a/src/main/java/ninja/bytecode/iris/pack/IrisDimension.java b/src/main/java/ninja/bytecode/iris/pack/IrisDimension.java index 3578505ee..3a1dd0a27 100644 --- a/src/main/java/ninja/bytecode/iris/pack/IrisDimension.java +++ b/src/main/java/ninja/bytecode/iris/pack/IrisDimension.java @@ -6,7 +6,7 @@ import org.bukkit.World.Environment; import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.controller.PackController; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; import ninja.bytecode.shuriken.execution.J; import ninja.bytecode.shuriken.json.JSONArray; import ninja.bytecode.shuriken.json.JSONException; @@ -16,7 +16,7 @@ public class IrisDimension { private String name; private Environment environment; - GList biomes; + KList biomes; public IrisDimension(JSONObject o) throws JSONException, IOException { @@ -26,7 +26,7 @@ public class IrisDimension public IrisDimension() { - biomes = new GList(); + biomes = new KList(); environment = Environment.NORMAL; } @@ -42,7 +42,7 @@ public class IrisDimension try { - biomes = chain ? biomesFromArray(o.getJSONArray("biomes")) : new GList<>(); + biomes = chain ? biomesFromArray(o.getJSONArray("biomes")) : new KList<>(); } catch(Throwable e) @@ -62,9 +62,9 @@ public class IrisDimension return o; } - private GList biomesFromArray(JSONArray a) throws JSONException, IOException + private KList biomesFromArray(JSONArray a) throws JSONException, IOException { - GList b = new GList<>(); + KList b = new KList<>(); for(int i = 0; i < a.length(); i++) { int ii = i; @@ -76,7 +76,7 @@ public class IrisDimension return b; } - private JSONArray biomesToArray(GList b) + private JSONArray biomesToArray(KList b) { JSONArray a = new JSONArray(); @@ -88,7 +88,7 @@ public class IrisDimension return a; } - public GList getBiomes() + public KList getBiomes() { return biomes; } diff --git a/src/main/java/ninja/bytecode/iris/pack/IrisPack.java b/src/main/java/ninja/bytecode/iris/pack/IrisPack.java index 5365471cb..69fb14b2c 100644 --- a/src/main/java/ninja/bytecode/iris/pack/IrisPack.java +++ b/src/main/java/ninja/bytecode/iris/pack/IrisPack.java @@ -4,7 +4,7 @@ import java.io.IOException; import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.controller.PackController; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; import ninja.bytecode.shuriken.execution.J; import ninja.bytecode.shuriken.json.JSONArray; import ninja.bytecode.shuriken.json.JSONException; @@ -12,15 +12,15 @@ import ninja.bytecode.shuriken.json.JSONObject; public class IrisPack { - private GList dimensions; - private GList biomes; - private GList objects; + private KList dimensions; + private KList biomes; + private KList objects; public IrisPack() { - this.dimensions = new GList<>(); - this.biomes = new GList<>(); - this.objects = new GList<>(); + this.dimensions = new KList<>(); + this.biomes = new KList<>(); + this.objects = new KList<>(); } public IrisPack(JSONObject o) @@ -46,9 +46,9 @@ public class IrisPack return o; } - public GList fromArray(JSONArray ja) + public KList fromArray(JSONArray ja) { - GList g = new GList<>(); + KList g = new KList<>(); for(int i = 0; i < ja.length(); i++) { @@ -58,7 +58,7 @@ public class IrisPack return g; } - public JSONArray toArray(GList s) + public JSONArray toArray(KList s) { JSONArray ja = new JSONArray(); diff --git a/src/main/java/ninja/bytecode/iris/pack/IrisRegion.java b/src/main/java/ninja/bytecode/iris/pack/IrisRegion.java index 48e310622..6d1ae058a 100644 --- a/src/main/java/ninja/bytecode/iris/pack/IrisRegion.java +++ b/src/main/java/ninja/bytecode/iris/pack/IrisRegion.java @@ -4,14 +4,14 @@ import java.util.Objects; import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.controller.PackController; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; import ninja.bytecode.shuriken.execution.J; import ninja.bytecode.shuriken.json.JSONObject; public class IrisRegion { private String name; - private GList biomes; + private KList biomes; private IrisBiome ocean; private IrisBiome lake; private IrisBiome lakeBeach; @@ -21,7 +21,7 @@ public class IrisRegion public IrisRegion(String name) { this.name = name; - this.biomes = new GList<>(); + this.biomes = new KList<>(); beach = null; ocean = null; lake = null; @@ -53,12 +53,12 @@ public class IrisRegion this.name = name; } - public GList getBiomes() + public KList getBiomes() { return biomes; } - public void setBiomes(GList biomes) + public void setBiomes(KList biomes) { this.biomes = biomes; } diff --git a/src/main/java/ninja/bytecode/iris/util/BiomeLayer.java b/src/main/java/ninja/bytecode/iris/util/BiomeLayer.java index d3921a203..a2c4754be 100644 --- a/src/main/java/ninja/bytecode/iris/util/BiomeLayer.java +++ b/src/main/java/ninja/bytecode/iris/util/BiomeLayer.java @@ -13,7 +13,7 @@ import ninja.bytecode.iris.generator.IrisGenerator; import ninja.bytecode.iris.pack.BiomeType; import ninja.bytecode.iris.pack.IrisBiome; import ninja.bytecode.iris.util.PolygonGenerator.EnumPolygonGenerator; -import ninja.bytecode.shuriken.collections.GSet; +import ninja.bytecode.shuriken.collections.KSet; import ninja.bytecode.shuriken.logging.L; import ninja.bytecode.shuriken.math.CNG; import ninja.bytecode.shuriken.math.RNG; @@ -179,7 +179,7 @@ public class BiomeLayer } } - GSet deject = new GSet<>(); + KSet deject = new KSet<>(); for(String i : components.keySet()) { diff --git a/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java b/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java index 8738486b2..263cf5b98 100644 --- a/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java +++ b/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java @@ -1,21 +1,21 @@ package ninja.bytecode.iris.util; import ninja.bytecode.iris.pack.IrisBiome; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KMap; public class ChunkPlan { - private final GMap realHeightCache; - private final GMap realWaterHeightCache; - private final GMap heightCache; - private final GMap biomeCache; + private final KMap realHeightCache; + private final KMap realWaterHeightCache; + private final KMap heightCache; + private final KMap biomeCache; public ChunkPlan() { - this.realHeightCache = new GMap<>(); - this.realWaterHeightCache = new GMap<>(); - this.heightCache = new GMap<>(); - this.biomeCache = new GMap<>(); + this.realHeightCache = new KMap<>(); + this.realWaterHeightCache = new KMap<>(); + this.heightCache = new KMap<>(); + this.biomeCache = new KMap<>(); } public IrisBiome getBiome(int x, int z) diff --git a/src/main/java/ninja/bytecode/iris/util/Cuboid.java b/src/main/java/ninja/bytecode/iris/util/Cuboid.java index 017b202e6..a65b13aff 100644 --- a/src/main/java/ninja/bytecode/iris/util/Cuboid.java +++ b/src/main/java/ninja/bytecode/iris/util/Cuboid.java @@ -17,7 +17,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.material.MaterialData; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; /** * Cuboids @@ -55,9 +55,9 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ z2 = Math.max(l1.getBlockZ(), l2.getBlockZ()); } - public GList getLivingEntities() + public KList getLivingEntities() { - return new GList(new GListAdapter() + return new KList(new GListAdapter() { @Override public LivingEntity onAdapt(Entity from) @@ -72,9 +72,9 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ }.adapt(getEntities())); } - public GList getEntities() + public KList getEntities() { - GList en = new GList(); + KList en = new KList(); for(Chunk i : getChunks()) { diff --git a/src/main/java/ninja/bytecode/iris/util/Direction.java b/src/main/java/ninja/bytecode/iris/util/Direction.java index 855355147..23ee8287d 100644 --- a/src/main/java/ninja/bytecode/iris/util/Direction.java +++ b/src/main/java/ninja/bytecode/iris/util/Direction.java @@ -5,8 +5,8 @@ import org.bukkit.block.BlockFace; import org.bukkit.util.Vector; import ninja.bytecode.iris.util.Cuboid.CuboidDirection; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; /** * Directions @@ -22,7 +22,7 @@ public enum Direction E(1, 0, 0, CuboidDirection.East), W(-1, 0, 0, CuboidDirection.West); - private static GMap, DOP> permute = null; + private static KMap, DOP> permute = null; private int x; private int y; @@ -143,7 +143,7 @@ public enum Direction return s; } - public static Direction closest(Vector v, GList d) + public static Direction closest(Vector v, KList d) { double m = Double.MAX_VALUE; Direction s = null; @@ -249,9 +249,9 @@ public enum Direction return f; } - public static GList news() + public static KList news() { - return new GList().add(N, E, W, S); + return new KList().add(N, E, W, S); } public static Direction getDirection(Vector v) @@ -269,9 +269,9 @@ public enum Direction return Direction.N; } - public static GList udnews() + public static KList udnews() { - return new GList().add(U, D, N, E, W, S); + return new KList().add(U, D, N, E, W, S); } /** @@ -356,7 +356,7 @@ public enum Direction return; } - permute = new GMap, DOP>(); + permute = new KMap, DOP>(); for(Direction i : udnews()) { diff --git a/src/main/java/ninja/bytecode/iris/util/GListAdapter.java b/src/main/java/ninja/bytecode/iris/util/GListAdapter.java index 6985abbfd..d6c0d702b 100644 --- a/src/main/java/ninja/bytecode/iris/util/GListAdapter.java +++ b/src/main/java/ninja/bytecode/iris/util/GListAdapter.java @@ -3,7 +3,7 @@ package ninja.bytecode.iris.util; import java.util.List; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; /** * Adapts a list of objects into a list of other objects @@ -25,7 +25,7 @@ public abstract class GListAdapter */ public List adapt(List from) { - List adapted = new GList(); + List adapted = new KList(); for(FROM i : from) { diff --git a/src/main/java/ninja/bytecode/iris/util/IrisControllerSet.java b/src/main/java/ninja/bytecode/iris/util/IrisControllerSet.java index 956e484ad..8fe9b1830 100644 --- a/src/main/java/ninja/bytecode/iris/util/IrisControllerSet.java +++ b/src/main/java/ninja/bytecode/iris/util/IrisControllerSet.java @@ -7,17 +7,17 @@ import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; import ninja.bytecode.iris.Iris; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.logging.L; import ninja.bytecode.shuriken.tools.JarScanner; public class IrisControllerSet { - private GMap, IrisController> controllers; + private KMap, IrisController> controllers; public IrisControllerSet() { - controllers = new GMap<>(); + controllers = new KMap<>(); } public void startControllers(File jar) throws IOException diff --git a/src/main/java/ninja/bytecode/iris/util/IrisWorldData.java b/src/main/java/ninja/bytecode/iris/util/IrisWorldData.java index 823cdf1bd..6a92fa0b2 100644 --- a/src/main/java/ninja/bytecode/iris/util/IrisWorldData.java +++ b/src/main/java/ninja/bytecode/iris/util/IrisWorldData.java @@ -11,8 +11,8 @@ import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.generator.atomics.AtomicChunkData; import ninja.bytecode.iris.generator.atomics.AtomicRegionData; import ninja.bytecode.iris.generator.atomics.AtomicWorldData; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.logging.L; public class IrisWorldData @@ -20,14 +20,14 @@ public class IrisWorldData private final World world; private final AtomicWorldData data; private boolean saving; - private final GMap loadedChunks; + private final KMap loadedChunks; public IrisWorldData(World world) { this.world = world; saving = true; data = new AtomicWorldData(world); - loadedChunks = new GMap<>(); + loadedChunks = new KMap<>(); Bukkit.getScheduler().scheduleSyncRepeatingTask(Iris.instance, this::softUnloadWorld, 200, 20); } @@ -232,12 +232,12 @@ public class IrisWorldData return false; } - public GList getLoadedChunks() + public KList getLoadedChunks() { return loadedChunks.k(); } - public GList getLoadedRegions() + public KList getLoadedRegions() { return data.getLoadedRegions(); } diff --git a/src/main/java/ninja/bytecode/iris/util/ParticleBase.java b/src/main/java/ninja/bytecode/iris/util/ParticleBase.java index aa20e1a97..e1c50a9ae 100644 --- a/src/main/java/ninja/bytecode/iris/util/ParticleBase.java +++ b/src/main/java/ninja/bytecode/iris/util/ParticleBase.java @@ -3,7 +3,7 @@ package ninja.bytecode.iris.util; import org.bukkit.Location; import org.bukkit.entity.Player; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; public abstract class ParticleBase implements VisualEffect { @@ -20,7 +20,7 @@ public abstract class ParticleBase implements VisualEffect } @Override - public void play(Location l, GList p) + public void play(Location l, KList p) { for(Player i : p) { diff --git a/src/main/java/ninja/bytecode/iris/util/RealBiome.java b/src/main/java/ninja/bytecode/iris/util/RealBiome.java index 58ae5e897..18aa2c97a 100644 --- a/src/main/java/ninja/bytecode/iris/util/RealBiome.java +++ b/src/main/java/ninja/bytecode/iris/util/RealBiome.java @@ -6,7 +6,7 @@ import org.bukkit.block.Biome; import net.minecraft.server.v1_12_R1.BiomeBase; import net.minecraft.server.v1_12_R1.Block; import net.minecraft.server.v1_12_R1.IBlockData; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.format.Form; public class RealBiome { @@ -30,7 +30,7 @@ public class RealBiome public String toString() { - return F.capitalizeWords(b.toString().toLowerCase().replaceAll("\\Q_\\E", " ")) + " Temp: " + temperature + " Humidity: " + humidity + " Height: " + height + " Surf: " + F.capitalizeWords(surface.material.toString().replaceAll("_", " ").toLowerCase())+ " Dirt: " + F.capitalizeWords(dirt.material.toString().replaceAll("_", " ").toLowerCase()); + return Form.capitalizeWords(b.toString().toLowerCase().replaceAll("\\Q_\\E", " ")) + " Temp: " + temperature + " Humidity: " + humidity + " Height: " + height + " Surf: " + Form.capitalizeWords(surface.material.toString().replaceAll("_", " ").toLowerCase())+ " Dirt: " + Form.capitalizeWords(dirt.material.toString().replaceAll("_", " ").toLowerCase()); } @SuppressWarnings("deprecation") diff --git a/src/main/java/ninja/bytecode/iris/util/VectorMath.java b/src/main/java/ninja/bytecode/iris/util/VectorMath.java index 01fe3b44c..c9e0d05af 100644 --- a/src/main/java/ninja/bytecode/iris/util/VectorMath.java +++ b/src/main/java/ninja/bytecode/iris/util/VectorMath.java @@ -6,8 +6,8 @@ import org.bukkit.block.BlockFace; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; -import ninja.bytecode.shuriken.collections.GList; -import ninja.bytecode.shuriken.format.F; +import ninja.bytecode.shuriken.collections.KList; +import ninja.bytecode.shuriken.format.Form; /** * Vector utilities @@ -286,7 +286,7 @@ public class VectorMath private static double round(double value, int precision) { - return Double.valueOf(F.f(value, precision)); + return Double.valueOf(Form.f(value, precision)); } public static Vector clip(Vector v, int decimals) @@ -323,9 +323,9 @@ public class VectorMath * the block face * @return multiple faces, or one if the face is already simple */ - public static GList split(BlockFace f) + public static KList split(BlockFace f) { - GList faces = new GList(); + KList faces = new KList(); switch(f) { @@ -527,9 +527,9 @@ public class VectorMath * the vectors to be shifted * @return the shifted vectors */ - public static GList shift(Vector vector, GList vectors) + public static KList shift(Vector vector, KList vectors) { - return new GList(new GListAdapter() + return new KList(new GListAdapter() { @Override public Vector onAdapt(Vector from) diff --git a/src/main/java/ninja/bytecode/iris/util/VisualEffect.java b/src/main/java/ninja/bytecode/iris/util/VisualEffect.java index 1b47faa8f..2f619b094 100644 --- a/src/main/java/ninja/bytecode/iris/util/VisualEffect.java +++ b/src/main/java/ninja/bytecode/iris/util/VisualEffect.java @@ -3,7 +3,7 @@ package ninja.bytecode.iris.util; import org.bukkit.Location; import org.bukkit.entity.Player; -import ninja.bytecode.shuriken.collections.GList; +import ninja.bytecode.shuriken.collections.KList; public interface VisualEffect { @@ -13,5 +13,5 @@ public interface VisualEffect public void play(Location l, Player p); - public void play(Location l, GList p); + public void play(Location l, KList p); } diff --git a/src/main/java/ninja/bytecode/iris/util/WorldState.java b/src/main/java/ninja/bytecode/iris/util/WorldState.java index a5f174117..a50485ef3 100644 --- a/src/main/java/ninja/bytecode/iris/util/WorldState.java +++ b/src/main/java/ninja/bytecode/iris/util/WorldState.java @@ -13,14 +13,14 @@ import org.bukkit.event.Listener; import net.md_5.bungee.api.ChatColor; import ninja.bytecode.iris.Iris; -import ninja.bytecode.shuriken.collections.GMap; +import ninja.bytecode.shuriken.collections.KMap; import ninja.bytecode.shuriken.io.CustomOutputStream; import ninja.bytecode.shuriken.logging.L; public class WorldState implements Listener { private int taskId; - private GMap stateCache; + private KMap stateCache; private World world; @SuppressWarnings("deprecation")