cacklingfiend/bzlib
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: cacklingfiend:main
Branches Tags
cacklingfiend:main
cacklingfiend:1.1.0
cacklingfiend:1.0.1
cacklingfiend:1.0.0
..
compare: cacklingfiend:1.0.0
Branches Tags
cacklingfiend:main
cacklingfiend:1.1.0
cacklingfiend:1.0.1
cacklingfiend:1.0.0

No commits in common. "main" and "1.0.0" have entirely different histories.
main ... 1.0.0

3 changed files with 30 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bzlib/changelog.txt
View file

@ -1,12 +0,0 @@
---------------------------------------------------------------------------------------------------
Version: 1.1.0
Date: 13.03.2026
Changes:
- Add get_setting
- Make `me` optional
---------------------------------------------------------------------------------------------------
Version: 1.0.1
Date: 11.03.2026
Bug Fixes:
- K2: Fix bug in matter recipe generation
- Fix bug in add_icon when icons table is nil

70
bzlib/data-util.lua
View file

@ -80,13 +80,6 @@ function util.initialize(them)
util.me = me
end
function util.get_setting(name)
if settings.startup[name] == nil then
return nil
end
return settings.startup[name].value
end
function util.item(item, quantity, probability)
if not quantity then
quantity = 1
@ -124,13 +117,13 @@ end
allbypass = {}
if get_setting("bz-recipe-bypass") then
for recipe in string.gmatch(util.get_setting("bz-recipe-bypass"), '[^",%s]+') do
for recipe in string.gmatch(me.get_setting("bz-recipe-bypass"), '[^",%s]+') do
allbypass[recipe] = true
end
end
function util.is_foundry()
return util.bz.foundry and not util.get_setting("bzfoundry-minimal")
return util.bz.foundry and not me.get_setting("bzfoundry-minimal")
end
function should_force(options)
@ -138,7 +131,7 @@ function should_force(options)
end
function bypass(recipe_name)
if me and me.bypass[recipe_name] then
if me.bypass[recipe_name] then
return true
end
if allbypass[recipe_name] then
@ -423,7 +416,7 @@ function util.add_gleba_rock(resource, amount_min, amount_max)
})
local probability = data.raw["simple-entity"]["gleba-rock"].autoplace.probability_expression
-- A lot more common near starting point when aps gleba
local factor = (mods["any-planet-start"] and util.get_setting("aps-planet") == "gleba" and 20) or 1
local factor = (mods["any-planet-start"] and me.get_setting("aps-planet") == "gleba" and 20) or 1
data.raw["simple-entity"]["gleba-rock"].autoplace.probability_expression = probability .. [[*
if(distance_from_nearest_point{x = x, y = y, points = starting_positions} < 200, ]] .. factor .. [[,
if(distance_from_nearest_point{x = x, y = y, points = starting_positions} < 700,
@ -432,8 +425,8 @@ function util.add_gleba_rock(resource, amount_min, amount_max)
end
if data.raw.item[resource] then
amount_min = (amount_min or 10) * ((mods["any-planet-start"] and util.get_setting("aps-planet") == "gleba" and 4) or 1)
amount_max = (amount_max or 20) * ((mods["any-planet-start"] and util.get_setting("aps-planet") == "gleba" and 4) or 1)
amount_min = (amount_min or 10) * ((mods["any-planet-start"] and me.get_setting("aps-planet") == "gleba" and 4) or 1)
amount_max = (amount_max or 20) * ((mods["any-planet-start"] and me.get_setting("aps-planet") == "gleba" and 4) or 1)
util.add_minable_result(
"simple-entity", "gleba-rock",
{ type = "item", name = resource, amount_min = amount_min, amount_max = amount_max })
@ -536,7 +529,7 @@ function util.se_landfill(params)
type = "recipe",
icons = {
{ icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 },
{ icon = "__" .. (me and me.name or params.ore) .. "__/graphics/icons/" .. params.ore .. ".png", icon_size = params.icon_size, scale = 0.33 * 64 / params.icon_size },
{ icon = "__" .. me.name .. "__/graphics/icons/" .. params.ore .. ".png", icon_size = params.icon_size, scale = 0.33 * 64 / params.icon_size },
},
energy_required = 1,
enabled = false,
@ -607,7 +600,7 @@ function util.k2matter(params)
time = 45,
},
effects = {},
localised_name = { "technology-name.k2-conversion", { "item-name." .. params.k2matter.material.name } },
localised_name = { "technology-name.k2-conversion", { "item-name." .. params.k2matter.item_name } },
},
})
end
@ -644,7 +637,7 @@ function util.se_matter(params)
icon_size = 64, scale = 0.5 },
{ icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png",
icon_size = 64, scale = 0.33, shift = { 8, -8 } },
{ icon = "__" .. (me and me.name or params.ore) .. "__/graphics/icons/" .. params.ore .. ".png",
{ icon = "__" .. util.me.name .. "__/graphics/icons/" .. params.ore .. ".png",
icon_size = params.icon_size, scale = 0.33 * 64 / params.icon_size, shift = { -8, 8 } },
{ icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png",
icon_size = 64, scale = 0.5 },
@ -683,7 +676,7 @@ function util.se_matter(params)
icon_size = 64, scale = 0.5 },
{ icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png",
icon_size = 64, scale = 0.33, shift = { -8, 8 } },
{ icon = "__" .. (me and me.name or params.ore) .. "__/graphics/icons/" .. params.ore .. ".png",
{ icon = "__" .. util.me.name .. "__/graphics/icons/" .. params.ore .. ".png",
icon_size = params.icon_size, scale = 0.33 * 64 / params.icon_size, shift = { 8, -8 } },
{ icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png",
icon_size = 64, scale = 0.5 },
@ -967,7 +960,7 @@ function util.add_ingredient(recipe_name, ingredient, quantity, options)
end
local is_fluid = not not data.raw.fluid[ingredient]
if data.raw.recipe[recipe_name] and (util.get_item(ingredient) or is_fluid) then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
add_ingredient(data.raw.recipe[recipe_name], ingredient, quantity, is_fluid)
end
@ -1018,7 +1011,7 @@ function util.set_ingredient(recipe_name, ingredient, quantity, options)
end
if data.raw.recipe[recipe_name] and data.raw.item[ingredient] then
local is_fluid = not not data.raw.fluid[ingredient]
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
set_ingredient(data.raw.recipe[recipe_name], ingredient, quantity, is_fluid)
end
@ -1130,7 +1123,7 @@ function util.replace_ingredient(recipe_name, old, new, amount, multiply, option
return
end
if data.raw.recipe[recipe_name] and (data.raw.item[new] or data.raw.fluid[new]) and (data.raw.item[old] or data.raw.fluid[old]) then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
replace_ingredient(data.raw.recipe[recipe_name], old, new, amount, multiply)
end
@ -1164,7 +1157,7 @@ function util.remove_ingredient(recipe_name, old, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
remove_ingredient(data.raw.recipe[recipe_name], old)
end
@ -1192,7 +1185,7 @@ function util.replace_some_product(recipe_name, old, old_amount, new, new_amount
end
local is_fluid = not not data.raw.fluid[new] -- NOTE CURRENTLY UNUSUED
if data.raw.recipe[recipe_name] and (data.raw.item[new] or is_fluid) then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
replace_some_product(data.raw.recipe[recipe_name], old, old_amount, new, new_amount, is_fluid)
end
@ -1226,7 +1219,7 @@ function util.replace_some_ingredient(recipe_name, old, old_amount, new, new_amo
end
local is_fluid = not not data.raw.fluid[new]
if data.raw.recipe[recipe_name] and (data.raw.item[new] or is_fluid) then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
replace_some_ingredient(data.raw.recipe[recipe_name], old, old_amount, new, new_amount, is_fluid)
end
@ -1254,7 +1247,7 @@ function util.set_product_probability(recipe_name, product, probability, options
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
set_product_probability(data.raw.recipe[recipe_name], product, probability)
end
@ -1278,7 +1271,7 @@ function util.set_product_amount(recipe_name, product, amount, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
set_product_amount(data.raw.recipe[recipe_name], product, amount)
end
@ -1309,7 +1302,7 @@ function util.multiply_recipe(recipe_name, multiple, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
multiply_recipe(data.raw.recipe[recipe_name], multiple)
end
@ -1351,7 +1344,7 @@ function util.multiply_ingredients(recipe_name, multiple, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
multiply_ingredients(data.raw.recipe[recipe_name], multiple)
end
@ -1392,7 +1385,7 @@ function util.remove_product(recipe_name, old, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
remove_product(data.raw.recipe[recipe_name], old)
end
@ -1475,7 +1468,7 @@ function util.set_recipe_time(recipe_name, time, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
set_recipe_time(data.raw.recipe[recipe_name], time)
end
@ -1495,7 +1488,7 @@ function util.multiply_time(recipe_name, factor, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
multiply_time(data.raw.recipe[recipe_name], factor)
end
@ -1515,7 +1508,7 @@ function util.add_time(recipe_name, amount, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
add_time(data.raw.recipe[recipe_name], amount)
end
@ -1542,7 +1535,7 @@ function util.set_category(recipe_name, category, options)
return
end
if data.raw.recipe[recipe_name] and data.raw["recipe-category"][category] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
prepare_redo_recycling(recipe_name)
data.raw.recipe[recipe_name].category = category
end
@ -1554,7 +1547,7 @@ function util.set_subgroup(recipe_name, subgroup, options)
return
end
if data.raw.recipe[recipe_name] and data.raw["item-subgroup"][subgroup] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
data.raw.recipe[recipe_name].subgroup = subgroup
end
end
@ -1574,7 +1567,7 @@ function util.add_icon(recipe_name, icon, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
if not (data.raw.recipe[recipe_name].icons and #(data.raw.recipe[recipe_name].icons) > 0) then
if data.raw.recipe[recipe_name].icon then
data.raw.recipe[recipe_name].icons = { {
@ -1598,7 +1591,6 @@ function util.add_icon(recipe_name, icon, options)
data.raw.recipe[recipe_name].icon = nil
data.raw.recipe[recipe_name].icon_size = nil
end
data.raw.recipe[recipe_name].icons = data.raw.recipe[recipe_name].icons or {}
table.insert(data.raw.recipe[recipe_name].icons, icon)
end
end
@ -1609,7 +1601,7 @@ function util.set_icons(recipe_name, icons, options)
return
end
if data.raw.recipe[recipe_name] then
if me then me.add_modified(recipe_name) end
me.add_modified(recipe_name)
data.raw.recipe[recipe_name].icons = icons
data.raw.recipe[recipe_name].icon = nil
data.raw.recipe[recipe_name].icon_size = nil
@ -1622,7 +1614,7 @@ function util.set_tech_icons(technology, icons, options)
return
end
if data.raw.technology[technology] then
if me then me.add_modified(technology) end
me.add_modified(technology)
data.raw.technology[technology].icons = icons
data.raw.technology[technology].icon = nil
data.raw.technology[technology].icon_size = nil
@ -1967,10 +1959,6 @@ function util.sum_products(recipe_name)
return 0
end
function util.add_productivity(recipe)
data.raw.recipe[recipe].allow_productivity = true
end
function util.set_vtk_dcm_ingredients()
if mods["vtk-deep-core-mining"] then
local sum = util.sum_products("vtk-deepcore-mining-ore-chunk-refining")

2
bzlib/info.json
View file

@ -1,6 +1,6 @@
{
"name": "bzlib",
"version": "1.1.0",
"version": "1.0.0",
"factorio_version": "2.0",
"title": "BZ Lib",
"description": "Library code for BZ mods",