feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

1 files changed, 120 insertions, 2 deletions

diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp
index ce7a9bfc..ab9db75d 100644
--- a/Minecraft.Client/Textures.cpp
+++ b/Minecraft.Client/Textures.cpp
@@ -16,6 +16,9 @@
 #include "..\Minecraft.World\net.minecraft.world.h"
 #include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "..\Minecraft.World\StringHelpers.h"
+#include "ResourceLocation.h"
+#include "..\Minecraft.World\ItemEntity.h"
+#include "TextureAtlas.h"
 
 bool Textures::MIPMAP = true;
 C4JRender::eTextureFormat Textures::TEXTURE_FORMAT = C4JRender::TEXTURE_FORMAT_RxGyBzAw;
@@ -120,6 +123,44 @@ wchar_t *Textures::preLoaded[TN_COUNT] =
 	L"mob/wolf_collar",
 	L"mob/zombie_villager",
 
+	// 1.6.4
+	L"item/lead_knot",
+
+	L"misc/beacon_beam",
+
+	L"mob/bat",
+
+	L"mob/horse/donkey",
+	L"mob/horse/horse_black",
+	L"mob/horse/horse_brown",
+	L"mob/horse/horse_chestnut",
+	L"mob/horse/horse_creamy",
+	L"mob/horse/horse_darkbrown",
+	L"mob/horse/horse_gray",
+	L"mob/horse/horse_markings_blackdots",
+	L"mob/horse/horse_markings_white",
+	L"mob/horse/horse_markings_whitedots",
+	L"mob/horse/horse_markings_whitefield",
+	L"mob/horse/horse_skeleton",
+	L"mob/horse/horse_white",
+	L"mob/horse/horse_zombie",
+	L"mob/horse/mule",
+	
+	L"mob/horse/armor/horse_armor_diamond",
+	L"mob/horse/armor/horse_armor_gold",
+	L"mob/horse/armor/horse_armor_iron",
+
+	L"mob/witch",
+
+	L"mob/wither/wither",
+	L"mob/wither/wither_armor",
+	L"mob/wither/wither_invulnerable",
+
+	L"item/trapped",
+	L"item/trapped_double",
+	//L"item/christmas",
+	//L"item/christmas_double",
+
 #ifdef _LARGE_WORLDS
 	L"misc/additionalmapicons",
 #endif
@@ -367,9 +408,28 @@ void Textures::bindTexture(const wstring &resourceName)
 }
 
 // 4J Added
-void Textures::bindTexture(int resourceId)
+void Textures::bindTexture(ResourceLocation *resource)
 {
-	bind(loadTexture(resourceId));
+	if(resource->isPreloaded())
+	{
+		bind(loadTexture(resource->getTexture()));
+	}
+	else
+	{
+		bind(loadTexture(TN_COUNT, resource->getPath()));
+	}
+}
+
+void Textures::bindTextureLayers(ResourceLocation *resource)
+{
+	assert(resource->isPreloaded());
+
+	int layers = resource->getTextureCount();
+
+	for( int i = 0; i < layers; i++ )
+	{
+		RenderManager.TextureBind(loadTexture(resource->getTexture(i)));
+	}
 }
 
 void Textures::bind(int id)
@@ -382,6 +442,26 @@ void Textures::bind(int id)
 	}
 }
 
+ResourceLocation *Textures::getTextureLocation(shared_ptr<Entity> entity)
+{
+	shared_ptr<ItemEntity> item = dynamic_pointer_cast<ItemEntity>(entity);
+	int iconType = item->getItem()->getIconType();
+	return getTextureLocation(iconType);
+}
+
+ResourceLocation *Textures::getTextureLocation(int iconType)
+{
+	switch(iconType)
+	{
+	case Icon::TYPE_TERRAIN:
+		return &TextureAtlas::LOCATION_BLOCKS;
+		break;
+	case Icon::TYPE_ITEM:
+		return &TextureAtlas::LOCATION_ITEMS;
+		break;
+	}
+}
+
 void Textures::clearLastBoundId()
 {
 	lastBoundId = -1;
@@ -1300,6 +1380,42 @@ TEXTURE_NAME TUImages[] =
 	TN_PARTICLES,
 	TN_MOB_ZOMBIE_VILLAGER,
 
+	TN_ITEM_LEASHKNOT,
+
+	TN_MISC_BEACON_BEAM,
+
+	TN_MOB_BAT,
+
+	TN_MOB_DONKEY,
+	TN_MOB_HORSE_BLACK,
+	TN_MOB_HORSE_BROWN,
+	TN_MOB_HORSE_CHESTNUT,
+	TN_MOB_HORSE_CREAMY,
+	TN_MOB_HORSE_DARKBROWN,
+	TN_MOB_HORSE_GRAY,
+	TN_MOB_HORSE_MARKINGS_BLACKDOTS,
+	TN_MOB_HORSE_MARKINGS_WHITE,
+	TN_MOB_HORSE_MARKINGS_WHITEDOTS,
+	TN_MOB_HORSE_MARKINGS_WHITEFIELD,
+	TN_MOB_HORSE_SKELETON,
+	TN_MOB_HORSE_WHITE,
+	TN_MOB_HORSE_ZOMBIE,
+	TN_MOB_MULE,
+	TN_MOB_HORSE_ARMOR_DIAMOND,
+	TN_MOB_HORSE_ARMOR_GOLD,
+	TN_MOB_HORSE_ARMOR_IRON,
+
+	TN_MOB_WITCH,
+
+	TN_MOB_WITHER,
+	TN_MOB_WITHER_ARMOR,
+	TN_MOB_WITHER_INVULNERABLE,
+
+	TN_TILE_TRAP_CHEST,
+	TN_TILE_LARGE_TRAP_CHEST,
+	//TN_TILE_XMAS_CHEST,	
+	//TN_TILE_LARGE_XMAS_CHEST,
+
 #ifdef _LARGE_WORLDS
 	TN_MISC_ADDITIONALMAPICONS,
 #endif
@@ -1324,6 +1440,8 @@ wchar_t *TUImagePaths[] =
 	L"armor/cloth_2.png",
 	L"armor/cloth_2_b.png",
 
+	//
+
 	NULL
 };