MTSR/techage
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for i3 added

Browse Source
This commit is contained in:
Joachim Stolberg 2021-12-25 17:18:34 +01:00
parent 2fb526f54b
commit 45479bf153
10 changed files with 116 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -80,6 +80,11 @@ Available worlds will be converted to 'lsqlite3', but there is no way back, so:
### History ### History
**2021-12-25 V1.05**
- Support for the mod i3 added (thanks to ghaydn)
- TA5 enabled
- Many improvements
**2021-12-12 V1.04** **2021-12-12 V1.04**
- TA4 Collider added (experimental) - TA4 Collider added (experimental)
- move, turn, sound, and fly blocks added - move, turn, sound, and fly blocks added

38
basic_machines/electronic_fab.lua
View File

@ -259,24 +259,22 @@ minetest.register_craft({
}, },
}) })
if minetest.global_exists("unified_inventory") then techage.recipes.register_craft_type("ta2_electronic_fab", {
unified_inventory.register_craft_type("ta2_electronic_fab", { description = S("TA2 Ele Fab"),
description = S("TA2 Ele Fab"), icon = 'techage_filling_ta2.png^techage_appl_electronic_fab.png^techage_frame_ta2.png',
icon = 'techage_filling_ta2.png^techage_appl_electronic_fab.png^techage_frame_ta2.png', width = 2,
width = 2, height = 2,
height = 2, })
}) techage.recipes.register_craft_type("ta3_electronic_fab", {
unified_inventory.register_craft_type("ta3_electronic_fab", { description = S("TA3 Ele Fab"),
description = S("TA3 Ele Fab"), icon = 'techage_filling_ta3.png^techage_appl_electronic_fab.png^techage_frame_ta3.png',
icon = 'techage_filling_ta3.png^techage_appl_electronic_fab.png^techage_frame_ta3.png', width = 2,
width = 2, height = 2,
height = 2, })
}) techage.recipes.register_craft_type("ta4_electronic_fab", {
unified_inventory.register_craft_type("ta4_electronic_fab", { description = S("TA4 Ele Fab"),
description = S("TA4 Ele Fab"), icon = 'techage_filling_ta4.png^techage_appl_electronic_fab.png^techage_frame_ta4.png',
icon = 'techage_filling_ta4.png^techage_appl_electronic_fab.png^techage_frame_ta4.png', width = 2,
width = 2, height = 2,
height = 2, })
})
end

22
basic_machines/gravelrinser.lua
View File

@ -317,22 +317,18 @@ minetest.register_craft({
}) })
if minetest.global_exists("unified_inventory") then techage.recipes.register_craft_type("rinsing", {
unified_inventory.register_craft_type("rinsing", { description = S("Rinsing"),
description = S("Rinsing"), icon = "techage_appl_rinser_top.png^techage_frame_ta2_top.png",
icon = "techage_appl_rinser_top.png^techage_frame_ta2_top.png", width = 2,
width = 2, height = 2,
height = 2, })
})
end
function techage.add_rinser_recipe(recipe) function techage.add_rinser_recipe(recipe)
Probability[recipe.output] = recipe.probability Probability[recipe.output] = recipe.probability
if minetest.global_exists("unified_inventory") then recipe.items = {recipe.input}
recipe.items = {recipe.input} recipe.type = "rinsing"
recipe.type = "rinsing" techage.recipes.register_craft(recipe)
unified_inventory.register_craft(recipe)
end
end end
techage.add_rinser_recipe({input="techage:sieved_gravel", output="techage:usmium_nuggets", probability=30}) techage.add_rinser_recipe({input="techage:sieved_gravel", output="techage:usmium_nuggets", probability=30})

68
basic_machines/gravelsieve.lua
View File

