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

diff --git a/Minecraft.World/ButtonTile.h b/Minecraft.World/ButtonTile.h
index e06158e0..96c49cdf 100644
--- a/Minecraft.World/ButtonTile.h
+++ b/Minecraft.World/ButtonTile.h
@@ -19,13 +19,13 @@ protected:
 public:
 	Icon *getTexture(int face, int data);
 	virtual AABB *getAABB(Level *level, int x, int y, int z);
-    virtual int getTickDelay();
-    virtual bool blocksLight();
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual bool isCubeShaped();
-    virtual bool mayPlace(Level *level, int x, int y, int z, int face);
-    virtual bool mayPlace(Level *level, int x, int y, int z);
-    virtual int getPlacedOnFaceDataValue(Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, int itemValue);
+	virtual int getTickDelay(Level *level);
+	virtual bool blocksLight();
+	virtual bool isSolidRender(bool isServerLevel = false);
+	virtual bool isCubeShaped();
+	virtual bool mayPlace(Level *level, int x, int y, int z, int face);
+	virtual bool mayPlace(Level *level, int x, int y, int z);
+	virtual int getPlacedOnFaceDataValue(Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, int itemValue);
 
 private:
 	int findFace(Level *level, int x, int y, int z);
@@ -37,30 +37,30 @@ private:
 	bool checkCanSurvive(Level *level, int x, int y, int z);
 
 public:
-    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 updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>());	// 4J added forceData, forceEntity param
 
 private:
 	void updateShape(int data);
 
 public:
-    virtual void attack(Level *level, int x, int y, int z, shared_ptr<Player> player);
+	virtual void attack(Level *level, int x, int y, int z, shared_ptr<Player> player);
 	virtual bool TestUse();
-    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 onRemove(Level *level, int x, int y, int z, int id, int data);
-    virtual bool getSignal(LevelSource *level, int x, int y, int z, int dir);
-    virtual bool getDirectSignal(Level *level, int x, int y, int z, int dir);
-    virtual bool isSignalSource();
-    virtual void tick(Level *level, int x, int y, int z, Random *random);
-    virtual void updateDefaultShape();
+	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 onRemove(Level *level, int x, int y, int z, int id, int data);
+	virtual int getSignal(LevelSource *level, int x, int y, int z, int dir);
+	virtual int getDirectSignal(LevelSource *level, int x, int y, int z, int dir);
+	virtual bool isSignalSource();
+	virtual void tick(Level *level, int x, int y, int z, Random *random);
+	virtual void updateDefaultShape();
 	void entityInside(Level *level, int x, int y, int z, shared_ptr<Entity> entity);
 
 private:
 	void checkPressed(Level *level, int x, int y, int z);
-    void updateNeighbours(Level *level, int x, int y, int z, int dir);
+	void updateNeighbours(Level *level, int x, int y, int z, int dir);
 
 public:
 	void registerIcons(IconRegister *iconRegister);
-	
+
 	// 4J Added so we can check before we try to add a tile to the tick list if it's actually going to do seomthing
 	virtual bool shouldTileTick(Level *level, int x,int y,int z);
 };
\ No newline at end of file