Add missing storage drawers recipes (#144)

kubejs/client_scripts/jei/hidden_items.js

@@ -3,6 +3,11 @@ JEIEvents.hideItems(event => {
   // Hide AE2 facades
   event.hide('ae2:facade')
 
+  // Hide the useless storage drawers stuff
+  event.hide('storagedrawers:personal_key_cofh')
+  event.hide('storagedrawers:portability_upgrade')
+  event.hide('storagedrawers:conversion_upgrade')
+
   // Hide all irrelevant stonetype ores
   event.hide('#forge:ores_in_ground/sand')
   event.hide('#forge:ores_in_ground/red_sand')
@@ -44,4 +49,4 @@ JEIEvents.hideItems(event => {
   event.hide('expatternprovider:circuit_cutter')
 
 
-})
+})

kubejs/client_scripts/tooltips.js

@@ -7,9 +7,11 @@ ItemEvents.tooltip((event) => {
       "storagedrawers:redstone_upgrade",
       "storagedrawers:min_redstone_upgrade",
       "storagedrawers:max_redstone_upgrade",
+      "storagedrawers:compacting_drawers_2",
       "storagedrawers:compacting_drawers_3",
+      "storagedrawers:compacting_half_drawers_2",
+      "storagedrawers:compacting_half_drawers_3",
       "storagedrawers:fill_level_upgrade",
-      "storagedrawers:illumination_upgrade",
 
       "expatternprovider:caner",
       "ae2:inscriber",
@@ -33,7 +35,9 @@ ItemEvents.tooltip((event) => {
 
   event.add("expatternprovider:fishbig", Text.gray("Congratulations! You won Minecraft."));
 
-  event.add(["enderstorage:ender_chest", "enderstorage:ender_tank", "enderstorage:ender_pouch"], 
+  event.add(["enderstorage:ender_chest", "enderstorage:ender_tank", "enderstorage:ender_pouch"],
     Text.red("WARNING: These are deprcated and will be removed in a future update.\nPlease convert them into the GT covers in a crafting table.")
   );
+
+  event.add("storagedrawers:personal_key_ftb", Text.gray("Craft me with a regular personal key in a crafting grid."));
 });

kubejs/server_scripts/storage_drawers/drawers.js

@@ -1,7 +1,5 @@
 ServerEvents.recipes((event) => {
   const greg = event.recipes.gtceu;
-  event.remove({ mod: "storagedrawers" });
-  event.remove({ mod: "gtstoragedrawers" });
   const woodTypes = [
     "oak",
     "spruce",

kubejs/server_scripts/storage_drawers/upgrades.js

@@ -1,4 +1,20 @@
 ServerEvents.recipes((event) => {
+  event.remove({
+    not: [
+      { id: "storagedrawers:personal_key" },
+      { id: "storagedrawers:personal_key_cycle" },
+      { id: "storagedrawers:priority_key" },
+      { id: "storagedrawers:quantify_key" },
+      { id: "storagedrawers:suspend_key" },
+      { id: "storagedrawers:shroud_key" },
+      { id: "storagedrawers:keybutton_conscealment" },
+      { id: "storagedrawers:keybutton_drawer" },
+      { id: "storagedrawers:keybutton_quantify" }
+    ], 
+    mod: "storagedrawers" 
+  });
+
+  event.remove({ mod: "gtstoragedrawers" });
   // Upgrade Template
   event.shaped("storagedrawers:upgrade_template", ["SPS", "SWS", " d "], {
     S: "#forge:screws/iron",
@@ -17,58 +33,32 @@ ServerEvents.recipes((event) => {
     .duration(60)
     .EUt(24);
 
-  // Upgrade 1
+  // Storage Upgrade lvl 1
   event.shaped("storagedrawers:obsidian_storage_upgrade", ["PTP"], {
     P: "#forge:plates/obsidian",
     T: "storagedrawers:upgrade_template",
   });
 
-  // Upgrade 2
-  event.shaped("storagedrawers:iron_storage_upgrade", ["S S", "PTP", "S S"], {
-    S: "#forge:rods/iron",
-    P: "#forge:plates/iron",
-    T: "storagedrawers:upgrade_template",
+  // Storage Upgrades lvl 2+
+  // rod material, plate material, upgrade name
+  const upgrades = [
+    {rod_mat: "bronze", plate_mat: "copper", upgrade: "copper"},
+    {rod_mat: "steel", plate_mat: "wrought_iron", upgrade: "iron"},
+    {rod_mat: "gold", plate_mat: "rose_gold", upgrade: "gold"},
+    {rod_mat: "aluminium", plate_mat: "emerald", upgrade: "emerald"},
+    {rod_mat: "aluminium", plate_mat: "olivine", upgrade: "emerald"},
+    {rod_mat: "stainless_steel", plate_mat: "diamond", upgrade: "diamond"},
+    {rod_mat: "titanium", plate_mat: "black_steel", upgrade: "netherite"},
+  ];
+
+  upgrades.forEach((e) => {
+    event.shaped(`storagedrawers:${e.upgrade}_storage_upgrade`, ["S S", "PTP", "S S"], {
+      S: `#forge:rods/${e.rod_mat}`,
+      P: `#forge:plates/${e.plate_mat}`,
+      T: "storagedrawers:upgrade_template",
+    });
   });
 
-  // Upgrade 3
-  event.shaped("storagedrawers:gold_storage_upgrade", ["S S", "PTP", "S S"], {
-    S: "#forge:rods/gold",
-    P: "#forge:plates/rose_gold",
-    T: "storagedrawers:upgrade_template",
-  });
-
-  // Upgrade 4
-  event.shaped(
-    "storagedrawers:diamond_storage_upgrade",
-    ["S S", "PTP", "S S"],
-    {
-      S: "#forge:rods/stainless_steel",
-      P: "#forge:plates/diamond",
-      T: "storagedrawers:upgrade_template",
-    }
-  );
-
-  // Upgrade 5
-  event.shaped(
-    "storagedrawers:emerald_storage_upgrade",
-    ["S S", "PTP", "S S"],
-    {
-      S: "#forge:rods/titanium",
-      P: "#forge:plates/emerald",
-      T: "storagedrawers:upgrade_template",
-    }
-  );
-  // Upgrade 5 2
-  event.shaped(
-    "storagedrawers:emerald_storage_upgrade",
-    ["S S", "PTP", "S S"],
-    {
-      S: "#forge:rods/titanium",
-      P: "#forge:plates/olivine",
-      T: "storagedrawers:upgrade_template",
-    }
-  );
-
   // Storage Downgrade
   event.shaped("storagedrawers:one_stack_upgrade", ["PTP"], {
     P: "flint",
@@ -81,6 +71,58 @@ ServerEvents.recipes((event) => {
     T: "storagedrawers:upgrade_template",
   });
 
+  // Illumination Upgrade
+  event.shaped("storagedrawers:illumination_upgrade", ["GTG"], {
+    G: "minecraft:glowstone",
+    T: "storagedrawers:upgrade_template"
+  });
+
+  // Balance Upgrade
+  event.shaped("storagedrawers:balance_fill_upgrade", ["P P", "CTC"], {
+    P: "gtceu:tin_small_item_pipe",
+    C: "gtceu:lv_conveyor_module",
+    T: "storagedrawers:upgrade_template"
+  });
+  
+  // Hopper Upgrade
+  event.shaped("storagedrawers:hopper_upgrade", ["P", "C", "T"], {
+    P: "gtceu:tin_large_item_pipe",
+    C: "gtceu:lv_conveyor_module",
+    T: "storagedrawers:upgrade_template",
+  });
+
+  // Magnet Upgrades
+  for (let i = 1; i <= 3; i++) {
+    let sd_tier = "";
+    if (i > 1) {
+      sd_tier = `_${i}`;
+    }
+    let gt_tier = GTValues.VN[i].toLowerCase();
+    event.shaped(`storagedrawers:magnet_upgrade${sd_tier}`, ["RCR", "RTR"], {
+      R: "#forge:rods/steel",
+      C: `gtceu:${gt_tier}_item_collector`,
+      T: "storagedrawers:upgrade_template",
+    });
+  }
+
+  // Remote Upgrade
+  event.shaped("storagedrawers:remote_upgrade", [" C ", "ETE"], {
+    C: "#gtceu:circuits/lv",
+    E: "gtceu:lv_emitter",
+    T: "storagedrawers:upgrade_template",
+  });
+
+  // Remote Group Upgrade
+  event.shaped("storagedrawers:remote_group_upgrade", [" E", "CT", " E"], {
+    C: "#gtceu:circuits/lv",
+    E: "gtceu:lv_emitter",
+    T: "storagedrawers:upgrade_template",
+  });
+
+  // Conversion recipes
+  event.shapeless("storagedrawers:remote_group_upgrade", ["storagedrawers:remote_upgrade"]);
+  event.shapeless("storagedrawers:remote_upgrade", ["storagedrawers:remote_group_upgrade"]);
+
   // Drawer Key
   event.shaped("storagedrawers:drawer_key", [" BP", "TPP", "Gs "], {
     B: "#forge:bolts/gold",
@@ -89,4 +131,22 @@ ServerEvents.recipes((event) => {
     G: "#forge:plates/gold",
     s: "#forge:tools/saws",
   });
+
+  // Keyring
+  event.shaped("storagedrawers:keyring", ["HR"], {
+    H: "#forge:tools/hammers",
+    R: "#forge:rings/iron"
+  });
+
+  // Drawer Puller
+  event.shaped("storagedrawers:drawer_puller", ["RH"], {
+    H: "#forge:tools/hammers",
+    R: "#forge:rods/long/iron"
+  });
+
+  // Framing Table
+  event.shaped("storagedrawers:framing_table", ["FFF", "FSF"], {
+    F: "#storagedrawers:trim",
+    S: "#forge:tools/saws"
+  });
 });