@ -246,38 +246,36 @@ minetest.register_craft({
}, },
}) })
if minetest.global_exists("unified_inventory") then techage.recipes.register_craft_type("ta2_gravelsieve", {
unified_inventory.register_craft_type("ta2_gravelsieve", { description = S("TA2 Gravel Sieve"),
description = S("TA2 Gravel Sieve"), icon = 'techage_sieve_sieve_ta1.png',
icon = 'techage_sieve_sieve_ta1.png', width = 1,
width = 1, height = 1,
height = 1, })
}) techage.recipes.register_craft_type("ta3_gravelsieve", {
unified_inventory.register_craft_type("ta3_gravelsieve", { description = S("TA3 Gravel Sieve"),
description = S("TA3 Gravel Sieve"), icon = 'techage_filling_ta3.png^techage_appl_sieve.png^techage_frame_ta3.png',
icon = 'techage_filling_ta3.png^techage_appl_sieve.png^techage_frame_ta3.png', width = 1,
width = 1, height = 1,
height = 1, })
}) techage.recipes.register_craft_type("ta4_gravelsieve", {
unified_inventory.register_craft_type("ta4_gravelsieve", { description = S("TA4 Gravel Sieve"),
description = S("TA4 Gravel Sieve"), icon = 'techage_filling_ta4.png^techage_appl_sieve.png^techage_frame_ta4.png',
icon = 'techage_filling_ta4.png^techage_appl_sieve.png^techage_frame_ta4.png', width = 1,
width = 1, height = 1,
height = 1, })
}) techage.recipes.register_craft({
unified_inventory.register_craft({ output = "techage:sieved_basalt_gravel",
output = "techage:sieved_basalt_gravel", items = {"techage:basalt_gravel"},
items = {"techage:basalt_gravel"}, type = "ta2_gravelsieve",
type = "ta2_gravelsieve", })
}) techage.recipes.register_craft({
unified_inventory.register_craft({ output = "techage:sieved_basalt_gravel",
output = "techage:sieved_basalt_gravel", items = {"techage:basalt_gravel"},
items = {"techage:basalt_gravel"}, type = "ta3_gravelsieve",
type = "ta3_gravelsieve", })
}) techage.recipes.register_craft({
unified_inventory.register_craft({ output = "techage:sieved_basalt_gravel",
output = "techage:sieved_basalt_gravel", items = {"techage:basalt_gravel"},
items = {"techage:basalt_gravel"}, type = "ta4_gravelsieve",
type = "ta4_gravelsieve", })
})
end

42
basic_machines/grinder.lua
View File

@ -351,20 +351,18 @@ minetest.register_craft({
}, },
}) })
if minetest.global_exists("unified_inventory") then techage.recipes.register_craft_type("grinding", {
unified_inventory.register_craft_type("grinding", { description = S("Grinding"),
description = S("Grinding"), icon = 'techage_appl_grinder.png',
icon = 'techage_appl_grinder.png', width = 2,
width = 2, height = 2,
height = 2, })
}) techage.recipes.register_craft_type("milling", {
unified_inventory.register_craft_type("milling", { description = S("Milling"),
description = S("Milling"), icon = 'techage_mill_inv.png',
icon = 'techage_mill_inv.png', width = 2,
width = 2, height = 2,
height = 2, })
})
end
function techage.add_grinder_recipe(recipe, ta1_permitted) function techage.add_grinder_recipe(recipe, ta1_permitted)
local name, num = unpack(string.split(recipe.input, " ", false, 1)) local name, num = unpack(string.split(recipe.input, " ", false, 1))
@ -372,20 +370,16 @@ function techage.add_grinder_recipe(recipe, ta1_permitted)
if ta1_permitted then if ta1_permitted then
RecipesTa1[name] = {input = name,inp_num = tonumber(num) or 1, output = recipe.output} RecipesTa1[name] = {input = name,inp_num = tonumber(num) or 1, output = recipe.output}
if minetest.global_exists("unified_inventory") then recipe.items = {recipe.input}
recipe.items = {recipe.input} recipe.type = "milling"
recipe.type = "milling" techage.recipes.register_craft(table.copy(recipe))
unified_inventory.register_craft(table.copy(recipe))
end
end end
Recipes[name] = {input = name,inp_num = tonumber(num) or 1, output = recipe.output} Recipes[name] = {input = name,inp_num = tonumber(num) or 1, output = recipe.output}
if minetest.global_exists("unified_inventory") then recipe.items = {recipe.input}
recipe.items = {recipe.input} recipe.type = "grinding"
recipe.type = "grinding" techage.recipes.register_craft(recipe)
unified_inventory.register_craft(recipe)
end
end end
end end

