Skip to content

Commit

Permalink
More renaming to AOneBlock
Browse files Browse the repository at this point in the history
  • Loading branch information
tastybento committed Apr 14, 2020
1 parent 4ce19d6 commit 1ee7ed0
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions src/main/java/world/bentobox/aoneblock/AOneBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);
Expand Down Expand Up @@ -109,7 +109,7 @@ public void onDisable() {
@Override
public void onReload() {
if (loadSettings()) {
log("Reloaded OneBlock settings");
log("Reloaded AOneBlock settings");
}
}

Expand All @@ -124,22 +124,22 @@ 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
islandWorld = getWorld(worldName, World.Environment.NORMAL, chunkGenerator);
// 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);
}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/world/bentobox/aoneblock/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 <player> <new range>")
@ConfigComment("or set this permission: oneblock.island.range.<number>")
@ConfigComment("or set this permission: aoneblock.island.range.<number>")
@ConfigEntry(path = "world.protection-range", needsReset = true)
private int islandProtectionRange = 50;

Expand Down Expand Up @@ -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.<number> permission to be bigger but")
@ConfigComment("Players can have the aoneblock.coop.maxsize.<number> 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.<number> permission to be bigger but")
@ConfigComment("Players can have the aoneblock.trust.maxsize.<number> 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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/addon.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: OneBlock
name: AOneBlock
main: world.bentobox.aoneblock.AOneBlock
version: ${version}${build.number}
metrics: true
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/locales/ja.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
oneblock:
aoneblock:
commands:
admin:
setcount:
Expand Down

0 comments on commit 1ee7ed0

Please sign in to comment.