diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9a6cdc..db8c77b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,10 +14,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 16 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 16 + java-version: 17 - name: Cache SonarCloud packages uses: actions/cache@v1 with: @@ -34,4 +34,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BentoBoxWorld_CaveBlock \ No newline at end of file + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BentoBoxWorld_CaveBlock diff --git a/pom.xml b/pom.xml index 81154b4..c43b69f 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ UTF-8 17 - 1.19.2-R0.1-SNAPSHOT - 1.19.0 + 1.19.4-R0.1-SNAPSHOT + 1.23.0 ${build.version}-SNAPSHOT - 1.17.0 + 1.18.0 -LOCAL bentobox-world https://sonarcloud.io @@ -114,12 +114,6 @@ ${spigot.version} provided - - org.spigotmc - plugin-annotations - 1.2.3-SNAPSHOT - provided - world.bentobox bentobox @@ -189,18 +183,20 @@ maven-jar-plugin 3.1.0 - + org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + 3.3.0 - public false -Xdoclint:none + + ${java.home}/bin/javadoc attach-javadocs + install jar diff --git a/src/main/java/world/bentobox/caveblock/CaveBlock.java b/src/main/java/world/bentobox/caveblock/CaveBlock.java index 712c783..c9584de 100644 --- a/src/main/java/world/bentobox/caveblock/CaveBlock.java +++ b/src/main/java/world/bentobox/caveblock/CaveBlock.java @@ -282,6 +282,16 @@ public class CaveBlock extends GameModeAddon } + /** + * This addon uses the new chunk generation API for the sea bottom + */ + @Override + public boolean isUsesNewChunkGeneration() + { + return true; + } + + // --------------------------------------------------------------------- // Section: Variables // --------------------------------------------------------------------- diff --git a/src/main/java/world/bentobox/caveblock/CaveBlockPladdon.java b/src/main/java/world/bentobox/caveblock/CaveBlockPladdon.java index a340bf3..da0d0d7 100644 --- a/src/main/java/world/bentobox/caveblock/CaveBlockPladdon.java +++ b/src/main/java/world/bentobox/caveblock/CaveBlockPladdon.java @@ -1,16 +1,10 @@ package world.bentobox.caveblock; -import org.bukkit.plugin.java.annotation.dependency.Dependency; -import org.bukkit.plugin.java.annotation.plugin.ApiVersion; -import org.bukkit.plugin.java.annotation.plugin.Plugin; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.addons.Pladdon; -@Plugin(name = "Pladdon", version = "1.0") -@ApiVersion(ApiVersion.Target.v1_18) -@Dependency(value = "BentoBox") public class CaveBlockPladdon extends Pladdon { @Override diff --git a/src/main/java/world/bentobox/caveblock/Settings.java b/src/main/java/world/bentobox/caveblock/Settings.java index 64478e9..4d32700 100644 --- a/src/main/java/world/bentobox/caveblock/Settings.java +++ b/src/main/java/world/bentobox/caveblock/Settings.java @@ -1,12 +1,7 @@ package world.bentobox.caveblock; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import org.bukkit.Difficulty; import org.bukkit.GameMode; @@ -333,7 +328,7 @@ public class Settings implements WorldSettings * @return the defaultIslandFlags object. */ @Override - public Map getDefaultIslandFlags() + public Map getDefaultIslandFlagNames() { return defaultIslandFlags; } @@ -344,7 +339,7 @@ public class Settings implements WorldSettings * @return the defaultIslandSettings object. */ @Override - public Map getDefaultIslandSettings() + public Map getDefaultIslandSettingNames() { return defaultIslandSettings; } @@ -1179,7 +1174,7 @@ public class Settings implements WorldSettings * @param defaultIslandFlags the defaultIslandFlags object new value. * */ - public void setDefaultIslandFlags(Map defaultIslandFlags) + public void setDefaultIslandFlags(Map defaultIslandFlags) { this.defaultIslandFlags = defaultIslandFlags; } @@ -1190,7 +1185,7 @@ public class Settings implements WorldSettings * @param defaultIslandSettings the defaultIslandSettings object new value. * */ - public void setDefaultIslandSettings(Map defaultIslandSettings) + public void setDefaultIslandSettings(Map defaultIslandSettings) { this.defaultIslandSettings = defaultIslandSettings; } @@ -2143,6 +2138,20 @@ public class Settings implements WorldSettings } + @Override + public Map getDefaultIslandFlags() + { + return Collections.emptyMap(); + } + + + @Override + public Map getDefaultIslandSettings() + { + return Collections.emptyMap(); + } + + // --------------------------------------------------------------------- // Section: Variables // --------------------------------------------------------------------- @@ -2439,13 +2448,11 @@ public class Settings implements WorldSettings @ConfigComment(" SUB-OWNER = 900") @ConfigComment(" OWNER = 1000") @ConfigEntry(path = "world.default-cave-flags") - @Adapter(FlagSerializer.class) - private Map defaultIslandFlags = new HashMap<>(); + private Map defaultIslandFlags = new HashMap<>(); @ConfigComment("These are the default settings for new caves") @ConfigEntry(path = "world.default-cave-settings") - @Adapter(FlagSerializer2.class) - private Map defaultIslandSettings = new HashMap<>(); + private Map defaultIslandSettings = new HashMap<>(); @ConfigComment("These settings/flags are hidden from users") @ConfigComment("Ops can toggle hiding in-game using SHIFT-LEFT-CLICK on flags in settings") diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index 13f8edf..d1a8bfe 100644 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -1,7 +1,7 @@ name: CaveBlock main: world.bentobox.caveblock.CaveBlock version: ${version}${build.number} -api-version: 1.19.0 +api-version: 1.23.0 metrics: true repository: "BentoBoxWorld/CaveBlock" icon: "STONE_PICKAXE" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..b998ac6 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,9 @@ +name: BentoBox-CaveBlock +main: world.bentobox.caveblock.CaveBlockPladdon +version: ${project.version}${build.number} +api-version: "1.19" + +authors: [tastybento, BONNe] +contributors: ["The BentoBoxWorld Community"] +website: https://bentobox.world +description: ${project.description}