Cleaned up import system and implemented the ability to modify 'loadO…

…nStartup' through API
Swofty-Developments · Oct 12, 2023 · cd7db8d · cd7db8d
1 parent ac287f9
commit cd7db8d
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>net.swofty</groupId>
     <artifactId>swoftyworldmanager</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <modules>
         <module>swoftyworldmanager-api</module>
         <module>swoftyworldmanager-nms-common</module>

diff --git a/swoftyworldmanager-api/pom.xml b/swoftyworldmanager-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>swoftyworldmanager</artifactId>
         <groupId>net.swofty</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...tyworldmanager-api/src/main/java/net/swofty/swm/api/world/properties/SlimeProperties.java b/...tyworldmanager-api/src/main/java/net/swofty/swm/api/world/properties/SlimeProperties.java
@@ -72,4 +72,10 @@ public class SlimeProperties {
      * The default biome generated in empty chunks
      */
     public static final SlimeProperty<String> DEFAULT_BIOME = new SlimePropertyString("defaultBiome", "minecraft:plains");
+
+
+    /**
+     * The default biome generated in empty chunks
+     */
+    public static final SlimeProperty<Boolean> LOAD_ON_STARTUP = new SlimePropertyBoolean("loadOnStartup", true);
 }
diff --git a/swoftyworldmanager-classmodifier/pom.xml b/swoftyworldmanager-classmodifier/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>swoftyworldmanager</artifactId>
         <groupId>net.swofty</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/swoftyworldmanager-importer/pom.xml b/swoftyworldmanager-importer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>swoftyworldmanager</artifactId>
         <groupId>net.swofty</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swoftyworldmanager-importer</artifactId>

diff --git a/swoftyworldmanager-importer/src/main/java/net/swofty/swm/importer/SWMImporter.java b/swoftyworldmanager-importer/src/main/java/net/swofty/swm/importer/SWMImporter.java
@@ -344,17 +344,6 @@ private static boolean isEmpty(byte[] array) {
                 return false;
             }
         }
-
-        return true;
-    }
-
-    private static boolean isEmpty(long[] array) {
-        for (long b : array) {
-            if (b != 0L) {
-                return false;
-            }
-        }
-
         return true;
     }
 

diff --git a/swoftyworldmanager-nms-common/pom.xml b/swoftyworldmanager-nms-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>swoftyworldmanager</artifactId>
         <groupId>net.swofty</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/swoftyworldmanager-nms-v1_8_R3/pom.xml b/swoftyworldmanager-nms-v1_8_R3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>swoftyworldmanager</artifactId>
         <groupId>net.swofty</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/swoftyworldmanager-plugin/pom.xml b/swoftyworldmanager-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>swoftyworldmanager</artifactId>
         <groupId>net.swofty</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swoftyworldmanager-plugin</artifactId>

diff --git a/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/SWMPlugin.java b/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/SWMPlugin.java
@@ -296,7 +296,6 @@ public CompletableFuture<Void> generateWorld(SlimeWorld world) {
          */
         worldGeneratorService.submit(() -> {
             Object nmsWorld = nms.createNMSWorld(world);
-            System.out.println("TEST 6");
             Bukkit.getScheduler().runTask(this, () -> {
                 nms.addWorldToServerList(nmsWorld);
                 future.complete(null);

diff --git a/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/config/WorldData.java b/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/config/WorldData.java
@@ -78,16 +78,17 @@ public SlimePropertyMap toPropertyMap() {
 
         SlimePropertyMap propertyMap = new SlimePropertyMap();
 
-        propertyMap.setInt(SlimeProperties.SPAWN_X, (int) spawnX);
-        propertyMap.setInt(SlimeProperties.SPAWN_Y, (int) spawnY);
-        propertyMap.setInt(SlimeProperties.SPAWN_Z, (int) spawnZ);
-
-        propertyMap.setString(SlimeProperties.DIFFICULTY, difficulty);
-        propertyMap.setBoolean(SlimeProperties.ALLOW_MONSTERS, allowMonsters);
-        propertyMap.setBoolean(SlimeProperties.ALLOW_ANIMALS, allowAnimals);
-        propertyMap.setBoolean(SlimeProperties.PVP, pvp);
-        propertyMap.setString(SlimeProperties.ENVIRONMENT, environment);
-        propertyMap.setString(SlimeProperties.WORLD_TYPE, worldType);
+        propertyMap.setValue(SlimeProperties.SPAWN_X, (int) spawnX);
+        propertyMap.setValue(SlimeProperties.SPAWN_Y, (int) spawnY);
+        propertyMap.setValue(SlimeProperties.SPAWN_Z, (int) spawnZ);
+
+        propertyMap.setValue(SlimeProperties.DIFFICULTY, difficulty);
+        propertyMap.setValue(SlimeProperties.ALLOW_MONSTERS, allowMonsters);
+        propertyMap.setValue(SlimeProperties.ALLOW_ANIMALS, allowAnimals);
+        propertyMap.setValue(SlimeProperties.PVP, pvp);
+        propertyMap.setValue(SlimeProperties.ENVIRONMENT, environment);
+        propertyMap.setValue(SlimeProperties.WORLD_TYPE, worldType);
+        propertyMap.setValue(SlimeProperties.LOAD_ON_STARTUP, loadOnStartup);
 
         return propertyMap;
     }

diff --git a/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/world/importer/LevelData.java b/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/world/importer/LevelData.java
@@ -9,7 +9,6 @@
 @RequiredArgsConstructor
 public class LevelData {
 
-    private final int version; // Unused
     private final Map<String, String> gameRules;
 
     private final int spawnX;

diff --git a/...worldmanager-plugin/src/main/java/net/swofty/swm/plugin/world/importer/WorldImporter.java b/...worldmanager-plugin/src/main/java/net/swofty/swm/plugin/world/importer/WorldImporter.java
@@ -129,7 +129,7 @@ private static LevelData readLevelData(File file) throws IOException, InvalidWor
                 int spawnY = dataTag.get().getIntValue("SpawnY").orElse(255);
                 int spawnZ = dataTag.get().getIntValue("SpawnZ").orElse(0);
 
-                return new LevelData(dataVersion, gameRules, spawnX, spawnY, spawnZ);
+                return new LevelData(gameRules, spawnX, spawnY, spawnZ);
             }
         }