From 1273d59995bca09aecc2dd0674ccb4a24642ae80 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Tue, 29 Mar 2022 12:16:06 -0500 Subject: [PATCH 01/66] Lightning command: Strike player by name --- mods/ENVIRONMENT/lightning/init.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua index 3579316e8..59e494858 100644 --- a/mods/ENVIRONMENT/lightning/init.lua +++ b/mods/ENVIRONMENT/lightning/init.lua @@ -238,8 +238,8 @@ after(5, function(dtime) end) minetest.register_chatcommand("lightning", { - params = "[ ]", - description = S("Let lightning strike at the specified position or yourself"), + params = "[ ] | | ", + description = S("Let lightning strike at the specified position or player. No parameter will strike yourself."), privs = { maphack = true }, func = function(name, param) local pos = {} @@ -247,21 +247,21 @@ minetest.register_chatcommand("lightning", { pos.x = tonumber(pos.x) pos.y = tonumber(pos.y) pos.z = tonumber(pos.z) + local player_to_strike if not (pos.x and pos.y and pos.z) then pos = nil + player_to_strike = minetest.get_player_by_name(param) + if not player_to_strike and param == "" then + player_to_strike = minetest.get_player_by_name(name) + end end - if name == "" and pos == nil then + if not player_to_strike and pos == nil then return false, "No position specified and unknown player" end if pos then lightning.strike(pos) - else - local player = minetest.get_player_by_name(name) - if player then - lightning.strike(player:get_pos()) - else - return false, S("No position specified and unknown player") - end + elseif player_to_strike then + lightning.strike(player_to_strike:get_pos()) end return true end, From ddaa96589e1eca84f8385d3987e04d6e8aa89026 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Fri, 1 Apr 2022 07:58:26 -0500 Subject: [PATCH 02/66] Make params description sensable --- mods/ENVIRONMENT/lightning/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua index 59e494858..14d8f5176 100644 --- a/mods/ENVIRONMENT/lightning/init.lua +++ b/mods/ENVIRONMENT/lightning/init.lua @@ -238,7 +238,7 @@ after(5, function(dtime) end) minetest.register_chatcommand("lightning", { - params = "[ ] | | ", + params = "[ | ]", description = S("Let lightning strike at the specified position or player. No parameter will strike yourself."), privs = { maphack = true }, func = function(name, param) From d424aaa5bcaeecf5275c4c8ae0d7f2b34ee00b83 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Mon, 4 Apr 2022 07:48:05 -0500 Subject: [PATCH 03/66] Lightning mod: fix localization template --- mods/ENVIRONMENT/lightning/locale/template.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENVIRONMENT/lightning/locale/template.txt b/mods/ENVIRONMENT/lightning/locale/template.txt index 2c07393f6..897f295eb 100644 --- a/mods/ENVIRONMENT/lightning/locale/template.txt +++ b/mods/ENVIRONMENT/lightning/locale/template.txt @@ -1,4 +1,4 @@ # textdomain: lightning @1 was struck by lightning.= -Let lightning strike at the specified position or yourself= +Let lightning strike at the specified position or player. No parameter will strike yourself.= No position specified and unknown player= From ed963428c08d33779f2431da37f88a03fab770f9 Mon Sep 17 00:00:00 2001 From: kabou Date: Wed, 6 Apr 2022 23:04:01 +0200 Subject: [PATCH 04/66] Replace mcl_end_crystal_beam.png with free version. * Replace mcl_end_crystal_beam.png with unknown provenance with a version from the PixelPerfection texture pack that has a know good free licence. --- .../mcl_end/textures/mcl_end_crystal_beam.png | Bin 2065 -> 2794 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_end/textures/mcl_end_crystal_beam.png b/mods/ITEMS/mcl_end/textures/mcl_end_crystal_beam.png index 1259a5d0ec80af0c59843b46c21fda8853fa9601..94eac193a9b4d7b454ef7826e7cfe1f0540ee348 100644 GIT binary patch delta 2750 zcmV;v3PJUe5b70>NPhq!bVXQnLvm$dbZKvHAXI5>WdJfTF*Q0dFgh?dATTyMH8MIe zGQ}fwv;Y7KUr9tkRCr#kn}?3wybgqqH$6y#1VP^a>C$`e@zu~8W=K&!-rWBKw5p`2 zVp)>Up4N3O-S_X`n^)(3`0$~5>*@FJ-|J$b(`jjrsSKRy*d%7HtZo z<7PEm{;OB7Oc?PSH*O&5^y$+ln@AS<7v8*i6BMw9OQC(R{QUV7O4dJr{+Ms6`>a%8 zg|A(^W)@vsTz|ll<>kwlQzfk&@)ipqe87Rz7wO z_AptebYIC(;KN)~TE|X`Dh- z0xV4xun^J0CDy@c0v#UJ9;R>Z%a<=2Cl+7uDt~L+wop6vO4#nSptaKyC*+9)R6rF} z%Iv+M8M%PP(X=*gEuj%AQwy^2j8Imma)s7bqQj_UL5+vX*aw+x5#psaP%tweSRUp9 z!x?Wvu@Ch4?c28pVVg;fBM%d6r>}$^3NUSYB5Anr)2C12+bbU#4W9@9%+X;4A=%!({Pcm zjFrM6&HF$=p-LDGX;6T|M(YcBD1W2{JwJn2e`o^MysKBQRy9uv7PP%z4>?+UX~}|D z+r4}DE>){?0b#u3T6pc-`b%+c9#m-o8^+>5L9J(-W(s6S0znF&WI;8*-z6xktu|;z zcOcAlIDFyBX-I&dXJTpcqeqVxZ0&lKplrB9v4rj`InB$e1uT$-fu)HBCVvdy=oaju zf&;k^Ds2!Pgg<}&yxM+2cBR>$IpFbXCT2eq(zOXpG(SC=UP~h?g+2Mh%NYkeuJZs? zChwy2pb}QoHSA~~W5?rg(OBeq<(sP=Vr2kdLx~ejG4ixsdg; zc_M+brWvpRf^ZO2VN0KFZ-2#(?6rd$qOBNpTOhL1P8B|0xOi|qu1J~SPW=^y3 z@3@P#nJD`|EeNoG=t0BEg^OIYA6CF&PQb^RiD}7!kTy(Zxe`9Y^ndV;8#{g?u{K-k zNPQjHSn^37e~L>>dpG79TuJwtpVJMU$|0jsr74y_>x0ACJlKNn6T~fT?-Tl^Ex^W0 zKc(v^sHUmbCTs^2e|NxwiCZVvW5MMnY+4U;?%R8CD6DaA365I8Lf(1Z51)xIX(&#AnY}u6MN9G%L#M@tk~I5!GVy5w;B9u6i80bO|pDWL<$|ILva*3NjD0(!0=vSEv)jC^aDTAqVrMA}h5OXa7KKFun7?zQsb?xU zYl2zO6ZAhufY&NlV8Ig3gQaQC!hizY?hVbzoyY>Y;E>K=4N`$;@V*$~Bd7(r7FW8* zxp{CFor#ylYUbnY$fr>d^5iFFz?#QlG;lh9`0$~}+u_4}+^Zlje=Zw-J|G~GitO-- zrGJc%z3gOnA0}qFqVBtefSt%pdk%US1+{RFZ@_}?R^E%?PxnK9_k;5$V5Mz~C4yru zn}s>u(yR$sD6_CG-Hl4ArBzc|snP;wf&A}cW+wdCI_;3k6+bf#`5wRtjbXZc9Z%8wITS@VlGAyjTVnB)4LLk$5<8!r{Hpf5&%tNvrY!H)>e}}o!HuQt&3;+NC07*qoM6N<$ Ef>zolAOHXW delta 2015 zcmV<52O#+B6_F5-NPh>jNkl>+5Tc1^xZ_ z_=uS{4CCqc_SP7f3?blUK74$95U&@<_y0P8#RKVG#r^c{+qcv!uGbPt;X%gE&dypM zOx>s9jXijMeTBmr8^}Ui=7JwDFai}x8|9Glw=j$@&Q&=X3l(;-w#9SgvLe{_{rmSa z7s$ZkJ2Le2^nZjs7*bd;F@R08P4^Yb(F#N>;?z==pnAdSHUNa)R4?&)L-m0n(6bblJdjsg=^BPzSRyv($~farnj zLMi3aP?024B^cfbfV!dfjQ*}fwc>%a>pVb4~|$-L6p?14TGTKla z3ZwTzvQY^t83fb(cH%q$S}2B-LwYjm4S%FjSZe_QWKiV^|GCb#_D$osI}fCziGfVw z#;OcESqIZAcQln{Y)t|goDdT`L#YAdD(}iFelV4{!R9K>8J+86{%ef7FlwW)gDRa( zgY5Jh$`xNebO4GTbi(Ph(F|Muk!>#Zb^x7pAu;KI4IX64Lf@<9%@l)@AE~?DR)2_r zKOH^2@exa>twkK*MHtQ`7b*-t2+@Zstbh zX3K}E9+Y6}A^0A}?AQDl^k~uqx_fup}B<;^IS=BOx@|=z1P&UeFecJPpi{%SoP!oGH{a)J_U3SwFp8sGy7(1FYcT!suF zK#zH#dfvdTw{*Jp4<=;?m;_H!5UbNYHCx-8E`Nrc-E1s342Wy(lZeP(HxD%sF#BmZ1h0EKy{jn5Y6U4#X5^?I@E+4 Date: Fri, 8 Apr 2022 20:28:59 +0000 Subject: [PATCH 05/66] Replace proprietary texture Replace by the texture from PixelPerfection Legacy by XSSheep (CC-BY-SA) --- .../textures/mcl_nether_netheriteblock.png | Bin 425 -> 201 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_nether/textures/mcl_nether_netheriteblock.png b/mods/ITEMS/mcl_nether/textures/mcl_nether_netheriteblock.png index 60957f01794f9ecc0ad1eb8ce72749060c7d435b..5b08c3d03e0ffe0769fd45a9ae5869d3d0137c49 100644 GIT binary patch delta 185 zcmV;q07n0*1IYo97=Hu<0002(-QrRJ000tDOjJb{6cia47atuQB_bd#DkwEFFdhus zDgXcga!Eu%R0!84jWG_xFbo5^bdS~K0j8V}NXp*Y?H&W||G!cNJ#aV>1PD*G)`H{v zd1oe$!ZEl`?4sedWMi++OB$n_$OAFDk$PfxDn(L8ce delta 411 zcmV;M0c8Hk0jUF!7=H)`0000V^Z#K00004VQb$4nuFf3k0004FNklAAgaVY5pdSu!JV4~i5ySz3XSkpB5*<{#WVJwC3^ z2W;2!-KurY2PWq*&If+}dSD#KZvoSBVz?j5`Ss-)W4o4d9DjLxe`DCEM=?@@WL5$F}Jpii8behWht`@2$deim=Qdbkt=VtNfxsn1< zRYU~8!W!lx&OKkl00wI>fDFl*vN#*3QPG%^tan{{b8g!LKv=>}rs+6s64ce0TG)3z zeb-+qsvOTPW`BrA-L@cCJO!fFXvsZ;PCH2G=fG=du3Q&&Ehw~HzuC`e3TK@0jDd_&?n7c z?FBIG2l&swu#b8(R!CEroJ)Y$m*;H;Yg4bzeR&7)2^3%`%!y0L-% Date: Fri, 8 Apr 2022 20:40:45 +0000 Subject: [PATCH 06/66] README Add license info --- mods/ITEMS/mcl_nether/README.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 mods/ITEMS/mcl_nether/README.txt diff --git a/mods/ITEMS/mcl_nether/README.txt b/mods/ITEMS/mcl_nether/README.txt new file mode 100644 index 000000000..144039e1a --- /dev/null +++ b/mods/ITEMS/mcl_nether/README.txt @@ -0,0 +1,3 @@ +Mod mcl_nether : basic nether blocs + +Texture of mcl_nether_netheritebloc.png from PixelPerfection Legacy by XSSheep edited by Nova_Wostra (CC-BY-SA 4.0) \ No newline at end of file From 5f2ea5b073ebd2ca1d058208f6518c49bf02d0f3 Mon Sep 17 00:00:00 2001 From: 3raven Date: Fri, 8 Apr 2022 20:45:03 +0000 Subject: [PATCH 07/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Fnether/README.txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_nether/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_nether/README.txt b/mods/ITEMS/mcl_nether/README.txt index 144039e1a..8deac79a9 100644 --- a/mods/ITEMS/mcl_nether/README.txt +++ b/mods/ITEMS/mcl_nether/README.txt @@ -1,3 +1,3 @@ -Mod mcl_nether : basic nether blocs +Mod mcl_nether : basic nether blocs, forked from Mineclone 2 Texture of mcl_nether_netheritebloc.png from PixelPerfection Legacy by XSSheep edited by Nova_Wostra (CC-BY-SA 4.0) \ No newline at end of file From 86328c0822eed4cce99e4fe3e7ec97638ce67470 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Fri, 8 Apr 2022 16:13:07 -0500 Subject: [PATCH 08/66] WIP Zombies and Husks wear armor --- mods/ENTITIES/mcl_mobs/api/api.lua | 1 + .../mcl_mobs/api/mob_functions/set_up.lua | 100 ++++++++++++++++++ mods/ENTITIES/mobs_mc/zombie.lua | 2 + 3 files changed, 103 insertions(+) diff --git a/mods/ENTITIES/mcl_mobs/api/api.lua b/mods/ENTITIES/mcl_mobs/api/api.lua index c72dca0bd..564c59d0f 100644 --- a/mods/ENTITIES/mcl_mobs/api/api.lua +++ b/mods/ENTITIES/mcl_mobs/api/api.lua @@ -375,6 +375,7 @@ function mobs:register_mob(name, def) --moves the wrong way swap_y_with_x = def.swap_y_with_x or false, reverse_head_yaw = def.reverse_head_yaw or false, + _spawn_with_armor = def.spawn_with_armor, --END HEAD CODE VARIABLES diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua index d9cc4237c..f3d82b0bb 100644 --- a/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua +++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua @@ -62,6 +62,103 @@ mobs.mob_staticdata = function(self) return minetest.serialize(tmp) end +mobs.armor_setup = function(self) + local armor = self._armor + if not armor then + armor = {} + -- Source: https://minecraft.fandom.com/wiki/Zombie + local materials = { + {name = "leather", chance = 0.3706}, + {name = "gold", chance = 0.4873}, + {name = "chain", chance = 0.129}, + {name = "iron", chance = 0.0127}, + {name = "diamond", chance = 0.0004} + } + local types = { + {name = "helmet", chance = 0.15}, + --{name = "helmet", chance = 1}, + {name = "chestplate", chance = 0.75}, + {name = "leggings", chance = 0.5625}, + {name = "boots", chance = 0.4219} + } + + local material + if type(self._spawn_with_armor) == "string" then + material = self._spawn_with_armor + else + local chance = 0 + for i, m in pairs(materials) do + chance = chance + m.chance + if math.random() <= chance then + material = m.name + break + end + end + end + for i, t in pairs(types) do + if math.random() <= t.chance then + armor[t.name] = material + else + break + end + end + self._armor = armor + end + + local t = "" + local first_image = true + for atype, material in pairs(armor) do + if not first_image then + t = t .. "^" + end + t = t .. "mcl_armor_" .. atype .. "_" .. material .. ".png" + first_image = false + end + if t == "" then + t = "mobs_mc_empty.png" + end + + -- Configure damage groups based on armor + -- Source: https://minecraft.fandom.com/wiki/Armor#Armor_points + local points = 2 + for atype, material in pairs(self._armor) do + local item_name = "mcl_armor:" .. atype .. "_" .. material + points = points + minetest.get_item_group(item_name, "mcl_armor_points") + end + local armor_strength = 100 - 4 * points * 0.8 -- We should realy be using the full damage calculation + local armor_groups = self.object:get_armor_groups() + armor_groups.undead = armor_strength + armor_groups.fleshy = armor_strength + self.object:set_armor_groups(armor_groups) + + local props = self.object:get_properties() + props.textures[1] = t + self.object:set_properties(props) + minetest.chat_send_all(dump(self._armor)) + + -- Rare chance of dropping armor on death + for atype, material in pairs(self._armor) do + local wear = math.random(1, 65535) + local item = "mcl_armor:" .. atype .. "_" .. material .. " 1 " .. wear + self.drops = table.copy(self.drops) + table.insert(self.drops, { + name = item, + chance = 1/0.085, -- 8.5% + min = 1, + max = 1, + looting = "common", + looting_factor = 0.01 / 3, + }) + end + --[[for atype, material in pairs(self._armor) do + if math.random() <= 0.085 then + local wear = math.random(1, 65535) + local item = "mcl_armor:" .. atype .. "_" .. material .. " 1 " .. wear + minetest.add_item(pos, item) + end + end]] +end + -- activate mob and reload settings mobs.mob_activate = function(self, staticdata, def, dtime) @@ -224,6 +321,9 @@ mobs.mob_activate = function(self, staticdata, def, dtime) --update_tag(self) --mobs.set_animation(self, "stand") + if self._spawn_with_armor then + mobs.armor_setup(self) + end -- run on_spawn function if found if self.on_spawn and not self.on_spawn_run then diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua index 3eb0122a7..27432745b 100644 --- a/mods/ENTITIES/mobs_mc/zombie.lua +++ b/mods/ENTITIES/mobs_mc/zombie.lua @@ -204,8 +204,10 @@ local zombie = { attack_type = "punch", punch_timer_cooloff = 0.5, harmed_by_heal = true, + spawn_with_armor = true, } + mobs:register_mob("mobs_mc:zombie", zombie) -- Baby zombie. From 7db8d3cd5fd38fa273998e8feb32f49a22c2594f Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 02:28:43 +0000 Subject: [PATCH 09/66] Add nether wood buttons --- mods/ITEMS/REDSTONE/mesecons_button/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ITEMS/REDSTONE/mesecons_button/init.lua b/mods/ITEMS/REDSTONE/mesecons_button/init.lua index 2812b2758..3dcf5e21e 100644 --- a/mods/ITEMS/REDSTONE/mesecons_button/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_button/init.lua @@ -223,6 +223,8 @@ local woods = { { "darkwood", "mcl_core:darkwood", "mcl_core_planks_big_oak.png", S("Dark Oak Button") }, { "sprucewood", "mcl_core:sprucewood", "mcl_core_planks_spruce.png", S("Spruce Button") }, { "junglewood", "mcl_core:junglewood", "default_junglewood.png", S("Jungle Button") }, + { "warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood", "warped_hyphae_wood.png", S("Warped Hyphae Button") }, + { "crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "crimson_hyphae_wood.png", S("Crimson Hyphae Button") }, } for w=1, #woods do From b0392bbeb9542fcf53baa4da8eb000fdac69652c Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 02:39:52 +0000 Subject: [PATCH 10/66] Add blackstone button --- mods/ITEMS/REDSTONE/mesecons_button/init.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mods/ITEMS/REDSTONE/mesecons_button/init.lua b/mods/ITEMS/REDSTONE/mesecons_button/init.lua index 3dcf5e21e..b324fcf6d 100644 --- a/mods/ITEMS/REDSTONE/mesecons_button/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_button/init.lua @@ -216,6 +216,18 @@ mesecon.register_button( S("A stone button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second."), "mesecons_button_push") +mesecon.register_button( + "polished_blackstone", + S("Polished Blackstone Button"), + "mcl_blackstone_polished.png", + "mcl_blackstone:blackstone_polished", + mcl_sounds.node_sound_stone_defaults(), + {material_stone=1,handy=1,pickaxey=1}, + 1, + false, + S("A polished blackstone button is a redstone component made out of polished blackstone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second."), + "mesecons_button_push") + local woods = { { "wood", "mcl_core:wood", "default_wood.png", S("Oak Button") }, { "acaciawood", "mcl_core:acaciawood", "default_acacia_wood.png", S("Acacia Button") }, From 45c388931662f9a3b99a5980019968c3737c84c1 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 02:58:14 +0000 Subject: [PATCH 11/66] Add nether wood pressure plate --- mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua index d040c8666..db08e81c7 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua @@ -164,6 +164,8 @@ local woods = { { "darkwood", "mcl_core:darkwood", "mcl_core_planks_big_oak.png", S("Dark Oak Pressure Plate" )}, { "sprucewood", "mcl_core:sprucewood", "mcl_core_planks_spruce.png", S("Spruce Pressure Plate") }, { "junglewood", "mcl_core:junglewood", "default_junglewood.png", S("Jungle Pressure Plate") }, + { "warped_hyphae_wood", "mcl_mushrooom:warped_hyphae_wood", "warped_hyphae_wood.png", S("Warped Hyphae Pressure Plate")}, + { "crimson_hyphae_wood", "mcl_mushrooom:crimson_hyphae_wood", "crimson_hyphae_wood.png", S("Crimson Hyphae Pressure Plate")}, } for w=1, #woods do From 3129379fe97e656e37382690959600903683fd8a Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 03:21:38 +0000 Subject: [PATCH 12/66] Add steel and black stone pressure plate light and heavy weighted pressure plate don't work the same as in minecraft. They dont give signal proportional to entities number. Modified heavey weighted pressure plate so it detect all entities as in minecraft wiki. --- .../REDSTONE/mesecons_pressureplates/init.lua | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua index db08e81c7..b3d7a4de8 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua @@ -203,6 +203,19 @@ mesecon.register_pressure_plate( { player = true, mob = true }, S("A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.")) +mesecon.register_pressure_plate( + "mesecons_pressureplates:pressure_plate_polished_blackstone", + S("Polished Blackstone Pressure Plate"), + {"mcl_blackstone_polished.png"}, + {"mcl_blackstone_polished.png"}, + "default_stone.png", + nil, + {{"mcl_blackstone:blackstone_polished", "mcl_blackstone:blackstone_polished"}}, + mcl_sounds.node_sound_stone_defaults(), + {pickaxey=1, material_stone=1}, + { player = true, mob = true }, + S("A polished blackstone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.")) + mesecon.register_pressure_plate( "mesecons_pressureplates:pressure_plate_gold", S("Light-Weighted Pressure Plate"), @@ -213,5 +226,18 @@ mesecon.register_pressure_plate( {{"mcl_core:gold_ingot", "mcl_core:gold_ingot"}}, mcl_sounds.node_sound_metal_defaults(), {pickaxey=1}, - { player = true, mob = true }, - S("A light-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.")) + nil, + S("A light-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.")) + +mesecon.register_pressure_plate( + "mesecons_pressureplates:pressure_plate_iron", + S("Heavy-Weighted Pressure Plate"), + {"default_steel_block.png"}, + {"default_steel_block.png"}, + "default_steel_block.png", + nil, + {{"mcl_core:iron_ingot", "mcl_core:iron_ingot"}}, + mcl_sounds.node_sound_metal_defaults(), + {pickaxey=1}, + nil, + S("A heavy-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.")) From 5fa14070d3a93f2611da5ab7316a6d99010f2019 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 03:50:37 +0000 Subject: [PATCH 13/66] Add target from mcl2 --- mods/ITEMS/REDSTONE/mcl_target/init.lua | 70 +++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 mods/ITEMS/REDSTONE/mcl_target/init.lua diff --git a/mods/ITEMS/REDSTONE/mcl_target/init.lua b/mods/ITEMS/REDSTONE/mcl_target/init.lua new file mode 100644 index 000000000..268c6ebe3 --- /dev/null +++ b/mods/ITEMS/REDSTONE/mcl_target/init.lua @@ -0,0 +1,70 @@ +local S = minetest.get_translator("mcl_target") + +local mod_farming = minetest.get_modpath("mcl_farming") + +mcl_target = {} + +function mcl_target.hit(pos, time) + minetest.set_node(pos, {name="mcl_target:target_on"}) + mesecon.receptor_on(pos, mesecon.rules.alldirs) + + local timer = minetest.get_node_timer(pos) + timer:start(time) +end + +minetest.register_node("mcl_target:target_off", { + description = S("Target"), + _doc_items_longdesc = S("A target is a block that provides a temporary redstone charge when hit by a projectile."), + _doc_items_usagehelp = S("Throw a projectile on the target to activate it."), + tiles = {"mcl_target_target_top.png", "mcl_target_target_top.png", "mcl_target_target_side.png"}, + groups = {hoey = 1}, + sounds = mcl_sounds.node_sound_dirt_defaults({ + footstep = {name="default_grass_footstep", gain=0.1}, + }), + mesecons = { + receptor = { + state = mesecon.state.off, + rules = mesecon.rules.alldirs, + }, + }, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, +}) + +minetest.register_node("mcl_target:target_on", { + description = S("Target"), + _doc_items_create_entry = false, + tiles = {"mcl_target_target_top.png", "mcl_target_target_top.png", "mcl_target_target_side.png"}, + groups = {hoey = 1, not_in_creative_inventory = 1}, + drop = "mcl_target:target_off", + sounds = mcl_sounds.node_sound_dirt_defaults({ + footstep = {name="default_grass_footstep", gain=0.1}, + }), + on_timer = function(pos, elapsed) + local node = minetest.get_node(pos) + if node.name == "mcl_target:target_on" then --has not been dug + minetest.set_node(pos, {name="mcl_target:target_off"}) + mesecon.receptor_off(pos, mesecon.rules.alldirs) + end + end, + mesecons = { + receptor = { + state = mesecon.state.on, + rules = mesecon.rules.alldirs, + }, + }, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, +}) + + +if mod_farming then + minetest.register_craft({ + output = "mcl_target:target_off", + recipe = { + {"", "mesecons:redstone", ""}, + {"mesecons:redstone", "mcl_farming:hay_block", "mesecons:redstone"}, + {"", "mesecons:redstone", ""}, + }, + }) +end \ No newline at end of file From 13e92cd5b314c8e2e0b9dad4d1cd1498bc698ed0 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 03:51:46 +0000 Subject: [PATCH 14/66] Add target from mcl 2 --- mods/ITEMS/REDSTONE/mcl_target/mod.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 mods/ITEMS/REDSTONE/mcl_target/mod.conf diff --git a/mods/ITEMS/REDSTONE/mcl_target/mod.conf b/mods/ITEMS/REDSTONE/mcl_target/mod.conf new file mode 100644 index 000000000..16f70ed12 --- /dev/null +++ b/mods/ITEMS/REDSTONE/mcl_target/mod.conf @@ -0,0 +1,3 @@ +name = mcl_target +author = AFCMS +depends = mesecons, mcl_sounds \ No newline at end of file From 5d214ae4bf9c913d4df25737f45d7f5b4b4d9bd9 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 03:53:12 +0000 Subject: [PATCH 15/66] Add target --- mods/ITEMS/REDSTONE/mcl_target/locale/template.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mods/ITEMS/REDSTONE/mcl_target/locale/template.txt diff --git a/mods/ITEMS/REDSTONE/mcl_target/locale/template.txt b/mods/ITEMS/REDSTONE/mcl_target/locale/template.txt new file mode 100644 index 000000000..18bc7708c --- /dev/null +++ b/mods/ITEMS/REDSTONE/mcl_target/locale/template.txt @@ -0,0 +1,4 @@ +# textdomain: mcl_target +Target= +A target is a block that provides a temporary redstone charge when hit by a projectile.= +Throw a projectile on the target to activate it.= \ No newline at end of file From 11a9f6baead3f95657e7580aa43028ea7e00c970 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 03:54:13 +0000 Subject: [PATCH 16/66] Add target --- mods/ITEMS/REDSTONE/mcl_target/locale/mcl_target.fr.tr | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mods/ITEMS/REDSTONE/mcl_target/locale/mcl_target.fr.tr diff --git a/mods/ITEMS/REDSTONE/mcl_target/locale/mcl_target.fr.tr b/mods/ITEMS/REDSTONE/mcl_target/locale/mcl_target.fr.tr new file mode 100644 index 000000000..6c558683d --- /dev/null +++ b/mods/ITEMS/REDSTONE/mcl_target/locale/mcl_target.fr.tr @@ -0,0 +1,4 @@ +# textdomain: mcl_target +Target=Cible +A target is a block that provides a temporary redstone charge when hit by a projectile.=La cible est un bloc qui se comporte comme une source d'énergie temporaire quand elle est frappée par un projectile. +Throw a projectile on the target to activate it.=Lancer un projectile sur la cible pour l'activer. \ No newline at end of file From 820ceceffcae2e1a5468ceb4a9d231c29d83c85a Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 03:55:23 +0000 Subject: [PATCH 17/66] Add target --- .../textures/mcl_target_target_side.png | Bin 0 -> 752 bytes .../mcl_target/textures/mcl_target_target_top.png | Bin 0 -> 752 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/REDSTONE/mcl_target/textures/mcl_target_target_side.png create mode 100644 mods/ITEMS/REDSTONE/mcl_target/textures/mcl_target_target_top.png diff --git a/mods/ITEMS/REDSTONE/mcl_target/textures/mcl_target_target_side.png b/mods/ITEMS/REDSTONE/mcl_target/textures/mcl_target_target_side.png new file mode 100644 index 0000000000000000000000000000000000000000..286f7767edfb3060af8b57a0521c6930b36bbf36 GIT binary patch literal 752 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01F8K01F8L68c9z00007bV*G`2jmA2 z4>=XXM-d(X00MAHL_t(I%YBp2OVe=}$6vFr!@i&SZLWXM4&*}N_ zJnzr*KF3(wO3+wmMF^!3 zSES64H$xuKH2G3@7fS-1!i{mUB z*4Y@G0RJsQ+bLQaZ72XzW>8*y#2xTsce*&`aA2`jm4H*Rc+Ls<364yIua!hHjp>2! zdiLPuJ6ZrS4%o zv!kS9aiU?pP*ho5+vSv$Y=(3;Lpn}}M&-jU=C1Y}q48^Qxj^G;Hp|;rKQK+*^JRrl zSRQ{)@8r;bg|rum5Dn`DN2ba6TB$#4$?c%Vb&}@(PUZ&2>75(`U@sCmR?5MVY3lkr zkTR1~aB)KWP#1FpPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01F8K01F8L68c9z00007bV*G`2jmA2 z4>|)JzW0m(00MAHL_t(I%YBp2OVe=}$6vFr!@i&SZLWXM4&*}N_ zJnzr*KF3(wO3+wmMF^!3 zSES64H$xuKH2G3@7fS-1!i{mUB z*4Y@G0RJsQ+bLQaZ72XzW>8*y#2xTsce*&`aA2`jm4H*Rc+Ls<364yIua!hHjp>2! zdiLPuJ6ZrS4%o zv!kS9aiU?pP*ho5+vSv$Y=(3;Lpn}}M&-jU=C1Y}q48^Qxj^G;Hp|;rKQK+*^JRrl zSRQ{)@8r;bg|rum5Dn`DN2ba6TB$#4$?c%Vb&}@(PUZ&2>75(`U@sCmR?5MVY3lkr zkTR1~aB)KWP#1Fp Date: Sat, 9 Apr 2022 04:12:11 +0000 Subject: [PATCH 18/66] Add french translation --- mods/ITEMS/REDSTONE/mcl_bells/locale/mcl_bells.fr.tr | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 mods/ITEMS/REDSTONE/mcl_bells/locale/mcl_bells.fr.tr diff --git a/mods/ITEMS/REDSTONE/mcl_bells/locale/mcl_bells.fr.tr b/mods/ITEMS/REDSTONE/mcl_bells/locale/mcl_bells.fr.tr new file mode 100644 index 000000000..a1f7a075c --- /dev/null +++ b/mods/ITEMS/REDSTONE/mcl_bells/locale/mcl_bells.fr.tr @@ -0,0 +1,2 @@ +# textdomain: mcl_observers +Bell=Cloche From 3e8e74b633e459591e36f2a0f4a517f217ffc6f7 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 04:21:16 +0000 Subject: [PATCH 19/66] Update template --- mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt b/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt index 4c352b878..41d404101 100644 --- a/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt +++ b/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt @@ -1,6 +1,7 @@ # textdomain: mesecons_button Use the button to push it.= Stone Button= +Polished Blackstone Button= A stone button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second.= Oak Button= Acacia Button= @@ -8,6 +9,8 @@ Birch Button= Dark Oak Button= Spruce Button= Jungle Button= +Warped Hyphae Button= +Crimson Hyphae Button= A wooden button is a redstone component made out of wood which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1.5 seconds. Wooden buttons may also be pushed by arrows.= Provides redstone power when pushed= Push duration: @1s= From 5429a259ffa8bd0ec23515dcd281f7238ff3aa16 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 04:24:09 +0000 Subject: [PATCH 20/66] Update french translation --- .../REDSTONE/mesecons_button/locale/mesecons_button.fr.tr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ITEMS/REDSTONE/mesecons_button/locale/mesecons_button.fr.tr b/mods/ITEMS/REDSTONE/mesecons_button/locale/mesecons_button.fr.tr index 96f963b4b..03d78b50d 100644 --- a/mods/ITEMS/REDSTONE/mesecons_button/locale/mesecons_button.fr.tr +++ b/mods/ITEMS/REDSTONE/mesecons_button/locale/mesecons_button.fr.tr @@ -1,6 +1,7 @@ # textdomain: mesecons_button Use the button to push it.=Utilisez le bouton pour le pousser. Stone Button=Bouton de pierre +Polished Blackstone Button=Bouton de Pierre Noire Polie A stone button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second.=Un bouton en pierre est un composant Redstone en pierre qui peut être poussé pour fournir de la puissance Redstone. Lorsqu'il est poussé, il alimente les composants Redstone adjacents pendant 1 seconde. Oak Button=Bouton en Chêne Acacia Button=Bouton en Acacia @@ -8,6 +9,8 @@ Birch Button=Bouton en Bouleau Dark Oak Button=Bouton en Chêne Noir Spruce Button=Bouton en Sapin Jungle Button=Bouton en Acajou +Warped Hyphae Button=Bouton en Hyphae Tordu +Crimson Hyphae Button=Bouton en Hyphae Ecarlate A wooden button is a redstone component made out of wood which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1.5 seconds. Wooden buttons may also be pushed by arrows.=Un bouton en bois est un composant de redstone en bois qui peut être poussé pour fournir une puissance de redstone. Lorsqu'il est poussé, il alimente les composants Redstone adjacents pendant 1,5 seconde. Les boutons en bois peuvent également être poussés par des flèches. Provides redstone power when pushed=Fournit une puissance de redstone lorsqu'il est poussé Push duration: @1s=Durée de poussée: @1s From c0e83aa0cd545468280f011a2cba8f3c46d70dea Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 04:41:09 +0000 Subject: [PATCH 21/66] Update template.txt --- .../REDSTONE/mesecons_pressureplates/locale/template.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt b/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt index 96eb3f922..a118f727a 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/template.txt @@ -6,9 +6,17 @@ Birch Pressure Plate= Dark Oak Pressure Plate= Spruce Pressure Plate= Jungle Pressure Plate= +Warped Hyphae Pressure Plate= +Crimson Hyphae Pressure Plate= A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.= Stone Pressure Plate= A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.= +Polished Blackstone Pressure Plate= +A polished blackstone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.= +Light-Weighted Pressure Plate= +A light-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.= +Heavy-Weighted Pressure Plate= +A heavy-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.= Provides redstone power when pushed= Pushable by players, mobs and objects= Pushable by players and mobs= From 69fc0228d6137e920a473186e3c851acb073bdeb Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 05:00:07 +0000 Subject: [PATCH 22/66] Update french translation --- .../locale/mesecons_pressureplates.fr.tr | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/mesecons_pressureplates.fr.tr b/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/mesecons_pressureplates.fr.tr index ef145de56..f82d3f552 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/mesecons_pressureplates.fr.tr +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/locale/mesecons_pressureplates.fr.tr @@ -6,10 +6,18 @@ Birch Pressure Plate=Plaque de pression en Bouleau Dark Oak Pressure Plate=Plaque de pression en Chêne Noir Spruce Pressure Plate=Plaque de pression en Sapin Jungle Pressure Plate=Plaque de pression en Acajou +Warped Hyphae Pressure Plate=Plaque de pression en Hyphae Tordue +Crimson Hyphae Pressure Plate=Plaque de pression en Hyphae Ecarlate A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.=Une plaque de pression en bois est un composant de redstone qui alimente ses blocs environnants en puissance de redstone tandis que tout objet mobile (y compris les objets lâchés, les joueurs et les mobs) repose dessus. Stone Pressure Plate=Plaque de pression en pierre A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.=Une plaque de pression en pierre est un composant de redstone qui alimente ses blocs environnants en puissance de redstone pendant qu'un joueur ou un mob se tient au-dessus. Il n'est déclenché par rien d'autre. -Provides redstone power when pushed=Fournit une puissance de redstone lorsqu'il est poussé +Polished Blackstone Pressure Plate=Plaque de pression en pierre noire polie +A polished blackstone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.=Une plaque de pression en pierre noire polie est un composant de redstone qui alimente ses blocs environnants en puissance de redstone pendant qu'un joueur ou un mob se tient au-dessus. Il n'est déclenché par rien d'autre. +Light-Weighted Pressure Plate=Plaque de pression pondérée légère +A light-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.=Une plaque de pression pondérée légère est un composant de redstone qui alimente ses blocs environnants en puissance de redstone tandis que tout objet mobile (y compris les objets lâchés, les joueurs et les mobs) repose dessus. +Heavy-Weighted Pressure Plate=Plaque de pression pondérée lourde +A heavy-weighted pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.=Une plaque de pression pondérée lourde est un composant de redstone qui alimente ses blocs environnants en puissance de redstone tandis que tout objet mobile (y compris les objets lâchés, les joueurs et les mobs) repose dessus. +Provides redstone power when pushed=Fournit une puissance de redstone lorsque poussé Pushable by players, mobs and objects=Poussable par les joueurs, les mobs et les objets Pushable by players and mobs=Poussable par les joueurs et les mobs Pushable by players=Poussable par les joueurs From e017d4a724b8a1c6e6351df808a0aedfdaee036a Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 05:33:22 +0000 Subject: [PATCH 23/66] Add translation --- mods/ITEMS/mcl_beds/respawn_anchor.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mods/ITEMS/mcl_beds/respawn_anchor.lua b/mods/ITEMS/mcl_beds/respawn_anchor.lua index 5f279abd7..e479ac097 100644 --- a/mods/ITEMS/mcl_beds/respawn_anchor.lua +++ b/mods/ITEMS/mcl_beds/respawn_anchor.lua @@ -2,10 +2,11 @@ --Nether ends at y -29077 --Nether roof at y -28933 - +local S = minetest.get_translator(minetest.get_current_modname()) +--local mod_doc = minetest.get_modpath("doc") -> maybe add documentation ? minetest.register_node("mcl_beds:respawn_anchor",{ - description="Respawn Anchor", + description=S("Respawn Anchor"), tiles = { "respawn_anchor_top_off.png", "respawn_anchor_bottom.png", @@ -36,7 +37,7 @@ minetest.register_node("mcl_beds:respawn_anchor",{ _mcl_hardness = 22.5 }) minetest.register_node("mcl_beds:respawn_anchor_charged_1",{ - description="Respawn Anchor", + description=S("Respawn Anchor"), tiles = { "portal.png", "respawn_anchor_bottom.png", @@ -104,7 +105,7 @@ minetest.register_node("mcl_beds:respawn_anchor_charged_2",{ }) minetest.register_node("mcl_beds:respawn_anchor_charged_3",{ - description="Respawn Anchor", + description=S("Respawn Anchor") tiles = { "portal.png", "respawn_anchor_bottom.png", @@ -138,7 +139,7 @@ minetest.register_node("mcl_beds:respawn_anchor_charged_3",{ }) minetest.register_node("mcl_beds:respawn_anchor_charged_4",{ - description="Respawn Anchor", + description=S("Respawn Anchor"), tiles = { "portal.png", "respawn_anchor_bottom.png", From 8f64a1e18c2761d98a393b0a5664291d685c1406 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 05:35:54 +0000 Subject: [PATCH 24/66] Update translation --- mods/ITEMS/mcl_beds/locale/template.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_beds/locale/template.txt b/mods/ITEMS/mcl_beds/locale/template.txt index 5525bd91b..69c493880 100644 --- a/mods/ITEMS/mcl_beds/locale/template.txt +++ b/mods/ITEMS/mcl_beds/locale/template.txt @@ -40,3 +40,4 @@ You will fall asleep when all players are in bed.= You will fall asleep when @1% of all players are in bed.= You're in bed.= Allows you to sleep= +Respawn Anchor= From b7c521bedc85ac5aa6566b53a3438bdb7c7099a6 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 05:37:39 +0000 Subject: [PATCH 25/66] Update french translation --- mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr b/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr index d85d48bf1..ba513df3a 100644 --- a/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr +++ b/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr @@ -39,3 +39,4 @@ You're sleeping.=Tu dors. You will fall asleep when all players are in bed.=Vous vous endormirez lorsque tous les joueurs seront au lit. You're in bed.=Tu es au lit. Allows you to sleep=Vous permet de dormir +Respwn Anchor=Ancre de Réapparition \ No newline at end of file From c1a7d3e504033adb2f1ed8d41643725bbf2b89ab Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 06:07:35 +0000 Subject: [PATCH 26/66] Update --- mods/ITEMS/mcl_compass/locale/template.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_compass/locale/template.txt b/mods/ITEMS/mcl_compass/locale/template.txt index 462a08bc4..67ca6e840 100644 --- a/mods/ITEMS/mcl_compass/locale/template.txt +++ b/mods/ITEMS/mcl_compass/locale/template.txt @@ -2,3 +2,4 @@ Compasses are tools which point to the world origin (X@=0, Z@=0) or the spawn point in the Overworld.= Compass= Points to the world origin= +Lodestone Compass= From e4865338fcefb678a19a738c2ec58cd27ac96515 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 06:12:07 +0000 Subject: [PATCH 27/66] Update translation --- mods/ITEMS/mcl_compass/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_compass/init.lua b/mods/ITEMS/mcl_compass/init.lua index 812c2345f..dbb2e8358 100644 --- a/mods/ITEMS/mcl_compass/init.lua +++ b/mods/ITEMS/mcl_compass/init.lua @@ -206,7 +206,7 @@ mcl_compass.stereotype = "mcl_compass:"..tostring(stereotype_frame) minetest.register_node("mcl_compass:lodestone",{ - description="Lodestone", + description=S("Lodestone"), on_rightclick = function(pos, node, player, itemstack) if itemstack.get_name(itemstack).match(itemstack.get_name(itemstack),"mcl_compass:") then if itemstack.get_name(itemstack) ~= "mcl_compass:lodestone" then From 99c4fbfc389e199cfd85cfde5d2a8294c6873b78 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 06:13:17 +0000 Subject: [PATCH 28/66] Update --- mods/ITEMS/mcl_compass/locale/template.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_compass/locale/template.txt b/mods/ITEMS/mcl_compass/locale/template.txt index 67ca6e840..48157aa14 100644 --- a/mods/ITEMS/mcl_compass/locale/template.txt +++ b/mods/ITEMS/mcl_compass/locale/template.txt @@ -3,3 +3,4 @@ Compasses are tools which point to the world origin (X@=0, Z@=0) or the spawn po Compass= Points to the world origin= Lodestone Compass= +Lodestone= \ No newline at end of file From fd94fba22c08c1f438b030707d28410ea30a7b92 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 06:15:06 +0000 Subject: [PATCH 29/66] Update french translation --- mods/ITEMS/mcl_compass/locale/mcl_compass.fr.tr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ITEMS/mcl_compass/locale/mcl_compass.fr.tr b/mods/ITEMS/mcl_compass/locale/mcl_compass.fr.tr index 89299fde7..8ad4bda79 100644 --- a/mods/ITEMS/mcl_compass/locale/mcl_compass.fr.tr +++ b/mods/ITEMS/mcl_compass/locale/mcl_compass.fr.tr @@ -2,3 +2,5 @@ Compasses are tools which point to the world origin (X@=0, Z@=0) or the spawn point in the Overworld.=Les boussoles sont des outils qui pointent vers l'origine du monde (X@=0,Z@=0) ou le point d'apparition dans l'Overworld. Compass=Boussole Points to the world origin=Pointe vers l'origine mondiale +Lodestone Compass=Boussole magnétisée +Lodestone=Magnétite From f60588cf25561486bdc155852c167347deace204 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 06:38:04 +0000 Subject: [PATCH 30/66] Update Please when you add stuff update the template.txt and not just one translation file --- mods/ITEMS/mcl_core/locale/template.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mods/ITEMS/mcl_core/locale/template.txt b/mods/ITEMS/mcl_core/locale/template.txt index 57b15ef82..901c0a4a3 100644 --- a/mods/ITEMS/mcl_core/locale/template.txt +++ b/mods/ITEMS/mcl_core/locale/template.txt @@ -284,3 +284,7 @@ Slows down movement= 2×2 saplings @= large tree= Grows on sand or dirt next to water= Stackable= +Moss= +Moss Carpet= +A moss block is a natural block that can be spread to some other blocks by using bone meal.= +Moss Carpets are a thin decorative variant of the moss block.= \ No newline at end of file From 6afda0af92e3d403887a1a10d0c712355a8fb674 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 06:42:51 +0000 Subject: [PATCH 31/66] Update french translation --- mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr index c4c818aae..3dee12c57 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr @@ -256,3 +256,7 @@ Slows down movement=Ralentit le mouvement 2×2 saplings @= large tree=2×2 pousses @= grand arbre Grows on sand or dirt next to water=Pousse sur le sable ou la terre près de l'eau Stackable=Empilable +Moss=Mousse +Moss Carpet=Tapis de Mousse +A moss block is a natural block that can be spread to some other blocks by using bone meal.=Un bloc de mousse est un bloc naturel qui peut se propager à d'autres blocs en utilisant de la farine d'os. +Moss Carpets are a thin decorative variant of the moss block.=Les tapis de mousse sont une fine variante décorative du bloc de mousse. \ No newline at end of file From 7f34c979ff5e99ebde27c5f7404b70537a810e89 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 06:49:31 +0000 Subject: [PATCH 32/66] update --- mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr index 3dee12c57..d51cf831a 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr @@ -92,6 +92,7 @@ Diorite=Diorite Diorite is an igneous rock.=La diorite est une roche volcanique. Dirt=Terre Dirt acts as a soil for a few plants. When in light, this block may grow a grass or mycelium cover if such blocks are nearby.=La terre agit comme un sol pour quelques plantes. Lorsqu'il est à la lumière, ce bloc peut faire pousser une couverture d'herbe ou de mycélium si ces blocs sont à proximité. +Enchanted Golden Apple=Pomme Dorée Enchantée Emerald=Emeraude Emerald Ore=Minerai d'Emeraude Emerald ore is the ore of emeralds. It is very rare and can be found alone, not in clusters.=Le minerai d'émeraude produit des émeraudes. Il est très rare et ne peut être trouvé que seul, pas en filons. From 9dd85f9f7b85147e9ef95e9a8137a3bb4670398c Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 07:12:24 +0000 Subject: [PATCH 33/66] Update french translation --- mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr index d51cf831a..83922aa86 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr @@ -155,6 +155,8 @@ Oak Wood Planks=Planches de Chêne Oak leaves are grown from oak trees.=Les feuilles de chêne sont cultivées à partir de chênes. Obsidian=Obsidienne Obsidian is an extremely hard mineral with an enourmous blast-resistance. Obsidian is formed when water meets lava.=L'obsidienne est un minéral extrêmement dur avec une énorme résistance à l'explosion. L'obsidienne se forme lorsque l'eau rencontre la lave. +Crying Obsidian=Obsidienne Pleureuse +Crying obsidian is a luminous obsidian that can generate as part of ruined portals.=L'obsidienne pleureuse est de l'obsidienne lumineuse générée comme composant des portails en ruines. One of the most common blocks in the world, almost the entire underground consists of stone. It sometimes contains ores. Stone may be created when water meets lava.=L'un des blocs les plus courants au monde, presque tout le sous-sol est en pierre. Il contient parfois des minerais. La pierre peut être créée lorsque l'eau rencontre la lave. Orange Stained Glass=Verre Orange Packed Ice=Glace Compactée @@ -203,20 +205,45 @@ Stained glass is a decorative and mostly transparent block which comes in variou Stick=Bâton Sticks are a very versatile crafting material; used in countless crafting recipes.=Les bâtons sont un matériau d'artisanat très polyvalent; utilisé dans d'innombrables recettes d'artisanat. Stone=Roche +Stripped Acacia Log=Bois d'Acacia +Stripped Acacia Wood=Bois Ecorché d'Acacia +Stripped Birch Log=Bois de Bouleau +Stripped Birch Wood=Bois Ecorché de Bouleau +Stripped Dark Oak Log=Bois de Chêne Noir +Stripped Dark Oak Wood=Bois Ecorché de Chêne Noir +Stripped Jungle Log=Bois d'Acajou +Stripped Jungle Wood=Bois Ecorché d'Acajou +Stripped Oak Log=Bois de Chêne +Stripped Oak Wood=Bois Ecorché de Chêne +Stripped Spruce Log=Bois de Sapin +Stripped Spruce Wood=Bois Ecorché de Sapin Stone Bricks=Pierre Taillée Sugar=Sucre Sugar Canes=Canne à Sucre Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.=Les cannes à sucre sont une plante qui a certaines utilisations dans l'artisanat. Les cannes à sucre poussent lentement jusqu'à 3 blocs lorsqu'elles sont à côté de l'eau et sont placées sur un bloc d'herbe, de terre, de sable, de sable rouge, de podzol ou de terre stérile. Lorsqu'une canne à sucre est cassée, toutes les cannes à sucre connectées au-dessus se brisent également. Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Les cannes à sucre ne peuvent être placées que sur d'autres cannes à sucre et sur des blocs sur lesquels elles poussent. Sugar comes from sugar canes and is used to make sweet foods.=Le sucre provient des cannes à sucre et est utilisé pour fabriquer des aliments sucrés. +The stripped trunk of an acacia tree.=Le tronc écorché d'un acacia. +The stripped trunk of a birch tree.=Le tronc écorché d'un bouleau. +The stripped trunk of a dark oak tree.=Le tronc écorché d'un chêne noir. +The stripped trunk of a jungle tree.=Le tronc écorché d'un acajou. +The stripped trunk of an oak tree.=Le tronc écorché d'un chêne. +The stripped trunk of a spruce tree.=Le tronc écorché d'un sapin. The trunk of a birch tree.=Le tronc d'un bouleau. The trunk of a dark oak tree.=Le tronc d'un chêne noir. The trunk of a jungle tree.=Le tronc d'un acajou. The trunk of a spruce tree.=Le tronc d'un sapin. The trunk of an acacia.=Le tronc d'un acacia The trunk of an oak tree.=Le tronc d'un chêne. +The stripped wood of an acacia tree.=Les planches écorchée d'un acacia. +The stripped wood of a birch tree.=Les planches écorchée d'un bouleau. +The stripped wood of a dark oak tree.=Les planches écorchée d'un chêne noir. +The stripped wood of a jungle tree.=Les planches écorchée d'un acajou. +The stripped wood of an oak tree.=Les planches écorchée d'un chêne. +The stripped wood of a spruce tree.=Les planches écorchée d'un sapin. This block consists of a couple of loose stones and can't support itself.=Ce bloc se compose de quelques pierres lâches et ne peut pas se soutenir. This is a decorative block surrounded by the bark of a tree trunk.=Il s'agit d'un bloc décoratif entouré par l'écorce d'un tronc d'arbre. +This is a decorative block.=Il s'agit d'un bloc décoratif. This is a full block of snow. Snow of this thickness is usually found in areas of extreme cold.=Ceci est un bloc de neige complet. La neige de cette épaisseur se trouve généralement dans les zones de froid extrême. This is a piece of cactus commonly found in dry areas, especially deserts. Over time, cacti will grow up to 3 blocks high on sand or red sand. A cactus hurts living beings touching it with a damage of 1 HP every half second. When a cactus block is broken, all cactus blocks connected above it will break as well.=Il s'agit d'un morceau de cactus que l'on trouve couramment dans les zones sèches, en particulier dans les déserts. Au fil du temps, les cactus pousseront jusqu'à 3 blocs de haut sur le sable ou le sable rouge. Un cactus blesse les êtres vivants qui le touchent avec des dégâts de 1 HP toutes les demi-secondes. Lorsqu'un bloc de cactus est brisé, tous les blocs de cactus connectés au-dessus se brisent également. This stone contains pure gold, a rare metal.=Cette pierre contient de l'or pur, un métal rare. From cc300971b3b478efb39b68db7bcbfea615417d4e Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 07:42:19 +0000 Subject: [PATCH 34/66] Update --- mods/ITEMS/mcl_furnaces/locale/template.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mods/ITEMS/mcl_furnaces/locale/template.txt b/mods/ITEMS/mcl_furnaces/locale/template.txt index 4f88824b0..edbc185a5 100644 --- a/mods/ITEMS/mcl_furnaces/locale/template.txt +++ b/mods/ITEMS/mcl_furnaces/locale/template.txt @@ -7,3 +7,10 @@ Burning Furnace= Recipe book= Inventory= Uses fuel to smelt or cook items= +Blast Furnace= +Blast Furnaces cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.= +Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.= +Smoker= +Uses fuel to smelt or cook items= +Smokers cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.= +Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.= From f46d0930388fb14b56c1f731386852a359c85ec6 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 07:44:09 +0000 Subject: [PATCH 35/66] remove doublon --- mods/ITEMS/mcl_furnaces/locale/template.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ITEMS/mcl_furnaces/locale/template.txt b/mods/ITEMS/mcl_furnaces/locale/template.txt index edbc185a5..ba0b31c4d 100644 --- a/mods/ITEMS/mcl_furnaces/locale/template.txt +++ b/mods/ITEMS/mcl_furnaces/locale/template.txt @@ -11,6 +11,5 @@ Blast Furnace= Blast Furnaces cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.= Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.= Smoker= -Uses fuel to smelt or cook items= Smokers cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.= Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.= From cbfac6074289f3ad7ea91449952f37d1c2ed11fd Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 07:45:41 +0000 Subject: [PATCH 36/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Ffurnaces/locale/template.txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_furnaces/locale/template.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/mods/ITEMS/mcl_furnaces/locale/template.txt b/mods/ITEMS/mcl_furnaces/locale/template.txt index ba0b31c4d..d48de3909 100644 --- a/mods/ITEMS/mcl_furnaces/locale/template.txt +++ b/mods/ITEMS/mcl_furnaces/locale/template.txt @@ -9,7 +9,5 @@ Inventory= Uses fuel to smelt or cook items= Blast Furnace= Blast Furnaces cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.= -Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.= Smoker= Smokers cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.= -Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.= From 2b87fb2cd27ae46934e36a5d0a01fe27789542e6 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 07:51:40 +0000 Subject: [PATCH 37/66] Update french translation --- mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.fr.tr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.fr.tr b/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.fr.tr index f7b37e537..6140504ef 100644 --- a/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.fr.tr +++ b/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.fr.tr @@ -7,3 +7,7 @@ Burning Furnace=Four Allumé Recipe book=Livre de Recette Inventory=Inventaire Uses fuel to smelt or cook items=Utilise du carburant pour fondre ou cuire des articles +Blast Furnace=Haut Fourneau +Blast Furnaces cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.=Un haut fourneau peut cuire ou fondre plusieurs objets, en quelque chose d'autre, en utilisant du carburant, plus vite qu'un four normal. +Smoker=Fumoir +Smokers cook or smelt several items, using a furnace fuel, into something else, but faster than a normal furnace.=Le Fumoir peut cuire ou fondre plusieurs objets, en quelque chose d'autre, en utilisant du carburant, plus vite qu'un four normal. From 4c957a3e7c40498d445d098617c4090cbca201ea Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 08:01:16 +0000 Subject: [PATCH 38/66] Add Translation --- mods/ITEMS/mcl_lanterns/template.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mods/ITEMS/mcl_lanterns/template.txt diff --git a/mods/ITEMS/mcl_lanterns/template.txt b/mods/ITEMS/mcl_lanterns/template.txt new file mode 100644 index 000000000..765de8747 --- /dev/null +++ b/mods/ITEMS/mcl_lanterns/template.txt @@ -0,0 +1,6 @@ +# textdomain: mcl_lanterns +Chain= +Chains are metallic decoration blocks.= +Lantern= +Lanterns are light sources which can be placed on the top or the bottom of most blocks.= +Soul Lantern= From 8cd3b63fae3b2f1278a091aa543016e41c0204ad Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 08:02:22 +0000 Subject: [PATCH 39/66] Add Translations --- mods/ITEMS/mcl_lanterns/local/template.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mods/ITEMS/mcl_lanterns/local/template.txt diff --git a/mods/ITEMS/mcl_lanterns/local/template.txt b/mods/ITEMS/mcl_lanterns/local/template.txt new file mode 100644 index 000000000..765de8747 --- /dev/null +++ b/mods/ITEMS/mcl_lanterns/local/template.txt @@ -0,0 +1,6 @@ +# textdomain: mcl_lanterns +Chain= +Chains are metallic decoration blocks.= +Lantern= +Lanterns are light sources which can be placed on the top or the bottom of most blocks.= +Soul Lantern= From 700200958df57b50f23a644c7736a5dd1543c904 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 08:03:37 +0000 Subject: [PATCH 40/66] wrong place --- mods/ITEMS/mcl_lanterns/template.txt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 mods/ITEMS/mcl_lanterns/template.txt diff --git a/mods/ITEMS/mcl_lanterns/template.txt b/mods/ITEMS/mcl_lanterns/template.txt deleted file mode 100644 index 765de8747..000000000 --- a/mods/ITEMS/mcl_lanterns/template.txt +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: mcl_lanterns -Chain= -Chains are metallic decoration blocks.= -Lantern= -Lanterns are light sources which can be placed on the top or the bottom of most blocks.= -Soul Lantern= From 140fd676860d60eef47e8b4d5dacdc67b53673ff Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 08:07:47 +0000 Subject: [PATCH 41/66] Add french translation --- mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr diff --git a/mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr b/mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr new file mode 100644 index 000000000..e8264e2f4 --- /dev/null +++ b/mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr @@ -0,0 +1,6 @@ +# textdomain: mcl_lanterns +Chain=Chaine +Chains are metallic decoration blocks.=Les chaines sont des blocs de décoration métalliques. +Lantern=Lanterne +Lanterns are light sources which can be placed on the top or the bottom of most blocks.=Les lanternes sont des sources de lumières qui peuvent être placées au sommet ou en-dessous de la plupart des blocs. +Soul Lantern=Lanterne de l'Ame From c3111c99b235fabc8263c1f71bc44b4c4b10611f Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 08:49:47 +0000 Subject: [PATCH 42/66] French translation --- .../ENTITIES/extra_mobs/locale/extra_mobs.fr.tr | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr diff --git a/mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr b/mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr new file mode 100644 index 000000000..87caf9592 --- /dev/null +++ b/mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr @@ -0,0 +1,17 @@ +# textdomain:extra_mobs +Hoglin=Hoglin +piglin=Piglin +piglin Brute=Piglin Barbare +Strider=Arpenteur +Fox=Renard +Cod=Poisson +Salmon=Saumon +dolphin=Dauphin +Glow Squid=Pieuvre Lumineuse +Glow Ink Sac=Sac d'Encre Lumineuse +Use it to craft the Glow Item Frame.=Utilisez le pour fabriquer le Cadre à Objet Lumineux +Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.=Utiliser le Sac d'Encre Lumineuse et le Cadre à Objet normal pour fabriquer le Cadre à Objet Lumineux. +Glow Item Frame=Cadre à Objet Lumineux +Can hold an item and glows=Peut exposer un objet et éclairer +Glow Item frames are decorative blocks in which items can be placed.=les Cadres à Objet Lumineux sont des blocs décoratifs pouvant contenir des objets. +Just place any item on the item frame. Use the item frame again to retrieve the item.=Placer n'importe quel objet sur le cadre. Récupérer l'objet en faisant un clic droit sur le cadre. \ No newline at end of file From e14545a2b82973f86f8ff70c457c9ca83aa377b7 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 08:51:53 +0000 Subject: [PATCH 43/66] French translation --- mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr b/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr index 91be07c32..922f5f069 100644 --- a/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr +++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr @@ -6,6 +6,7 @@ Boats are used to travel on the surface of water.=Les bateaux sont utilisés pou Dark Oak Boat=Bateau en Chêne Noir Jungle Boat=Bateau en Acajou Oak Boat=Bateau en Chêne +Obsidian Boat=Bateau en Obsidienne Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Utilisez [Sneak] pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet. Spruce Boat=Bateau en Sapin Water vehicle=Véhicule aquatique From f828ee6a1927f1b7556122cc07c850ac9d0eb90d Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 09:28:36 +0000 Subject: [PATCH 44/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/HUD/mcl?= =?UTF-8?q?=5Fachievements/locale/template.txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/HUD/mcl_achievements/locale/template.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mods/HUD/mcl_achievements/locale/template.txt b/mods/HUD/mcl_achievements/locale/template.txt index eccec5225..2cb6b28b4 100644 --- a/mods/HUD/mcl_achievements/locale/template.txt +++ b/mods/HUD/mcl_achievements/locale/template.txt @@ -53,3 +53,13 @@ Hot Stuff= Put lava in a bucket.= Ice Bucket Challenge= Obtain an obsidian block.= +Isn't It Iron Pick= +Craft a iron pickaxe using sticks and iron.= +Who is Cutting Onions?= +Pick up a crying obsidian from the floor.= +Hidden in the Depths= +Pick up an Ancient Debris from the floor.= +Not Quite "Nine" Lives= +Charge a Respawn Anchor to the maximum.= +The End?= +Or the beginning?\nHint: Enter an end portal.= From 609653eaf27e05a7e00f5d31c644b0bf683a5825 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 09:44:49 +0000 Subject: [PATCH 45/66] Update french translation --- .../locale/mcl_achievements.fr.tr | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/mods/HUD/mcl_achievements/locale/mcl_achievements.fr.tr b/mods/HUD/mcl_achievements/locale/mcl_achievements.fr.tr index 0896bcf36..fc68322a1 100644 --- a/mods/HUD/mcl_achievements/locale/mcl_achievements.fr.tr +++ b/mods/HUD/mcl_achievements/locale/mcl_achievements.fr.tr @@ -10,7 +10,7 @@ Craft a stone pickaxe using sticks and cobblestone.=Fabriquez une pioche en pier Craft a wooden sword using wooden planks and sticks on a crafting table.=Fabriquez une épée en bois à l'aide de planches et de bâtons en bois sur un établi. DIAMONDS!=DIAMANTS! Delicious Fish=Délicieux Poisson -Dispense With This=Dispenser de ça +Dispense With This=Dispensé de ça Eat a cooked porkchop.=Mangez du porc cuit. Eat a cooked rabbit.=Mangez du lapin cuit. Get really desperate and eat rotten flesh.=Soyez vraiment désespéré et mangez de la chair pourrie. @@ -47,3 +47,19 @@ Use a crafting table to craft a wooden hoe from wooden planks and sticks.=Utilis Use a crafting table to craft a wooden pickaxe from wooden planks and sticks.=Utilisez un établi pour fabriquer une pioche en bois à partir de planches et de bâtons en bois. Use obsidian and a fire starter to construct a Nether portal.=Utilisez de l'obsidienne et un briquet pour construire un portail du Nether. Use wheat to craft a bread.=Utilisez du blé pour fabriquer un pain. +Stone Age=L'Age de Pierre +Mine a stone with new pickaxe.=Miner de la roche avec une nouvelle pioche +Hot Stuff=Chaud Devant ! +Put lava in a bucket.=Remplir un Seau de lave +Ice Bucket Challenge=Le défi du seau d'eau glacée +Obtain an obsidian block.=Obtenir un bloc d'obsidienne +Isn't It Iron Pick=Bonne Pioche ! +Craft a iron pickaxe using sticks and iron.=Fabriquer une pioche de fer avec des batons et du fer +Who is Cutting Onions?=Qui épluche des oignons ? +Pick up a crying obsidian from the floor.=Ramasser une obsidienne pleureuse sur le sol. +Hidden in the Depths=Caché dans les profondeurs +Pick up an Ancient Debris from the floor.=Ramasser un Ancien Débris +Not Quite "Nine" Lives=Presque "neuf" vies +Charge a Respawn Anchor to the maximum.=Charger une Ancre de Réapparition au maximum. +The End?=L'End ? +Or the beginning?\nHint: Enter an end portal.=Ou le commencement ?\nAstuce : Entrer dans un portail de l'End. From 47ed81490a10fb6bf1f93ed4993660284fc93042 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 09:52:46 +0000 Subject: [PATCH 46/66] french translation --- mods/HUD/mcl_experience/locale/mlc_experience.fr.tr | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr b/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr index 0644e2596..488af5006 100644 --- a/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr +++ b/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr @@ -5,3 +5,4 @@ Error: Too many parameters!=Erreur: Trop de paramètres! Error: Incorrect value of XP=Erreur: Valeur incorrecte de XP Error: Player not found=Erreur: Joueur introuvable Added @1 XP to @2, total: @3, experience level: @4=Ajout de @1 XP à @2, total: @3, niveau d'expérience: @4 +Bottle o' Enchanting=Fiole d'expérience \ No newline at end of file From 3591ef1fae2a25cc8007303778157ac27506702f Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 09:59:27 +0000 Subject: [PATCH 47/66] French translation --- mods/HUD/mcl_info/locale/mcl_info.fr.tr | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mods/HUD/mcl_info/locale/mcl_info.fr.tr diff --git a/mods/HUD/mcl_info/locale/mcl_info.fr.tr b/mods/HUD/mcl_info/locale/mcl_info.fr.tr new file mode 100644 index 000000000..fb6ecbd0d --- /dev/null +++ b/mods/HUD/mcl_info/locale/mcl_info.fr.tr @@ -0,0 +1,4 @@ +# textdomain: mcl_info +Set debug bit mask: 0 @= disable, 1 @= biome name, 2 @= coordinates, 3 @= all=Réglage du masque de débugage : 0 @= désactiver, 1 @= nom de biome, 2 @= coordonnées, 3 @= tout= +Error! Possible values are integer numbers from @1 to @2=Erreur ! Les valeurs autorisées sont des nombres entiers de @1 à @2 +Debug bit mask set to @1=Masque de débugage réglé à @1 \ No newline at end of file From 421c1e8d0084399d5e324af504661f7230139887 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 10:21:26 +0000 Subject: [PATCH 48/66] Ajouter 'mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr' --- mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr diff --git a/mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr b/mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr new file mode 100644 index 000000000..86b7d1b33 --- /dev/null +++ b/mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr @@ -0,0 +1,3 @@ +# textdomain: mcl_villages +Chiseled Stone Village Bricks=Pierre sculptée du village +Map chunk @1 to @2 is not suitable for placing villages.=La partie de la carte de @1 à @2 n'est pas propice au placement d'un village. From c55aab93608d3f00be3dff3f7e27040b6e724334 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 10:31:13 +0000 Subject: [PATCH 49/66] Update french translation --- mods/MISC/mcl_commands/locale/mcl_commands.fr.tr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mods/MISC/mcl_commands/locale/mcl_commands.fr.tr b/mods/MISC/mcl_commands/locale/mcl_commands.fr.tr index 1223c24ec..f9a1fa064 100644 --- a/mods/MISC/mcl_commands/locale/mcl_commands.fr.tr +++ b/mods/MISC/mcl_commands/locale/mcl_commands.fr.tr @@ -21,6 +21,10 @@ Ban list: @1=Liste d'interdiction: @1 Show who is logged on=Afficher qui est connecté Displays the world seed=Affiche la graine du monde Only peaceful mobs allowed!=Seuls les mobs pacifiques sont autorisés! -@1[]=@1[] +@1[]=@1[] Set game mode for player or yourself=Choisir le mode de jeu pour vous ou pour les joueurs Error: No game mode specified.=Erreur : mode de jeu non spécifié. + = +Play a sound. Arguments: : name of the sound. : Target.=Jouer un son. Arguments: : nom d'un son. : Cible. +Sound name is invalid!=Le nom du son est invalide ! +Target is invalid!!=La cible est invalide ! From f052e26e0cf91b40ca2dfd9f02c51045a7903122 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 11:43:47 +0000 Subject: [PATCH 50/66] fix --- mods/ITEMS/mcl_beds/respawn_anchor.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_beds/respawn_anchor.lua b/mods/ITEMS/mcl_beds/respawn_anchor.lua index e479ac097..19c2c67d9 100644 --- a/mods/ITEMS/mcl_beds/respawn_anchor.lua +++ b/mods/ITEMS/mcl_beds/respawn_anchor.lua @@ -71,7 +71,7 @@ minetest.register_node("mcl_beds:respawn_anchor_charged_1",{ }) minetest.register_node("mcl_beds:respawn_anchor_charged_2",{ - description="Respawn Anchor", + description=S("Respawn Anchor"), tiles = { "portal.png", "respawn_anchor_bottom.png", @@ -105,7 +105,7 @@ minetest.register_node("mcl_beds:respawn_anchor_charged_2",{ }) minetest.register_node("mcl_beds:respawn_anchor_charged_3",{ - description=S("Respawn Anchor") + description=S("Respawn Anchor"), tiles = { "portal.png", "respawn_anchor_bottom.png", From 337b4e1d050a977f69cd946b08e6a7c90c1dbe07 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 11:47:14 +0000 Subject: [PATCH 51/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Flanterns/register.lua'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_lanterns/register.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_lanterns/register.lua b/mods/ITEMS/mcl_lanterns/register.lua index 7cf03d0d5..fcffbdcb8 100644 --- a/mods/ITEMS/mcl_lanterns/register.lua +++ b/mods/ITEMS/mcl_lanterns/register.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("mcl_lanterns") +local S = minetest.get_translator(minetest.get_current_modname()) mcl_lanterns.register_lantern("lantern", { description = S("Lantern"), From 1e431814bc3964d5eda87061b905c92ae899a052 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 11:48:43 +0000 Subject: [PATCH 52/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Flanterns/init.lua'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_lanterns/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_lanterns/init.lua b/mods/ITEMS/mcl_lanterns/init.lua index e6707b075..8f99ea151 100644 --- a/mods/ITEMS/mcl_lanterns/init.lua +++ b/mods/ITEMS/mcl_lanterns/init.lua @@ -1,5 +1,5 @@ -local S = minetest.get_translator("mcl_lanterns") -local modpath = minetest.get_modpath("mcl_lanterns") +local S = minetest.get_translator(minetest.get_current_modname()) +local modpath = minetest.get_modpath(minetest.get_current_modname()) mcl_lanterns = {} From 07d564b5a26480aab06348a6d54fa2f64e0004e9 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 12:05:00 +0000 Subject: [PATCH 53/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Fbeds/init.lua'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_beds/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_beds/init.lua b/mods/ITEMS/mcl_beds/init.lua index ad9dbdded..b07b591dd 100644 --- a/mods/ITEMS/mcl_beds/init.lua +++ b/mods/ITEMS/mcl_beds/init.lua @@ -4,6 +4,7 @@ mcl_beds.pos = {} mcl_beds.bed_pos = {} local modpath = minetest.get_modpath("mcl_beds") +local S = minetest.get_translator(minetest.get_current_modname()) -- Load files From 44d32b5d17833fa9170a78127955770070442bea Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 12:12:07 +0000 Subject: [PATCH 54/66] fix --- mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr b/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr index ba513df3a..1c10627e3 100644 --- a/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr +++ b/mods/ITEMS/mcl_beds/locale/mcl_beds.fr.tr @@ -39,4 +39,4 @@ You're sleeping.=Tu dors. You will fall asleep when all players are in bed.=Vous vous endormirez lorsque tous les joueurs seront au lit. You're in bed.=Tu es au lit. Allows you to sleep=Vous permet de dormir -Respwn Anchor=Ancre de Réapparition \ No newline at end of file +Respawn Anchor=Ancre de Réapparition \ No newline at end of file From 0184925890b3cc17cf70b0a2daababfaf4fb26b2 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 19:26:04 +0000 Subject: [PATCH 55/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Flanterns/local/mcl=5Flanterns.fr.tr'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr b/mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr index e8264e2f4..c653a8faf 100644 --- a/mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr +++ b/mods/ITEMS/mcl_lanterns/local/mcl_lanterns.fr.tr @@ -3,4 +3,4 @@ Chain=Chaine Chains are metallic decoration blocks.=Les chaines sont des blocs de décoration métalliques. Lantern=Lanterne Lanterns are light sources which can be placed on the top or the bottom of most blocks.=Les lanternes sont des sources de lumières qui peuvent être placées au sommet ou en-dessous de la plupart des blocs. -Soul Lantern=Lanterne de l'Ame +Soul Lantern=Lanterne des âmes From c72c960e8a305f570cdd5c1dd99c9e5c1f2dc7c5 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 19:29:52 +0000 Subject: [PATCH 56/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Flanterns/init.lua'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_lanterns/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_lanterns/init.lua b/mods/ITEMS/mcl_lanterns/init.lua index 8f99ea151..72df287ca 100644 --- a/mods/ITEMS/mcl_lanterns/init.lua +++ b/mods/ITEMS/mcl_lanterns/init.lua @@ -1,5 +1,5 @@ -local S = minetest.get_translator(minetest.get_current_modname()) -local modpath = minetest.get_modpath(minetest.get_current_modname()) +local S = minetest.get_translator(mcl_lanterns) +local modpath = minetest.get_modpath(mcl_lanterns) mcl_lanterns = {} From a1ca0c3431af9edfc4adcdc9efc8232862c4f4f5 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 19:31:56 +0000 Subject: [PATCH 57/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Flanterns/register.lua'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_lanterns/register.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_lanterns/register.lua b/mods/ITEMS/mcl_lanterns/register.lua index fcffbdcb8..6f3372b0a 100644 --- a/mods/ITEMS/mcl_lanterns/register.lua +++ b/mods/ITEMS/mcl_lanterns/register.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_translator(mcl_lanterns) mcl_lanterns.register_lantern("lantern", { description = S("Lantern"), From a47e0d2f1736555e0463f142d0a6085edb5c336d Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 19:49:23 +0000 Subject: [PATCH 58/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Flanterns/init.lua'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_lanterns/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_lanterns/init.lua b/mods/ITEMS/mcl_lanterns/init.lua index 72df287ca..8f99ea151 100644 --- a/mods/ITEMS/mcl_lanterns/init.lua +++ b/mods/ITEMS/mcl_lanterns/init.lua @@ -1,5 +1,5 @@ -local S = minetest.get_translator(mcl_lanterns) -local modpath = minetest.get_modpath(mcl_lanterns) +local S = minetest.get_translator(minetest.get_current_modname()) +local modpath = minetest.get_modpath(minetest.get_current_modname()) mcl_lanterns = {} From c6f09e30a5e1a6ed1523ff375a4e5f2128f9b0a1 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sat, 9 Apr 2022 19:49:59 +0000 Subject: [PATCH 59/66] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'mods/ITEMS/m?= =?UTF-8?q?cl=5Flanterns/register.lua'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ITEMS/mcl_lanterns/register.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_lanterns/register.lua b/mods/ITEMS/mcl_lanterns/register.lua index 6f3372b0a..fcffbdcb8 100644 --- a/mods/ITEMS/mcl_lanterns/register.lua +++ b/mods/ITEMS/mcl_lanterns/register.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(mcl_lanterns) +local S = minetest.get_translator(minetest.get_current_modname()) mcl_lanterns.register_lantern("lantern", { description = S("Lantern"), From 1d315c569f1f1ef51d519f1c137f5fa852525c28 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Sun, 10 Apr 2022 14:05:15 -0500 Subject: [PATCH 60/66] Bonus: Mobs Redo bug fix --- mods/ENTITIES/mcl_mobs/api.txt | 5 + .../mcl_mobs/api/mob_functions/set_up.lua | 121 +++++++++--------- mods/ENTITIES/mobs_mc/zombie.lua | 1 - 3 files changed, 66 insertions(+), 61 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.txt b/mods/ENTITIES/mcl_mobs/api.txt index 2d8cef5b0..6c61855aa 100644 --- a/mods/ENTITIES/mcl_mobs/api.txt +++ b/mods/ENTITIES/mcl_mobs/api.txt @@ -227,6 +227,11 @@ functions needed for the mob to work properly which contains the following: older mobs. 'pushable' Allows players, & other mobs to push the mob. + 'spawn_with_armor' If set to true, the mob has a small chance of spawning with + random matched armor. If set to a string, the string represents + the material type of the armor. Any materials used by + mcl_armor will work. Example: "gold" + It is assumed that the first texture is for armor. MineClone 2 extensions: diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua index f3d82b0bb..cebf28e58 100644 --- a/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua +++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua @@ -13,8 +13,13 @@ mobs.can_despawn = function(self) if self.tamed or self.bred or self.nametag then return false end local mob_pos = self.object:get_pos() if not mob_pos then return true end + local players = minetest_get_connected_players() + if #players == 0 then return false end + -- If no players, probably this is being called from get_staticdata() at server shutdown time + -- Minetest is to buggy (as of 5.5) to delete entities at server shutdown time anyway + local distance = 999 - for _, player in pairs(minetest_get_connected_players()) do + for _, player in pairs(players) do if player and player:get_hp() > 0 then local player_pos = player:get_pos() local new_distance = vector_distance(player_pos, mob_pos) @@ -63,9 +68,8 @@ mobs.mob_staticdata = function(self) end mobs.armor_setup = function(self) - local armor = self._armor - if not armor then - armor = {} + if not self._armor_items then + local armor = {} -- Source: https://minecraft.fandom.com/wiki/Zombie local materials = { {name = "leather", chance = 0.3706}, @@ -76,12 +80,11 @@ mobs.armor_setup = function(self) } local types = { {name = "helmet", chance = 0.15}, - --{name = "helmet", chance = 1}, {name = "chestplate", chance = 0.75}, - {name = "leggings", chance = 0.5625}, - {name = "boots", chance = 0.4219} + {name = "leggings", chance = 0.75}, + {name = "boots", chance = 0.75} } - + local material if type(self._spawn_with_armor) == "string" then material = self._spawn_with_armor @@ -95,6 +98,7 @@ mobs.armor_setup = function(self) end end end + for i, t in pairs(types) do if math.random() <= t.chance then armor[t.name] = material @@ -102,61 +106,56 @@ mobs.armor_setup = function(self) break end end - self._armor = armor - end - local t = "" - local first_image = true - for atype, material in pairs(armor) do - if not first_image then - t = t .. "^" + -- Setup table containing the armor items + self._armor_items = {} + for atype, material in pairs(armor) do + local item = "mcl_armor:" .. atype .. "_" .. material + table.insert(self._armor_items, item) end - t = t .. "mcl_armor_" .. atype .. "_" .. material .. ".png" - first_image = false - end - if t == "" then - t = "mobs_mc_empty.png" - end - -- Configure damage groups based on armor - -- Source: https://minecraft.fandom.com/wiki/Armor#Armor_points - local points = 2 - for atype, material in pairs(self._armor) do - local item_name = "mcl_armor:" .. atype .. "_" .. material - points = points + minetest.get_item_group(item_name, "mcl_armor_points") - end - local armor_strength = 100 - 4 * points * 0.8 -- We should realy be using the full damage calculation - local armor_groups = self.object:get_armor_groups() - armor_groups.undead = armor_strength - armor_groups.fleshy = armor_strength - self.object:set_armor_groups(armor_groups) - - local props = self.object:get_properties() - props.textures[1] = t - self.object:set_properties(props) - minetest.chat_send_all(dump(self._armor)) - - -- Rare chance of dropping armor on death - for atype, material in pairs(self._armor) do - local wear = math.random(1, 65535) - local item = "mcl_armor:" .. atype .. "_" .. material .. " 1 " .. wear - self.drops = table.copy(self.drops) - table.insert(self.drops, { - name = item, - chance = 1/0.085, -- 8.5% - min = 1, - max = 1, - looting = "common", - looting_factor = 0.01 / 3, - }) - end - --[[for atype, material in pairs(self._armor) do - if math.random() <= 0.085 then + -- Setup armor drops + for atype, material in pairs(armor) do local wear = math.random(1, 65535) local item = "mcl_armor:" .. atype .. "_" .. material .. " 1 " .. wear - minetest.add_item(pos, item) + self.drops = table.copy(self.drops) + table.insert(self.drops, { + name = item, + chance = 1/0.085, -- 8.5% + min = 1, + max = 1, + looting = "rare", + looting_factor = 0.01 / 3, + }) end - end]] + + -- Configure textures + local t = "" + local first_image = true + for atype, material in pairs(armor) do + if not first_image then + t = t .. "^" + end + t = t .. "mcl_armor_" .. atype .. "_" .. material .. ".png" + first_image = false + end + if t ~= "" then + self.base_texture = table.copy(self.base_texture) + self.base_texture[1] = t + end + + -- Configure damage groups based on armor + -- Source: https://minecraft.fandom.com/wiki/Armor#Armor_points + local points = 2 + for atype, material in pairs(armor) do + local item_name = "mcl_armor:" .. atype .. "_" .. material + points = points + minetest.get_item_group(item_name, "mcl_armor_points") + end + local armor_strength = 100 - 4 * points + local armor_groups = self.object:get_armor_groups() + armor_groups.fleshy = armor_strength + self.armor = armor_groups + end end @@ -201,6 +200,11 @@ mobs.mob_activate = function(self, staticdata, def, dtime) self.base_colbox = self.collisionbox self.base_selbox = self.selectionbox end + + -- Setup armor on mobs + if self._spawn_with_armor then + mobs.armor_setup(self) + end -- for current mobs that dont have this set if not self.base_selbox then @@ -321,9 +325,6 @@ mobs.mob_activate = function(self, staticdata, def, dtime) --update_tag(self) --mobs.set_animation(self, "stand") - if self._spawn_with_armor then - mobs.armor_setup(self) - end -- run on_spawn function if found if self.on_spawn and not self.on_spawn_run then diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua index 27432745b..7a5682d8f 100644 --- a/mods/ENTITIES/mobs_mc/zombie.lua +++ b/mods/ENTITIES/mobs_mc/zombie.lua @@ -207,7 +207,6 @@ local zombie = { spawn_with_armor = true, } - mobs:register_mob("mobs_mc:zombie", zombie) -- Baby zombie. From 9b04b285b74aa5c96192d82700bf9d08d0e4dbbe Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 12 Apr 2022 22:08:33 +0000 Subject: [PATCH 61/66] Make the shield drop at death --- mods/PLAYER/mcl_death_drop/init.lua | 113 ++++++++++++++-------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/mods/PLAYER/mcl_death_drop/init.lua b/mods/PLAYER/mcl_death_drop/init.lua index bfeee0c3e..5ea548ecc 100644 --- a/mods/PLAYER/mcl_death_drop/init.lua +++ b/mods/PLAYER/mcl_death_drop/init.lua @@ -1,56 +1,57 @@ -local random = math.random - -local ipairs = ipairs - -mcl_death_drop = {} - -mcl_death_drop.registered_dropped_lists = {} - -function mcl_death_drop.register_dropped_list(inv, listname, drop) - table.insert(mcl_death_drop.registered_dropped_lists, {inv = inv, listname = listname, drop = drop}) -end - -mcl_death_drop.register_dropped_list("PLAYER", "main", true) -mcl_death_drop.register_dropped_list("PLAYER", "craft", true) -mcl_death_drop.register_dropped_list("PLAYER", "armor", true) - -minetest.register_on_dieplayer(function(player) - local keep = minetest.settings:get_bool("mcl_keepInventory", false) - if keep == false then - -- Drop inventory, crafting grid and armor - local playerinv = player:get_inventory() - local pos = player:get_pos() - -- No item drop if in deep void - local _, void_deadly = mcl_worlds.is_in_void(pos) - - for l=1,#mcl_death_drop.registered_dropped_lists do - local inv = mcl_death_drop.registered_dropped_lists[l].inv - if inv == "PLAYER" then - inv = playerinv - elseif type(inv) == "function" then - inv = inv(player) - end - local listname = mcl_death_drop.registered_dropped_lists[l].listname - local drop = mcl_death_drop.registered_dropped_lists[l].drop - if inv then - for i, stack in ipairs(inv:get_list(listname)) do - local x = random(0, 9)/3 - local z = random(0, 9)/3 - pos.x = pos.x + x - pos.z = pos.z + z - if not void_deadly and drop and not mcl_enchanting.has_enchantment(stack, "curse_of_vanishing") then - local def = minetest.registered_items[stack:get_name()] - if def and def.on_drop then - stack = def.on_drop(stack, player, pos) - end - minetest.add_item(pos, stack) - end - pos.x = pos.x - x - pos.z = pos.z - z - end - inv:set_list(listname, {}) - end - end - mcl_armor.update(player) - end -end) +local random = math.random + +local ipairs = ipairs + +mcl_death_drop = {} + +mcl_death_drop.registered_dropped_lists = {} + +function mcl_death_drop.register_dropped_list(inv, listname, drop) + table.insert(mcl_death_drop.registered_dropped_lists, {inv = inv, listname = listname, drop = drop}) +end + +mcl_death_drop.register_dropped_list("PLAYER", "main", true) +mcl_death_drop.register_dropped_list("PLAYER", "craft", true) +mcl_death_drop.register_dropped_list("PLAYER", "armor", true) +mcl_death_drop.register_dropped_list("PLAYER", "offhand", true) + +minetest.register_on_dieplayer(function(player) + local keep = minetest.settings:get_bool("mcl_keepInventory", false) + if keep == false then + -- Drop inventory, crafting grid and armor + local playerinv = player:get_inventory() + local pos = player:get_pos() + -- No item drop if in deep void + local _, void_deadly = mcl_worlds.is_in_void(pos) + + for l=1,#mcl_death_drop.registered_dropped_lists do + local inv = mcl_death_drop.registered_dropped_lists[l].inv + if inv == "PLAYER" then + inv = playerinv + elseif type(inv) == "function" then + inv = inv(player) + end + local listname = mcl_death_drop.registered_dropped_lists[l].listname + local drop = mcl_death_drop.registered_dropped_lists[l].drop + if inv then + for i, stack in ipairs(inv:get_list(listname)) do + local x = random(0, 9)/3 + local z = random(0, 9)/3 + pos.x = pos.x + x + pos.z = pos.z + z + if not void_deadly and drop and not mcl_enchanting.has_enchantment(stack, "curse_of_vanishing") then + local def = minetest.registered_items[stack:get_name()] + if def and def.on_drop then + stack = def.on_drop(stack, player, pos) + end + minetest.add_item(pos, stack) + end + pos.x = pos.x - x + pos.z = pos.z - z + end + inv:set_list(listname, {}) + end + end + mcl_armor.update(player) + end +end) From b7f3b8edd56ec9e3a5c36a5366f5894f77abb3b9 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Wed, 13 Apr 2022 12:52:39 -0500 Subject: [PATCH 62/66] No sun damage wearing helment --- mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua index cebf28e58..971750293 100644 --- a/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua +++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua @@ -107,11 +107,11 @@ mobs.armor_setup = function(self) end end - -- Setup table containing the armor items + -- Save armor items in lua entity self._armor_items = {} for atype, material in pairs(armor) do local item = "mcl_armor:" .. atype .. "_" .. material - table.insert(self._armor_items, item) + self._armor_items[atype] = item end -- Setup armor drops @@ -155,6 +155,11 @@ mobs.armor_setup = function(self) local armor_groups = self.object:get_armor_groups() armor_groups.fleshy = armor_strength self.armor = armor_groups + + -- Helmet protects mob from sun damage + if armor.helmet then + self.ignited_by_sunlight = false + end end end From f0b8e8ea1192511585974cb049769060b8647974 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Fri, 15 Apr 2022 13:56:49 -0500 Subject: [PATCH 63/66] Lava produce sparks --- mods/ITEMS/mcl_core/README.txt | 8 ++ mods/ITEMS/mcl_core/functions.lua | 89 ++++++++++++++++++ .../mcl_core/textures/mcl_core_lava_spark.png | Bin 0 -> 1520 bytes 3 files changed, 97 insertions(+) create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_lava_spark.png diff --git a/mods/ITEMS/mcl_core/README.txt b/mods/ITEMS/mcl_core/README.txt index 6c48d74fd..88da2f88d 100644 --- a/mods/ITEMS/mcl_core/README.txt +++ b/mods/ITEMS/mcl_core/README.txt @@ -21,6 +21,14 @@ MIT License. The textures are taken from the Minecraft resource pack “Faithful 1.11” by Vattic and xMrVizzy and contributers. + +CC BY-SA 4.0 + +mcl_core_lava_spark.png is based on the Pixel Perfection resource pack for Minecraft 1.11, +authored by XSSheep. +Source: +License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/) + Sounds ====== All sounds included in this mod are under the MIT License. diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index 20978e26f..43ddbcce5 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -54,6 +54,95 @@ minetest.register_abm({ end, }) +-- Production of sparks from lava +minetest.register_abm({ + label = "Lava produce sparks", + nodenames = {"group:lava"}, + neighbors = {"air"}, + interval = 1, + chance = 100, + action = function(pos, node) + local above = minetest.get_node(vector.new(pos.x, pos.y + 1, pos.z)) + if above.name ~= "air" then return end + + local pos_addend = vector.new( + (math.random() - 0.5) * 0.8, + (math.random() - 0.5) * 0.8, + (math.random() - 0.5) * 0.8 + ) + local spark_pos = vector.add(pos, pos_addend) + local spark = minetest.add_entity(spark_pos, "mcl_core:lava_spark") + if not spark then return end + + local velocity = vector.new( + (math.random() - 0.5) * 3, + (math.random() + 2) * 2, + (math.random() - 0.5) * 3 + ) + spark:set_velocity(velocity) + + spark:set_acceleration(vector.new(0, -9, 0)) + + -- Set a random size + local size = 0.2 + math.random() * 0.2 + local props = spark:get_properties() + if not props then return end + props.visual_size = vector.new(size, size, size) + spark:set_properties(props) + + local luaentity = spark:get_luaentity() + if not luaentity then return end + luaentity._life_timer = 0.4 + math.random() + end +}) + +minetest.register_entity("mcl_core:lava_spark", { + physical = true, + visual = "sprite", + collide_with_objects = true, + textures = {"mcl_core_lava_spark.png"}, + glow = 10, + static_save = false, + _smoke_timer = 0.1, + _life_timer = 1, + on_step = function(self, dtime) + if not self or not self.object then return end + + self._life_timer = self._life_timer - dtime + if self._life_timer <= 0 then + self.object:remove() + return + end + + + self._smoke_timer = self._smoke_timer - dtime + if self._smoke_timer > 0 then return end + self._smoke_timer = math.random() * 0.4 + + local pos = self.object:get_pos() + + -- Add smoke + minetest.add_particlespawner({ + amount = 3, + time = 0.001, + minpos = pos, + maxpos = pos, + minvel = vector.new(-0.1, 1, -0.1), + maxvel = vector.new(0.1, 1.5, 0.1), + minexptime = 0.1, + maxexptime = 0.6, + minsize = 0.5, + maxsize = 1.5, + texture = "mcl_particles_smoke_anim.png", + animation = { + type = "vertical_frames", + aspect_w = 8, + aspect_h = 8, + } + }) + end +}) + -- -- Papyrus and cactus growing -- diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_lava_spark.png b/mods/ITEMS/mcl_core/textures/mcl_core_lava_spark.png new file mode 100644 index 0000000000000000000000000000000000000000..079f7730ec909c78b339f81d57748a5a7ed576da GIT binary patch literal 1520 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGlI$i7hTmC5mVhKKVmVx^vV$x?Kj3zEdpeVu zp7WB_vC9^gu_XQv=r;YYKZp4P2U~H*`KTd-=n;s{!0V8idA8e8&=E*@`{{T#>G&XrhtiLW>k;+{ zetmWkVlR;nn`apwrjT%q;!sYFg(Wg>9%q`}dEMiT{( z3UUHBpS94+n`S;FQ)F(0o=gY^#?Pm@I^I2>0*x`JIg!;Zr;%gKxiDA z`lT1+tMj z5aP19dhFU$ z&jWL9$Z*4tFyhdWMn0(>RG+C`$$d_Z4r;tW&3^Gt4el6kA!u$Veli0wb_C*a62OG! z$;>J_$CKP-W)q7M@r)|{gwtpe13}k`{h*WGo!mciGf?-t-1rqaGtvDDa%Q4?Aor2m z3u-N|?N%0`xeB2vc1XeULx--JHP7Frx2$>h!{34a(}70rn7V8<4;AUz-Coo@EtleY zv#Y6Ax<9C-f3W82c*{yJ=9bCUkNKx3_~qwY$?PyQmRtFVBLSZz=kTH6IjA zVFyZp+Vm9A@3K`pzhrAp0crOP((XNb)MMD$joRubb(w!5{N?)0>&f^1`pl1(>qEWf zq2M3MWPZMj?6S;N$9KyzzhZa%9q9iVXyCt4!mRxp)0f;<|0||u0004nX+uL$Nkc;* zaB^>EX>4Tx0C=2zkv&MmKpe$iQ>7vm2aAX}WT;LS#EJ+mQpF-zC~bvS9ZW9$f+h_~ zii@M*T5#}VvFhOBtgC~oAP9bdI5|2gx=4xtOA0MwJUH&hyL*qjcYx5SFxBju094H~ zQt_CW&8>=oR|pt{AG3%`%+wR<#SA>h*FAiEy^HWH?{j~SJ|%B5z$X&VG2O6;H;AV< zEuHf|afp>9h4`F!+@K2*KXP4m`HgeYVS#6cj7(~tI7BQKJ6P^uRx(uLDdMoAYLqWz zT~;`6aaJoe*19KuVKA?)q`6LW1aT}Ofh0u8sG*DsEJSG4NHLM3{g{V;*zqUHC6lWR zMvetkp+a)};D7MDTeA?Ibd!QHp!>zPKSqJTF3_yo_V=-EH%|cnGjOG~{nZ9A^GSNW zt%Z+({%zpmx~<83z~v4w^rTCMpV2qvfPq_}cg^jswU5&WAVXa(-v9@P zz*v#8*FE0d)7jgy{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jl`60TnYR%Q6uF002ZuL_t&-(_>(uD)_z8>Hn`D zkN?PGOvsW Date: Tue, 19 Apr 2022 08:01:56 -0500 Subject: [PATCH 64/66] Lava sparks: performance improvement --- mods/ITEMS/mcl_core/functions.lua | 118 ++++++++++++++++++++---------- settingtypes.txt | 4 + 2 files changed, 84 insertions(+), 38 deletions(-) diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index 43ddbcce5..407766d08 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -54,47 +54,89 @@ minetest.register_abm({ end, }) + +-- -- Production of sparks from lava -minetest.register_abm({ - label = "Lava produce sparks", - nodenames = {"group:lava"}, - neighbors = {"air"}, - interval = 1, - chance = 100, - action = function(pos, node) - local above = minetest.get_node(vector.new(pos.x, pos.y + 1, pos.z)) - if above.name ~= "air" then return end +-- + +local LAVA_SPARK_ABM_INTERVAL = 5 +local lava_spark_limit = minetest.settings:get("mcl_core_lava_spark_limit") +if lava_spark_limit == nil then + lava_spark_limit = 10 +else + lava_spark_limit = tonumber(lava_spark_limit) +end +local lava_spark_chance = 0 +local lava_spark_abm_census = 0 +local lava_spark_census = 0 + +function mcl_core.lava_spark_set_chance() + lava_spark_chance = lava_spark_limit / lava_spark_abm_census + minetest.after(LAVA_SPARK_ABM_INTERVAL, mcl_core.lava_spark_set_chance) + lava_spark_abm_census = 0 + lava_spark_census = 0 +end + +if lava_spark_limit > 0 then + mcl_core.lava_spark_set_chance() + + minetest.register_abm({ + label = "Lava produce sparks", + nodenames = {"group:lava"}, + neighbors = {"air"}, + interval = LAVA_SPARK_ABM_INTERVAL, + chance = 18, + action = function(pos, node) + local above = minetest.get_node(vector.new(pos.x, pos.y + 1, pos.z)) + if above.name ~= "air" then return end - local pos_addend = vector.new( - (math.random() - 0.5) * 0.8, - (math.random() - 0.5) * 0.8, - (math.random() - 0.5) * 0.8 - ) - local spark_pos = vector.add(pos, pos_addend) - local spark = minetest.add_entity(spark_pos, "mcl_core:lava_spark") - if not spark then return end + lava_spark_abm_census = lava_spark_abm_census + 1 - local velocity = vector.new( - (math.random() - 0.5) * 3, - (math.random() + 2) * 2, - (math.random() - 0.5) * 3 - ) - spark:set_velocity(velocity) + if lava_spark_census >= lava_spark_limit then return end + if math.random() > lava_spark_chance then return end - spark:set_acceleration(vector.new(0, -9, 0)) - - -- Set a random size - local size = 0.2 + math.random() * 0.2 - local props = spark:get_properties() - if not props then return end - props.visual_size = vector.new(size, size, size) - spark:set_properties(props) - - local luaentity = spark:get_luaentity() - if not luaentity then return end - luaentity._life_timer = 0.4 + math.random() - end -}) + lava_spark_census = lava_spark_census + 1 + minetest.after(math.random() * LAVA_SPARK_ABM_INTERVAL, mcl_core.lava_spark_add, pos) + end + }) +end + +function mcl_core.lava_spark_add(pos) + local node = minetest.get_node(pos) + if minetest.get_node_group(node.name, "lava") == 0 then return end + + local above = minetest.get_node(vector.new(pos.x, pos.y + 1, pos.z)) + if above.name ~= "air" then return end + + local pos_addend = vector.new( + (math.random() - 0.5) * 0.8, + (math.random() - 0.5) * 0.8, + (math.random() - 0.5) * 0.8 + ) + local spark_pos = vector.add(pos, pos_addend) + local spark = minetest.add_entity(spark_pos, "mcl_core:lava_spark") + if not spark then return end + + local velocity = vector.new( + (math.random() - 0.5) * 3, + (math.random() + 2) * 2, + (math.random() - 0.5) * 3 + ) + spark:set_velocity(velocity) + + spark:set_acceleration(vector.new(0, -9, 0)) + + -- Set a random size + local size = 0.2 + math.random() * 0.2 + local props = spark:get_properties() + if not props then return end + props.visual_size = vector.new(size, size, size) + spark:set_properties(props) + + local luaentity = spark:get_luaentity() + if not luaentity then return end + luaentity._life_timer = 0.4 + math.random() +end minetest.register_entity("mcl_core:lava_spark", { physical = true, @@ -117,7 +159,7 @@ minetest.register_entity("mcl_core:lava_spark", { self._smoke_timer = self._smoke_timer - dtime if self._smoke_timer > 0 then return end - self._smoke_timer = math.random() * 0.4 + self._smoke_timer = 0.2 + math.random() * 0.3 local pos = self.object:get_pos() diff --git a/settingtypes.txt b/settingtypes.txt index dca03b7e1..fd3f6114a 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -51,6 +51,10 @@ mcl_showDeathMessages (Show death messages) bool true # If disabled, all recipes will be shown. mcl_craftguide_progressive_mode (Learn crafting recipes progressively) bool true +# Limit the number of sparks produced by lava per 5 seconds to this number. +# 0 will disable lava sparks altogeter with no ABM being registered. +mcl_core_lava_spark_limit (Number of sparks lava can produce per 5 seconds) int 10 + [Mobs] # If enabled, mobs will spawn naturally. This does not affect # affect mob spawners. From c5ad0d5f33388340055e1776599bf51d11de1a12 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Wed, 20 Apr 2022 16:56:17 -0500 Subject: [PATCH 65/66] Remove image stack wieldview --- mods/PLAYER/mcl_player/init.lua | 4 - mods/PLAYER/mcl_playerplus/init.lua | 12 ++- mods/PLAYER/mcl_wieldview/README.txt | 13 +-- mods/PLAYER/mcl_wieldview/init.lua | 150 ++++++--------------------- mods/PLAYER/mcl_wieldview/mod.conf | 1 - 5 files changed, 41 insertions(+), 139 deletions(-) diff --git a/mods/PLAYER/mcl_player/init.lua b/mods/PLAYER/mcl_player/init.lua index 9d910a89a..f3e5ad0c3 100644 --- a/mods/PLAYER/mcl_player/init.lua +++ b/mods/PLAYER/mcl_player/init.lua @@ -109,10 +109,6 @@ function mcl_player.player_set_armor(player, texture, preview) set_preview(player, "armor", preview) end -function mcl_player.player_set_wielditem(player, texture) - set_texture(player, 3, texture) -end - function mcl_player.player_get_preview(player) local preview = player:get_meta():get_string("mcl_player:skin_preview") if preview == "" then diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index 85755e0de..85be89aa0 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -324,15 +324,17 @@ minetest.register_globalstep(function(dtime) end if wielded_def and wielded_def._mcl_toollike_wield then - set_bone_position_conditional(player,"Wield_Item", vector.new(0,3.9,1.3), vector.new(90,0,0)) + set_bone_position_conditional(player,"Wield_Item", vector.new(0,4.7,3.1), vector.new(90,-45,90)) elseif string.find(wielded:get_name(), "mcl_bows:bow") then - set_bone_position_conditional(player,"Wield_Item", vector.new(.5,4.5,-1.6), vector.new(90,0,20)) + set_bone_position_conditional(player,"Wield_Item", vector.new(1,4,0), vector.new(90,130,115)) elseif string.find(wielded:get_name(), "mcl_bows:crossbow_loaded") then - set_bone_position_conditional(player,"Wield_Item", vector.new(-1.5,5.7,1.8), vector.new(64,90,0)) + set_bone_position_conditional(player,"Wield_Item", vector.new(0,5.2,1.2), vector.new(0,180,73)) elseif string.find(wielded:get_name(), "mcl_bows:crossbow") then - set_bone_position_conditional(player,"Wield_Item", vector.new(-1.5,5.7,1.8), vector.new(90,90,0)) + set_bone_position_conditional(player,"Wield_Item", vector.new(0,5.2,1.2), vector.new(0,180,45)) + elseif wielded_def.inventory_image == "" then + set_bone_position_conditional(player,"Wield_Item", vector.new(0,6,2), vector.new(180,-45,0)) else - set_bone_position_conditional(player,"Wield_Item", vector.new(-1.5,4.9,1.8), vector.new(135,0,90)) + set_bone_position_conditional(player,"Wield_Item", vector.new(0,5.3,2), vector.new(90,0,0)) end -- controls right and left arms pitch when shooting a bow or blocking diff --git a/mods/PLAYER/mcl_wieldview/README.txt b/mods/PLAYER/mcl_wieldview/README.txt index 183e8c6d5..b118d9ba6 100644 --- a/mods/PLAYER/mcl_wieldview/README.txt +++ b/mods/PLAYER/mcl_wieldview/README.txt @@ -3,19 +3,8 @@ Makes hand wielded items visible to other players. -default settings: [minetest.conf] - -# Set number of seconds between visible wielded item updates. -wieldview_update_time = 2 - -# Show nodes as tiles, disabled by default -wieldview_node_tiles = false - Info for modders ################ -Wield image transformation: To apply a simple transformation to the item in -hand, add the group “wieldview_transform” to the item definition. The group -rating equals one of the numbers used for the [transform texture modifier -of the Lua API. +Add items to the "no_wieldview" group with a raiting of 1 and it will not be shown by the wieldview. diff --git a/mods/PLAYER/mcl_wieldview/init.lua b/mods/PLAYER/mcl_wieldview/init.lua index 92175a17e..660f5edb3 100644 --- a/mods/PLAYER/mcl_wieldview/init.lua +++ b/mods/PLAYER/mcl_wieldview/init.lua @@ -1,131 +1,47 @@ -local get_connected_players = minetest.get_connected_players local get_item_group = minetest.get_item_group -mcl_wieldview = { - players = {} -} - -function mcl_wieldview.get_item_texture(itemname) - if itemname == "" or minetest.get_item_group(itemname, "no_wieldview") ~= 0 then - return - end - - local def = minetest.registered_items[itemname] - if not def then - return - end - - local inv_image = def.inventory_image - if inv_image == "" then - return - end - - local texture = inv_image - - local transform = get_item_group(itemname, "wieldview_transform") - if transform then - -- This actually works with groups ratings because transform1, transform2, etc. - -- have meaning and transform0 is used for identidy, so it can be ignored - texture = texture .. "^[transform" .. transform - end - - return texture -end - -function mcl_wieldview.update_wielded_item(player) - if not player then - return - end - local itemstack = player:get_wielded_item() - local itemname = itemstack:get_name() - - local def = mcl_wieldview.players[player] - - if def and (def.item == itemname) then - return - end - - local texture = mcl_wieldview.get_item_texture(itemname) or "blank.png" - - local new_def = { - item = itemname, - texture = texture, - } - mcl_wieldview.players[player] = new_def - - mcl_player.player_set_wielditem(player, texture) -end - minetest.register_on_joinplayer(function(player) - mcl_wieldview.players[player] = {item = "", texture = "blank.png"} - - minetest.after(0, function() - if not player:is_player() then - return - end - - mcl_wieldview.update_wielded_item(player) - - local itementity = minetest.add_entity(player:get_pos(), "mcl_wieldview:wieldnode") - itementity:set_attach(player, "Hand_Right", vector.new(0, 1, 0), vector.new(90, 0, 45)) - itementity:get_luaentity().wielder = player - end) -end) - -minetest.register_on_leaveplayer(function(player) - mcl_wieldview.players[player] = nil -end) - -minetest.register_globalstep(function() - local players = get_connected_players() - for i = 1, #players do - mcl_wieldview.update_wielded_item(players[i]) + if not player or not player:is_player() then + return end + local itementity = minetest.add_entity(player:get_pos(), "mcl_wieldview:wieldnode") + if not itementity then return end + itementity:set_attach(player, "Wield_Item", vector.new(0, 0, 0), vector.new(0, 0, 0)) + --itementity:set_attach(player, "Hand_Right", vector.new(0, 1, 0), vector.new(90, 45, 90)) + itementity:get_luaentity()._wielder = player end) minetest.register_entity("mcl_wieldview:wieldnode", { - initial_properties = { - hp_max = 1, - visual = "wielditem", - physical = false, - textures = {""}, - automatic_rotate = 1.5, - is_visible = true, - pointable = false, - collide_with_objects = false, - static_save = false, - collisionbox = {-0.21, -0.21, -0.21, 0.21, 0.21, 0.21}, - selectionbox = {-0.21, -0.21, -0.21, 0.21, 0.21, 0.21}, - visual_size = {x = 0.21, y = 0.21}, - }, + visual = "wielditem", + physical = false, + pointable = false, + collide_with_objects = false, + static_save = false, + visual_size = {x = 0.21, y = 0.21}, - itemstring = "", + _item = "", on_step = function(self) - if self.wielder:is_player() then - local def = mcl_wieldview.players[self.wielder] - local itemstring = def.item - - if self.itemstring ~= itemstring then - local itemdef = minetest.registered_items[itemstring] - self.object:set_properties({glow = itemdef and itemdef.light_source or 0}) - - -- wield item as cubic - if def.texture == "blank.png" then - self.object:set_properties({textures = {itemstring}}) - -- wield item as flat - else - self.object:set_properties({textures = {""}}) - end - - if minetest.get_item_group(itemstring, "no_wieldview") ~= 0 then - self.object:set_properties({textures = {""}}) - end - - self.itemstring = itemstring - end - else + if not self._wielder or not self._wielder:is_player() then self.object:remove() end + local player = self._wielder + + local item = player:get_wielded_item():get_name() + + if item == self._item then return end + + self._item = item + + if get_item_group(item, "no_wieldview") ~= 0 then + item = "" + end + + local item_def = minetest.registered_items[item] + self.object:set_properties({ + glow = item_def and item_def.light_source or 0, + wield_item = item, + is_visible = item ~= "" + }) end, }) diff --git a/mods/PLAYER/mcl_wieldview/mod.conf b/mods/PLAYER/mcl_wieldview/mod.conf index 4b3097876..62dda432f 100644 --- a/mods/PLAYER/mcl_wieldview/mod.conf +++ b/mods/PLAYER/mcl_wieldview/mod.conf @@ -1,4 +1,3 @@ name = mcl_wieldview author = stujones11 description = Makes hand wielded items visible to other players. -depends = mcl_player From 5432c6bd9247bb0cce94be1a8c494f43780b68fb Mon Sep 17 00:00:00 2001 From: CableGuy67 Date: Fri, 22 Apr 2022 13:51:17 +0000 Subject: [PATCH 66/66] /spawnstruct placed schematics one block lower than player is standing Because the position of the player is -0.5 from the block (when not flying) /spawnstruct would place the schematic a block lower than the player's feet. --- mods/MAPGEN/mcl_structures/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/MAPGEN/mcl_structures/init.lua b/mods/MAPGEN/mcl_structures/init.lua index c99970813..13609be59 100644 --- a/mods/MAPGEN/mcl_structures/init.lua +++ b/mods/MAPGEN/mcl_structures/init.lua @@ -75,6 +75,7 @@ local function spawnstruct_function(name, param) local pos = player:get_pos() if not pos then return end + pos.y = math.floor(pos.y) + 1 local pr = PseudoRandom(math.floor(pos.x * 333 + pos.y * 19 - pos.z + 4)) pos = vector.round(pos) local dir = minetest.yaw_to_dir(player:get_look_horizontal())