Merge branch 'develop' into team_gui

pom.xml

@@ -73,7 +73,7 @@
         <postgresql.version>42.2.18</postgresql.version>
         <hikaricp.version>5.0.1</hikaricp.version>
         <!-- More visible way to change dependency versions -->
-        <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.3-R0.1-SNAPSHOT</spigot.version>
         <!-- Might differ from the last Spigot release for short periods 
             of time -->
         <paper.version>1.20.2-R0.1-SNAPSHOT</paper.version>

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -463,6 +463,10 @@ public boolean loadSettings() {
             getPluginLoader().disablePlugin(this);
             return false;
         }
+
+        log("Saving default panels...");
+        this.saveResource("panels/island_creation_panel.yml", false);
+        this.saveResource("panels/language_panel.yml", false);
         return true;
     }
 

src/main/java/world/bentobox/bentobox/api/addons/Addon.java

@@ -12,6 +12,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
@@ -263,7 +264,7 @@ public File saveResource(String jarResource, File destinationFolder, boolean rep
             throw new IllegalArgumentException("ResourcePath cannot be null or empty");
         }
 
-        jarResource = jarResource.replace("\\", File.separator).replace("/", File.separator);
+        jarResource = jarResource.replace('\\', '/');
         try (JarFile jar = new JarFile(file)) {
             JarEntry jarConfig = jar.getJarEntry(jarResource);
             if (jarConfig != null) {
@@ -273,7 +274,9 @@ public File saveResource(String jarResource, File destinationFolder, boolean rep
                                 "The embedded resource '" + jarResource + "' cannot be found in " + jar.getName());
                     }
                     // There are two options, use the path of the resource or not
-                    File outFile = new File(destinationFolder, jarResource);
+                    File outFile = new File(destinationFolder,
+                        jarResource.replaceAll("/", Matcher.quoteReplacement(File.separator)));
+
                     if (noPath) {
                         outFile = new File(destinationFolder, outFile.getName());
                     }
@@ -308,7 +311,7 @@ public YamlConfiguration getYamlFromJar(String jarResource) throws IOException,
             throw new IllegalArgumentException("jarResource cannot be null or empty");
         }
         YamlConfiguration result = new YamlConfiguration();
-        jarResource = jarResource.replace("\\", File.separator).replace("/", File.separator);
+        jarResource = jarResource.replace('\\', '/');
         try (JarFile jar = new JarFile(file)) {
             JarEntry jarConfig = jar.getJarEntry(jarResource);
             if (jarConfig != null) {
@@ -330,7 +333,7 @@ public InputStream getResource(String jarResource) {
             throw new IllegalArgumentException("ResourcePath cannot be null or empty");
         }
 
-        jarResource = jarResource.replace("\\", File.separator).replace("/", File.separator);
+        jarResource = jarResource.replace('\\', '/');
         try (JarFile jar = new JarFile(file)) {
             JarEntry jarConfig = jar.getJarEntry(jarResource);
             if (jarConfig != null) {

src/main/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommand.java

@@ -12,7 +12,7 @@
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.BlueprintsManager;
 import world.bentobox.bentobox.managers.island.NewIsland;
-import world.bentobox.bentobox.panels.IslandCreationPanel;
+import world.bentobox.bentobox.panels.customizable.IslandCreationPanel;
 import world.bentobox.bentobox.util.Util;
 
 /**

src/main/java/world/bentobox/bentobox/api/commands/island/IslandLanguageCommand.java

@@ -7,7 +7,7 @@
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.panels.LanguagePanel;
+import world.bentobox.bentobox.panels.customizable.LanguagePanel;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -46,7 +46,7 @@ public boolean execute(User user, String label, List<String> args) {
                 return false;
             }
         } else {
-            LanguagePanel.openPanel(user);
+            LanguagePanel.openPanel(this, user);
         }
         return true;
     }

src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java

@@ -16,7 +16,7 @@
 import world.bentobox.bentobox.managers.BlueprintsManager;
 import world.bentobox.bentobox.managers.island.NewIsland;
 import world.bentobox.bentobox.managers.island.NewIsland.Builder;
-import world.bentobox.bentobox.panels.IslandCreationPanel;
+import world.bentobox.bentobox.panels.customizable.IslandCreationPanel;
 import world.bentobox.bentobox.util.Util;
 
 /**

src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java

@@ -3,6 +3,7 @@
 import java.util.Map;
 
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
@@ -23,6 +24,7 @@
 import world.bentobox.bentobox.database.json.adapters.FlagTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.ItemStackTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.LocationTypeAdapter;
+import world.bentobox.bentobox.database.json.adapters.MaterialTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.PotionEffectTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.VectorTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.WorldTypeAdapter;
@@ -55,6 +57,8 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
         if (Location.class.isAssignableFrom(rawType)) {
             // Use our current location adapter for backward compatibility
             return (TypeAdapter<T>) new LocationTypeAdapter();
+        } else if (Material.class.isAssignableFrom(rawType)) {
+            return (TypeAdapter<T>) new MaterialTypeAdapter();
         } else if (Biome.class.isAssignableFrom(rawType)) {
             return (TypeAdapter<T>) new BiomeTypeAdapter();
         } else if (Enum.class.isAssignableFrom(rawType)) {

src/main/java/world/bentobox/bentobox/database/json/adapters/MaterialTypeAdapter.java

@@ -0,0 +1,56 @@
+package world.bentobox.bentobox.database.json.adapters;
+
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.Material;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+
+/**
+ * Minecraft 1.20 changed GRASS to SHORT_GRASS. This class provides and backwards compatibility when loading
+ * databased files stored with previous versions. It can be extended in the future if further enum changes are made.
+ * @author tastybento
+ * @since 2.0.0
+ */
+public final class MaterialTypeAdapter extends TypeAdapter<Material>
+{
+    /**
+     * Map that contains string value to the actual Material enum object.
+     */
+    final Map<String, Material> materialMap;
+
+    public MaterialTypeAdapter() {
+        this.materialMap = new HashMap<>();
+
+        // Put in current values.
+        Arrays.stream(Material.values()).forEach(mat -> this.materialMap.put(mat.name(), mat));
+
+        // Put in renamed material values.
+        this.materialMap.put("GRASS", Material.SHORT_GRASS);
+    }
+
+    @Override
+    public Material read(JsonReader input) throws IOException
+    {
+        if (JsonToken.NULL.equals(input.peek())) {
+            input.nextNull();
+            return null;
+        }
+
+        return this.materialMap.get(input.nextString().toUpperCase());
+    }
+
+    @Override
+    public void write(JsonWriter output, Material enumValue) throws IOException {
+        output.value(enumValue != null ? enumValue.name() : null);
+    }
+}
+