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!ia0y~yU~m9o4rT@hhPm4t-!L#RNC)_YxH2#>7%B027>fr_
zKN#;S7r*XC`MKXK9{qp&{r^p++ea7}7#K@}{DK)Ap4~`eU|{g@ba4!cIQ;hFY2E_{
zB212(pFR8%U+8t>`I$S89&17&pnu)uKU}vgTAJGha&9wxTg}vPQ6nkaglU4xk>#p0
f_g1I;EoHXMWVqP4nBg=70|SGntDnm{r-UW|c@IO$

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!ia0y~yU~m9o4rT@hhPm4t-!L#RNC)_YxPs`J5i-#paz%l1
zEg^<`a*dSuJdDNTUFDQbKYe0gU|=i>@(X5gcy=R=fq}up)5S3);_%yxr+E(;h%h<c
z?%(hwzR>H$^D}oGJ=TOmK>s@3zg%iA9lmUelT;W^u4ZcZ81byahHXRcndPdpimOuo
bmNMTdVk{B-$Y#yJz`)??>gTe~DWM4f2K+k~

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!ia0y~yU~m9o4rT@hhPm4t-!L#RNC)_YxH2#>7%B027>mcd
z$}Oo-+SQ|VWx46AgGrw*R|;;}z{tSBz*rLG7tG-B>_!>`1A~XBi(^Q{;kOr0^Byn|
zVRGF3<KdV1La!6g&)jkJSQ82X{p%+G;ksqf(%dePbDQDYYNm#Z8cEqEOcPX&ELWYm
ew>sr-DYH@-!%3kDHJ%I%3=E#GelF{r5}E+L%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!ia0y~yU~m9o4rT@hhPm4t-!L#RNC)_YxH2#>7%B027>mcd
z%C*#$Pwwkjzh>#l;|HHUc`$|L-+TrJ2F8*gzhDN3XE)Lq7#KV}T^vIq4!^y4n)iT#
z2$SRH9}mC87kZs|e&&v&$C^+G=wCPa57#Y=mgaVWoZAfFRx>qR)JV!UVVa<FWV!0h
fz11myOPQ6z7)}aJsPSZAU|{fc^>bP0l+XkKy}Ci1

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!ia0y~yU~m9o4rT@hhPm4t-!L#RNC)_YxH2#>7%B027>h^w
z`^3A-C4~hQ#78z1Wp~z<xjgO)W?*1oED7=pW^j0RBaMN9!Nb$VF(l&f+l!}p4;Y9r
zIc|RT@JoE5*NNw6?l^j^359_Eb(8;a-LhzDZWqY8&G2nCQ^Q4#q-+zW2`WdHtIph8
do$|Mo*)o&iV&h_l(+ms@44$rjF6*2UngGNfJ@^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