From 54b9cd4a7710905d664f7e414f4495a920884277 Mon Sep 17 00:00:00 2001 From: MisterE Date: Sat, 13 Aug 2022 21:43:06 -0400 Subject: [PATCH] fix some bugs with cleaner and xpanes --- mods/MTG/xpanes/init.lua | 9 ++++++--- mods/MTG/xpanes/locale/xpanes.eo.tr | 6 ++++++ mods/MTG/xpanes/locale/xpanes.it.tr | 12 ++++++------ mods/MTG/xpanes/locale/xpanes.ja.tr | 6 ++++++ mods/MTG/xpanes/locale/xpanes.jbo.tr | 6 ++++++ mods/MTG/xpanes/locale/xpanes.pl.tr | 6 ++++++ mods/MTG/xpanes/locale/xpanes.pt_BR.tr | 6 ++++++ mods/MTG/xpanes/locale/xpanes.se.tr | 6 ------ mods/MTG/xpanes/locale/xpanes.sk.tr | 6 ++++++ mods/MTG/xpanes/locale/xpanes.sv.tr | 6 ++++++ mods/MTG/xpanes/locale/xpanes.uk.tr | 6 ++++++ .../xpanes/textures/xpanes_door_steel_bar.png | Bin 605 -> 552 bytes .../xpanes/textures/xpanes_item_steel_bar.png | Bin 354 -> 301 bytes .../textures/xpanes_trapdoor_steel_bar.png | Bin 261 -> 208 bytes mods/WORLD/cleaner/init.lua | 4 ++-- 15 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 mods/MTG/xpanes/locale/xpanes.eo.tr create mode 100644 mods/MTG/xpanes/locale/xpanes.ja.tr create mode 100644 mods/MTG/xpanes/locale/xpanes.jbo.tr create mode 100644 mods/MTG/xpanes/locale/xpanes.pl.tr create mode 100644 mods/MTG/xpanes/locale/xpanes.pt_BR.tr delete mode 100644 mods/MTG/xpanes/locale/xpanes.se.tr create mode 100644 mods/MTG/xpanes/locale/xpanes.sk.tr create mode 100644 mods/MTG/xpanes/locale/xpanes.sv.tr create mode 100644 mods/MTG/xpanes/locale/xpanes.uk.tr diff --git a/mods/MTG/xpanes/init.lua b/mods/MTG/xpanes/init.lua index efedf0a..a02dbfe 100644 --- a/mods/MTG/xpanes/init.lua +++ b/mods/MTG/xpanes/init.lua @@ -116,7 +116,7 @@ function xpanes.register_pane(name, def) groups = flatgroups, drop = "xpanes:" .. name .. "_flat", sounds = def.sounds, - use_texture_alpha = def.use_texture_alpha or "opaque", + use_texture_alpha = def.use_texture_alpha and "blend" or "clip", node_box = { type = "fixed", fixed = {{-1/2, -1/2, -1/32, 1/2, 1/2, 1/32}}, @@ -145,7 +145,7 @@ function xpanes.register_pane(name, def) groups = groups, drop = "xpanes:" .. name .. "_flat", sounds = def.sounds, - use_texture_alpha = def.use_texture_alpha or "clip", + use_texture_alpha = def.use_texture_alpha and "blend" or "clip", node_box = { type = "connected", fixed = {{-1/32, -1/2, -1/32, 1/32, 1/2, 1/32}}, @@ -168,7 +168,6 @@ xpanes.register_pane("pane", { textures = {"default_glass.png", "", "xpanes_edge.png"}, inventory_image = "default_glass.png", wield_image = "default_glass.png", - use_texture_alpha = "clip", sounds = default.node_sound_glass_defaults(), groups = {snappy=2, cracky=3, oddly_breakable_by_hand=3}, recipe = { @@ -228,6 +227,8 @@ if minetest.get_modpath("doors") then sounds = default.node_sound_metal_defaults(), sound_open = "xpanes_steel_bar_door_open", sound_close = "xpanes_steel_bar_door_close", + gain_open = 0.15, + gain_close = 0.13, recipe = { {"xpanes:bar_flat", "xpanes:bar_flat"}, {"xpanes:bar_flat", "xpanes:bar_flat"}, @@ -246,6 +247,8 @@ if minetest.get_modpath("doors") then sounds = default.node_sound_metal_defaults(), sound_open = "xpanes_steel_bar_door_open", sound_close = "xpanes_steel_bar_door_close", + gain_open = 0.15, + gain_close = 0.13, }) minetest.register_craft({ diff --git a/mods/MTG/xpanes/locale/xpanes.eo.tr b/mods/MTG/xpanes/locale/xpanes.eo.tr new file mode 100644 index 0000000..0051b7e --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.eo.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Vitra Vitraĵo +Obsidian Glass Pane=Obsidiana Vitra Vitraĵo +Steel Bars=Ŝtalaj Baraĵoj +Steel Bar Door=Ŝtala Baraĵa Pordo +Steel Bar Trapdoor=Ŝtala Baraĵa Plankpordo diff --git a/mods/MTG/xpanes/locale/xpanes.it.tr b/mods/MTG/xpanes/locale/xpanes.it.tr index 7b73968..63c8b62 100644 --- a/mods/MTG/xpanes/locale/xpanes.it.tr +++ b/mods/MTG/xpanes/locale/xpanes.it.tr @@ -1,6 +1,6 @@ -# textdomain: xpanes -Glass Pane=Pannello di vetro -Obsidian Glass Pane=Pannello di vetro d'ossidiana -Steel Bars=Sbarre d'acciaio -Steel Bar Door=Porta con sbarre d'acciaio -Steel Bar Trapdoor=Botola con sbarre d'acciaio \ No newline at end of file +# textdomain: xpanes +Glass Pane=Pannello di vetro +Obsidian Glass Pane=Pannello di vetro d'ossidiana +Steel Bars=Sbarre d'acciaio +Steel Bar Door=Porta con sbarre d'acciaio +Steel Bar Trapdoor=Botola con sbarre d'acciaio diff --git a/mods/MTG/xpanes/locale/xpanes.ja.tr b/mods/MTG/xpanes/locale/xpanes.ja.tr new file mode 100644 index 0000000..06e0bed --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.ja.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=板ガラス +Obsidian Glass Pane=黒曜石の板ガラス +Steel Bars=鉄棒の柵 +Steel Bar Door=鉄棒のドア +Steel Bar Trapdoor=鉄棒のトラップドア diff --git a/mods/MTG/xpanes/locale/xpanes.jbo.tr b/mods/MTG/xpanes/locale/xpanes.jbo.tr new file mode 100644 index 0000000..333b531 --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.jbo.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=lo blaci plita +Obsidian Glass Pane=lo je'erma'ablaci blaci plita +Steel Bars=lo gasta garna +Steel Bar Door=lo gasta garna vrogai +Steel Bar Trapdoor=lo gasta garna lolvrogai diff --git a/mods/MTG/xpanes/locale/xpanes.pl.tr b/mods/MTG/xpanes/locale/xpanes.pl.tr new file mode 100644 index 0000000..0ebb386 --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.pl.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Szyba +Obsidian Glass Pane=Obsydianowa szyba +Steel Bars=Stalowe kraty +Steel Bar Door=Drzwi ze stalowych krat +Steel Bar Trapdoor=Właz ze stalowych krat diff --git a/mods/MTG/xpanes/locale/xpanes.pt_BR.tr b/mods/MTG/xpanes/locale/xpanes.pt_BR.tr new file mode 100644 index 0000000..c1ca3b2 --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.pt_BR.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Painel de Vidro +Obsidian Glass Pane=Painel de Vidro de Obsidiana +Steel Bars=Barras de Aço +Steel Bar Door=Porta de Barras de Aço +Steel Bar Trapdoor=Alçapão de Barras de Aço diff --git a/mods/MTG/xpanes/locale/xpanes.se.tr b/mods/MTG/xpanes/locale/xpanes.se.tr deleted file mode 100644 index fc3bbfe..0000000 --- a/mods/MTG/xpanes/locale/xpanes.se.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Glasruta -Obsidian Glass Pane=Obsidian Glasruta -Steel Bars=Stålgaller -Steel Bar Door=Stålgallers Dörr -Steel Bar Trapdoor=Stålgallers Fallucka \ No newline at end of file diff --git a/mods/MTG/xpanes/locale/xpanes.sk.tr b/mods/MTG/xpanes/locale/xpanes.sk.tr new file mode 100644 index 0000000..0d07e08 --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.sk.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Tabuľa skla +Obsidian Glass Pane=Tabuľa obsidiánového skla +Steel Bars=Oceľové mreže +Steel Bar Door=Dvere z oceľových mreží +Steel Bar Trapdoor=Padajúce dvere z oceľových mreží diff --git a/mods/MTG/xpanes/locale/xpanes.sv.tr b/mods/MTG/xpanes/locale/xpanes.sv.tr new file mode 100644 index 0000000..7b615dd --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.sv.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Glasruta +Obsidian Glass Pane=Obsidianglasruta +Steel Bars=Stålgaller +Steel Bar Door=Stålgallerdörr +Steel Bar Trapdoor=Stålgallerfallucka diff --git a/mods/MTG/xpanes/locale/xpanes.uk.tr b/mods/MTG/xpanes/locale/xpanes.uk.tr new file mode 100644 index 0000000..d4b4b5c --- /dev/null +++ b/mods/MTG/xpanes/locale/xpanes.uk.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Скляна Панель +Obsidian Glass Pane=Скляна Панель З Обсидіану +Steel Bars=Сталева Решітка +Steel Bar Door=Сталеві Двері З Решіткою +Steel Bar Trapdoor=Сталевий Люк З Решіткою diff --git a/mods/MTG/xpanes/textures/xpanes_door_steel_bar.png b/mods/MTG/xpanes/textures/xpanes_door_steel_bar.png index 435af148df7b0401acfa6cfa4cb23e28f80258cd..39f45c302553aa9de4953a4aac6d472a680e1405 100644 GIT binary patch delta 13 Vcmcc1vVvuT%0!={ji)Cu0stpT1)u-` delta 63 zcmZ3%a+hU-iYjM;M`SSr1Gg{;GcwGYBf-GHz+U3%>&pI^Lr6?RcEc2|7ZVjrxfvLf Ryxm^oVJKiYjM;M`SSr1Gg{;GcwGYBf-GHz+U3%>&pI^Lr6?tUhwu`=81~kT#QNH P?k*f{_oh}&T-gEuz@-rA diff --git a/mods/MTG/xpanes/textures/xpanes_trapdoor_steel_bar.png b/mods/MTG/xpanes/textures/xpanes_trapdoor_steel_bar.png index de4b4946248411f1da2bcefee5952f85f556871e..a56c5ee3af9532d0031fbe2cfbcddfa917ef92aa 100644 GIT binary patch delta 12 TcmZo=y1+O=WulMs#5tJ&9YqAg delta 61 zcmcb>*vd3PMU}I_BeIx*fm;}a85w5Hkzin8U@!6Xb!C6dAta_M%Kh-q^ofdYT#QNH P?k*f{_oh}&OvwQNw=ock diff --git a/mods/WORLD/cleaner/init.lua b/mods/WORLD/cleaner/init.lua index e9f43c0..b2f90b6 100644 --- a/mods/WORLD/cleaner/init.lua +++ b/mods/WORLD/cleaner/init.lua @@ -53,8 +53,8 @@ local function clean() for j = 1, #objs do local obj = objs[j] if not obj:is_player() then - local entname = obj:get_luaentity().name - if not minetest.registered_entities[entname] then + local ent = obj:get_luaentity() + if not (ent) or not ( minetest.registered_entities[ent.name] ) then obj:remove() end end