Cleanup

ULSTICK · Jul 1, 2024 · 2ee2ae5 · 2ee2ae5
1 parent 02e626f
commit 2ee2ae5
Show file tree

Hide file tree

Showing 43 changed files with 606 additions and 74 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,10 @@
 - Add recipe for cutting mud bricks into slabs
 - Change bloomery structure
 - Remove lootbags from various ULV quests
+- Hide Ad Astra oxygen in EMI
+- Hide blasting and smoking categories in EMI
+- Fix flint knife recipe
+- Disable crafting recipe for phenolic boards
 
 **Mod Changes**
 - Downgrade ProbeJS to 6.0.1

diff --git a/config/heracles/quests/introduction/flint_knife.json b/config/heracles/quests/introduction/flint_knife.json
@@ -3,16 +3,22 @@
     "the_start_of_something_new"
   ],
   "tasks": {
-    "flint_knife": {
+    "knife": {
       "type": "heracles:item",
       "item": "gtceu:flint_knife",
       "nbt": {
         "DisallowContainerItem": 0,
         "GT.Behaviours": {},
         "HideFlags": 2,
+        "Enchantments": [
+          {
+            "lvl": 2,
+            "id": "minecraft:fire_aspect"
+          }
+        ],
         "GT.Tool": {
           "AttackDamage": 1,
-          "MaxDamage": 50,
+          "MaxDamage": 63,
           "Damage": 0,
           "AttackSpeed": 3
         }

diff --git a/config/heracles/quests/lvlsthegrindstartshere/aluminium.json b/config/heracles/quests/lvlsthegrindstartshere/aluminium.json
@@ -21,8 +21,8 @@
     "groups": {
       "LV/LS - The Grind Starts Here": {
         "position": [
-          -99,
-          -346
+          -224,
+          -140
         ]
       }
     },

diff --git a/...sts/lvlsthegrindstartshere/lubricant.json → ...s/lvlsthegrindstartshere/arc_furnace.json b/...sts/lvlsthegrindstartshere/lubricant.json → ...s/lvlsthegrindstartshere/arc_furnace.json
@@ -1,19 +1,12 @@
 {
   "dependencies": [
-    "lv_pump",
-    "lv_assembler"
+    "the_first_of_many"
   ],
   "tasks": {
-    "lubricant": {
+    "arc_furnace": {
       "type": "heracles:item",
-      "item": "gtceu:fluid_cell",
-      "nbt": {
-        "Fluid": {
-          "FluidName": "gtceu:lubricant",
-          "Amount": 1000
-        }
-      },
-      "amount": 2,
+      "item": "gtceu:lv_arc_furnace",
+      "amount": 1,
       "collection": "AUTOMATIC"
     }
   },
@@ -23,30 +16,28 @@
       "text": ""
     },
     "description": [
-      "/d/Lubricant/d/ can be gotten in 2 ways:",
-      "",
-      "/d/Brewery/d/: 1 Bucket of /d/Creosote/d/ & /d/Talc/d/ = 1 Bucket of /d/Lubricant/d/",
+      "Allows cheaper recipes for various components. ",
       "",
-      "/d/Distillery/d/: 24mB of /d/Creosote/d/ = 12mB of /d/Lubricant/d/"
+      "All recipes require some amount of /d/Oxygen/d/, so make sure to set up a source soon!"
     ],
     "groups": {
       "LV/LS - The Grind Starts Here": {
         "position": [
-          -35,
-          -262
+          -4,
+          34
         ]
       }
     },
     "icon": {
       "item": {
-        "id": "gtceu:lubricant_bucket",
+        "id": "gtceu:lv_arc_furnace",
         "count": 1
       },
       "type": "heracles:item"
     },
     "icon_background": "heracles:textures/gui/quest_backgrounds/default.png",
     "title": {
-      "translate": "Lubricant"
+      "translate": "Arc Furnace"
     }
   },
   "settings": {

diff --git a/config/heracles/quests/lvlsthegrindstartshere/basic_centrifuge.json b/config/heracles/quests/lvlsthegrindstartshere/basic_centrifuge.json
@@ -0,0 +1,50 @@
+{
+  "dependencies": [
+    "the_first_of_many",
+    "lv_motor"
+  ],
+  "tasks": {
+    "centrifuge": {
+      "type": "heracles:item",
+      "item": "gtceu:lv_centrifuge",
+      "amount": 1,
+      "collection": "AUTOMATIC"
+    }
+  },
+  "rewards": {},
+  "display": {
+    "subtitle": {
+      "text": ""
+    },
+    "description": [
+      "An alternative way to break down materials into their various components."
+    ],
+    "groups": {
+      "LV/LS - The Grind Starts Here": {
+        "position": [
+          -3,
+          -21
+        ]
+      }
+    },
+    "icon": {
+      "item": {
+        "id": "gtceu:lv_centrifuge",
+        "count": 1
+      },
+      "type": "heracles:item"
+    },
+    "icon_background": "heracles:textures/gui/quest_backgrounds/default.png",
+    "title": {
+      "translate": "Basic Centrifuge"
+    }
+  },
+  "settings": {
+    "showDependencyArrow": true,
+    "repeatable": false,
+    "autoClaimRewards": false,
+    "individual_progress": false,
+    "hidden": "LOCKED",
+    "unlockNotification": false
+  }
+}
diff --git a/config/heracles/quests/lvlsthegrindstartshere/basic_electrolyzer.json b/config/heracles/quests/lvlsthegrindstartshere/basic_electrolyzer.json
@@ -0,0 +1,42 @@
+{
+  "dependencies": [
+    "the_first_of_many"
+  ],
+  "tasks": {},
+  "rewards": {},
+  "display": {
+    "subtitle": {
+      "text": ""
+    },
+    "description": [
+      "One way to break down materials into their various components."
+    ],
+    "groups": {
+      "LV/LS - The Grind Starts Here": {
+        "position": [
+          -3,
+          5
+        ]
+      }
+    },
+    "icon": {
+      "item": {
+        "id": "gtceu:lv_electrolyzer",
+        "count": 1
+      },
+      "type": "heracles:item"
+    },
+    "icon_background": "heracles:textures/gui/quest_backgrounds/default.png",
+    "title": {
+      "translate": "Basic Electrolyzer"
+    }
+  },
+  "settings": {
+    "showDependencyArrow": true,
+    "repeatable": false,
+    "autoClaimRewards": false,
+    "individual_progress": false,
+    "hidden": "LOCKED",
+    "unlockNotification": false
+  }
+}
diff --git a/config/heracles/quests/lvlsthegrindstartshere/cheaper_iron.json b/config/heracles/quests/lvlsthegrindstartshere/cheaper_iron.json
@@ -0,0 +1,50 @@
+{
+  "dependencies": [
+    "arc_furnace",
+    "oxygen"
+  ],
+  "tasks": {
+    "iron_ingot": {
+      "type": "heracles:item",
+      "item": "minecraft:iron_ingot",
+      "amount": 1,
+      "collection": "AUTOMATIC"
+    }
+  },
+  "rewards": {},
+  "display": {
+    "subtitle": {
+      "text": ""
+    },
+    "description": [
+      "The Arc Furnace provides a cheaper and faster way to make /d/Iron Ingots/d/, at the cost of some /d/Wrought Iron/d/, /d/Oxygen/d/, and some /d/EU/d/."
+    ],
+    "groups": {
+      "LV/LS - The Grind Starts Here": {
+        "position": [
+          37,
+          34
+        ]
+      }
+    },
+    "icon": {
+      "item": {
+        "id": "minecraft:iron_ingot",
+        "count": 1
+      },
+      "type": "heracles:item"
+    },
+    "icon_background": "heracles:textures/gui/quest_backgrounds/default.png",
+    "title": {
+      "translate": "Cheaper Iron"
+    }
+  },
+  "settings": {
+    "showDependencyArrow": true,
+    "repeatable": false,
+    "autoClaimRewards": false,
+    "individual_progress": false,
+    "hidden": "LOCKED",
+    "unlockNotification": false
+  }
+}
diff --git a/config/heracles/quests/lvlsthegrindstartshere/circuit_assembler.json b/config/heracles/quests/lvlsthegrindstartshere/circuit_assembler.json
@@ -0,0 +1,52 @@
+{
+  "dependencies": [
+    "lv_emitter",
+    "first_mv_circuit",
+    "lv_conveyor",
+    "lv_robot_arm"
+  ],
+  "tasks": {
+    "circuit_assembler": {
+      "type": "heracles:item",
+      "item": "gtceu:lv_circuit_assembler",
+      "amount": 1,
+      "collection": "AUTOMATIC"
+    }
+  },
+  "rewards": {},
+  "display": {
+    "subtitle": {
+      "text": ""
+    },
+    "description": [
+      "Used in the creation of cheaper circuits."
+    ],
+    "groups": {
+      "LV/LS - The Grind Starts Here": {
+        "position": [
+          -33,
+          -223
+        ]
+      }
+    },
+    "icon": {
+      "item": {
+        "id": "gtceu:lv_circuit_assembler",
+        "count": 1
+      },
+      "type": "heracles:item"
+    },
+    "icon_background": "heracles:textures/gui/quest_backgrounds/default.png",
+    "title": {
+      "translate": "Circuit Assembler"
+    }
+  },
+  "settings": {
+    "showDependencyArrow": true,
+    "repeatable": false,
+    "autoClaimRewards": false,
+    "individual_progress": false,
+    "hidden": "LOCKED",
+    "unlockNotification": false
+  }
+}
diff --git a/config/heracles/quests/lvlsthegrindstartshere/cupronickel_coil.json b/config/heracles/quests/lvlsthegrindstartshere/cupronickel_coil.json
@@ -21,8 +21,8 @@
     "groups": {
       "LV/LS - The Grind Starts Here": {
         "position": [
-          -85,
-          -262
+          -145,
+          -140
         ]
       }
     },

diff --git a/config/heracles/quests/lvlsthegrindstartshere/diodes.json b/config/heracles/quests/lvlsthegrindstartshere/diodes.json
@@ -22,8 +22,8 @@
     "groups": {
       "LV/LS - The Grind Starts Here": {
         "position": [
-          -81,
-          -187
+          -117,
+          -206
         ]
       }
     },

diff --git a/config/heracles/quests/lvlsthegrindstartshere/ebf.json b/config/heracles/quests/lvlsthegrindstartshere/ebf.json
@@ -2,6 +2,7 @@
   "dependencies": [
     "cupronickel_coil",
     "lv_energy_hatch",
+    "the_first_of_many",
     "muffler_hatch"
   ],
   "tasks": {
@@ -65,8 +66,8 @@
     "groups": {
       "LV/LS - The Grind Starts Here": {
         "position": [
-          -100,
-          -301
+          -192,
+          -140
         ]
       }
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,8 @@ @@
         "groups": {
           "LV/LS - The Grind Starts Here": {
             "position": [
-              -99,
-              -346
+              -224,
+              -140
             ]
           }
         },
@@ Expand Down @@