Merge branch 'main' of https://github.com/game-design-driven/Create-P…

…repare-to-Dye

VERSION

@@ -1 +1 @@
-1.225.0
+1.226.0

config/modpack-update-checker/config.json

@@ -1 +1 @@
-{ "schemaVersion": 4, "currentVersion": "1.225.0", "modpackName": "Create Prepare to Dye", "modpackAuthor": "Create Prepare to Dye team", "githubRepo": "https://raw.githubusercontent.com/game-design-driven/Create-Prepare-to-Dye/main/modpack-update-checker/", "advanced": { "bccEnabled": false, "expandButton": true, "updateCheckerType": 2, "showAllChangelogsIfUpToDate": true, "forceModpackCompatible": true } }
+{ "schemaVersion": 4, "currentVersion": "1.226.0", "modpackName": "Create Prepare to Dye", "modpackAuthor": "Create Prepare to Dye team", "githubRepo": "https://raw.githubusercontent.com/game-design-driven/Create-Prepare-to-Dye/main/modpack-update-checker/", "advanced": { "bccEnabled": false, "expandButton": true, "updateCheckerType": 2, "showAllChangelogsIfUpToDate": true, "forceModpackCompatible": true } }

index.toml

@@ -26,7 +26,7 @@ hash = "48981474996310a7861d97b5aaea8a11ba16d6075c273766daab566848930c09"
 
 [[files]]
 file = "VERSION"
-hash = "e53c413845a32f8076bc87282b5d7e73d9873c882108dc4b7be31bea53c14db2"
+hash = "44276c5a8accf3e5b6f6ee72aadd789fa83b6b485300ddfba97354994c65338b"
 
 [[files]]
 file = "config/MouseTweaks.cfg"
@@ -434,7 +434,7 @@ hash = "f5029b0a3ca477b85c097983a9c7d1747dc2f2fdff6ede904e3d11ba4ab169fa"
 
 [[files]]
 file = "config/modpack-update-checker/config.json"
-hash = "0428dd761e0ca3125dacc889d8a2c98819a1d5bd4d01252bd0b70a0aa44c2d7c"
+hash = "ea48bcc2408baecaf8da57ec1094625a221ae748f90ceca1ed7dc685f02508e9"
 
 [[files]]
 file = "config/more_babies-common.toml"
@@ -3560,6 +3560,10 @@ hash = "cb2e5f5f1cc929430dc8400e45c7cfc5102254ca643f5ef3208dfd499a24f1fa"
 file = "kubejs/assets/ptdye/textures/item/tomato.png"
 hash = "dcfd0bc58723c9acc65dcf191fb506e899cf77c1a6c8cc3ceb7304e3db51c32f"
 
+[[files]]
+file = "kubejs/assets/ptdye/textures/item/tool_parts.png"
+hash = "c89dc34b13c0496671c19618504030399c0bd846272b5662ab01fd5868a2cfab"
+
 [[files]]
 file = "kubejs/assets/ptdye/textures/item/trading_transceiver.png"
 hash = "fde11a2056c949893ad17e0a162c99ac925dbeba6264c7259f8bcb85da28b852"
@@ -3606,7 +3610,7 @@ hash = "ded1b3b51c1b47ee3e812ef73dfb4dd423dec7119ed921585bed038c95328c0d"
 
 [[files]]
 file = "kubejs/assets/sdrp/lang/en_us.json"
-hash = "369fffd0ac63633e55acb8226cc7a7d3f9cbae12f9a462b40f737774c4665f2e"
+hash = "5ddb8d673c7744224847aacce2d0b225a024d84703aeea4838353b3f61a64a26"
 
 [[files]]
 file = "kubejs/assets/storagedrawers/lang/en_us.json"
@@ -5222,7 +5226,7 @@ hash = "2f140c19f7c69a63a37e1304e71e73029211207aca59c45381590587dbfaadbd"
 
 [[files]]
 file = "kubejs/server_scripts/base/features/devices.js"
-hash = "1aea7b8f030f2d4befe425e5e6f27ef123d7f0e734c55d7da51726b97afe7078"
+hash = "eab6fea4d5f702605971899e5bd6e5bc626b8744b47c044186ae6aae46b86d9f"
 
 [[files]]
 file = "kubejs/server_scripts/base/features/diamondToolsSilkTouch.js"
@@ -5398,23 +5402,23 @@ hash = "9f6e6eecae9bc87a9ded3b553f2527007060d756e01d0a5d8d56a0c62b64e67e"
 
 [[files]]
 file = "kubejs/server_scripts/base/mods/botania.js"
