From 3f90d7488cedad641a814be06624f42cc9518d39 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 23:49:19 +0200 Subject: [PATCH] Rename mod --- bztin2/compatibility/data/hot-metals.lua | 16 +++---- bztin2/info.json | 2 +- bztin2/me.lua | 2 +- bztin2/strange-matter.lua | 2 +- bztin2/tin-enriched.lua | 16 +++---- bztin2/tin-matter.lua | 2 +- bztin2/tin-ore.lua | 14 +++--- bztin2/tin-recipe-final-stacking.lua | 8 ++-- bztin2/tin-recipe-se.lua | 8 ++-- bztin2/tin-recipe.lua | 54 ++++++++++++------------ 10 files changed, 62 insertions(+), 62 deletions(-) diff --git a/bztin2/compatibility/data/hot-metals.lua b/bztin2/compatibility/data/hot-metals.lua index 0a1096d..6339184 100644 --- a/bztin2/compatibility/data/hot-metals.lua +++ b/bztin2/compatibility/data/hot-metals.lua @@ -2,20 +2,20 @@ local util = require("data-util"); util.add_hot_metals({ {name="tin-plate", icons={ - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, }}, {name="bronze-plate", icons={ - { icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, }}, {name="tinned-cable", icons={ - { icon = "__bztin__/graphics/icons/tinned-cable.png", icon_size = 64}, - { icon = "__bztin__/graphics/icons/tinned-cable.png", icon_size = 64, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64}, + { icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64, tint={.9,.3,0, .5}}, }}, {name="solder", icons={ - { icon = "__bztin__/graphics/icons/solder.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, tint={.9,.3,0, .5}}, }}, }) diff --git a/bztin2/info.json b/bztin2/info.json index a73284c..0484f8b 100644 --- a/bztin2/info.json +++ b/bztin2/info.json @@ -1,5 +1,5 @@ { - "name": "bztin", + "name": "bztin2", "version": "2.1.14", "factorio_version": "2.0", "title": "Tin", diff --git a/bztin2/me.lua b/bztin2/me.lua index b9e40cd..651c83d 100644 --- a/bztin2/me.lua +++ b/bztin2/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bztin" +me.name = "bztin2" me.resources = {{"tin-ore", "nauvis"}} me.list = {} me.recipes = {"tin-plate", "solder", "organotins", diff --git a/bztin2/strange-matter.lua b/bztin2/strange-matter.lua index c9eaf8f..50c2a75 100644 --- a/bztin2/strange-matter.lua +++ b/bztin2/strange-matter.lua @@ -1,7 +1,7 @@ local util = require("data-util"); local ore = "tin-ore" -local ore_icon = "__bztin__/graphics/icons/tin-ore.png" +local ore_icon = "__bztin2__/graphics/icons/tin-ore.png" if mods["StrangeMatter"] then data:extend({ diff --git a/bztin2/tin-enriched.lua b/bztin2/tin-enriched.lua index 211737e..66db626 100644 --- a/bztin2/tin-enriched.lua +++ b/bztin2/tin-enriched.lua @@ -8,12 +8,12 @@ data:extend( type = "item", name = "enriched-tin", icon_size = 128, - icon = "__bztin__/graphics/icons/enriched-tin.png", + icon = "__bztin2__/graphics/icons/enriched-tin.png", pictures = { - {filename="__bztin__/graphics/icons/enriched-tin.png", size=128, scale=0.25}, - {filename="__bztin__/graphics/icons/enriched-tin-1.png", size=128, scale=0.25}, - {filename="__bztin__/graphics/icons/enriched-tin-2.png", size=128, scale=0.25}, - {filename="__bztin__/graphics/icons/enriched-tin-3.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin-1.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin-2.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-tin]", @@ -23,7 +23,7 @@ data:extend( type = "recipe", name = "enriched-tin", main_product="enriched-tin", - icon = "__bztin__/graphics/icons/enriched-tin.png", + icon = "__bztin2__/graphics/icons/enriched-tin.png", icon_size = 128, category = "chemistry", energy_required = 3, @@ -58,8 +58,8 @@ data:extend( name = "enriched-tin-plate", icons = { - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128 }, - { icon = "__bztin__/graphics/icons/enriched-tin.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128 }, + { icon = "__bztin2__/graphics/icons/enriched-tin.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, diff --git a/bztin2/tin-matter.lua b/bztin2/tin-matter.lua index 6030b8d..b1cc805 100644 --- a/bztin2/tin-matter.lua +++ b/bztin2/tin-matter.lua @@ -15,7 +15,7 @@ if mods["Krastorio2"] then unlocked_by = "tin-matter-processing", }, k2baseicon = "stone", - icon = { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4} + icon = { icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4} }) util.k2matter({ diff --git a/bztin2/tin-ore.lua b/bztin2/tin-ore.lua index e6e5ccd..b3446ab 100644 --- a/bztin2/tin-ore.lua +++ b/bztin2/tin-ore.lua @@ -26,7 +26,7 @@ data:extend({ type = "resource", icon_size = 64, icon_mipmaps = 3, name = "tin-ore", - icon = "__bztin__/graphics/icons/tin-ore.png", + icon = "__bztin2__/graphics/icons/tin-ore.png", flags = {"placeable-neutral"}, order="a-b-a", map_color = {r=0.90, g=1.00, b=0.10}, @@ -53,7 +53,7 @@ data:extend({ stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, stages = { sheet = { - filename = "__bztin__/graphics/entity/ores/hr-tin-ore.png", + filename = "__bztin2__/graphics/entity/ores/hr-tin-ore.png", priority = "extra-high", size = 128, frame_count = 8, @@ -66,12 +66,12 @@ data:extend({ type = "item", name = "tin-ore", icon_size = 64, icon_mipmaps = 3, - icon = "__bztin__/graphics/icons/tin-ore.png", + icon = "__bztin2__/graphics/icons/tin-ore.png", pictures = { - {filename="__bztin__/graphics/icons/tin-ore.png", size=64, scale=0.5}, - {filename="__bztin__/graphics/icons/tin-ore-1.png", size=64, scale=0.5}, - {filename="__bztin__/graphics/icons/tin-ore-2.png", size=64, scale=0.5}, - {filename="__bztin__/graphics/icons/tin-ore-3.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore-1.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore-2.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore-3.png", size=64, scale=0.5}, }, inventory_move_sound = item_sounds.resource_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, diff --git a/bztin2/tin-recipe-final-stacking.lua b/bztin2/tin-recipe-final-stacking.lua index 9df36a0..8457413 100644 --- a/bztin2/tin-recipe-final-stacking.lua +++ b/bztin2/tin-recipe-final-stacking.lua @@ -3,9 +3,9 @@ local util = require("data-util"); if deadlock and deadlock["add_stack"] then - deadlock.add_stack("tin-ore", "__bztin__/graphics/icons/stacked/tin-ore-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("tin-plate", "__bztin__/graphics/icons/stacked/tin-plate-stacked.png", "deadlock-stacking-1", 128) - deadlock.add_stack("solder", "__bztin__/graphics/icons/stacked/solder-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("tin-ore", "__bztin2__/graphics/icons/stacked/tin-ore-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("tin-plate", "__bztin2__/graphics/icons/stacked/tin-plate-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("solder", "__bztin2__/graphics/icons/stacked/solder-stacked.png", "deadlock-stacking-1", 128) if data.raw.item["tinned-cable"] then deadlock.add_stack("tinned-cable", nil , "deadlock-stacking-2", nil) end @@ -13,7 +13,7 @@ if deadlock and deadlock["add_stack"] then deadlock.add_stack("bronze-plate", nil , "deadlock-stacking-1", nil) end if mods.Krastorio2 then - deadlock.add_stack("enriched-tin", "__bztin__/graphics/icons/stacked/enriched-tin-ore-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("enriched-tin", "__bztin2__/graphics/icons/stacked/enriched-tin-ore-stacked.png" , "deadlock-stacking-3", 128) end end diff --git a/bztin2/tin-recipe-se.lua b/bztin2/tin-recipe-se.lua index 401d5a5..4642bc0 100644 --- a/bztin2/tin-recipe-se.lua +++ b/bztin2/tin-recipe-se.lua @@ -20,7 +20,7 @@ if mods["space-exploration"] then { type = "item", name = "tin-ingot", - icons = {{icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128}}, + icons = {{icon = "__bztin2__/graphics/icons/tin-ingot.png", icon_size = 128}}, order = "b-b", stack_size = 50, subgroup = "tin", @@ -32,7 +32,7 @@ if mods["space-exploration"] then max_temperature = 232, base_color = {r=191, g=219, b=233}, flow_color = {r=191, g=219, b=233}, - icons = {{icon = "__bztin__/graphics/icons/molten-tin.png", icon_size = 128}}, + icons = {{icon = "__bztin2__/graphics/icons/molten-tin.png", icon_size = 128}}, order = "a[molten]-a", pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, @@ -76,8 +76,8 @@ if mods["space-exploration"] then name = "tin-ingot-to-plate", icons = { - {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, - {icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, + {icon = "__bztin2__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { {type = "item", name = "tin-plate", amount = 10}, diff --git a/bztin2/tin-recipe.lua b/bztin2/tin-recipe.lua index f9ea15b..8ea43da 100644 --- a/bztin2/tin-recipe.lua +++ b/bztin2/tin-recipe.lua @@ -13,10 +13,10 @@ data:extend({ order = "d[tin-plate]", icons = (mods["Krastorio2"] and { - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}}, } or { - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, } ), -- (mods["Krastorio2"] and @@ -51,7 +51,7 @@ data:extend({ { type = "item", name = "tin-plate", - icon = "__bztin__/graphics/icons/tin-plate.png", + icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, subgroup = "raw-material", order = "b[tin-plate]", @@ -73,7 +73,7 @@ data:extend({ { type = "item", name = "solder", - icon = "__bztin__/graphics/icons/solder.png", + icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, subgroup = "intermediate-product", order = "b[solder]", @@ -105,8 +105,8 @@ data:extend({ subgroup = "vulcanus-processes", order = "z[casting]-d[casting-solder]", icons = { - {icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, shift={-4,4}}, - {icon = "__bztin__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, + {icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, shift={-4,4}}, + {icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, }, enabled = false, ingredients = solder_casting, @@ -124,8 +124,8 @@ data:extend({ type = "technology", name = "alloy-separation", icons = { - {icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, scale = 0.33, shift = {0,-6}}, - {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, scale = 0.25, shift = {-6,4}}, + {icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, scale = 0.33, shift = {0,-6}}, + {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, scale = 0.25, shift = {-6,4}}, mods["bzlead2"] and {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}} or {icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}}, }, @@ -148,7 +148,7 @@ if mods.bzaluminum2 and not mods["bzlead2"] then { type = "technology", name = "solder", - icon = "__bztin__/graphics/icons/solder.png", + icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, effects = { { type = "unlock-recipe", recipe = "solder" }, @@ -182,7 +182,7 @@ data:extend({ heat_capacity = "0.1kJ", base_color = {r=0.75, g=0.65, b=0.1}, flow_color = {r=0.7, g=1, b=0.1}, - icon = "__bztin__/graphics/icons/organotins.png", + icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64, order = "a[fluid]-f[organotins]" }, @@ -207,7 +207,7 @@ data:extend({ { type = "technology", name = "organotin-chemistry", - icon = "__bztin__/graphics/technology/organotins.png", + icon = "__bztin2__/graphics/technology/organotins.png", icon_size = 256, effects = { { type = "unlock-recipe", recipe = "organotins" }, @@ -228,7 +228,7 @@ data:extend({ { type = "item", name = "tinned-cable", - icon = "__bztin__/graphics/icons/tinned-cable.png", + icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64, icon_mipmaps = 4, subgroup = util.cablesg, order = "b[tinned-cable]", @@ -252,7 +252,7 @@ data:extend({ { type = "technology", name = "tinned-cable", - icon = "__bztin__/graphics/icons/tinned-cable.png", + icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64, icon_mipmaps = 4, effects = { { type = "unlock-recipe", recipe = "tinned-cable" }, @@ -281,7 +281,7 @@ data:extend({ { type = "item", name = "bronze-plate", - icon = "__bztin__/graphics/icons/bronze-plate.png", + icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, subgroup = "intermediate-product", order = "b[bronze-plate]", @@ -319,7 +319,7 @@ data:extend({ subgroup = "vulcanus-processes", order = "b[casting]-d[casting-tin-bronze]", icons = { - {icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128, shift={-4,4}}, + {icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, shift={-4,4}}, {icon = "__space-age__/graphics/icons/fluid/molten-copper.png", icon_size = 64, shift={4,-4}}, }, enabled = false, @@ -391,7 +391,7 @@ data:extend({ allow_productivity = true, energy_required = 2, icons = { - { icon="__bztin__/graphics/icons/tin-ore.png", icon_size=64}, + { icon="__bztin2__/graphics/icons/tin-ore.png", icon_size=64}, { icon="__base__/graphics/icons/fluid/steam.png", icon_size=64, tint={r=.9, g=.9, b=.1, a=.7}, scale=0.5, shift={-8,-8}}, }, ingredients = mods.bztitanium and { @@ -408,7 +408,7 @@ data:extend({ { type = "fluid", name = "molten-tin", - icon = "__bztin__/graphics/icons/molten-tin-sa.png", + icon = "__bztin2__/graphics/icons/molten-tin-sa.png", subgroup = "fluid", order = "b[new-fluid]-b[vulcanus]-d[molten-tin]", default_temperature = 1500, @@ -444,8 +444,8 @@ data:extend({ subgroup = "vulcanus-processes", order = "b[casting]-d[casting-tin]", icons = { - {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, shift={-4,4}}, - {icon = "__bztin__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, + {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, shift={-4,4}}, + {icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, }, enabled = false, ingredients = @@ -469,7 +469,7 @@ data:extend({ { type = "item", name = "jellyskin", - icon = "__bztin__/graphics/icons/jellyskin.png", + icon = "__bztin2__/graphics/icons/jellyskin.png", icon_size = 64, subgroup = "agriculture-processes", order = "b[agriulture]-d[tin]", @@ -492,8 +492,8 @@ data:extend({ subgroup = "agriculture-processes", order = "e[agriculture]-a[tin]", icons = { - {icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64}, - {icon = "__bztin__/graphics/icons/jellyskin.png", icon_size=64, shift={0,-8}}, + {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64}, + {icon = "__bztin2__/graphics/icons/jellyskin.png", icon_size=64, shift={0,-8}}, }, enabled = false, allow_productivity = true, @@ -515,8 +515,8 @@ data:extend({ subgroup = "agriculture-processes", order = "e[agriculture]-a[tin]", icons = { - {icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64}, - {icon = "__bztin__/graphics/icons/tin-ore.png", icon_size=64, scale=0.333, shift={0,8}}, + {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64}, + {icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size=64, scale=0.333, shift={0,8}}, }, enabled = false, allow_productivity = true, @@ -538,7 +538,7 @@ util.add_product("jellynut-processing", util.item("jellyskin", 1, .25)) util.add_ingredient("bioplastic", "organotins", 7.5) util.set_icons("bioplastic", { {icon = "__space-age__/graphics/icons/bioplastic.png", icon_size = 64}, - {icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64, scale=.25, shift={0,-8}}, + {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64, scale=.25, shift={0,-8}}, }) util.add_unlock("biochamber", "jellyskin-processing") util.add_unlock("biochamber", "tin-from-organotins") @@ -551,7 +551,7 @@ data:extend({ name = "metallic-asteroid-crushing-tin", icons = { {icon = "__space-age__/graphics/icons/metallic-asteroid-crushing.png", icon_size=64}, - {icon="__bztin__/graphics/icons/tin-ore.png", icon_size=64, scale =0.25, shift = {0,4}}, + {icon="__bztin2__/graphics/icons/tin-ore.png", icon_size=64, scale =0.25, shift = {0,4}}, }, category = "crushing", subgroup="space-crushing",