From a7e58b715bc7d0d5aefcd1cf494f4fda53ba0fb9 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 6 Jan 2020 01:40:16 -0500 Subject: [PATCH] Fixes --- .../java/ninja/bytecode/iris/CommandIris.java | 14 ++++++ .../iris/generator/IrisGenerator.java | 2 - .../bytecode/iris/schematic/Schematic.java | 48 ------------------- .../iris/schematic/SchematicGroup.java | 25 ---------- 4 files changed, 14 insertions(+), 75 deletions(-) create mode 100644 src/main/java/ninja/bytecode/iris/CommandIris.java diff --git a/src/main/java/ninja/bytecode/iris/CommandIris.java b/src/main/java/ninja/bytecode/iris/CommandIris.java new file mode 100644 index 000000000..87949fb0a --- /dev/null +++ b/src/main/java/ninja/bytecode/iris/CommandIris.java @@ -0,0 +1,14 @@ +package ninja.bytecode.iris; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; + +public class CommandIris implements CommandExecutor +{ + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) + { + return false; + } +} diff --git a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java index 4f19e5888..74aafada7 100644 --- a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java +++ b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java @@ -317,8 +317,6 @@ public class IrisGenerator extends ParallelChunkGenerator } } - g.generateRotationVariants(); - schematicCache.put(folder, g); return g; } diff --git a/src/main/java/ninja/bytecode/iris/schematic/Schematic.java b/src/main/java/ninja/bytecode/iris/schematic/Schematic.java index c86433108..4695a0e54 100644 --- a/src/main/java/ninja/bytecode/iris/schematic/Schematic.java +++ b/src/main/java/ninja/bytecode/iris/schematic/Schematic.java @@ -15,9 +15,7 @@ import org.bukkit.World; import org.bukkit.util.BlockVector; import ninja.bytecode.iris.util.Catalyst12; -import ninja.bytecode.iris.util.Direction; import ninja.bytecode.iris.util.MB; -import ninja.bytecode.iris.util.VectorMath; import ninja.bytecode.shuriken.collections.GMap; import ninja.bytecode.shuriken.io.CustomOutputStream; import ninja.bytecode.shuriken.logging.L; @@ -105,7 +103,6 @@ public class Schematic } din.close(); - center(); } @SuppressWarnings("deprecation") @@ -207,49 +204,4 @@ public class Schematic L.i("Loaded Schematic: " + f.getPath() + " Size: " + s.getSchematic().size()); return s; } - - public void center() - { - GMap sf = getSchematic().copy(); - BlockVector max = new BlockVector(-w, -h, -d); - BlockVector min = new BlockVector(w, h, d); - clear(); - - for(BlockVector i : sf.k()) - { - if(i.getX() <= min.getX() && i.getZ() <= min.getZ() && i.getY() <= min.getY()) - { - min = i; - } - - if(i.getX() >= max.getX() && i.getZ() >= max.getZ() && i.getY() >= max.getY()) - { - max = i; - } - } - - BlockVector center = min.clone().add(max.clone().multiply(0.5D)).toBlockVector(); - center.setY(0); - - for(BlockVector i : sf.k()) - { - getSchematic().put(i.clone().subtract(center).toBlockVector(), sf.get(i)); - } - - x = 0; - y = 0; - z = 0; - } - - public void rotate(Direction from, Direction to) - { - GMap sf = getSchematic().copy(); - clear(); - - for(BlockVector i : sf.k()) - { - getSchematic().put(VectorMath.rotate(from, to, i).toBlockVector(), sf.get(i)); - } - center(); - } } diff --git a/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java b/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java index 46e66ea61..8bd24a1bf 100644 --- a/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java +++ b/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java @@ -1,6 +1,5 @@ package ninja.bytecode.iris.schematic; -import ninja.bytecode.iris.util.Direction; import ninja.bytecode.shuriken.collections.GList; public class SchematicGroup @@ -62,28 +61,4 @@ public class SchematicGroup { return getSchematics().size(); } - - public void generateRotationVariants() - { - if(flags.contains("rotation=none")) - { - return; - } - - GList variants = new GList<>(); - GList directions = flags.contains("rotation=all") ? Direction.udnews() : Direction.news(); - directions.remove(Direction.N); - - for(Schematic i : getSchematics()) - { - for(Direction j : directions) - { - Schematic rotated = i.copy(); - rotated.rotate(Direction.N, j); - variants.add(rotated); - } - } - - getSchematics().add(variants); - } }