From fb5fd6b2e99cff11351dc223bba7edc8a9a59cc4 Mon Sep 17 00:00:00 2001
From: talamh <newmarchpeterl@yahoo.com>
Date: Thu, 6 Oct 2022 00:16:03 +0200
Subject: [PATCH] Fix villager badges messing up non-64px textures

---
 .../mobs_mc/textures/mobs_mc_diamond.png      | Bin 0 -> 181 bytes
 .../mobs_mc/textures/mobs_mc_emerald.png      | Bin 0 -> 181 bytes
 .../mobs_mc/textures/mobs_mc_gold.png         | Bin 0 -> 181 bytes
 .../mobs_mc/textures/mobs_mc_iron.png         | Bin 0 -> 181 bytes
 .../mobs_mc/textures/mobs_mc_stone.png        | Bin 0 -> 181 bytes
 mods/ENTITIES/mobs_mc/villager.lua            |  80 +++++-------------
 6 files changed, 20 insertions(+), 60 deletions(-)
 create mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_diamond.png
 create mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_emerald.png
 create mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_gold.png
 create mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_iron.png
 create mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_stone.png

diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_diamond.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_diamond.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f0c05f3b1bbad3d9ca74e3e0a9098dd5fe3ebf
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!qyv0HT!FNa5}${$c<}Ut@vd_5
z>u!{v`@Q1P|F_@&-&DGN1Sri|666=m;PC858j$1R>Eaj?aro`U)4T@^M3@{mKYREk
zzR>H$^D}oGJ=TOmK>xbQf4FX0v^2L1<lJWXwwkHoqDE4-3DX3XBg<81?yXMwTgq&i
W$#Ai8F~ez~nGBw;elF{r5}E*c4@1cS

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_emerald.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_emerald.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdb1ef6671b03a5a6f6af4a884af0970d65f1f63
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!qyv0HTtW2A2$^UPxuQV1mJq`|
zxkgHS9>(JFu5!wzpFRPl8B2ovf*Bm1-ADs+JUm?-Ln02py?C1UfPn~;<L&+pU*ZeB
zPCP$z$I)X=C<OGc)BVe(=F;KIrZ`E3;pA$jhK~`?Ds0#`<episI;*%U<!>qTog&5(
U!H;a#Kr<OUUHx3vIVCg!00#U!761SM

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_gold.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_gold.png
new file mode 100644
index 0000000000000000000000000000000000000000..e136dad54c1787290ed2218cd188ec07566574d8
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!qyv0HT!FNa5}${$c)Y9Jk_x3=
zJz7_mo4z`j^yzY?;D!y1KxxL3AirP+hi5m^fE*7`7srr@!*4I1<~?8_!sNL5$HOo2
zg<dC~pSk1cu_hD(`qxeV!*$D|rMX=o=QhK))l3Z+HIlMTm?o$kS*|*BZ*|JwQf8$v
WhLb`QYCM5vGI+ZBxvX<aXaWGe%RgoS

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron.png
new file mode 100644
index 0000000000000000000000000000000000000000..8573938f30f45a7658df68c0111ff3dcc67dd5d9
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!qyv0HT!FNa5}${$c)Y7zOI`Wo
zzK->4mYzI*@adBWQ&|4Z2TC)R1o;IsI6S+N2IP2nx;TbJ9DaN8H17ce5hlmYKOTOG
zFZ4R`{LCFkk2RqX(7$f-AFf*#EzRu$Iky?Ut!8StsF9Ry!ZbnU$a2-0d#h9amNF}a
WF`N{dP~!<Slfl!~&t;ucLK6VJx<Q-(

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_stone.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_stone.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e4e4485c0149e294f39daba767c4b6a05e8fec0
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!qyv0HT!FNa5}${$c$B|SysKPN
zSWrQHWJ6JQXI+`g<E~(!G-FASUoeBivm0qZj)$j<V@Sl|w--<I9xxDLa@_pv;g|SA
zuM^MD+;Q|+6AA(S>n8u<x@FPQ+%AxFo8jAPriP0eN!cb$6I6~YSDm@HI^}OEvt=g3
V#m2=9r-5cNc)I$ztaD0e0szDxJ@^0s

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index e5987524c..7e4ca72ad 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -66,11 +66,11 @@ local tiernames = {
 }
 
 local badges = {
-	"default_wood.png",
-	"default_steel_block.png",
-	"default_gold_block.png",
-	"mcl_core_emerald_block.png",
-	"default_diamond_block.png",
+	"mobs_mc_stone.png",
+	"mobs_mc_iron.png",
+	"mobs_mc_gold.png",
+	"mobs_mc_emerald.png",
+	"mobs_mc_diamond.png",
 }
 
 local professions = {
@@ -84,10 +84,7 @@ local professions = {
 	},
 	farmer = {
 		name = N("Farmer"),
-		textures = {
-				"mobs_mc_villager_farmer.png",
-				"mobs_mc_villager_farmer.png",
-			},
+		texture = "mobs_mc_villager_farmer.png",
 		jobsite = "mcl_composters:composter",
 		trades = {
 			{
@@ -121,10 +118,7 @@ local professions = {
 	},
 	fisherman = {
 		name = N("Fisherman"),
-		textures = {
-				"mobs_mc_villager_fisherman.png",
-				"mobs_mc_villager_fisherman.png",
-			},
+		texture = "mobs_mc_villager_fisherman.png",
 		jobsite = "mcl_barrels:barrel_closed",
 		trades = {
 			{
@@ -158,10 +152,7 @@ local professions = {
 	},
 	fletcher = {
 		name = N("Fletcher"),
-		textures =  {
-				"mobs_mc_villager_fletcher.png",
-				"mobs_mc_villager_fletcher.png",
-			},
+		texture = "mobs_mc_villager_fletcher.png",
 		jobsite = "mcl_fletching_table:fletching_table",
 		trades = {
 			{
@@ -200,10 +191,7 @@ local professions = {
 	},
 	shepherd ={
 		name = N("Shepherd"),
-		textures =  {
-				"mobs_mc_villager_sheperd.png",
-				"mobs_mc_villager_sheperd.png",
-			},
+		texture =  "mobs_mc_villager_sheperd.png",
 		jobsite = "mcl_loom:loom",
 		trades = {
 			{
@@ -233,10 +221,7 @@ local professions = {
 	},
 	librarian = {
 		name = N("Librarian"),
-		textures = {
-				"mobs_mc_villager_librarian.png",
-				"mobs_mc_villager_librarian.png",
-			},
+		texture = "mobs_mc_villager_librarian.png",
 		jobsite = "mcl_books:bookshelf", --FIXME: lectern
 		trades = {
 			{
@@ -271,10 +256,7 @@ local professions = {
 	},
 	cartographer = {
 		name = N("Cartographer"),
-		textures = {
-				"mobs_mc_villager_cartographer.png",
-				"mobs_mc_villager_cartographer.png",
-			},
+		texture = "mobs_mc_villager_cartographer.png",
 		jobsite = "mcl_cartography_table:cartography_table",
 		trades = {
 			{
@@ -317,10 +299,7 @@ local professions = {
 	},
 	armorer = {
 		name = N("Armorer"),
-		textures = {
-				"mobs_mc_villager_armorer.png",
-				"mobs_mc_villager_armorer.png",
-			},
+		texture = "mobs_mc_villager_armorer.png",
 		jobsite = "mcl_blast_furnace:blast_furnace",
 		trades = {
 			{
@@ -357,10 +336,7 @@ local professions = {
 	},
 	leatherworker = {
 		name = N("Leatherworker"),
-		textures = {
-				"mobs_mc_villager_leatherworker.png",
-				"mobs_mc_villager_leatherworker.png",
-			},
+		texture = "mobs_mc_villager_leatherworker.png",
 		jobsite = "mcl_cauldrons:cauldron",
 		trades = {
 			{
@@ -389,10 +365,7 @@ local professions = {
 	},
 	butcher = {
 		name = N("Butcher"),
-		textures = {
-				"mobs_mc_villager_butcher.png",
-				"mobs_mc_villager_butcher.png",
-			},
+		texture = "mobs_mc_villager_butcher.png",
 		jobsite = "mcl_smoker:smoker",
 		trades = {
 			{
@@ -422,10 +395,7 @@ local professions = {
 	},
 	weapon_smith = {
 		name = N("Weapon Smith"),
-		textures = {
-				"mobs_mc_villager_weaponsmith.png",
-				"mobs_mc_villager_weaponsmith.png",
-			},
+		texture = "mobs_mc_villager_weaponsmith.png",
 		jobsite = "mcl_grindstone:grindstone",
 		trades = {
 			{
@@ -453,10 +423,7 @@ local professions = {
 	},
 	tool_smith = {
 		name = N("Tool Smith"),
-		textures = {
-				"mobs_mc_villager_toolsmith.png",
-				"mobs_mc_villager_toolsmith.png",
-			},
+		texture = "mobs_mc_villager_toolsmith.png",
 		jobsite = "mcl_smithing_table:table",
 		trades = {
 			{
@@ -490,10 +457,7 @@ local professions = {
 	},
 	cleric = {
 		name = N("Cleric"),
-		textures = {
-				"mobs_mc_villager_priest.png",
-				"mobs_mc_villager_priest.png",
-			},
+		texture = "mobs_mc_villager_priest.png",
 		jobsite = "mcl_brewing:stand_000",
 		trades = {
 			{
@@ -522,10 +486,7 @@ local professions = {
 	},
 	nitwit = {
 		name = N("Nitwit"),
-		textures = {
-				"mobs_mc_villager_nitwit.png",
-				"mobs_mc_villager_nitwit.png",
-			},
+		texture = "mobs_mc_villager_nitwit.png",
 		-- No trades for nitwit
 		trades = nil,
 	}
@@ -559,12 +520,11 @@ local function init_trader_vars(self)
 end
 
 local function get_badge_textures(self)
-	local t = professions[self._profession].textures
+	local t = professions[self._profession].texture
 	if self._profession == "unemployed" or self._profession == "nitwit" then return t end
 	local tier = self._max_trade_tier or 1
 	return {
-		"[combine:64x64:0,0="..t[1]..":11,55=".. badges[tier].."\\^[resize\\:2x2",
-		t[2]
+		t .. "^" .. badges[tier]
 	}
 end