LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-03 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.World

Browse Source
This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
Minecraft.World/Entities/MobEffectInstance.cpp
View File

@@ -1,139 +1,112 @@
#include "../Platform/stdafx.h"
#include "../Headers/net.minecraft.world.effect.h"
void MobEffectInstance::_init(int id, int duration, int amplifier)
{
this->id = id;
this->duration = duration;
this->amplifier = amplifier;
void MobEffectInstance::_init(int id, int duration, int amplifier) {
this->id = id;
this->duration = duration;
this->amplifier = amplifier;
}
MobEffectInstance::MobEffectInstance(int id)
{
_init(id, 0, 0);
MobEffectInstance::MobEffectInstance(int id) { _init(id, 0, 0); }
MobEffectInstance::MobEffectInstance(int id, int duration) {
_init(id, duration, 0);
}
MobEffectInstance::MobEffectInstance(int id, int duration)
{
_init(id, duration, 0);
MobEffectInstance::MobEffectInstance(int id, int duration, int amplifier) {
_init(id, duration, amplifier);
}
MobEffectInstance::MobEffectInstance(int id, int duration, int amplifier)
{
_init(id,duration,amplifier);
MobEffectInstance::MobEffectInstance(MobEffectInstance* copy) {
this->id = copy->id;
this->duration = copy->duration;
this->amplifier = copy->amplifier;
}
MobEffectInstance::MobEffectInstance(MobEffectInstance *copy)
{
this->id = copy->id;
this->duration = copy->duration;
this->amplifier = copy->amplifier;
void MobEffectInstance::update(MobEffectInstance* takeOver) {
if (this->id != takeOver->id) {
app.DebugPrintf(
"This method should only be called for matching effects!");
}
if (takeOver->amplifier > this->amplifier) {
this->amplifier = takeOver->amplifier;
this->duration = takeOver->duration;
} else if (takeOver->amplifier == this->amplifier &&
this->duration < takeOver->duration) {
this->duration = takeOver->duration;
}
}
void MobEffectInstance::update(MobEffectInstance *takeOver)
{
if (this->id != takeOver->id)
{
app.DebugPrintf("This method should only be called for matching effects!");
}
if (takeOver->amplifier > this->amplifier)
{
this->amplifier = takeOver->amplifier;
this->duration = takeOver->duration;
}
else if (takeOver->amplifier == this->amplifier && this->duration < takeOver->duration)
{
this->duration = takeOver->duration;
}
}
int MobEffectInstance::getId() { return id; }
int MobEffectInstance::getId()
{
return id;
}
int MobEffectInstance::getDuration() { return duration; }
int MobEffectInstance::getDuration()
{
return duration;
}
int MobEffectInstance::getAmplifier()
{
return amplifier;
}
int MobEffectInstance::getAmplifier() { return amplifier; }
/**
* Runs the effect on a Mob target.
*
* @param target
* @return True if the effect is still active.
*/
bool MobEffectInstance::tick(std::shared_ptr<Mob> target)
{
if (duration > 0)
{
if (MobEffect::effects[id]->isDurationEffectTick(duration, amplifier))
{
applyEffect(target);
}
tickDownDuration();
}
return duration > 0;
* Runs the effect on a Mob target.
*
* @param target
* @return True if the effect is still active.
*/
bool MobEffectInstance::tick(std::shared_ptr<Mob> target) {
if (duration > 0) {
if (MobEffect::effects[id]->isDurationEffectTick(duration, amplifier)) {
applyEffect(target);
}
tickDownDuration();
}
return duration > 0;
}
int MobEffectInstance::tickDownDuration()
{
return --duration;
int MobEffectInstance::tickDownDuration() { return --duration; }
void MobEffectInstance::applyEffect(std::shared_ptr<Mob> mob) {
if (duration > 0) {
MobEffect::effects[id]->applyEffectTick(mob, amplifier);
}
}
void MobEffectInstance::applyEffect(std::shared_ptr<Mob> mob)
{
if (duration > 0)
{
MobEffect::effects[id]->applyEffectTick(mob, amplifier);
}
}
int MobEffectInstance::getDescriptionId()
{
return MobEffect::effects[id]->getDescriptionId();
int MobEffectInstance::getDescriptionId() {
return MobEffect::effects[id]->getDescriptionId();
}
// 4J Added
int MobEffectInstance::getPostfixDescriptionId()
{
return MobEffect::effects[id]->getPostfixDescriptionId();
int MobEffectInstance::getPostfixDescriptionId() {
return MobEffect::effects[id]->getPostfixDescriptionId();
}
int MobEffectInstance::hashCode()
{
//return id;
int MobEffectInstance::hashCode() {
// return id;
// 4J Stu - Changed this to return a value that represents id, amp and duration
return (id & 0xff) | ( (amplifier & 0xff) << 8) | ( (duration & 0xffff) << 16);
// 4J Stu - Changed this to return a value that represents id, amp and
// duration
return (id & 0xff) | ((amplifier & 0xff) << 8) |
((duration & 0xffff) << 16);
}
std::wstring MobEffectInstance::toString()
{
std::wstring result = L"MobEffectInstance::toString - NON IMPLEMENTED OR LOCALISED FUNCTION";
//std::wstring result = "";
//if (getAmplifier() > 0)
//{
// result = getDescriptionId() + " x " + (getAmplifier() + 1) + ", Duration: " + getDuration();
//}
//else
//{
// result = getDescriptionId() + ", Duration: " + getDuration();
//}
//if (MobEffect.effects[id].isDisabled())
//{
// return "(" + result + ")";
//}
return result;
std::wstring MobEffectInstance::toString() {
std::wstring result =
L"MobEffectInstance::toString - NON IMPLEMENTED OR LOCALISED FUNCTION";
// std::wstring result = "";
// if (getAmplifier() > 0)
//{
// result = getDescriptionId() + " x " + (getAmplifier() + 1) + ",
//Duration: " + getDuration();
// }
// else
//{
// result = getDescriptionId() + ", Duration: " + getDuration();
// }
// if (MobEffect.effects[id].isDisabled())
//{
// return "(" + result + ")";
// }
return result;
}
// Was bool equals(Object obj)
bool MobEffectInstance::equals(MobEffectInstance *obj)
{
return this->id == obj->id && this->amplifier == obj->amplifier && this->duration == obj->duration;
bool MobEffectInstance::equals(MobEffectInstance* obj) {
return this->id == obj->id && this->amplifier == obj->amplifier &&
this->duration == obj->duration;
}