Merge pull request #1229 from SymmetricDevs/env-survival-hotfixes

Update SusyCore.groovy

config/betterquesting/DefaultQuests/QuestLines/17.json

@@ -24,14 +24,14 @@
       "sizeX:3": 48,
       "sizeY:3": 48,
       "x:3": -24,
-      "y:3": 120
+      "y:3": 96
     },
     "2:10": {
       "id:3": 69,
       "sizeX:3": 48,
       "sizeY:3": 48,
       "x:3": -24,
-      "y:3": 234
+      "y:3": 204
     },
     "3:10": {
       "id:3": 70,
@@ -268,50 +268,50 @@
       "id:3": 610444332,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -60,
-      "y:3": 72
+      "x:3": -12,
+      "y:3": 48
     },
     "37:10": {
       "id:3": 988736631,
       "sizeX:3": 24,
       "sizeY:3": 24,
       "x:3": 84,
-      "y:3": 246
+      "y:3": 216
     },
     "38:10": {
       "id:3": 1112000445,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -12,
-      "y:3": 72
+      "x:3": 42,
+      "y:3": 108
     },
     "39:10": {
       "id:3": 1403511944,
       "sizeX:3": 36,
       "sizeY:3": 36,
       "x:3": 36,
-      "y:3": 66
+      "y:3": 156
     },
     "40:10": {
       "id:3": 1422303937,
       "sizeX:3": 36,
       "sizeY:3": 36,
       "x:3": 36,
-      "y:3": 240
+      "y:3": 210
     },
     "41:10": {
       "id:3": 1754821293,
       "sizeX:3": 24,
       "sizeY:3": 24,
       "x:3": 84,
-      "y:3": 72
+      "y:3": 162
     },
     "42:10": {
       "id:3": 2114289290,
       "sizeX:3": 36,
       "sizeY:3": 36,
       "x:3": 36,
-      "y:3": 294
+      "y:3": 264
     }
   }
 }

config/betterquesting/DefaultQuests/Quests/17/1422303937.json

@@ -34,7 +34,6 @@
           "id:8": "susy:susy_armor",
           "tag:10": {
             "damage:6": 0.0,
-            "maxOxygen:6": 1200.0,
             "oxygen:6": 1200.0
           }
         },

config/betterquesting/DefaultQuests/Quests/17/1754821293.json

@@ -11,8 +11,7 @@
         "id:8": "susy:susy_armor",
         "tag:10": {
           "damage:6": 0.0,
-          "maxOxygen:6": 1200.0,
-          "oxygen:6": 1200.0
+          "oxygen:6": 3600.0
         }
       },
       "name:8": "susy.quest.db.1754821293.title"
@@ -28,8 +27,7 @@
           "id:8": "susy:susy_armor",
           "tag:10": {
             "damage:6": 0.0,
-            "maxOxygen:6": 1200.0,
-            "oxygen:6": 1200.0
+            "oxygen:6": 3600.0
           }
         }
       },

config/betterquesting/DefaultQuests/Quests/17/68.json

