Fix some itemstack display name crashes for furniture. Closes #44

grim3212 · Sep 20, 2016 · f78ab5b · f78ab5b
1 parent e48a1fc
commit f78ab5b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "1.8.9-1.0.0.0"
+version = "1.8.9-1.0.0.2"
 group= "com.grim3212.mc" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Grim Pack"
 

diff --git a/src/main/java/com/grim3212/mc/core/GrimCore.java b/src/main/java/com/grim3212/mc/core/GrimCore.java
@@ -30,7 +30,7 @@ public class GrimCore extends GrimPart {
 
 	public static final String modID = "grimcore";
 	public static final String modName = "Grim Core";
-	public static final String modVersion = "1.0.0.1";
+	public static final String modVersion = "1.0.0.2";
 
 	public GrimCore() {
 		super(GrimCore.modID, GrimCore.modName, GrimCore.modVersion);

diff --git a/src/main/java/com/grim3212/mc/decor/item/ItemFireplaceBase.java b/src/main/java/com/grim3212/mc/decor/item/ItemFireplaceBase.java
@@ -9,7 +9,6 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -77,11 +76,11 @@ public String getUnlocalizedName(ItemStack stack) {
 	public String getItemStackDisplayName(ItemStack stack) {
 		ItemStack toPlaceStack = new ItemStack(Block.getBlockById(NBTHelper.getInt(stack, "blockID")), 1, NBTHelper.getInt(stack, "blockMeta"));
 
-		if (toPlaceStack.getItem() != Item.getItemFromBlock(Blocks.air)) {
+		if (toPlaceStack.getItem() != null) {
 			return StatCollector.translateToLocal(toPlaceStack.getDisplayName() + " " + StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name"));
+		} else {
+			return StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name");
 		}
-
-		return super.getItemStackDisplayName(stack);
 	}
 
 	@Override

diff --git a/src/main/java/com/grim3212/mc/decor/item/ItemFurniture.java b/src/main/java/com/grim3212/mc/decor/item/ItemFurniture.java
@@ -79,7 +79,13 @@ public String getUnlocalizedName(ItemStack stack) {
 
 	@Override
 	public String getItemStackDisplayName(ItemStack stack) {
-		return StatCollector.translateToLocal(new ItemStack(Block.getBlockById(NBTHelper.getInt(stack, "blockID")), 1, NBTHelper.getInt(stack, "blockMeta")).getDisplayName()) + " " + StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name");
+		ItemStack toPlaceStack = new ItemStack(Block.getBlockById(NBTHelper.getInt(stack, "blockID")), 1, NBTHelper.getInt(stack, "blockMeta"));
+
+		if (toPlaceStack.getItem() != null) {
+			return StatCollector.translateToLocal(toPlaceStack.getDisplayName() + " " + StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name"));
+		} else {
+			return StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name");
+		}
 	}
 
 	@Override

diff --git a/src/main/java/com/grim3212/mc/decor/item/ItemGrill.java b/src/main/java/com/grim3212/mc/decor/item/ItemGrill.java
@@ -75,7 +75,13 @@ public String getUnlocalizedName(ItemStack stack) {
 
 	@Override
 	public String getItemStackDisplayName(ItemStack stack) {
-		return StatCollector.translateToLocal(new ItemStack(Block.getBlockById(NBTHelper.getInt(stack, "blockID")), 1, NBTHelper.getInt(stack, "blockMeta")).getDisplayName()) + " " + StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name");
+		ItemStack toPlaceStack = new ItemStack(Block.getBlockById(NBTHelper.getInt(stack, "blockID")), 1, NBTHelper.getInt(stack, "blockMeta"));
+
+		if (toPlaceStack.getItem() != null) {
+			return StatCollector.translateToLocal(toPlaceStack.getDisplayName() + " " + StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name"));
+		} else {
+			return StatCollector.translateToLocal(this.block.getUnlocalizedName() + ".name");
+		}
 	}
 
 	@Override

diff --git a/src/main/java/com/grim3212/mc/decor/item/ItemLampPost.java b/src/main/java/com/grim3212/mc/decor/item/ItemLampPost.java
@@ -111,7 +111,13 @@ public String getUnlocalizedName(ItemStack stack) {
 
 	@Override
 	public String getItemStackDisplayName(ItemStack stack) {
-		return StatCollector.translateToLocal(new ItemStack(Block.getBlockById(NBTHelper.getInt(stack, "blockID")), 1, NBTHelper.getInt(stack, "blockMeta")).getDisplayName()) + " " + StatCollector.translateToLocal(DecorItems.lamp_item.getUnlocalizedName() + ".name");
+		ItemStack toPlaceStack = new ItemStack(Block.getBlockById(NBTHelper.getInt(stack, "blockID")), 1, NBTHelper.getInt(stack, "blockMeta"));
+
+		if (toPlaceStack.getItem() != null) {
+			return StatCollector.translateToLocal(toPlaceStack.getDisplayName() + " " + StatCollector.translateToLocal(DecorItems.lamp_item.getUnlocalizedName() + ".name"));
+		} else {
+			return StatCollector.translateToLocal(DecorItems.lamp_item.getUnlocalizedName() + ".name");
+		}
 	}
 
 	@Override