Lithium Space Age fix

bobequipment/prototypes/recipe/updates.lua

@@ -172,7 +172,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk3-equipment", "battery", "bob-lithium-ion-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk3-equipment", "battery", "bob-battery-2")
       bobmods.lib.recipe.add_ingredient(
         "bob-personal-roboport-mk3-equipment",
         { type = "item", name = "bob-titanium-bearing", amount = 5 }
@@ -186,7 +186,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-3",
       "battery",
-      "bob-lithium-ion-battery"
+      "bob-battery-2"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-antenna-equipment-3",
@@ -267,7 +267,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk4-equipment", "battery", "bob-silver-zinc-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk4-equipment", "battery", "bob-battery-3")
       bobmods.lib.recipe.add_ingredient(
         "bob-personal-roboport-mk4-equipment",
         { type = "item", name = "bob-nitinol-bearing", amount = 5 }
@@ -286,7 +286,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-4",
       "battery",
-      "bob-silver-zinc-battery"
+      "bob-battery-3"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-4",
@@ -449,14 +449,14 @@ if data.raw.item["bob-gilded-copper-cable"] then
   bobmods.lib.tech.add_prerequisite("bob-solar-panel-equipment-3", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-battery-mk3-equipment", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("battery-mk3-equipment", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-battery-equipment-3", "bob-battery-2")
 
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-3", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-personal-laser-defense-equipment-3",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 3 }
+    { type = "item", name = "bob-battery-2", amount = 3 }
   )
   bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-3", "bob-battery-2")
 end
@@ -591,21 +591,27 @@ if data.raw.item["bob-tungsten-carbide"] then
   bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-tungsten-alloy-processing")
 end
 
-if data.raw.item["bob-lithium"] then
+if mods["space-age"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-fission-reactor-equipment-4",
+    { type = "item", name = "lithium-plate", amount = 40 }
+  )
+  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-4", "cryogenic-science-pack")
+elseif data.raw.item["lithium"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-fission-reactor-equipment-3",
-    { type = "item", name = "bob-lithium", amount = 40 }
+    { type = "item", name = "lithium", amount = 40 }
   )
   bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-lithium-processing")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-battery-mk5-equipment", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-battery-mk5-equipment", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-battery-equipment-5", "bob-battery-3")
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-5", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-personal-laser-defense-equipment-5",
-    { type = "item", name = "bob-silver-zinc-battery", amount = 3 }
+    { type = "item", name = "bob-battery-3", amount = 3 }
   )
   bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-5", "bob-battery-3")
 end

boblogistics/prototypes/recipe/roboport-recipe-updates.lua

@@ -49,8 +49,8 @@ if data.raw.item["bob-insulated-cable"] then
   bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-3", "copper-cable", "bob-insulated-cable")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-3", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-3", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "bob-battery-2")
 end
 
@@ -101,12 +101,12 @@ if data.raw.item["bob-advanced-processing-unit"] then
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-battery-3")
 else
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-battery-2")
   end
 end
 

boblogistics/prototypes/recipe/robots-recipe-updates.lua

@@ -310,8 +310,8 @@ else
 end
 
 if data.raw.item["bob-flying-robot-frame-3"] then
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-3", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-3", "battery", "bob-battery-2")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -334,8 +334,8 @@ else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-lithium-ion-battery", amount = 2 })
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-2", amount = 2 })
     else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
     end
@@ -351,11 +351,11 @@ else
 end
 
 if data.raw.item["bob-flying-robot-frame-4"] then
-  if data.raw.item["bob-silver-zinc-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-silver-zinc-battery")
+  if data.raw.item["bob-battery-3"] then
+    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-battery-3")
   else
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-lithium-ion-battery")
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-battery-2")
     end
   end
 
@@ -379,11 +379,11 @@ else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
-    if data.raw.item["bob-silver-zinc-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-silver-zinc-battery", amount = 2 })
+    if data.raw.item["bob-battery-3"] then
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-3", amount = 2 })
     else
-      if data.raw.item["bob-lithium-ion-battery"] then
-        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-lithium-ion-battery", amount = 2 })
+      if data.raw.item["bob-battery-2"] then
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-2", amount = 2 })
       else
         bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
       end

boblogistics/prototypes/technology-updates.lua

@@ -257,7 +257,7 @@ end
 
 bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "processing-unit")
 
