diff --git a/Tantalite2/data-util.lua b/Tantalite2/data-util.lua deleted file mode 100644 index e2cbe2a..0000000 --- a/Tantalite2/data-util.lua +++ /dev/null @@ -1,4 +0,0 @@ -local me = require("me") -local util = require("__bzlib__/data-util"); -util.initialize(me) -return util \ No newline at end of file diff --git a/Tantalite2/me.lua b/Tantalite2/me.lua deleted file mode 100644 index ab5ba72..0000000 --- a/Tantalite2/me.lua +++ /dev/null @@ -1,7 +0,0 @@ -local me = {} - -me.name = "Tantalite2" -me.bypass = {} -me.add_modified = function() end - -return me diff --git a/Tantalite2/prototypes/niobium-recipe.lua b/Tantalite2/prototypes/niobium-recipe.lua index cda899c..60b70c7 100644 --- a/Tantalite2/prototypes/niobium-recipe.lua +++ b/Tantalite2/prototypes/niobium-recipe.lua @@ -1,4 +1,4 @@ -local util = require("data-util") +local util = require("__bzlib__/data-util") data:extend({{ type = "item-subgroup", @@ -140,7 +140,7 @@ if mods["248k-Redux"] and mods["space-exploration"] then order = "h", enabled = false, energy_required = 8, - ingredients = {{type="item", name="niobium-plate", amount = 1}, {type="item", name="fi_energy_crystal", amount=1}, { type = "fluid", name = "se-liquid-rocket-fuel", amount = 10 }}, + ingredients = {{type="item", name="niobium-plate", amount = 1}, {type="item", name="fu_materials_energy_crystal", amount=1}, { type = "fluid", name = "se-liquid-rocket-fuel", amount = 10 }}, results = {{ type = "fluid", name = "se-pyroflux", amount = 10 }}, } }) diff --git a/Tantalite2/prototypes/tantalite-248k.lua b/Tantalite2/prototypes/tantalite-248k.lua index cbeac02..8e74860 100644 --- a/Tantalite2/prototypes/tantalite-248k.lua +++ b/Tantalite2/prototypes/tantalite-248k.lua @@ -1,4 +1,4 @@ -local util = require("data-util") +local util = require("__bzlib__/data-util") if mods["248k-Redux"] then data:extend({ diff --git a/Tantalite2/prototypes/tantalite-enriched.lua b/Tantalite2/prototypes/tantalite-enriched.lua index 71ebfc5..1b3cc32 100644 --- a/Tantalite2/prototypes/tantalite-enriched.lua +++ b/Tantalite2/prototypes/tantalite-enriched.lua @@ -1,4 +1,4 @@ -local util = require("data-util") +local util = require("__bzlib__/data-util") if mods["Krastorio2"] then data:extend( diff --git a/Tantalite2/prototypes/tantalite-ore.lua b/Tantalite2/prototypes/tantalite-ore.lua index 9d0d325..40e7b2b 100644 --- a/Tantalite2/prototypes/tantalite-ore.lua +++ b/Tantalite2/prototypes/tantalite-ore.lua @@ -1,6 +1,6 @@ local resource_autoplace = require('resource-autoplace'); local item_sounds = require('__base__.prototypes.item_sounds') -local util = require("data-util") +local util = require("__bzlib__/data-util") data.raw.planet.nauvis.map_gen_settings.autoplace_controls["tantalite-ore"] = {} data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["tantalite-ore"] = {} diff --git a/Tantalite2/prototypes/tantalite-recipe-se.lua b/Tantalite2/prototypes/tantalite-recipe-se.lua index 8ae9c2f..5aeb745 100644 --- a/Tantalite2/prototypes/tantalite-recipe-se.lua +++ b/Tantalite2/prototypes/tantalite-recipe-se.lua @@ -1,5 +1,5 @@ -- Additional recipes if Space Exploration mod is enabled -local util = require("data-util") +local util = require("__bzlib__/data-util") if mods["space-exploration"] then se_delivery_cannon_recipes["tantalite-ore"] = {name= "tantalite-ore"} diff --git a/Tantalite2/prototypes/tantalum-recipe.lua b/Tantalite2/prototypes/tantalum-recipe.lua index e569c76..9a31245 100644 --- a/Tantalite2/prototypes/tantalum-recipe.lua +++ b/Tantalite2/prototypes/tantalum-recipe.lua @@ -1,4 +1,4 @@ -local util = require("data-util") +local util = require("__bzlib__/data-util") data:extend({ { @@ -30,7 +30,7 @@ if mods["248k-Redux"] then enabled = false, energy_required = 14, ingredients = { { type = "item", name = "thorium-ore", amount = 10 } }, - results = { { type = "item", name = "fi_thorium232", amount = 1 } }, + results = { { type = "item", name = "fi_thorium232_item", amount = 1 } }, } }) util.add_unlock("uranium-processing", "thorium-processing") --maybe add its own tech later diff --git a/Tantalite2/prototypes/technology.lua b/Tantalite2/prototypes/technology.lua index dd218c5..2c49896 100644 --- a/Tantalite2/prototypes/technology.lua +++ b/Tantalite2/prototypes/technology.lua @@ -1,4 +1,4 @@ -local util = require("data-util") +local util = require("__bzlib__/data-util") local electron_emitter_prerequisites = {"laser"} if mods["248k-Redux"] then diff --git a/Tantalite2/recipe-final-fix.lua b/Tantalite2/recipe-final-fix.lua index ab3c1ec..eb3ea36 100644 --- a/Tantalite2/recipe-final-fix.lua +++ b/Tantalite2/recipe-final-fix.lua @@ -1,4 +1,4 @@ -local util = require("data-util") +local util = require("__bzlib__/data-util") util.remove_ingredient("rocket-control-unit", mods["Krastorio2"] and "kr-glass" or "glass") util.remove_ingredient("rocket-control-unit", "advanced-circuit") diff --git a/Tantalite2/recipe-modify.lua b/Tantalite2/recipe-modify.lua index 8be828d..9a5e9ee 100644 --- a/Tantalite2/recipe-modify.lua +++ b/Tantalite2/recipe-modify.lua @@ -1,4 +1,4 @@ -local util = require("data-util") +local util = require("__bzlib__/data-util") -- Main vanilla changes util.replace_ingredient("laser-turret", "electronic-circuit", "electron-gun", 5)