From fb51ab05ea2ccc2073e6e4225f9c6095e7f54ff8 Mon Sep 17 00:00:00 2001 From: MysticTempest Date: Thu, 17 Dec 2020 09:22:34 -0600 Subject: [PATCH 1/8] Enable basic mob despawning. --- mods/ENTITIES/mcl_mobs/api.lua | 70 ++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index a6f0fd095..3d8e2b528 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -67,7 +67,7 @@ local disable_blood = minetest.settings:get_bool("mobs_disable_blood") local mobs_drop_items = minetest.settings:get_bool("mobs_drop_items") ~= false local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= false -local remove_far = false +local remove_far = true local difficulty = tonumber(minetest.settings:get("mob_difficulty")) or 1.0 local show_health = false local max_per_block = tonumber(minetest.settings:get("max_objects_per_block") or 64) @@ -3113,6 +3113,7 @@ end -- get entity staticdata local mob_staticdata = function(self) +--[[ -- remove mob when out of range unless tamed if remove_far and self.can_despawn @@ -3125,7 +3126,7 @@ local mob_staticdata = function(self) return ""-- nil end - +--]] self.remove_ok = true self.attack = nil self.following = nil @@ -3334,37 +3335,6 @@ local mob_step = function(self, dtime) update_tag(self) end - -- Despawning: when lifetimer expires, remove mob - if remove_far - and self.can_despawn == true - and ((not self.nametag) or (self.nametag == "")) then - - -- TODO: Finish up implementation of despawning rules - - self.lifetimer = self.lifetimer - dtime - - if self.lifetimer <= 0 then - - -- only despawn away from player - local objs = minetest.get_objects_inside_radius(pos, 32) - - for n = 1, #objs do - - if objs[n]:is_player() then - - self.lifetimer = 20 - - return - end - end - - minetest.log("action", "Mob "..name.." despawns in mob_step at "..minetest.pos_to_string(pos)) - self.object:remove() - - return - end - end - if self.state == "die" then return end @@ -3548,6 +3518,40 @@ local mob_step = function(self, dtime) set_animation(self, "stand") end + -- Despawning: when lifetimer expires, remove mob + if remove_far + and self.can_despawn == true + and ((not self.nametag) or (self.nametag == "")) then + + self.lifetimer = self.lifetimer - dtime + if self.lifetimer <= 10 then + + -- only despawn away from player + local far_objs = minetest.get_objects_inside_radius(pos, 48) + for n = 1, #far_objs do + + if far_objs[n]:is_player() then + + local close_objs = minetest.get_objects_inside_radius(pos, 16) + for n = 1, #close_objs do + if close_objs[n]:is_player() then + self.lifetimer = 20 + else + if math.random(1,10) <= 3 then + minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos)) + self.object:remove() + return + end + end + end + else + minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos)) + self.object:remove() + return + end + end + end + end end From cb3fa6cd0912cd74f7b4f4cd138ad5ccca312285 Mon Sep 17 00:00:00 2001 From: MysticTempest Date: Thu, 17 Dec 2020 16:07:20 -0600 Subject: [PATCH 2/8] Fix magma cubes and zombies not taking damage from hands; and adjust magma cube armors to their proper values. --- mods/ENTITIES/mcl_mobs/api.lua | 6 +++--- mods/ENTITIES/mobs_mc/slime+magma_cube.lua | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index 3d8e2b528..596843ac6 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -2964,8 +2964,8 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir) local die = false - -- only play hit sound and show blood effects if damage is 1 or over - if damage >= 1 then + -- only play hit sound and show blood effects if damage is 1 or over; lower to 0.1 to ensure armor works appropriately. + if damage >= 0.1 then -- weapon sounds if weapon:get_definition().sounds ~= nil then @@ -2986,7 +2986,7 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir) damage_effect(self, damage) -- do damage - self.health = self.health - floor(damage) + self.health = self.health - damage -- skip future functions if dead, except alerting others if check_for_death(self, "hit", {type = "punch", puncher = hitter}) then diff --git a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua index ddf925bbb..743733930 100644 --- a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua +++ b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua @@ -185,7 +185,7 @@ local magma_cube_big = { run_velocity = 4, damage = 6, reach = 3, - armor = 40, + armor = 53, drops = { {name = mobs_mc.items.magma_cream, chance = 4, @@ -240,7 +240,7 @@ magma_cube_small.run_velocity = 2.6 magma_cube_small.jump_height = 6 magma_cube_small.damage = 4 magma_cube_small.reach = 2.75 -magma_cube_small.armor = 70 +magma_cube_small.armor = 66 magma_cube_small.spawn_small_alternative = "mobs_mc:magma_cube_tiny" magma_cube_small.on_die = spawn_children_on_die("mobs_mc:magma_cube_tiny", 4, 0.6, 1.0) mobs:register_mob("mobs_mc:magma_cube_small", magma_cube_small) @@ -260,7 +260,7 @@ magma_cube_tiny.run_velocity = 1.02 magma_cube_tiny.jump_height = 4 magma_cube_tiny.damage = 3 magma_cube_tiny.reach = 2.5 -magma_cube_tiny.armor = 85 +magma_cube_tiny.armor = 50 magma_cube_tiny.drops = {} magma_cube_tiny.spawn_small_alternative = nil magma_cube_tiny.on_die = nil From 1f124476f2338ab6f63b61fc228da2705d31a37c Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 19 Dec 2020 11:45:41 +0100 Subject: [PATCH 3/8] Remove NC enchanting sound --- .../sounds/mcl_enchanting_enchant.ogg | Bin 14918 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ITEMS/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg diff --git a/mods/ITEMS/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg b/mods/ITEMS/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg deleted file mode 100644 index 882e9ee23f2018985157f2948615fc3a58bc9d1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14918 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 IA&m(}cR;q*iA zI&st3T%S$VM_)L_8XO4YlnAcoe%IPvAmAYFf_{`Q4AFUilY%Ez8bMZMtP*HtfwPUk z&yvKu9IzF$Ac7Ry9pruOQ#{GbP?m2XPn3O3h#o>rbX=YXwbYdO)so9Afl;~CR5F5Q zC>*upI(n5EP`>$bmY;C}iXC-m>ZB>-p-0ITZvmN~4S}2b6r^+T`SPcu{>B`_ABEWV zyb{7G4>FsBjMT(q7vf_4#-`SZp5oh2fVIrTNIe)G3?rbvjW44o%)q^H44PiFT+JFm ziks?77Yt5Iuk&^h(`RvGr<1@yqdH3dRj;}zt+ld0Y_DvqYz33sCZAEwfhTPP&#hr&ahb)b9Ty^mM4y8 z8eiO-dLvFu)6Mv~Owof3y&*cnVOPELkR1pr^GKLTu@0e=5-b`EB*6S+9d#ihSzc@uYgEfG?mpJJG0*Z9_j$#e*oq)o!|ff From e22b766ffa6afe1edfa9ae567549b4582e1d9c7a Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 19 Dec 2020 15:32:32 +0100 Subject: [PATCH 4/8] Remove enchanted compass (caused a crash) --- mods/ITEMS/mcl_compass/depends.txt | 1 - mods/ITEMS/mcl_compass/init.lua | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/mods/ITEMS/mcl_compass/depends.txt b/mods/ITEMS/mcl_compass/depends.txt index 0389d3050..53261d53c 100644 --- a/mods/ITEMS/mcl_compass/depends.txt +++ b/mods/ITEMS/mcl_compass/depends.txt @@ -2,4 +2,3 @@ mcl_core mcl_worlds mesecons doc? -mcl_enchanting diff --git a/mods/ITEMS/mcl_compass/init.lua b/mods/ITEMS/mcl_compass/init.lua index 66553dfc0..b0cf5627e 100644 --- a/mods/ITEMS/mcl_compass/init.lua +++ b/mods/ITEMS/mcl_compass/init.lua @@ -57,9 +57,6 @@ minetest.register_globalstep(function(dtime) if minetest.get_item_group(stack:get_name(), "compass") ~= 0 and minetest.get_item_group(stack:get_name(), "compass")-1 ~= compass_image then local itemname = "mcl_compass:"..compass_image - if mcl_enchanting.is_enchanted(stack:get_name()) then - itemname = itemname .. "_enchanted" - end stack:set_name(itemname) player:get_inventory():set_stack("main", j, stack) end @@ -98,7 +95,7 @@ for i,img in ipairs(images) do inventory_image = img, wield_image = img, stack_max = 64, - groups = {not_in_creative_inventory=inv, compass=i, tool=1, disable_repair=1, enchantability=1 } + groups = {not_in_creative_inventory=inv, compass=i, tool=1, disable_repair=1 } }) -- Help aliases. Makes sure the lookup tool works correctly From 821af9367590502a18e5ab187afb8a5a0c1b2038 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 19 Dec 2020 16:07:34 +0100 Subject: [PATCH 5/8] Translate mcl_experience,mcl_enchanting to de --- .../locale/mcl_experience.de.tr | 7 ++ .../locale/mcl_experience.ru.tr | 1 + .../locale/mlc_experience.fr.tr | 1 + mods/HUD/mcl_experience/locale/template.txt | 2 +- .../locale/mcl_enchanting.de.tr | 100 ++++++++++++++++++ mods/ITEMS/mcl_enchanting/locale/template.txt | 100 ++++++++++++++++++ 6 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 mods/HUD/mcl_experience/locale/mcl_experience.de.tr create mode 100644 mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.de.tr create mode 100644 mods/ITEMS/mcl_enchanting/locale/template.txt diff --git a/mods/HUD/mcl_experience/locale/mcl_experience.de.tr b/mods/HUD/mcl_experience/locale/mcl_experience.de.tr new file mode 100644 index 000000000..351cf1911 --- /dev/null +++ b/mods/HUD/mcl_experience/locale/mcl_experience.de.tr @@ -0,0 +1,7 @@ +# textdomain: mcl_experience +[[] ]=[[] ] +Gives a player some XP=Gibt einen Spieler ein paar EP +Error: Too many parameters!=Fehler: Zu viele Parameter! +Error: Incorrect value of XP=Fehler: Ungültiger EP-Wert +Error: Player not found=Fehler: Spieler nicht gefunden +Added @1 XP to @2, total: @3, experience level: @4=@1 EP an @2 gegeben, gesamt: @3, Erfahrungsstufe: @4 diff --git a/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr b/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr index 42cc9ec43..a87840aff 100644 --- a/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr +++ b/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr @@ -1,3 +1,4 @@ +# textdomain: mcl_experience [[] ]=[[<игрок>] ] Gives a player some XP=Даёт игроку XP Error: Too many parameters!=Ошибка: слишком много параметров! diff --git a/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr b/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr index a186b549b..0644e2596 100644 --- a/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr +++ b/mods/HUD/mcl_experience/locale/mlc_experience.fr.tr @@ -1,3 +1,4 @@ +# textdomain: mcl_experience [[] ]=[[] ] Gives a player some XP=Donne de l'XP à un joueur Error: Too many parameters!=Erreur: Trop de paramètres! diff --git a/mods/HUD/mcl_experience/locale/template.txt b/mods/HUD/mcl_experience/locale/template.txt index 8494504e9..a355cbbac 100644 --- a/mods/HUD/mcl_experience/locale/template.txt +++ b/mods/HUD/mcl_experience/locale/template.txt @@ -1,7 +1,7 @@ +# textdomain: mcl_experience [[] ]= Gives a player some XP= Error: Too many parameters!= Error: Incorrect value of XP= Error: Player not found= Added @1 XP to @2, total: @3, experience level: @4= -XP are disabled!= diff --git a/mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.de.tr b/mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.de.tr new file mode 100644 index 000000000..58933cb86 --- /dev/null +++ b/mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.de.tr @@ -0,0 +1,100 @@ +# textdomain: mcl_enchanting +Aqua Affinity=Aquaaffinität +Increases underwater mining speed.=Erhöht Unterwassergrabegeschwindigkeit. +Bane of Arthropods=Schrecken der Gliederfüßler +Increases damage and applies Slowness IV to arthropod mobs (spiders, cave spiders, silverfish and endermites).=Erhöht Schaden und gibt Langsamkeit IV an Gliederfüßlern (Spinnen, Höhlenspinenn, Silberfischchen und Endermilben). +Blast Protection=Explosionsschutz +Reduces explosion damage and knockback.=Reduziert Explosionsschaden und -rückschlag. +Channeling=Kanalisierung +Channels a bolt of lightning toward a target. Works only during thunderstorms and if target is unobstructed with opaque blocks.=Kanalisiert einen Blitz zu einem Ziel. Funktioniert nur während Gewitterstürmen und solange kein undurchsichtiger Block im Weg ist. +Curse of Binding=Fluch der Bindung +Item cannot be removed from armor slots except due to death, breaking or in Creative Mode.=Gegenstand kann nicht von den Rüstungsplätzen entfernt werden, außer beim Tod, Zerbrechen oder im Kreativmodus. +Curse of Vanishing=Fluch des Verschwindens +Item destroyed on death.=Gegenstand wird bei Tod zerstört. +Depth Strider=Tiefenstreicher +Increases underwater movement speed.=Erhöht Bewegungsgeschwindigkeit im Wasser. +Efficiency=Effizienz +Increases mining speed.=Erhöht Grabegeschwindigkeit. +Feather Falling=Federfall +Reduces fall damage.=Reduziert Fallschaden. +Fire Aspect=Feieraspekt +Sets target on fire.=Zündes das Ziel an. +Fire Protection=Feuerschutz +Reduces fire damage.=Reduziert Feuerschaden +Flame=Flamme +Arrows set target on fire.=Pfeile zünden Ziel an. +Fortune=Glück +Increases certain block drops.=Erhöht bestimmte Blockabwürfe. +Frost Walker=Frostläufer +Turns water beneath the player into frosted ice and prevents the damage from magma blocks.=Verwandelt Wasser unter dem Spieler zu brüchigem Eis und verhindert Schaden von Magmablöcken. +Impaling=Aufspießen +Trident deals additional damage to ocean mobs.=Dreizack richtet Zusatzschaden an Ozeanmobs an. +Infinity=Unendlichkeit +Shooting consumes no regular arrows.=Schüsse verbrauchen keine regulären Pfeile. +Knockback=Rückschlag. +Increases knockback.=Verstärkt Rückschlag. +Looting=Plünderer +Increases mob loot.=Erhöht Abwürfe von Mobs. +Loyalty=Loyalität +Trident returns after being thrown. Higher levels reduce return time.=Dreizack kehrt nach Wurf zurück. Höhere Stufen reduzieren die Rückkehrzeit. +Luck of the Sea=Glück des Meeres +Increases rate of good loot (enchanting books, etc.)=Erhöht die Rate von guten Abwürfen (verzauberte Bücher, usw.) +Lure=Köder +Decreases time until rod catches something.=Reduziert die Zeit, bis die Angel etwas fängt. +Mending=Ausbessern +Repair the item while gaining XP orbs.=Gegenstand reparieren, während man Erfahrungskugeln erhält. +Multishot=Mehrschuss +Shoot 3 arrows at the cost of one.=3 Pfeile zum Preis von 1 schießen. +Piercing=Durchbohren +Arrows passes through multiple objects.=Pfeile durchdringen mehrere Objekte. +Power=Stärke +Increases arrow damage.=Erhöht Pfeilschaden. +Projectile Protection=Projektilprojektion +Reduces projectile damage.=Reduziert Projektilschaden. +Protection=Schutz +Reduces most types of damage by 4% for each level.=Reduziert die meisten Schadensarten um 4% je Stufe. +Punch=Schlag +Increases arrow knockback.=Erhöht Pfeilrückschlag. +Quick Charge=Schnellladen +Decreases crossbow charging time.=Reduziert Armbrustladezeit. +Respiration=Atmung +Extends underwater breathing time.=Erhöht Unterwasseratemzeit. +Riptide=Strömung +Trident launches player with itself when thrown. Works only in water or rain.=Dreizack wirft den Spieler mit. Funktioniert nur im Wasser oder Regen. +Sharpness=Schärfe +Increases damage.=Erhöht Schaden. +Silk Touch=Sorgfalt +Mined blocks drop themselves.=Abgebaute Blöcke werfen sich selbst ab. +Smite=Qual +Increases damage to undead mobs.=Erhöht Schaden für untote Mobs. +Soul Speed=Schnelle Seele +Increases walking speed on soul sand.=Erhöht Gehgeschwindigkeit auf Seelensand. +Sweeping Edge=Schwungklinge +Increases sweeping attack damage.=Erhöht Schwungangriffsschaden. +Thorns=Dornen +Reflects some of the damage taken when hit, at the cost of reducing durability with each proc.=Reflektiert etwas des Schadens beim Erleiden eines Treffers, auf Kosten der Haltbarkeit. +Unbreaking=Haltbarkeit +Increases item durability.=Erhöht Haldbarkeit des Gegenstands. +Inventory=Inventar +@1 × Lapis Lazuli=@1 × Lapislazuli +Enchantment levels: @1=Verzauberungsstufen: @1 +Level requirement: @1=Level benötigt: @1 +Enchant an item=Gegenstand verzaubern + []= [] +Usage: /enchant []=Verwendung: /enchant [] +Player '@1' cannot be found.=Spieler „@1“ kann nicht gefunden werden. +There is no such enchantment '@1'.=Es gibt keine Verzauberung namens „@1“. +The target doesn't hold an item.=Das Ziel hält keinen Gegenstand. +The selected enchantment can't be added to the target item.=Die gewählte Verzauberug kann nicht dem Ziel gegeben werden. +'@1' is not a valid number='@1' ist keine gültige Zahl +The number you have entered (@1) is too big, it must be at most @2.=Die eingegebene Zahl (@1) ist zu groß, maximal @1 erlaubt. +The number you have entered (@1) is too small, it must be at least @2.=Die eingegebene Zahl (@1) ist zu klein, minimal @1 erlaubt. +@1 can't be combined with @2.=@1 kann nicht mit @2 kombiniert werden. +Enchanting succeded.=Verzauberug erfolgreich. +Forcefully enchant an item=Einen Gegenstand zwangsweise verzaubern +Usage: /forceenchant []=Verwendung: /forceenchant [] +The target item is not enchantable.=Der Zielgegenstand ist nicht verzauberbar. +'@1' is not a valid number.='@1' ist keine gültige Zahl. +Enchanted Book=Verzaubertes Buch +Enchanting Table=Zaubertisch +Enchant=Verzaubern diff --git a/mods/ITEMS/mcl_enchanting/locale/template.txt b/mods/ITEMS/mcl_enchanting/locale/template.txt new file mode 100644 index 000000000..f186ef37b --- /dev/null +++ b/mods/ITEMS/mcl_enchanting/locale/template.txt @@ -0,0 +1,100 @@ +# textdomain: mcl_enchanting +Aqua Affinity= +Increases underwater mining speed.= +Bane of Arthropods= +Increases damage and applies Slowness IV to arthropod mobs (spiders, cave spiders, silverfish and endermites).= +Blast Protection= +Reduces explosion damage and knockback.= +Channeling= +Channels a bolt of lightning toward a target. Works only during thunderstorms and if target is unobstructed with opaque blocks.= +Curse of Binding= +Item cannot be removed from armor slots except due to death, breaking or in Creative Mode.= +Curse of Vanishing= +Item destroyed on death.= +Depth Strider= +Increases underwater movement speed.= +Efficiency= +Increases mining speed.= +Feather Falling= +Reduces fall damage.= +Fire Aspect= +Sets target on fire.= +Fire Protection= +Reduces fire damage.= +Flame= +Arrows set target on fire.= +Fortune= +Increases certain block drops.= +Frost Walker= +Turns water beneath the player into frosted ice and prevents the damage from magma blocks.= +Impaling= +Trident deals additional damage to ocean mobs.= +Infinity= +Shooting consumes no regular arrows.= +Knockback= +Increases knockback.= +Looting= +Increases mob loot.= +Loyalty= +Trident returns after being thrown. Higher levels reduce return time.= +Luck of the Sea= +Increases rate of good loot (enchanting books, etc.)= +Lure= +Decreases time until rod catches something.= +Mending= +Repair the item while gaining XP orbs.= +Multishot= +Shoot 3 arrows at the cost of one.= +Piercing= +Arrows passes through multiple objects.= +Power= +Increases arrow damage.= +Projectile Protection= +Reduces projectile damage.= +Protection= +Reduces most types of damage by 4% for each level.= +Punch= +Increases arrow knockback.= +Quick Charge= +Decreases crossbow charging time.= +Respiration= +Extends underwater breathing time.= +Riptide= +Trident launches player with itself when thrown. Works only in water or rain.= +Sharpness= +Increases damage.= +Silk Touch= +Mined blocks drop themselves.= +Smite= +Increases damage to undead mobs.= +Soul Speed= +Increases walking speed on soul sand.= +Sweeping Edge= +Increases sweeping attack damage.= +Thorns= +Reflects some of the damage taken when hit, at the cost of reducing durability with each proc.= +Unbreaking= +Increases item durability.= +Inventory= +@1 × Lapis Lazuli= +Enchantment levels: @1= +Level requirement: @1= +Enchant an item= + []= +Usage: /enchant []= +Player '@1' cannot be found.= +There is no such enchantment '@1'.= +The target doesn't hold an item.= +The selected enchantment can't be added to the target item.= +'@1' is not a valid number= +The number you have entered (@1) is too big, it must be at most @2.= +The number you have entered (@1) is too small, it must be at least @2.= +@1 can't be combined with @2.= +Enchanting succeded.= +Forcefully enchant an item= +Usage: /forceenchant []= +The target item is not enchantable.= +'@1' is not a valid number.= +Enchanted Book= +Enchanting Table= +Enchant= From 39a0fdd24c1afec86aaa0f8528d35fa2acc2e830 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 19 Dec 2020 16:18:54 +0100 Subject: [PATCH 6/8] No enchant 4 flint&steel,pumpkin,head,screwdriver --- mods/ITEMS/mcl_farming/pumpkin.lua | 1 - mods/ITEMS/mcl_fire/flint_and_steel.lua | 2 +- mods/ITEMS/mcl_heads/init.lua | 2 +- mods/ITEMS/screwdriver/init.lua | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index 990da549d..72b4e5412 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -112,7 +112,6 @@ pumpkin_face_base_def._doc_items_longdesc = S("A pumpkin can be worn as a helmet pumpkin_face_base_def._doc_items_usagehelp = nil pumpkin_face_base_def.tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face.png"} pumpkin_face_base_def.groups.armor_head=1 -pumpkin_face_base_def.groups.enchantability=1 pumpkin_face_base_def._mcl_armor_mob_range_factor = 0 pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:enderman" pumpkin_face_base_def.groups.non_combat_armor=1 diff --git a/mods/ITEMS/mcl_fire/flint_and_steel.lua b/mods/ITEMS/mcl_fire/flint_and_steel.lua index 7b585f348..79771baad 100644 --- a/mods/ITEMS/mcl_fire/flint_and_steel.lua +++ b/mods/ITEMS/mcl_fire/flint_and_steel.lua @@ -9,7 +9,7 @@ minetest.register_tool("mcl_fire:flint_and_steel", { inventory_image = "mcl_fire_flint_and_steel.png", liquids_pointable = false, stack_max = 1, - groups = { tool = 1, enchantability = 1 }, + groups = { tool = 1, }, on_place = function(itemstack, user, pointed_thing) -- Use pointed node's on_rightclick function first, if present local node = minetest.get_node(pointed_thing.under) diff --git a/mods/ITEMS/mcl_heads/init.lua b/mods/ITEMS/mcl_heads/init.lua index 7502bf115..a8e9f2cb5 100644 --- a/mods/ITEMS/mcl_heads/init.lua +++ b/mods/ITEMS/mcl_heads/init.lua @@ -42,7 +42,7 @@ local function addhead(name, texture, desc, longdesc, rangemob, rangefactor) { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, }, }, }, - groups = {handy=1, armor_head=1,non_combat_armor=1, head=1, deco_block=1, dig_by_piston=1, enchantability=1}, + groups = {handy=1, armor_head=1,non_combat_armor=1, head=1, deco_block=1, dig_by_piston=1 }, -- The head textures are based off the textures of an actual mob. tiles = { -- Note: bottom texture is overlaid over top texture to get rid of possible transparency. diff --git a/mods/ITEMS/screwdriver/init.lua b/mods/ITEMS/screwdriver/init.lua index bf264a50c..ec4f1a2ad 100644 --- a/mods/ITEMS/screwdriver/init.lua +++ b/mods/ITEMS/screwdriver/init.lua @@ -176,7 +176,7 @@ minetest.register_tool("screwdriver:screwdriver", { description = S("Screwdriver"), inventory_image = "screwdriver.png", wield_image = "screwdriver.png^[transformFX", - groups = { tool = 1, not_in_creative_inventory = 1, enchantability = 1 }, + groups = { tool = 1, not_in_creative_inventory = 1 }, on_use = function(itemstack, user, pointed_thing) screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, 200) return itemstack From fd53198c9a8cf87d5210177153e63449ef87ceab Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 19 Dec 2020 16:29:55 +0100 Subject: [PATCH 7/8] No enchant for shears --- mods/ITEMS/mcl_tools/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index 5df422f08..6dc8d1e0d 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -576,7 +576,7 @@ minetest.register_tool("mcl_tools:shears", { inventory_image = "default_tool_shears.png", wield_image = "default_tool_shears.png", stack_max = 1, - groups = { tool=1, shears=1, dig_speed_class=4, enchantability=1 }, + groups = { tool=1, shears=1, dig_speed_class=4, }, tool_capabilities = { full_punch_interval = 0.5, max_drop_level=1, From b0dc0ecc9cbe9aa4bc35a146a82ca37626a54cc2 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 21 Dec 2020 13:13:01 +0100 Subject: [PATCH 8/8] Fix possible nil crashes in mcl_jukebox --- mods/ITEMS/mcl_jukebox/init.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_jukebox/init.lua b/mods/ITEMS/mcl_jukebox/init.lua index 9a101e33f..db9f25312 100644 --- a/mods/ITEMS/mcl_jukebox/init.lua +++ b/mods/ITEMS/mcl_jukebox/init.lua @@ -81,7 +81,7 @@ local function now_playing(player, track_id) if not player or not player:is_player() or not active_huds[playername] or not hud_sequence_numbers[playername] or seq ~= hud_sequence_numbers[playername] then return end - if id == active_huds[playername] then + if id ~= nil and id == active_huds[playername] then player:hud_remove(active_huds[playername]) active_huds[playername] = nil end @@ -162,8 +162,10 @@ minetest.register_node("mcl_jukebox:jukebox", { inv:set_stack("main", 1, "") if active_tracks[cname] ~= nil then minetest.sound_stop(active_tracks[cname]) - clicker:hud_remove(active_huds[cname]) active_tracks[cname] = nil + end + if active_huds[cname] ~= nil then + clicker:hud_remove(active_huds[cname]) active_huds[cname] = nil end else @@ -219,8 +221,10 @@ minetest.register_node("mcl_jukebox:jukebox", { dropped_item:set_yaw(math.pi/2) if active_tracks[name] ~= nil then minetest.sound_stop(active_tracks[name]) - digger:hud_remove(active_huds[name]) active_tracks[name] = nil + end + if active_huds[name] ~= nil then + digger:hud_remove(active_huds[name]) active_huds[name] = nil end end