Merge branch 'KAMKEEL:master' into master

src/main/java/noppes/npcs/CustomItems.java

@@ -445,6 +445,9 @@ public class CustomItems {
 			Item.getItemFromBlock(sign).setHasSubtypes(true);
 			Item.getItemFromBlock(beam).setHasSubtypes(true);
 			Item.getItemFromBlock(pedestal).setHasSubtypes(true);
+
+			tabBlocks.item = Item.getItemFromBlock(couchWool);
+			tabBlocks.meta = 1;
 		}
 
 		banjo = new ItemMusicBanjo().setUnlocalizedName("npcBanjo").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcBanjo");
@@ -887,8 +890,6 @@ public class CustomItems {
 			tabArmor.item = cowarmor;
 			tabWeapon.item = CustomItems.shuriken;
 			tabMisc.item = CustomItems.coinGold;
-			tabBlocks.item = Item.getItemFromBlock(couchWool);
-			tabBlocks.meta = 1;
 		}
 		
 		tab.item = wand;

src/main/java/noppes/npcs/CustomNpcs.java

@@ -61,7 +61,7 @@ import noppes.npcs.entity.old.EntityNpcNagaMale;
 import noppes.npcs.entity.old.EntityNpcSkeleton;
 import noppes.npcs.scripted.wrapper.WrapperNpcAPI;
 
-@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.4.2")
+@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.5.1-beta")
 public class CustomNpcs {
 
 	@ConfigProp(info = "Disable Chat Bubbles")

src/main/java/noppes/npcs/ModelPartData.java

@@ -24,8 +24,9 @@ public class ModelPartData {
 		NBTTagCompound compound = new NBTTagCompound();
 		compound.setByte("Type", type);
 		compound.setInteger("Color", color);
-		if(texture != null && !texture.isEmpty())
+		if(texture != null && !texture.isEmpty()) {
 			compound.setString("Texture", texture);
+		}
 		compound.setBoolean("PlayerTexture", playerTexture);
 		return compound;
 	}
@@ -34,6 +35,9 @@ public class ModelPartData {
 		type = compound.getByte("Type");
 		color = compound.getInteger("Color");
 		texture = compound.getString("Texture");
+		if(texture.contains("moreplayermodels:textures")){
+			texture = texture.replace("moreplayermodels:textures", "customnpcs:textures/parts");
+		}
 		playerTexture = compound.getBoolean("PlayerTexture");
 		location = null;
 	}

src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java

@@ -12,11 +12,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.client.Client;
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.controllers.ClientCloneController;
-import noppes.npcs.client.gui.util.GuiNPCInterface;
-import noppes.npcs.client.gui.util.GuiNpcButton;
-import noppes.npcs.client.gui.util.GuiNpcLabel;
-import noppes.npcs.client.gui.util.GuiNpcTextField;
-import noppes.npcs.client.gui.util.IGuiData;
+import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumPacketServer;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -44,7 +40,8 @@ public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCall
 		
 
 		addLabel(new GuiNpcLabel(1, "Tab", guiLeft + 10, guiTop + 50));
-		addButton(new GuiNpcButton(2, guiLeft + 40, guiTop + 45, 20, 20, new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"}, tab - 1));
+		// addButton(new GuiNpcButton(2, guiLeft + 40, guiTop + 45, 20, 20, new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"}, tab - 1));
+		addButton(new GuiButtonBiDirectional(2, guiLeft + 40, guiTop + 45, 60, 20, new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"}, tab - 1));
 
 		addButton(new GuiNpcButton(3, guiLeft + 4, guiTop + 95, new String[]{"Client side", "Server side"}, serverSide?1:0));
 		

src/main/java/noppes/npcs/controllers/Dialog.java

@@ -60,7 +60,17 @@ public class Dialog implements ICompatibilty, IDialog {
 		else
 			showWheel = true;
 		disableEsc = compound.getBoolean("DialogDisableEsc");
-		darkenScreen = compound.getBoolean("DialogDarkenScreen");
+
+		if(compound.hasKey("DialogDarkScreen")) {
+			darkenScreen = compound.getBoolean("DialogDarkScreen");
+		}
+		else {
+			darkenScreen = true;
+		}
+		// Temporary Remove after Few Versions
+		if(compound.hasKey("DialogDarkenScreen")){
+			compound.removeTag("DialogDarkenScreen");
+		}
 
 		NBTTagList options = compound.getTagList("Options", 10);
 		HashMap<Integer,DialogOption> newoptions = new HashMap<Integer,DialogOption>();
@@ -92,7 +102,12 @@ public class Dialog implements ICompatibilty, IDialog {
 		compound.setBoolean("DialogHideNPC", hideNPC);
 		compound.setBoolean("DialogShowWheel", showWheel);
 		compound.setBoolean("DialogDisableEsc", disableEsc);
-		compound.setBoolean("DialogDarkenScreen", darkenScreen);
+
+		compound.setBoolean("DialogDarkScreen", darkenScreen);
+		// Temporary Remove after Few Versions
+		if(compound.hasKey("DialogDarkenScreen")){
+			compound.removeTag("DialogDarkenScreen");
+		}
 		
 		if(sound != null && !sound.isEmpty())
 			compound.setString("DialogSound", sound);