Fix/add some /trecipe viewing

Author: eccentricdevotion

src/main/java/me/eccentric_nz/TARDIS/commands/TARDISRecipeCommands.java

@@ -16,15 +16,10 @@
  */
 package me.eccentric_nz.TARDIS.commands;
 
-import java.util.*;
 import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.TARDIS.blueprints.TARDISPermission;
 import me.eccentric_nz.TARDIS.customblocks.TARDISDisplayItem;
-import me.eccentric_nz.TARDIS.enumeration.Consoles;
-import me.eccentric_nz.TARDIS.enumeration.RecipeCategory;
-import me.eccentric_nz.TARDIS.enumeration.RecipeItem;
-import me.eccentric_nz.TARDIS.enumeration.Schematic;
-import me.eccentric_nz.TARDIS.enumeration.TardisModule;
+import me.eccentric_nz.TARDIS.enumeration.*;
 import me.eccentric_nz.TARDIS.messaging.TARDISRecipeLister;
 import me.eccentric_nz.TARDIS.recipes.TARDISRecipeCategoryInventory;
 import net.md_5.bungee.api.ChatColor;
@@ -38,12 +33,12 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.*;
+
 /**
- * A Time Control Unit is a golden sphere about the size of a Cricket ball. It
- * is stored in the Secondary Control Room. All TARDISes have one of these
- * devices, which can be used to remotely control a TARDIS by broadcasting
- * Stattenheim signals that travel along the time contours in the Space/Time
- * Vortex.
+ * A Time Control Unit is a golden sphere about the size of a Cricket ball. It is stored in the Secondary Control Room.
+ * All TARDISes have one of these devices, which can be used to remotely control a TARDIS by broadcasting Stattenheim
+ * signals that travel along the time contours in the Space/Time Vortex.
  *
  * @author eccentric_nz
  */
@@ -58,7 +53,22 @@ public TARDISRecipeCommands(TARDIS plugin) {
         recipeItems.put("seed", "");
         recipeItems.put("tardis", "");
         for (RecipeItem recipeItem : RecipeItem.values()) {
-            recipeItems.put(recipeItem.toTabCompletionString(), recipeItem.toRecipeString());
+            if (recipeItem.getCategory() != RecipeCategory.UNCRAFTABLE && recipeItem.getCategory() != RecipeCategory.UNUSED) {
+                recipeItems.put(recipeItem.toTabCompletionString(), recipeItem.toRecipeString());
+            }
+        }
+        // remove recipes form modules that are not enabled
+        if (!plugin.getConfig().getBoolean("modules.vortex_manipulator")) {
+            recipeItems.remove("vortex-manipulator");
+        }
+        if (!plugin.getConfig().getBoolean("modules.sonic_blaster")) {
+            recipeItems.remove("sonic-blaster");
+            recipeItems.remove("blaster-battery");
+            recipeItems.remove("landing-pad");
+        }
+        if (!plugin.getConfig().getBoolean("modules.weeping_angels")) {
+            recipeItems.remove("judoon-ammunition");
+            recipeItems.remove("k9");
         }
         // DELUXE, ELEVENTH, TWELFTH, ARS & REDSTONE schematics designed by Lord_Rahl and killeratnight at mcnovus.net
         t.put("ANCIENT", Material.SCULK); // ancient
@@ -129,7 +139,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
                 player.openInventory(categories);
                 return true;
             }
