Merge pull request #81

Fixed & Improved Recipe Book

Author: WolfyScript

src/main/java/me/wolfyscript/customcrafting/commands/cc_subcommands/ReloadSubCommand.java

@@ -68,9 +68,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull String var3, @N
             api.getChat().sendMessage(p, ChatColor.YELLOW + "Reloading Config...");
             configHandler.load();
             api.getChat().sendMessage(p, ChatColor.YELLOW + "Loading Recipe & Items...");
-            dataHandler.initCategories();
             dataHandler.load();
-            dataHandler.getCategories().index(customCrafting);
+            configHandler.getRecipeBookConfig().index(customCrafting);
             api.getChat().sendMessage(p, "&eReloading GUIs");
             ((MenuRecipeBook) invAPI.getGuiWindow(ClusterRecipeBook.RECIPE_BOOK)).reset();
             invAPI.reset();

src/main/java/me/wolfyscript/customcrafting/configs/recipebook/Categories.java

@@ -43,7 +43,7 @@ public class Category extends CategorySettings {
     public Category() {
         super();
         this.containers = new ArrayList<>();
-        this.auto = recipes.isEmpty() && namespaces.isEmpty();
+        this.auto = recipes.isEmpty() && folders.isEmpty();
     }
 
     public Category(Category category) {
@@ -55,16 +55,16 @@ public Category(Category category) {
     void index(CustomCrafting customCrafting, Collection<CategoryFilter> filters) {
         var registry = customCrafting.getRegistries().getRecipes();
         if (auto) {
-            this.namespaces.clear();
+            this.folders.clear();
             this.groups.clear();
-            this.namespaces.addAll(registry.namespaces());
+            this.folders.addAll(registry.folders("customcrafting"));
             this.groups.addAll(registry.groups());
         }
         containers.clear();
         //Construct containers based on settings
         List<RecipeContainer> recipeContainers = new ArrayList<>();
         recipeContainers.addAll(this.groups.stream().map(s -> new RecipeContainer(customCrafting, s)).toList());
-        recipeContainers.addAll(this.namespaces.stream().flatMap(s -> registry.get(s).stream().filter(recipe -> recipe.getGroup().isEmpty() || !groups.contains(recipe.getGroup())).map(customRecipe -> new RecipeContainer(customCrafting, customRecipe))).toList());
+        recipeContainers.addAll(this.folders.stream().flatMap(s -> registry.get("customcrafting", s).stream().filter(recipe -> recipe.getGroup().isEmpty() || !groups.contains(recipe.getGroup())).map(customRecipe -> new RecipeContainer(customCrafting, customRecipe))).toList());
         recipeContainers.addAll(this.recipes.stream().map(namespacedKey -> {
             CustomRecipe<?> recipe = registry.get(namespacedKey);
             return recipe == null ? null : new RecipeContainer(customCrafting, recipe);

src/main/java/me/wolfyscript/customcrafting/configs/recipebook/Category.java

@@ -80,7 +80,7 @@ public boolean filter(RecipeContainer container) {
         if (!groups.isEmpty() && container.getGroup() != null && !groups.contains(container.getGroup())) {
             return false;
         }
-        if (container.getRecipe() != null && ((!recipes.isEmpty() && !recipes.contains(container.getRecipe())) || (!namespaces.isEmpty() && !namespaces.contains(container.getRecipe().getNamespace())))) {
+        if (container.getRecipe() != null && ((!recipes.isEmpty() && !recipes.contains(container.getRecipe())) || (!folders.isEmpty() && !folders.contains(container.getRecipe().getNamespace())))) {
             return false;
         }
         return container.isValid(totalMaterials);

src/main/java/me/wolfyscript/customcrafting/configs/recipebook/CategoryFilter.java

@@ -22,13 +22,13 @@
 
 package me.wolfyscript.customcrafting.configs.recipebook;
 
+import me.wolfyscript.lib.com.fasterxml.jackson.annotation.JsonAlias;
 import me.wolfyscript.lib.com.fasterxml.jackson.annotation.JsonGetter;
 import me.wolfyscript.lib.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import me.wolfyscript.lib.com.fasterxml.jackson.annotation.JsonInclude;
 import me.wolfyscript.lib.com.fasterxml.jackson.annotation.JsonSetter;
 import me.wolfyscript.customcrafting.CustomCrafting;
 import me.wolfyscript.customcrafting.recipes.CustomRecipe;
-import me.wolfyscript.utilities.api.WolfyUtilities;
 import me.wolfyscript.utilities.api.nms.network.MCByteBuf;
 import me.wolfyscript.utilities.util.NamespacedKey;
 import org.bukkit.Material;
@@ -37,35 +37,36 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CategorySettings {
+public abstract class CategorySettings {
 
     protected Set<String> groups;
-    protected Set<String> namespaces;
+    protected Set<String> folders;
     protected Set<NamespacedKey> recipes;
     private String id = "";
     private Material icon;
     private String name;
     private List<String> description;
 
-    public CategorySettings() {
+    protected CategorySettings() {
         this.name = "";
         this.icon = Material.CHEST;
         this.groups = new HashSet<>();
-        this.namespaces = new HashSet<>();
+        this.folders = new HashSet<>();
         this.description = new ArrayList<>();
         this.recipes = new HashSet<>();
     }
 
-    public CategorySettings(CategorySettings category) {
+    protected CategorySettings(CategorySettings category) {
         this.id = category.id;
         this.name = category.name;
         this.icon = category.getIcon();
         this.groups = new HashSet<>(category.groups);
-        this.namespaces = new HashSet<>(category.namespaces);
+        this.folders = new HashSet<>(category.folders);
         this.description = new ArrayList<>(category.getDescription());
         this.recipes = new HashSet<>(category.getRecipes());
     }
@@ -118,12 +119,16 @@ public void setGroups(Set<String> groups) {
         this.groups = groups;
     }
 
-    public Set<String> getNamespaces() {
-        return namespaces;
+    @JsonAlias("namespaces")
+    @JsonGetter
+    public Set<String> getFolders() {
+        return folders;
     }
 
-    public void setNamespaces(Set<String> namespaces) {
-        this.namespaces = namespaces;
+    @JsonAlias("namespaces")
+    @JsonSetter
+    public void setFolders(Set<String> folders) {
+        this.folders = folders;
     }
 
     @JsonGetter
@@ -156,19 +161,32 @@ public String toString() {
         return "CategorySettings{" +
                 "id='" + id + '\'' +
                 ", groups=" + groups +
-                ", namespaces=" + namespaces +
+                ", namespaces=" + folders +
                 ", recipes=" + recipes +
                 '}';
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CategorySettings that = (CategorySettings) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+
     public void writeToByteBuf(MCByteBuf byteBuf) {
         byteBuf.writeItemStack(new ItemStack(this.icon));
         byteBuf.writeUtf(this.name);
     }
 
     protected void writeData(MCByteBuf byteBuf) {
         writeStringArray(new ArrayList<>(this.groups), byteBuf);
-        writeStringArray(new ArrayList<>(this.namespaces), byteBuf);
+        writeStringArray(new ArrayList<>(this.folders), byteBuf);
         writeStringArray(this.recipes.stream().map(NamespacedKey::toString).toList(), byteBuf);
     }