Skip to content

fix MC-197260 causing armorstands to render dark #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrKinau wants to merge 1 commit into
base: 1.21.10
Choose a base branch
from
Open

fix MC-197260 causing armorstands to render dark #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions ...ient/java/dev/isxander/debugify/client/mixins/basic/mc197260/ArmorStandRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package dev.isxander.debugify.client.mixins.basic.mc197260;

import com.mojang.datafixers.util.Pair;
import dev.isxander.debugify.fixes.BugFix;
import dev.isxander.debugify.fixes.FixCategory;
import net.minecraft.client.Minecraft;
Expand All @@ -9,8 +8,6 @@
import net.minecraft.client.renderer.entity.state.ArmorStandRenderState;
import org.spongepowered.asm.mixin.Mixin;

import java.util.Comparator;
import java.util.stream.IntStream;
import net.minecraft.client.model.ArmorStandArmorModel;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.entity.ArmorStandRenderer;
Expand Down Expand Up @@ -39,13 +36,14 @@ protected ArmorStandRendererMixin(EntityRendererProvider.Context context) {
BlockPos mainPos = BlockPos.containing(livingEntity.x, livingEntity.y, livingEntity.z);
ClientLevel level = Minecraft.getInstance().level;

livingEntity.lightCoords = IntStream.of(-1, 0, 2, 3)
.mapToObj(operand -> {
BlockPos pos = mainPos.offset(0, operand, 0);
return Pair.of(level.getBrightness(LightLayer.BLOCK, pos), pos);
})
.max(Comparator.comparingInt(Pair::getFirst))
.map(p -> LightTexture.pack(p.getFirst(), level.getBrightness(LightLayer.SKY, p.getSecond())))
.orElse(livingEntity.lightCoords);
int maxSkyLight = 0;
int maxBlockLight = 0;
for (int offset : new int[] { -1, 0, 2, 3 }) {
BlockPos pos = mainPos.offset(0, offset, 0);
maxSkyLight = Math.max(maxSkyLight, level.getBrightness(LightLayer.SKY, pos));
maxBlockLight = Math.max(maxBlockLight, level.getBrightness(LightLayer.BLOCK, pos));
}

livingEntity.lightCoords = LightTexture.pack(maxBlockLight, maxSkyLight);
}
}