-if data.raw.item["bob-lithium-ion-battery"] and data.raw.technology["bob-battery-2"] then
+if data.raw.item["bob-battery-2"] and data.raw.technology["bob-battery-2"] then
   if data.raw.technology["bob-robotics-3"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-3", "bob-battery-2")
   else
@@ -282,7 +282,7 @@ else
   end
 end
 
-if data.raw.item["bob-silver-zinc-battery"] and data.raw.technology["bob-battery-3"] then
+if data.raw.item["bob-battery-3"] and data.raw.technology["bob-battery-3"] then
   if data.raw.technology["bob-robotics-4"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-4", "bob-battery-3")
   else

bobplates/data-final-fixes.lua

@@ -15,3 +15,7 @@ end
 if mods["aai-industry"] then
   bobmods.lib.tech.remove_recipe_unlock("glass-processing", "glass")
 end
+
+if mods["space-age"] then
+  bobmods.lib.tech.replace_prerequisite_in_all("bob-lithium-processing", "cryogenic-science-pack")
+end

bobplates/data-updates.lua

@@ -308,7 +308,9 @@ if settings.startup["bobmods-plates-purewater"].value == true then
 
   bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-distillery")
   bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water")
-  bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water-from-lithia")
+  if not mods["space-age"] then
+    bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water-from-lithia")
+  end
 end
 
 data.raw.fluid["petroleum-gas"].gas_temperature = -42
@@ -443,8 +445,8 @@ if mods["quality"] then
     "bob-steel-chemical-furnace",
     "bob-electric-chemical-furnace",
     "bob-polishing-wheel",
-    "bob-lithium-ion-battery",
-    "bob-silver-zinc-battery",
+    "bob-battery-2",
+    "bob-battery-3",
     "battery",
     "cargo-landing-pad",
     "rocket-silo",
@@ -457,6 +459,11 @@ if mods["quality"] then
 end
 
 if mods["space-age"] then
-  data.raw.recipe["bob-lithium-ion-battery"].category = "chemistry-or-cryogenics"
-  data.raw.recipe["bob-silver-zinc-battery"].category = "chemistry-or-cryogenics"
+  data.raw.fluid["bob-lithia-water"].hidden = true
+  data.raw.resource["bob-lithia-water"].hidden = true
+  data.raw.item["bob-lithia-water-barrel"].hidden = true
+  data.raw.recipe["bob-lithia-water-barrel"].hidden = true
+  data.raw.recipe["empty-bob-lithia-water-barrel"].hidden = true
+  bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "bob-lithia-water-barrel")
+  bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-bob-lithia-water-barrel")
 end

bobplates/data.lua

@@ -23,7 +23,9 @@ if bobmods.ores.bauxite.create_autoplace then
   end
   if settings.startup["bobmods-plates-groundwater"].value == false then
     bobmods.ores.water.create_autoplace()
-    bobmods.ores.lithia_water.create_autoplace()
+    if not mods["space-age"] then
+      bobmods.ores.lithia_water.create_autoplace()
+    end
   end
   bobmods.ores.thorium.create_autoplace()
 end

bobplates/migrations/bobplates_2.0.0.json

@@ -121,10 +121,8 @@
     ["lead-plate", "bob-lead-plate"],
     ["liquid-fuel-barrel", "bob-liquid-fuel-barrel"],
     ["lithia-water-barrel", "bob-lithia-water-barrel"],
-    ["lithium", "bob-lithium"],
     ["lithium-chloride", "bob-lithium-chloride"],
     ["lithium-cobalt-oxide", "bob-lithium-cobalt-oxide"],
-    ["lithium-ion-battery", "bob-lithium-ion-battery"],
     ["lithium-perchlorate", "bob-lithium-perchlorate"],
     ["nickel-ore", "bob-nickel-ore"],
     ["nickel-plate", "bob-nickel-plate"],
@@ -165,7 +163,6 @@
     ["silver-ore", "bob-silver-ore"],
     ["silver-oxide", "bob-silver-oxide"],
     ["silver-plate", "bob-silver-plate"],
-    ["silver-zinc-battery", "bob-silver-zinc-battery"],
     ["sodium-hydroxide", "bob-sodium-hydroxide"],
     ["steel-bearing", "bob-steel-bearing"],
     ["steel-bearing-ball", "bob-steel-bearing-ball"],
@@ -317,10 +314,8 @@
     ["liquid-air", "bob-liquid-air"],
     ["liquid-fuel", "bob-liquid-fuel"],
     ["lithia-water", "bob-lithia-water"],
-    ["lithium", "bob-lithium"],
     ["lithium-chloride", "bob-lithium-chloride"],
     ["lithium-cobalt-oxide", "bob-lithium-cobalt-oxide"],
-    ["lithium-ion-battery", "bob-lithium-ion-battery"],
     ["lithium-water-electrolysis", "bob-lithium-perchlorate"],
     ["nickel-plate", "bob-nickel-plate"],
     ["nitinol-alloy", "bob-nitinol-alloy"],
@@ -358,7 +353,6 @@
     ["silver-nitrate", "bob-silver-nitrate"],
     ["silver-oxide", "bob-silver-oxide"],
     ["silver-plate", "bob-silver-plate"],
-    ["silver-zinc-battery", "bob-silver-zinc-battery"],
     ["solid-fuel-from-hydrogen", "bob-solid-fuel-from-hydrogen"],
     ["steel-bearing", "bob-steel-bearing"],
     ["steel-bearing-ball", "bob-steel-bearing-ball"],

bobplates/migrations/bobplates_2.0.6.json

@@ -1,6 +1,19 @@
 {
+  "item":
+  [
+    ["bob-lithium", "lithium"],
+    ["bob-lithium-ion-battery", "bob-battery-2"],
+    ["lithium-ion-battery", "bob-battery-2"],
+    ["bob-silver-zinc-battery", "bob-battery-2"],
+    ["silver-zinc-battery", "bob-battery-2"]
+  ],
   "recipe":
   [
-    ["bob-heavy-water-electrolysis", "bob-deuterium"]
+    ["bob-heavy-water-electrolysis", "bob-deuterium"],
+    ["bob-lithium", "lithium"],
+    ["bob-lithium-ion-battery", "bob-battery-2"],
+    ["lithium-ion-battery", "bob-battery-2"],
+    ["bob-silver-zinc-battery", "bob-battery-2"],
+    ["silver-zinc-battery", "bob-battery-2"]
   ]
 }

bobplates/migrations/bobplates_2.0.6.lua

@@ -0,0 +1,5 @@
+for index, force in pairs(game.forces) do
+  if force.technologies["bob-lithium-processing"].researched and prototypes.technology["lithium-processing"] then
+    force.technologies["lithium-processing"].researched = true
+  end
+end

bobplates/prototypes/item/parts.lua

@@ -238,7 +238,8 @@ data:extend({
 
   {
     type = "item",
-    name = "bob-lithium-ion-battery",
+    name = "bob-battery-2",
+    localised_name = { "item-name.bob-lithium-ion-battery" },
     icon = "__bobplates__/graphics/icons/lithium-ion-battery.png",
     icon_size = 64,
     subgroup = "intermediate-product",
@@ -260,7 +261,8 @@ data:extend({
 
   {
     type = "item",
-    name = "bob-silver-zinc-battery",
+    name = "bob-battery-3",
+    localised_name = { "item-name.bob-silver-zinc-battery" },
     icon = "__bobplates__/graphics/icons/silver-zinc-battery.png",
     icon_size = 64,
     subgroup = "intermediate-product",
@@ -328,3 +330,11 @@ data:extend({
     },
   },
 })
+
+if mods["space-age"] then
+  data.raw.item["bob-battery-2"].localised_name = { "item-name.bob-silver-zinc-battery" }
+  data.raw.item["bob-battery-3"].localised_name = { "item-name.bob-lithium-ion-battery" }
+  data.raw.item["bob-battery-2"].icon = "__bobplates__/graphics/icons/silver-zinc-battery.png"
+  data.raw.item["bob-battery-3"].icon = "__bobplates__/graphics/icons/lithium-ion-battery.png"
+end
+

bobplates/prototypes/item/plates.lua

@@ -128,18 +128,6 @@ data:extend({
       volume = 0.6,
     },
   },
-  {
-    type = "item",
-    name = "bob-lithium",
-    icon = "__bobplates__/graphics/icons/plate/lithium-plate.png",
-    icon_size = 64,
-    subgroup = "bob-material",
-    order = "c-a-e[bob-lithium-plate]",
-    stack_size = 200,
-    drop_sound = plate_drop_move,
-    inventory_move_sound = plate_drop_move,
-    pick_sound = plate_pick,
-  },
   {
     type = "item",
     name = "bob-cobalt-plate",
@@ -153,3 +141,22 @@ data:extend({
     pick_sound = plate_pick,
   },
 })
+
+if not data.raw.item.lithium then
+  data:extend({
+    {
+      type = "item",
+      name = "lithium",
+      localised_name = { "item-name.bob-lithium" },
+      icon = "__bobplates__/graphics/icons/plate/lithium-plate.png",
+      icon_size = 64,
+      subgroup = "bob-material",
+      order = "c-a-e[bob-lithium-plate]",
+      stack_size = 200,
+      drop_sound = plate_drop_move,
+      inventory_move_sound = plate_drop_move,
+      pick_sound = plate_pick,
+      weight = 500,
+    },
+  })
+end

bobplates/prototypes/recipe/chemistry-recipe.lua

@@ -949,3 +949,8 @@ data:extend({
 if mods["bobpower"] then
   data.raw.recipe["bob-sodium-hydroxide-sink"].results[1].temperature = 465
 end
+
+if mods["space-age"] then
+  bobmods.lib.recipe.replace_ingredient("bob-lithium-chloride", "bob-lithia-water", "lithium-brine")
+  bobmods.lib.recipe.hide("bob-pure-water-from-lithia")
+end

bobplates/prototypes/recipe/nuclear-recipe.lua

@@ -249,7 +249,7 @@ data:extend({
         ignored_by_productivity = 10,
         ignored_by_stats = 10,
       },
-      { type = "item", name = "bob-lithium", amount = 1, probability = 0.1 },
+      { type = "item", name = "lithium", amount = 1, probability = 0.1 },
       { type = "item", name = "bob-fusion-catalyst", amount = 1 },
     },
     crafting_machine_tint = {