From a887fcaaf21df2b1d53e4bd0c3e18e82f665b4ae Mon Sep 17 00:00:00 2001 From: root Date: Sat, 14 Aug 2021 17:52:13 +0200 Subject: [PATCH] update --- mods/skinsdb/meta/character_2110.txt | 3 + mods/skinsdb/meta/character_2111.txt | 3 + mods/skinsdb/meta/character_2112.txt | 3 + mods/skinsdb/textures/character_2110.png | Bin 0 -> 8538 bytes mods/skinsdb/textures/character_2111.png | Bin 0 -> 10199 bytes mods/skinsdb/textures/character_2112.png | Bin 0 -> 9091 bytes mods/techpack/tubelib_addons3/distributor.lua | 3 + .../tubelib_addons3/pushing_chest.lua | 58 ++++++++++-------- mods/ts_doors/init.lua | 2 +- 9 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 mods/skinsdb/meta/character_2110.txt create mode 100644 mods/skinsdb/meta/character_2111.txt create mode 100644 mods/skinsdb/meta/character_2112.txt create mode 100644 mods/skinsdb/textures/character_2110.png create mode 100644 mods/skinsdb/textures/character_2111.png create mode 100644 mods/skinsdb/textures/character_2112.png diff --git a/mods/skinsdb/meta/character_2110.txt b/mods/skinsdb/meta/character_2110.txt new file mode 100644 index 00000000..71fe020f --- /dev/null +++ b/mods/skinsdb/meta/character_2110.txt @@ -0,0 +1,3 @@ +Mythrodak (fixed) +Christian_Soldier +CC 0 (1.0) diff --git a/mods/skinsdb/meta/character_2111.txt b/mods/skinsdb/meta/character_2111.txt new file mode 100644 index 00000000..4cb60364 --- /dev/null +++ b/mods/skinsdb/meta/character_2111.txt @@ -0,0 +1,3 @@ +BadBoyHalo (fixed) +Christian_Soldier +CC 0 (1.0) diff --git a/mods/skinsdb/meta/character_2112.txt b/mods/skinsdb/meta/character_2112.txt new file mode 100644 index 00000000..b1889d67 --- /dev/null +++ b/mods/skinsdb/meta/character_2112.txt @@ -0,0 +1,3 @@ +Sapnap (fixed) +Christian_Soldier +CC 0 (1.0) diff --git a/mods/skinsdb/textures/character_2110.png b/mods/skinsdb/textures/character_2110.png new file mode 100644 index 0000000000000000000000000000000000000000..88e5f36d5e83c368f823c501f41ef79059168ec4 GIT binary patch literal 8538 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 E0kA(l#{d8T literal 0 HcmV?d00001 diff --git a/mods/skinsdb/textures/character_2111.png b/mods/skinsdb/textures/character_2111.png new file mode 100644 index 0000000000000000000000000000000000000000..f76eb7a4aeab1d1bc4535254a0b0f1e18480b876 GIT binary patch literal 10199 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 literal 0 HcmV?d00001 diff --git a/mods/techpack/tubelib_addons3/distributor.lua b/mods/techpack/tubelib_addons3/distributor.lua index eb5ee713..6d4ef851 100644 --- a/mods/techpack/tubelib_addons3/distributor.lua +++ b/mods/techpack/tubelib_addons3/distributor.lua @@ -508,6 +508,9 @@ tubelib.register_node("tubelib_addons3:distributor", on_pull_item = function(pos, side) return tubelib.get_item(M(pos), "src") end, + on_pull_stack = function(pos, side) + return tubelib.get_stack(M(pos), "src") + end, on_push_item = function(pos, side, item) return tubelib.put_item(M(pos), "src", item) end, diff --git a/mods/techpack/tubelib_addons3/pushing_chest.lua b/mods/techpack/tubelib_addons3/pushing_chest.lua index e72a6bdc..7dd7440d 100644 --- a/mods/techpack/tubelib_addons3/pushing_chest.lua +++ b/mods/techpack/tubelib_addons3/pushing_chest.lua @@ -7,9 +7,9 @@ AGPL v3 See LICENSE.txt for more information - + pushing_chest.lua - + A high performance pushing chest ]]-- @@ -49,11 +49,11 @@ local function allow_metadata_inventory_move(pos, from_list, from_index, to_list end Cache[minetest.get_meta(pos):get_string("number")] = nil return count -end +end local function keep_the_rest(meta, list, taken) if taken then - local inv = meta:get_inventory() + local inv = meta:get_inventory() local rest = ItemStack(taken:get_name()) if not inv:contains_item(list, rest) then inv:add_item(list, rest) @@ -65,7 +65,7 @@ local function keep_the_rest(meta, list, taken) return taken end end -end +end local function aging(pos, meta) local cnt = meta:get_int("tubelib_aging") + 1 @@ -83,7 +83,7 @@ local function set_state(meta, state) local number = meta:get_string("number") meta:set_string("infotext", S("HighPerf Pushing Chest").." "..number..": "..state) meta:set_string("state", state) -end +end local function configured(pos, item) local meta = minetest.get_meta(pos) @@ -110,9 +110,10 @@ local function shift_items(pos, elapsed) for i = 0,7 do local idx = ((i + offs) % 8) + 1 local stack = inv:get_stack("shift", idx) - if stack:get_count() > 0 then + local count = stack:get_count() + if count > 0 then if tubelib.push_items(pos, "R", stack, player_name) then - -- The effort is needed here for the case the + -- The effort is needed here for the case the -- pusher pushes into its own chest. local num = stack:get_count() stack = inv:get_stack("shift", idx) @@ -121,7 +122,12 @@ local function shift_items(pos, elapsed) aging(pos, meta) return true else - set_state(meta, "blocked") + -- Complete stack rejected + if count == stack:get_count() then + set_state(meta, "blocked") + else + inv:set_stack("shift", idx, stack) + end end end end @@ -153,7 +159,7 @@ local function defect(pos, meta) node.name = "tubelib_addons3:pushing_chest_defect" minetest.swap_node(pos, node) return true -end +end -- code duplication of method "NodeStates:on_dig_node" (node_states.lua) -- (in contrast to (all?) other tubelib nodes that can go defect class "NodeStates" isn't applied here) @@ -163,15 +169,15 @@ function on_dig_node(pos, node, player) if (not cnt or cnt < 1) then cnt = 1 end - + local is_defect = (cnt > AGING_LEVEL1) and ( math.random(math.max(1, math.floor(AGING_LEVEL2 / cnt))) == 1 ) - + if is_defect then - defect(pos, meta) -- replace node with defect one - node = minetest.get_node(pos) + defect(pos, meta) -- replace node with defect one + node = minetest.get_node(pos) end - - + + minetest.node_dig(pos, node, player) -- default behaviour (this function is called automatically if on_dig() callback isn't set) end @@ -204,10 +210,10 @@ minetest.register_node("tubelib_addons3:pushing_chest", { inv:set_size('main', 32) inv:set_size('shift', 8) end, - + after_place_node = function(pos, placer) local meta = minetest.get_meta(pos) - local number = tubelib.add_node(pos, "tubelib_addons3:pushing_chest") + local number = tubelib.add_node(pos, "tubelib_addons3:pushing_chest") meta:set_string("player_name", placer:get_player_name()) meta:set_string("number", number) meta:set_string("formspec", formspec()) @@ -237,7 +243,7 @@ minetest.register_node("tubelib_addons3:pushing_chest", { on_timer = shift_items, on_rotate = screwdriver.disallow, - + paramtype = "light", sunlight_propagates = true, paramtype2 = "facedir", @@ -264,10 +270,10 @@ minetest.register_node("tubelib_addons3:pushing_chest_defect", { inv:set_size('main', 32) inv:set_size('shift', 8) end, - + after_place_node = function(pos, placer) local meta = minetest.get_meta(pos) - local number = tubelib.add_node(pos, "tubelib_addons3:pushing_chest") + local number = tubelib.add_node(pos, "tubelib_addons3:pushing_chest") meta:set_string("player_name", placer:get_player_name()) meta:set_string("number", number) meta:set_string("formspec", formspec()) @@ -291,7 +297,7 @@ minetest.register_node("tubelib_addons3:pushing_chest_defect", { allow_metadata_inventory_move = allow_metadata_inventory_move, on_rotate = screwdriver.disallow, - + paramtype = "light", sunlight_propagates = true, paramtype2 = "facedir", @@ -310,14 +316,14 @@ minetest.register_craft({ }, }) -tubelib.register_node("tubelib_addons3:pushing_chest", +tubelib.register_node("tubelib_addons3:pushing_chest", {"tubelib_addons3:pushing_chest_defect"}, { on_recv_message = function(pos, topic, payload) local node = minetest.get_node(pos) if topic == "state" then local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - if inv:is_empty("main") then + if inv:is_empty("main") then return "empty" end return meta:get_string("state") @@ -368,7 +374,7 @@ tubelib.register_node("tubelib_addons3:pushing_chest", local meta = minetest.get_meta(pos) meta:set_int("tubelib_aging", 0) meta:set_int("idx", 2) - + meta:set_string("formspec", formspec()) set_state(meta, "empty") local node = minetest.get_node(pos) @@ -377,4 +383,4 @@ tubelib.register_node("tubelib_addons3:pushing_chest", minetest.get_node_timer(pos):start(2) return true end, -}) +}) diff --git a/mods/ts_doors/init.lua b/mods/ts_doors/init.lua index 38b178ed..543ce75e 100755 --- a/mods/ts_doors/init.lua +++ b/mods/ts_doors/init.lua @@ -105,7 +105,7 @@ function ts_doors.register_door(item, description, texture, sounds, recipe) local groups = minetest.registered_nodes[item].groups - local door_groups = {door=1} + local door_groups = {door=1, not_in_creative_inventory=1} for k, v in pairs(groups) do if k ~= "wood" then door_groups[k] = v