diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ffdc34 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml +bin/ +*.class \ No newline at end of file diff --git a/src/main/java/bentobox/addon/acidisland/AISettings.java b/src/main/java/bentobox/addon/acidisland/AISettings.java index 1c03a4c..65e45c0 100644 --- a/src/main/java/bentobox/addon/acidisland/AISettings.java +++ b/src/main/java/bentobox/addon/acidisland/AISettings.java @@ -52,6 +52,17 @@ public class AISettings implements DataObject, WorldSettings { @ConfigEntry(path = "acid.damage-chickens") private boolean acidDamageChickens = false; + // Command + @ConfigComment("") + @ConfigComment("Island Command. What command users will run to access their island") + @ConfigEntry(path = "acid.command.island") + private String islandCommand = "ai"; + + @ConfigComment("") + @ConfigComment("The island admin command.") + @ConfigEntry(path = "acid.command.admin") + private String adminCommand = "acid"; + // Damage @ConfigComment("Damage that a player will experience in acid. 10 is half their health typically. 5 would be easier.") @ConfigEntry(path = "acid.damage.acid.player") @@ -1305,4 +1316,22 @@ public class AISettings implements DataObject, WorldSettings { this.defaultBiome = defaultBiome; } + /** + * @return the command for accessing your island + */ + public String getIslandCommand() { return islandCommand; } + + /** + * @param islandCommand what you want your island command to be + */ + public void setIslandCommand(String islandCommand) { this.islandCommand = islandCommand; } + /** + * @return the command for accessing your admin command + */ + public String getAdminCommand() { return adminCommand; } + + /** + * @param adminCommand what you want your admin command to be + */ + public void setAdminCommand(String adminCommand) { this.adminCommand = adminCommand; } } diff --git a/src/main/java/bentobox/addon/acidisland/AcidIsland.java b/src/main/java/bentobox/addon/acidisland/AcidIsland.java index bcff1d0..126fb36 100644 --- a/src/main/java/bentobox/addon/acidisland/AcidIsland.java +++ b/src/main/java/bentobox/addon/acidisland/AcidIsland.java @@ -42,8 +42,8 @@ public class AcidIsland extends Addon { manager.registerEvents(new AcidEffect(this), this.getPlugin()); manager.registerEvents(new LavaCheck(this), this.getPlugin()); // Register commands - new AcidCommand(this); - new AiCommand(this); + new AcidCommand(this, settings.getAdminCommand()); + new AiCommand(this, settings.getIslandCommand()); // Burn everything acidTask = new AcidTask(this); } diff --git a/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java b/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java index 7d724f5..5ab7645 100755 --- a/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java +++ b/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java @@ -25,8 +25,8 @@ import world.bentobox.bentobox.api.user.User; public class AcidCommand extends CompositeCommand { - public AcidCommand(Addon addon) { - super(addon, "acid"); + public AcidCommand(Addon addon, String command) { + super(addon, command); } @Override diff --git a/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java b/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java index ff46b91..c3f687b 100755 --- a/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java +++ b/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java @@ -26,8 +26,8 @@ import world.bentobox.bentobox.api.user.User; public class AiCommand extends CompositeCommand { - public AiCommand(Addon addon) { - super(addon, "ai"); + public AiCommand(Addon addon, String command) { + super(addon, command); } /* (non-Javadoc)