FEAT: exclude some devices from bulk recycling (#622)

game-design-driven · Nov 22, 2024 · 1e84ce7 · 1e84ce7
2 parents 267a244 + 90fc154
commit 1e84ce7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/kubejs/server_scripts/base/features/bulkrecycle-command.js b/kubejs/server_scripts/base/features/bulkrecycle-command.js
@@ -10,7 +10,7 @@ function compactItems(player,keepOne){
   player.inventory.allItems.toArray().forEach(
     /** @param {Internal.ItemStack} i */
     i=>{
-      if(i.hasTag("forge:devices")){
+      if(i.hasTag("forge:devices") && !i.hasTag("ptdye:recycle_excluded") && !i.hasNBT()){
         let [_,type,fraction] = i.getTags()
           .toList()
           .filter((tag) => tag.location().path.startsWith("devices/"))[0]

diff --git a/kubejs/server_scripts/base/features/devices.js b/kubejs/server_scripts/base/features/devices.js
@@ -490,6 +490,7 @@ if (true) {
 
   deviceDefinitions.forEach((device) => {
     if(!device.enable) return;
+
     addToTag("forge:generics/devices", device.generic);
     addToTag(`forge:generics/${device.tag.split(":")[1]}`, device.generic);
     let generic_id = Item.of(device.generic).id; //support both ids and kjs items
@@ -546,6 +547,7 @@ if (true) {
         true
       ); //let players transmute any device but don't show in craftables panel
 
+      if(device.recycleExcluded) addToTag("ptdye:recycle_excluded")
       addToTag(device.tag + tagSuffix, item.id);
       addStonecutting(included_device, device.generic);
     });