aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/block
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-09-22 14:07:13 +1000
committerAlkalus <draknyte1@hotmail.com>2017-09-22 14:07:13 +1000
commit14b6ee91c1d784539c130d4ed90a0aa2a87d4902 (patch)
treefb22577c02a08ff102884b38c2b9b82114e80e26 /src/Java/gtPlusPlus/core/block
parentbc74aaa35b726899e5830425eb7a8fb5e54501e8 (diff)
downloadGT5-Unofficial-14b6ee91c1d784539c130d4ed90a0aa2a87d4902.tar.gz
GT5-Unofficial-14b6ee91c1d784539c130d4ed90a0aa2a87d4902.tar.bz2
GT5-Unofficial-14b6ee91c1d784539c130d4ed90a0aa2a87d4902.zip
+ More work on the Trade Table.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
index 1551d2cddd..fc155765c6 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
@@ -9,7 +9,8 @@ import gtPlusPlus.GTplusplus;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.player.PlayerUtils;
@@ -59,10 +60,10 @@ public class Machine_TradeTable extends BlockContainer
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister p_149651_1_)
{
- this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
- this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting");
- this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
- this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
+ this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
+ this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "workbench_top");
+ this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
+ this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
}
/**
@@ -88,7 +89,7 @@ public class Machine_TradeTable extends BlockContainer
}
final TileEntity te = world.getTileEntity(x, y, z);
- if ((te != null) && (te instanceof TileEntityProjectTable))
+ if ((te != null) && (te instanceof TileEntityTradeTable))
{
if (!holdingWrench){
player.openGui(GTplusplus.instance, 6, world, x, y, z);
@@ -101,7 +102,7 @@ public class Machine_TradeTable extends BlockContainer
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
- return new TileEntityProjectTable();
+ return new TileEntityTradeTable();
}
public static boolean isWrench(final ItemStack item){