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, 8 insertions, 36 deletions

diff --git a/Minecraft.World/Inventory.h b/Minecraft.World/Inventory.h
index 9d1aa7e0..5c49e904 100644
--- a/Minecraft.World/Inventory.h
+++ b/Minecraft.World/Inventory.h
@@ -37,7 +37,6 @@ public:
 	shared_ptr<ItemInstance> getSelected();
 	// 4J-PB - Added for the in-game tooltips
 	bool IsHeldItem();
-
 	static int getSelectionSize();
 
 private:
@@ -45,16 +44,12 @@ private:
 	int getSlot(int tileId, int data);
 
 	int getSlotWithRemainingSpace(shared_ptr<ItemInstance> item);
-	
+
 public:
 	int getFreeSlot();
-
 	void grabTexture(int id, int data, bool checkData, bool mayReplace);
-
 	void swapPaint(int wheel);
-
-	void clearInventory();
-
+	int clearInventory(int id, int data);
 	void replaceSlot(Item *item, int data);
 
 private:
@@ -62,56 +57,37 @@ private:
 
 public:
 	void tick();
-
 	bool removeResource(int type);
 
 	// 4J-PB added to get the right resource from the inventory for removal
 	bool removeResource(int type,int iAuxVal);
 	void removeResources(shared_ptr<ItemInstance> item); // 4J Added for trading
-	
+
 	// 4J-Stu added to the get the item that would be affected by the removeResource functions
 	shared_ptr<ItemInstance> getResourceItem(int type);
 	shared_ptr<ItemInstance> getResourceItem(int type,int iAuxVal);
 
 	bool hasResource(int type);
-
 	void swapSlots(int from, int to);
-
 	bool add(shared_ptr<ItemInstance> item);
-
 	shared_ptr<ItemInstance> removeItem(unsigned int slot, int count);
 	virtual shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
-
 	void setItem(unsigned int slot, shared_ptr<ItemInstance> item);
-
 	float getDestroySpeed(Tile *tile);
-
 	ListTag<CompoundTag> *save(ListTag<CompoundTag> *listTag);
-
 	void load(ListTag<CompoundTag> *inventoryList);
-
 	unsigned int getContainerSize();
-
 	shared_ptr<ItemInstance> getItem(unsigned int slot);
-
-	int getName();
-
+	wstring getName();
+	wstring getCustomName();
+	bool hasCustomName();
 	int getMaxStackSize();
-
-	int getAttackDamage(shared_ptr<Entity> entity);
-
 	bool canDestroy(Tile *tile);
-
 	shared_ptr<ItemInstance> getArmor(int layer);
-
 	int getArmorValue();
-
-	void hurtArmor(int dmg);
-
+	void hurtArmor(float dmg);
 	void dropAll();
-
 	void setChanged();
-
 	bool isSame(shared_ptr<Inventory> copy);
 
 private:
@@ -119,17 +95,13 @@ private:
 
 public:
 	shared_ptr<Inventory> copy();
-
 	void setCarried(shared_ptr<ItemInstance> carried);
-
 	shared_ptr<ItemInstance> getCarried();
-
 	bool stillValid(shared_ptr<Player> player);
-
 	bool contains(shared_ptr<ItemInstance> itemInstance);
-
 	virtual void startOpen();
 	virtual void stopOpen();
+	bool canPlaceItem(int slot, shared_ptr<ItemInstance> item);
 	void replaceWith(shared_ptr<Inventory> other);
 
 	int countMatches(shared_ptr<ItemInstance> itemInstance); // 4J Added