@@ -1,8 +1,6 @@
 {
   "preRequisites:11": [
-    610444332,
-    1112000445,
-    1403511944
+    610444332
   ],
   "properties:10": {
     "betterquesting:10": {

config/betterquesting/DefaultQuests/Quests/17/988736631.json

@@ -10,7 +10,6 @@
         "id:8": "susy:susy_armor",
         "tag:10": {
           "damage:6": 0.0,
-          "maxOxygen:6": 1200.0,
           "oxygen:6": 1200.0
         }
       },
@@ -27,7 +26,6 @@
           "id:8": "susy:susy_armor",
           "tag:10": {
             "damage:6": 0.0,
-            "maxOxygen:6": 1200.0,
             "oxygen:6": 1200.0
           }
         }

config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1112000445.json

@@ -11,7 +11,7 @@
     48,
     88,
     38,
-    67
+    68
   ],
   "properties:10": {
     "betterquesting:10": {

config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1403511944.json

@@ -11,7 +11,7 @@
     99,
     11,
     224,
-    67
+    68
   ],
   "properties:10": {
     "betterquesting:10": {

config/betterquesting/resources/supersymmetry/lang/en_us.lang

@@ -1335,7 +1335,7 @@ susy.quest.db.638.desc=The §6Liquid-Fueled Impeller Jetpack §rprovides a good
 susy.quest.db.639.title=Electric Jetpack
 susy.quest.db.639.desc=The §bElectric Jetpack §ris the first option of §belectric §rpowered flight, at MV. It has a §aHover Mode §rwhich can be activated via a hotkey. Check the Controls tab for more info.
 susy.quest.db.640.title=Gas Mask
-susy.quest.db.640.desc=If you wish to survive the possible §6gas attacks§r, a §3gas mask§r is going to be a must have. %n%nIt will allow you to §cbreathe in gases without having to be concerned about their toxicity§r. It will as well grant the armor rating of a leather helmet.
+susy.quest.db.640.desc=If you wish to survive the possible §6gas attacks§r, a §3gas mask§r is going to be a must have. %n%nIt will allow you to §cbreathe in gases without having to be concerned about their toxicity§r. It will as well grant the armor rating of a leather helmet.%n%nThis is not a replacement for exploration gas masks, however.
 susy.quest.db.641.title=The "Real" Distillation Tower
 susy.quest.db.641.desc=The §6Distillation Tower§r is a multiblock that can be used to break down all of the fractions of §7Oil§r at the same time, without requiring 10 different Distilleries.%n%nThe Distillation Tower is a highly flexible multiblock structure, able to be anywhere from §62 blocks high to up to 13 high§r (12 fluid outputs).%n%nEach level of the tower after the first will output a different fluid from the §6distillation process.§r%n%nAlso, any recipe that has an item output will need an §6Output Bus§r, anywhere on the bottom layer.%nThe §2Input Hatch§r can go anywhere on the bottom layer.§r%n%nThe §6controller§r goes in the middle of an edge of the bottom layer. The §6Energy Input Hatch§r can go anywhere on the bottom layer.
 susy.quest.db.642.title=Chloroform [1-3]
@@ -1849,7 +1849,7 @@ susy.quest.db.530373325.desc=Do you want even more §4Dried Plant Fibers§r, or
 susy.quest.db.577792334.title=Stone Kiln
 susy.quest.db.577792334.desc=The §6Stone Kiln§r is also a type of kiln. Better than the pit kiln, with a thermally insulated chamber made out of §8Masonry Bricks§r, it can hold a higher temperature, making it possible to perform §4calcination§r, a process that turns §7Limestone§r into §7Quicklime§r. It can also fire §6Coke Oven Bricks§r and §6Firebricks§r. And above all, it also has a lower chance of failure than a pit kiln.%n%nTo use a stone kiln, you need to §a[right-click]§r the lower/upper part of the kiln to insert fuels/items that you want to smelt, and then ignite it to start the process.
 susy.quest.db.610444332.title=Smart Ways To Live
-susy.quest.db.610444332.desc=Hopefully, you have not had your lungs filled yet with the trace toxic gases in the §7Beneath§r like §cCarbon Monoxide, Methane, and Hydrogen Sulfide§r. In either case, you can get away just a little longer using a §eSimple Gas Mask§r!%n%nTo be clear, it isn't very good. It does literally break in ten minutes! However, it's very easy to craft, assuming that you have a little §6charcoal§r from a coke oven, some §7paper§r, some §6sticky resin§r, and some string. String can be easily crafted through §dGTFO cotton§r, assuming you make a quick farm.%n%nThis technically is not a required item, but you would have to wait until §7mid-LV§r to go to the §7Beneath§r if you're that strict about your progression.
+susy.quest.db.610444332.desc=Hopefully, you have not had your lungs filled yet with the trace toxic gases in the §7Beneath§r like §cCarbon Monoxide, Methane, and Hydrogen Sulfide§r. In either case, you can get away just a little longer using a §eSimple Gas Mask§r!%n%nTo be clear, it isn't very good. It does literally break in ten minutes! However, it's very easy to craft, assuming that you have a little §6charcoal§r from a coke oven, some §7paper§r, some §6sticky resin§r, and some string. String can be easily crafted through §dGTFO cotton§r, assuming you make a quick farm.
 susy.quest.db.618527753.title=Carbon Black
 susy.quest.db.618527753.desc=Carbon black is an important component of synthetic rubber manufacturing, strengthening the product. It can be produced by partially combusting residues and heavy fractions in a rotary kiln.
 susy.quest.db.641325952.title=Lipid Pretreatment
@@ -1871,8 +1871,7 @@ susy.quest.db.1090881854.desc=The §9Operational Amplifier§r (or just Op Amp) i
 susy.quest.db.1107188354.title=Stone Anvil
 susy.quest.db.1107188354.desc=The §6Stone Anvil§r is not much different than a stone, other than its smooth surface which allows you to §4smash things§r on the top of it.%n%nYou'll need this for §7Masonry Bricks§r.
 susy.quest.db.1112000445.title=Gas Mask v2.0
-susy.quest.db.1112000445.desc=So you don't really want your gas mask to last a maximum of §c20 minutes§r. That's hardly enough to even get anthracite! %n%nFortunately, you've advanced a little since then. You can make your suits out of actually durable materials like §8rubber§r!%n%nThis technically is not a required item, but you would have to wait until §7mid-LV§r to go to the §7Beneath§r if you're that strict about your progression.
-susy.quest.db.1177038065.title=Heated Oil
+susy.quest.db.1112000445.desc=So you don't really want your gas mask to last a maximum of §c10 minutes§r. That's hardly enough to even get anthracite! %n%nFortunately, you've advanced a little since then. You can make your suits out of actually durable materials like §8rubber§r!
 susy.quest.db.1177038065.desc=
 susy.quest.db.1193199034.title=The Gates of Oil Processing Hell
 susy.quest.db.1193199034.desc=The §bsieve distillation tower §ris a slightly cheaper version of the regular distillation tower used in oil processing, which allows for more inputs. These will be ubiquitous in petrochemical processing.

config/gregtech/worldgen/vein/overworld/talc_vein.json

@@ -27,7 +27,7 @@
         "between": "ore:calcite"
       },
       {
-        "sporadic": "ore:magnesite"
+        "sporadic": "ore:talc"
       }
     ]
   }

