Skip to content

Commit f90fb3b

Browse files
committed
fix: mask texture auto stuff
1 parent e20bfee commit f90fb3b

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

src/main/java/dev/pavatus/squid/client/renderers/GuardMaskFeatureRenderer.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package dev.pavatus.squid.client.renderers;
22

3-
import dev.pavatus.squid.SquidMod;
4-
import dev.pavatus.squid.client.models.GuardMaskModel;
5-
import dev.pavatus.squid.core.items.mask.MaskItem;
63
import net.fabricmc.api.EnvType;
74
import net.fabricmc.api.Environment;
85

@@ -21,13 +18,14 @@
2118
import net.minecraft.item.ItemStack;
2219
import net.minecraft.util.Identifier;
2320

21+
import dev.pavatus.squid.SquidMod;
22+
import dev.pavatus.squid.client.models.GuardMaskModel;
23+
import dev.pavatus.squid.core.items.mask.MaskItem;
24+
2425
@Environment(value = EnvType.CLIENT)
2526
public class GuardMaskFeatureRenderer<T extends LivingEntity, M extends PlayerEntityModel<T>>
2627
extends
2728
FeatureRenderer<T, M> {
28-
29-
private static final Identifier MASK_TEXTURE = new Identifier(SquidMod.MOD_ID,
30-
"textures/wearables/triangle_mask.png");
3129
private final GuardMaskModel model;
3230

3331
public GuardMaskFeatureRenderer(FeatureRendererContext<T, M> context, EntityModelLoader loader) {
@@ -40,7 +38,7 @@ public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsume
4038
float f, float g, float h, float j, float k, float l) {
4139
ItemStack stack = livingEntity.getEquippedStack(EquipmentSlot.HEAD);
4240

43-
if (!(stack.getItem() instanceof MaskItem))
41+
if (!(stack.getItem() instanceof MaskItem maskItem))
4442
return;
4543

4644
if (!(livingEntity instanceof AbstractClientPlayerEntity))
@@ -51,6 +49,9 @@ public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsume
5149
this.model.getPart().copyTransform(this.getContextModel().head);
5250
this.model.setAngles(livingEntity, f, g, j, k, l);
5351

52+
Identifier MASK_TEXTURE = new Identifier(SquidMod.MOD_ID,
53+
"textures/wearables/" + maskItem.getMaskType().asString() + "_mask.png");
54+
5455
VertexConsumer vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getEntitySmoothCutout(MASK_TEXTURE));
5556
this.model.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1f);
5657

src/main/java/dev/pavatus/squid/core/items/mask/MaskItem.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package dev.pavatus.squid.core.items.mask;
22

3-
import net.minecraft.entity.EquipmentSlot;
43

5-
import dev.pavatus.squid.core.items.WearableItem;
64
import net.minecraft.item.ArmorItem;
5+
import net.minecraft.util.StringIdentifiable;
6+
7+
import dev.pavatus.squid.core.items.WearableItem;
78

89
public class MaskItem extends WearableItem {
910
private final MaskType type;
@@ -18,9 +19,14 @@ public MaskType getMaskType() {
1819
return this.type;
1920
}
2021

21-
public enum MaskType {
22+
public enum MaskType implements StringIdentifiable {
2223
CIRCLE,
2324
TRIANGLE,
24-
SQUARE
25+
SQUARE;
26+
27+
@Override
28+
public String asString() {
29+
return this.name().toLowerCase().replace("_", " ");
30+
}
2531
}
2632
}

0 commit comments

Comments
 (0)