From 67cbec7671eb828db990593a559c37da0b82e15b Mon Sep 17 00:00:00 2001 From: Brevven Date: Sat, 24 Jul 2021 22:52:53 -0700 Subject: [PATCH] rename util to data-util --- data-final-fixes.lua | 2 +- util.lua => data-util.lua | 0 lead-enriched.lua | 2 +- lead-matter.lua | 2 +- lead-ore.lua | 2 +- lead-recipe-colors.lua | 2 +- lead-recipe-final-5d.lua | 2 +- lead-recipe-final-rrr.lua | 2 +- lead-recipe-final.lua | 2 +- lead-recipe-se.lua | 2 +- lead-recipe-updates.lua | 2 +- lead-recipe.lua | 2 +- omni.lua | 2 +- other-entities.lua | 4 ++-- strange-matter.lua | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename util.lua => data-util.lua (100%) diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 80570ec..ffd5905 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -7,7 +7,7 @@ require("lead-recipe-final-rrr") ---- -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then -- If furnaces are treated as furnaces, we need 2 outputs diff --git a/util.lua b/data-util.lua similarity index 100% rename from util.lua rename to data-util.lua diff --git a/lead-enriched.lua b/lead-enriched.lua index b53630f..57e6200 100644 --- a/lead-enriched.lua +++ b/lead-enriched.lua @@ -1,5 +1,5 @@ -- Enriched Lead for Krastorio2 -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if mods["Krastorio2"] then data:extend( diff --git a/lead-matter.lua b/lead-matter.lua index 14e87a1..4a96b4a 100644 --- a/lead-matter.lua +++ b/lead-matter.lua @@ -1,6 +1,6 @@ -- Matter recipes for Krastorio2 if mods["Krastorio2"] then -local matter = require("__Krastorio2__/lib/public/data-stages/matter-util") +local matter = require("__Krastorio2__/lib/public/data-stages/matter-data-util") data:extend( { diff --git a/lead-ore.lua b/lead-ore.lua index 257ec94..9737b5a 100644 --- a/lead-ore.lua +++ b/lead-ore.lua @@ -1,7 +1,7 @@ local resource_autoplace = require('resource-autoplace'); local noise = require('noise'); -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); data:extend({ { diff --git a/lead-recipe-colors.lua b/lead-recipe-colors.lua index 5dad156..b1f07e1 100644 --- a/lead-recipe-colors.lua +++ b/lead-recipe-colors.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); diff --git a/lead-recipe-final-5d.lua b/lead-recipe-final-5d.lua index d5ac47a..3c9940b 100644 --- a/lead-recipe-final-5d.lua +++ b/lead-recipe-final-5d.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if mods["5dim_core"] then diff --git a/lead-recipe-final-rrr.lua b/lead-recipe-final-rrr.lua index d7d20e5..6e57a43 100644 --- a/lead-recipe-final-rrr.lua +++ b/lead-recipe-final-rrr.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if mods["Rich-Rocks-Requiem"] then if data.raw.recipe["rrr-stone-processing"] then diff --git a/lead-recipe-final.lua b/lead-recipe-final.lua index dbc7a1e..d03c6f5 100644 --- a/lead-recipe-final.lua +++ b/lead-recipe-final.lua @@ -1,7 +1,7 @@ -- Titanium recipe & tech changes -- These are in "final" for compatibility with other mods such as Space Exploration, AAI and Krastorio 2 -local util = require("__bztitanium__.util"); +local util = require("__bztitanium__.data-util"); if (mods["bobrevamp"] and not mods["bobplates"] and not mods["angelssmelting"]) then -- TODO diff --git a/lead-recipe-se.lua b/lead-recipe-se.lua index 9394f4d..e01768d 100644 --- a/lead-recipe-se.lua +++ b/lead-recipe-se.lua @@ -1,5 +1,5 @@ -- Additional recipes if Space Exploration mod is enabled -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if mods["space-exploration"] then se_delivery_cannon_recipes[util.me.lead_ore] = {name= util.me.lead_ore} diff --git a/lead-recipe-updates.lua b/lead-recipe-updates.lua index 0ad678b..564f99b 100644 --- a/lead-recipe-updates.lua +++ b/lead-recipe-updates.lua @@ -1,6 +1,6 @@ -- Titanium recipe & tech changes -- -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] and not mods["IndustrialRevolution"]) then util.replace_ingredient("pipe", "iron-plate", "lead-plate") diff --git a/lead-recipe.lua b/lead-recipe.lua index 4a68119..f6fab57 100644 --- a/lead-recipe.lua +++ b/lead-recipe.lua @@ -1,6 +1,6 @@ -- Lead smelting -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] and not mods["IndustrialRevolution"]) then data:extend({ diff --git a/omni.lua b/omni.lua index f047704..a80c779 100644 --- a/omni.lua +++ b/omni.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then if omni and omni.matter then diff --git a/other-entities.lua b/other-entities.lua index 1637d0c..c6126fb 100644 --- a/other-entities.lua +++ b/other-entities.lua @@ -1,5 +1,5 @@ -local leadutil = require("__bzlead__.util"); -require("util") +local leadutil = require("__bzlead__.data-util"); +require("data-util") if leadutil.me.more_entities() then data:extend({ diff --git a/strange-matter.lua b/strange-matter.lua index ee380e2..529267f 100644 --- a/strange-matter.lua +++ b/strange-matter.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.util"); +local util = require("__bzlead__.data-util"); local ore = "lead-ore"