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

diff --git a/Minecraft.World/Wolf.h b/Minecraft.World/Wolf.h
index 52f2a23b..edfd3814 100644
--- a/Minecraft.World/Wolf.h
+++ b/Minecraft.World/Wolf.h
@@ -15,6 +15,7 @@ private:
     static const int DATA_HEALTH_ID = 18;
 	static const int DATA_INTERESTED_ID = 19;
 	static const int DATA_COLLAR_COLOR = 20;
+
     static const int START_HEALTH = 8;
     static const int MAX_HEALTH = 20;
     static const int TAME_HEALTH = 20;
@@ -25,26 +26,24 @@ private:
 
 public:
 	Wolf(Level *level);
-	virtual bool useNewAi();
-	virtual void setTarget(shared_ptr<Mob> target);
 
 protected:
-	virtual void serverAiMobStep();
+	virtual void registerAttributes();
 
 public:
-	virtual int getMaxHealth();
+	virtual bool useNewAi();
+	virtual void setTarget(shared_ptr<LivingEntity> target);
 
 protected:
+	virtual void serverAiMobStep();
 	virtual void defineSynchedData();
-	virtual bool makeStepSound();
+	virtual void playStepSound(int xt, int yt, int zt, int t);
 
 public:
-	virtual int getTexture();		// 4J - changed from wstring to ing
 	virtual void addAdditonalSaveData(CompoundTag *tag);
 	virtual void readAdditionalSaveData(CompoundTag *tag);
 
 protected:
-	virtual bool removeWhenFarAway();
 	virtual int getAmbientSound();
 	virtual int getHurtSound();
 	virtual int getDeathSound();
@@ -60,9 +59,10 @@ public:
 	float getHeadRollAngle(float a);
 	float getHeadHeight();
 	int getMaxHeadXRot();
-	virtual bool hurt(DamageSource *source, int dmg);
+	virtual bool hurt(DamageSource *source, float dmg);
 	virtual bool doHurtTarget(shared_ptr<Entity> target);
-	virtual bool interact(shared_ptr<Player> player);
+	virtual void setTame(bool value);
+	virtual bool mobInteract(shared_ptr<Player> player);
 	virtual void handleEntityEvent(byte id);
 	float getTailAngle();
 	virtual bool isFood(shared_ptr<ItemInstance> item);
@@ -83,4 +83,10 @@ public:
 	virtual void setIsInterested(bool isInterested);
 	virtual bool canMate(shared_ptr<Animal> animal);
 	bool isInterested();
+
+protected:
+	virtual bool removeWhenFarAway();
+
+public:
+	virtual bool wantsToAttack(shared_ptr<LivingEntity> target, shared_ptr<LivingEntity> owner);
 };