From 67cedf1308b30c4fd3832eefa827288d62f002e4 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Fri, 19 Mar 2021 14:32:02 +0100 Subject: [PATCH 1/3] Fix villager visual_size (Closes #1338) --- mods/ENTITIES/mobs_mc/villager.lua | 2 +- mods/ENTITIES/mobs_mc/villager_evoker.lua | 2 +- mods/ENTITIES/mobs_mc/villager_illusioner.lua | 2 +- mods/ENTITIES/mobs_mc/villager_vindicator.lua | 2 +- mods/ENTITIES/mobs_mc/villager_zombie.lua | 2 +- mods/ENTITIES/mobs_mc/witch.lua | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 0021a1adb..a38c78719 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -960,7 +960,7 @@ mobs:register_mob("mobs_mc:villager", { "mobs_mc_villager_smith.png", --hat }, }, - visual_size = {x=3, y=3}, + visual_size = {x=2.75, y=2.75}, makes_footstep_sound = true, walk_velocity = 1.2, run_velocity = 2.4, diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua index 226c82a32..abe0e9ca2 100644 --- a/mods/ENTITIES/mobs_mc/villager_evoker.lua +++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua @@ -28,7 +28,7 @@ mobs:register_mob("mobs_mc:evoker", { "blank.png", --no hat -- TODO: Attack glow } }, - visual_size = {x=3, y=3}, + visual_size = {x=2.75, y=2.75}, makes_footstep_sound = true, damage = 6, walk_velocity = 0.2, diff --git a/mods/ENTITIES/mobs_mc/villager_illusioner.lua b/mods/ENTITIES/mobs_mc/villager_illusioner.lua index 30e9f6f36..0bbe2a5f6 100644 --- a/mods/ENTITIES/mobs_mc/villager_illusioner.lua +++ b/mods/ENTITIES/mobs_mc/villager_illusioner.lua @@ -36,7 +36,7 @@ mobs:register_mob("mobs_mc:illusioner", { -- TODO: more sounds distance = 16, }, - visual_size = {x=3, y=3}, + visual_size = {x=2.75, y=2.75}, walk_velocity = 0.6, run_velocity = 2, jump = true, diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua index 3e611acdd..56b295066 100644 --- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua +++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua @@ -30,7 +30,7 @@ mobs:register_mob("mobs_mc:vindicator", { -- TODO: Glow when attacking (mobs_mc_vindicator.png) }, }, - visual_size = {x=3, y=3}, + visual_size = {x=2.75, y=2.75}, makes_footstep_sound = true, damage = 13, reach = 2, diff --git a/mods/ENTITIES/mobs_mc/villager_zombie.lua b/mods/ENTITIES/mobs_mc/villager_zombie.lua index d7f2203e1..09539fa76 100644 --- a/mods/ENTITIES/mobs_mc/villager_zombie.lua +++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua @@ -45,7 +45,7 @@ mobs:register_mob("mobs_mc:villager_zombie", { {"mobs_mc_zombie_smith.png"}, {"mobs_mc_zombie_villager.png"} }, - visual_size = {x=3, y=3}, + visual_size = {x=2.75, y=2.75}, makes_footstep_sound = true, damage = 3, reach = 2, diff --git a/mods/ENTITIES/mobs_mc/witch.lua b/mods/ENTITIES/mobs_mc/witch.lua index 05f5098e5..383cbd36f 100644 --- a/mods/ENTITIES/mobs_mc/witch.lua +++ b/mods/ENTITIES/mobs_mc/witch.lua @@ -25,7 +25,7 @@ mobs:register_mob("mobs_mc:witch", { textures = { {"mobs_mc_witch.png"}, }, - visual_size = {x=3, y=3}, + visual_size = {x=2.75, y=2.75}, makes_footstep_sound = true, damage = 2, reach = 2, From c20bd768ec8aa5ea458601599e01a47c6e8d1a44 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Fri, 19 Mar 2021 14:36:48 +0100 Subject: [PATCH 2/3] Revert "Fix #1277". The commit caused each enchanted armor piece to overlay an additional violet layer over all previous armor layers. A better fix needs to be found. This reverts commit b82da0559008297a9668f28cd2c72726af666f22. --- mods/ITEMS/mcl_armor/armor.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_armor/armor.lua b/mods/ITEMS/mcl_armor/armor.lua index ec06f19ee..a879f7240 100644 --- a/mods/ITEMS/mcl_armor/armor.lua +++ b/mods/ITEMS/mcl_armor/armor.lua @@ -149,8 +149,8 @@ armor.set_player_armor = function(self, player) if level then local texture = def.texture or item:gsub("%:", "_") local enchanted_addition = (mcl_enchanting.is_enchanted(item) and mcl_enchanting.overlay or "") - table.insert(textures, texture..".png"..enchanted_addition) - preview = "player.png^[opacity:0^"..texture.."_preview.png"..enchanted_addition..""..(preview and "^"..preview or "") + table.insert(textures, "("..texture..".png"..enchanted_addition..")") + preview = "(player.png^[opacity:0^"..texture.."_preview.png"..enchanted_addition..")"..(preview and "^"..preview or "") armor_level = armor_level + level items = items + 1 mcl_armor_points = mcl_armor_points + (def.groups["mcl_armor_points"] or 0) From d168bfa791bab470d588ec590b9492f137293199 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Fri, 19 Mar 2021 14:47:52 +0100 Subject: [PATCH 3/3] Fix pumpking breaking armor display --- .../textures/mcl_farming_pumpkin_face.png | Bin 628 -> 2732 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_face.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_face.png index a2fd0fbf9b4e115697162aef807e8723f5b6354a..0fb980b40ff9c12ab8d0a3a7083e8d72de28d10b 100644 GIT binary patch delta 2723 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 delta 603 zcmV-h0;K({74!rtiBL{Q4GJ0x0000DNk~Le0001h0000$1Oos703i5cOaK4?Cs0gO zMU!+1Cx30fqR{{V00DGTPE!Ct=GbNc00H|+L_t(|0qv79bDJ<2hVvJMvNRif$U{9z zfIK9N0pq1hg(15!@?dW?=r^=mw_dk&YS&~WYrDihs<@}q&^sR}Gw&Vu+&g^FY2dvY z8{~Oz{~_cd$8$V%Wg90<7)}G%3FBxP2ClUL`+vm_iWoW3z7)ms4T25d&1#prL`hyd z)LL+T-{hnr0)o&dm5i+g9{=5!6-IlaU|0WRa3ixvGxrYQ_Z2;{8h6&JXInsraYbj@LbTC}{$ z8a#h)Z@aG1-EdIgtF?;Sb>nw0>h3jbbbmJ-C0MEc;BZnO_KQY$!(lP=e*M0a8Lj;lN-smaCm;2-*#Kw4MzyL%+CkMuFuO>cg<0Pnam3= z;P~2gr<2g#aKxV&)?!5jF8`cP$KOJC!(l