diff --git a/pom.xml b/pom.xml index a234e158..e8f676a1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.swofty swoftyworldmanager pom - 3.0.1 + 3.0.2 swoftyworldmanager-api swoftyworldmanager-nms-common diff --git a/swoftyworldmanager-api/pom.xml b/swoftyworldmanager-api/pom.xml index 63d066ed..5c2cc49b 100644 --- a/swoftyworldmanager-api/pom.xml +++ b/swoftyworldmanager-api/pom.xml @@ -3,7 +3,7 @@ swoftyworldmanager net.swofty - 3.0.1 + 3.0.2 4.0.0 diff --git a/swoftyworldmanager-api/src/main/java/net/swofty/swm/api/world/properties/SlimeProperties.java b/swoftyworldmanager-api/src/main/java/net/swofty/swm/api/world/properties/SlimeProperties.java index cedb2cae..574c71a2 100644 --- a/swoftyworldmanager-api/src/main/java/net/swofty/swm/api/world/properties/SlimeProperties.java +++ b/swoftyworldmanager-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 DEFAULT_BIOME = new SlimePropertyString("defaultBiome", "minecraft:plains"); + + + /** + * The default biome generated in empty chunks + */ + public static final SlimeProperty LOAD_ON_STARTUP = new SlimePropertyBoolean("loadOnStartup", true); } \ No newline at end of file diff --git a/swoftyworldmanager-classmodifier/pom.xml b/swoftyworldmanager-classmodifier/pom.xml index bd9c09b2..07911b2c 100644 --- a/swoftyworldmanager-classmodifier/pom.xml +++ b/swoftyworldmanager-classmodifier/pom.xml @@ -3,7 +3,7 @@ swoftyworldmanager net.swofty - 3.0.1 + 3.0.2 4.0.0 diff --git a/swoftyworldmanager-importer/pom.xml b/swoftyworldmanager-importer/pom.xml index 0c08af87..78b8bb58 100644 --- a/swoftyworldmanager-importer/pom.xml +++ b/swoftyworldmanager-importer/pom.xml @@ -3,7 +3,7 @@ swoftyworldmanager net.swofty - 3.0.1 + 3.0.2 4.0.0 swoftyworldmanager-importer 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 index fce2cf1b..7a0ca107 100644 --- 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 index b5b0feef..468f900e 100644 --- a/swoftyworldmanager-nms-common/pom.xml +++ b/swoftyworldmanager-nms-common/pom.xml @@ -3,7 +3,7 @@ swoftyworldmanager net.swofty - 3.0.1 + 3.0.2 4.0.0 diff --git a/swoftyworldmanager-nms-v1_8_R3/pom.xml b/swoftyworldmanager-nms-v1_8_R3/pom.xml index 43716801..686eff71 100644 --- a/swoftyworldmanager-nms-v1_8_R3/pom.xml +++ b/swoftyworldmanager-nms-v1_8_R3/pom.xml @@ -3,7 +3,7 @@ swoftyworldmanager net.swofty - 3.0.1 + 3.0.2 4.0.0 diff --git a/swoftyworldmanager-plugin/pom.xml b/swoftyworldmanager-plugin/pom.xml index 7d9d224e..8e03f0cf 100644 --- a/swoftyworldmanager-plugin/pom.xml +++ b/swoftyworldmanager-plugin/pom.xml @@ -3,7 +3,7 @@ swoftyworldmanager net.swofty - 3.0.1 + 3.0.2 4.0.0 swoftyworldmanager-plugin 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 index 876c8974..b77454f9 100644 --- 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 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 index ecb0c64d..0e87cc48 100644 --- 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 index e93b8921..0031a737 100644 --- 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 gameRules; private final int spawnX; diff --git a/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/world/importer/WorldImporter.java b/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/world/importer/WorldImporter.java index 263928e8..dcbece59 100644 --- a/swoftyworldmanager-plugin/src/main/java/net/swofty/swm/plugin/world/importer/WorldImporter.java +++ b/swoftyworldmanager-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); } }