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

diff --git a/Minecraft.World/PistonMovingPiece.h b/Minecraft.World/PistonMovingPiece.h
index 1b1a61dc..cf64cabf 100644
--- a/Minecraft.World/PistonMovingPiece.h
+++ b/Minecraft.World/PistonMovingPiece.h
@@ -1,8 +1,8 @@
-#include "EntityTile.h"
+#include "BaseEntityTile.h"
 
 class PistonPieceEntity;
 
-class PistonMovingPiece : public EntityTile
+class PistonMovingPiece : public BaseEntityTile
 {
 public:
 	PistonMovingPiece(int id);
@@ -12,21 +12,21 @@ protected:
 
 public:
 	virtual void onPlace(Level *level, int x, int y, int z);
-    virtual void onRemove(Level *level, int x, int y, int z, int id, int data);
-    virtual bool mayPlace(Level *level, int x, int y, int z);
-    virtual bool mayPlace(Level *level, int x, int y, int z, int face);
-    virtual int getRenderShape();
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual bool isCubeShaped();
-    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 int getResource(int data, Random *random, int playerBonusLevel);
-    virtual void spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonus);
-    virtual void neighborChanged(Level *level, int x, int y, int z, int type);
-    static shared_ptr<TileEntity> newMovingPieceEntity(int block, int data, int facing, bool extending, bool isSourcePiston);
-    virtual AABB *getAABB(Level *level, int x, int y, int z);
-    virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>());	// 4J added forceData, forceEntity param
+	virtual void onRemove(Level *level, int x, int y, int z, int id, int data);
+	virtual bool mayPlace(Level *level, int x, int y, int z);
+	virtual bool mayPlace(Level *level, int x, int y, int z, int face);
+	virtual int getRenderShape();
+	virtual bool isSolidRender(bool isServerLevel = false);
+	virtual bool isCubeShaped();
+	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 int getResource(int data, Random *random, int playerBonusLevel);
+	virtual void spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonus);
+	virtual void neighborChanged(Level *level, int x, int y, int z, int type);
+	static shared_ptr<TileEntity> newMovingPieceEntity(int block, int data, int facing, bool extending, bool isSourcePiston);
+	virtual AABB *getAABB(Level *level, int x, int y, int z);
+	virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>());	// 4J added forceData, forceEntity param
 
-    AABB *getAABB(Level *level, int x, int y, int z, int tile, float progress, int facing);
+	AABB *getAABB(Level *level, int x, int y, int z, int tile, float progress, int facing);
 
 private:
 	shared_ptr<PistonPieceEntity> getEntity(LevelSource *level, int x, int y, int z);