-hash = "62c463107901b1f68288cf8069dd6b9eb167e8de5f1d6d5590758edde0c1e294"
+hash = "60122ca2c8421ae42d81a914411cef115b28ae12956b4de30ec704c61990cd56"
 
 [[files]]
 file = "kubejs/server_scripts/base/mods/craftingOnAStick.js"
-hash = "cdf539f8b9068e29a5b53b9d8c2a6ddff0fc62c9ae2334de684d0a27c8e9559e"
+hash = "b23e20b0eca9a870c9e9200dc23ec6bd8ee9037c6d4dc23d1d67d4d19dadc2ff"
 
 [[files]]
 file = "kubejs/server_scripts/base/mods/create.js"
-hash = "dd4f4f4c7ac15e68475260f250316386d167143112a6e44e3edf2cfea92d7f29"
+hash = "c284ebb1ba41baa461ba2095332c06dc95aa5b8185ae19c284466c8dfc96112e"
 
 [[files]]
 file = "kubejs/server_scripts/base/mods/createEnchantmentIndustry.js"
 hash = "9f90166ef75cccf5895c74b24205fa47d731e9a9b9a75550bcbe2644f3851ff3"
 
 [[files]]
 file = "kubejs/server_scripts/base/mods/minecraft.js"
-hash = "76d8f942d969698a909a6e226afaebe99da48b552536855412e0291a58821c0e"
+hash = "f65c9170e3cb5018a793691bddb1816ddbf7a0cd57931238bc0dd4652542ed0c"
 
 [[files]]
 file = "kubejs/server_scripts/base/mods/quark.js"
@@ -5546,7 +5550,7 @@ hash = "cf8e4f4f1796c84ebf2c695c749368c2940ca81a5b19bf1e31670f4336ffbe1f"
 
 [[files]]
 file = "kubejs/startup_scripts/blocks.js"
-hash = "50f07f7143baf1e843666db32a7c1673c80f97f9ba793838829453f9c204aa97"
+hash = "161ae7e9af7c900775c9bc5e082c51cea2592265da18d60ade25a423357596a8"
 
 [[files]]
 file = "kubejs/startup_scripts/conversions.js"
@@ -5670,7 +5674,7 @@ hash = "85eb8219412efbf27a5f1bdde418a11fd606c07de4ea599177ad3f430655630c"
 
 [[files]]
 file = "modpack-update-checker/meta.json"
-hash = "53f7b4253517b064aebae349923e8e7db38bdd783e1bb18a9c989ef8d12f8fb5"
+hash = "1c262bd5b6be473ba72ecf6fc437134b2efc673ad94bb10a2cc37b798e1de7de"
 
 [[files]]
 file = "modpack-update-checker/versions/1.100.0/changelog.txt"
@@ -7756,6 +7760,10 @@ hash = "bdb76a55aab656edaa2d907ad88da26aeca93ad76d6ab20d82354d4898ea7070"
 file = "modpack-update-checker/versions/1.225.0/changelog.txt"
 hash = "b124192fc75ed60d102faf5d46464a7554c50dc7db52813ab868f64cea0e0b45"
 
+[[files]]
+file = "modpack-update-checker/versions/1.226.0/changelog.txt"
+hash = "0b54685bedaeb506eb4120ff3a7758e653a7d05f274deeacc003c9469a28e6ed"
+
 [[files]]
 file = "modpack-update-checker/versions/1.79.33/changelog.txt"
 hash = "3ffee41ebf2c4f32db44a257c726f8496cc33446635821d2cf364ce80a6bef3e"

kubejs/assets/sdrp/lang/en_us.json

@@ -1 +1 @@
-{ "sdrp.logo": "Hanging out with Betsy on version 1.225.0", "sdrp.mainmenu": "Main Menu", "sdrp.overworld.in": "On Chroma Prime", "sdrp.overworld": "Chroma Prime" }
+{ "sdrp.logo": "Hanging out with Betsy on version 1.226.0", "sdrp.mainmenu": "Main Menu", "sdrp.overworld.in": "On Chroma Prime", "sdrp.overworld": "Chroma Prime" }

kubejs/server_scripts/base/features/devices.js

@@ -1,11 +1,16 @@
 if (feature("Remove crafting table")) {
   removeItem("minecraft:crafting_table");
 }
