Merge remote-tracking branch 'origin/dev' into dev

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-pre2")
+@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6.4")
 public class CustomNpcs {
 
     @ConfigProp(info = "Disable Chat Bubbles")
@@ -159,6 +159,9 @@ public class CustomNpcs {
 	@ConfigProp(info="Font size for custom fonts (doesn't work with minecrafts font)")
 	public static int FontSize = 18;
 
+    @ConfigProp(info = "Enables Overlay Mixins for Conflicts relating to Optifine or other Skin Renderers. If crashes occur, please disable.")
+    public static boolean EntityRendererMixin = true;
+
     public static FMLEventChannel Channel;
     public static FMLEventChannel ChannelPlayer;
     

src/main/java/noppes/npcs/NoppesUtilPlayer.java

@@ -330,6 +330,9 @@ public class NoppesUtilPlayer {
         Server.sendData(player, EnumPacketClient.GUI_DATA, data.writeNBT());
 	}
 	public static void questCompletion(EntityPlayerMP player, int questId) {
+		if(player == null)
+			return;
+
 		PlayerData playerData = PlayerDataController.instance.getPlayerData(player);
 		PlayerQuestData questData = playerData.questData;
 		QuestData data = questData.activeQuests.get(questId);
@@ -349,7 +352,10 @@ public class NoppesUtilPlayer {
 		while(var8.hasNext()) {
 			ItemStack item = (ItemStack)var8.next();
 			if (item.stackSize > 0) {
-				list.add(NpcAPI.Instance().getIItemStack(item));
+				IItemStack iStack = NpcAPI.Instance().getIItemStack(item);
+				if (iStack != null){
+					list.add(iStack);
+				}
 			}
 		}
 

src/main/java/noppes/npcs/ScriptPlayerEventHandler.java

@@ -379,8 +379,10 @@ public class ScriptPlayerEventHandler {
             Entity source = NoppesUtilServer.GetDamageSourcee(event.source);
             PlayerDataScript handler = ScriptController.Instance.playerScripts;
             if(event.entityLiving instanceof EntityPlayer) {
-                IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityLiving);
-                EventHooks.onPlayerDeath(handler,scriptPlayer, event.source, source);
+                try {
+                    IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityLiving);
+                    EventHooks.onPlayerDeath(handler,scriptPlayer, event.source, source);
+                } catch (Exception ignored) {}
             }
 
             if(source instanceof EntityPlayer) {

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){

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;
 

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);

src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java

@@ -1,5 +1,6 @@
 package noppes.npcs.mixin;
 
+import noppes.npcs.CustomNpcs;
 import org.spongepowered.asm.lib.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -32,9 +33,9 @@ public class CustomNPCsMixinPlugin implements IMixinConfigPlugin {
     @Override
     public List<String> getMixins() {
         List<String> mixins = new ArrayList<>();
-
-        mixins.add("MixinEntityRenderer");
-
+        if (CustomNpcs.EntityRendererMixin){
+            mixins.add("MixinEntityRenderer");
+        }
         return mixins;
     }