Revert "Revert "Remove polyethylene requirement from Basic Upgrades""

This reverts commit 310acc8.

src/generated/resources/data/modern_industrialization/advancement/advanced_upgrade.json

@@ -1,5 +1,5 @@
 {
-  "parent": "modern_industrialization:basic_upgrade",
+  "parent": "modern_industrialization:chemical_reactor",
   "criteria": {
     "checkInv": {
       "conditions": {

src/generated/resources/data/modern_industrialization/advancement/basic_upgrade.json

@@ -1,5 +1,5 @@
 {
-  "parent": "modern_industrialization:chemical_reactor",
+  "parent": "modern_industrialization:assembler",
   "criteria": {
     "checkInv": {
       "conditions": {

src/main/java/aztech/modern_industrialization/datagen/advancement/MIAdvancementsProvider.java

@@ -212,8 +212,8 @@ public void generate(HolderLookup.Provider registries, Consumer<AdvancementHolde
         var quantumCircuit = createBasic(consumer, "quantum_circuit", mixedIngotIridium, AdvancementType.GOAL, "Mobius Strip Eigenvalues", "Craft a Quantum Circuit", existingFileHelper);
         var fusionReactor = createBasic(consumer, "fusion_reactor", quantumCircuit, AdvancementType.CHALLENGE, "Enslaved Star Core", "Craft a Fusion Reactor to produce insane amount of energy", existingFileHelper);
         var plasmaTurbine = createBasic(consumer, "plasma_turbine", fusionReactor, "Better than Nuclear Fission", "Craft a Plasma Turbine to transform Helium Plasma into energy", existingFileHelper);
-        var basicUpgrade = createBasic(consumer, "basic_upgrade", chemicalReactor, AdvancementType.GOAL, "Machine Speedup", "Craft a Basic Upgrade to increase the maximum speed of an electric recipe", existingFileHelper);
-        var advancedUpgrade = createBasic(consumer, "advanced_upgrade", basicUpgrade, "Machine Speedup-Speedup", "Craft a Advanced Upgrade", existingFileHelper);
+        var basicUpgrade = createBasic(consumer, "basic_upgrade", assembler, AdvancementType.GOAL, "Machine Speedup", "Craft a Basic Upgrade to increase the maximum speed of an electric recipe", existingFileHelper);
+        var advancedUpgrade = createBasic(consumer, "advanced_upgrade", chemicalReactor, "Machine Speedup-Speedup", "Craft a Advanced Upgrade", existingFileHelper);
         var turboUpgrade = createBasic(consumer, "turbo_upgrade", digitalCircuit, "Gotta go Fast", "Craft a Turbo Upgrade", existingFileHelper);
         var highlyAdvancedUpgrade = createBasic(consumer, "highly_advanced_upgrade", processingUnit, "I'm speed", "Craft an Highly Advanced Upgrade", existingFileHelper);
         var quantumUpgrade = createBasic(consumer, "quantum_upgrade", quantumCircuit, AdvancementType.GOAL, "Time Dilation", "Craft a Quantum Upgrade to unlock unlimited recipe speed", existingFileHelper);

src/main/resources/assets/modern_industrialization/patchouli_books/book/en_us/entries/electric_age/basic_machines.json

@@ -30,7 +30,19 @@
     {
       "type": "text",
       "text": "We strongly suggest that you automate Machine Hull, Analog Circuits, Motors, Pistons, Robot Arms and Conveyor Belts using Assemblers as soon as possible, that will make crafting electric machines basically free!"
+    },
+    {
+      "type": "spotlight",
+      "title": "Redstone Control Modules",
+      "item": "modern_industrialization:redstone_control_module",
+      "text": "A Redstone Control Module can be used to control the behavior of electric machines and multiblocks with redstone signals.$(br2)Configure the module in your hand, then insert it into the machine or multiblock controller."
+    },
+    {
+      "type": "spotlight",
+      "title": "Overclock Upgrades",
+      "item": "modern_industrialization:basic_upgrade",
+      "text": "Regular electric machines have an overclock capped at 32 EU/t, and electric multiblocks have an overclock capped at 128 EU/t.$(br2)In the machine or multiblock's menu, add upgades to increase its maximum overclock! Check REI for the exact amounts."
     }
   ],
   "sortnum": 105
-}
+}

src/main/resources/assets/modern_industrialization/patchouli_books/book/en_us/entries/midgame/upgrades.json

@@ -3,18 +3,6 @@
   "category": "modern_industrialization:midgame",
   "icon": "modern_industrialization:basic_upgrade",
   "pages": [
-    {
-      "type": "spotlight",
-      "title": "Redstone Control Modules",
-      "item": "modern_industrialization:redstone_control_module",
-      "text": "A Redstone Control Module can be used to control the behavior of electric machines and multiblocks with redstone signals.$(br2)Configure the module in your hand, then insert it into the machine or multiblock controller."
-    },
-    {
-      "type": "spotlight",
-      "title": "Overclock Upgrades",
-      "item": "modern_industrialization:basic_upgrade",
-      "text": "You know that regular electric machines have an overclock capped at 32 EU/t, and electric multiblocks have an overclock capped at 128 EU/t?$(br2)In the machine or multiblock's menu, add upgades to increase its maximum overclock! Check REI for the exact amounts."
-    },
     {
       "type": "spotlight",
       "title": "Machine Hull Upgrades",

src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json

@@ -20,15 +20,10 @@
       "amount": 1
     }
   ],
-
-  "fluid_inputs": {
-    "fluid" : "modern_industrialization:polyethylene",
-    "amount" : 500
-  },
   "item_outputs": [
     {
       "item": "modern_industrialization:basic_upgrade",
       "amount": 4
     }
   ]
-}
+}