Update technic modpack to Git commit 1c21948...

https://github.com/minetest-mods/technic/tree/1c21948
master
Jordan Irwin 2021-05-13 12:26:05 -07:00
parent 093de466bb
commit 5c6aa0b0a0
6 changed files with 65 additions and 26 deletions

View File

@ -171,7 +171,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
* [myroofs][] ([DWYWPL][lic.dwywpl]) -- version: [fe98461 Git][ver.myroofs] *2017-07-14*
* [mysheetmetal][] ([DWYWPL][lic.dwywpl]) -- version: [7c5ab71 Git][ver.mysheetmetal] *2016-04-12* ([patched][patch.mysheetmetal])
* [mywoodslopes][] ([DWYWPL][lic.dwywpl]) -- version: [3a1b531 Git][ver.mywoodslopes] *2016-03-23* (patched)
* [technic][] ([LGPL][lic.lgpl2.0]) -- version: [43acec2 Git][ver.technic] *2021-02-09*
* [technic][] ([LGPL][lic.lgpl2.0]) -- version: [1c21948 Git][ver.technic] *2021-04-14* ([patched][patch.technic])
---
@ -565,7 +565,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[ver.snowdrift]: https://github.com/paramat/snowdrift/tree/3342939
[ver.asm_spawneggs]: https://github.com/AntumMT/mod-asm_spawneggs/tree/8579eac
[ver.spectator_mode]: https://github.com/minetest-mods/spectator_mode/tree/3648371
[ver.technic]: https://github.com/minetest-mods/technic/tree/43acec2
[ver.technic]: https://github.com/minetest-mods/technic/tree/1c21948
[ver.throwing]: https://github.com/PilzAdam/throwing/tree/90bcf43
[ver.tnt]: https://github.com/PilzAdam/TNT/tree/d6a0b7d
[ver.tools_obsidian]: https://github.com/Dragonop/tools_obsidian/releases/tag/1.0
@ -616,7 +616,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.quartz]: https://github.com/AntumMT/mod-quartz/tree/adc759e
[patch.rainbow_ore]: https://github.com/AntumMT/mod-rainbow_ore/tree/0227a86
[patch.simple_protection]: https://github.com/AntumMT/mod-simple_protection/tree/be873b5
[patch.technic]: https://github.com/AntumMT/mp-technic/tree/cdb31be
[patch.technic]: https://github.com/AntumMT/mp-technic/tree/b591884
[patch.throwing]: https://github.com/AntumMT/mod-throwing/tree/b33ffde
[patch.trash_can]: https://github.com/AntumMT/mod-trash_can/tree/5a92bf4
[patch.unifieddyes]: https://github.com/AntumMT/mod-unifieddyes/tree/3013964

View File

@ -1,14 +0,0 @@
default
pipeworks
technic_worldgen
basic_materials
bucket?
screwdriver?
mesecons?
mesecons_mvps?
digilines?
digiline_remote?
intllib?
unified_inventory?
vector_extras?
dye?

View File

@ -34,6 +34,13 @@ local workshop_formspec =
"listring[current_name;upgrade2]"..
"listring[current_player;main]"
-- Setting for enabling/disabling tool wear & break
local tool_wear = minetest.settings:get_bool("enable_tool_wear")
if tool_wear == nil then
-- Default is enabled
tool_wear = true
end
local run = function(pos, node)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
@ -75,7 +82,9 @@ local run = function(pos, node)
meta:set_string("infotext", S("%s Unpowered"):format(machine_name))
elseif eu_input >= workshop_demand[EU_upgrade+1] then
meta:set_string("infotext", S("%s Active"):format(machine_name))
srcstack:add_wear(-1000)
if enable_wear then
srcstack:add_wear(-1000)
end
inv:set_stack("src", 1, srcstack)
end
meta:set_int("MV_EU_demand", workshop_demand[EU_upgrade+1])

View File

@ -1,4 +1,6 @@
local have_ui = minetest.get_modpath("unified_inventory")
local have_cg = minetest.get_modpath("craftguide")
local have_i3 = minetest.get_modpath("i3")
technic.recipes = { cooking = { input_size = 1, output_size = 1 } }
function technic.register_recipe_type(typename, origdata)
@ -6,12 +8,24 @@ function technic.register_recipe_type(typename, origdata)
for k, v in pairs(origdata) do data[k] = v end
data.input_size = data.input_size or 1
data.output_size = data.output_size or 1
if have_ui and unified_inventory.register_craft_type and data.output_size == 1 then
unified_inventory.register_craft_type(typename, {
description = data.description,
width = data.input_size,
height = 1,
})
if data.output_size == 1 then
if have_ui and unified_inventory.register_craft_type then
unified_inventory.register_craft_type(typename, {
description = data.description,
width = data.input_size,
height = 1,
})
end
if have_cg and craftguide.register_craft_type then
craftguide.register_craft_type(typename, {
description = data.description,
})
end
if have_i3 then
i3.register_craft_type(typename, {
description = data.description,
})
end
end
data.recipes = {}
technic.recipes[typename] = data
@ -59,6 +73,27 @@ local function register_recipe(typename, data)
width = 0,
})
end
if (have_cg or have_i3) and technic.recipes[typename].output_size == 1 then
local result = data.output
if (type(result)=="table") then
result = result[1]
end
local items = table.concat(data.input, ", ")
if have_cg and craftguide.register_craft then
craftguide.register_craft({
type = typename,
result = result,
items = {items},
})
end
if have_i3 then
i3.register_craft({
type = typename,
result = result,
items = {items},
})
end
end
end
function technic.register_recipe(typename, data)

View File

@ -1,3 +1,3 @@
name = technic
depends = default, pipeworks, technic_worldgen, basic_materials
optional_depends = bucket, screwdriver, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye
optional_depends = bucket, screwdriver, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye, craftguide,i3

View File

@ -84,6 +84,13 @@ for name, info in pairs(wrench.registered_nodes) do
end
end
-- Setting for enabling/disabling tool wear & break
local tool_wear = minetest.settings:get_bool("enable_tool_wear")
if tool_wear == nil then
-- Default is enabled
tool_wear = true
end
minetest.register_tool("wrench:wrench", {
description = S("Wrench"),
inventory_image = "technic_wrench.png",
@ -160,7 +167,9 @@ minetest.register_tool("wrench:wrench", {
item_meta:set_string("data", minetest.serialize(metadata))
minetest.remove_node(pos)
itemstack:add_wear(65535 / 20)
if tool_wear then
itemstack:add_wear(65535 / 20)
end
player_inv:add_item("main", stack)
return itemstack
end,