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, 54 insertions, 45 deletions

diff --git a/Minecraft.Client/ServerPlayer.h b/Minecraft.Client/ServerPlayer.h
index a9b37594..57ea8947 100644
--- a/Minecraft.Client/ServerPlayer.h
+++ b/Minecraft.Client/ServerPlayer.h
@@ -10,6 +10,10 @@ class Stat;
 class TileEntity;
 class Entity;
 class BrewingStandTileEntity;
+class HopperTileEntity;
+class MinecartHopper;
+class BeaconTileEntity;
+class EntityHorse;
 class Merchant;
 using namespace std;
 
@@ -18,24 +22,26 @@ class ServerPlayer : public Player, public net_minecraft_world_inventory::Contai
 public:
 	eINSTANCEOF GetType() { return eTYPE_SERVERPLAYER; }
 	shared_ptr<PlayerConnection> connection;
-    MinecraftServer *server;
-    ServerPlayerGameMode *gameMode;
-    double lastMoveX, lastMoveZ;
-    list<ChunkPos> chunksToSend;
+	MinecraftServer *server;
+	ServerPlayerGameMode *gameMode;
+	double lastMoveX, lastMoveZ;
+	list<ChunkPos> chunksToSend;
 	vector<int> entitiesToRemove;
-    unordered_set<ChunkPos, ChunkPosKeyHash, ChunkPosKeyEq> seenChunks;
-    int spewTimer;
+	unordered_set<ChunkPos, ChunkPosKeyHash, ChunkPosKeyEq> seenChunks;
+	int spewTimer;
 
 	// 4J-Added, for 'Adventure Time' achievement.
 	Biome *currentBiome;
 
 private:
-	int lastSentHealth;
+	float lastRecordedHealthAndAbsorption;
+	float lastSentHealth;
 	int lastSentFood;
 	bool lastFoodSaturationZero;
 	int lastSentExp;
-    int invulnerableTime;
+	int invulnerableTime;
 	int viewDistance;
+	__int64 lastActionTime;
 	int lastBrupSendTickCount; // 4J Added
 
 public:
@@ -45,39 +51,34 @@ public:
 
 	virtual void readAdditionalSaveData(CompoundTag *entityTag);
 	virtual void addAdditonalSaveData(CompoundTag *entityTag);
-	virtual void withdrawExperienceLevels(int amount);
-    void initMenu();
+	virtual void giveExperienceLevels(int amount);
+	void initMenu();
 
-private:
-	ItemInstanceArray lastCarried;
-
-public:
-	virtual ItemInstanceArray getEquipmentSlots();
 protected:
 	virtual void setDefaultHeadHeight();
 public:
 	virtual float getHeadHeight();
-    virtual void tick();
+	virtual void tick();
 	void flushEntitiesToRemove();
-    virtual shared_ptr<ItemInstance> getCarried(int slot);
-    virtual void die(DamageSource *source);
-    virtual bool hurt(DamageSource *dmgSource, int dmg);
-	virtual bool isPlayerVersusPlayer();
-    void doTick(bool sendChunks, bool dontDelayChunks = false, bool ignorePortal = false);
+	virtual shared_ptr<ItemInstance> getCarried(int slot);
+	virtual void die(DamageSource *source);
+	virtual bool hurt(DamageSource *dmgSource, float dmg);
+	virtual bool canHarmPlayer(shared_ptr<Player> target);
+	bool canHarmPlayer(wstring targetName); // 4J: Added
+	void doTick(bool sendChunks, bool dontDelayChunks = false, bool ignorePortal = false);
 	void doTickA();
 	void doChunkSendingTick(bool dontDelayChunks);
-	void doTickB(bool ignorePortal);
+	void doTickB();
 	virtual void changeDimension(int i);
 private:
 	void broadcast(shared_ptr<TileEntity> te, bool delay = false);
 public:
-    virtual void take(shared_ptr<Entity> e, int orgCount);
-    virtual void swing();
+	virtual void take(shared_ptr<Entity> e, int orgCount);
 	virtual BedSleepingResult startSleepInBed(int x, int y, int z, bool bTestUse = false);
 
 public:
 	virtual void stopSleepInBed(bool forcefulWakeUp, bool updateLevelList, bool saveRespawnPoint);
-    virtual void ride(shared_ptr<Entity> e);
+	virtual void ride(shared_ptr<Entity> e);
 protected:
 	virtual void checkFallDamage(double ya, bool onGround);
 public:
@@ -94,28 +95,34 @@ private:
 	void nextContainerCounter();
 
 public:
+	virtual void openTextEdit(shared_ptr<TileEntity> sign);
 	virtual bool startCrafting(int x, int y, int z);					// 4J added bool return
