Skip to content

Refactor goggle rendering to stick to head #65

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
Usantia wants to merge 1 commit into
base: 1.21.1
Choose a base branch
from
Open

Refactor goggle rendering to stick to head #65

Show file tree
Hide file tree
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
19 changes: 10 additions & 9 deletions common/src/main/java/com/robocraft999/creategoggles/item/goggle/GoggleArmorLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import net.minecraft.world.entity.Pose;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import com.simibubi.create.AllPartialModels;

public class GoggleArmorLayer<T extends LivingEntity, M extends EntityModel<T>> extends RenderLayer<T, M> {

Expand All @@ -36,14 +37,15 @@ public void render(PoseStack ms, MultiBufferSource buffer, int light, LivingEnti

ItemStack stack = new ItemStack(AllItems.GOGGLES.get());

// Translate and rotate with our head
ms.pushPose();
ms.translate(model.head.x / 16.0, model.head.y / 16.0, model.head.z / 16.0);
ms.mulPose(Axis.YP.rotation(model.head.yRot));
ms.mulPose(Axis.XP.rotation(model.head.xRot));

// Translate and scale to our head
ms.translate(0, -0.25, -0.05);
// Translate and rotate to our head
model.head.translateAndRotate(ms);

// Translate offset
double zOffset = IGoggleHelmet.getGoggleZOffset(entity);
ms.translate(0.0D, -0.25D, (double) zOffset);

ms.mulPose(Axis.ZP.rotationDegrees(180.0f));
ms.scale(0.625f, 0.625f, 0.625f);

Expand All @@ -52,9 +54,8 @@ public void render(PoseStack ms, MultiBufferSource buffer, int light, LivingEnti
ms.translate(0, -0.25, 0);
}

// Render
Minecraft.getInstance().getItemRenderer().renderStatic(stack, ItemDisplayContext.HEAD, light, OverlayTexture.NO_OVERLAY, ms, buffer, Minecraft.getInstance().level, 0);
//Minecraft.getInstance().getItemRenderer().render(stack, ItemDisplayContext.HEAD, false, ms, buffer, light, OverlayTexture.NO_OVERLAY, AllPartialModels.GOGGLES.get());
Minecraft.getInstance().getItemRenderer().render(stack, ItemDisplayContext.HEAD, false, ms, buffer, light, OverlayTexture.NO_OVERLAY, AllPartialModels.GOGGLES.get());

ms.popPose();
}
}
25 changes: 24 additions & 1 deletion common/src/main/java/com/robocraft999/creategoggles/item/goggle/IGoggleHelmet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,27 @@ static boolean isGoggleHelmet(LivingEntity entity) {

return false;
}
}

static double getGoggleZOffset(LivingEntity entity) {
ItemStack headSlot = entity.getItemBySlot(EquipmentSlot.HEAD);

if (headSlot.is(CGTags.Items.GOGGLE)) {
return -0.05D;
}

if (Minecraft.getInstance().level != null) {
var optionalTrim = headSlot.get(DataComponents.TRIM);
if (optionalTrim != null &&
optionalTrim.pattern().is(CGTrimPatterns.GOGGLE_PATTERN) &&
optionalTrim.material().is(CGTrimPatterns.GOGGLE_MATERIAL)) {
return -0.05D;
}
}

if (entity instanceof Player player && player.isCreative()) {
return 0.0D;
}

return 0.05D;
}
}