Remove deprecated armor_model usage

nulllib

@@ -1 +1 @@
-Subproject commit a8155f594112cfbb96ae7eb1af330f303f679824
+Subproject commit b891cf1efce1f68b1be09063e4cb83af5ac8a180

script.lua

@@ -3,12 +3,6 @@
 --- Initial definitions ---
 -- player model backwards compatibility
 model=models.player_model
-armor_model={
-	["BOOTS"]=vanilla_model.BOOTS,
-	["LEGGINGS"]=vanilla_model.LEGGINGS,
-	["CHESTPLATE"]=vanilla_model.CHESTPLATE,
-	["HELMET"]=vanilla_model.HELMET
-}
 ping=pings
 -- Texture dimensions --
 TEXTURE_WIDTH = 256
@@ -114,7 +108,7 @@ VANILLA_GROUPS={
 	["OUTER"]={ vanilla_model.HAT, vanilla_model.JACKET, vanilla_model.LEFT_SLEEVE, vanilla_model.RIGHT_SLEEVE, vanilla_model.LEFT_PANTS, vanilla_model.RIGHT_PANTS },
 	["INNER"]={ vanilla_model.HEAD, vanilla_model.BODY, vanilla_model.LEFT_ARM, vanilla_model.RIGHT_ARM, vanilla_model.LEFT_LEG, vanilla_model.RIGHT_LEG },
 	["ALL"]={ vanilla_model.HEAD, vanilla_model.BODY, vanilla_model.LEFT_ARM, vanilla_model.RIGHT_ARM, vanilla_model.LEFT_LEG, vanilla_model.RIGHT_LEG, vanilla_model.HAT, vanilla_model.JACKET, vanilla_model.LEFT_SLEEVE, vanilla_model.RIGHT_SLEEVE, vanilla_model.LEFT_PANTS, vanilla_model.RIGHT_PANTS },
-	["ARMOR"]=armor_model
+	["ARMOR"]={vanilla_model.LEGGINGS, vanilla_model.BOOTS, vanilla_model.CHESTPLATE, vanilla_model.HELMET}
 }
 
 -- these are inefficient, redundancy is better in this case
@@ -230,22 +224,22 @@ do
 	-- Enable tail setting
 	PM.addPartFunction(model.Body_Tail, function(last) return last and sharedconfig.load("tail_enabled") end)
 	-- no legs, regular tail in water if tail enabled
-	local mtail_mutually_exclusive={model.LeftLeg, model.RightLeg, model.Body_Tail, armor_model.LEGGINGS, armor_model.BOOTS}
-	PM.addPartGroupFunction(mtail_mutually_exclusive, function(last) return last and not aquaticTailVisible() end)
+	local mtail_mutually_exclusive={model.LeftLeg, model.RightLeg, model.Body_Tail, vanilla_model.LEGGINGS, vanilla_model.BOOTS}
+	PM.addPartListFunction(mtail_mutually_exclusive, function(last) return last and not aquaticTailVisible() end)
 	-- aquatic tail in water
-	PM.addPartGroupFunction(tail_parts, function(last) return last and aquaticTailVisible() end)
+	PM.addPartListFunction(tail_parts, function(last) return last and aquaticTailVisible() end)
 
 	--- Armor state
 	local all_armor=util.reduce(util.mergeTable, {VANILLA_GROUPS.ARMOR, TAIL_LEGGINGS, TAIL_BOOTS})
-	PM.addPartGroupFunction(all_armor, function(last) return last and sharedconfig.load("armor_enabled") end)
+	PM.addPartListFunction(all_armor, function(last) return last and sharedconfig.load("armor_enabled") end)
 	-- Only show armor if equipped
 	PM.addPartFunction(model.Body.MTail1.MTail2.MTail3.Boot, function(last) return last and armor_state.boots end)
 	PM.addPartFunction(model.Body.MTail1.MTail2.MTail3.LeatherBoot, function(last) return last and armor_state.leather_boots end)
-	PM.addPartGroupFunction(TAIL_LEGGINGS, function(last) return last and armor_state.leggings end)
+	PM.addPartListFunction(TAIL_LEGGINGS, function(last) return last and armor_state.leggings end)
 
 
 	-- Disable when vanilla_enabled
-	PM.addPartGroupFunction(MAIN_GROUPS, function(last) return last and not getVanillaVisible() end)
+	PM.addPartListFunction(MAIN_GROUPS, function(last) return last and not getVanillaVisible() end)
 end
 
 SNORES={"snore-1", "snore-2", "snore-3"}