From 92992cb44ecfa2332bdbadc4d071b04e34581e67 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Wed, 14 Apr 2021 12:20:53 +0000 Subject: [PATCH 01/35] Add ancient debris --- mods/ITEMS/mcl_nether/init.lua | 15 +++++++++++++++ .../textures/mcl_nether_ancient_debris_side.png | Bin 0 -> 8573 bytes .../textures/mcl_nether_ancient_debris_top.png | Bin 0 -> 7800 bytes 3 files changed, 15 insertions(+) create mode 100644 mods/ITEMS/mcl_nether/textures/mcl_nether_ancient_debris_side.png create mode 100644 mods/ITEMS/mcl_nether/textures/mcl_nether_ancient_debris_top.png diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index 2d8def90d..679524d98 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -51,6 +51,21 @@ minetest.register_node("mcl_nether:quartz_ore", { _mcl_fortune_drop = mcl_core.fortune_drop_ore }) +minetest.register_node("mcl_nether:ancient_debris", { + description = S("Ancient Debris"), + _doc_items_longdesc = S("Ancient debris can be found in the nether and is very very rare."), + stack_max = 64, + tiles = {"mcl_nether_ancient_debris_top.png", "mcl_nether_ancient_debris_side.png"}, + is_ground_content = true, + groups = {pickaxey=4, building_block=1, material_stone=1, xp=0}, + drop = 'mcl_nether:ancient_debris', + sounds = mcl_sounds.node_sound_stone_defaults(), + _mcl_blast_resistance = 1200, + _mcl_hardness = 30, + _mcl_silk_touch_drop = true, + _mcl_fortune_drop = mcl_core.fortune_drop_ore +}) + -- For eternal fire on top of netherrack and magma blocks -- (this code does not require a dependency on mcl_fire) local function eternal_after_destruct(pos, oldnode) diff --git a/mods/ITEMS/mcl_nether/textures/mcl_nether_ancient_debris_side.png b/mods/ITEMS/mcl_nether/textures/mcl_nether_ancient_debris_side.png new file mode 100644 index 0000000000000000000000000000000000000000..230f2cce361c510162b332ee4c028b5f68d74ca2 GIT binary patch literal 8573 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 dnDH%Mkln Date: Wed, 14 Apr 2021 11:42:28 +0000 Subject: [PATCH 02/35] Add code for netherite armor --- mods/ITEMS/mcl_armor/register.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua index 1f9ce7b02..1d3414339 100644 --- a/mods/ITEMS/mcl_armor/register.lua +++ b/mods/ITEMS/mcl_armor/register.lua @@ -81,6 +81,21 @@ mcl_armor.register_set({ craft_material = "mcl_core:diamond", }) +mcl_armor.register_set({ + name = "netherite", + description = "Netherite", + durability = 555, + enchantability = 10, + points = { + head = 3, + torso = 8, + legs = 6, + feet = 3, + }, + toughness = 2, + craft_material = "mcl_nether:netherite_ingot", +}) + mcl_armor.register_protection_enchantment({ id = "projectile_protection", name = S("Projectile Protection"), From 57ebfbfb56574f338828151076511ff491959d07 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Wed, 14 Apr 2021 11:44:50 +0000 Subject: [PATCH 03/35] Add first part of netherite armor textures --- .../textures/mcl_armor_inv_boots_netherite.png | Bin 0 -> 173 bytes .../mcl_armor_inv_chestplate_netherite.png | Bin 0 -> 244 bytes .../textures/mcl_armor_inv_helmet_netherite.png | Bin 0 -> 162 bytes .../textures/mcl_armor_inv_leggings_netherite.png | Bin 0 -> 176 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_netherite.png create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_inv_chestplate_netherite.png create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_inv_helmet_netherite.png create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_inv_leggings_netherite.png diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..ec4183ed782bce5bc7b48d36bdee8bcd2a1bd070 GIT binary patch literal 173 zcmV;e08;;nP)BeTg%`-Oe6GAxIn~ zMw9^{Md%7~iBs1AWJUPAfG&qsv#G8wh5;ZkoQA+`K-P?`0LDjGgJJ+o5xzh|R)aS% bhZX<;{z`r=gbJ0500000NkvXXu0mjfB`7)Q literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_chestplate_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_chestplate_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..f2f0ad5a953c213c783ba635e50ddbab19f87b8f GIT binary patch literal 244 zcmVp1vs9R9E-ExS-&FqBWOgmHm$mi-j8i5+`T~$N+SkVVYr> zC<9=AhPeR7C&>ViLYNCcY?2H>HUx%=3P|KYL^pt_K!h2BO%co>hEae400vrmFb;s= QZ2$lO07*qoM6N<$f_m^a*#H0l literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_leggings_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_leggings_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..af45363b3631abf9349a8c06d81f8e695803f45e GIT binary patch literal 176 zcmV;h08jskP)gwV*1ZDuTCS>exXHT2~$QnSH zECXPQK^Ww8q78uAhO7|8CdmMFg}B6NV*o7R(7k|79H#;3@eMP8U^;+>I5q>YiDNYY e850s88~^~6>7xT#Y%N~^0000 Date: Wed, 14 Apr 2021 11:46:34 +0000 Subject: [PATCH 04/35] Add second part of netherite armor textures --- .../mcl_armor/mcl_armor_chestplate_netherite.png | Bin 0 -> 494 bytes .../mcl_armor/mcl_armor_helmet_netherite.png | Bin 0 -> 472 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/mcl_armor/mcl_armor_chestplate_netherite.png create mode 100644 mods/ITEMS/mcl_armor/mcl_armor_helmet_netherite.png diff --git a/mods/ITEMS/mcl_armor/mcl_armor_chestplate_netherite.png b/mods/ITEMS/mcl_armor/mcl_armor_chestplate_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..c2eb42facea0a0c9901dec4b7d65067e9b4930ae GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z#tvq6XMFi zzz`c2Yj0p(mR06yX&>m~ry{Rlq^|z||9`1_lWiFo7#K@}{DK)Ap4~_Tagw~JU|=ut^mS!_%EHI3XzE#g-kE`c;jpKRV~EA+w-YyVH5-Vy%FDi*bFAcA!dac4 zOwI3^FR7K}8ry_(UU|P>X^Tde{R7!^B|FUbFvwVLlAiXSW7j>w0{@7a4#EsxIZdLf z+jZ1;ZJ3!5%PGK?B`ddehv40}iw>r$yF9LZy0%gTe~ HDWM4fx09tT literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_armor/mcl_armor_helmet_netherite.png b/mods/ITEMS/mcl_armor/mcl_armor_helmet_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..f3b054735233d34317eca43a98d65323a27db20a GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z#tdk6XMFi zz+j}VZf{^+mQ@z$;^%2;9~%~{BCo*3#r6OH|Mi*)5&GbXUQn;Iy8!)S7c9 z0nxdc7kEr6WIlK_Z9Vw+|Ho}pE8lNfGv({|)%*>GwJ*CK6)!GI71i^Uesb1N;tZ>~ zhO@$y7(ajE%$*NTwMl=KtFT%x{ISkZb8)@V>iz6C$#!f)%ndK|W7fEG2iPX&=)7T_ zI8p9pkjv%?3=9maC9V-ADTyViR>?)Fi6yBFMg~TPx&|h?h9)6~hE~SLR;I?<1_o9J k2Cw)lWl%Ka=BH$)RpQn#JLup71_lNOPgg&ebxsLQ00VrSumAu6 literal 0 HcmV?d00001 From 8ee792e965082042ec76ca504ca7791bfa5e2a9d Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Wed, 14 Apr 2021 11:54:42 +0000 Subject: [PATCH 05/35] Add correct textures for netherite armor --- .../textures/mcl_armor_boots_netherite.png | Bin 0 -> 385 bytes .../textures/mcl_armor_chestplate_netherite.png | Bin 0 -> 494 bytes .../textures/mcl_armor_helmet_netherite.png | Bin 0 -> 472 bytes .../textures/mcl_armor_leggings_netherite.png | Bin 0 -> 458 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_boots_netherite.png create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_netherite.png create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_netherite.png create mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_netherite.png diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..245512c28c194446c675d68b8c8da7e7471e1353 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z#tdk6XMFi zz@Q?pASftkq^@pnVC`vXAL!y28x~uZRrde?|ImFmtr-{?7)yfuf*Bm1-ADs*lDyqr zI6vN8`i6mlfxX1j*OmP#3m>6%ZJC<%a_NOr%+44%tT+zOyt;F zhk$?^0RaN#ISdSo|8wQ8yXe!*z`&qd;u=wsl30>zm0XmXSdz+MWME{dYha>lXcA&* wXk~0{WooQ#U|?ln@QS}u21P?|eoAIqC2kF~gAOiWU|?YIboFyt=akR{09T1@_W%F@ literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..c2eb42facea0a0c9901dec4b7d65067e9b4930ae GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z#tvq6XMFi zzz`c2Yj0p(mR06yX&>m~ry{Rlq^|z||9`1_lWiFo7#K@}{DK)Ap4~_Tagw~JU|=ut^mS!_%EHI3XzE#g-kE`c;jpKRV~EA+w-YyVH5-Vy%FDi*bFAcA!dac4 zOwI3^FR7K}8ry_(UU|P>X^Tde{R7!^B|FUbFvwVLlAiXSW7j>w0{@7a4#EsxIZdLf z+jZ1;ZJ3!5%PGK?B`ddehv40}iw>r$yF9LZy0%gTe~ HDWM4fx09tT literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..f3b054735233d34317eca43a98d65323a27db20a GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z#tdk6XMFi zz+j}VZf{^+mQ@z$;^%2;9~%~{BCo*3#r6OH|Mi*)5&GbXUQn;Iy8!)S7c9 z0nxdc7kEr6WIlK_Z9Vw+|Ho}pE8lNfGv({|)%*>GwJ*CK6)!GI71i^Uesb1N;tZ>~ zhO@$y7(ajE%$*NTwMl=KtFT%x{ISkZb8)@V>iz6C$#!f)%ndK|W7fEG2iPX&=)7T_ zI8p9pkjv%?3=9maC9V-ADTyViR>?)Fi6yBFMg~TPx&|h?h9)6~hE~SLR;I?<1_o9J k2Cw)lWl%Ka=BH$)RpQn#JLup71_lNOPgg&ebxsLQ00VrSumAu6 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_netherite.png new file mode 100644 index 0000000000000000000000000000000000000000..3ddff72e3e8632345fbae461132e1f04ed3484f3 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z@Ql56XMFi zz+kGYt0J!;E+`lq7ONsDX>Mv>mR08K>FaK1|NsAg-zE2MFfcGMmIV0)GdMiEkp|)< zdAqxCWnB0Y#=yY9UgGKN%Knsvk6Y2yv--R<0|UcMPZ!4!i_^&o60D0ESUI@(wlKLS zA5U;i4i%ikb)@A^>yZ`~?*gq1Pan-3&z$nZD-{kWd%3o`?^4fW%{9JjbSo(BQJM4Y zGiDpjIPY+Y2rCLKXL45L&`D3wV1HaB(8|&?MRCK@J$IN}RIRPll1x_y>TF(|9JR>h zQIDVD8m>z$m(xm^I87Z7s;uFf(lfQE(c`3tr>A7341<7=`s=@w&Kff?FsPQeMwFx^ zmZVxG7o{eaq%s&87#ZpsnCKdsgcurH85>)f8fzOESQ!|+;;)oJ(U6;;l9^VCTf^+2 Tg9{iK7#KWV{an^LB{Ts5K~slK literal 0 HcmV?d00001 From 338114aecc714cda4b7f51ced8f1bda3f08ae453 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Wed, 14 Apr 2021 12:35:15 +0000 Subject: [PATCH 06/35] Add: Netherite scrap, Netherite ingot. Add crafting recipe for netherite ingot. --- mods/ITEMS/mcl_nether/init.lua | 34 +++++++++++++++++- .../textures/mcl_nether_netherite_ingot.png | Bin 0 -> 222 bytes .../textures/mcl_nether_netherite_scrap.png | Bin 0 -> 207 bytes 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 mods/ITEMS/mcl_nether/textures/mcl_nether_netherite_ingot.png create mode 100644 mods/ITEMS/mcl_nether/textures/mcl_nether_netherite_scrap.png diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index 679524d98..14ac215b3 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -266,6 +266,22 @@ minetest.register_craftitem("mcl_nether:quartz", { groups = { craftitem = 1 }, }) +minetest.register_craftitem("mcl_nether:netherite_scrap", { + description = S("Netherite Scrap"), + _doc_items_longdesc = S("Netherite scrap is a crafting ingredient for netherite ingots."), + inventory_image = "mcl_nether_netherite_scrap.png", + stack_max = 64, + groups = { craftitem = 1 }, +}) + +minetest.register_craftitem("mcl_nether:netherite_ingot", { + description = S("Netherite Ingot"), + _doc_items_longdesc = S("Netherite ingots can be used with a smithing table to upgrade items to netherite."), + inventory_image = "mcl_nether_netherite_ingot.png", + stack_max = 64, + groups = { craftitem = 1 }, +}) + minetest.register_craftitem("mcl_nether:netherbrick", { description = S("Nether Brick"), _doc_items_longdesc = S("Nether bricks are the main crafting ingredient for crafting nether brick blocks and nether fences."), @@ -282,7 +298,14 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "mcl_nether:quartz_block", + type = "cooking", + output = "mcl_nether:netherite_scrap", + recipe = "mcl_nether:ancient_debris", + cooktime = 10, +}) + +minetest.register_craft({ + output = 'mcl_nether:quartz_block', recipe = { {"mcl_nether:quartz", "mcl_nether:quartz"}, {"mcl_nether:quartz", "mcl_nether:quartz"}, @@ -352,5 +375,14 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "mcl_nether:netherite_ingot", + recipe = { + {'mcl_nether:netherite_scrap', 'mcl_nether:netherite_scrap', 'mcl_nether:netherite_scrap'}, + {'mcl_nether:netherite_scrap', 'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, + {'mcl_core:gold_ingot', 'mcl_core:gold_ingot', ''}, + } +}) + dofile(minetest.get_modpath(minetest.get_current_modname()).."/nether_wart.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/lava.lua") diff --git a/mods/ITEMS/mcl_nether/textures/mcl_nether_netherite_ingot.png b/mods/ITEMS/mcl_nether/textures/mcl_nether_netherite_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..90aab05632a87b234c41c5179621f895f26c38e1 GIT binary patch literal 222 zcmV<403rX0P)9U5Jme7+3Q+#XLpiriU<|#TF75W{-4O5a>Hauu((U$kk_0$>7v8X%{U#73H&92 z*L)YQ=S$ixEssT5pR3ReX-VN73K)d@90CcKOlKz++mQH)LJr~g;m~$s7$q(Gn@`TU zEnpf)L5Elg_YeWrMF2LWB@ta)ynu%gFuk%v5%kZ Y3y(|Wmcdz%(HnfL9~BAu!jVYXq?|oQ@s_AdSeH zU>cEKh1C$4W^5R5;9-jeLIFrH0g)8)xB?PAEJ)4+WNRb`004pq%38E>n-%~7002ov JPDHLkV1n!jNuB@z literal 0 HcmV?d00001 From 9c0e9964a61950c374b46b7a623d3483f5d0fe7c Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Fri, 16 Apr 2021 11:47:21 +0000 Subject: [PATCH 07/35] Add smithing table W.I.P --- mods/ITEMS/mcl_smithing_table/init.lua | 43 ++++++++++++++++++ .../locale/mcl_anvils.de.tr | 16 +++++++ .../locale/mcl_anvils.es.tr | 15 ++++++ .../locale/mcl_anvils.fr.tr | 16 +++++++ .../locale/mcl_anvils.ru.tr | 16 +++++++ .../mcl_smithing_table/locale/template.txt | 16 +++++++ mods/ITEMS/mcl_smithing_table/mod.conf | 2 + .../textures/mcl_smithing_table_bottom.png | Bin 0 -> 206 bytes .../textures/mcl_smithing_table_front.png | Bin 0 -> 312 bytes .../textures/mcl_smithing_table_inventory.png | Bin 0 -> 699 bytes .../textures/mcl_smithing_table_side.png | Bin 0 -> 315 bytes .../textures/mcl_smithing_table_top.png | Bin 0 -> 260 bytes 12 files changed, 124 insertions(+) create mode 100644 mods/ITEMS/mcl_smithing_table/init.lua create mode 100644 mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.de.tr create mode 100644 mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.es.tr create mode 100644 mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.fr.tr create mode 100644 mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.ru.tr create mode 100644 mods/ITEMS/mcl_smithing_table/locale/template.txt create mode 100644 mods/ITEMS/mcl_smithing_table/mod.conf create mode 100644 mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_bottom.png create mode 100644 mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_front.png create mode 100644 mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_inventory.png create mode 100644 mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_side.png create mode 100644 mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_top.png diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua new file mode 100644 index 000000000..b57842d0f --- /dev/null +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -0,0 +1,43 @@ +local formspec = "size[9,9]" .. + "label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, "Inventory")) .. "]" .. + "list[current_player;main;0,4.5;9,3;9]" .. + mcl_formspec.get_itemslot_bg(0,4.5,9,3) .. + "list[current_player;main;0,7.74;9,1;]" .. + mcl_formspec.get_itemslot_bg(0,7.74,9,1) .. + "list[context;input;1,2.5;1,1;]" .. + mcl_formspec.get_itemslot_bg(1,2.5,1,1) .. + "list[context;input;4,2.5;1,1;1]" .. + mcl_formspec.get_itemslot_bg(4,2.5,1,1) .. + "list[context;output;8,2.5;1,1;]" .. + mcl_formspec.get_itemslot_bg(8,2.5,1,1) .. + "label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, "Upgrade Gear")) .. "]" .. + "button[7,0.7;2,1;name_button;" .. minetest.formspec_escape("Upgrade Gear") .. "]" .. + "listring[context;output]".. + "listring[current_player;main]".. + "listring[context;input]".. + "listring[current_player;main]" + + +local function upgrade(itemstack) + itemstack:set_name(itemstack:get_name():gsub("diamond", "netherite")) +end + +minetest.register_node("mcl_smithing_table:table", { + description = "Smithing table", + + stack_max = 64, + groups = {pickaxey = 2, deco_block = true}, + + tiles = { + "mcl_smithing_table_top.png", "mcl_smithing_table_front.png", "mcl_smithing_table_side.png", + "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", + "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_bottom.png" + }, + + on_construct = function(pos) + minetest.get_meta(pos):set_string("formspec", formspec) + end, + + _mcl_blast_resistance = 2.5, + _mcl_hardness = 2.5 +}) \ No newline at end of file diff --git a/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.de.tr b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.de.tr new file mode 100644 index 000000000..9e7d88337 --- /dev/null +++ b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.de.tr @@ -0,0 +1,16 @@ +# textdomain: mcl_anvils +Set Name=Name setzen +Repair and Name=Reparieren und benennen +Inventory=Inventar +Anvil=Amboss +The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!=Der Amboss ermöglicht es, Werkzeuge und Rüstung zu reparieren und Gegenstände zu benennen. Er hat jedoch eine begrenzte Lebensdauer. Lassen Sie ihn nicht auf Ihren Kopf fallen, das könnte ziemlich schmerzhaft sein! +To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.=Um einen Amboss zu benutzen, rechtsklicken Sie auf ihn. Ein Amboss hat 2 Eingabeplätze (links) und einen Ausgabeplatz (rechts). +To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.=Um Gegenstände umzubenennen, platzieren Sie einen Gegenstand in einen der Eingangsplätze und lassen Sie den anderen frei. Geben Sie einen Namen ein und drücken Sie die Eingabetaste oder „Name setzen”, dann nehmen Sie den umbenannten Gegenstand an sich. +There are two possibilities to repair tools (and armor):=Es gibt zwei Möglichkeiten, Werkzeuge (und Rüstung) zu reparieren: +• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.=• Werkzeug + Werkzeug: Platzieren sie zwei gleiche Werkzeuge in die Eingangsplätze. Der Zustand des reparierten Werkzeugs ist die Summe des Zustands beider Eingangswerkzeuge, plus einem Bonus von 12%. +• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.=• Werkzeug + Material: Einige Werkzeuge können auch repariert werden, indem man sie mit einem Gegenstand, aus dem sie gemacht worden sind, kombiniert. Zum Beispiel können Eisenspitzhacken mit Eisenbarren repariert werden. Dadurch wird das Werkzeug um 25% repariert. +Armor counts as a tool. It is possible to repair and rename a tool in a single step.=Rüstung zählt als Werkzeug. Es ist möglich, ein Werkzeug in einem Arbeitsschritt zu reparieren und zu benennen. +The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.=Der Amboss hat begrenze Lebensdauer und 3 Schadensstufen: Kein Schaden, leicht beschädigt, und stark beschädigt. Jedes mal, wenn Sie etwas reparieren oder umbenennen, gibt es eine 12%-ige Chance, dass der Amboss Schaden nimmt. Ambosse können auch beschädigt werden, wenn sie um mehr als 1 Block fallen. Wenn ein sehr beschädigter Amboss erneut beschädigt wird, wird er zerstört. +Slightly Damaged Anvil=Leicht beschädigter Amboss +Very Damaged Anvil=Stark beschädigter Amboss +Repair and rename items=Für die Reparatur und Umbenennung von Gegenständen diff --git a/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.es.tr b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.es.tr new file mode 100644 index 000000000..7212b92ba --- /dev/null +++ b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.es.tr @@ -0,0 +1,15 @@ +# textdomain: mcl_anvils +Set Name=Establece un nombre +Repair and Name=Reparar y nombrar +Inventory=Inventario +Anvil=Yunque +The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!=El yunque le permite reparar herramientas y armaduras, y dar nombres a los elementos. Sin embargo, tiene una durabilidad limitada. No lo dejes caer sobre tu cabeza, ¡podría ser bastante doloroso! +To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.=Para usar un yunque, haga clic derecho sobre él. Un yunque tiene 2 ranuras de entrada (a la izquierda) y una ranura de salida. +To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.=Para cambiar el nombre de los elementos, coloque una pila de elementos en una de las ranuras de elementos mientras mantiene vacía la otra ranura de entrada. Escriba un nombre, presione enter o "Establecer nombre", luego obtenga el elemento renombrado en la ranura de salida. +There are two possibilities to repair tools (and armor):=Hay dos posibilidades para reparar herramientas (y armaduras): +• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.=• Herramienta + Herramienta: Coloque dos herramientas del mismo tipo en las ranuras de entrada. La "salud" de la herramienta reparada es la suma de la "salud" de ambas herramientas, con un bono del 12%. +• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.=• Herramienta + Material: Algunas herramientas también pueden repararse combinándolas con un elemento del que está hecho. Por ejemplo, los picos de hierro pueden repararse con lingotes de hierro. Esto repara la herramienta en un 25%. +Armor counts as a tool. It is possible to repair and rename a tool in a single step.=La armadura cuenta como una herramienta. Es posible reparar y cambiar el nombre de una herramienta en un solo paso. +The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.=El yunque tiene una durabilidad limitada y 3 niveles de daño: sin daños, ligeramente dañado y muy dañado. Cada vez que reparas o cambias el nombre de algo, hay un 12% de posibilidades de que el yunque se dañe. Los yunques también tienen la posibilidad de dañarse cuando caen en más de 1 bloque. Si un yunque muy dañado se daña nuevamente, se destruye. +Slightly Damaged Anvil=Yunque dañado +Very Damaged Anvil=Yunque muy dañado diff --git a/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.fr.tr b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.fr.tr new file mode 100644 index 000000000..1f03de8e5 --- /dev/null +++ b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.fr.tr @@ -0,0 +1,16 @@ +# textdomain: mcl_anvils +Set Name=Définir le Nom +Repair and Name=Réparation et Nomme +Inventory=Inventaire +Anvil=Enclume +The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!=L'enclume vous permet de réparer des outils et des armures, et de donner des noms à des objets. Il a cependant une durabilité limitée. Ne la laissez pas tomber sur la tête, cela pourrait être assez douloureux! +To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.=Pour utiliser une enclume, faites un clic droit dessus. Une enclume a 2 emplacements d'entrée (à gauche) et un emplacement de sortie. +To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.=Pour renommer des objets, placez une pile d'objets dans l'un des emplacements d'objets tout en laissant l'autre emplacement d'entrée vide. Tapez un nom, appuyez sur Entrée ou sur «Définir le nom», puis prenez l'élément renommé dans l'emplacement de sortie. +There are two possibilities to repair tools (and armor):=Il existe deux possibilités pour réparer les outils (et les armures): +• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.=• Outil + Outil: Placez deux outils du même type dans les emplacements d'entrée. La "santé" de l'outil réparé est la somme de la "santé" des deux outils d'entrée, plus un bonus de 12%. +• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.=• Outil + Matériel: Certains outils peuvent également être réparés en les combinant avec un élément dont il est fait. Par exemple, les pioches de fer peuvent être réparées avec des lingots de fer. Cela répare l'outil de 25%. +Armor counts as a tool. It is possible to repair and rename a tool in a single step.=L'armure compte comme un outil. Il est possible de réparer et de renommer un outil en une seule étape. +The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.=L'enclume a une durabilité limitée et 3 niveaux de dommages: en bon état, légèrement endommagé et très endommagé. Chaque fois que vous réparez ou renommez quelque chose, il y a 12% de chances que l'enclume soit endommagée. Les enclumes ont également une chance d'être endommagées lorsqu'elles tombent de plus d'un bloc. Si une enclume très endommagée est à nouveau endommagée, elle est détruite. +Slightly Damaged Anvil=Enclume Légèrement Endommagée +Very Damaged Anvil=Enclume Très Endommagée +Repair and rename items=Réparer et renommer des objets diff --git a/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.ru.tr b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.ru.tr new file mode 100644 index 000000000..20281bd6b --- /dev/null +++ b/mods/ITEMS/mcl_smithing_table/locale/mcl_anvils.ru.tr @@ -0,0 +1,16 @@ +# textdomain: mcl_anvils +Set Name=Дать имя +Repair and Name=Починить и дать имя +Inventory=Инвентарь +Anvil=Наковальня +The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!=Наковальня позволяет ремонтировать инструменты и защиту, а также давать имена предметам. Но она имеет ограниченный срок службы. Не дайте ей упасть вам на голову, это может быть больно! +To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.=Чтобы воспользоваться наковальней, кликните по ней правой кнопкой. Наковальня имеет два входных отсека (слева) и один выходной. +To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.=Для переименования положите стопку предметов в один отсек, второй оставьте пустым. Наберите имя, нажмите [Enter] или “Дать имя” и заберите переименованные предметы из выходного отсека. +There are two possibilities to repair tools (and armor):=Есть два способа отремонтировать инструменты (и защиту): +• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.=• Инструмент + Инструмент: Положите два инструмента одного типа во входные отсеки. “Здоровье” отремонтированного инструмента будет равно сумме “здоровья” каждого из них, плюс 12% бонус. +• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.=• Инструмент + Материал: Некоторые инструменты можно также ремонтировать, добавляя к ним предмет, из которого они сделаны. Например, железные кирки ремонтируются добавлением слитков железа. Таким способом инструмент восстанавливается на 25%. +Armor counts as a tool. It is possible to repair and rename a tool in a single step.=Защиты считается за инструмент. Можно ремонтировать и переименовывать за одно действие. +The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.=Наковальня имеет ограниченный срок службы и 3 уровня износа: новая, немного изношенная, сильно повреждённая. Каждый раз, ремонтируя или переименовывая что-либо, вы имеете 12-процентный шанс повредить наковальню. Наковальни также могут повреждаться, когда они падают с высоте более 1 блока. Если повреждённая наковальня повреждается снова, то она уничтожается. +Slightly Damaged Anvil=Немного изношенная наковальня +Very Damaged Anvil=Сильно повреждённая наковальня +Repair and rename items=Ремонтирует и переименовывает предметы diff --git a/mods/ITEMS/mcl_smithing_table/locale/template.txt b/mods/ITEMS/mcl_smithing_table/locale/template.txt new file mode 100644 index 000000000..ebc741c00 --- /dev/null +++ b/mods/ITEMS/mcl_smithing_table/locale/template.txt @@ -0,0 +1,16 @@ +# textdomain: mcl_anvils +Set Name= +Repair and Name= +Inventory= +Anvil= +The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!= +To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.= +To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.= +There are two possibilities to repair tools (and armor):= +• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.= +• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.= +Armor counts as a tool. It is possible to repair and rename a tool in a single step.= +The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.= +Slightly Damaged Anvil= +Very Damaged Anvil= +Repair and rename items= diff --git a/mods/ITEMS/mcl_smithing_table/mod.conf b/mods/ITEMS/mcl_smithing_table/mod.conf new file mode 100644 index 000000000..aee93fa65 --- /dev/null +++ b/mods/ITEMS/mcl_smithing_table/mod.conf @@ -0,0 +1,2 @@ +name = mcl_smithing_table +depends = mcl_colors, mcl_formspec diff --git a/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_bottom.png b/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..59833b5ea20686a3eae16a005d9abec43bcd9022 GIT binary patch literal 206 zcmV;<05SiGP)7tL>0^K~^hE^05+E9e(fP#Hn5ASJfZ_$10ThJ+sRp2Uft*03*Z{0v zpldY3)S?)GFWDlCBWEzM0qB_tUj{;!$HEV7R5-T(jq07*qo IM6N<$g5F$8ng9R* literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_front.png b/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_front.png new file mode 100644 index 0000000000000000000000000000000000000000..55875ef5459ab6e0bc4ac530c51d8b97e044ff7b GIT binary patch literal 312 zcmV-80muG{P)m-ckE0CuW?*1=#HC@%z`!6B;1lA?ke|cAz~Jug zzIgHCxpU|K|Nq}*GP4{50|R48kY6x^!?PP{AWo9Ey9+}HtE>kD0|RG)M`SSr1Gg{; zGcwGYBf-GHz+U3%>&pIwS(r;ruE5)ig@J)d$VS%@@o&Ux>zdYrGCiI>7~mJ&lQiS`&p^Z zedhdfN$|}~+bMolOXnT~ac*Z?Pw}%lI(Hd}b2rm+il5cfxosfM{Y>*IepY`s9`)`& zYIDBilIBYjF)#JG=iY7+^-`bf_s#@Fy|JBJQZ)VblF9XpS0>D#=d?V#q-yuWEVa2M zRtqoZsLd^TW&JkolIQY0mkZS9maMYYO~2&1e8=SywYeo(*0~_gmdh1tb4#?W*QW1c zn7i(>r`p^TRwtJTN2<>(QF^U1*^kBnMki3SRlc^Oea8CD-vvQ7db;|#taD0e0sv@7 Bn@a!y literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_side.png b/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_side.png new file mode 100644 index 0000000000000000000000000000000000000000..419312b1c6b1ee3784fb09c4059d2bc408eaf2c0 GIT binary patch literal 315 zcmV-B0mS}^P) zyX+Vj=`ya?nZy_^*mKJ7mASwK#h}+8Y0lWfLl_4Z`eJUh>ve>r)s7a35I^ttg207* z&}{@o#R8J+xTky{xs1LDa1Uy<2T00v5}&VkycDH^uHU9ZSpz6!jMGH`jgsbd5-qYL z=If{kKppXHz7hCT)|&4D*2RJf{MA3jR%7ei0s;9*6tG^=M8@7bQ2|^-u4DW`z zI}XAy5JY_%s1Q^nq5;t$lro~u1-O3;nn<&H-q=u#{8{hw+GCgJw0xx7eGYkUe!W+D zOgUC^@_2bvYQ;PbfCJ~@8X{!3KdfTRkf?ykSxVM!8Lr%7ngYku5R2Sb>+%V$jzEAG zs+MXbLfTsBz^_E!jVsvzXxqPgh$HZU(4Jm0 zD~LPj9ieAo1>jTmvu*8|Eesn~ZvH5O Date: Wed, 14 Apr 2021 13:07:25 +0000 Subject: [PATCH 08/35] Add netherite tools --- mods/ITEMS/mcl_farming/hoes.lua | 21 +++++ mods/ITEMS/mcl_tools/init.lua | 86 +++++++++++++++++- .../textures/default_tool_netheriteaxe.png | Bin 0 -> 184 bytes .../textures/default_tool_netheritepick.png | Bin 0 -> 188 bytes .../textures/default_tool_netheriteshovel.png | Bin 0 -> 161 bytes .../textures/default_tool_netheritesword.png | Bin 0 -> 210 bytes 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 mods/ITEMS/mcl_tools/textures/default_tool_netheriteaxe.png create mode 100644 mods/ITEMS/mcl_tools/textures/default_tool_netheritepick.png create mode 100644 mods/ITEMS/mcl_tools/textures/default_tool_netheriteshovel.png create mode 100644 mods/ITEMS/mcl_tools/textures/default_tool_netheritesword.png diff --git a/mods/ITEMS/mcl_farming/hoes.lua b/mods/ITEMS/mcl_farming/hoes.lua index d2250eb70..9a8883609 100644 --- a/mods/ITEMS/mcl_farming/hoes.lua +++ b/mods/ITEMS/mcl_farming/hoes.lua @@ -272,4 +272,25 @@ minetest.register_craft({ {"mcl_core:stick", ""}, {"mcl_core:stick", ""} } +}) + +minetest.register_tool("mcl_farming:hoe_netherite", { + description = S("Netherite Hoe"), + _tt_help = hoe_tt.."\n"..S("Uses: @1", uses.netherite), + _doc_items_longdesc = hoe_longdesc, + _doc_items_usagehelp = hoe_usagehelp, + inventory_image = "farming_tool_netheritehoe.png", + wield_scale = mcl_vars.tool_wield_scale, + on_place = hoe_on_place_function(uses.netherite), + groups = { tool=1, hoe=1, enchantability=10 }, + tool_capabilities = { + full_punch_interval = 0.25, + damage_groups = { fleshy = 4, }, + punch_attack_uses = uses.netherite, + }, + _repair_material = "mcl_nether:netherite_ingot", + _mcl_toollike_wield = true, + _mcl_diggroups = { + hoey = { speed = 8, level = 5, uses = 2031 } + }, }) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index cbee8e3d0..aadf90e0d 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -177,7 +177,28 @@ minetest.register_tool("mcl_tools:pick_diamond", { }, }) -local function make_grass_path(itemstack, placer, pointed_thing) +minetest.register_tool("mcl_tools:pick_netherite", { + description = S("Netherite Pickaxe"), + _doc_items_longdesc = pickaxe_longdesc, + inventory_image = "default_tool_netheritepick.png", + wield_scale = wield_scale, + groups = { tool=1, pickaxe=1, dig_speed_class=5, enchantability=10 }, + tool_capabilities = { + -- 1/1.2 + full_punch_interval = 0.83333333, + max_drop_level=5, + damage_groups = {fleshy=6}, + punch_attack_uses = 1016, + }, + sound = { breaks = "default_tool_breaks" }, + _repair_material = "mcl_nether:netherite_ingot", + _mcl_toollike_wield = true, + _mcl_diggroups = { + pickaxey = { speed = 8, level = 5, uses = 2031 } + }, +}) + +local make_grass_path = function(itemstack, placer, pointed_thing) -- Use pointed node's on_rightclick function first, if present local node = minetest.get_node(pointed_thing.under) if placer and not placer:get_player_control().sneak then @@ -353,6 +374,28 @@ minetest.register_tool("mcl_tools:shovel_diamond", { }, }) +minetest.register_tool("mcl_tools:shovel_netherite", { + description = S("Netherite Shovel"), + _doc_items_longdesc = shovel_longdesc, + _doc_items_usagehelp = shovel_use, + inventory_image = "default_tool_netheriteshovel.png", + wield_scale = wield_scale, + groups = { tool=1, shovel=1, dig_speed_class=5, enchantability=10 }, + tool_capabilities = { + full_punch_interval = 1, + max_drop_level=5, + damage_groups = {fleshy=5}, + punch_attack_uses = 1016, + }, + on_place = make_grass_path, + sound = { breaks = "default_tool_breaks" }, + _repair_material = "mcl_nether:netherite_ingot", + _mcl_toollike_wield = true, + _mcl_diggroups = { + shovely = { speed = 8, level = 5, uses = 2031 } + }, +}) + -- Axes local function make_stripped_trunk(itemstack, placer, pointed_thing) if pointed_thing.type ~= "node" then return end @@ -485,6 +528,27 @@ minetest.register_tool("mcl_tools:axe_diamond", { }, }) +minetest.register_tool("mcl_tools:axe_netherite", { + description = S("Netherite Axe"), + _doc_items_longdesc = axe_longdesc, + inventory_image = "default_tool_netheriteaxe.png", + wield_scale = wield_scale, + groups = { tool=1, axe=1, dig_speed_class=5, enchantability=10 }, + tool_capabilities = { + full_punch_interval = 1.0, + max_drop_level=5, + damage_groups = {fleshy=10}, + punch_attack_uses = 1016, + }, + on_place = make_stripped_trunk, + sound = { breaks = "default_tool_breaks" }, + _repair_material = "mcl_nether:netherite_ingot", + _mcl_toollike_wield = true, + _mcl_diggroups = { + axey = { speed = 8, level = 5, uses = 2031 } + }, +}) + -- Swords minetest.register_tool("mcl_tools:sword_wood", { description = S("Wooden Sword"), @@ -587,6 +651,26 @@ minetest.register_tool("mcl_tools:sword_diamond", { swordy_cobweb = { speed = 8, level = 5, uses = 1562 } }, }) +minetest.register_tool("mcl_tools:sword_netherite", { + description = S("Netherite Sword"), + _doc_items_longdesc = sword_longdesc, + inventory_image = "default_tool_netheritesword.png", + wield_scale = wield_scale, + groups = { weapon=1, sword=1, dig_speed_class=5, enchantability=10 }, + tool_capabilities = { + full_punch_interval = 0.625, + max_drop_level=5, + damage_groups = {fleshy=9}, + punch_attack_uses = 2032, + }, + sound = { breaks = "default_tool_breaks" }, + _repair_material = "mcl_nether:netherite_ingot", + _mcl_toollike_wield = true, + _mcl_diggroups = { + swordy = { speed = 8, level = 5, uses = 1562 }, + swordy_cobweb = { speed = 8, level = 5, uses = 1562 } + }, +}) --Shears minetest.register_tool("mcl_tools:shears", { diff --git a/mods/ITEMS/mcl_tools/textures/default_tool_netheriteaxe.png b/mods/ITEMS/mcl_tools/textures/default_tool_netheriteaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..322bf45130946f4750019b2329efac3edcf6dc18 GIT binary patch literal 184 zcmV;p07w6cP)x($w%1%&>StT{F;7K{th3y3!Wq#2|Eq|x8Tj&uV+KwnXbGR?)V z&R|UxX$J90)|_BsM4FArnyoFZ>8u%~5rmx`oXNKtIl#yQAk7pRKn?%^??+lk=UVA3 P00000NkvXXu0mjff08-? literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_tools/textures/default_tool_netheritesword.png b/mods/ITEMS/mcl_tools/textures/default_tool_netheritesword.png new file mode 100644 index 0000000000000000000000000000000000000000..4bc0809b12478fa4d29150871df6b303dec9cebe GIT binary patch literal 210 zcmV;@04@KCP)bD)bKd744Cf;59@k~PPM#ey}1Xq=j{ zg(`>-(rBcv{@>rm4!_MXn_z~Jq#50>AR45JB+bYMfH29Lu>~5*n)MZx{wJ6ifi=Rs zK(rws&Bd Date: Wed, 14 Apr 2021 13:08:31 +0000 Subject: [PATCH 09/35] Add netherite hoe texture --- .../textures/farming_tool_netheritehoe.png | Bin 0 -> 167 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/mcl_farming/textures/farming_tool_netheritehoe.png diff --git a/mods/ITEMS/mcl_farming/textures/farming_tool_netheritehoe.png b/mods/ITEMS/mcl_farming/textures/farming_tool_netheritehoe.png new file mode 100644 index 0000000000000000000000000000000000000000..b41b1eef3d1d4c6bbf9e502c92967100991aa5ba GIT binary patch literal 167 zcmV;Y09gNtP)=dzjMUZt>nke#PcSk1PqIO=VX Date: Wed, 14 Apr 2021 13:10:07 +0000 Subject: [PATCH 10/35] Fix crash in netherite hoe by adding netherite to uses{} --- mods/ITEMS/mcl_farming/hoes.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_farming/hoes.lua b/mods/ITEMS/mcl_farming/hoes.lua index 9a8883609..d988fa8be 100644 --- a/mods/ITEMS/mcl_farming/hoes.lua +++ b/mods/ITEMS/mcl_farming/hoes.lua @@ -54,7 +54,8 @@ local uses = { stone = 132, iron = 251, gold = 33, - diamond = 1562, + diamond = 1562, + netherite = 2031, } local hoe_tt = S("Turns block into farmland") @@ -291,6 +292,6 @@ minetest.register_tool("mcl_farming:hoe_netherite", { _repair_material = "mcl_nether:netherite_ingot", _mcl_toollike_wield = true, _mcl_diggroups = { - hoey = { speed = 8, level = 5, uses = 2031 } + hoey = { speed = 8, level = 5, uses = uses.netherite } }, }) From 3b2a34c670e3bfabbf51055919af64a027298886 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Fri, 16 Apr 2021 14:00:14 +0000 Subject: [PATCH 11/35] Add first try of code for smithing table (Thanks to Fleckenstein), add _mcl_upgradable and _mcl_upgrade_item to every diamond tool/armor piece --- mods/ITEMS/mcl_farming/hoes.lua | 6 +- mods/ITEMS/mcl_smithing_table/init.lua | 139 ++++++++++++++++++++++--- mods/ITEMS/mcl_tools/init.lua | 8 ++ 3 files changed, 136 insertions(+), 17 deletions(-) diff --git a/mods/ITEMS/mcl_farming/hoes.lua b/mods/ITEMS/mcl_farming/hoes.lua index d988fa8be..e023f123e 100644 --- a/mods/ITEMS/mcl_farming/hoes.lua +++ b/mods/ITEMS/mcl_farming/hoes.lua @@ -256,6 +256,8 @@ minetest.register_tool("mcl_farming:hoe_diamond", { _mcl_diggroups = { hoey = { speed = 8, level = 5, uses = 1562 } }, + _mcl_upgradable = true, + _mcl_upgrade_item = "mcl_farming:hoe_netherite" }) minetest.register_craft({ @@ -272,7 +274,7 @@ minetest.register_craft({ {"mcl_core:diamond", "mcl_core:diamond"}, {"mcl_core:stick", ""}, {"mcl_core:stick", ""} - } + } }) minetest.register_tool("mcl_farming:hoe_netherite", { @@ -294,4 +296,4 @@ minetest.register_tool("mcl_farming:hoe_netherite", { _mcl_diggroups = { hoey = { speed = 8, level = 5, uses = uses.netherite } }, -}) +}) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index b57842d0f..adbac011b 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -1,43 +1,152 @@ +--[[ +By EliasFleckenstein03 and Code-Sploit +]] + +--[[ +Netherite item / node strings + +Nodes: + +Ancient Debris mcl_nether:ancient_debris +Netherite Ingot mcl_nether:netherite_ingot +Netherite Scrap mcl_nether:netherite_scrap +Netherite Block mcl_nether:netheriteblock + +Items: + +Netherite Sword mcl_tools:sword_netherite +Netherite Pickaxe mcl_tools:pick_netherite +Netherite Axe mcl_tools:axe_netherite +Netherite Shovel mcl_tools:shovel_netherite +Netherite Hoe mcl_farming:hoe_netherite + +Netherite Helmet mcl_armor:helmet_netherite +Netherite Chestplate mcl_armor:chestplate_netherite +Netherite Leggings mcl_armor:leggings_netherite +Netherite Boots mcl_armor:boots_netherite +]] + +local S = minetest.get_translator("mcl_smithing_table") +mcl_smithing_table = {} + +-- Function to upgrade diamond tool/armor to netherite tool/armor +function mcl_smithing_table.upgrade_item(itemstack) + itemstack = ItemStack(itemstack) -- Copy the stack + + local def = itemstack:get_definition() + + if not def or not def._mcl_upgradeable then + return + end + + local itemname = itemstack:get_name() + + local upgrade_item = def._mcl_upgrade_item or itemname:gsub("diamond", "netherite") + + if upgrade_item == itemname then + return + end + + itemstack:set_name(upgrade_item) + + -- Reload the ToolTips of the tool + + tt.reload_itemstack_description(itemstack) + + -- Only return itemstack if upgrade was successfull + return itemstack +end + +-- Badly copied over from mcl_anvils + local formspec = "size[9,9]" .. - "label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, "Inventory")) .. "]" .. + "label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Inventory"))) .. "]" .. "list[current_player;main;0,4.5;9,3;9]" .. mcl_formspec.get_itemslot_bg(0,4.5,9,3) .. "list[current_player;main;0,7.74;9,1;]" .. mcl_formspec.get_itemslot_bg(0,7.74,9,1) .. - "list[context;input;1,2.5;1,1;]" .. + "list[context;diamond_item;1,2.5;1,1;]" .. mcl_formspec.get_itemslot_bg(1,2.5,1,1) .. - "list[context;input;4,2.5;1,1;1]" .. + "list[context;netherite;4,2.5;1,1;]" .. mcl_formspec.get_itemslot_bg(4,2.5,1,1) .. - "list[context;output;8,2.5;1,1;]" .. + "list[context;upgraded_item;8,2.5;1,1;]" .. mcl_formspec.get_itemslot_bg(8,2.5,1,1) .. - "label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, "Upgrade Gear")) .. "]" .. - "button[7,0.7;2,1;name_button;" .. minetest.formspec_escape("Upgrade Gear") .. "]" .. + "label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Upgrade Gear"))) .. "]" .. "listring[context;output]".. "listring[current_player;main]".. "listring[context;input]".. "listring[current_player;main]" +local function reset_upgraded_item(pos) + local inv = minetest.get_meta(pos):get_inventory() + local upgraded_item -local function upgrade(itemstack) - itemstack:set_name(itemstack:get_name():gsub("diamond", "netherite")) + if inv:get_stack("netherite", 1):get_name() == "mcl_nether:netherite_ingot" then + upgraded_item = mcl_smithing_table.upgrade_item(inv:get_stack("diamond_item", 1)) + end + + inv:set_stack("upgraded_item", 1, upgraded_item) end minetest.register_node("mcl_smithing_table:table", { - description = "Smithing table", + description = S("Smithing table"), + -- ToDo: Add _doc_items_longdesc and _doc_items_usagehelp stack_max = 64, - groups = {pickaxey = 2, deco_block = true}, + groups = {pickaxey = 2, deco_block = 1}, tiles = { "mcl_smithing_table_top.png", "mcl_smithing_table_front.png", "mcl_smithing_table_side.png", - "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", - "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_bottom.png" + "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_side.png" }, + sounds = mcl_sounds.node_sound_metal_defaults(), + on_construct = function(pos) - minetest.get_meta(pos):set_string("formspec", formspec) - end, + local meta = minetest.get_meta(pos) + meta:set_string("formspec", formspec) + + local inv = meta:get_inventory() + + inv:set_size("diamond_item", 1) + inv:set_size("netherite", 1) + inv:set_size("upgraded_item", 1) + end, + + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + if listname == "diamond_item" and mcl_smithing_table.upgrade_item(stack) or listname == "netherite" and stack:get_name() == "mcl_nether:netherite_ingot" then + return stack:get_count() + end + + return 0 + end, + + allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + return 0 + end, + + on_metadata_inventory_put = reset_upgraded_item, + + on_metadata_inventory_take = function(pos, listname, index, stack, player) + local inv = minetest.get_meta(pos):get_inventory() + + local function take_item(listname) + local itemstack = inv:get_stack(listname, 1) + itemstack:take_item() + inv:set_stack(listname, 1, itemstack) + end + + if listname == "upgraded_item" then + take_item("diamond_item") + take_item("netherite") + + -- ToDo: make epic sound + minetest.sound_play("mcl_smithing_table_upgrade", {pos = pos, max_hear_distance = 16}) + end + + reset_upgraded_item(pos) + end, _mcl_blast_resistance = 2.5, _mcl_hardness = 2.5 -}) \ No newline at end of file +}) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index aadf90e0d..6d959cd10 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -175,6 +175,8 @@ minetest.register_tool("mcl_tools:pick_diamond", { _mcl_diggroups = { pickaxey = { speed = 8, level = 5, uses = 1562 } }, + _mcl_upgradable = true, + _mcl_upgrade_item = "mcl_tools:pick_netherite" }) minetest.register_tool("mcl_tools:pick_netherite", { @@ -372,6 +374,8 @@ minetest.register_tool("mcl_tools:shovel_diamond", { _mcl_diggroups = { shovely = { speed = 8, level = 5, uses = 1562 } }, + _mcl_upgradable = true, + _mcl_upgrade_item = "mcl_tools:shovel_netherite" }) minetest.register_tool("mcl_tools:shovel_netherite", { @@ -526,6 +530,8 @@ minetest.register_tool("mcl_tools:axe_diamond", { _mcl_diggroups = { axey = { speed = 8, level = 5, uses = 1562 } }, + _mcl_upgradable = true, + _mcl_upgrade_item = "mcl_tools:axe_netherite" }) minetest.register_tool("mcl_tools:axe_netherite", { @@ -650,6 +656,8 @@ minetest.register_tool("mcl_tools:sword_diamond", { swordy = { speed = 8, level = 5, uses = 1562 }, swordy_cobweb = { speed = 8, level = 5, uses = 1562 } }, + _mcl_upgradable = true, + _mcl_upgrade_item = "mcl_tools:sword_netherite" }) minetest.register_tool("mcl_tools:sword_netherite", { description = S("Netherite Sword"), From 808093235326715f5f1054883bd7deb2df4f3562 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Thu, 22 Apr 2021 12:07:30 +0000 Subject: [PATCH 12/35] Fix not able to put diamond tools in the smithing_table --- mods/ITEMS/mcl_smithing_table/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index adbac011b..02112ab14 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -35,7 +35,7 @@ function mcl_smithing_table.upgrade_item(itemstack) local def = itemstack:get_definition() - if not def or not def._mcl_upgradeable then + if not def or not def._mcl_upgradable then return end @@ -58,6 +58,7 @@ function mcl_smithing_table.upgrade_item(itemstack) end -- Badly copied over from mcl_anvils +-- ToDo: Make better formspec local formspec = "size[9,9]" .. "label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Inventory"))) .. "]" .. From af2a4b1de02057311071b17bb4b318931b53e6d8 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Thu, 22 Apr 2021 12:11:47 +0000 Subject: [PATCH 13/35] Add crafting recipe for smithing table --- mods/ITEMS/mcl_smithing_table/init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index 02112ab14..e8eb26128 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -151,3 +151,12 @@ minetest.register_node("mcl_smithing_table:table", { _mcl_blast_resistance = 2.5, _mcl_hardness = 2.5 }) + +minetest.register_craft({ + output = "mcl_smithing_table:table", + recipe = { + {"mcl_core:iron_ingot", "mcl_core:iron_ingot", ""}, + {"group:wood", "group:wood", ""}, + {"group:wood", "group:wood", ""} + } +}) From e8cedbc553b4fc83a1bb9225422e1336d86d376b Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Sun, 2 May 2021 08:11:11 +0000 Subject: [PATCH 14/35] Remove unnessacary comments in mcl_smithing_table/init.lua --- mods/ITEMS/mcl_smithing_table/init.lua | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index e8eb26128..820ba1f78 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -2,30 +2,6 @@ By EliasFleckenstein03 and Code-Sploit ]] ---[[ -Netherite item / node strings - -Nodes: - -Ancient Debris mcl_nether:ancient_debris -Netherite Ingot mcl_nether:netherite_ingot -Netherite Scrap mcl_nether:netherite_scrap -Netherite Block mcl_nether:netheriteblock - -Items: - -Netherite Sword mcl_tools:sword_netherite -Netherite Pickaxe mcl_tools:pick_netherite -Netherite Axe mcl_tools:axe_netherite -Netherite Shovel mcl_tools:shovel_netherite -Netherite Hoe mcl_farming:hoe_netherite - -Netherite Helmet mcl_armor:helmet_netherite -Netherite Chestplate mcl_armor:chestplate_netherite -Netherite Leggings mcl_armor:leggings_netherite -Netherite Boots mcl_armor:boots_netherite -]] - local S = minetest.get_translator("mcl_smithing_table") mcl_smithing_table = {} From 688d1e3f7e90cde64925e8958814aa2d6d38e91e Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Wed, 14 Apr 2021 13:12:44 +0000 Subject: [PATCH 15/35] Add correct durability for netherite sword --- mods/ITEMS/mcl_tools/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index 6d959cd10..a1292cb71 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -669,14 +669,14 @@ minetest.register_tool("mcl_tools:sword_netherite", { full_punch_interval = 0.625, max_drop_level=5, damage_groups = {fleshy=9}, - punch_attack_uses = 2032, + punch_attack_uses = 2031, }, sound = { breaks = "default_tool_breaks" }, _repair_material = "mcl_nether:netherite_ingot", _mcl_toollike_wield = true, _mcl_diggroups = { - swordy = { speed = 8, level = 5, uses = 1562 }, - swordy_cobweb = { speed = 8, level = 5, uses = 1562 } + swordy = { speed = 8, level = 5, uses = 2031 }, + swordy_cobweb = { speed = 8, level = 5, uses = 2031 } }, }) From bbf63cf66b887831042804bfb9a77cba71a987e8 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Thu, 15 Apr 2021 15:45:48 +0000 Subject: [PATCH 16/35] Add netheriteblock --- mods/ITEMS/mcl_nether/init.lua | 15 +++++++++++++++ .../textures/mcl_nether_netheriteblock.png | Bin 0 -> 425 bytes 2 files changed, 15 insertions(+) create mode 100644 mods/ITEMS/mcl_nether/textures/mcl_nether_netheriteblock.png diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index 14ac215b3..4891c3dd3 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -66,6 +66,21 @@ minetest.register_node("mcl_nether:ancient_debris", { _mcl_fortune_drop = mcl_core.fortune_drop_ore }) +minetest.register_node("mcl_nether:netheriteblock", { + description = S("Netherite Block"), + _doc_items_longdesc = S("Netherite block is very hard and can be made of 9 netherite ingots."), + stack_max = 64, + tiles = {"mcl_nether_netheriteblock.png"}, + is_ground_content = true, + groups = {pickaxey=4, building_block=1, material_stone=1, xp = 0}, + drop = 'mcl_nether:netheriteblock', + sounds = mcl_sounds.node_sound_stone_defaults(), + _mcl_blast_resistance = 1200, + _mcl_hardness = 50, + _mcl_silk_touch_drop = true, + _mcl_fortune_drop = mcl_core.fortune_drop_ore +}) + -- For eternal fire on top of netherrack and magma blocks -- (this code does not require a dependency on mcl_fire) local function eternal_after_destruct(pos, oldnode) diff --git a/mods/ITEMS/mcl_nether/textures/mcl_nether_netheriteblock.png b/mods/ITEMS/mcl_nether/textures/mcl_nether_netheriteblock.png new file mode 100644 index 0000000000000000000000000000000000000000..60957f01794f9ecc0ad1eb8ce72749060c7d435b GIT binary patch literal 425 zcmV;a0apHrP)Px$V@X6oR5*==lfi1^Fc5}62Mx8YxGcWxW$8oo-1mQgLg~4^ZDF%Z99c3Wa1V+U zIaykPk&yoRX67H$8Q1Cabmb1%K7!>8DqPa zaU6Mje`DCEM=?@@WL5$F}Jpii8behWht`@2$ zdeim=Qdbkt=VtNfxsn1fDFl*vN#*3QPG%^tan{{b8g!L zKv=>}rs+6s64ce0TG)3zeb-+qsvOTPW{5`JwjftM&wfT#({~1CNWF~np_B-4{P Date: Thu, 15 Apr 2021 16:07:19 +0000 Subject: [PATCH 17/35] Add correct speeds for netherite shovel, pickaxe and axe --- mods/ITEMS/mcl_tools/init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index a1292cb71..c2192c968 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -184,7 +184,7 @@ minetest.register_tool("mcl_tools:pick_netherite", { _doc_items_longdesc = pickaxe_longdesc, inventory_image = "default_tool_netheritepick.png", wield_scale = wield_scale, - groups = { tool=1, pickaxe=1, dig_speed_class=5, enchantability=10 }, + groups = { tool=1, pickaxe=1, dig_speed_class=6, enchantability=10 }, tool_capabilities = { -- 1/1.2 full_punch_interval = 0.83333333, @@ -196,7 +196,7 @@ minetest.register_tool("mcl_tools:pick_netherite", { _repair_material = "mcl_nether:netherite_ingot", _mcl_toollike_wield = true, _mcl_diggroups = { - pickaxey = { speed = 8, level = 5, uses = 2031 } + pickaxey = { speed = 9.5, level = 6, uses = 2031 } }, }) @@ -384,7 +384,7 @@ minetest.register_tool("mcl_tools:shovel_netherite", { _doc_items_usagehelp = shovel_use, inventory_image = "default_tool_netheriteshovel.png", wield_scale = wield_scale, - groups = { tool=1, shovel=1, dig_speed_class=5, enchantability=10 }, + groups = { tool=1, shovel=1, dig_speed_class=6, enchantability=10 }, tool_capabilities = { full_punch_interval = 1, max_drop_level=5, @@ -396,7 +396,7 @@ minetest.register_tool("mcl_tools:shovel_netherite", { _repair_material = "mcl_nether:netherite_ingot", _mcl_toollike_wield = true, _mcl_diggroups = { - shovely = { speed = 8, level = 5, uses = 2031 } + shovely = { speed = 9, level = 6, uses = 2031 } }, }) @@ -539,7 +539,7 @@ minetest.register_tool("mcl_tools:axe_netherite", { _doc_items_longdesc = axe_longdesc, inventory_image = "default_tool_netheriteaxe.png", wield_scale = wield_scale, - groups = { tool=1, axe=1, dig_speed_class=5, enchantability=10 }, + groups = { tool=1, axe=1, dig_speed_class=6, enchantability=10 }, tool_capabilities = { full_punch_interval = 1.0, max_drop_level=5, @@ -551,7 +551,7 @@ minetest.register_tool("mcl_tools:axe_netherite", { _repair_material = "mcl_nether:netherite_ingot", _mcl_toollike_wield = true, _mcl_diggroups = { - axey = { speed = 8, level = 5, uses = 2031 } + axey = { speed = 9, level = 6, uses = 2031 } }, }) From 1283967132d6d30981f50a7eacf996ec8b592ffe Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Fri, 16 Apr 2021 06:19:14 +0000 Subject: [PATCH 18/35] Add crafting recipe for netheriteblock & make netheriteblock convertable to ingots. --- mods/ITEMS/mcl_nether/init.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index 4891c3dd3..f0fc6ff4d 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -399,5 +399,23 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "mcl_nether:netheriteblock", + recipe = { + {'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot'}, + {'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot'}, + {'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot'} + } +}) + +minetest.register_craft({ + output = "mcl_nether:netherite_ingot 9", + recipe = { + {'mcl_nether:netheriteblock', '', ''}, + {'', '', ''}, + {'', '', ''} + } +}) + dofile(minetest.get_modpath(minetest.get_current_modname()).."/nether_wart.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/lava.lua") From 10ea6da4e86d07ac39395e5dc0b3283174e197f1 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Thu, 22 Apr 2021 13:59:53 +0000 Subject: [PATCH 19/35] Add all pixel-perfection textures for netherite --- .../mcl_armor_chestplate_netherite.png | Bin 494 -> 0 bytes .../mcl_armor/mcl_armor_helmet_netherite.png | Bin 472 -> 0 bytes .../textures/mcl_armor_boots_netherite.png | Bin 385 -> 400 bytes .../mcl_armor_chestplate_netherite.png | Bin 494 -> 574 bytes .../textures/mcl_armor_helmet_netherite.png | Bin 472 -> 535 bytes .../textures/mcl_armor_inv_boots_netherite.png | Bin 173 -> 6939 bytes .../mcl_armor_inv_chestplate_netherite.png | Bin 244 -> 7724 bytes .../mcl_armor_inv_helmet_netherite.png | Bin 162 -> 6443 bytes .../mcl_armor_inv_leggings_netherite.png | Bin 176 -> 6796 bytes .../textures/mcl_armor_leggings_netherite.png | Bin 458 -> 459 bytes .../textures/farming_tool_netheritehoe.png | Bin 167 -> 6478 bytes .../textures/default_tool_netheriteaxe.png | Bin 184 -> 7209 bytes .../textures/default_tool_netheritepick.png | Bin 188 -> 7242 bytes .../textures/default_tool_netheriteshovel.png | Bin 161 -> 6414 bytes .../textures/default_tool_netheritesword.png | Bin 210 -> 6985 bytes tools/Texture_Converter.py | 3 ++- 16 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 mods/ITEMS/mcl_armor/mcl_armor_chestplate_netherite.png delete mode 100644 mods/ITEMS/mcl_armor/mcl_armor_helmet_netherite.png diff --git a/mods/ITEMS/mcl_armor/mcl_armor_chestplate_netherite.png b/mods/ITEMS/mcl_armor/mcl_armor_chestplate_netherite.png deleted file mode 100644 index c2eb42facea0a0c9901dec4b7d65067e9b4930ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z#tvq6XMFi zzz`c2Yj0p(mR06yX&>m~ry{Rlq^|z||9`1_lWiFo7#K@}{DK)Ap4~_Tagw~JU|=ut^mS!_%EHI3XzE#g-kE`c;jpKRV~EA+w-YyVH5-Vy%FDi*bFAcA!dac4 zOwI3^FR7K}8ry_(UU|P>X^Tde{R7!^B|FUbFvwVLlAiXSW7j>w0{@7a4#EsxIZdLf z+jZ1;ZJ3!5%PGK?B`ddehv40}iw>r$yF9LZy0%gTe~ HDWM4fx09tT diff --git a/mods/ITEMS/mcl_armor/mcl_armor_helmet_netherite.png b/mods/ITEMS/mcl_armor/mcl_armor_helmet_netherite.png deleted file mode 100644 index f3b054735233d34317eca43a98d65323a27db20a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq{V~-O<;Pfnj4m_n$;o zkYut)kS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v-tY$DUh!@P+6==i2z#tdk6XMFi zz+j}VZf{^+mQ@z$;^%2;9~%~{BCo*3#r6OH|Mi*)5&GbXUQn;Iy8!)S7c9 z0nxdc7kEr6WIlK_Z9Vw+|Ho}pE8lNfGv({|)%*>GwJ*CK6)!GI71i^Uesb1N;tZ>~ zhO@$y7(ajE%$*NTwMl=KtFT%x{ISkZb8)@V>iz6C$#!f)%ndK|W7fEG2iPX&=)7T_ zI8p9pkjv%?3=9maC9V-ADTyViR>?)Fi6yBFMg~TPx&|h?h9)6~hE~SLR;I?<1_o9J k2Cw)lWl%Ka=BH$)RpQn#JLup71_lNOPgg&ebxsLQ00VrSumAu6 diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_netherite.png index 245512c28c194446c675d68b8c8da7e7471e1353..39f84afb14e09b06d3fc1fc1ce9ef10f0488a465 100644 GIT binary patch delta 313 zcmZo(|DpSCS~D;( zFqQ=Q1v5B2yO9RsBze2LaDKeG^bG?81AB?5uPggg7Cvr8Q_t%2&I}9;!JaOTAr_~T z6C_v{Gw^b72?Z!D@mR^!6vo4RK<742wGIIRHv$3#%5xYP7XRnUU3bx^nSp^pwZt`|BqgyV)hf9t zHL)a>!N|bKP}jgj*U%)y(9p`**viyc+rYrez~B{sr3{LO-29Zxv`VN3Wh^>o2OV6% Qz`(%Z>FVdQ&MBb@05iZ`JOBUy diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_netherite.png index c2eb42facea0a0c9901dec4b7d65067e9b4930ae..8e3a383667a1a4a85a3ce4e2a10c724ef4e99c91 100644 GIT binary patch delta 467 zcmaFIypLsq1SbbG0|UcU=e}(d747S70(?ST85kJS)D6T$L?k7|tFj|YwM|u(6f&Z` zYVV>PF(-;^S*h@TpUD=dVN!$hs#o6%l&XsPgxc0*M+B{J-dud* z?i3zgzNIFG(>!w*?b80%TW2w$f1y-T(8RO0SJjrWXU<&8uKe`D+#z;?v>#HSl z+8L+qWa+)aTCXszZ{3zq&z{ZS#rO69u=r3fApCy!PiBRKoXI`PU)mTL7*tDKBT7;d zOH!>S_cHQ}8X1Kc8e5r~TbY__8yHv_7;s!$Xfk;tql_YkOl7xZ2Ll5GgQu&X%Q~lo FCIEBzvJLJT2`5UHnw!6^zu? z|Ns9lb#JmQ0|NtNNswPKgTu2MX&_FLx4R2R+r6n(3=9nHC7!;n>`z(vxD`!3tIs<# zFfbhUba4!^IQ@3wMy_T95m$NHS96Y)TuV5s^OLFhJ@X~Cl3Zh(aLz05*DGzQ*XXi; zAbYN4hxr}`8Ou%5)82FJx+hrRA2HKGn87QjNmO;aj{2?*GZSJt1=zA=<+kn+y!&?1 z!BlmZ$CXdlmdh_vKi6_-!G?7PTSYakzN+myHd7#U-Pcs5^(@Lsr#qX%(~`Vv|66U} zk|A+=v6FVpq*7T2rfzeOxRZ@9p1jIjl%=#JM=dWVKSut=-kSoGtYoKOERB{IxH^A- z4dc}$?e96khhI;=z$hbXXcA&*Xk~0{WooQ#U|?ln@QS}uW-=p_j3S22?4W}S7#J8B NJYD@<);T3K0RY#wi$nkb diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_netherite.png index f3b054735233d34317eca43a98d65323a27db20a..c35f112470b4e53675b373be3c74bad526adc7b7 100644 GIT binary patch delta 415 zcmcb?Je_5N1SbbG0|UcU=e}(d747TI0(?ST85kJEL_{Pd#51D2sO-)Vz|Nrm(ce@`00|R48kY6x^!?PP{AWo9E zyNlqXt+u-u7#P?~Jbhi+pR$PYTAFY1GyTHAz;Myi#WBR=_}d^yzQYPU%_{ZY4VTvb zuYW7EqU@%M!0tzKi&h-zdfQ^qDbe{<@bR19`Anh4mrI#~yftU*3UfRQKDWo`z&?kt z$mt1|>A_KI9cK^Q`?&NR+9I&{dAvaf?+=Hb`Ty1>GX*vL;c1CIe7E_6t)y^(y@Hal zUYg5Y?k^ptH*bXSq^Mtr@?IG__rT=VDaQsHgY8x0>85nR}TWB(QHlvIphD>F*WCsHS1B0ilpUXO@geCyq CFq!}W delta 334 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 ACjbBd diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_chestplate_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_chestplate_netherite.png index f2f0ad5a953c213c783ba635e50ddbab19f87b8f..32fabb10f1734c511cbdb12d8c7ae000d91faed0 100644 GIT binary patch literal 7724 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 TyaKuIbGM&&kk>Ac$?5+BuU8}Z delta 217 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 X!`c}x-?n-iKV69eLj4c;ew6wThs=A% delta 134 zcmV;10D1qbGNJ*HBYyyCNklp1vs9R9E-ExS-&F zqBWOgmHm$mi-j8i5+`T~$N+SkVVYr>C<9=AhPeR7C&>ViLYNCcY?2H>HUx%=3P|KY oL^pt_K!h2BO%co>hEae400vrmFb;s=Z2$lO07*qoM6N<$g2jw94gdfE diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_leggings_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_leggings_netherite.png index af45363b3631abf9349a8c06d81f8e695803f45e..3ac1b844a3c6a2579fd45bd2cd2f92a2702d3fa5 100644 GIT binary patch literal 6796 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 DUJN>} diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_netherite.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_netherite.png index 3ddff72e3e8632345fbae461132e1f04ed3484f3..7411e0a705c17405fdcb8c1e3591a3a18f069426 100644 GIT binary patch delta 326 zcmX@be42SeLcLaiPlzi614FczO-7WLq=dMbh)7j-q`a(*s*-}PmWHyja&AIUeMLr9 zZsh;}|4X@+IWaIWFqQ=Q1v5B2yO9RsBze2L@P6Bp_?3ZyfxX1j*OmP#ix{t^`4&IZ zFANL}6FprVLo7}wCrGd^W?<#e6be}I#>JtrOE5KTMLnA)SEGR+>#<{cS}#-m^ejY| zES<@+eELkQ#~~Bqrpc_*5Xou_cC4&6I>BYbb*h&ow3%gUp_YL++i#)m`XS9Kjv|XE zEK*?c)D=1MFjhTXSd^pFcb@c%(9KU0I64pOt~%7_n0C_ZP@7kTD2FE32bqMH2`3&g zTt6(6U%Jy-mtk@&qqL}zQHY_jm8rRvsj0Ssft7&)$F+qflY1Fu6ftBfyCpjq7#J8l MUHx3vIVCg!02aDw>i_@% delta 326 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 delta 157 zcmV;O0Al~CIJg0jBYyyYNkl6%V}dDlR#&M00000 LNkvXXu0mjf>*7A# diff --git a/mods/ITEMS/mcl_tools/textures/default_tool_netheritepick.png b/mods/ITEMS/mcl_tools/textures/default_tool_netheritepick.png index 088283b0bf6ab4c414f001edadb471075b34ec0b..e4140dde7684add3bfa91bec6b4dbca49d19a00e 100644 GIT binary patch literal 7242 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 pj@y0eX6MT9I`uEy7`wO1uNTil@w3`Y(&Gd}IIs delta 161 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 COLR^E delta 133 zcmV;00DAw9GNA#GBYpsANklx($w%1%&>StT{F;7K{th z3y3!Wq#2|Eq|x8Tj&uV+KwnXbGR?)V&R|UxX$J90)|_BsM4FArnyoFZ>8u%~5rmx` noXNKtIl#yQAk7pRKn?%^??+lk=UVA300000NkvXXu0mjfyyiC+ diff --git a/mods/ITEMS/mcl_tools/textures/default_tool_netheritesword.png b/mods/ITEMS/mcl_tools/textures/default_tool_netheritesword.png index 4bc0809b12478fa4d29150871df6b303dec9cebe..589637a62e5cf0df635a53f1f8091d45ef568c3d 100644 GIT binary patch literal 6985 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 D+_WKt delta 183 zcmV;o07(DIHqrr*BYyyyNkl zbD)bKd744Cf;59@k~PPM#ey}1Xq=j{g(`>-(rBcv{@>rm4!_MXn_z~Jq#50>AR45J zB+bYMfH29Lu>~5*n)MZx{wJ6ifi=RsK(rws&Bd Date: Fri, 7 May 2021 22:50:35 +0000 Subject: [PATCH 20/35] Fix ancient debris duplication glitch (remove fortune drop) --- mods/ITEMS/mcl_nether/init.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index f0fc6ff4d..d1941336c 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -62,8 +62,7 @@ minetest.register_node("mcl_nether:ancient_debris", { sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 1200, _mcl_hardness = 30, - _mcl_silk_touch_drop = true, - _mcl_fortune_drop = mcl_core.fortune_drop_ore + _mcl_silk_touch_drop = true }) minetest.register_node("mcl_nether:netheriteblock", { From 7f340b7e2a4822e83e870355f66287fc7c5461b4 Mon Sep 17 00:00:00 2001 From: Code-Sploit Date: Thu, 22 Apr 2021 14:38:17 +0000 Subject: [PATCH 21/35] Add forgotten textures for netherite ingot, scrap and ancient debris --- .../mcl_nether_ancient_debris_side.png | Bin 8573 -> 6800 bytes .../mcl_nether_ancient_debris_top.png | Bin 7800 -> 6800 bytes .../textures/mcl_nether_netherite_ingot.png | Bin 222 -> 6360 bytes .../textures/mcl_nether_netherite_scrap.png | Bin 207 -> 6221 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_nether/textures/mcl_nether_ancient_debris_side.png b/mods/ITEMS/mcl_nether/textures/mcl_nether_ancient_debris_side.png index 230f2cce361c510162b332ee4c028b5f68d74ca2..9891604029e55a39fd4d26859b84aa09ccb4d769 100644 GIT binary patch literal 6800 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 literal 8573 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 dnDH%Mkln}CYgZ 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 delta 195 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 delta 180 zcmV;l089VPFwX&yBYyyvNkl zz%(HnfL9~BAu!jVYXq?|oQ@s_AdSeHU>cEKh1C$4W^5R5;4NW`1wsKxFaePi^0)#L iJuFDh17vF?2LJ$q2g+KsahnzZ0000 Date: Sun, 29 May 2022 21:06:48 -0600 Subject: [PATCH 22/35] Serious Dedication Advancement --- mods/HUD/mcl_achievements/init.lua | 7 +++++++ mods/ITEMS/mcl_smithing_table/init.lua | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index dfd3c0657..91764b3e5 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -215,6 +215,13 @@ awards.register_achievement("mcl:countryLode", { icon = "lodestone_side4.png", }) +-- Triggered in mcl_smithing_table +awards.register_achievement("mcl:seriousDedication", { + title = S("Serious Dedication"), + description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices"), + icon = "farming_tool_netheritehoe.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index 820ba1f78..b178c19fc 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -120,6 +120,11 @@ minetest.register_node("mcl_smithing_table:table", { -- ToDo: make epic sound minetest.sound_play("mcl_smithing_table_upgrade", {pos = pos, max_hear_distance = 16}) end + if listname == "upgraded_item" then + if stack:get_name() == "mcl_farming:hoe_netherite" then + awards.unlock(player:get_player_name(), "mcl:seriousDedication") + end + end reset_upgraded_item(pos) end, @@ -128,6 +133,7 @@ minetest.register_node("mcl_smithing_table:table", { _mcl_hardness = 2.5 }) + minetest.register_craft({ output = "mcl_smithing_table:table", recipe = { From c05e1b5f4580a74b541f1a2d9ad9aa8c158dd72a Mon Sep 17 00:00:00 2001 From: cora Date: Sun, 26 Jun 2022 22:13:39 +0200 Subject: [PATCH 23/35] make diamond armor upgradable to netherite --- mods/ITEMS/mcl_armor/api.lua | 2 ++ mods/ITEMS/mcl_armor/register.lua | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mods/ITEMS/mcl_armor/api.lua b/mods/ITEMS/mcl_armor/api.lua index 6ec1b377b..57e52ef44 100644 --- a/mods/ITEMS/mcl_armor/api.lua +++ b/mods/ITEMS/mcl_armor/api.lua @@ -133,6 +133,8 @@ function mcl_armor.register_set(def) _on_break = on_break_callbacks[name] or def.on_break, _mcl_armor_element = name, _mcl_armor_texture = textures[name] or modname .. "_" .. itemname .. ".png", + _mcl_upgradable = def._mcl_upgradable, + _mcl_upgrade_item = itemstring:gsub("_diamond","_netherite") }) if def.craft_material then diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua index 1d3414339..0023414f1 100644 --- a/mods/ITEMS/mcl_armor/register.lua +++ b/mods/ITEMS/mcl_armor/register.lua @@ -79,6 +79,8 @@ mcl_armor.register_set({ }, toughness = 2, craft_material = "mcl_core:diamond", + _mcl_upgradable = true, + _mcl_upgrade_item_add = "_netherite" }) mcl_armor.register_set({ From 909aa71dd339c9475dea24860cecd468f0030835 Mon Sep 17 00:00:00 2001 From: cora Date: Sun, 26 Jun 2022 22:18:38 +0200 Subject: [PATCH 24/35] keep _mcl_upgrade_item as nil for non diamond armor --- mods/ITEMS/mcl_armor/api.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_armor/api.lua b/mods/ITEMS/mcl_armor/api.lua index 57e52ef44..14ed5b666 100644 --- a/mods/ITEMS/mcl_armor/api.lua +++ b/mods/ITEMS/mcl_armor/api.lua @@ -114,6 +114,10 @@ function mcl_armor.register_set(def) for k, v in pairs(element_groups) do groups[k] = v end + local upgrade_item = nil + if itemstring:find("_diamond") then + upgrade_item = itemstring:gsub("_diamond","_netherite") + end minetest.register_tool(itemstring, { description = S(def.description .. " " .. (descriptions[name] or element.description)), @@ -134,7 +138,7 @@ function mcl_armor.register_set(def) _mcl_armor_element = name, _mcl_armor_texture = textures[name] or modname .. "_" .. itemname .. ".png", _mcl_upgradable = def._mcl_upgradable, - _mcl_upgrade_item = itemstring:gsub("_diamond","_netherite") + _mcl_upgrade_item = upgrade_item }) if def.craft_material then From 352a52e086406db243f1c6755bd269221122e206 Mon Sep 17 00:00:00 2001 From: cora Date: Sun, 26 Jun 2022 22:19:17 +0200 Subject: [PATCH 25/35] fix indentation --- mods/ITEMS/mcl_smithing_table/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index b178c19fc..81cf3a0c9 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -85,7 +85,7 @@ minetest.register_node("mcl_smithing_table:table", { local inv = meta:get_inventory() - inv:set_size("diamond_item", 1) + inv:set_size("diamond_item", 1) inv:set_size("netherite", 1) inv:set_size("upgraded_item", 1) end, From d86be83b2b20497a200926b53591acda08b3739b Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Sun, 26 Jun 2022 15:26:44 -0600 Subject: [PATCH 26/35] Fixed the lodestone crafting to use the netherite ingot. --- 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 4536064d1..9ec1ba074 100644 --- a/mods/ITEMS/mcl_compass/init.lua +++ b/mods/ITEMS/mcl_compass/init.lua @@ -285,7 +285,7 @@ minetest.register_craft({ output = "mcl_compass:lodestone", recipe = { {"mcl_core:stonebrickcarved","mcl_core:stonebrickcarved","mcl_core:stonebrickcarved"}, - {"mcl_core:stonebrickcarved", "mcl_core:diamondblock", "mcl_core:stonebrickcarved"}, + {"mcl_core:stonebrickcarved", "mcl_nether:netherite_ingot", "mcl_core:stonebrickcarved"}, {"mcl_core:stonebrickcarved", "mcl_core:stonebrickcarved", "mcl_core:stonebrickcarved"} } }) From 7136e5461512f047eac0a4f794663ff1e312e73c Mon Sep 17 00:00:00 2001 From: cora Date: Mon, 27 Jun 2022 12:40:21 +0200 Subject: [PATCH 27/35] make armor upgrade slightly more flexible --- mods/ITEMS/mcl_armor/api.lua | 4 ++-- mods/ITEMS/mcl_armor/register.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_armor/api.lua b/mods/ITEMS/mcl_armor/api.lua index 14ed5b666..8d08524c6 100644 --- a/mods/ITEMS/mcl_armor/api.lua +++ b/mods/ITEMS/mcl_armor/api.lua @@ -115,8 +115,8 @@ function mcl_armor.register_set(def) groups[k] = v end local upgrade_item = nil - if itemstring:find("_diamond") then - upgrade_item = itemstring:gsub("_diamond","_netherite") + if itemstring:find("_diamond") and def._mcl_upgrade_item_material then + upgrade_item = itemstring:gsub("_[%l%d]*$",def._mcl_upgrade_item_material) end minetest.register_tool(itemstring, { diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua index 0023414f1..425bf75f0 100644 --- a/mods/ITEMS/mcl_armor/register.lua +++ b/mods/ITEMS/mcl_armor/register.lua @@ -80,7 +80,7 @@ mcl_armor.register_set({ toughness = 2, craft_material = "mcl_core:diamond", _mcl_upgradable = true, - _mcl_upgrade_item_add = "_netherite" + _mcl_upgrade_item_material = "_netherite" }) mcl_armor.register_set({ From ed2fc6601e522abb31b53a21b1d9e1e479031827 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Mon, 27 Jun 2022 10:31:56 -0600 Subject: [PATCH 28/35] Added Smithing Table to Toolsmith Villager Jobsite --- mods/ENTITIES/mobs_mc/villager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 1c2cffb9b..429d7c743 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -458,7 +458,7 @@ local professions = { "mobs_mc_villager_toolsmith.png", "mobs_mc_villager_toolsmith.png", }, - jobsite = "mcl_anvils:anvil", --FIXME: smithing table + jobsite = "mcl_smithing_table:table", trades = { { { { "mcl_core:coal_lump", 15, 15 }, E1 }, From 1fc79ffb61495a35cf335d9f3d1816393db8b16b Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Mon, 27 Jun 2022 14:11:50 -0600 Subject: [PATCH 29/35] Added pixelperfection netheriteblock texture --- .../textures/mcl_nether_netheriteblock.png | Bin 425 -> 6951 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..302ead2a0872becf8c8ec9f7d61bd5cb0de68f79 100644 GIT binary patch literal 6951 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 XO0TArM_!~FzCZek1HHcUSeo)LsuU*W delta 400 zcmV;B0dM}NHmL)UBYyw^b5ch_0Itp)=>Px$V@X6oR5*==lfi1^Fc5}62Mx8YxGcWx zW$8oo-1mQgLg~4^ZDF%Z99c3Wa1V+UIaykPk&yoRX67H$8Q1Cabmb1%K7!>8DqPaaU6Mje`DCEM=?@@W`92;BABQE9L{^z?6R=E zOQo5ptYIzy5kZX5v^@Z-%5<8_`>qzMCVJEM1yWZN&*x_G=(&;tP*p?(zrq^kBF;Tu z!vF?rFMtfmnX)(=r%}8O{VEMZ4%Vgm|EC(J$=_-DykgMEoO*D z-L@cCJ<9SIzp#&b uGge4bn4C+1*O%vQ25VEV&V6|Y@Cjfj%!y0L-% Date: Tue, 28 Jun 2022 11:59:04 +0200 Subject: [PATCH 30/35] check for _upgradable instead of diamond --- mods/ITEMS/mcl_armor/api.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_armor/api.lua b/mods/ITEMS/mcl_armor/api.lua index 8d08524c6..1b9aa4f73 100644 --- a/mods/ITEMS/mcl_armor/api.lua +++ b/mods/ITEMS/mcl_armor/api.lua @@ -115,7 +115,7 @@ function mcl_armor.register_set(def) groups[k] = v end local upgrade_item = nil - if itemstring:find("_diamond") and def._mcl_upgrade_item_material then + if def._mcl_upgradable and def._mcl_upgrade_item_material then upgrade_item = itemstring:gsub("_[%l%d]*$",def._mcl_upgrade_item_material) end From 6543d819da6699b55008bfc750bebba2c48bfbbd Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Tue, 28 Jun 2022 09:47:55 -0600 Subject: [PATCH 31/35] Fixed some quote formating issues --- mods/ITEMS/mcl_nether/init.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index d1941336c..f4a241cee 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -58,7 +58,7 @@ minetest.register_node("mcl_nether:ancient_debris", { tiles = {"mcl_nether_ancient_debris_top.png", "mcl_nether_ancient_debris_side.png"}, is_ground_content = true, groups = {pickaxey=4, building_block=1, material_stone=1, xp=0}, - drop = 'mcl_nether:ancient_debris', + drop = "mcl_nether:ancient_debris", sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 1200, _mcl_hardness = 30, @@ -72,7 +72,7 @@ minetest.register_node("mcl_nether:netheriteblock", { tiles = {"mcl_nether_netheriteblock.png"}, is_ground_content = true, groups = {pickaxey=4, building_block=1, material_stone=1, xp = 0}, - drop = 'mcl_nether:netheriteblock', + drop = "mcl_nether:netheriteblock", sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 1200, _mcl_hardness = 50, @@ -319,7 +319,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'mcl_nether:quartz_block', + output = "mcl_nether:quartz_block", recipe = { {"mcl_nether:quartz", "mcl_nether:quartz"}, {"mcl_nether:quartz", "mcl_nether:quartz"}, @@ -392,27 +392,27 @@ minetest.register_craft({ minetest.register_craft({ output = "mcl_nether:netherite_ingot", recipe = { - {'mcl_nether:netherite_scrap', 'mcl_nether:netherite_scrap', 'mcl_nether:netherite_scrap'}, - {'mcl_nether:netherite_scrap', 'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, - {'mcl_core:gold_ingot', 'mcl_core:gold_ingot', ''}, + {"mcl_nether:netherite_scrap", "mcl_nether:netherite_scrap", "mcl_nether:netherite_scrap"}, + {"mcl_nether:netherite_scrap", "mcl_core:gold_ingot", "mcl_core:gold_ingot"}, + {"mcl_core:gold_ingot", "mcl_core:gold_ingot", ""}, } }) minetest.register_craft({ output = "mcl_nether:netheriteblock", recipe = { - {'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot'}, - {'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot'}, - {'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot', 'mcl_nether:netherite_ingot'} + {"mcl_nether:netherite_ingot", "mcl_nether:netherite_ingot", "mcl_nether:netherite_ingot"}, + {"mcl_nether:netherite_ingot", "mcl_nether:netherite_ingot", "mcl_nether:netherite_ingot"}, + {"mcl_nether:netherite_ingot", "mcl_nether:netherite_ingot", "mcl_nether:netherite_ingot"} } }) minetest.register_craft({ output = "mcl_nether:netherite_ingot 9", recipe = { - {'mcl_nether:netheriteblock', '', ''}, - {'', '', ''}, - {'', '', ''} + {"mcl_nether:netheriteblock", "", ""}, + {"", "", ""}, + {"", "", ""} } }) From 074f1df354be589eb0834343ef6b51eced98045c Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Wed, 29 Jun 2022 09:12:14 -0600 Subject: [PATCH 32/35] Added Formspec Image to Smithing Table and Fixed some whitespace issues. --- mods/ITEMS/mcl_smithing_table/init.lua | 47 +++++++++++++------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index 81cf3a0c9..b7200d17d 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -37,22 +37,23 @@ end -- ToDo: Make better formspec local formspec = "size[9,9]" .. - "label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Inventory"))) .. "]" .. - "list[current_player;main;0,4.5;9,3;9]" .. - mcl_formspec.get_itemslot_bg(0,4.5,9,3) .. - "list[current_player;main;0,7.74;9,1;]" .. - mcl_formspec.get_itemslot_bg(0,7.74,9,1) .. - "list[context;diamond_item;1,2.5;1,1;]" .. - mcl_formspec.get_itemslot_bg(1,2.5,1,1) .. - "list[context;netherite;4,2.5;1,1;]" .. - mcl_formspec.get_itemslot_bg(4,2.5,1,1) .. - "list[context;upgraded_item;8,2.5;1,1;]" .. - mcl_formspec.get_itemslot_bg(8,2.5,1,1) .. - "label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Upgrade Gear"))) .. "]" .. - "listring[context;output]".. - "listring[current_player;main]".. - "listring[context;input]".. - "listring[current_player;main]" + "background[-0.19,-0.25;9.41,9.49;mcl_smithing_table_inventory.png]".. + "label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Inventory"))) .. "]" .. + "list[current_player;main;0,4.5;9,3;9]" .. + mcl_formspec.get_itemslot_bg(0,4.5,9,3) .. + "list[current_player;main;0,7.74;9,1;]" .. + mcl_formspec.get_itemslot_bg(0,7.74,9,1) .. + "list[context;diamond_item;1,2.5;1,1;]" .. + mcl_formspec.get_itemslot_bg(1,2.5,1,1) .. + "list[context;netherite;4,2.5;1,1;]" .. + mcl_formspec.get_itemslot_bg(4,2.5,1,1) .. + "list[context;upgraded_item;8,2.5;1,1;]" .. + mcl_formspec.get_itemslot_bg(8,2.5,1,1) .. + "label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Upgrade Gear"))) .. "]" .. + "listring[context;output]".. + "listring[current_player;main]".. + "listring[context;input]".. + "listring[current_player;main]" local function reset_upgraded_item(pos) local inv = minetest.get_meta(pos):get_inventory() @@ -80,15 +81,15 @@ minetest.register_node("mcl_smithing_table:table", { sounds = mcl_sounds.node_sound_metal_defaults(), on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", formspec) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", formspec) - local inv = meta:get_inventory() + local inv = meta:get_inventory() - inv:set_size("diamond_item", 1) - inv:set_size("netherite", 1) - inv:set_size("upgraded_item", 1) - end, + inv:set_size("diamond_item", 1) + inv:set_size("netherite", 1) + inv:set_size("upgraded_item", 1) + end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) if listname == "diamond_item" and mcl_smithing_table.upgrade_item(stack) or listname == "netherite" and stack:get_name() == "mcl_nether:netherite_ingot" then From 145d1839983898e94c47c966fb17a55e5bf6a8a4 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Wed, 29 Jun 2022 09:23:47 -0600 Subject: [PATCH 33/35] Added Armor (Un)Eqip Sound Definitions --- mods/ITEMS/mcl_armor/register.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua index 425bf75f0..0f8ef6315 100644 --- a/mods/ITEMS/mcl_armor/register.lua +++ b/mods/ITEMS/mcl_armor/register.lua @@ -49,6 +49,8 @@ mcl_armor.register_set({ }, repair_material = "mcl_core:iron_ingot", cook_material = "mcl_core:iron_nugget", + sound_equip = "mcl_armor_equip_iron", + sound_unequip = "mcl_armor_unequip_iron", }) mcl_armor.register_set({ @@ -64,6 +66,8 @@ mcl_armor.register_set({ }, craft_material = "mcl_core:iron_ingot", cook_material = "mcl_core:iron_nugget", + sound_equip = "mcl_armor_equip_iron", + sound_unequip = "mcl_armor_unequip_iron", }) mcl_armor.register_set({ @@ -79,8 +83,10 @@ mcl_armor.register_set({ }, toughness = 2, craft_material = "mcl_core:diamond", + sound_equip = "mcl_armor_equip_diamond", + sound_unequip = "mcl_armor_unequip_diamond", _mcl_upgradable = true, - _mcl_upgrade_item_material = "_netherite" + _mcl_upgrade_item_material = "_netherite", }) mcl_armor.register_set({ @@ -96,6 +102,8 @@ mcl_armor.register_set({ }, toughness = 2, craft_material = "mcl_nether:netherite_ingot", + sound_equip = "mcl_armor_equip_diamond", + sound_unequip = "mcl_armor_unequip_diamond", }) mcl_armor.register_protection_enchantment({ From c9dadc0bc791ecb5e2e436e00f4a0c9fe445ff48 Mon Sep 17 00:00:00 2001 From: cora Date: Wed, 29 Jun 2022 20:18:59 +0200 Subject: [PATCH 34/35] correct tile order in smithing table item def --- mods/ITEMS/mcl_smithing_table/init.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index b7200d17d..f32cb8c28 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -74,8 +74,12 @@ minetest.register_node("mcl_smithing_table:table", { groups = {pickaxey = 2, deco_block = 1}, tiles = { - "mcl_smithing_table_top.png", "mcl_smithing_table_front.png", "mcl_smithing_table_side.png", - "mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_side.png" + "mcl_smithing_table_top.png", + "mcl_smithing_table_bottom.png", + "mcl_smithing_table_side.png", + "mcl_smithing_table_side.png", + "mcl_smithing_table_side.png", + "mcl_smithing_table_front.png", }, sounds = mcl_sounds.node_sound_metal_defaults(), From be8692daab999a9d2a4581a1cca06560fa7558f7 Mon Sep 17 00:00:00 2001 From: cora Date: Wed, 29 Jun 2022 21:36:24 +0200 Subject: [PATCH 35/35] Add smithing table textures by @RandomLegoBrick --- .../textures/mcl_smithing_table_front.png | Bin 312 -> 541 bytes .../textures/mcl_smithing_table_side.png | Bin 315 -> 511 bytes .../textures/mcl_smithing_table_top.png | Bin 260 -> 505 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_front.png b/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_front.png index 55875ef5459ab6e0bc4ac530c51d8b97e044ff7b..15c0a943f0eb671aa9fc5ff7d7c9199fd0463460 100644 GIT binary patch delta 527 zcmV+q0`UE~0-Xeq8Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)00059Nkl-RrYy@)YnrxI)dWix zOra|oRa3Aj^(STmXCMQZZQGa*^-7to)hje=43FODYe#9f+nAGEf(=p|C84Rx|1~MJ zG!8K*j^iSkA%7-_+_$*z`<~~4!!hc~-UccJi60@GO!0>pQ&Sy99(NQ_Lj(nx z@M^V+3|2{=#LzUgYttL`a{ThSZs@z)%Ukm^$bfzr^;$iKw_=S(1FjJI=)f)Rk)(1- zFW3mqF7ARLC?*{5J89A%uCUw7SQe)Vt=4yh&fS9-MSoH8N`$B9cOtjf_sf;af-^@y z@!XGZAH4--WIsOK0r9&XR0Qz8f?Og=C7l!L zb~5?{3QI!;(Cq|Qmp7JSz!D7v{#e3?)TjxvG{ovs4cFu1x>fY?O3h~T7jahBPMGrz Rp#T5?00>D%PDHLkV1hxW?SudT delta 296 zcmV+@0oVSW1h@i_8Gi-<001BJ|6u?C0RKruK~y-)g_6w5PiIA5%jkM$sDUtTM*AVM+d zbO*-ed*~ARL4|p-68(7{LeXeO4@5v7|8^ck%3j-W8g^>obAKe3T7dXOhLsoOViem9 zAouAg9?$o98TXTg1H{C!aC{SBP`qH?DpG>Cx$pUh0EB0vj(wb$_H?!5+asiVvWRRsS1y?WP|+7MBZz^_Hh ucfy7!0pD{Db|C}!n6;qY&U^j`)x7|54TEzt+|#uH0000D5EF}R@kIkt(N3tbY171OOk}oSP4zj!Z5_KRf1#~hA4_~tE#$d zs+{>vgKKg~tHD`WS$T}(3~YdPIvrGpyH#QBtvZ!jV=$V0%w@-MP$zB)ZID|pa#fN4 zMv1F|H$xrI^MB%IfX)jf!1ev>ngB5PzK^?!bo~sNPWQJ-L*&m8X@xvok=8^8io^%9 zBF@6ax(Wjb1Vokuuwgu`+wDT((&r}@eE^lBmZ}_AH$B_7CDSx9rOV^Jz>l(+EtVk* zy}+lKe!Ix@`XkqM)AuLdhU1CtKK93F2Q6&xp5Bjk8fo=1haOGs#3G3F7d<@p;f82! z8d&il2-;?vh+ATenI*YVt>BH2YHpNodxMwZC&pS-(-yvF^XZbIrGLg+)e9GgZ3IM` m%JF-EMwtyX8!km^5`-TppUfH??}F0+0000uGX2v7%kXy%I}rA zzy!sh*B@!l*up~?2NwEbZnW!lgrwDu7Kji(@Arbhg?!L$1b;=v0+Q>vr+go|jJ^nP z4{EdrNXm2)pRaek6s3Z$-=;%Z11MyS(?tM{lIC?1EwUr#>!=7o9r0|w5%^Trn(qPD z#exd_)j!2nW9!=j0r^N2uwKzb#@;(o0bE0_WBftDd-mW^6+mMB@fkh#DYc1EVGjsS xum%1PP(YeU0VH~}y|7^3uBinC{0B{7-4DS{eZcYrLg4@a002ovPDHLkV1nc@iAn$f diff --git a/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_top.png b/mods/ITEMS/mcl_smithing_table/textures/mcl_smithing_table_top.png index 7099674fab65c127fec680e26f4dc6595d4837c3..2ec0468c782a7852d94a79ddcd2a27d8d4c046a6 100644 GIT binary patch delta 490 zcmV7E~JHNs&AX*Co7Yze7v7My{y$JiUxxL$z0bx zy8d7o#!)Fsk|c0l*BU?1(s8rwc^*Tl1g1zp86XG(-?b1DV8RTtEW>A-rfu5@(O3}} z#zRZjb**Wd+kfduQVQ}s-)^^90mC?sSp^&q)@VY1N|rH+27RN11#L;R0v0!>ZoVDL zK>_m=EV>P_j5ezj(3^TN@B2Q2LTF4Ia0-@z2x&A~(lqU6+CnsGwlF41CZJb+Ff2#a z!!YDmR1G&z19rQe9FY#vWoB@ryMXE|&D)Yb)8i}Z^J4)C6D|8Ec?qkF#e%Cq{eK## z;BsJkrB5akUe)_1u?= gr;tnF#jJ)Bpeg delta 243 zcmVlRp@AKMYm*=#6q}zQCd2W8aS9wf1R&w%qc~ok}JPv>Z=iwS6 zWVb)8V$6`JfXP`()@~WD++vyn$I}pt+*j-J39XJmfEKE?2yEmyD)1ecs&WZv!MXrL zT8VD6-G%4t?M$gc+FIzquSDLBE7<^O+rN8=Bk+OHo?bF5h&$*Vp=V(Q;8XUqZS9yX t3>#H${wRXv|G`Z*0Df8a>9@h0lfK7$x>k*O8_NIy002ovPDHLkV1jtYa*qH2