-if (
-  feature("Craftable devices that are transmuted to specific things on demand")
-) {
+
+
+if (true) {
+  let ComponentDevicesFeature = feature("Craftable Devices that can be reversibly transformed to Components (e.g. basins, gearboxes)")
+  let DecorativeDevicesFeature = feature("Craftable Devices that can be reversibly transformed to Decorative Blocks (e.g. copycat blocks)")
+  let ToolDevicesFeature = feature("Craftable Devices that can be reversibly transformed to Player Tools (e.g. wrenches, schematics)")
+
   let deviceDefinitions = [
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/network",
       generic: "ae2:fluix_smart_cable",
       included_devices: [
@@ -19,12 +24,14 @@ if (
       ],
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/craftingplaceholder",
       generic: "gold_nugget",
       convert_back_recipe: false,
       included_devices: ["botania:placeholder", "create:crafter_slot_cover"],
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/track",
       generic: "create:track",
       base: "#create:sleepers",
@@ -61,6 +68,7 @@ if (
       },
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/rail",
       generic: "create:controller_rail",
       base: "rail",
@@ -73,24 +81,56 @@ if (
       },
     },
     {
+      enable: DecorativeDevicesFeature,
       tag: "forge:devices/window",
-      generic: 'create:ornate_iron_window',
-      included_devices: ['create:oak_window', 'create:spruce_window', 'create:birch_window', 'create:jungle_window', 'create:acacia_window', 'create:dark_oak_window', 'create:mangrove_window', 'create:crimson_window', 'create:warped_window'],
+      generic: "create:ornate_iron_window",
+      included_devices: [
+        "create:oak_window",
+        "create:spruce_window",
+        "create:birch_window",
+        "create:jungle_window",
+        "create:acacia_window",
+        "create:dark_oak_window",
+        "create:mangrove_window",
+        "create:crimson_window",
+        "create:warped_window",
+      ],
       post_logic: () => {
-        removeAllRecipesForItem('create:ornate_iron_window')
-        addMixing('16x create:ornate_iron_window',["#forge:glass",'16x quark:iron_plate'])
+        removeAllRecipesForItem("create:ornate_iron_window");
+        addMixing("16x create:ornate_iron_window", [
+          "#forge:glass",
+          "16x quark:iron_plate",
+        ]);
       },
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/lamp",
       generic: "minecraft:redstone_lamp",
-      included_devices: ['quark:red_crystal_lamp', 'quark:orange_crystal_lamp', 'quark:yellow_crystal_lamp', 'quark:green_crystal_lamp', 'quark:blue_crystal_lamp', 'quark:indigo_crystal_lamp', 'quark:violet_crystal_lamp', 'quark:white_crystal_lamp', 'quark:black_crystal_lamp', 'create:rose_quartz_lamp', 'supplementaries:redstone_illuminator'],
+      included_devices: [
+        "quark:red_crystal_lamp",
+        "quark:orange_crystal_lamp",
+        "quark:yellow_crystal_lamp",
+        "quark:green_crystal_lamp",
+        "quark:blue_crystal_lamp",
+        "quark:indigo_crystal_lamp",
+        "quark:violet_crystal_lamp",
+        "quark:white_crystal_lamp",
+        "quark:black_crystal_lamp",
+        "create:rose_quartz_lamp",
+        "supplementaries:redstone_illuminator",
+      ],
       post_logic: () => {
-        removeAllRecipesForItem("minecraft:redstone_lamp")
-        addItemApplication("minecraft:redstone_lamp","#forge:glass","#forge:glowy_items")
+        removeAllRecipesForItem("minecraft:redstone_lamp");
+        addItemApplication(
+          "minecraft:redstone_lamp",
+          "#forge:glass",
+          "#forge:glowy_items"
+        );
       },
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/furniture",
       generic: "ptdye:furnished_device",
       base: "minecraft:stick",
@@ -144,11 +184,11 @@ if (
           event.addSimpleBlock("minecraft:campfire", "minecraft:campfire");
           event.addSimpleBlock("minecraft:soul_campfire", "minecraft:campfire");
         });
-
+  
         removeRecipe({ id: "create:haunting/soul_campfire" });
         removeRecipe({ id: "minecraft:soul_campfire" });
         removeRecipe({ id: "minecraft:soul_torch" });
-
+  
         [
           "#minecraft:piglin_repellents",
           "#minecraft:soul_fire_base_blocks",
@@ -165,6 +205,35 @@ if (
       },
     },
     {
+      enable: ToolDevicesFeature,
+      recycleExcluded: true,
+      tag: "forge:util_devices/tools",
+      generic: "ptdye:tool_parts",
+      included_devices: [
+        "create:wrench",
+        "ptdye:hammer",
+        "create:schematic_and_quill",
+        "create:empty_schematic",
+        "create:linked_controller",
+        "create:wand_of_symmetry",
+        "botania:twig_wand",
+        "create:clipboard",
+        "crafting_on_a_stick:stonecutter",
+        "quark:abacus",
+        "minecraft:elytra",
+      ],
+      post_logic: () => {
+        addMixing("2x ptdye:tool_parts", [
+          "#forge:nuggets/gold",
+          "2x #forge:plates/iron",
+          "#forge:rods",
+        ]);
+        //for recycling currently filled schematics
+        addStonecutting("ptdye:tool_parts", "create:schematic");
+      },
+    },
+    {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/red_stringed",
       generic: "ptdye:red_stringed_device", //better to use fully qualifed names for better refactorability in future
       assembly: ["botania:livingrock", "string", "red_dye"],
@@ -187,6 +256,7 @@ if (
       }
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/smart",
       generic: "ptdye:smart_device",
       assembly: [
@@ -220,6 +290,7 @@ if (
       ],
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/logic",
       generic: "ptdye:logic_device",
       amount_crafted: 12,
@@ -248,6 +319,7 @@ if (
       ],
     },
     {
+      enable: DecorativeDevicesFeature,
       tag: "forge:devices/smokestack",
       generic: "railways:smokestack_woodburner",
       base: "minecraft:campfire",
@@ -264,6 +336,7 @@ if (
       ],
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/locomotive",
       generic: "ptdye:locomotive_device",
       assembly: [
@@ -288,6 +361,7 @@ if (
       ],
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/sealed",
       generic: "ptdye:sealed_device",
       assembly: [
@@ -317,6 +391,7 @@ if (
       ],
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/sturdy",
       generic: "ptdye:sturdy_device",
       assembly: ["cobblestone", "#forge:plates/iron"],
@@ -351,6 +426,7 @@ if (
       ],
     },
     {
+      enable: ComponentDevicesFeature,
       tag: "forge:devices/mechanical",
       generic: "ptdye:mechanical_device",
       assembly: [
@@ -410,8 +486,9 @@ if (
   let addedTagRecipes = {};
 
   deviceDefinitions.forEach((device) => {
-    addToTag('forge:generics/devices', device.generic)
-    addToTag(`forge:generics/${device.tag.split(":")[1]}`, device.generic)
+    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
 
     device.base = device.base || "create:cogwheel";

kubejs/server_scripts/base/mods/botania.js

@@ -120,8 +120,8 @@ if (feature("Lexica botania from book")) {
 
 if (feature("Wand easy recipe")) {
   removeAllRecipesForItem("botania:twig_wand");
-  addShapeless("botania:twig_wand", ["botania:livingwood_twig"]);
-  addStonecutting("botania:twig_wand", "botania:livingwood_twig");
+  if(!feature("Craftable Devices that can be reversibly transformed to Player Tools (e.g. wrenches, schematics)")) addShapeless("botania:twig_wand", ["botania:livingwood_twig", "#forge:dyes"]);
+
 }
 
 if (feature("Remove Drum of gathering because it makes milk easy")) {

kubejs/server_scripts/base/mods/craftingOnAStick.js

@@ -10,5 +10,5 @@ if (feature('Remove crafting tables on a stick')) {
       'crafting_on_a_stick:chipped_anvil',
       'crafting_on_a_stick:damaged_anvil'
     ])
-    addShaped('crafting_on_a_stick:stonecutter', ['s','r'], { s: 'minecraft:stonecutter', r: '#forge:rods' })
+    if(!feature("Craftable Devices that can be reversibly transformed to Player Tools (e.g. wrenches, schematics)")) addShaped('crafting_on_a_stick:stonecutter', ['s','r'], { s: 'minecraft:stonecutter', r: '#forge:rods' })
 }

kubejs/server_scripts/base/mods/create.js

@@ -108,7 +108,7 @@ if (feature("Replace golden sheet with brass one")) {
   });
   removeItem("create:golden_sheet");
   removeRecipe({ id: "create:crafting/kinetics/wrench" });
-  addShaped("create:wrench", ["c", "s"], {
+  if(!feature("Craftable Devices that can be reversibly transformed to Player Tools (e.g. wrenches, schematics)"))  addShaped("create:wrench", ["c", "s"], {
     c: "#forge:cogs",
     s: "#forge:rods",
   });

kubejs/server_scripts/base/mods/minecraft.js

@@ -14,7 +14,7 @@ if (feature("Paper recipes")) {
     addPressing("stick", "stick"),
   ]);
 }
-if (feature("Chest recipes") && !feature("Craftable devices that are transmuted to specific things on demand")) {
+if (feature("Chest recipes") && !feature("Craftable Devices that can be reversibly transformed to Components (e.g. basins, gearboxes)")) {
   addShaped("chest", ["###", "# #", "###"], { "#": "#planks" });
   addShaped("4x chest", ["###", "# #", "###"], { "#": "#logs" });
 }

kubejs/startup_scripts/blocks.js

@@ -28,6 +28,8 @@ StartupEvents.registry("item", (event) => {
 
   event.create("ptdye:orange_tubes");
 
+  event.create("ptdye:tool_parts");
+
   event.create("ptdye:incomplete_sturdy_device", "create:sequenced_assembly");
   event.create(
     "ptdye:incomplete_mechanical_device",