From 73a4152b5dcc3789450f9521e5cdbdcd43a65290 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 16 Jul 2021 02:40:56 -0400 Subject: [PATCH] RF --- .../core/command/studio/CommandIrisStudioExplorer.java | 4 ++-- .../studio/CommandIrisStudioExplorerGenerator.java | 4 ++-- .../core/gui/{NoiseExplorer.java => IrisExplorer.java} | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/com/volmit/iris/core/gui/{NoiseExplorer.java => IrisExplorer.java} (97%) diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java index 01f04cdea..3e1e6dc9d 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java @@ -20,7 +20,7 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.core.gui.NoiseExplorer; +import com.volmit.iris.core.gui.IrisExplorer; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; @@ -57,7 +57,7 @@ public class CommandIrisStudioExplorer extends MortarCommand { return true; } - NoiseExplorer.launch(); + IrisExplorer.launch(); sender.sendMessage("Opening Noise Explorer!"); } return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java index 9fc2b73dc..154f8e203 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java @@ -21,7 +21,7 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.core.gui.NoiseExplorer; +import com.volmit.iris.core.gui.IrisExplorer; import com.volmit.iris.engine.object.IrisGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; @@ -70,7 +70,7 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand { if (generator != null) { long finalSeed = seed; - NoiseExplorer.launch((x, z) -> + IrisExplorer.launch((x, z) -> generator.getHeight(x, z, new RNG(finalSeed).nextParallelRNG(3245).lmax()), "Gen: " + generator.getLoadKey()); sender.sendMessage("Opening Noise Explorer for gen " + generator.getLoadKey() + " (" + generator.getLoader().getDataFolder().getName() + ")"); diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/core/gui/IrisExplorer.java similarity index 97% rename from src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java rename to src/main/java/com/volmit/iris/core/gui/IrisExplorer.java index 3a7843b25..c45dc8742 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java +++ b/src/main/java/com/volmit/iris/core/gui/IrisExplorer.java @@ -38,7 +38,7 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; -public class NoiseExplorer extends JPanel implements MouseWheelListener { +public class IrisExplorer extends JPanel implements MouseWheelListener { private static final long serialVersionUID = 2094606939770332040L; @@ -74,7 +74,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { double t; double tz; - public NoiseExplorer() { + public IrisExplorer() { addMouseWheelListener(this); addMouseMotionListener(new MouseMotionListener() { @Override @@ -237,7 +237,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { private static void createAndShowGUI(Function2 gen, String genName) { JFrame frame = new JFrame("Noise Explorer: " + genName); - NoiseExplorer nv = new NoiseExplorer(); + IrisExplorer nv = new IrisExplorer(); frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); JLayeredPane pane = new JLayeredPane(); nv.setSize(new Dimension(1440, 820)); @@ -259,7 +259,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { private static void createAndShowGUI() { JFrame frame = new JFrame("Noise Explorer"); - NoiseExplorer nv = new NoiseExplorer(); + IrisExplorer nv = new IrisExplorer(); frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); KList li = new KList<>(NoiseStyle.values()).toStringList(); combo = new JComboBox<>(li.toArray(new String[0])); @@ -296,7 +296,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { } public static void launch() { - EventQueue.invokeLater(NoiseExplorer::createAndShowGUI); + EventQueue.invokeLater(IrisExplorer::createAndShowGUI); } static class HandScrollListener extends MouseAdapter {