-            if (!recipeItems.containsKey(args[0].toLowerCase(Locale.ENGLISH))) {
+            String which = args[0].toLowerCase();
+            if (!recipeItems.containsKey(which)) {
                 if (args[0].equalsIgnoreCase("list_more")) {
                     new TARDISRecipeLister(plugin, sender).listMore();
                 } else {
@@ -149,9 +160,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
                 showTARDISRecipe(player, args[1].toUpperCase(Locale.ENGLISH));
                 return true;
             }
-            String which = args[0].toLowerCase();
             switch (which) {
-                case "bowl-of-custard", "jelly-baby", "biome-storage-disk", "player-storage-disk", "preset-storage-disk", "save-storage-disk", "schematic-wand", "admin-upgrade", "bio-scanner-upgrade", "redstone-upgrade", "diamond-upgrade", "emerald-upgrade", "painter-upgrade", "ignite-upgrade", "pickup-arrows-upgrade", "knockback-upgrade" -> {
+                case "bowl-of-custard", "jelly-baby", "biome-storage-disk", "player-storage-disk", "preset-storage-disk", "save-storage-disk", "schematic-wand", "admin-upgrade", "bio-scanner-upgrade", "redstone-upgrade", "diamond-upgrade", "emerald-upgrade", "painter-upgrade", "ignite-upgrade", "pickup-arrows-upgrade", "knockback-upgrade", "brush-upgrade", "judoon-ammunition" -> {
                     showShapelessRecipe(player, recipeItems.get(which));
                     return true;
                 }

src/main/java/me/eccentric_nz/TARDIS/commands/TARDISRecipeTabComplete.java

@@ -17,15 +17,17 @@
 package me.eccentric_nz.TARDIS.commands;
 
 import com.google.common.collect.ImmutableList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import me.eccentric_nz.TARDIS.enumeration.RecipeCategory;
 import me.eccentric_nz.TARDIS.enumeration.RecipeItem;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * TabCompleter for /tardisrecipe command
  */
@@ -42,7 +44,9 @@ public TARDISRecipeTabComplete() {
         ROOT_SUBS.add("seed");
         ROOT_SUBS.add("tardis");
         for (RecipeItem recipeItem : RecipeItem.values()) {
-            ROOT_SUBS.add(recipeItem.toTabCompletionString());
+            if (recipeItem.getCategory() != RecipeCategory.UNCRAFTABLE && recipeItem.getCategory() != RecipeCategory.UNUSED) {
+                ROOT_SUBS.add(recipeItem.toTabCompletionString());
+            }
         }
     }
 

src/main/java/me/eccentric_nz/TARDIS/enumeration/RecipeItem.java

@@ -25,7 +25,6 @@ public enum RecipeItem {
     AUTHORISED_CONTROL_DISK(10000001, RecipeCategory.STORAGE_DISKS),
     BIO_SCANNER_CIRCUIT(10001969, RecipeCategory.SONIC_CIRCUITS),
     BLANK_STORAGE_DISK(10000001, RecipeCategory.STORAGE_DISKS),
-    BLASTER_BATTERY(10000002, RecipeCategory.MISC),
     BRUSH_CIRCUIT(10001987, RecipeCategory.SONIC_CIRCUITS),
     CUSTARD_CREAM(10000002, RecipeCategory.FOOD),
     DIAMOND_DISRUPTOR_CIRCUIT(10001971, RecipeCategory.SONIC_CIRCUITS),
@@ -95,7 +94,13 @@ public enum RecipeItem {
     RED_BOW_TIE(10000037, RecipeCategory.ACCESSORIES),
     BLACK_BOW_TIE(10000038),
     THREE_D_GLASSES(10000039, RecipeCategory.ACCESSORIES),
+    // module recipes
     VORTEX_MANIPULATOR(10000002, RecipeCategory.ACCESSORIES),
+    SONIC_BLASTER(10000002, RecipeCategory.ACCESSORIES),
+    BLASTER_BATTERY(10000002, RecipeCategory.MISC),
+    LANDING_PAD(10000001, RecipeCategory.ACCESSORIES),
+    JUDOON_AMMUNITION(13, RecipeCategory.MISC),
+    K9(1, RecipeCategory.MISC),
     // custom block recipes start here
     GROW(10001, RecipeCategory.CUSTOM_BLOCKS),
     BLUE_BOX(10001, RecipeCategory.CUSTOM_BLOCKS),

todo.md

@@ -2,7 +2,8 @@
 
 ## Current version `5.0.0`
 
-1. ?
+1. Add custom item model for Rust Plague Sword
+2. ?
 
 ## Next version `5.1.0`
 
@@ -35,6 +36,7 @@
    * Slimes -> Adipose
    * Husk -> Sycorax
    * Stray -> Scarecrows
+2. Rust Plague Sword
 
 ## Minecraft Bedrock Edition?