From 68ed8a1511666b5beb69a560b748fc1a366ddff6 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 29 Jul 2017 21:07:41 +0200 Subject: [PATCH] Fix #229 Game Crash from looking at wood in JEI --- .../java/binnie/extratrees/block/wood/BlockETSlab.java | 7 +++++++ .../java/binnie/extratrees/block/wood/ItemETSlab.java | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index 514dcecf..80facde4 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -9,6 +9,7 @@ import forestry.arboriculture.blocks.BlockForestrySlab; import binnie.Constants; import binnie.extratrees.block.EnumETLog; +import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.property.PropertyETWoodType; public abstract class BlockETSlab extends BlockForestrySlab { @@ -26,6 +27,12 @@ public abstract class BlockETSlab extends BlockForestrySlab { setUnlocalizedName(name); } + @Override + public String getUnlocalizedName(int meta) { + EnumETLog woodType = getWoodType(meta); + return WoodManager.getDisplayName(this, woodType); + } + public static List create(boolean fireproof, final boolean doubleSlab) { List blocks = new ArrayList<>(); PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, false); diff --git a/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java index 4a88f398..fe5e4f9f 100644 --- a/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java @@ -21,4 +21,12 @@ public class ItemETSlab extends ItemSlab { IWoodType woodType = wood.getWoodType(meta); return WoodManager.getDisplayName(wood, woodType); } + + @Override + public String getUnlocalizedName(ItemStack stack) { + BlockETSlab wood = (BlockETSlab) getBlock(); + int meta = stack.getMetadata(); + IWoodType woodType = wood.getWoodType(meta); + return WoodManager.getDisplayName(wood, woodType); + } } \ No newline at end of file