diff --git a/build.gradle b/build.gradle index 697319d96..26ea31100 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ configurations { apply plugin: 'forge' -version = "1.6.2" +version = "1.6.3-pre" group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 3ef146134..74807e73d 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Set; import java.util.UUID; -@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6.2") +@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6.3-pre") public class CustomNpcs { @ConfigProp(info = "Disable Chat Bubbles") diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index 41fb6f643..29173463e 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -185,6 +185,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene } else if(button.id == 11){ npc.display.skinOverlayData.overlayList.get(0).setGlow(button.getValue() == 0); + npc.display.skinOverlayData.overlayList.get(0).setBlend(button.getValue() == 0); initGui(); } else if(button.id == 14){ diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index a2f42a611..ef63d5492 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -259,7 +259,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); } - else if (itemstack2.getItem().isFull3D() && (customRenderer == null || pluginMod)) + else if (itemstack2.getItem().isFull3D() && !is3D) { var6 = 0.625F; @@ -367,7 +367,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); } - else if (itemstack2.getItem().isFull3D()) + else if (itemstack2.getItem().isFull3D() && !is3D) { var6 = 0.625F; diff --git a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java index 4412eb26c..11c21e8e1 100644 --- a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java +++ b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java @@ -77,8 +77,8 @@ public class ItemSoulstoneFilled extends Item { EntityNPCInterface npc = (EntityNPCInterface) entity; npc.ai.startPos = new int[]{x, y, z}; npc.setHealth(npc.getMaxHealth()); - npc.setPosition((float)x + 0.5F, npc.getStartYPos(), (float)z + 0.5F); - npc.advanced.soulStonePlayerName = player.getDisplayName(); + npc.setPosition((float)x + 0.5F, npc.getStartYPos() - 0.5, (float)z + 0.5F); + npc.advanced.soulStonePlayerName = player.getDisplayName(); npc.advanced.soulStoneInit = true; if(npc.advanced.role == EnumRoleType.Companion && player != null){ PlayerData data = PlayerDataController.instance.getPlayerData(player);