+ Added an interface to make tooltips on tile entities more flexible.

+ Actually added the recipe for the Mining Explosives this time.
+ Attempted to add a framework for packet handling.

4 files changed, 53 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
index fad1dff490..a08d50d27a 100644
--- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
@@ -5,7 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 import gtPlusPlus.core.util.inventory.InventoryUtils;
@@ -22,7 +24,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class FishTrap extends BlockContainer
+public class FishTrap extends BlockContainer implements ITileTooltip
 {
 	@SideOnly(Side.CLIENT)
 	private IIcon textureTop;
@@ -31,6 +33,15 @@ public class FishTrap extends BlockContainer
 	@SideOnly(Side.CLIENT)
 	private IIcon textureFront;
 
+	/**
+	 * Determines which tooltip is displayed within the itemblock.
+	 */
+	private final int mTooltipID = 0;
+
+	@Override
+	public int getTooltipID() {
+		return this.mTooltipID;
+	}
 
 	@SuppressWarnings("deprecation")
 	public FishTrap()
@@ -38,7 +49,7 @@ public class FishTrap extends BlockContainer
 		super(Material.iron);
 		this.setBlockName("blockFishTrap");
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		GameRegistry.registerBlock(this, "blockFishTrap");
+		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockFishTrap");
 		LanguageRegistry.addName(this, "Fish Catcher");
 
 	}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
index bd41980325..46d5994a66 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
@@ -5,8 +5,10 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
 import net.minecraft.block.BlockContainer;
@@ -19,7 +21,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class Machine_ModularityTable extends BlockContainer
+public class Machine_ModularityTable extends BlockContainer implements ITileTooltip
 {
 	@SideOnly(Side.CLIENT)
 	private IIcon textureTop;
@@ -28,13 +30,23 @@ public class Machine_ModularityTable extends BlockContainer
 	@SideOnly(Side.CLIENT)
 	private IIcon textureFront;
 
+	/**
+	 * Determines which tooltip is displayed within the itemblock.
+	 */
+	private final int mTooltipID = 1;
+
+	@Override
+	public int getTooltipID() {
+		return this.mTooltipID;
+	}
+
 	@SuppressWarnings("deprecation")
 	public Machine_ModularityTable()
 	{
 		super(Material.iron);
 		this.setBlockName("blockModularity");
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		GameRegistry.registerBlock(this, "blockModularity");
+		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockModularity");
 		LanguageRegistry.addName(this, "Modularity Configurator");
 
 	}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
index 712d32aba7..4d48e7e793 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
@@ -6,8 +6,10 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
@@ -26,7 +28,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO")
-public class Machine_ProjectTable extends BlockContainer
+public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
 {
 	@SideOnly(Side.CLIENT)
 	private IIcon textureTop;
@@ -35,13 +37,23 @@ public class Machine_ProjectTable extends BlockContainer
 	@SideOnly(Side.CLIENT)
 	private IIcon textureFront;
 
+	/**
+	 * Determines which tooltip is displayed within the itemblock.
+	 */
+	private final int mTooltipID = 3;
+
+	@Override
+	public int getTooltipID() {
+		return this.mTooltipID;
+	}
+
 	@SuppressWarnings("deprecation")
 	public Machine_ProjectTable()
 	{
 		super(Material.iron);
 		this.setBlockName("blockProjectBench");
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		GameRegistry.registerBlock(this, "blockProjectBench");
+		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockProjectBench");
 		LanguageRegistry.addName(this, "Project Workbench");
 
 	}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
index 4cad0977ed..ca51b8948c 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.block.machine;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BlockBaseNBT;
 import gtPlusPlus.core.lib.CORE;
@@ -16,7 +17,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class Machine_TradeTable extends BlockBaseNBT
+public class Machine_TradeTable extends BlockBaseNBT  implements ITileTooltip
 {
 	@SideOnly(Side.CLIENT)
 	private IIcon textureTop;
@@ -25,6 +26,16 @@ public class Machine_TradeTable extends BlockBaseNBT
 	@SideOnly(Side.CLIENT)
 	private IIcon textureFront;
 
+	/**
+	 * Determines which tooltip is displayed within the itemblock.
+	 */
+	private final int mTooltipID = 2;
+
+	@Override
+	public int getTooltipID() {
+		return this.mTooltipID;
+	}
+
 	public Machine_TradeTable(){
 		super(Material.leaves, "blockTradeBench", "Trade-o-Mat");
 	}