mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/LCE-Revelations.git
synced 2026-09-24 00:40:43 +00:00
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 <[email protected]>
This commit is contained in:
+13
-12
@@ -39,9 +39,9 @@ private:
|
||||
int updateMerchantTimer;
|
||||
bool addRecipeOnUpdate;
|
||||
int riches;
|
||||
wstring lastPlayerTradeName;
|
||||
wstring lastPlayerTradeName;
|
||||
|
||||
bool rewardPlayersOnFirstVillage;
|
||||
bool rewardPlayersOnFirstVillage;
|
||||
|
||||
private:
|
||||
|
||||
@@ -52,24 +52,25 @@ public:
|
||||
Villager(Level *level, int profession);
|
||||
~Villager();
|
||||
|
||||
protected:
|
||||
virtual void registerAttributes();
|
||||
|
||||
public:
|
||||
virtual bool useNewAi();
|
||||
|
||||
protected:
|
||||
virtual void serverAiMobStep();
|
||||
|
||||
public:
|
||||
virtual bool interact(shared_ptr<Player> player);
|
||||
virtual bool mobInteract(shared_ptr<Player> player);
|
||||
|
||||
protected:
|
||||
virtual void defineSynchedData();
|
||||
|
||||
public:
|
||||
virtual int getMaxHealth();
|
||||
virtual void addAdditonalSaveData(CompoundTag *tag);
|
||||
virtual void readAdditionalSaveData(CompoundTag *tag);
|
||||
|
||||
virtual int getTexture();
|
||||
|
||||
protected:
|
||||
virtual bool removeWhenFarAway();
|
||||
virtual int getAmbientSound();
|
||||
@@ -83,7 +84,7 @@ public:
|
||||
void setInLove(bool inLove);
|
||||
void setChasing(bool chasing);
|
||||
bool isChasing();
|
||||
void setLastHurtByMob(shared_ptr<Mob> mob);
|
||||
void setLastHurtByMob(shared_ptr<LivingEntity> mob);
|
||||
void die(DamageSource *source);
|
||||
|
||||
void handleEntityEvent(byte id);
|
||||
@@ -141,9 +142,9 @@ private:
|
||||
static int getPurchaseCost(int itemId, Random *random);
|
||||
|
||||
public:
|
||||
void finalizeMobSpawn();
|
||||
void setRewardPlayersInVillage();
|
||||
shared_ptr<AgableMob> getBreedOffspring(shared_ptr<AgableMob> target);
|
||||
|
||||
virtual int getDisplayName();
|
||||
virtual MobGroupData *finalizeMobSpawn(MobGroupData *groupData, int extraData = 0); // 4J Added extraData param
|
||||
virtual void setRewardPlayersInVillage();
|
||||
virtual shared_ptr<AgableMob> getBreedOffspring(shared_ptr<AgableMob> target);
|
||||
virtual bool canBeLeashed();
|
||||
virtual wstring getDisplayName();
|
||||
};
|
||||
Reference in New Issue
Block a user