Merge pull request #845 from VolmitSoftware/Development

Development
VolmitSoftware · Aug 4, 2022 · 0ea936f · 0ea936f
2 parents 723b696 + d1870ee
commit 0ea936f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.2.6-1.19.1' // Needs to be version specific
+version '2.2.7-1.19.1' // Needs to be version specific
 def nmsVersion = "1.19.1"
 def apiVersion = '1.19'
 def spigotJarVersion = '1.19.1-R0.1-SNAPSHOT'

diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java
@@ -148,7 +148,7 @@ private static void createAndShowGUI() {
         JFrame frame = new JFrame("Noise Explorer");
         NoiseExplorerGUI nv = new NoiseExplorerGUI();
         frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-        KList<String> li = new KList<>(NoiseStyle.values()).toStringList();
+        KList<String> li = new KList<>(NoiseStyle.values()).toStringList().sort();
         combo = new JComboBox<>(li.toArray(new String[0]));
         combo.setSelectedItem("STATIC");
         combo.setFocusable(false);

diff --git a/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java b/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java
@@ -140,6 +140,7 @@ private void shutdown() {
         generator.close();
         ticker.interrupt();
         listener.onClose();
+        getMantle().trim(0);
     }
 
     private void visitRegion(int x, int z, boolean regions) {