From 6d84a139d6064d2f0420c0ccf967dad1a5a3f45b Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 23 Aug 2017 03:50:22 +0200
Subject: [PATCH] Render enderman's carried block

---
 mods/ENTITIES/mobs_mc/0_gameconfig.lua        |   4 +-
 mods/ENTITIES/mobs_mc/enderman.lua            | 180 ++++++++++++++++--
 .../mobs_mc/models/mobs_mc_enderman.b3d       | Bin 108266 -> 683474 bytes
 3 files changed, 171 insertions(+), 13 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/0_gameconfig.lua b/mods/ENTITIES/mobs_mc/0_gameconfig.lua
index 410719f6..5e47ecbe 100644
--- a/mods/ENTITIES/mobs_mc/0_gameconfig.lua
+++ b/mods/ENTITIES/mobs_mc/0_gameconfig.lua
@@ -228,7 +228,9 @@ mobs_mc.enderman_takable = {
 	"default:dirt_with_snow",
 	"default:dirt_with_rainforest_litter",
 	"default:dirt_with_grass_footsteps",
-	"default:cactus",
+-- FIXME: For some reason, Minetest has a Lua error when an enderman tries to place a Minetest Game cactus.
+-- Maybe this is because default:cactus has rotate_and_place?
+--	"default:cactus", -- TODO: Re-enable cactus when it works again
 	"default:gravel",
 	"default:clay",
 	"flowers:mushroom_red",
diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua
index 80381ea8..ceaddbf7 100644
--- a/mods/ENTITIES/mobs_mc/enderman.lua
+++ b/mods/ENTITIES/mobs_mc/enderman.lua
@@ -18,6 +18,139 @@ local pr = PseudoRandom(os.time()*(-334))
 local take_frequency = 10
 local place_frequency = 10
 
+-- Create the textures table for the enderman, depending on which kind of block
+-- the enderman holds (if any).
+local create_enderman_textures = function(block_type, itemstring)
+	local base = "mobs_mc_enderman.png^mobs_mc_enderman_eyes.png"
+
+	--[[ Order of the textures in the texture table:
+		Flower, 90 degrees
+		Flower, 45 degrees
+		Held block, backside
+		Held block, bottom
+		Held block, front
+		Held block, left
+		Held block, right
+		Held block, top
+		Enderman texture (base)
+	]]
+	-- Regular cube
+	if block_type == "cube" then
+		local tiles = minetest.registered_nodes[itemstring].tiles
+		local textures = {}
+		local last
+		for i = 1, 6 do
+			if type(tiles[i]) == "string" then
+				last = tiles[i]
+			elseif type(tiles[i]) == "table" then
+				if tiles[i].name then
+					last = tiles[i].name
+				end
+			end
+			table.insert(textures, last)
+		end
+		return {
+			"blank.png",
+			"blank.png",
+			textures[5],
+			textures[2],
+			textures[6],
+			textures[3],
+			textures[4],
+			textures[1],
+			base, -- Enderman texture
+		}
+	-- Node of plantlike drawtype, 45° (recommended)
+	elseif block_type == "plantlike45" then
+		local textures = minetest.registered_nodes[itemstring].tiles
+		return {
+			"blank.png",
+			textures[1],
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			base,
+		}
+	-- Node of plantlike drawtype, 90°
+	elseif block_type == "plantlike90" then
+		local textures = minetest.registered_nodes[itemstring].tiles
+		return {
+			textures[1],
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			base,
+		}
+	elseif block_type == "unknown" then
+		return {
+			"blank.png",
+			"blank.png",
+			"unknown_node.png",
+			"unknown_node.png",
+			"unknown_node.png",
+			"unknown_node.png",
+			"unknown_node.png",
+			"unknown_node.png",
+			base, -- Enderman texture
+		}
+	-- No block held (for initial texture)
+	elseif block_type == "nothing" or block_type == nil then
+		return {
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			"blank.png",
+			base, -- Enderman texture
+		}
+	end
+end
+
+-- Select a new animation definition.
+local select_enderman_animation = function(animation_type)
+	-- Enderman holds a block
+	if animation_type == "block" then
+		return {
+			walk_speed = 25,
+			run_speed = 50,
+			stand_speed = 25,
+			stand_start = 200,
+			stand_end = 200,
+			walk_start = 161,
+			walk_end = 200,
+			run_start = 161,
+			run_end = 200,
+			punch_start = 121,
+			punch_end = 160,
+		}
+	-- Enderman doesn't hold a block
+	elseif animation_type == "normal" or animation_type == nil then
+		return {
+			walk_speed = 25,
+			run_speed = 50,
+			stand_speed = 25,
+			stand_start = 40,
+			stand_end = 80,
+			walk_start = 0,
+			walk_end = 40,
+			run_start = 0,
+			run_end = 40,
+			punch_start = 81,
+			punch_end = 120,
+		}
+	end
+end
+
 mobs:register_mob("mobs_mc:enderman", {
 	type = "monster",
 	runaway = true,
@@ -28,9 +161,7 @@ mobs:register_mob("mobs_mc:enderman", {
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 2.89, 0.3},
 	visual = "mesh",
 	mesh = "mobs_mc_enderman.b3d",
-	textures = {
-		{"mobs_mc_enderman.png^(mobs_mc_enderman_eyes.png^[makealpha:0,0,0)"},
-	},
+	textures = create_enderman_textures(),
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
 	sounds = {
@@ -49,12 +180,7 @@ mobs:register_mob("mobs_mc:enderman", {
 		min = 0,
 		max = 1,},
 	},
-	animation = {
-		speed_normal = 25,		speed_run = 50,
-		stand_start = 40,		stand_end = 80,
-		walk_start = 0,		walk_end = 40,
-		run_start = 0,		run_end = 40,
-	},
+	animation = select_enderman_animation("normal"),
 	_taken_node = "",
 	do_custom = function(self, dtime)
 		-- Take and put nodes
@@ -63,7 +189,7 @@ mobs:register_mob("mobs_mc:enderman", {
 			return
 		end
 		self._take_place_timer = self._take_place_timer + dtime
-		if (self._taken_node == nil or self._taken_node == "") and self._take_place_timer >= take_frequency  then
+		if (self._taken_node == nil or self._taken_node == "") and self._take_place_timer >= take_frequency then
 			-- Take random node
 			self._take_place_timer = 0
 			local pos = self.object:getpos()
@@ -75,8 +201,35 @@ mobs:register_mob("mobs_mc:enderman", {
 				local dug = minetest.dig_node(take_pos)
 				if dug then
 					self._taken_node = node.name
-					-- TODO: Update enderman model (enderman holding block)
 					local def = minetest.registered_nodes[self._taken_node]
+					-- Update animation and texture accordingly (adds visibly carried block)
+					local block_type
+					-- Cube-shaped
+					if def.drawtype == "normal" or
+							def.drawtype == "nodebox" or
+							def.drawtype == "liquid" or
+							def.drawtype == "flowingliquid" or
+							def.drawtype == "glasslike" or
+							def.drawtype == "glasslike_framed" or
+							def.drawtype == "glasslike_framed_optional" or
+							def.drawtype == "allfaces" or
+							def.drawtype == "allfaces_optional" or
+							def.drawtype == nil then
+						block_type = "cube"
+					elseif def.drawtype == "plantlike" then
+						-- Flowers and stuff
+						block_type = "plantlike45"
+					elseif def.drawtype == "airlike" then
+						-- Just air
+						block_type = nil
+					else
+						-- Fallback for complex drawtypes
+						block_type = "unknown"
+					end
+					self.base_texture = create_enderman_textures(block_type, self._taken_node)
+					self.object:set_properties({ textures = self.base_texture })
+					self.animation = select_enderman_animation("block")
+					mobs:set_animation(self, self.animation.current)
 					if def.sounds and def.sounds.dug then
 						minetest.sound_play(def.sounds.dug, {pos = take_pos, max_hear_distance = 16})
 					end
@@ -93,6 +246,9 @@ mobs:register_mob("mobs_mc:enderman", {
 				-- ... but only if there's a free space
 				minetest.place_node(place_pos, {name = self._taken_node})
 				local def = minetest.registered_nodes[self._taken_node]
+				-- Update animation accordingly (removes visible block)
+				self.animation = select_enderman_animation("normal")
+				mobs:set_animation(self, self.animation.current)
 				if def.sounds and def.sounds.place then
 					minetest.sound_play(def.sounds.place, {pos = place_pos, max_hear_distance = 16})
 				end
@@ -147,7 +303,7 @@ mobs:register_mob("mobs_mc:enderman", {
 
 
 -- End spawn
-mobs:spawn_specific("mobs_mc:enderman", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 3000, 18, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max)
+mobs:spawn_specific("mobs_mc:enderman", mobs_mc.spawn.solid, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 3000, 12, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max)
 -- Overworld spawn
 mobs:spawn_specific("mobs_mc:enderman", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 9000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max)
 -- Nether spawn (rare)
diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_enderman.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_enderman.b3d
index ac92259907e6b11363dca2372006ba7107780bcc..30f42632b6d9b3b1710f08003de3a3da2e1b4d62 100644
GIT binary patch
delta 39533
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
TCCk{rzWGQF#7@vXRvk(JUz5W}

delta 16542
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
SKI7QV_kK9|@Z1)b4kZAT^V((r