From 72274c0174b1071cf501865df034f7e57b1b3891 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 20 Jan 2024 17:11:09 -0800 Subject: [PATCH 1/6] Version 1.17.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f8f021..10298eb 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ -LOCAL - 1.17.0 + 1.17.1 BentoBoxWorld_BSkyBlock bentobox-world From 706178d3d5f0930872355241942a3bb832501d0e Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 20 Jan 2024 17:11:25 -0800 Subject: [PATCH 2/6] Fix for L-Shaped island mis-naming --- src/main/resources/blueprints/classic-island.json | 2 +- .../blueprints/{classic-lshape.blu => l-shaped.blu} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/blueprints/{classic-lshape.blu => l-shaped.blu} (100%) diff --git a/src/main/resources/blueprints/classic-island.json b/src/main/resources/blueprints/classic-island.json index 0bcf01e..dc45bcc 100644 --- a/src/main/resources/blueprints/classic-island.json +++ b/src/main/resources/blueprints/classic-island.json @@ -9,7 +9,7 @@ ], "requirePermission": false, "blueprints": { - "NORMAL": "classic-lshape", + "NORMAL": "l-shaped", "NETHER": "nether-island", "THE_END": "end-island" }, diff --git a/src/main/resources/blueprints/classic-lshape.blu b/src/main/resources/blueprints/l-shaped.blu similarity index 100% rename from src/main/resources/blueprints/classic-lshape.blu rename to src/main/resources/blueprints/l-shaped.blu From d2728734104436a2e4e000276ab953f6b2a2c98c Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 6 Apr 2024 09:32:06 -0700 Subject: [PATCH 3/6] Enable team members to have islands - requires Bentobox 2.3.0 --- pom.xml | 4 ++-- .../world/bentobox/bskyblock/Settings.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 10298eb..75ffccb 100644 --- a/pom.xml +++ b/pom.xml @@ -59,13 +59,13 @@ 2.0.9 1.20.4-R0.1-SNAPSHOT - 2.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ${build.version}-SNAPSHOT -LOCAL - 1.17.1 + 1.18.0 BentoBoxWorld_BSkyBlock bentobox-world diff --git a/src/main/java/world/bentobox/bskyblock/Settings.java b/src/main/java/world/bentobox/bskyblock/Settings.java index 324297a..5727956 100644 --- a/src/main/java/world/bentobox/bskyblock/Settings.java +++ b/src/main/java/world/bentobox/bskyblock/Settings.java @@ -116,6 +116,10 @@ public class Settings implements WorldSettings { @ConfigEntry(path = "world.island-height") private int islandHeight = 120; + @ConfigComment("Disallow team members from having their own islands.") + @ConfigEntry(path = "world.disallow-team-member-islands") + private boolean disallowTeamMemberIslands = false; + @ConfigComment("Use your own world generator for this world.") @ConfigComment("In this case, the plugin will not generate anything.") @ConfigComment("If used, you must specify the world name and generator in the bukkit.yml file.") @@ -1816,4 +1820,18 @@ public void setMakeNetherPortals(boolean makeNetherPortals) { public void setMakeEndPortals(boolean makeEndPortals) { this.makeEndPortals = makeEndPortals; } + + /** + * @return the disallowTeamMemberIslands + */ + public boolean isDisallowTeamMemberIslands() { + return disallowTeamMemberIslands; + } + + /** + * @param disallowTeamMemberIslands the disallowTeamMemberIslands to set + */ + public void setDisallowTeamMemberIslands(boolean disallowTeamMemberIslands) { + this.disallowTeamMemberIslands = disallowTeamMemberIslands; + } } From d24d965152f444762b43379fd4cdcc724e5265fc Mon Sep 17 00:00:00 2001 From: "gitlocalize-app[bot]" <55277160+gitlocalize-app[bot]@users.noreply.github.com> Date: Sat, 8 Jun 2024 10:22:10 -0700 Subject: [PATCH 4/6] Translate fr.yml via GitLocalize (#519) Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> From 663e8086391aec0d3f8455c88be999dd6ae35667 Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 2 Jul 2024 09:29:53 -0700 Subject: [PATCH 5/6] Return the Pladdon that was generated --- .../world/bentobox/bskyblock/BSkyBlockPladdon.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java index 9e04af3..f5280e5 100644 --- a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java +++ b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java @@ -2,13 +2,19 @@ import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.addons.Pladdon; public class BSkyBlockPladdon extends Pladdon { - + + private GameModeAddon addon; + @Override public Addon getAddon() { - return new BSkyBlock(); + if (addon == null) { + addon = new BSkyBlock(); + } + return addon; } } From d92efb03832cd2f434fd09d32efde59047dc5a1c Mon Sep 17 00:00:00 2001 From: "gitlocalize-app[bot]" <55277160+gitlocalize-app[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:21:33 -0700 Subject: [PATCH 6/6] Translate fr.yml via GitLocalize (#520) Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com>