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, 9 deletions

diff --git a/Minecraft.World/PortalForcer.h b/Minecraft.World/PortalForcer.h
index feb2f129..a589d9b3 100644
--- a/Minecraft.World/PortalForcer.h
+++ b/Minecraft.World/PortalForcer.h
@@ -4,18 +4,27 @@ class Random;
 
 class PortalForcer
 {
-private:
-	Random *random;
-
 public:
-	// 4J Stu Added - Java has no ctor, but we need to initialise random
-	PortalForcer();
+	class PortalPosition : public Pos
+	{
+	public:
+		__int64 lastUsed;
 
-	void force(Level *level, shared_ptr<Entity> e);
+		PortalPosition(int x, int y, int z, __int64 time);
+	};
 
-public:
-	bool findPortal(Level *level, shared_ptr<Entity> e);
+private:
+	ServerLevel *level;
+	Random *random;
+	unordered_map<__int64, PortalPosition *> cachedPortals;
+	vector<__int64> cachedPortalKeys;
 
 public:
-	bool createPortal(Level *level, shared_ptr<Entity> e);
+	PortalForcer(ServerLevel *level);
+	~PortalForcer();
+
+	void force(shared_ptr<Entity> e, double xOriginal, double yOriginal, double zOriginal, float yRotOriginal);
+	bool findPortal(shared_ptr<Entity> e, double xOriginal, double yOriginal, double zOriginal, float yRotOriginal);
+	bool createPortal(shared_ptr<Entity> e);
+	void tick(__int64 time);
 };
\ No newline at end of file