Merge branch 'master' of https://github.com/MasivoSMP/BreweryX

Author: Chesvin1

build.gradle.kts

@@ -38,7 +38,7 @@ plugins {
 }
 
 group = "com.dre.brewery"
-version = "3.6.4"
+version = "3.6.5"
 val langVersion: Int = 21
 val encoding: String = "UTF-8"
 

src/main/java/com/dre/brewery/Barrel.java

@@ -597,6 +597,12 @@ public static class BarrelCheck extends UniversalRunnable {
         public void run() {
             barrels.keySet()
                 .forEach(worldUuid -> {
+                    // Folia doesn't fire 'WorldUnloadEvent' but Canvas does.
+                    if (MinecraftVersion.isFolia() && !MinecraftVersion.isCanvas() && Bukkit.getWorld(worldUuid) == null) {
+                        barrels.remove(worldUuid); // remove this world and assume that it was unloaded on Folia servers
+                        return;
+                    }
+
                     int counter = checkCounters.computeIfAbsent(worldUuid, ignored -> -1);
 
                     List<Barrel> worldBarrels = barrels.get(worldUuid);

src/main/java/com/dre/brewery/BreweryPlugin.java

@@ -281,8 +281,6 @@ public void onDisable() {
         // save Data to Disk
         if (dataManager != null) dataManager.exit(true, false);
 
-        BSealer.unregisterRecipe();
-
         PlaceholderAPIHook placeholderAPIHook = PlaceholderAPIHook.PLACEHOLDERAPI;
         if (placeholderAPIHook.isEnabled()) {
             placeholderAPIHook.getInstance().unregister();

src/main/java/com/dre/brewery/integration/Hook.java

@@ -29,6 +29,7 @@
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
 
 @Getter
 @Setter
@@ -55,7 +56,8 @@ public class Hook {
     private final String name;
     @ApiStatus.Internal
     private boolean enabled;
-    private boolean checked;
+    @ApiStatus.Internal
+    protected boolean checked;
 
     public Hook(String name) {
         this.name = name;
@@ -78,7 +80,7 @@ public boolean isEnabled() {
     }
 
     @Contract
-    public Plugin getPlugin() {
+    public @Nullable Plugin getPlugin() {
         if (isEnabled()) {
             Plugin plugin = Bukkit.getPluginManager().getPlugin(name);
             if (plugin == null) {

src/main/java/com/dre/brewery/recipe/BRecipe.java

@@ -29,7 +29,6 @@
 import com.dre.brewery.configuration.files.CustomItemsFile;
 import com.dre.brewery.configuration.files.Lang;
 import com.dre.brewery.configuration.sector.capsule.ConfigRecipe;
-import com.dre.brewery.integration.Hook;
 import com.dre.brewery.integration.PlaceholderAPIHook;
 import com.dre.brewery.utility.BUtil;
 import com.dre.brewery.utility.Logging;
@@ -254,13 +253,9 @@ public static IngredientResult loadIngredientVerbose(String item) {
 
 
         // Check if this is a Plugin Item
-        String[] pluginItem = matParts[0].split(":");
+        String[] pluginItem = matParts[0].split(":", 2);
         if (pluginItem.length > 1) {
-            StringBuilder itemId = new StringBuilder();
-            for (int i = 1; i < pluginItem.length; i++) { // Append all but the first part to include namespaces.
-                itemId.append(pluginItem[i]);
-            }
-            RecipeItem custom = PluginItem.fromConfig(pluginItem[0], itemId.toString());
+            RecipeItem custom = PluginItem.fromConfig(pluginItem[0], pluginItem[1]);
             if (custom != null) {
                 custom.setAmount(amount);
                 custom.makeImmutable();
@@ -312,8 +307,11 @@ public static IngredientResult loadIngredientVerbose(String item) {
     }
 
     public sealed interface IngredientResult {
-        record Success(RecipeItem ingredient) implements IngredientResult {}
-        record Error(IngredientError error, String invalidPart) implements IngredientResult {}
+        record Success(RecipeItem ingredient) implements IngredientResult {
+        }
+
+        record Error(IngredientError error, String invalidPart) implements IngredientResult {
+        }
     }
 
     @AllArgsConstructor
@@ -420,6 +418,7 @@ public int allowedTimeDiff(int time) {
 
     /**
      * Gets the <strong>primary</strong> barrel type out of all supported.
+     *
      * @return the barrel type
      * @see #getBarrelTypes() for the full list
      */
@@ -486,6 +485,7 @@ public boolean isMissingIngredients(List<Ingredient> list) {
         }
         return false;
     }
+
     public List<RecipeItem> getMissingIngredients(List<Ingredient> list) {
         List<RecipeItem> missing = new ArrayList<>();
         for (RecipeItem rItem : ingredients) {

src/main/java/com/dre/brewery/storage/serialization/BukkitSerialization.java

@@ -136,7 +136,7 @@ public static Inventory fromBase64(String data) throws IOException {
             return null;
         }
         try {
-            ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64.getDecoder().decode(data));
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64.getMimeDecoder().decode(data));
             BukkitObjectInputStream dataInput = new BukkitObjectInputStream(inputStream);
             Inventory inventory = Bukkit.getServer().createInventory(null, dataInput.readInt());
 
@@ -169,7 +169,7 @@ public static ItemStack[] itemStackArrayFromBase64(String data) {
         }
 
         try {
-            ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64.getDecoder().decode(data));
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64.getMimeDecoder().decode(data));
             BukkitObjectInputStream dataInput = new BukkitObjectInputStream(inputStream);
             ItemStack[] items = new ItemStack[dataInput.readInt()];
 

src/main/java/com/dre/brewery/storage/serialization/SQLDataSerializer.java

@@ -39,7 +39,7 @@ public String serialize(Object object) {
     }
 
     public <T> T deserialize(String data, Class<T> type) {
-        return gson.fromJson(new String(Base64.getDecoder().decode(data)), type);
+        return gson.fromJson(new String(Base64.getMimeDecoder().decode(data)), type);
     }
 
     public <T> T deserialize(String data, Class<T> type, T defaultValue) {

src/main/java/com/dre/brewery/utility/MinecraftVersion.java

@@ -25,6 +25,10 @@
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Enum for major Minecraft versions where Brewery needs
  * to handle things differently.
@@ -55,8 +59,10 @@ public enum MinecraftVersion {
     V1_21_11("1.21.11"),
     UNKNOWN("Unknown");
 
+    private static final Pattern VERSION_PATTERN = Pattern.compile("^([0-9]+)\\.([0-9]+)(?:\\.([0-9]+))?");
 
-    private @Getter static final boolean isFolia = MinecraftVersion.checkFolia();
+    private @Getter static final boolean isFolia = ClassUtil.exists("io.papermc.paper.threadedregions.RegionizedServer");
+    private @Getter static final boolean isCanvas = ClassUtil.exists("io.canvasmc.canvas.Config"); // Popular Folia fork
     private @Getter static final boolean useNBT = NBTUtil.initNbt();
 
     private final String[] versions;
@@ -91,12 +97,14 @@ public static MinecraftVersion get(String major, String minor, @Nullable String
     public static MinecraftVersion getIt() {
         String rawVersion = Bukkit.getVersion();
         String rawVersionParsed = rawVersion.substring(rawVersion.indexOf("(MC: ") + 5, rawVersion.indexOf(")"));
-        String[] versionSplit = rawVersionParsed.split("\\.");
-
-        Preconditions.checkState(versionSplit.length == 3 || versionSplit.length == 2, "Unexpected Minecraft version format: " + rawVersionParsed);
 
+        Matcher matcher = VERSION_PATTERN.matcher(rawVersionParsed);
+        if (!matcher.find()) {
+            throw new IllegalStateException("Could not parse Minecraft version from: " + rawVersion);
+        }
+        Preconditions.checkState(matcher.groupCount() == 3 || matcher.groupCount() == 2, "Unexpected Minecraft version format: " + rawVersionParsed);
 
-        return get(versionSplit[0], versionSplit[1], versionSplit[2]);
+        return get(matcher.group(1), matcher.group(2), matcher.group(3));
     }
 
     public boolean isOrLater(MinecraftVersion version) {
@@ -110,13 +118,4 @@ public boolean isOrEarlier(MinecraftVersion version) {
     public String getVersion() {
         return versions[0];
     }
-
-    private static boolean checkFolia() {
-        try {
-            Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
-            return true;
-        } catch (ClassNotFoundException ignored) {
-            return false;
-        }
-    }
 }