diff --git a/build.gradle b/build.gradle index 3eade4447..23b5f1fa8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10-beta5" +version = "1.10-beta6" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockShortLampRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockShortLampRenderer.java index 83acde74b..aacbeb2f4 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockShortLampRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockShortLampRenderer.java @@ -65,7 +65,7 @@ public class BlockShortLampRenderer extends BlockRendererInterface { } @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {} + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer){} public static void setLampTexture(int meta){ TextureManager manager = Minecraft.getMinecraft().getTextureManager(); diff --git a/src/main/java/noppes/npcs/client/renderer/items/ItemBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/ItemBannerRenderer.java index c64393181..a99a09135 100644 --- a/src/main/java/noppes/npcs/client/renderer/items/ItemBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/items/ItemBannerRenderer.java @@ -36,6 +36,10 @@ public class ItemBannerRenderer implements IItemRenderer { GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glPushMatrix(); + if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON){ + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + GL11.glTranslatef(0, 0.44f, 0); GL11.glScalef(0.76f, 0.66f, 0.76f); GL11.glRotatef(180, 0, 0, 1); diff --git a/src/main/java/noppes/npcs/client/renderer/items/ItemBannerWallRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/ItemBannerWallRenderer.java index 5e2fc74b7..6de47be5b 100644 --- a/src/main/java/noppes/npcs/client/renderer/items/ItemBannerWallRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/items/ItemBannerWallRenderer.java @@ -34,6 +34,10 @@ public class ItemBannerWallRenderer implements IItemRenderer { TextureManager manager = Minecraft.getMinecraft().getTextureManager(); GL11.glPushMatrix(); + if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON){ + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + GL11.glTranslatef(0, 0.26f, 0.3f); GL11.glScalef(0.95f, 0.85f, 0.95f); GL11.glRotatef(180, 0, 0, 1); diff --git a/src/main/java/noppes/npcs/client/renderer/items/ItemCouchWoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/ItemCouchWoolRenderer.java index 481dcc4ef..2dd59dabe 100644 --- a/src/main/java/noppes/npcs/client/renderer/items/ItemCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/items/ItemCouchWoolRenderer.java @@ -38,6 +38,9 @@ public class ItemCouchWoolRenderer implements IItemRenderer { GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glPushMatrix(); + if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON){ + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } GL11.glTranslatef(0, 0.9f, 0.1f); GL11.glScalef(0.9f, 0.9f, 0.9f); diff --git a/src/main/java/noppes/npcs/client/renderer/items/ItemShortLampRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/ItemShortLampRenderer.java index b413c722f..00f00da84 100644 --- a/src/main/java/noppes/npcs/client/renderer/items/ItemShortLampRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/items/ItemShortLampRenderer.java @@ -31,6 +31,10 @@ public class ItemShortLampRenderer implements IItemRenderer { GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glPushMatrix(); + if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON){ + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + // Adjust transformation for inventory rendering. GL11.glTranslatef(0, 0.42f, 0); GL11.glScalef(0.76f, 0.76f, 0.76f); diff --git a/src/main/java/noppes/npcs/client/renderer/items/ItemTallLampRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/ItemTallLampRenderer.java index 2b891aa1a..a40705fac 100644 --- a/src/main/java/noppes/npcs/client/renderer/items/ItemTallLampRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/items/ItemTallLampRenderer.java @@ -35,6 +35,10 @@ public class ItemTallLampRenderer implements IItemRenderer { GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glPushMatrix(); + if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON){ + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + GL11.glTranslatef(0, 0.42f, 0); GL11.glScalef(0.76f, 0.66f, 0.76f); GL11.glRotatef(180, 0, 0, 1);