From 62156910119ba03744c6047cd73d000a5c8cbbd0 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 12 Mar 2026 16:15:05 -0400 Subject: [PATCH] Fix up Rendering Util Positions --- GeckoLib | 2 +- .../npcgecko/client/ModelItemRenderUtil.java | 48 +++++++++++++------ .../mixin/impl/MixinCustomItemRenderer.java | 10 ++-- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/GeckoLib b/GeckoLib index 20067df..9db88c7 160000 --- a/GeckoLib +++ b/GeckoLib @@ -1 +1 @@ -Subproject commit 20067df5a1fe8f27bf9a8ef52f1ef53f86f113b9 +Subproject commit 9db88c7bd716e5a0ac813b8c06e3104877525e89 diff --git a/src/main/java/com/goodbird/npcgecko/client/ModelItemRenderUtil.java b/src/main/java/com/goodbird/npcgecko/client/ModelItemRenderUtil.java index 9e1b172..ddbc377 100644 --- a/src/main/java/com/goodbird/npcgecko/client/ModelItemRenderUtil.java +++ b/src/main/java/com/goodbird/npcgecko/client/ModelItemRenderUtil.java @@ -31,15 +31,28 @@ public class ModelItemRenderUtil { return ((IScriptCustomItem) iItemStack).hasCustomModel(); } + /** + * Undoes ForgeHooksClient's sprite path transforms and applies the simpler + * EQUIPPED_BLOCK translate instead. This normalizes the matrix state so that + * our EQUIPPED defaults work consistently regardless of arm bone orientation. + * + * Sprite path applies: translate(0,-0.3,0) → scale(1.5) → rotate(50,Y) → rotate(335,Z) → translate(-0.9375,-0.0625,0) + * We undo in reverse, then apply the block path: translate(-0.5,-0.5,-0.5) + */ + private static void normalizeEquipped() { + // Undo sprite path (reverse order) + GL11.glTranslatef(0.9375F, 0.0625F, 0.0F); + GL11.glRotatef(-335.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(-50.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(1.0F / 1.5F, 1.0F / 1.5F, 1.0F / 1.5F); + GL11.glTranslatef(0.0F, 0.3F, 0.0F); + // Apply old block path + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + } + /** * Attempts to render a gecko model for the given item. * Returns true if rendering was handled, false if the item has no gecko model. - * - * With shouldUseRenderHelper returning true for EQUIPPED_BLOCK, - * ForgeHooksClient only applies translate(-0.5, -0.5, -0.5) before calling us. - * Our per-type defaults below match GeoItemRenderer.renderItem() transforms. - * GeoItemStackRenderer.render() then applies the standard GeckoLib transforms - * (translate 0.5,0.5,0.5 + rotate 90 Y) matching GeoItemRenderer.render(). */ public static boolean tryRender(ItemRenderType type, ItemStack itemStack) { IItemStack iItemStack = NpcAPI.Instance().getIItemStack(itemStack); @@ -53,8 +66,14 @@ public class ModelItemRenderUtil { AnimatableStackWrapper wrapper = AnimatableStackWrapper.of(itemStack).withUserData(modelData); ItemDisplayTransform transform = resolveTransform(modelData, scriptCustomItem, type); - // Reset Resetting to the Upper Stack GL11.glPushMatrix(); + + // For equipped types, undo the sprite path and apply the block path + // so our tuned defaults work consistently across all arm orientations + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + normalizeEquipped(); + } + applyTranslate(transform, type); applyRotate(transform, type); applyScale(transform, type); @@ -78,10 +97,10 @@ public class ModelItemRenderUtil { GL11.glTranslatef(0.5F, 0.55F, 0.5F); break; case EQUIPPED: - GL11.glTranslatef(0.7F, 0.4F, 0.7F); + GL11.glTranslatef(0.75F, 0.4F, 0F); break; case INVENTORY: - GL11.glTranslatef(0F, 0.05F, 0F); + GL11.glTranslatef(0F, -0.1F, 0F); break; case ENTITY: GL11.glTranslatef(0F, 0.0F, 0F); @@ -102,9 +121,9 @@ public class ModelItemRenderUtil { GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); break; case EQUIPPED: - GL11.glRotatef(-65F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(20F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(33F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(-5F, 0.0F, 1.0F, 0.0F); break; case INVENTORY: GL11.glRotatef(-135F, 0.0F, 1.0F, 0.0F); @@ -132,15 +151,14 @@ public class ModelItemRenderUtil { GL11.glScalef(scale, scale, scale); break; case EQUIPPED: - scale = 2.5f; + scale = 1.0f; GL11.glScalef(scale, scale, scale); break; case INVENTORY: - scale = 1.65f; + scale = 1.5f; GL11.glScalef(scale, scale, scale); break; case ENTITY: - //GL11.glScalef(0F, -0.5F, 0F); break; default: break; diff --git a/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinCustomItemRenderer.java b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinCustomItemRenderer.java index 68f0a92..9110088 100644 --- a/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinCustomItemRenderer.java +++ b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinCustomItemRenderer.java @@ -22,10 +22,12 @@ public class MixinCustomItemRenderer { ) public void shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper, CallbackInfoReturnable cir) { if (ModelItemRenderUtil.hasGeckoModel(item)) { - // Return true for all helpers, matching GeoItemRenderer behavior. - // EQUIPPED_BLOCK → simple translate(-0.5) path in ForgeHooksClient - // INVENTORY_BLOCK → 3D isometric inventory rendering - cir.setReturnValue(true); + // Only override INVENTORY_BLOCK for 3D isometric inventory rendering. + // For EQUIPPED, keep the default sprite path — it handles all arm + // orientations correctly (player, zombie, NPC models). + if (helper == ItemRendererHelper.INVENTORY_BLOCK) { + cir.setReturnValue(true); + } } }