groovy/postInit/mod/SusyCore.groovy

@@ -143,7 +143,7 @@ crafting.addShaped("susy:gas_mask", item('susy:susy_armor', 2), [
     [metaitem('bound_leather'), metaitem('bound_leather'), metaitem('bound_leather')],
     [null, ore('pipeTinyFluidRubber'), ore('ringRubber')]
 ])
-crafting.addShaped("susy:gas_tank", item('susy:susy_armor', 3).withNbt(['maxOxygen': 1200.0D, 'oxygen': 0.0D]), [
+crafting.addShaped("susy:gas_tank", item('susy:susy_armor', 3).withNbt(['oxygen': 0.0D]), [
     [metaitem('bound_leather'), null, null],
     [metaitem('bound_leather'), ore('pipeTinyFluidRubber'), ore('ringRubber')],
     [metaitem('bound_leather'), metaitem('fluid_cell'), metaitem('bound_leather')]
@@ -154,7 +154,7 @@ crafting.addShaped("susy:easy_cell", metaitem('fluid_cell'), [
     [null, ore('plateSteel')]
 ])
 
-crafting.addShapeless("susy:gas_tank_fill", item('susy:susy_armor', 3).withNbt(['maxOxygen': 1200.0D, 'oxygen': 1200.0D]), 
+crafting.addShapeless("susy:gas_tank_fill", item('susy:susy_armor', 3).withNbt(['oxygen': 1200.0D]), 
     [item('susy:susy_armor', 3),
     metaitem('fluid_cell').withNbt(['Fluid': ['FluidName': 'air', 'Amount': 1000]])
 ])
@@ -182,14 +182,14 @@ mods.gregtech.assembler.recipeBuilder()
     .inputs(metaitem('mineral_wool') * 8)
     .inputs(ore('foilAsbestos') * 8)
     .inputs(metaitem('large_fluid_cell.steel'))
-    .outputs(item('susy:susy_armor', 5).withNbt(['maxOxygen': 1200.0D, 'oxygen': 0.0D]))
+    .outputs(item('susy:susy_armor', 5).withNbt(['oxygen': 0.0D]))
     .duration(400)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
 
 crafting.shapelessBuilder()
     .name("susy:asbestos_tank_fill")
-    .output(item('susy:susy_armor', 5).withNbt(['maxOxygen': 1200.0D, 'oxygen': 1200.0D]))
+    .output(item('susy:susy_armor', 5).withNbt(['oxygen': 1200.0D]))
     .input(item('susy:susy_armor', 5).mark('tank')) 
     .input(metaitem('large_fluid_cell.steel').withNbt(['Fluid': ['FluidName': 'air', 'Amount': 8000]])
         .transform({ _ -> metaitem('large_fluid_cell.steel')}))
@@ -220,15 +220,15 @@ mods.gregtech.assembler.recipeBuilder()
 mods.gregtech.assembler.recipeBuilder()
     .inputs(item('susy:meta_item', 1))
     .inputNBT(item('susy:susy_armor', 5), NBTMatcher.ANY, NBTCondition.ANY)
-    .outputs(item('susy:susy_armor', 8).withNbt(['maxOxygen': 3600.0D, 'oxygen': 0.0D]))
+    .outputs(item('susy:susy_armor', 8).withNbt(['oxygen': 0.0D]))
     .duration(400)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
 
 crafting.shapelessBuilder()
     .name("susy:rebreather_tank_fill")
-    .output(item('susy:susy_armor', 9).withNbt(['maxOxygen': 3600.0D, 'oxygen': 3600.0D]))
-    .input(item('susy:susy_armor', 9).mark('tank')) 
+    .output(item('susy:susy_armor', 8).withNbt(['oxygen': 3600.0D]))
+    .input(item('susy:susy_armor', 8).mark('tank')) 
     .input(metaitem('dustLithiumHydroxide'))
     .input(metaitem('large_fluid_cell.steel').withNbt(['Fluid': ['FluidName': 'air', 'Amount': 8000]])
         .transform({ _ -> metaitem('large_fluid_cell.steel')}))
@@ -247,14 +247,14 @@ mods.gregtech.cvd.recipeBuilder()
 mods.gregtech.cvd.recipeBuilder()
     .inputs(metaitem('dustAluminium'))
     .inputNBT(item('susy:susy_armor', 5), NBTMatcher.ANY, NBTCondition.ANY)
-    .outputs(item('susy:susy_armor', 10).withNbt(['damage': 0.0D, 'maxOxygen': 1200.0D, 'oxygen': 0.0D]))
+    .outputs(item('susy:susy_armor', 10).withNbt(['damage': 0.0D, 'oxygen': 0.0D]))
     .duration(400)
     .EUt(Globals.voltAmps[3])
     .buildAndRegister()
 
 crafting.shapelessBuilder()
     .name("susy:reflective_tank_fill")
-    .output(item('susy:susy_armor', 10).withNbt(['maxOxygen': 1200.0D, 'oxygen': 1200.0D]))
+    .output(item('susy:susy_armor', 10).withNbt(['oxygen': 1200.0D]))
     .input(item('susy:susy_armor', 10).mark('tank')) 
     .input(metaitem('large_fluid_cell.steel').withNbt(['Fluid': ['FluidName': 'air', 'Amount': 8000]])
         .transform({ _ -> metaitem('large_fluid_cell.steel')}))
@@ -265,8 +265,8 @@ crafting.shapelessBuilder()
 // Rebreather tanks can be upgraded too.
 mods.gregtech.cvd.recipeBuilder()
     .inputs(metaitem('dustAluminium'))
-    .inputNBT(item('susy:susy_armor', 4), NBTMatcher.ANY, NBTCondition.ANY)
-    .outputs(item('susy:susy_armor', 10).withNbt(['damage': 0.0D, 'maxOxygen': 1200.0D, 'oxygen': 0.0D]))
+    .inputNBT(item('susy:susy_armor', 8), NBTMatcher.ANY, NBTCondition.ANY)
+    .outputs(item('susy:susy_armor', 10).withNbt(['damage': 0.0D, 'oxygen': 0.0D]))
     .duration(400)
     .EUt(Globals.voltAmps[3])
     .buildAndRegister()
@@ -293,7 +293,7 @@ mods.gregtech.assembler.recipeBuilder()
     .inputs(metaitem('plateStainlessSteel') * 4)
     .inputs(item('susy:meta_item', 1))
     .inputNBT(item('susy:susy_armor', 10), NBTMatcher.ANY, NBTCondition.ANY)
-    .outputs(item('susy:susy_armor', 13).withNbt(['maxOxygen': -1.0D, 'oxygen': 0.0D]))
+    .outputs(item('susy:susy_armor', 13).withNbt(['oxygen': 0.0D]))
     .duration(400)
     .EUt(Globals.voltAmps[3])
     .buildAndRegister()
@@ -328,7 +328,7 @@ mods.gregtech.assembler.recipeBuilder()
     .inputs(ore('threadPolybenzimidazole') * 16)
     .inputs(metaitem('pipeSmallFluidEthyleneVinylAcetate') * 3)
     .inputs(metaitem('plateNomex') * 7)
-    .outputs(item('susy:susy_armor', 16).withNbt(['maxOxygen': -1.0D, 'oxygen': 0.0D]))
+    .outputs(item('susy:susy_armor', 16).withNbt(['oxygen': 0.0D]))
     .duration(400)
     .EUt(Globals.voltAmps[4])
     .buildAndRegister()

mods/extreme-sound-muffler-legacy.pw.toml

@@ -1,6 +1,6 @@
 name = "Extreme Sound Muffler: Legacy"
 filename = "esm-legacy-1.12.2-1.0.2.jar"
-side = "both"
+side = "client"
 
 [download]
 hash-format = "sha1"

mods/susycore.pw.toml

@@ -1,13 +1,13 @@
 name = "SusyCore"
-filename = "supersymmetry-v0.1.44.jar"
+filename = "supersymmetry-v0.1.45.jar"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "c954cfc179c66ba8afea8b4cc5a8458aec1e6d54"
+hash = "2a17eba50f79516ce184a0a4bea1456b56389ac4"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 6099859
+file-id = 6101213
 project-id = 846224

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "8ed118630085cf5c5232d0172ef479f9aa3f3393b78c976b1aef84d86354fd34"
+hash = "ce5e9bc8282a631e33b9f264880592e274b2ff4a4e30559b462e598e5b0ed42d"
 
 [versions]
 forge = "14.23.5.2860"