Merge pull request #60 from BentoBoxWorld/develop

Version 1.19.0
BentoBoxWorld · Apr 16, 2023 · d1fbf6f · d1fbf6f
2 parents 92859e0 + ace6205
commit d1fbf6f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /target/
 /.classpath
 /.project
+/.DS_Store
+/bin/
diff --git a/pom.xml b/pom.xml
@@ -58,14 +58,14 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.19.1-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.21.0</bentobox.version>
+        <spigot.version>1.19.4-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>1.23.0</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.18.0</build.version>
+        <build.version>1.19.0</build.version>
         <!-- SonarCloud -->
         <sonar.projectKey>BentoBoxWorld_SkyGrid</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
@@ -316,4 +316,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/src/main/java/world/bentobox/skygrid/Settings.java b/src/main/java/world/bentobox/skygrid/Settings.java
@@ -1,6 +1,14 @@
 package world.bentobox.skygrid;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -14,8 +22,6 @@
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.database.objects.adapters.Adapter;
 import world.bentobox.bentobox.database.objects.adapters.FlagBooleanSerializer;
-import world.bentobox.bentobox.database.objects.adapters.FlagSerializer;
-import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
 
 /**
  * All the settings are here
@@ -105,7 +111,7 @@ public class Settings implements WorldSettings {
     @ConfigComment("This option indicates if obsidian platform in the end should be generated")
     @ConfigComment("when player enters the end world.")
     @ConfigEntry(path = "world.end.create-obsidian-platform", since = "1.16")
-    private boolean makeEndPortals = false;
+    private boolean makeEndPortals = true;
 
     /* SkyGrid */
     @ConfigComment("The probability of a frame being created in a chunk. Frames are always at y=0.")
@@ -722,6 +728,7 @@ public void setWorldFlags(Map<String, Boolean> worldFlags) {
      * @return the defaultIslandFlags
      * @deprecated since 1.21
      */
+    @Deprecated
     @Override
     public Map<Flag, Integer> getDefaultIslandFlags() {
         return Collections.emptyMap();
@@ -749,6 +756,7 @@ public void setDefaultIslandFlagNames(Map<String, Integer> defaultIslandFlags) {
      * @return the defaultIslandSettings
      * @deprecated since 1.21
      */
+    @Deprecated
     @Override
     public Map<Flag, Integer> getDefaultIslandSettings() {
         return Collections.emptyMap();

diff --git a/src/main/java/world/bentobox/skygrid/SkyGridPladdon.java b/src/main/java/world/bentobox/skygrid/SkyGridPladdon.java
@@ -1,8 +1,10 @@
 package world.bentobox.skygrid;
 
+
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.addons.Pladdon;
 
+
 public class SkyGridPladdon extends Pladdon {
 
     @Override

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -1029,7 +1029,7 @@ world:
     # This option indicates if obsidian platform in the end should be generated
     # when player enters the end world.
     # Added since 1.16.
-    create-obsidian-platform: false
+    create-obsidian-platform: true
   # The probability of a frame being created in a chunk. Frames are always at y=0.
   end-frame-probability: 0.1
   # Friendly name for this world. Used in admin commands. Must be a single word

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,7 +1,9 @@
-name: Pladdon
-main: world.bentobox.skygrid.SkyGrid
-version: ${version}
-api-version: 1.19
-description: SkyGrid
-author: tastybento
-depend: [BentoBox]
+name: BentoBox-SkyGrid
+main: world.bentobox.skygrid.SkyGridPladdon
+version: ${project.version}${build.number}
+api-version: "1.19"
+
+authors: [tastybento]
+contributors: ["The BentoBoxWorld Community"]
+website: https://bentobox.world
+description: ${project.description}