neoStudiosLCE/neoLegacy
1
0
Fork 0
mirror of https://git.neolegacy.dev/neoStudiosLCE/neoLegacy.git synced 2026-07-15 18:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'itsRevela/main' into upstream-merge

Browse Source 
# Conflicts:
#	Minecraft.Client/Common/Audio/SoundNames.cpp
#	Minecraft.Client/SheepRenderer.cpp
#	Minecraft.World/SoundTypes.h
#	README.md
#	cmake/CopyAssets.cmake
This commit is contained in:
George V.
2026-04-13 17:54:36 +03:00
parent edeb0d2230 5133925be0
commit 734f186cd3
56 changed files with 558 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.Client/SheepRenderer.cpp
View File

@@ -13,11 +13,10 @@ SheepRenderer::SheepRenderer(Model *model, Model *armor, float shadow) : MobRend
int SheepRenderer::prepareArmor(shared_ptr<LivingEntity> _sheep, int layer, float a)
{
// 4J - dynamic cast required because we aren't using templates/generics in our version
shared_ptr<Sheep> sheep = dynamic_pointer_cast<Sheep>(_sheep);
if (layer == 0 && !sheep->isSheared() &&
!sheep->isInvisibleTo(Minecraft::GetInstance()->player)) // 4J-JEV: Todo, merge with java fix (for invisible sheep armour) in '1.7.5'.
!sheep->isInvisibleTo(Minecraft::GetInstance()->player))
{
MemSect(31);
bindTexture(&SHEEP_FUR_LOCATION);
@@ -25,9 +24,8 @@ int SheepRenderer::prepareArmor(shared_ptr<LivingEntity> _sheep, int layer, floa
if (sheep->hasCustomName() && sheep->getCustomName().compare(L"jeb_") == 0)
{
// easter egg...
int colorDuration = 25;
int value = (sheep->tickCount / colorDuration);
int value = (sheep->tickCount / colorDuration) + sheep->entityId;
int c1 = value % Sheep::COLOR_LENGTH;
int c2 = (value + 1) % Sheep::COLOR_LENGTH;
float subStep = ((sheep->tickCount % colorDuration) + a) / static_cast<float>(colorDuration);
@@ -64,4 +62,4 @@ void SheepRenderer::render(shared_ptr<Entity> mob, double x, double y, double z,
ResourceLocation *SheepRenderer::getTextureLocation(shared_ptr<Entity> mob)
{
return &SHEEP_LOCATION;
}
}