LegacyConsole/4jcraft
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-24 05:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.Client

Browse Source
This commit is contained in:
Tropical
2026-03-13 17:10:10 -05:00
parent 33d0737d1d
commit e8424f2000
531 changed files with 67709 additions and 62690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
Minecraft.Client/Player/RemotePlayer.cpp
View File

@@ -3,45 +3,39 @@
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Util/Mth.h"
RemotePlayer::RemotePlayer(Level *level, const std::wstring& name) : Player(level)
{
// 4J - added initialisers
hasStartedUsingItem = false;
lSteps = 0;
lx = ly = lz = lyr = lxr = 0.0;
fallTime = 0.0f;
RemotePlayer::RemotePlayer(Level* level, const std::wstring& name)
: Player(level) {
// 4J - added initialisers
hasStartedUsingItem = false;
lSteps = 0;
lx = ly = lz = lyr = lxr = 0.0;
fallTime = 0.0f;
this->name = name;
m_UUID = name;
app.DebugPrintf("Created RemotePlayer with name %ls\n", name.c_str() );
m_UUID = name;
app.DebugPrintf("Created RemotePlayer with name %ls\n", name.c_str());
heightOffset = 0;
this->footSize = 0;
if (name.length() > 0)
{
customTextureUrl = L"";//L"http://s3.amazonaws.com/MinecraftSkins/" + name + L".png";
if (name.length() > 0) {
customTextureUrl = L""; // L"http://s3.amazonaws.com/MinecraftSkins/" +
// name + L".png";
}
this->noPhysics = true;
this->noPhysics = true;
bedOffsetY = 4 / 16.0f;
this->viewScale = 10;
}
void RemotePlayer::setDefaultHeadHeight()
{
heightOffset = 0;
}
void RemotePlayer::setDefaultHeadHeight() { heightOffset = 0; }
bool RemotePlayer::hurt(DamageSource *source, int dmg)
{
return true;
}
bool RemotePlayer::hurt(DamageSource* source, int dmg) { return true; }
void RemotePlayer::lerpTo(double x, double y, double z, float yRot, float xRot, int steps)
{
// heightOffset = 0;
void RemotePlayer::lerpTo(double x, double y, double z, float yRot, float xRot,
int steps) {
// heightOffset = 0;
lx = x;
ly = y;
lz = z;
@@ -51,8 +45,7 @@ void RemotePlayer::lerpTo(double x, double y, double z, float yRot, float xRot,
lSteps = steps;
}
void RemotePlayer::tick()
{
void RemotePlayer::tick() {
bedOffsetY = 0 / 16.0f;
Player::tick();
@@ -64,50 +57,43 @@ void RemotePlayer::tick()
walkAnimSpeed += (wst - walkAnimSpeed) * 0.4f;
walkAnimPos += walkAnimSpeed;
if (!hasStartedUsingItem && isUsingItemFlag() && inventory->items[inventory->selected] != NULL)
{
std::shared_ptr<ItemInstance> item = inventory->items[inventory->selected];
startUsingItem(inventory->items[inventory->selected], Item::items[item->id]->getUseDuration(item));
hasStartedUsingItem = true;
}
else if (hasStartedUsingItem && !isUsingItemFlag())
{
stopUsingItem();
hasStartedUsingItem = false;
}
if (!hasStartedUsingItem && isUsingItemFlag() &&
inventory->items[inventory->selected] != NULL) {
std::shared_ptr<ItemInstance> item =
inventory->items[inventory->selected];
startUsingItem(inventory->items[inventory->selected],
Item::items[item->id]->getUseDuration(item));
hasStartedUsingItem = true;
} else if (hasStartedUsingItem && !isUsingItemFlag()) {
stopUsingItem();
hasStartedUsingItem = false;
}
// if (eatItem != null) {
// if (eatItemTickCount <= 25 && eatItemTickCount % 4 == 0) {
// spawnEatParticles(eatItem, 5);
// }
// eatItemTickCount--;
// if (eatItemTickCount <= 0) {
// spawnEatParticles(eatItem, 16);
// swing();
// eatItem = null;
// }
// }
// if (eatItem != null) {
// if (eatItemTickCount <= 25 && eatItemTickCount % 4 == 0) {
// spawnEatParticles(eatItem, 5);
// }
// eatItemTickCount--;
// if (eatItemTickCount <= 0) {
// spawnEatParticles(eatItem, 16);
// swing();
// eatItem = null;
// }
// }
}
float RemotePlayer::getShadowHeightOffs()
{
return 0;
}
float RemotePlayer::getShadowHeightOffs() { return 0; }
void RemotePlayer::aiStep()
{
void RemotePlayer::aiStep() {
Player::serverAiStep();
if (lSteps > 0)
{
if (lSteps > 0) {
double xt = x + (lx - x) / lSteps;
double yt = y + (ly - y) / lSteps;
double zt = z + (lz - z) / lSteps;
double yrd = lyr - yRot;
while (yrd < -180)
yrd += 360;
while (yrd >= 180)
yrd -= 360;
while (yrd < -180) yrd += 360;
while (yrd >= 180) yrd -= 360;
yRot += (float)((yrd) / lSteps);
xRot += (float)((lxr - xRot) / lSteps);
@@ -118,35 +104,29 @@ void RemotePlayer::aiStep()
}
oBob = bob;
float tBob = (float) Mth::sqrt(xd * xd + zd * zd);
float tTilt = (float) atan(-yd * 0.2f) * 15.0f;
float tBob = (float)Mth::sqrt(xd * xd + zd * zd);
float tTilt = (float)atan(-yd * 0.2f) * 15.0f;
if (tBob > 0.1f) tBob = 0.1f;
if (!onGround || getHealth() <= 0) tBob = 0;
if (onGround || getHealth() <= 0) tTilt = 0;
bob += (tBob - bob) * 0.4f;
tilt += (tTilt - tilt) * 0.8f;
}
// 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer Encountered: TU7: Content: Art: Aura of enchanted item is not displayed for other players in online game
void RemotePlayer::setEquippedSlot(int slot, std::shared_ptr<ItemInstance> item)
{
if (slot == 0)
{
// 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer
// Encountered: TU7: Content: Art: Aura of enchanted item is not displayed for
// other players in online game
void RemotePlayer::setEquippedSlot(int slot,
std::shared_ptr<ItemInstance> item) {
if (slot == 0) {
inventory->items[inventory->selected] = item;
}
else
{
} else {
inventory->armor[slot - 1] = item;
}
}
void RemotePlayer::animateRespawn()
{
// Player.animateRespawn(this, level);
void RemotePlayer::animateRespawn() {
// Player.animateRespawn(this, level);
}
float RemotePlayer::getHeadHeight()
{
return 1.82f;
}
float RemotePlayer::getHeadHeight() { return 1.82f; }