From 7b8b8d6b75c9fd7639f4b5d2ab3224b7a901f85b Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 24 Jan 2020 08:20:47 -0500 Subject: [PATCH] Fixes --- .../ninja/bytecode/iris/CommandIshOld.java | 65 ------------------- .../java/ninja/bytecode/iris/Settings.java | 5 +- .../iris/command/CommandObjectSave.java | 2 +- .../iris/command/CommandReloadChunks.java | 2 +- .../iris/generator/IrisGenerator.java | 2 +- .../generator/atomics/AtomicCharArray.java | 1 - .../parallax/ParallaxWorldGenerator.java | 26 +------- 7 files changed, 8 insertions(+), 95 deletions(-) delete mode 100644 src/main/java/ninja/bytecode/iris/CommandIshOld.java diff --git a/src/main/java/ninja/bytecode/iris/CommandIshOld.java b/src/main/java/ninja/bytecode/iris/CommandIshOld.java deleted file mode 100644 index e153a9e76..000000000 --- a/src/main/java/ninja/bytecode/iris/CommandIshOld.java +++ /dev/null @@ -1,65 +0,0 @@ -package ninja.bytecode.iris; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; - -import org.bukkit.ChatColor; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Sound; -import org.bukkit.block.Block; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.util.Vector; - -import mortar.util.text.C; -import ninja.bytecode.iris.controller.WandController; -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.Form; - -public class CommandIshOld implements CommandExecutor -{ - public void msg(CommandSender s, String msg) - { - s.sendMessage(ChatColor.DARK_PURPLE + "[" + ChatColor.GRAY + "Iris" + ChatColor.DARK_PURPLE + "]" + ChatColor.GRAY + ": " + msg); - } - - @SuppressWarnings("deprecation") - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) - { - if(args.length == 0) - { - msg(sender, "/ish wand - Get an Iris Wand"); - msg(sender, "/ish save - Save Schematic"); - msg(sender, "/ish load [cursor] - Paste Schematic"); - msg(sender, "/ish expand - Expand Cuboid in direction"); - msg(sender, "/ish shift - Shift Cuboid in direction"); - msg(sender, "/ish shrinkwrap - Shrink to blocks"); - msg(sender, "/ish xup - Shift up, Expand up, Contract in."); - msg(sender, "/ish xvert - Expand up, Expand down, Contract in."); - msg(sender, "/ish id - What id am i looking at"); - } - - if(args.length > 0) - { - if(sender instanceof Player) - { - Player p = (Player) sender; - - if(args[0].equalsIgnoreCase("xvert")) - { - - } - } - } - - return false; - } -} diff --git a/src/main/java/ninja/bytecode/iris/Settings.java b/src/main/java/ninja/bytecode/iris/Settings.java index 1d6601764..a4487fad1 100644 --- a/src/main/java/ninja/bytecode/iris/Settings.java +++ b/src/main/java/ninja/bytecode/iris/Settings.java @@ -13,7 +13,6 @@ public class Settings { public PerformanceMode performanceMode = PerformanceMode.HALF_CPU; public ObjectMode objectMode = ObjectMode.PARALLAX; - public boolean fastMode = false; public int threadPriority = Thread.MAX_PRIORITY; public int threadCount = 4; public boolean debugMode = true; @@ -25,8 +24,8 @@ public class Settings public static class GeneratorSettings { - public InterpolationMode interpolationMode = InterpolationMode.BICUBIC; - public int interpolationRadius = 4; + public InterpolationMode interpolationMode = InterpolationMode.BILINEAR; + public int interpolationRadius = 6; public double objectDensity = 1D; public double horizontalZoom = 2; public double heightFracture = 155; diff --git a/src/main/java/ninja/bytecode/iris/command/CommandObjectSave.java b/src/main/java/ninja/bytecode/iris/command/CommandObjectSave.java index 83f73f879..f0a36430e 100644 --- a/src/main/java/ninja/bytecode/iris/command/CommandObjectSave.java +++ b/src/main/java/ninja/bytecode/iris/command/CommandObjectSave.java @@ -51,7 +51,7 @@ public class CommandObjectSave extends MortarCommand { FileOutputStream fos = new FileOutputStream(f); s.write(fos, true); - p.sendMessage("Saved " + args[1] + " (" + Form.f(s.getSchematic().size()) + " Entries)"); + p.sendMessage("Saved " + args[0] + " (" + Form.f(s.getSchematic().size()) + " Entries)"); p.playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 0.45f); } diff --git a/src/main/java/ninja/bytecode/iris/command/CommandReloadChunks.java b/src/main/java/ninja/bytecode/iris/command/CommandReloadChunks.java index f9d0f4067..2d3a61ef2 100644 --- a/src/main/java/ninja/bytecode/iris/command/CommandReloadChunks.java +++ b/src/main/java/ninja/bytecode/iris/command/CommandReloadChunks.java @@ -25,7 +25,7 @@ public class CommandReloadChunks extends MortarCommand } sender.sendMessage("Resending Chunks in your view distance."); - Player p = ((Player) sender); + Player p = sender.player(); for(Chunk i : p.getWorld().getLoadedChunks()) { diff --git a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java index e0d55b978..e4cc3c675 100644 --- a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java +++ b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java @@ -224,7 +224,7 @@ public class IrisGenerator extends ParallaxWorldGenerator public double getANoise(int x, int z, ChunkPlan plan, IrisBiome biome) { - double hv = !Iris.settings.performance.fastMode ? getInterpolation(x, z, plan) : getBiomedHeight((int) Math.round(x), (int) Math.round(z), plan); + double hv = getInterpolation(x, z, plan); hv += glLNoise.generateLayer(hv * Iris.settings.gen.roughness * 215, (double) x * Iris.settings.gen.roughness * 0.82, (double) z * Iris.settings.gen.roughness * 0.82) * (1.6918 * (hv * 2.35)); if(biome.hasCliffs()) diff --git a/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicCharArray.java b/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicCharArray.java index 7f032167e..35af8eba4 100644 --- a/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicCharArray.java +++ b/src/main/java/ninja/bytecode/iris/generator/atomics/AtomicCharArray.java @@ -5,7 +5,6 @@ import java.lang.reflect.Field; import sun.misc.Unsafe; -@SuppressWarnings("restriction") public class AtomicCharArray implements Serializable { private static final long serialVersionUID = 2862133569453604235L; 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 03812071a..f6865986d 100644 --- a/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxWorldGenerator.java +++ b/src/main/java/ninja/bytecode/iris/generator/parallax/ParallaxWorldGenerator.java @@ -6,7 +6,6 @@ import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.block.Biome; -import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.ChunkLoadEvent; @@ -66,28 +65,9 @@ public abstract class ParallaxWorldGenerator extends ParallelChunkGenerator impl @EventHandler public void on(ChunkLoadEvent e) { - if(!saving) - { - return; - } - - if(Iris.settings.performance.objectMode.equals(ObjectMode.PARALLAX) && !Iris.settings.performance.fastMode && e.getWorld().equals(world)) + if(Iris.settings.performance.objectMode.equals(ObjectMode.PARALLAX) && e.getWorld().equals(world)) { NMP.host.relight(e.getChunk()); - Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () -> fix.add(e.getChunk()), 20); - - if(cl.flip()) - { - for(Chunk i : fix) - { - for(Player f : e.getWorld().getPlayers()) - { - NMP.CHUNK.refreshIgnorePosition(f, i); - } - } - - fix.clear(); - } } } @@ -143,11 +123,11 @@ public abstract class ParallaxWorldGenerator extends ParallelChunkGenerator impl TaskGroup g = startWork(); if(Iris.settings.performance.objectMode.equals(ObjectMode.PARALLAX)) { - for(int ii = Iris.settings.performance.fastMode ? -1 : -(getParallaxSize().getX() / 2) - 1; ii < (Iris.settings.performance.fastMode ? 1 : ((getParallaxSize().getX() / 2) + 1)); ii++) + for(int ii = -(getParallaxSize().getX() / 2) - 1; ii < (((getParallaxSize().getX() / 2) + 1)); ii++) { int i = ii; - for(int jj = Iris.settings.performance.fastMode ? -1 : -(getParallaxSize().getZ() / 2) - 1; jj < (Iris.settings.performance.fastMode ? 1 : ((getParallaxSize().getZ() / 2) + 1)); jj++) + for(int jj = -(getParallaxSize().getZ() / 2) - 1; jj < (((getParallaxSize().getZ() / 2) + 1)); jj++) { int j = jj; int cx = x + i;