From 4e174854595d78c768a097edc88efec1fc49cd18 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Fri, 14 Feb 2014 16:01:57 -0500 Subject: [PATCH] add in method to get block/item from unique name, multiservant logic now uses this in r/w custom nbt --- src/mantle/blocks/BlockUtils.java | 5 +++++ src/mantle/blocks/abstracts/MultiServantLogic.java | 6 +++--- src/mantle/items/ItemUtils.java | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/mantle/blocks/BlockUtils.java b/src/mantle/blocks/BlockUtils.java index 4cdeef7..c33f5e7 100644 --- a/src/mantle/blocks/BlockUtils.java +++ b/src/mantle/blocks/BlockUtils.java @@ -22,4 +22,9 @@ public class BlockUtils return GameData.blockRegistry.getNameForObject(block); } + public static Block getBlockFromUniqueName (String uniqueName) + { + return GameData.blockRegistry.getObject(uniqueName); + } + } diff --git a/src/mantle/blocks/abstracts/MultiServantLogic.java b/src/mantle/blocks/abstracts/MultiServantLogic.java index 9083d6b..7f639d1 100644 --- a/src/mantle/blocks/abstracts/MultiServantLogic.java +++ b/src/mantle/blocks/abstracts/MultiServantLogic.java @@ -1,5 +1,6 @@ package mantle.blocks.abstracts; +import mantle.blocks.BlockUtils; import mantle.blocks.iface.IMasterLogic; import mantle.blocks.iface.IServantLogic; import mantle.debug.DebugData; @@ -123,7 +124,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic, IDeb int yCenter = tags.getInteger("yCenter"); int zCenter = tags.getInteger("zCenter"); master = new CoordTuple(xCenter, yCenter, zCenter); - masterBlock = GameRegistry.findBlock(tags.getString("MasterModName"), tags.getString("MasterBlockName")); + masterBlock = BlockUtils.getBlockFromUniqueName(tags.getString("MasterBlockName")); masterMeat = tags.getByte("masterMeat"); } } @@ -136,8 +137,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic, IDeb tags.setInteger("xCenter", master.x); tags.setInteger("yCenter", master.y); tags.setInteger("zCenter", master.z); - tags.setString("MasterBlockName", masterBlock.getUnlocalizedName());//<- unlocalized name? - tags.setString("MasterModName", "TConstruct"); //TODO get mod name of block here!! + tags.setString("MasterBlockName", BlockUtils.getUniqueName(masterBlock)); tags.setByte("masterMeat", masterMeat); } } diff --git a/src/mantle/items/ItemUtils.java b/src/mantle/items/ItemUtils.java index 0e73d21..c70b605 100644 --- a/src/mantle/items/ItemUtils.java +++ b/src/mantle/items/ItemUtils.java @@ -9,4 +9,8 @@ public class ItemUtils { return GameData.itemRegistry.getNameForObject(item); } + public static Item getItemFromUniqueName (String uniqueName) + { + return GameData.itemRegistry.getObject(uniqueName); + } }