12
basis/recipe_lib.lua
View File

@ -113,13 +113,11 @@ function techage.recipes.add(rtype, recipe)
Recipes[rtype][#Recipes[rtype]+1] = item Recipes[rtype][#Recipes[rtype]+1] = item
output = name output = name
if minetest.global_exists("unified_inventory") then techage.recipes.register_craft({
unified_inventory.register_craft({ output = recipe.output,
output = recipe.output, items = recipe.input,
items = recipe.input, type = rtype,
type = rtype, })
})
end
NormalizedRecipes[output] = { NormalizedRecipes[output] = {
output = recipe.output, output = recipe.output,
items = recipe.input, items = recipe.input,

14
chemistry/ta4_doser.lua
View File

@ -362,14 +362,12 @@ techage.register_node({"techage:ta4_doser", "techage:ta4_doser_on"}, {
end, end,
}) })
if minetest.global_exists("unified_inventory") then techage.recipes.register_craft_type("ta4_doser", {
unified_inventory.register_craft_type("ta4_doser", { description = S("TA4 Reactor"),
description = S("TA4 Reactor"), icon = 'techage_reactor_filler_plan.png',
icon = 'techage_reactor_filler_plan.png', width = 2,
width = 2, height = 2,
height = 2, })
})
end
minetest.register_craft({ minetest.register_craft({
output = "techage:ta4_doser", output = "techage:ta4_doser",

2
init.lua
View File

@ -13,7 +13,7 @@
techage = {} techage = {}
-- Version for compatibility checks, see readme.md/history -- Version for compatibility checks, see readme.md/history
techage.version = 1.03 techage.version = 1.05
if minetest.global_exists("tubelib") then if minetest.global_exists("tubelib") then
minetest.log("error", "[techage] Techage can't be used together with the mod tubelib!") minetest.log("error", "[techage] Techage can't be used together with the mod tubelib!")

44
iron_age/meltingpot.lua
View File

@ -475,25 +475,23 @@ minetest.register_craft({
}, },
}) })
if minetest.global_exists("unified_inventory") then techage.recipes.register_craft_type("melting", {
unified_inventory.register_craft_type("melting", { description = S("TA1 Melting"),
description = S("TA1 Melting"), icon = "default_cobble.png^techage_meltingpot.png",
icon = "default_cobble.png^techage_meltingpot.png", width = 2,
width = 2, height = 2,
height = 2, })
}) techage.recipes.register_craft_type("burning", {
unified_inventory.register_craft_type("burning", { description = S("TA1 Burning"),
description = S("TA1 Burning"), icon = "techage_smoke.png",
icon = "techage_smoke.png", width = 1,
width = 1, height = 1,
height = 1, })
}) techage.recipes.register_craft({
unified_inventory.register_craft({ output = "techage:charcoal",
output = "techage:charcoal", items = {"group:wood"},
items = {"group:wood"}, type = "burning",
type = "burning", })
})
end
function techage.ironage_register_recipe(recipe) function techage.ironage_register_recipe(recipe)
local key = recipe_key(recipe.recipe) local key = recipe_key(recipe.recipe)
@ -509,10 +507,8 @@ function techage.ironage_register_recipe(recipe)
} }
NumRecipes = NumRecipes + 1 NumRecipes = NumRecipes + 1
if minetest.global_exists("unified_inventory") then recipe.items = recipe.recipe
recipe.items = recipe.recipe recipe.type = "melting"
recipe.type = "melting" techage.recipes.register_craft(recipe)
unified_inventory.register_craft(recipe)
end
end end

2
mod.conf
View File

@ -1,4 +1,4 @@
name = techage name = techage
depends = default,doors,flowers,tubelib2,networks,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua depends = default,doors,flowers,tubelib2,networks,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua
optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron,bakedclay,moreblocks optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron,bakedclay,moreblocks,i3
description = Techage, go through 4 tech ages in search of wealth and power! description = Techage, go through 4 tech ages in search of wealth and power!