diff options
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java | 13 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java index b6e73edf20..997b70b98b 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java @@ -41,7 +41,6 @@ public class ModularBauble extends BaseBauble { public ModularBauble() { super(BaubleType.AMULET, "Modular Bauble"); - this.setTextureName(CORE.MODID + ":" + "itemKeyGold"); } @Override @@ -325,18 +324,18 @@ public class ModularBauble extends BaseBauble { } try { if (ModularArmourUtils.getBaubleType(stack) == BaubleType.AMULET) { - return mTextureAmulet; + return mfallback = mTextureAmulet; } if (ModularArmourUtils.getBaubleType(stack) == BaubleType.RING) { - return mTextureRing; + return mfallback = mTextureRing; } if (ModularArmourUtils.getBaubleType(stack) == BaubleType.BELT) { - return mTextureBelt; + return mfallback = mTextureBelt; } else { - return mfallback; + return mfallback = mTextureRing; } } catch (Throwable t) { - return mfallback; + return mfallback = mTextureRing; } } @@ -348,7 +347,7 @@ public class ModularBauble extends BaseBauble { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - this.mfallback = register.registerIcon("baubles" + ":" + "ring"); + this.mfallback = register.registerIcon("miscutils" + ":" + "itemAmulet"); // you cannot initialize iconArray when declared nor in the constructor, // as it is client-side only, so do it here: if (LoadedMods.Thaumcraft) { diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java index 8aacb7cf8c..bebec1071c 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java @@ -347,7 +347,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI @Override public boolean canExtractItem(int slot, ItemStack item, int side) { Utils.LOG_INFO("Slot:"+slot+" | side? "+side); - if (slot <= 8 || slot == 11){ + if (slot == 11 || slot <= 8){ return true; } return false; |