-	virtual bool startEnchanting(int x, int y, int z);					// 4J added bool return
+	virtual bool openFireworks(int x, int y, int z);					// 4J added
+	virtual bool startEnchanting(int x, int y, int z, const wstring &name);					// 4J added bool return
 	virtual bool startRepairing(int x, int y, int z);					// 4J added bool return
-    virtual bool openContainer(shared_ptr<Container> container);		// 4J added bool return
-    virtual bool openFurnace(shared_ptr<FurnaceTileEntity> furnace);	// 4J added bool return
-    virtual bool openTrap(shared_ptr<DispenserTileEntity> trap);		// 4J added bool return
+	virtual bool openContainer(shared_ptr<Container> container);		// 4J added bool return
+	virtual bool openHopper(shared_ptr<HopperTileEntity> container);
+	virtual bool openHopper(shared_ptr<MinecartHopper> container);
+	virtual bool openFurnace(shared_ptr<FurnaceTileEntity> furnace);	// 4J added bool return
+	virtual bool openTrap(shared_ptr<DispenserTileEntity> trap);		// 4J added bool return
 	virtual bool openBrewingStand(shared_ptr<BrewingStandTileEntity> brewingStand); // 4J added bool return
-	virtual bool openTrading(shared_ptr<Merchant> traderTarget); // 4J added bool return
-    virtual void slotChanged(AbstractContainerMenu *container, int slotIndex, shared_ptr<ItemInstance> item);
-    void refreshContainer(AbstractContainerMenu *menu);
-    virtual void refreshContainer(AbstractContainerMenu *container, vector<shared_ptr<ItemInstance> > *items);
-    virtual void setContainerData(AbstractContainerMenu *container, int id, int value);
-    virtual void closeContainer();
-    void broadcastCarriedItem();
-    void doCloseContainer();
-    void setPlayerInput(float xa, float ya, bool jumping, bool sneaking, float xRot, float yRot);
+	virtual bool openBeacon(shared_ptr<BeaconTileEntity> beacon);
+	virtual bool openTrading(shared_ptr<Merchant> traderTarget, const wstring &name); // 4J added bool return
+	virtual bool openHorseInventory(shared_ptr<EntityHorse> horse, shared_ptr<Container> container);
+	virtual void slotChanged(AbstractContainerMenu *container, int slotIndex, shared_ptr<ItemInstance> item);
+	void refreshContainer(AbstractContainerMenu *menu);
+	virtual void refreshContainer(AbstractContainerMenu *container, vector<shared_ptr<ItemInstance> > *items);
+	virtual void setContainerData(AbstractContainerMenu *container, int id, int value);
+	virtual void closeContainer();
+	void broadcastCarriedItem();
+	void doCloseContainer();
+	void setPlayerInput(float xa, float ya, bool jumping, bool sneaking);
 
 	virtual void awardStat(Stat *stat, byteArray param);
 
 	void disconnect();
-    void resetSentInfo();
-    virtual void displayClientMessage(int messageId);
+	void resetSentInfo();
+	virtual void displayClientMessage(int messageId);
 
 protected:
 	virtual void completeUsingItem();
@@ -126,24 +133,26 @@ public:
 
 protected:
 	virtual void onEffectAdded(MobEffectInstance *effect);
-	virtual void onEffectUpdated(MobEffectInstance *effect);
+	virtual void onEffectUpdated(MobEffectInstance *effect, bool doRefreshAttributes);
 	virtual void onEffectRemoved(MobEffectInstance *effect);
 
 public:
 	virtual void teleportTo(double x, double y, double z);
-    virtual void crit(shared_ptr<Entity> entity);
-    virtual void magicCrit(shared_ptr<Entity> entity);
+	virtual void crit(shared_ptr<Entity> entity);
+	virtual void magicCrit(shared_ptr<Entity> entity);
 
 	void onUpdateAbilities();
 	ServerLevel *getLevel();
 	void setGameMode(GameType *mode);
 	void sendMessage(const wstring& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, int customData = -1, const wstring& additionalMessage = L"");
 	bool hasPermission(EGameCommand command);
-	// 4J - Don't use
-	//void updateOptions(shared_ptr<ClientInformationPacket> packet);
+	// bool hasPermission(int permissionLevel, EGameCommand command);
+	//void updateOptions(shared_ptr<ClientInformationPacket> packet); // 4J: Don't use
 	int getViewDistance();
 	//bool canChatInColor();
 	//int getChatVisibility();
+	Pos *getCommandSenderWorldPosition();
+	void resetLastActionTime();
 
 public: