vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: make slime block more accurate to decomp

Browse Source
This commit is contained in:
Fireblade
2026-08-02 15:06:34 -04:00
parent 30d7291310
commit 2c42b0cea3
6 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Entity.cpp
+13 -11
View File
@@ -898,17 +898,15 @@ void Entity::move(double xa, double ya, double za, bool noEntityCubes) // 4J -
checkFallDamage(ya, onGround);
if (xaOrg != xa) xd = 0;
if (yaOrg != ya) {
// Fireblade - updated logic here cause previous check completely broke head hitter logic
bool isSlimeBlock = false;
if (level != nullptr) {
int blockBelowX = Mth::floor(x);
int blockBelowY = Mth::floor(y - 0.1f - heightOffset);
int blockBelowZ = Mth::floor(z);
int blockId = level->getTile(blockBelowX, blockBelowY, blockBelowZ);
isSlimeBlock = (blockId == Tile::slimeBlock->id);
}
if (!isSlimeBlock) {
if (yaOrg != ya)
{
int xt = Mth::floor(x);
int yt = Mth::floor(y - 0.2f - heightOffset);
int zt = Mth::floor(z);
Tile *tile = Tile::tiles[level->getTile(xt, yt, zt)];
if (tile != nullptr) {
tile->updateEntityAfterFallOn(level, self);
} else {
yd = 0;
}
}
@@ -1117,6 +1115,10 @@ void Entity::causeFallDamage(float distance)
if (rider.lock() != nullptr) rider.lock()->causeFallDamage(distance);
}
void Entity::causeFallDamage(float distance, float multiplier)
{
if (rider.lock() != nullptr) rider.lock()->causeFallDamage(distance, multiplier);
}
bool Entity::isInWaterOrRain()
{
Minecraft.World/Entity.h
+1
View File
@@ -256,6 +256,7 @@ protected:
public:
bool isFireImmune();
void clearFallDamageQueue();
virtual void causeFallDamage(float distance, float multiplier); // from decomp
protected:
virtual void causeFallDamage(float distance);
Minecraft.World/LivingEntity.cpp
+5
View File
@@ -168,6 +168,7 @@ void LivingEntity::checkFallDamage(double ya, bool onGround)
if (onGround)
{
// TODO: LANDING PARTICLES HERE
int xt = Mth::floor(x);
int yt = Mth::floor(y - 0.2f - heightOffset);
int zt = Mth::floor(z);
@@ -188,6 +189,10 @@ void LivingEntity::checkFallDamage(double ya, bool onGround)
{
auto ent = shared_from_this();
Tile::tiles[t]->fallOn(level, xt, yt, zt, ent, fallDistance);
if (t == Tile::slimeBlock->id && !isSneaking())
{
m_clearFallDamageThisTick = true;
}
}
}
}
Minecraft.World/SlimeTile.cpp
+39 -34
View File
@@ -40,54 +40,59 @@ int SlimeTile::getPistonPushReaction()
void SlimeTile::fallOn(Level *level, int x, int y, int z,
shared_ptr<Entity> entity, float distance)
{
HalfTransparentTile::fallOn(level, x, y, z, entity, distance);
assert(entity != nullptr);
if (entity == nullptr)
return;
bool sneaking = entity->isSneaking();
entity->clearFallDamageQueue();
entity->fallDistance = 0.0f;
if (entity->isSneaking() || std::abs(entity->yd) < 0.1f)
if (!sneaking)
{
entity->yd = 0.0f;
return;
entity->causeFallDamage(distance, 0.0f); // no damage
}
if (entity->yd < 0.0f)
else
{
entity->yd = -entity->yd;
if (!(entity->instanceof(eTYPE_LIVINGENTITY)))
{
entity->yd *= 0.8f;
}
Tile::fallOn(level, x, y, z, entity, distance); // normal fall damage
}
}
void SlimeTile::stepOn(Level *level, int x, int y, int z, shared_ptr<Entity> entity)
{
if (entity != nullptr)
{
entity->clearFallDamageQueue();
assert(entity != nullptr);
if ((std::abs)(entity->yd) < 0.1) {
bool sneaking = entity->isSneaking();
if (!sneaking) {
double factor = (std::abs)(entity->yd) * 0.2 + 0.4;
entity->xd *= factor;
entity->zd *= factor;
}
}
if (entity != nullptr &&
std::abs(entity->yd) < 0.1f &&
!entity->isSneaking())
{
double d0 = 0.4 + std::abs(entity->yd) * 0.2;
entity->xd *= d0;
entity->zd *= d0;
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_MOB_SLIME_SMALL, 0.4f, 0.8f + level->random->nextFloat() * 0.4f);
}
HalfTransparentTile::stepOn(level, x, y, z, entity);
Tile::stepOn(level, x, y, z, entity);
}
void SlimeTile::updateEntityAfterFallOn(Level* level, shared_ptr<Entity> entity)
{
// stub
assert(entity != nullptr);
bool sneaking = entity->isSneaking();
if (!sneaking) {
if (!(entity->yd > -0.08 && entity->yd < 0.0))
{
if (entity->yd < 0.0)
{
entity->yd = -entity->yd; // bounce
}
}
else
{
Tile::updateEntityAfterFallOn(level, entity); // LAB_02a7a4e4 goto
}
}
else
{
Tile::updateEntityAfterFallOn(level, entity); // LAB_02a7a4e4 definition
}
}
Minecraft.World/SoundTypes.h
+1
View File
@@ -348,6 +348,7 @@ enum eMATERIALSOUND_TYPE
eMaterialSoundType_WOOD,
eMaterialSoundType_GRAVEL,
eMaterialSoundType_GRASS,
eMaterialSoundType_SLIME,
eMaterialSoundType_METAL,
eMaterialSoundType_GLASS,
eMaterialSoundType_CLOTH,
Minecraft.World/Tile.cpp
+8 -2
View File
@@ -370,7 +370,7 @@ void Tile::staticCtor()
Tile::SOUND_GRAVEL = new Tile::SoundType(eMaterialSoundType_GRAVEL, 1, 1);
Tile::SOUND_GRASS = new Tile::SoundType(eMaterialSoundType_GRASS, 1, 1);
Tile::SOUND_STONE = new Tile::SoundType(eMaterialSoundType_STONE, 1, 1);
Tile::SOUND_SLIME = new Tile::SoundType(eMaterialSoundType_STONE, 1, 1, eSoundType_MOB_SLIME_BIG, eSoundType_MOB_SLIME_BIG);
Tile::SOUND_SLIME = new Tile::SoundType(eMaterialSoundType_SLIME, 1, 1, eSoundType_MOB_SLIME_BIG, eSoundType_MOB_SLIME_BIG);
Tile::SOUND_METAL = new Tile::SoundType(eMaterialSoundType_STONE, 1, 1.5f);
Tile::SOUND_GLASS = new Tile::SoundType(eMaterialSoundType_STONE, 1, 1, eSoundType_RANDOM_GLASS,eSoundType_STEP_STONE);
Tile::SOUND_CLOTH = new Tile::SoundType(eMaterialSoundType_CLOTH, 1, 1);
@@ -1642,7 +1642,7 @@ void Tile::registerIcons(IconRegister *iconRegister)
void Tile::updateEntityAfterFallOn(Level *level, shared_ptr<Entity> entity)
{
if (!entity) return;
entity->fallDistance = 0.0f;
entity->yd = 0;
}
wstring Tile::getTileItemIconName()
@@ -1673,6 +1673,9 @@ Tile::SoundType::SoundType(eMATERIALSOUND_TYPE eMaterialSound, float volume, flo
case eMaterialSoundType_GRASS:
this->iBreakSound=eSoundType_DIG_GRASS;
break;
case eMaterialSoundType_SLIME:
this->iStepSound=eSoundType_MOB_SLIME_SMALL;
break;
case eMaterialSoundType_METAL:
this->iBreakSound=eSoundType_DIG_STONE;
break;
@@ -1722,6 +1725,9 @@ Tile::SoundType::SoundType(eMATERIALSOUND_TYPE eMaterialSound, float volume, flo
case eMaterialSoundType_GRASS:
this->iStepSound=eSoundType_STEP_GRASS;
break;
case eMaterialSoundType_SLIME:
this->iStepSound=eSoundType_MOB_SLIME_SMALL;
break;
case eMaterialSoundType_METAL:
this->iStepSound=eSoundType_STEP_METAL;
break;