diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 87028ad..ded5846 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -23,7 +23,7 @@ }, { "dependsOn": ["package"], - "label": "update test server", + "label": "load build to server", "type": "shell", "args": ["-ExecutionPolicy", "Bypass", "-File", "./load_latest_build.ps1"], "options": {"cwd": "${workspaceFolder}/test-server/"}, @@ -34,12 +34,12 @@ "reveal": "silent", "focus": false, "panel": "shared", - "showReuseMessage": false, + "showReuseMessage": true, "clear": false } }, { - "dependsOn": ["update test server"], + "dependsOn": ["load build to server"], "label": "start test server", "type": "shell", "runOptions": {"instanceLimit": 1}, diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandSurvivalCraftChunkGenerator.java b/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandSurvivalCraftChunkGenerator.java index 7df9b0f..3425d37 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandSurvivalCraftChunkGenerator.java +++ b/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandSurvivalCraftChunkGenerator.java @@ -6,6 +6,7 @@ import org.bukkit.World; import org.bukkit.generator.ChunkGenerator; import ca.recrown.islandsurvivalcraft.world.generation.IslandBiomeGenerator; +import ca.recrown.islandsurvivalcraft.world.generation.IslandWorldGenerator; public class IslandSurvivalCraftChunkGenerator extends ChunkGenerator { private final IslandWorldGeneratorAlternator alternator; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldGeneratorAlternator.java b/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldGeneratorAlternator.java index 0346f18..16d5064 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldGeneratorAlternator.java +++ b/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldGeneratorAlternator.java @@ -7,6 +7,7 @@ import java.util.UUID; import org.bukkit.World; import ca.recrown.islandsurvivalcraft.world.generation.IslandBiomeGenerator; +import ca.recrown.islandsurvivalcraft.world.generation.IslandWorldGenerator; /** * Alternates the data used on a per world basis. diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldGenerator.java b/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/IslandWorldGenerator.java similarity index 93% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldGenerator.java rename to src/main/java/ca/recrown/islandsurvivalcraft/world/generation/IslandWorldGenerator.java index 18ef3b0..3869713 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldGenerator.java +++ b/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/IslandWorldGenerator.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.world; +package ca.recrown.islandsurvivalcraft.world.generation; import java.security.InvalidAlgorithmParameterException; import java.util.Random; @@ -9,8 +9,8 @@ import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; -import ca.recrown.islandsurvivalcraft.world.generation.BedrockGenerator; -import ca.recrown.islandsurvivalcraft.world.generation.IslandBiomeGenerator; +import ca.recrown.islandsurvivalcraft.world.BiomeSelector; +import ca.recrown.islandsurvivalcraft.world.IslandWorldMapper; import ca.recrown.islandsurvivalcraft.world.shaders.WorldHeightShader; /** diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/shaders/WorldHeightShader.java b/src/main/java/ca/recrown/islandsurvivalcraft/world/shaders/WorldHeightShader.java index 3e74d74..d42d305 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/shaders/WorldHeightShader.java +++ b/src/main/java/ca/recrown/islandsurvivalcraft/world/shaders/WorldHeightShader.java @@ -50,7 +50,7 @@ public class WorldHeightShader { height = (int) (getNormalizedHeightModifier(worldX, worldZ) * 5D + baseValue); } - if (height > worldHeight) throw new InvalidAlgorithmParameterException("Resulting height is greater than world height!!! Biome: " + biomeName); + if (height > worldHeight) throw new InvalidAlgorithmParameterException("Resulting height is greater than world height! Biome this occurred on: " + biomeName); return height; }