From 1ee7ed0da2d3415c771917acb2b7972093fcfcb0 Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 14 Apr 2020 12:51:24 -0700 Subject: [PATCH] More renaming to AOneBlock --- .../java/world/bentobox/aoneblock/AOneBlock.java | 16 ++++++++-------- .../java/world/bentobox/aoneblock/Settings.java | 14 +++++++------- src/main/resources/addon.yml | 2 +- src/main/resources/locales/ja.yml | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/world/bentobox/aoneblock/AOneBlock.java b/src/main/java/world/bentobox/aoneblock/AOneBlock.java index cab09f37..48ab2ab8 100644 --- a/src/main/java/world/bentobox/aoneblock/AOneBlock.java +++ b/src/main/java/world/bentobox/aoneblock/AOneBlock.java @@ -58,7 +58,7 @@ private boolean loadSettings() { settings = configObject.loadConfigObject(); if (settings == null) { // Disable - logError("OneBlock settings could not load! Addon disabled."); + logError("AOneBlock settings could not load! Addon disabled."); setState(State.DISABLED); return false; } @@ -73,11 +73,11 @@ public void onEnable(){ registerListener(listener); registerListener(new NoBlockHandler(this)); // Register placeholders - getPlugin().getPlaceholdersManager().registerPlaceholder(this,"oneblock_phase", this::getPhaseByUser); - getPlugin().getPlaceholdersManager().registerPlaceholder(this,"oneblock_count", this::getCountByUser); + getPlugin().getPlaceholdersManager().registerPlaceholder(this,"aoneblock_phase", this::getPhaseByUser); + getPlugin().getPlaceholdersManager().registerPlaceholder(this,"aoneblock_count", this::getCountByUser); } catch (IOException | InvalidConfigurationException e) { // Disable - logError("OneBlock settings could not load (oneblock.yml error)! Addon disabled."); + logError("AOneBlock settings could not load (oneblock.yml error)! Addon disabled."); logError(e.getMessage()); e.printStackTrace(); setState(State.DISABLED); @@ -109,7 +109,7 @@ public void onDisable() { @Override public void onReload() { if (loadSettings()) { - log("Reloaded OneBlock settings"); + log("Reloaded AOneBlock settings"); } } @@ -124,7 +124,7 @@ public Settings getSettings() { public void createWorlds() { String worldName = settings.getWorldName().toLowerCase(); if (getServer().getWorld(worldName) == null) { - log("Creating OneBlock world ..."); + log("Creating AOneBlock world ..."); } // Create the world if it does not exist @@ -132,14 +132,14 @@ public void createWorlds() { // Make the nether if it does not exist if (settings.isNetherGenerate()) { if (getServer().getWorld(worldName + NETHER) == null) { - log("Creating OneBlock's Nether..."); + log("Creating AOneBlock's Nether..."); } netherWorld = settings.isNetherIslands() ? getWorld(worldName, World.Environment.NETHER, chunkGenerator) : getWorld(worldName, World.Environment.NETHER, null); } // Make the end if it does not exist if (settings.isEndGenerate()) { if (getServer().getWorld(worldName + THE_END) == null) { - log("Creating OneBlock's End World..."); + log("Creating AOneBlock's End World..."); } endWorld = settings.isEndIslands() ? getWorld(worldName, World.Environment.THE_END, chunkGenerator) : getWorld(worldName, World.Environment.THE_END, null); } diff --git a/src/main/java/world/bentobox/aoneblock/Settings.java b/src/main/java/world/bentobox/aoneblock/Settings.java index 9ab88441..d1f64721 100644 --- a/src/main/java/world/bentobox/aoneblock/Settings.java +++ b/src/main/java/world/bentobox/aoneblock/Settings.java @@ -26,19 +26,19 @@ * All the plugin settings are here * @author Tastybento */ -@StoreAt(filename="config.yml", path="addons/OneBlock") // Explicitly call out what name this should have. -@ConfigComment("OneBlock Configuration [version]") +@StoreAt(filename="config.yml", path="addons/AOneBlock") // Explicitly call out what name this should have. +@ConfigComment("AOneBlock Configuration [version]") public class Settings implements WorldSettings { /* Commands */ @ConfigComment("Island Command. What command users will run to access their island.") @ConfigComment("To define alias, just separate commands with white space.") - @ConfigEntry(path = "oneblock.command.island", since = "1.3.0") + @ConfigEntry(path = "aoneblock.command.island", since = "1.3.0") private String islandCommand = "island is skyblock sb"; @ConfigComment("The island admin command.") @ConfigComment("To define alias, just separate commands with white space.") - @ConfigEntry(path = "oneblock.command.admin", since = "1.3.0") + @ConfigEntry(path = "aoneblock.command.admin", since = "1.3.0") private String adminCommand = "bsbadmin bsb skyblockadmin sbadmin sba"; /* WORLD */ @@ -83,7 +83,7 @@ public class Settings implements WorldSettings { @ConfigComment("Default protection range radius in blocks. Cannot be larger than distance.") @ConfigComment("Admins can change protection sizes for players individually using /bsbadmin range set ") - @ConfigComment("or set this permission: oneblock.island.range.") + @ConfigComment("or set this permission: aoneblock.island.range.") @ConfigEntry(path = "world.protection-range", needsReset = true) private int islandProtectionRange = 50; @@ -221,13 +221,13 @@ public class Settings implements WorldSettings { private int maxTeamSize = 4; @ConfigComment("Default maximum number of coop rank members per island") - @ConfigComment("Players can have the oneblock.coop.maxsize. permission to be bigger but") + @ConfigComment("Players can have the aoneblock.coop.maxsize. permission to be bigger but") @ConfigComment("permission size cannot be less than the default below. ") @ConfigEntry(path = "island.max-coop-size", since = "1.13.0") private int maxCoopSize = 4; @ConfigComment("Default maximum number of trusted rank members per island") - @ConfigComment("Players can have the oneblock.trust.maxsize. permission to be bigger but") + @ConfigComment("Players can have the aoneblock.trust.maxsize. permission to be bigger but") @ConfigComment("permission size cannot be less than the default below. ") @ConfigEntry(path = "island.max-trusted-size", since = "1.13.0") private int maxTrustSize = 4; diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index 650bd245..d122cdbc 100755 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -1,4 +1,4 @@ -name: OneBlock +name: AOneBlock main: world.bentobox.aoneblock.AOneBlock version: ${version}${build.number} metrics: true diff --git a/src/main/resources/locales/ja.yml b/src/main/resources/locales/ja.yml index 6f0b5186..4c053bc7 100644 --- a/src/main/resources/locales/ja.yml +++ b/src/main/resources/locales/ja.yml @@ -1,5 +1,5 @@ --- -oneblock: +aoneblock: commands: admin: setcount: