Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* 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 97a4399472.

* 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>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Minecraft.World/MeleeAttackGoal.cpp
View File

@@ -8,12 +8,12 @@
#include "net.minecraft.world.phys.h"
#include "MeleeAttackGoal.h"
void MeleeAttackGoal::_init(Mob *mob, float speed, bool trackTarget)
void MeleeAttackGoal::_init(PathfinderMob *mob, double speedModifier, bool trackTarget)
{
this->attackType = eTYPE_NOTSET;
this->mob = mob;
this->level = mob->level;
this->speed = speed;
level = mob->level;
this->speedModifier = speedModifier;
this->trackTarget = trackTarget;
setRequiredControlFlags(Control::MoveControlFlag | Control::LookControlFlag);
@@ -23,15 +23,15 @@ void MeleeAttackGoal::_init(Mob *mob, float speed, bool trackTarget)
timeToRecalcPath = 0;
}
MeleeAttackGoal::MeleeAttackGoal(Mob *mob, eINSTANCEOF attackType, float speed, bool trackTarget)
MeleeAttackGoal::MeleeAttackGoal(PathfinderMob *mob, eINSTANCEOF attackType, double speedModifier, bool trackTarget)
{
_init(mob, speed, trackTarget);
_init(mob, speedModifier, trackTarget);
this->attackType = attackType;
}
MeleeAttackGoal::MeleeAttackGoal(Mob *mob, float speed, bool trackTarget)
MeleeAttackGoal::MeleeAttackGoal(PathfinderMob *mob, double speedModifier, bool trackTarget)
{
_init(mob,speed,trackTarget);
_init(mob,speedModifier,trackTarget);
}
MeleeAttackGoal::~MeleeAttackGoal()
@@ -41,56 +41,56 @@ MeleeAttackGoal::~MeleeAttackGoal()
bool MeleeAttackGoal::canUse()
{
shared_ptr<Mob> bestTarget = mob->getTarget();
if (bestTarget == NULL) return false;
if(!bestTarget->isAlive()) return false;
if (attackType != eTYPE_NOTSET && (attackType & bestTarget->GetType()) != attackType) return false;
target = weak_ptr<Mob>(bestTarget);
shared_ptr<LivingEntity> target = mob->getTarget();
if (target == NULL) return false;
if (!target->isAlive()) return false;
if (attackType != NULL && !target->instanceof(attackType)) return false;
delete path;
path = mob->getNavigation()->createPath(target.lock());
path = mob->getNavigation()->createPath(target);
return path != NULL;
}
bool MeleeAttackGoal::canContinueToUse()
{
shared_ptr<Mob> bestTarget = mob->getTarget();
if (bestTarget == NULL) return false;
if (target.lock() == NULL || !target.lock()->isAlive()) return false;
shared_ptr<LivingEntity> target = mob->getTarget();
if (target == NULL) return false;
if (!target->isAlive()) return false;
if (!trackTarget) return !mob->getNavigation()->isDone();
if (!mob->isWithinRestriction(Mth::floor(target.lock()->x), Mth::floor(target.lock()->y), Mth::floor(target.lock()->z))) return false;
if (!mob->isWithinRestriction(Mth::floor(target->x), Mth::floor(target->y), Mth::floor(target->z))) return false;
return true;
}
void MeleeAttackGoal::start()
{
mob->getNavigation()->moveTo(path, speed);
mob->getNavigation()->moveTo(path, speedModifier);
path = NULL;
timeToRecalcPath = 0;
}
void MeleeAttackGoal::stop()
{
target = weak_ptr<Mob>();
mob->getNavigation()->stop();
}
void MeleeAttackGoal::tick()
{
mob->getLookControl()->setLookAt(target.lock(), 30, 30);
if (trackTarget || mob->getSensing()->canSee(target.lock()))
shared_ptr<LivingEntity> target = mob->getTarget();
mob->getLookControl()->setLookAt(target, 30, 30);
if (trackTarget || mob->getSensing()->canSee(target))
{
if (--timeToRecalcPath <= 0)
{
timeToRecalcPath = 4 + mob->getRandom()->nextInt(7);
mob->getNavigation()->moveTo(target.lock(), speed);
mob->getNavigation()->moveTo(target, speedModifier);
}
}
attackTime = max(attackTime - 1, 0);
double meleeRadiusSqr = (mob->bbWidth * 2) * (mob->bbWidth * 2);
if (mob->distanceToSqr(target.lock()->x, target.lock()->bb->y0, target.lock()->z) > meleeRadiusSqr) return;
double meleeRadiusSqr = (mob->bbWidth * 2) * (mob->bbWidth * 2) + target->bbWidth;
if (mob->distanceToSqr(target->x, target->bb->y0, target->z) > meleeRadiusSqr) return;
if (attackTime > 0) return;
attackTime = 20;
mob->doHurtTarget(target.lock());
if (mob->getCarriedItem() != NULL) mob->swing();
mob->doHurtTarget(target);
}