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, 12 insertions, 12 deletions

diff --git a/Minecraft.World/EnchantmentTableTile.h b/Minecraft.World/EnchantmentTableTile.h
index 43816cec..ec5c70bf 100644
--- a/Minecraft.World/EnchantmentTableTile.h
+++ b/Minecraft.World/EnchantmentTableTile.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "EntityTile.h"
+#include "BaseEntityTile.h"
 
 class ChunkRebuildData;
-class EnchantmentTableTile : public EntityTile
+class EnchantmentTableTile : public BaseEntityTile
 {
 	friend class ChunkRebuildData;
 public:
@@ -16,14 +16,14 @@ private:
 
 public:
 	EnchantmentTableTile(int id);
-	
-    virtual void updateDefaultShape(); // 4J Added override
-	bool isCubeShaped();
-    void animateTick(Level *level, int x, int y, int z, Random *random);
-    bool isSolidRender(bool isServerLevel = false);
-    Icon *getTexture(int face, int data);
-    shared_ptr<TileEntity> newTileEntity(Level *level);
-    bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); // 4J added soundOnly param
-	//@Override
-	void registerIcons(IconRegister *iconRegister);
+
+	virtual void updateDefaultShape(); // 4J Added override
+	virtual bool isCubeShaped();
+	virtual void animateTick(Level *level, int x, int y, int z, Random *random);
+	virtual bool isSolidRender(bool isServerLevel = false);
+	virtual Icon *getTexture(int face, int data);
+	virtual shared_ptr<TileEntity> newTileEntity(Level *level);
+	virtual bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); // 4J added soundOnly param
+	virtual void setPlacedBy(Level *level, int x, int y, int z, shared_ptr<LivingEntity> by, shared_ptr<ItemInstance> itemInstance);
+	virtual void registerIcons(IconRegister *iconRegister);
 };