diff --git a/.vscode/settings.json b/.vscode/settings.json index e0f15db..52b05cc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,7 @@ { - "java.configuration.updateBuildConfiguration": "automatic" + "java.configuration.updateBuildConfiguration": "automatic", + "cSpell.words": [ + "islandsurvivalcraft", + "Minecraft" + ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b1b5143..2e2d7f2 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -26,7 +26,7 @@ "type": "shell", "options": {"cwd": "${workspaceFolder}/test-server/"}, "args": ["-ExecutionPolicy", "Bypass", "-File", "./delete_worlds.ps1"], - "command": "powershell", + "command": "pwsh", "problemMatcher": [] }, { @@ -35,7 +35,7 @@ "type": "shell", "args": ["-ExecutionPolicy", "Bypass", "-File", "./load_build.ps1"], "options": {"cwd": "${workspaceFolder}/test-server/"}, - "command": "powershell", + "command": "pwsh", "problemMatcher": [], "presentation": { "echo": true, @@ -53,7 +53,7 @@ "runOptions": {"instanceLimit": 1}, "args": ["-ExecutionPolicy", "Bypass", "-File", "./start_process.ps1"], "options": {"cwd": "${workspaceFolder}/test-server/"}, - "command": "powershell", + "command": "pwsh", "problemMatcher": [], "group": "test", "presentation": { @@ -70,7 +70,7 @@ "type": "shell", "args": ["-ExecutionPolicy", "Bypass", "-File", "./end_process.ps1"], "options": {"cwd": "${workspaceFolder}/test-server/"}, - "command": "powershell", + "command": "pwsh", "problemMatcher": [], "group": "test", "presentation": { diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..a91d1a3 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any + stages { + stage ("Install") { + steps { + sh 'mamba env update --file environment.yml' + sh 'echo "mamba activate islandsurvivalcraft" >> ~/.bashrc' + sh "mvn validate" + } + } + stage ("Build") { + steps { + sh "mvn compile" + } + } + stage ("Test") { + steps { + sh "mvn -Dmaven.test.skip=false test" + } + } + stage ("Package") { + steps { + sh "mvn package" + } + } + } +} \ No newline at end of file diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000..a7c8b01 --- /dev/null +++ b/environment.yml @@ -0,0 +1,6 @@ +name: islandsurvivalcraft +channels: + - conda-forge +dependencies: + - openjdk=11.0.* + - maven=3.8.* \ No newline at end of file diff --git a/pom.xml b/pom.xml index 30cd4d5..7c3f105 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - ca.recrown.islandsurvivalcraft + net.reslate.islandsurvivalcraft IslandSurvivalCraft jar 1.0.0 @@ -53,10 +53,12 @@ + UTF-8 11 11 11 + true \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/persistence/Settings.java b/src/main/java/ca/recrown/islandsurvivalcraft/persistence/Settings.java deleted file mode 100644 index 78f1a8d..0000000 --- a/src/main/java/ca/recrown/islandsurvivalcraft/persistence/Settings.java +++ /dev/null @@ -1,5 +0,0 @@ -package ca.recrown.islandsurvivalcraft.persistence; - -public enum Settings { - -} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Reference.java b/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Reference.java deleted file mode 100644 index 084e240..0000000 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Reference.java +++ /dev/null @@ -1,5 +0,0 @@ -package ca.recrown.islandsurvivalcraft.utilities.datatypes; - -public class Reference { - public T value; -} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/CoordinateValidatable.java b/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/CoordinateValidatable.java deleted file mode 100644 index dcf59f1..0000000 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/CoordinateValidatable.java +++ /dev/null @@ -1,7 +0,0 @@ -package ca.recrown.islandsurvivalcraft.utilities.pathfinding; - -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; - -public interface CoordinateValidatable { - public boolean validate(Point2 point); -} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/NodeComparable.java b/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/NodeComparable.java deleted file mode 100644 index 0a77ea5..0000000 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/NodeComparable.java +++ /dev/null @@ -1,7 +0,0 @@ -package ca.recrown.islandsurvivalcraft.utilities.pathfinding; - -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; - -public interface NodeComparable { - public int compare(Point2 current, Point2 other); -} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/GeneratorModes.java b/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/GeneratorModes.java deleted file mode 100644 index 9b13e3d..0000000 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/GeneratorModes.java +++ /dev/null @@ -1,5 +0,0 @@ -package ca.recrown.islandsurvivalcraft.world.generation; - -public enum GeneratorModes { - UNIQUE -} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/IslandSurvivalCraft.java b/src/main/java/net/reslate/islandsurvivalcraft/IslandSurvivalCraft.java similarity index 87% rename from src/main/java/ca/recrown/islandsurvivalcraft/IslandSurvivalCraft.java rename to src/main/java/net/reslate/islandsurvivalcraft/IslandSurvivalCraft.java index d1f6098..4338370 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/IslandSurvivalCraft.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/IslandSurvivalCraft.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft; +package net.reslate.islandsurvivalcraft; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -11,10 +11,10 @@ import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import ca.recrown.islandsurvivalcraft.interaction.commands.CommandProcessor; -import ca.recrown.islandsurvivalcraft.interaction.items.ItemVariantManager; -import ca.recrown.islandsurvivalcraft.world.WorldInfoManager; -import ca.recrown.islandsurvivalcraft.world.generation.GeneratorModes; +import net.reslate.islandsurvivalcraft.interaction.commands.CommandProcessor; +import net.reslate.islandsurvivalcraft.interaction.items.ItemVariantManager; +import net.reslate.islandsurvivalcraft.world.WorldInfoManager; +import net.reslate.islandsurvivalcraft.world.generation.GeneratorModes; public class IslandSurvivalCraft extends JavaPlugin implements Listener { private PluginManager pluginManager; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/CommandProcessor.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/CommandProcessor.java similarity index 92% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/CommandProcessor.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/CommandProcessor.java index f93eecb..43a2f97 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/CommandProcessor.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/CommandProcessor.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.interaction.commands; +package net.reslate.islandsurvivalcraft.interaction.commands; import java.util.Arrays; @@ -7,7 +7,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; public class CommandProcessor implements CommandExecutor { private IslandSurvivalCraft islandSurvivalCraft; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/RegisteredCommands.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/RegisteredCommands.java similarity index 70% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/RegisteredCommands.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/RegisteredCommands.java index dbe75a2..d05a9ea 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/RegisteredCommands.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/RegisteredCommands.java @@ -1,8 +1,8 @@ -package ca.recrown.islandsurvivalcraft.interaction.commands; +package net.reslate.islandsurvivalcraft.interaction.commands; -import ca.recrown.islandsurvivalcraft.interaction.commands.runnables.IslandCommand; +import net.reslate.islandsurvivalcraft.interaction.commands.runnables.IslandCommand; -import ca.recrown.islandsurvivalcraft.interaction.commands.runnables.*; +import net.reslate.islandsurvivalcraft.interaction.commands.runnables.*; public enum RegisteredCommands { ISLAND(new IslandCommand()), diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/CommandRunnable.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/CommandRunnable.java similarity index 90% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/CommandRunnable.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/CommandRunnable.java index 19f34dc..3ac520e 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/CommandRunnable.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/CommandRunnable.java @@ -1,8 +1,8 @@ -package ca.recrown.islandsurvivalcraft.interaction.commands.runnables; +package net.reslate.islandsurvivalcraft.interaction.commands.runnables; import org.bukkit.command.CommandSender; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; public interface CommandRunnable { /** diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/HelpCommand.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/HelpCommand.java similarity index 91% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/HelpCommand.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/HelpCommand.java index 658caa8..8f50c52 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/HelpCommand.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/HelpCommand.java @@ -1,10 +1,10 @@ -package ca.recrown.islandsurvivalcraft.interaction.commands.runnables; +package net.reslate.islandsurvivalcraft.interaction.commands.runnables; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; -import ca.recrown.islandsurvivalcraft.interaction.commands.RegisteredCommands; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.interaction.commands.RegisteredCommands; public class HelpCommand implements CommandRunnable { private String helpMessage; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/IslandCommand.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/IslandCommand.java similarity index 93% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/IslandCommand.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/IslandCommand.java index b844be3..7617150 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/IslandCommand.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/IslandCommand.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.interaction.commands.runnables; +package net.reslate.islandsurvivalcraft.interaction.commands.runnables; import java.util.HashSet; import java.util.Set; @@ -11,11 +11,11 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; -import ca.recrown.islandsurvivalcraft.utilities.GeneralUtilities; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.world.WorldInfo; -import ca.recrown.islandsurvivalcraft.world.Information.IslandInformation; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.utilities.GeneralUtilities; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.world.WorldInfo; +import net.reslate.islandsurvivalcraft.world.Information.IslandInformation; public class IslandCommand implements CommandRunnable { private IslandSurvivalCraft islandSurvivalCraft; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/ValueCommand.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/ValueCommand.java similarity index 92% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/ValueCommand.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/ValueCommand.java index 4308da7..4b53031 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/commands/runnables/ValueCommand.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/commands/runnables/ValueCommand.java @@ -1,10 +1,10 @@ -package ca.recrown.islandsurvivalcraft.interaction.commands.runnables; +package net.reslate.islandsurvivalcraft.interaction.commands.runnables; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; public class ValueCommand implements CommandRunnable { private IslandSurvivalCraft isc; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariant.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariant.java similarity index 96% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariant.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariant.java index 87025b5..09394e2 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariant.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariant.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.interaction.items; +package net.reslate.islandsurvivalcraft.interaction.items; import org.bukkit.Material; import org.bukkit.block.Block; @@ -8,7 +8,7 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; public interface ItemVariant { /** diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariantIdentifier.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariantIdentifier.java similarity index 94% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariantIdentifier.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariantIdentifier.java index 341db09..5a2397c 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariantIdentifier.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariantIdentifier.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.interaction.items; +package net.reslate.islandsurvivalcraft.interaction.items; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariantManager.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariantManager.java similarity index 98% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariantManager.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariantManager.java index 23e2b73..ab1e476 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/ItemVariantManager.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/ItemVariantManager.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.interaction.items; +package net.reslate.islandsurvivalcraft.interaction.items; import java.util.Collection; import java.util.HashMap; @@ -28,7 +28,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.bukkit.inventory.meta.ItemMeta; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; public class ItemVariantManager implements Listener { private final IslandSurvivalCraft islandSurvivalCraft; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/RegisteredItemVariants.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/RegisteredItemVariants.java similarity index 77% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/RegisteredItemVariants.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/items/RegisteredItemVariants.java index 1b648f6..12a997a 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/RegisteredItemVariants.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/RegisteredItemVariants.java @@ -1,6 +1,6 @@ -package ca.recrown.islandsurvivalcraft.interaction.items; +package net.reslate.islandsurvivalcraft.interaction.items; -import ca.recrown.islandsurvivalcraft.interaction.items.variations.*; +import net.reslate.islandsurvivalcraft.interaction.items.variations.*; public enum RegisteredItemVariants { ISLAND_MAP(new IslandMapItem()) diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/variations/IslandMapItem.java b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/variations/IslandMapItem.java similarity index 89% rename from src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/variations/IslandMapItem.java rename to src/main/java/net/reslate/islandsurvivalcraft/interaction/items/variations/IslandMapItem.java index 08d9b25..4324e74 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/interaction/items/variations/IslandMapItem.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/interaction/items/variations/IslandMapItem.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.interaction.items.variations; +package net.reslate.islandsurvivalcraft.interaction.items.variations; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -18,14 +18,14 @@ import org.bukkit.map.MapView; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; -import ca.recrown.islandsurvivalcraft.IslandSurvivalCraft; -import ca.recrown.islandsurvivalcraft.interaction.items.ItemVariant; -import ca.recrown.islandsurvivalcraft.interaction.items.ItemVariantIdentifier; -import ca.recrown.islandsurvivalcraft.utilities.GeneralUtilities; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.world.WorldInfo; -import ca.recrown.islandsurvivalcraft.world.Information.IslandInformation; -import ca.recrown.islandsurvivalcraft.world.Information.IslandInformationManager; +import net.reslate.islandsurvivalcraft.IslandSurvivalCraft; +import net.reslate.islandsurvivalcraft.interaction.items.ItemVariant; +import net.reslate.islandsurvivalcraft.interaction.items.ItemVariantIdentifier; +import net.reslate.islandsurvivalcraft.utilities.GeneralUtilities; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.world.WorldInfo; +import net.reslate.islandsurvivalcraft.world.Information.IslandInformation; +import net.reslate.islandsurvivalcraft.world.Information.IslandInformationManager; import java.awt.Color; diff --git a/src/main/java/net/reslate/islandsurvivalcraft/persistence/Settings.java b/src/main/java/net/reslate/islandsurvivalcraft/persistence/Settings.java new file mode 100644 index 0000000..fb286a9 --- /dev/null +++ b/src/main/java/net/reslate/islandsurvivalcraft/persistence/Settings.java @@ -0,0 +1,5 @@ +package net.reslate.islandsurvivalcraft.persistence; + +public enum Settings { + +} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/GeneralUtilities.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/GeneralUtilities.java similarity index 96% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/GeneralUtilities.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/GeneralUtilities.java index 713e412..7e39963 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/GeneralUtilities.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/GeneralUtilities.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities; +package net.reslate.islandsurvivalcraft.utilities; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; public class GeneralUtilities { public final static int CHUNK_SIZE = 16; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/BiomeClassifications.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/BiomeClassifications.java similarity index 95% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/BiomeClassifications.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/BiomeClassifications.java index b0e2488..1a59afc 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/BiomeClassifications.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/BiomeClassifications.java @@ -1,11 +1,11 @@ -package ca.recrown.islandsurvivalcraft.utilities.biomes; +package net.reslate.islandsurvivalcraft.utilities.biomes; import java.util.Arrays; import org.bukkit.block.Biome; -import ca.recrown.islandsurvivalcraft.utilities.weighting.Weightable; -import ca.recrown.islandsurvivalcraft.utilities.weighting.WeightedSelector; +import net.reslate.islandsurvivalcraft.utilities.weighting.Weightable; +import net.reslate.islandsurvivalcraft.utilities.weighting.WeightedSelector; public enum BiomeClassifications implements Weightable { SNOWY(0.2f, new OceanBiomeInfo(Biome.FROZEN_OCEAN, Biome.COLD_OCEAN, Biome.DEEP_FROZEN_OCEAN), diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/BiomeInfo.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/BiomeInfo.java similarity index 69% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/BiomeInfo.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/BiomeInfo.java index 5fe24f6..2db0f6e 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/BiomeInfo.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/BiomeInfo.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.biomes; +package net.reslate.islandsurvivalcraft.utilities.biomes; import org.bukkit.block.Biome; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/LandBiomeInfo.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/LandBiomeInfo.java similarity index 94% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/LandBiomeInfo.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/LandBiomeInfo.java index ecfb548..9cadded 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/LandBiomeInfo.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/LandBiomeInfo.java @@ -1,8 +1,8 @@ -package ca.recrown.islandsurvivalcraft.utilities.biomes; +package net.reslate.islandsurvivalcraft.utilities.biomes; import org.bukkit.block.Biome; -import ca.recrown.islandsurvivalcraft.utilities.weighting.Weightable; +import net.reslate.islandsurvivalcraft.utilities.weighting.Weightable; public class LandBiomeInfo implements Weightable, BiomeInfo { private final Biome biome; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/OceanBiomeInfo.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/OceanBiomeInfo.java similarity index 94% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/OceanBiomeInfo.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/OceanBiomeInfo.java index 55dd5fd..2256df9 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/biomes/OceanBiomeInfo.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/biomes/OceanBiomeInfo.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.biomes; +package net.reslate.islandsurvivalcraft.utilities.biomes; import org.bukkit.block.Biome; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/Cache.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/Cache.java similarity index 98% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/Cache.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/Cache.java index 30ab508..25bdd97 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/Cache.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/Cache.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.caching; +package net.reslate.islandsurvivalcraft.utilities.caching; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheUsageStack.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheUsageStack.java similarity index 97% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheUsageStack.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheUsageStack.java index 78a1374..cf20219 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheUsageStack.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheUsageStack.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.caching; +package net.reslate.islandsurvivalcraft.utilities.caching; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheValue.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheValue.java similarity index 91% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheValue.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheValue.java index 7e736dd..8bb32a8 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheValue.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheValue.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.caching; +package net.reslate.islandsurvivalcraft.utilities.caching; class CacheValue { /** diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Point2.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Point2.java similarity index 94% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Point2.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Point2.java index 5496ea6..cabf356 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Point2.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Point2.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.datatypes; +package net.reslate.islandsurvivalcraft.utilities.datatypes; import java.util.Objects; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Point3.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Point3.java similarity index 93% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Point3.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Point3.java index d422f82..5c6b0c3 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Point3.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Point3.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.datatypes; +package net.reslate.islandsurvivalcraft.utilities.datatypes; import java.util.Objects; diff --git a/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Reference.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Reference.java new file mode 100644 index 0000000..1291d7b --- /dev/null +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Reference.java @@ -0,0 +1,5 @@ +package net.reslate.islandsurvivalcraft.utilities.datatypes; + +public class Reference { + public T value; +} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Vector3.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Vector3.java similarity index 93% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Vector3.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Vector3.java index cfe8fbb..aaef942 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/datatypes/Vector3.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/datatypes/Vector3.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.datatypes; +package net.reslate.islandsurvivalcraft.utilities.datatypes; import java.util.Objects; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/drawing/Circle.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/drawing/Circle.java similarity index 89% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/drawing/Circle.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/drawing/Circle.java index bb14b37..ecf08af 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/drawing/Circle.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/drawing/Circle.java @@ -1,7 +1,7 @@ -package ca.recrown.islandsurvivalcraft.utilities.drawing; +package net.reslate.islandsurvivalcraft.utilities.drawing; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; public class Circle { public final Point2 center; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/drawing/Flooder.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/drawing/Flooder.java similarity index 85% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/drawing/Flooder.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/drawing/Flooder.java index 0ac081d..5e0955e 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/drawing/Flooder.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/drawing/Flooder.java @@ -1,11 +1,11 @@ -package ca.recrown.islandsurvivalcraft.utilities.drawing; +package net.reslate.islandsurvivalcraft.utilities.drawing; import java.util.HashSet; import java.util.LinkedList; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; public class Flooder { private final Point2 start; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/noise/FractalOctaveGenerator.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/noise/FractalOctaveGenerator.java similarity index 90% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/noise/FractalOctaveGenerator.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/noise/FractalOctaveGenerator.java index 891bd27..44c213e 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/noise/FractalOctaveGenerator.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/noise/FractalOctaveGenerator.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.noise; +package net.reslate.islandsurvivalcraft.utilities.noise; import java.util.Random; diff --git a/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/CoordinateValidatable.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/CoordinateValidatable.java new file mode 100644 index 0000000..52b3330 --- /dev/null +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/CoordinateValidatable.java @@ -0,0 +1,7 @@ +package net.reslate.islandsurvivalcraft.utilities.pathfinding; + +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; + +public interface CoordinateValidatable { + public boolean validate(Point2 point); +} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearch.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearch.java similarity index 97% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearch.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearch.java index fa6f5e3..821193e 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearch.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearch.java @@ -1,10 +1,10 @@ -package ca.recrown.islandsurvivalcraft.utilities.pathfinding; +package net.reslate.islandsurvivalcraft.utilities.pathfinding; import java.util.HashSet; import java.util.PriorityQueue; import java.util.Queue; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; public class DepthFirstSearch { private final HashSet checkedNodes; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/LinkedCoordinateValidator.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/LinkedCoordinateValidator.java similarity index 80% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/LinkedCoordinateValidator.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/LinkedCoordinateValidator.java index a974840..3045843 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/LinkedCoordinateValidator.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/LinkedCoordinateValidator.java @@ -1,6 +1,6 @@ -package ca.recrown.islandsurvivalcraft.utilities.pathfinding; +package net.reslate.islandsurvivalcraft.utilities.pathfinding; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; public class LinkedCoordinateValidator implements CoordinateValidatable { private final CoordinateValidatable[] CoordinateValidatables; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/Node.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/Node.java similarity index 92% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/Node.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/Node.java index 3b026f8..cf735aa 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/Node.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/Node.java @@ -1,6 +1,6 @@ -package ca.recrown.islandsurvivalcraft.utilities.pathfinding; +package net.reslate.islandsurvivalcraft.utilities.pathfinding; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; public class Node extends Point2 implements Comparable { private final NodeComparable nodeComparable; diff --git a/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/NodeComparable.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/NodeComparable.java new file mode 100644 index 0000000..24febcf --- /dev/null +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/NodeComparable.java @@ -0,0 +1,7 @@ +package net.reslate.islandsurvivalcraft.utilities.pathfinding; + +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; + +public interface NodeComparable { + public int compare(Point2 current, Point2 other); +} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/weighting/Weightable.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/weighting/Weightable.java similarity index 50% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/weighting/Weightable.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/weighting/Weightable.java index 4fcf78c..2f7f7b6 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/weighting/Weightable.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/weighting/Weightable.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.weighting; +package net.reslate.islandsurvivalcraft.utilities.weighting; public interface Weightable { public float getWeight(); diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/weighting/WeightedSelector.java b/src/main/java/net/reslate/islandsurvivalcraft/utilities/weighting/WeightedSelector.java similarity index 92% rename from src/main/java/ca/recrown/islandsurvivalcraft/utilities/weighting/WeightedSelector.java rename to src/main/java/net/reslate/islandsurvivalcraft/utilities/weighting/WeightedSelector.java index 2dc29a5..591651c 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/utilities/weighting/WeightedSelector.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/utilities/weighting/WeightedSelector.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.weighting; +package net.reslate.islandsurvivalcraft.utilities.weighting; import java.util.Random; import java.util.TreeMap; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/BiomeMap.java b/src/main/java/net/reslate/islandsurvivalcraft/world/BiomeMap.java similarity index 85% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/BiomeMap.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/BiomeMap.java index c10b916..31130c3 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/BiomeMap.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/BiomeMap.java @@ -1,13 +1,13 @@ -package ca.recrown.islandsurvivalcraft.world; +package net.reslate.islandsurvivalcraft.world; import java.util.Random; import org.bukkit.block.Biome; import org.bukkit.util.noise.SimplexOctaveGenerator; -import ca.recrown.islandsurvivalcraft.utilities.biomes.BiomeClassifications; -import ca.recrown.islandsurvivalcraft.utilities.biomes.LandBiomeInfo; -import ca.recrown.islandsurvivalcraft.utilities.biomes.OceanBiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.biomes.BiomeClassifications; +import net.reslate.islandsurvivalcraft.utilities.biomes.LandBiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.biomes.OceanBiomeInfo; public class BiomeMap { private final SimplexOctaveGenerator noise; @@ -23,7 +23,7 @@ public class BiomeMap { } /** - * Attempts to procure a biome that helps transitionfrom one biome to another biome + * Attempts to procure a biome that helps transition from one biome to another biome * for given biome. * @param from the biome to transition from. * @return the resulting transition biome. diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformation.java b/src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformation.java similarity index 95% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformation.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformation.java index 4d3f64c..2a078b2 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformation.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformation.java @@ -1,10 +1,10 @@ -package ca.recrown.islandsurvivalcraft.world.Information; +package net.reslate.islandsurvivalcraft.world.Information; import java.util.Collections; import java.util.Set; import java.util.UUID; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; public class IslandInformation { private final Set chunkSpan; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformationBuilder.java b/src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformationBuilder.java similarity index 92% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformationBuilder.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformationBuilder.java index ea200fe..67ea948 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformationBuilder.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformationBuilder.java @@ -1,8 +1,8 @@ -package ca.recrown.islandsurvivalcraft.world.Information; +package net.reslate.islandsurvivalcraft.world.Information; import java.util.HashSet; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; public class IslandInformationBuilder { private final HashSet islandCoordinates = new HashSet<>(); diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformationManager.java b/src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformationManager.java similarity index 95% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformationManager.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformationManager.java index 0e47f81..a43433b 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/Information/IslandInformationManager.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/Information/IslandInformationManager.java @@ -1,14 +1,14 @@ -package ca.recrown.islandsurvivalcraft.world.Information; +package net.reslate.islandsurvivalcraft.world.Information; import java.lang.Thread.State; import java.util.HashSet; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; -import ca.recrown.islandsurvivalcraft.utilities.GeneralUtilities; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.utilities.GeneralUtilities; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; public class IslandInformationManager implements Runnable { private final IslandWorldMap islandMap; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldMap.java b/src/main/java/net/reslate/islandsurvivalcraft/world/IslandWorldMap.java similarity index 94% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldMap.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/IslandWorldMap.java index 19ccdcd..5b7a5c7 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/IslandWorldMap.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/IslandWorldMap.java @@ -1,14 +1,14 @@ -package ca.recrown.islandsurvivalcraft.world; +package net.reslate.islandsurvivalcraft.world; import java.util.Random; import org.bukkit.util.noise.SimplexOctaveGenerator; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Reference; -import ca.recrown.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; -import ca.recrown.islandsurvivalcraft.utilities.pathfinding.DepthFirstSearch; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Reference; +import net.reslate.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; +import net.reslate.islandsurvivalcraft.utilities.pathfinding.DepthFirstSearch; public class IslandWorldMap { private final float SHALLOW_PORTION = 0.06f; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/TemperatureMap.java b/src/main/java/net/reslate/islandsurvivalcraft/world/TemperatureMap.java similarity index 83% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/TemperatureMap.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/TemperatureMap.java index 9a54c36..4a1b6a7 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/TemperatureMap.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/TemperatureMap.java @@ -1,11 +1,11 @@ -package ca.recrown.islandsurvivalcraft.world; +package net.reslate.islandsurvivalcraft.world; import java.util.Random; import org.bukkit.util.noise.SimplexOctaveGenerator; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; public class TemperatureMap { diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/WorldInfo.java b/src/main/java/net/reslate/islandsurvivalcraft/world/WorldInfo.java similarity index 93% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/WorldInfo.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/WorldInfo.java index 83ef299..062b90c 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/WorldInfo.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/WorldInfo.java @@ -1,11 +1,11 @@ -package ca.recrown.islandsurvivalcraft.world; +package net.reslate.islandsurvivalcraft.world; import java.util.Random; import org.bukkit.World; -import ca.recrown.islandsurvivalcraft.world.Information.IslandInformationManager; -import ca.recrown.islandsurvivalcraft.world.generation.chunks.IslandWorldChunkGenerator; +import net.reslate.islandsurvivalcraft.world.Information.IslandInformationManager; +import net.reslate.islandsurvivalcraft.world.generation.chunks.IslandWorldChunkGenerator; public class WorldInfo { private final WorldInfoManager manager; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/WorldInfoManager.java b/src/main/java/net/reslate/islandsurvivalcraft/world/WorldInfoManager.java similarity index 90% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/WorldInfoManager.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/WorldInfoManager.java index fe76c67..19f76e9 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/WorldInfoManager.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/WorldInfoManager.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.world; +package net.reslate.islandsurvivalcraft.world; import java.util.concurrent.ConcurrentHashMap; @@ -11,9 +11,9 @@ import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.ChunkUnloadEvent; import org.bukkit.generator.ChunkGenerator; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.world.generation.GeneratorModes; -import ca.recrown.islandsurvivalcraft.world.generation.chunks.IslandWorldChunkGenerator; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.world.generation.GeneratorModes; +import net.reslate.islandsurvivalcraft.world.generation.chunks.IslandWorldChunkGenerator; public class WorldInfoManager implements Listener { public final ConcurrentHashMap worldInformation = new ConcurrentHashMap<>(); diff --git a/src/main/java/net/reslate/islandsurvivalcraft/world/generation/GeneratorModes.java b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/GeneratorModes.java new file mode 100644 index 0000000..30225f6 --- /dev/null +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/GeneratorModes.java @@ -0,0 +1,5 @@ +package net.reslate.islandsurvivalcraft.world.generation; + +public enum GeneratorModes { + UNIQUE +} \ No newline at end of file diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/BiomeGenerator.java b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/biomes/BiomeGenerator.java similarity index 75% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/BiomeGenerator.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/generation/biomes/BiomeGenerator.java index 7f53873..85af520 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/BiomeGenerator.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/biomes/BiomeGenerator.java @@ -1,11 +1,11 @@ -package ca.recrown.islandsurvivalcraft.world.generation.biomes; +package net.reslate.islandsurvivalcraft.world.generation.biomes; -import ca.recrown.islandsurvivalcraft.utilities.biomes.BiomeInfo; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.world.BiomeMap; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; -import ca.recrown.islandsurvivalcraft.world.TemperatureMap; +import net.reslate.islandsurvivalcraft.utilities.biomes.BiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.world.BiomeMap; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.world.TemperatureMap; public interface BiomeGenerator { diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGenerator.java b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGenerator.java similarity index 78% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGenerator.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGenerator.java index bb0385c..b4a4429 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGenerator.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGenerator.java @@ -1,15 +1,15 @@ -package ca.recrown.islandsurvivalcraft.world.generation.biomes; +package net.reslate.islandsurvivalcraft.world.generation.biomes; -import ca.recrown.islandsurvivalcraft.utilities.GeneralUtilities; -import ca.recrown.islandsurvivalcraft.utilities.biomes.BiomeInfo; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Reference; -import ca.recrown.islandsurvivalcraft.utilities.drawing.Flooder; -import ca.recrown.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; -import ca.recrown.islandsurvivalcraft.world.BiomeMap; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; -import ca.recrown.islandsurvivalcraft.world.TemperatureMap; +import net.reslate.islandsurvivalcraft.utilities.GeneralUtilities; +import net.reslate.islandsurvivalcraft.utilities.biomes.BiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Reference; +import net.reslate.islandsurvivalcraft.utilities.drawing.Flooder; +import net.reslate.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; +import net.reslate.islandsurvivalcraft.world.BiomeMap; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.world.TemperatureMap; public class UniqueBiomeGenerator implements BiomeGenerator { diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/chunks/IslandWorldChunkGenerator.java b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/chunks/IslandWorldChunkGenerator.java similarity index 88% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/generation/chunks/IslandWorldChunkGenerator.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/generation/chunks/IslandWorldChunkGenerator.java index 2ca5597..c4d5e68 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/chunks/IslandWorldChunkGenerator.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/chunks/IslandWorldChunkGenerator.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.world.generation.chunks; +package net.reslate.islandsurvivalcraft.world.generation.chunks; import java.util.Random; import java.util.concurrent.ExecutorService; @@ -13,21 +13,21 @@ import org.bukkit.block.data.BlockData; import org.bukkit.event.Listener; import org.bukkit.generator.ChunkGenerator; -import ca.recrown.islandsurvivalcraft.utilities.GeneralUtilities; -import ca.recrown.islandsurvivalcraft.utilities.biomes.BiomeInfo; -import ca.recrown.islandsurvivalcraft.utilities.biomes.LandBiomeInfo; -import ca.recrown.islandsurvivalcraft.utilities.biomes.OceanBiomeInfo; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.world.BiomeMap; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; -import ca.recrown.islandsurvivalcraft.world.TemperatureMap; -import ca.recrown.islandsurvivalcraft.world.WorldInfo; -import ca.recrown.islandsurvivalcraft.world.generation.GeneratorModes; -import ca.recrown.islandsurvivalcraft.world.generation.biomes.BiomeGenerator; -import ca.recrown.islandsurvivalcraft.world.generation.biomes.UniqueBiomeGenerator; -import ca.recrown.islandsurvivalcraft.world.generation.shaders.WorldHeightShader; -import ca.recrown.islandsurvivalcraft.world.generation.shaders.WorldLayerShader; +import net.reslate.islandsurvivalcraft.utilities.GeneralUtilities; +import net.reslate.islandsurvivalcraft.utilities.biomes.BiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.biomes.LandBiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.biomes.OceanBiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.world.BiomeMap; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.world.TemperatureMap; +import net.reslate.islandsurvivalcraft.world.WorldInfo; +import net.reslate.islandsurvivalcraft.world.generation.GeneratorModes; +import net.reslate.islandsurvivalcraft.world.generation.biomes.BiomeGenerator; +import net.reslate.islandsurvivalcraft.world.generation.biomes.UniqueBiomeGenerator; +import net.reslate.islandsurvivalcraft.world.generation.shaders.WorldHeightShader; +import net.reslate.islandsurvivalcraft.world.generation.shaders.WorldLayerShader; public class IslandWorldChunkGenerator extends ChunkGenerator implements Listener { private final int BEDROCK_HEIGHT = 5; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/shaders/WorldHeightShader.java b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/shaders/WorldHeightShader.java similarity index 95% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/generation/shaders/WorldHeightShader.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/generation/shaders/WorldHeightShader.java index c759757..28b0fb9 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/shaders/WorldHeightShader.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/shaders/WorldHeightShader.java @@ -1,12 +1,12 @@ -package ca.recrown.islandsurvivalcraft.world.generation.shaders; +package net.reslate.islandsurvivalcraft.world.generation.shaders; import java.util.Random; import org.bukkit.block.Biome; import org.bukkit.util.noise.SimplexOctaveGenerator; -import ca.recrown.islandsurvivalcraft.utilities.biomes.BiomeInfo; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.utilities.biomes.BiomeInfo; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; public class WorldHeightShader { private final IslandWorldMap mapper; diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/shaders/WorldLayerShader.java b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/shaders/WorldLayerShader.java similarity index 95% rename from src/main/java/ca/recrown/islandsurvivalcraft/world/generation/shaders/WorldLayerShader.java rename to src/main/java/net/reslate/islandsurvivalcraft/world/generation/shaders/WorldLayerShader.java index b735cec..c316e14 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/world/generation/shaders/WorldLayerShader.java +++ b/src/main/java/net/reslate/islandsurvivalcraft/world/generation/shaders/WorldLayerShader.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.world.generation.shaders; +package net.reslate.islandsurvivalcraft.world.generation.shaders; import java.util.Random; @@ -7,9 +7,9 @@ import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import org.bukkit.util.noise.SimplexOctaveGenerator; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Vector3; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Vector3; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; @SuppressWarnings("unused") public class WorldLayerShader { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 77310f9..b57200d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: IslandSurvivalCraft -main: ca.recrown.islandsurvivalcraft.IslandSurvivalCraft +main: net.reslate.islandsurvivalcraft.IslandSurvivalCraft version: 1.0.0 author: Reslate description: Adds the gamemode IslandSurvivalCraft. diff --git a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/GeneralUtilitiesTest.java b/src/test/java/net/reslate/islandsurvivalcraft/utilities/GeneralUtilitiesTest.java similarity index 97% rename from src/test/java/ca/recrown/islandsurvivalcraft/utilities/GeneralUtilitiesTest.java rename to src/test/java/net/reslate/islandsurvivalcraft/utilities/GeneralUtilitiesTest.java index e854a9a..04f354e 100644 --- a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/GeneralUtilitiesTest.java +++ b/src/test/java/net/reslate/islandsurvivalcraft/utilities/GeneralUtilitiesTest.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities; +package net.reslate.islandsurvivalcraft.utilities; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; /** * Unit test for simple App. diff --git a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheTest.java b/src/test/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheTest.java similarity index 99% rename from src/test/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheTest.java rename to src/test/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheTest.java index 3283d73..0308831 100644 --- a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/caching/CacheTest.java +++ b/src/test/java/net/reslate/islandsurvivalcraft/utilities/caching/CacheTest.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.caching; +package net.reslate.islandsurvivalcraft.utilities.caching; import static org.junit.Assert.assertSame; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/drawing/FloodFillTest.java b/src/test/java/net/reslate/islandsurvivalcraft/utilities/drawing/FloodFillTest.java similarity index 94% rename from src/test/java/ca/recrown/islandsurvivalcraft/utilities/drawing/FloodFillTest.java rename to src/test/java/net/reslate/islandsurvivalcraft/utilities/drawing/FloodFillTest.java index a6bb421..b77938a 100644 --- a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/drawing/FloodFillTest.java +++ b/src/test/java/net/reslate/islandsurvivalcraft/utilities/drawing/FloodFillTest.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.drawing; +package net.reslate.islandsurvivalcraft.utilities.drawing; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -13,8 +13,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.pathfinding.CoordinateValidatable; @TestInstance(Lifecycle.PER_CLASS) public class FloodFillTest { diff --git a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearchTest.java b/src/test/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearchTest.java similarity index 98% rename from src/test/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearchTest.java rename to src/test/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearchTest.java index 8e432ad..29666c6 100644 --- a/src/test/java/ca/recrown/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearchTest.java +++ b/src/test/java/net/reslate/islandsurvivalcraft/utilities/pathfinding/DepthFirstSearchTest.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.utilities.pathfinding; +package net.reslate.islandsurvivalcraft.utilities.pathfinding; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; /** * Unit test for simple App. diff --git a/src/test/java/ca/recrown/islandsurvivalcraft/world/IslandWorldMapTest.java b/src/test/java/net/reslate/islandsurvivalcraft/world/IslandWorldMapTest.java similarity index 96% rename from src/test/java/ca/recrown/islandsurvivalcraft/world/IslandWorldMapTest.java rename to src/test/java/net/reslate/islandsurvivalcraft/world/IslandWorldMapTest.java index 96ee7c4..4af9c32 100644 --- a/src/test/java/ca/recrown/islandsurvivalcraft/world/IslandWorldMapTest.java +++ b/src/test/java/net/reslate/islandsurvivalcraft/world/IslandWorldMapTest.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.world; +package net.reslate.islandsurvivalcraft.world; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; @TestInstance(Lifecycle.PER_CLASS) public class IslandWorldMapTest { diff --git a/src/test/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGeneratorTest.java b/src/test/java/net/reslate/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGeneratorTest.java similarity index 95% rename from src/test/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGeneratorTest.java rename to src/test/java/net/reslate/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGeneratorTest.java index 5724196..259421c 100644 --- a/src/test/java/ca/recrown/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGeneratorTest.java +++ b/src/test/java/net/reslate/islandsurvivalcraft/world/generation/biomes/UniqueBiomeGeneratorTest.java @@ -1,4 +1,4 @@ -package ca.recrown.islandsurvivalcraft.world.generation.biomes; +package net.reslate.islandsurvivalcraft.world.generation.biomes; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -18,13 +18,13 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.TestInstance.Lifecycle; -import ca.recrown.islandsurvivalcraft.utilities.GeneralUtilities; -import ca.recrown.islandsurvivalcraft.utilities.biomes.BiomeInfo; -import ca.recrown.islandsurvivalcraft.utilities.caching.Cache; -import ca.recrown.islandsurvivalcraft.utilities.datatypes.Point2; -import ca.recrown.islandsurvivalcraft.world.BiomeMap; -import ca.recrown.islandsurvivalcraft.world.IslandWorldMap; -import ca.recrown.islandsurvivalcraft.world.TemperatureMap; +import net.reslate.islandsurvivalcraft.utilities.GeneralUtilities; +import net.reslate.islandsurvivalcraft.utilities.biomes.BiomeInfo; +import net.reslate.islandsurvivalcraft.utilities.caching.Cache; +import net.reslate.islandsurvivalcraft.utilities.datatypes.Point2; +import net.reslate.islandsurvivalcraft.world.BiomeMap; +import net.reslate.islandsurvivalcraft.world.IslandWorldMap; +import net.reslate.islandsurvivalcraft.world.TemperatureMap; @TestInstance(Lifecycle.PER_CLASS) public class UniqueBiomeGeneratorTest { diff --git a/test-server/end_process.ps1 b/test-server/end_process.ps1 index 69739ad..0370a3d 100644 --- a/test-server/end_process.ps1 +++ b/test-server/end_process.ps1 @@ -1,8 +1,9 @@ -if (Test-Path ./pid.temp) { - $sID = Get-Item -Path ./pid.temp | Get-Content -Tail 1 +if (Test-Path ./test-server.pid) { + $sID = Get-Item -Path ./test-server.pid | Get-Content -Tail 1 if (Get-Process -Id $sID -ErrorAction SilentlyContinue) { Stop-Process -Id $sID } - Remove-Item "./pid.temp" -} - + Remove-Item "./test-server.pid" +} else { + Write-Output "Couldn't find running server to stop." +} \ No newline at end of file diff --git a/test-server/load_build.ps1 b/test-server/load_build.ps1 index 87a205c..1fb275e 100644 --- a/test-server/load_build.ps1 +++ b/test-server/load_build.ps1 @@ -1,2 +1,3 @@ +New-Item -Path .\plugins -ItemType Directory -Force write-Output "Attempting to copy plugin jar to plugins folder..." copy-Item -Path "..\target\IslandSurvivalCraft*.jar" -Destination "plugins\IslandSurvivalCraft.jar" diff --git a/test-server/start_process.ps1 b/test-server/start_process.ps1 index 5047565..b2f5a8b 100644 --- a/test-server/start_process.ps1 +++ b/test-server/start_process.ps1 @@ -1,6 +1,10 @@ +if (!(Test-Path -Path "paper.jar" -PathType Leaf)) { + Invoke-WebRequest -Uri "https://api.papermc.io/v2/projects/paper/versions/1.16.5/builds/794/downloads/paper-1.16.5-794.jar" -OutFile "paper.jar" +} + write-Output "Attempting to start Paper test server." $SID = Start-Process java -ArgumentList "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=25566", "-Xms512M", "-Xmx1G", "-jar", "paper.jar", "nogui" -PassThru $SID = $SID.Id write-Output "Process started. PID is: $SID" -$SID | Out-File -FilePath "pid.temp" \ No newline at end of file +$SID | Out-File -FilePath "test-server.pid" \ No newline at end of file