Merge pull request 'CC recipes: plastic-everywhere + advanced-contains-basic' (#20) from feature/cc-recipes-progression into main

pack/overrides/kubejs/server_scripts/cc_recipes.js

@@ -1,45 +1,45 @@
-// Brass & Sigil — ComputerCraft recipe overhaul (full coverage)
+// Brass & Sigil — ComputerCraft recipe overhaul (full coverage, v3)
 //
-// Replaces every craftable CC: Tweaked recipe with a Create + TFMG -gated
+// Two design principles:
-// version. Designed as a 5-tier progression that maps onto pack-wide
+//   1. Every electronic CC item contains TFMG plastic_sheet -- plastic is
-// industrial advancement:
+//      the electrical insulator and the gate that forces players to build
+//      out TFMG's full oil-refining chain (crude oil -> naphtha -> molten
+//      plastic -> sheet) before any CC tech.
+//   2. Advanced versions contain their basic counterpart in the recipe.
+//      Computer Advanced contains Computer Normal; Monitor Advanced
+//      contains Monitor Normal; etc. This makes the upgrade chain
+//      literal -- you can't skip basic tier, you upgrade through it.
 //
-//   T1 - Cabling: copper_wire + andesite_casing. Mid-game accessible.
+// Tier outline (with both principles applied):
-//   T2 - Basic CC: brass_casing, electron_tube, precision_mechanism,
+//   T1 Cable           plastic + copper_wire + redstone (cheap commodity)
-//        nixie_tube, plastic + steel. Players need Create's tier-2
+//   T2 Basic CC        plastic + brass_casing + electron_tube + p_mech +
-//        production set and TFMG's coke oven + distillation tower.
+//                      steel + silicon-or-cogwheel (Create T2 + TFMG oil
-//   T3 - Networking + Robotics: electromagnetic_coil (TFMG late) +
+//                      + steel chain)
-//        mechanical_arm/bearing/gantry_shaft (Create kinetic), plus
+//   T3 Networking+bots plastic + electromagnetic_coil + mech_arm/bearing
-//        constantan_wire (TFMG mid-late metal).
+//                      + constantan_wire (TFMG advanced electrical)
-//   T4 - Advanced computing: silicon_ingot (TFMG electrolysis chain =
+//   T4 Advanced        Basic item + silicon + rose_quartz + gold +
-//        late game), rose_quartz, display_link, railway_casing, gold.
+//                      industrial_iron_block (or display_link / large_coil)
-//   T5 - Mobile: pocket computers, miniaturised forms of T2/T4.
+//   T5 Mobile          Pocket Normal -> Pocket Advanced via same pattern
-//
-// Wires are deliberately the connective thread: copper_wire shows up
-// EVERYWHERE in early recipes (cables, modems), aluminum_wire is mid,
-// constantan_wire is high-tier. TFMG's electrical production becomes
-// genuinely useful for CC progression.
 
 ServerEvents.recipes(event => {
     // ─── T1 - CABLING ──────────────────────────────────────────────────
-    // Cable: 8-output craft to make laying networks viable. Heavy
+    // Cable (x8): plastic insulator + copper_wire core + redstone signal.
-    // copper_wire usage so players bulk-produce wire to support CC.
+    // Outputs 8 so network laying is still viable.
     event.remove({ output: 'computercraft:cable' });
     event.shaped(Item.of('computercraft:cable', 8), [
-        'WWW',
+        'PWP',
-        'CRC',
+        'WRW',
-        'WWW',
+        'PWP',
     ], {
+        P: 'tfmg:plastic_sheet',
         W: 'tfmg:copper_wire',
-        C: 'create:andesite_casing',
         R: 'minecraft:redstone',
     });
 
     // ─── T2 - BASIC COMPUTING ──────────────────────────────────────────
 
-    // Computer (Basic): brass_casing core (the "industrial computer"
+    // Computer (Basic): plastic shell + electron_tube CPU + brass_casing
-    // chassis), electron_tube above/below (the retro CPU), steel side
+    // chassis + steel reinforcement + precision_mechanism core.
-    // armour, precision_mech in the heart.
     event.remove({ output: 'computercraft:computer_normal' });
     event.shaped('computercraft:computer_normal', [
         'PEP',
@@ -53,35 +53,35 @@ ServerEvents.recipes(event => {
         M: 'create:precision_mechanism',
     });
 
-    // Monitor (Basic): nixie_tube top + bottom for retro display feel,
+    // Monitor (Basic): plastic frame + nixie_tube (retro CRT) + glass.
-    // glass pane window, copper sheet trim.
     event.remove({ output: 'computercraft:monitor_normal' });
     event.shaped('computercraft:monitor_normal', [
-        'CNC',
+        'PNP',
         'GGG',
-        'CNC',
+        'PNP',
     ], {
-        C: 'create:copper_sheet',
+        P: 'tfmg:plastic_sheet',
         N: 'create:nixie_tube',
         G: 'minecraft:glass_pane',
     });
 
-    // Disk Drive: cogwheel for the spinning read head, precision_mech
+    // Disk Drive: plastic frame + cogwheel (spinning read head) +
-    // for the data IO, rose_quartz for the data medium.
+    // rose_quartz (data medium) + steel + p_mech.
     event.remove({ output: 'computercraft:disk_drive' });
     event.shaped('computercraft:disk_drive', [
-        'SOS',
+        'PCP',
         'RQR',
         'SMS',
     ], {
-        S: 'tfmg:steel_ingot',
+        P: 'tfmg:plastic_sheet',
-        O: 'create:cogwheel',
+        C: 'create:cogwheel',
         R: 'minecraft:redstone',
         Q: 'create:rose_quartz',
+        S: 'tfmg:steel_ingot',
         M: 'create:precision_mechanism',
     });
 
-    // Floppy Disk: 2 plastic + redstone, shapeless, cheap consumable.
+    // Floppy Disk: 2 plastic + redstone, shapeless.
     event.remove({ output: 'computercraft:disk' });
     event.shapeless('computercraft:disk', [
         'tfmg:plastic_sheet',
@@ -89,57 +89,57 @@ ServerEvents.recipes(event => {
         'minecraft:redstone',
     ]);
 
-    // Wired Modem: copper_wire signal pickup wrapped around a brass
+    // Wired Modem: plastic shell + copper_wire signal lines + brass_casing
-    // casing with an electron tube amplifier.
+    // chassis + electron_tube amplifier.
     event.remove({ output: 'computercraft:wired_modem' });
     event.shaped('computercraft:wired_modem', [
-        'WBW',
+        'PWP',
-        'WEW',
+        'BEB',
-        'WBW',
+        'PWP',
     ], {
+        P: 'tfmg:plastic_sheet',
         W: 'tfmg:copper_wire',
         B: 'create:brass_casing',
         E: 'create:electron_tube',
     });
 
-    // Wired Modem Full: just the block-form. Same recipe but yields the
+    // Wired Modem Full: 1 modem -> block form (toggle).
-    // full-block variant; CC's default chains them via shapeless.
     event.remove({ output: 'computercraft:wired_modem_full' });
     event.shapeless('computercraft:wired_modem_full',
         ['computercraft:wired_modem']);
 
-    // Speaker: electron_tube amplifier feeding a note_block, in a
+    // Speaker: plastic + electron_tube amplifier + brass_casing + note_block.
-    // brass_casing chassis.
     event.remove({ output: 'computercraft:speaker' });
     event.shaped('computercraft:speaker', [
-        'CEC',
+        'PEP',
-        'PBP',
+        'BMB',
-        'CNC',
+        'PNP',
     ], {
-        C: 'create:copper_sheet',
-        E: 'create:electron_tube',
         P: 'tfmg:plastic_sheet',
+        E: 'create:electron_tube',
         B: 'create:brass_casing',
+        M: 'create:precision_mechanism',
         N: 'minecraft:note_block',
     });
 
-    // Printer: ink + precision_mech + cogwheels.
+    // Printer: plastic + steel + ink_sac + precision_mech + cogwheel.
     event.remove({ output: 'computercraft:printer' });
     event.shaped('computercraft:printer', [
-        'SSS',
+        'PSP',
         'IMI',
-        'SOS',
+        'PCP',
     ], {
+        P: 'tfmg:plastic_sheet',
         S: 'tfmg:steel_ingot',
         I: 'minecraft:ink_sac',
         M: 'create:precision_mechanism',
-        O: 'create:cogwheel',
+        C: 'create:cogwheel',
     });
 
     // ─── T3 - NETWORKING + ROBOTICS ────────────────────────────────────
 
-    // Wireless Modem (Basic): TFMG electromagnetic_coil is the antenna,
+    // Wireless Modem (Basic): plastic + copper/aluminum wire + TFMG
-    // copper_wire signal lines, brass_casing chassis.
+    // electromagnetic_coil antenna + brass_casing chassis.
     event.remove({ output: 'computercraft:wireless_modem_normal' });
     event.shaped('computercraft:wireless_modem_normal', [
         'WAW',
@@ -153,23 +153,23 @@ ServerEvents.recipes(event => {
         B: 'create:brass_casing',
     });
 
-    // Redstone Relay: brass casing, electron tubes for switching, copper
+    // Redstone Relay: plastic + copper_wire + electron_tube switching +
-    // wire signal. The CC equivalent of "smart redstone repeater".
+    // brass_casing.
     event.remove({ output: 'computercraft:redstone_relay' });
     event.shaped('computercraft:redstone_relay', [
-        'WEW',
+        'PEP',
         'RBR',
-        'WEW',
+        'PEP',
     ], {
-        W: 'tfmg:copper_wire',
+        P: 'tfmg:plastic_sheet',
         E: 'create:electron_tube',
         R: 'minecraft:redstone',
         B: 'create:brass_casing',
     });
 
-    // Turtle (Basic): the computer as the brain, mechanical_bearing for
+    // Turtle (Basic): steel + mechanical_bearing (movement axis) +
-    // movement axis, gantry_shaft as the "arms", chest for storage.
+    // gantry_shaft (arm reach) + computer_normal (the brain) + chest.
-    // Industrial robot vibe.
+    // Contains the basic computer, so turtle inherits its plastic cost.
     event.remove({ output: 'computercraft:turtle_normal' });
     event.shaped('computercraft:turtle_normal', [
         'SBS',
@@ -184,54 +184,62 @@ ServerEvents.recipes(event => {
     });
 
     // ─── T4 - ADVANCED ─────────────────────────────────────────────────
+    // All advanced items: contain their basic counterpart + premium
+    // upgrade materials (silicon, rose_quartz, gold, industrial_iron_blk,
+    // constantan).
 
-    // Computer (Advanced): silicon + rose_quartz + railway_casing for
+    // Computer (Advanced): Computer Normal core, silicon + rose_quartz
-    // the "premium" chassis. Gold trim.
+    // upgrades, industrial_iron_block premium chassis, gold trim.
     event.remove({ output: 'computercraft:computer_advanced' });
     event.shaped('computercraft:computer_advanced', [
         'GQG',
-        'SMS',
+        'SCS',
-        'GRG',
+        'GIG',
     ], {
         G: 'minecraft:gold_ingot',
         Q: 'create:rose_quartz',
         S: 'tfmg:silicon_ingot',
-        M: 'create:precision_mechanism',
+        C: 'computercraft:computer_normal',
-        R: 'create:railway_casing',
+        I: 'create:industrial_iron_block',
     });
 
-    // Monitor (Advanced): display_link is Create's literal data-binding
+    // Monitor (Advanced): Monitor Normal as the screen, display_link as
-    // block - perfect to pair with a CC monitor for showing data.
+    // the data binding layer, gold trim + nixie_tube accents, plastic
+    // insulation on the sides.
     event.remove({ output: 'computercraft:monitor_advanced' });
     event.shaped('computercraft:monitor_advanced', [
         'GNG',
-        'gDg',
+        'PMP',
-        'GNG',
+        'GDG',
     ], {
         G: 'minecraft:gold_ingot',
         N: 'create:nixie_tube',
-        g: 'minecraft:glass_pane',
+        P: 'tfmg:plastic_sheet',
+        M: 'computercraft:monitor_normal',
         D: 'create:display_link',
     });
 
-    // Wireless Modem (Advanced): constantan_spool for high-Q antenna
+    // Wireless Modem (Advanced): contains Wireless Modem Normal,
-    // tuning, transmitter-style central component.
+    // wrapped in constantan_wire + spool for high-Q tuning, large_coil
+    // for the powerful antenna, gold trim.
     event.remove({ output: 'computercraft:wireless_modem_advanced' });
     event.shaped('computercraft:wireless_modem_advanced', [
         'WCW',
-        'QLQ',
+        'PMP',
-        'GBG',
+        'GLG',
     ], {
         W: 'tfmg:constantan_wire',
         C: 'tfmg:constantan_spool',
-        Q: 'create:rose_quartz',
+        P: 'tfmg:plastic_sheet',
-        L: 'tfmg:large_coil',
+        M: 'computercraft:wireless_modem_normal',
         G: 'minecraft:gold_ingot',
-        B: 'create:brass_casing',
+        L: 'tfmg:large_coil',
     });
 
-    // Turtle (Advanced): gold-trim turtle with computer_advanced brain
+    // Turtle (Advanced): contains Computer Advanced (so the upgrade
-    // and mechanical_arm for actual robotic manipulation.
+    // chain forces Basic -> Computer Normal -> Computer Advanced ->
+    // Turtle Advanced). Mechanical_arm for proper robotic manipulation,
+    // gold trim.
     event.remove({ output: 'computercraft:turtle_advanced' });
     event.shaped('computercraft:turtle_advanced', [
         'GAG',
@@ -246,8 +254,8 @@ ServerEvents.recipes(event => {
 
     // ─── T5 - MOBILE (POCKET COMPUTERS) ────────────────────────────────
 
-    // Pocket Computer (Normal): miniaturised T2 computer. Electron tube
+    // Pocket Computer (Basic): miniaturised. Plastic shell, electron_tube,
-    // brain, silicon for the compact CPU, precision_mech, plastic shell.
+    // silicon CPU, precision_mech, glass pane screen.
     event.remove({ output: 'computercraft:pocket_computer_normal' });
     event.shaped('computercraft:pocket_computer_normal', [
         'PEP',
@@ -261,22 +269,18 @@ ServerEvents.recipes(event => {
         g: 'minecraft:glass_pane',
     });
 
-    // Pocket Computer (Advanced) - the gold variant.
+    // Pocket Computer (Advanced): contains Pocket Computer Normal,
+    // upgraded with rose_quartz, gold-trim, silicon doubled.
     event.remove({ output: 'computercraft:pocket_computer_advanced' });
     event.shaped('computercraft:pocket_computer_advanced', [
         'PQP',
-        'SMS',
+        'SCS',
         'PGP',
     ], {
         P: 'tfmg:plastic_sheet',
         Q: 'create:rose_quartz',
         S: 'tfmg:silicon_ingot',
-        M: 'create:precision_mechanism',
+        C: 'computercraft:pocket_computer_normal',
         G: 'minecraft:gold_ingot',
     });
-
-    // Note: computercraft:pocket_computer_colour appears in the model
-    // assets but is not a separately-registered item in CC: Tweaked --
-    // it's a colour-state variant of the advanced pocket computer.
-    // Don't try to define a recipe for it (KubeJS warns at startup).
 });

pack/pack.lock.json

@@ -1,7 +1,7 @@
 {
   "$schema": "Brass-and-Sigil pack.lock.json - generated, do not edit by hand unless you know what you are doing",
   "name": "Brass and Sigil",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "minecraft": "1.21.1",
   "loader": {
     "type": "neoforge",