This commit is contained in:
Kr4ight
2026-04-07 21:32:22 +02:00
parent 70d7953b45
commit 243275b414
5 changed files with 28 additions and 14 deletions
@@ -11,6 +11,7 @@ import org.saturnclient.impl.cosmetics.utils.ShaderUtils;
import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.command.OrderedRenderCommandQueue;
import net.minecraft.client.render.entity.equipment.EquipmentModel; import net.minecraft.client.render.entity.equipment.EquipmentModel;
import net.minecraft.client.render.entity.equipment.EquipmentModelLoader; import net.minecraft.client.render.entity.equipment.EquipmentModelLoader;
import net.minecraft.client.render.entity.equipment.EquipmentModel.LayerType; import net.minecraft.client.render.entity.equipment.EquipmentModel.LayerType;
@@ -273,11 +274,11 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light, public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light,
PlayerEntityRenderState playerEntityRenderState, float f, float g) { PlayerEntityRenderState playerEntityRenderState, float f, float g) {
if (playerEntityRenderState.invisible || !playerEntityRenderState.capeVisible if (playerEntityRenderState.invisible || !playerEntityRenderState.capeVisible
|| playerEntityRenderState.skinTextures.capeTexture() != null) { || playerEntityRenderState.skinTextures.cape() != null) {
return; return;
} }
SaturnPlayer player = SaturnPlayer.get(playerEntityRenderState.name); SaturnPlayer player = SaturnPlayer.get(playerEntityRenderState.displayName.getString());
if (player == null) { if (player == null) {
return; return;
@@ -332,4 +333,10 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
matrixStack.pop(); matrixStack.pop();
} }
@Override
public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
float limbAngle, float limbDistance) {
}
} }
@@ -7,6 +7,7 @@ import org.saturnclient.impl.cosmetics.obj.ObjModel;
import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.command.OrderedRenderCommandQueue;
import net.minecraft.client.render.entity.feature.FeatureRenderer; import net.minecraft.client.render.entity.feature.FeatureRenderer;
import net.minecraft.client.render.entity.feature.FeatureRendererContext; import net.minecraft.client.render.entity.feature.FeatureRendererContext;
import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.render.entity.model.PlayerEntityModel;
@@ -19,10 +20,10 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
super(context); super(context);
} }
@Override // @Override
public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
PlayerEntityRenderState state, float limbAngle, float limbDistance) { PlayerEntityRenderState state, float limbAngle, float limbDistance) {
SaturnPlayer player = SaturnPlayer.get(state.name); SaturnPlayer player = SaturnPlayer.get(state.displayName.getString());
if (state.invisible || player == null || player.hat.isEmpty()) { if (state.invisible || player == null || player.hat.isEmpty()) {
return; return;
@@ -39,4 +40,9 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
matrices.pop(); matrices.pop();
} }
@Override
public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
float limbAngle, float limbDistance) {
}
} }
@@ -141,7 +141,7 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
if (entry == null) if (entry == null)
return null; return null;
return entry.getProfile().getName(); return entry.getProfile().name();
} }
@Override @Override
@@ -157,6 +157,6 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
if (entry == null) if (entry == null)
return null; return null;
return entry.getProfile().getId(); return entry.getProfile().id();
} }
} }
@@ -14,7 +14,9 @@ public interface TextMixin extends TextRef {
@Override @Override
public default TextRef withFont(IdentifierRef font) { public default TextRef withFont(IdentifierRef font) {
return (TextRef) (((Text) this).copy().setStyle(Style.EMPTY.withFont((Identifier) (Object) font))); // return (TextRef) (((Text)
// this).copy().setStyle(Style.EMPTY.withFont((Identifier) (Object) font)));
return this;
} }
@Override @Override
@@ -8,7 +8,6 @@ import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui.components.SkinPreview.EntityDrawer; import org.saturnclient.ui.components.SkinPreview.EntityDrawer;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.EntityRenderer; import net.minecraft.client.render.entity.EntityRenderer;
import net.minecraft.client.render.entity.state.EntityRenderState; import net.minecraft.client.render.entity.state.EntityRenderState;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
@@ -59,12 +58,12 @@ public class EntityDrawerImpl implements EntityDrawer {
public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, float scale, public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, float scale,
Vector3f translation, Quaternionf rotation, @Nullable Quaternionf overrideCameraAngle, Vector3f translation, Quaternionf rotation, @Nullable Quaternionf overrideCameraAngle,
LivingEntity entity) { LivingEntity entity) {
EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher(); // EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderDispatcher.getRenderer(entity); // EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderDispatcher.getRenderer(entity);
EntityRenderState entityRenderState = entityRenderer.getAndUpdateRenderState(entity, 1.0F); // EntityRenderState entityRenderState = entityRenderer.getAndUpdateRenderState(entity, 1.0F);
entityRenderState.hitbox = null; // entityRenderState.hitbox = null;
if (renderScope instanceof RenderScopeImpl i) // if (renderScope instanceof RenderScopeImpl i)
i.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2); // i.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2);
} }
} }