+ Added some Geothermal Generators.

+ Added recipes and fuels for all Geothermals. (Normal Lava and Pahoehoe Lava)
$ Fixed workbench not saving crafting table contents when closed.
% Changed internal loading of Workbenches, Tanks and Geothermals.
% Disabled old workbench buttons, now using Gregtech Holo slots.

2 files changed, 430 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java
new file mode 100644
index 0000000000..39d9113a31
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java
@@ -0,0 +1,166 @@
+package gtPlusPlus.core.inventories;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+
+public class InventoryWorkbenchHoloCrafting implements IInventory{
+
+	private String name = "Inventory Crafting";
+
+	/** Defining your inventory size this way is handy */
+	public static final int INV_SIZE = 9;
+
+	/** Inventory's size must be same as number of slots you add to the Container class */
+	private ItemStack[] inventory = new ItemStack[INV_SIZE];
+
+	/**
+	 * @param itemstack - the ItemStack to which this inventory belongs
+	 */
+	public InventoryWorkbenchHoloCrafting()
+	{		
+
+	}
+
+	public void readFromNBT(NBTTagCompound nbt)
+	{
+		NBTTagList list = nbt.getTagList("Items", 10);
+		inventory = new ItemStack[INV_SIZE];
+		for(int i = 0;i<list.tagCount();i++)
+		{
+			NBTTagCompound data = list.getCompoundTagAt(i);
+			int slot = data.getInteger("Slot");
+			if(slot >= 0 && slot < INV_SIZE)
+			{
+				inventory[slot] = ItemStack.loadItemStackFromNBT(data);
+			}
+		}
+	}
+
+	public void writeToNBT(NBTTagCompound nbt)
+	{
+		NBTTagList list = new NBTTagList();
+		for(int i = 0;i<INV_SIZE;i++)
+		{
+			ItemStack stack = inventory[i];
+			if(stack != null)
+			{
+				NBTTagCompound data = new NBTTagCompound();
+				stack.writeToNBT(data);
+				data.setInteger("Slot", i);
+				list.appendTag(data);
+			}
+		}
+		nbt.setTag("Items", list);
+	}
+
+	@Override
+	public int getSizeInventory()
+	{
+		return inventory.length;
+	}
+
+	public ItemStack[] getInventory(){
+		return inventory;
+	}
+
+	@Override
+	public ItemStack getStackInSlot(int slot)
+	{
+		return inventory[slot];
+	}
+
+	@Override
+	public ItemStack decrStackSize(int slot, int amount)
+	{
+		ItemStack stack = getStackInSlot(slot);
+		if(stack != null)
+		{
+			if(stack.stackSize > amount)
+			{
+				stack = stack.splitStack(amount);
+				markDirty();
+			}
+			else
+			{
+				setInventorySlotContents(slot, null);
+			}
+		}
+		return stack;
+	}
+
+	@Override
+	public ItemStack getStackInSlotOnClosing(int slot)
+	{
+		ItemStack stack = getStackInSlot(slot);
+		setInventorySlotContents(slot, null);
+		return stack;
+	}
+
+	@Override
+	public void setInventorySlotContents(int slot, ItemStack stack)
+	{
+		inventory[slot] = stack;
+		if (stack != null && stack.stackSize > getInventoryStackLimit())
+		{
+			stack.stackSize = getInventoryStackLimit();
+		}
+		markDirty();
+	}
+
+	@Override
+	public String getInventoryName()
+	{
+		return name;
+	}
+
+	@Override
+	public boolean hasCustomInventoryName()
+	{
+		return name.length() > 0;
+	}
+
+	@Override
+	public int getInventoryStackLimit()
+	{
+		return 64;
+	}
+
+	@Override
+	public void markDirty()
+	{
+		for (int i = 0; i < getSizeInventory(); ++i)
+		{
+			ItemStack temp = getStackInSlot(i);
+			if (temp != null){
+				//Utils.LOG_INFO("Slot "+i+" contains "+temp.getDisplayName()+" x"+temp.stackSize);
+			}
+
+			if (temp != null && temp.stackSize == 0) {
+				inventory[i] = null;
+			}
+		}
+	}
+
+	@Override
+	public boolean isUseableByPlayer(EntityPlayer entityplayer)
+	{
+		return true;
+	}
+
+	@Override
+	public void openInventory() {}
+
+	@Override
+	public void closeInventory() {}
+
+
+	@Override
+	public boolean isItemValidForSlot(int slot, ItemStack itemstack)
+	{
+		return true;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
new file mode 100644
index 0000000000..2bc84f492d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
@@ -0,0 +1,264 @@
+package gtPlusPlus.core.inventories;
+
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+
+public class InventoryWorkbenchHoloSlots implements IInventory{
+
+	private String name = "Inventory Holo";
+
+	/** Defining your inventory size this way is handy */
+	public static final int INV_SIZE = 6;
+
+	/** Inventory's size must be same as number of slots you add to the Container class */
+	private ItemStack[] inventory = new ItemStack[INV_SIZE];
+
+	/**
+	 * @param itemstack - the ItemStack to which this inventory belongs
+	 */
+	public InventoryWorkbenchHoloSlots()
+	{
+
+	}
+
+	public void readFromNBT(NBTTagCompound nbt)
+	{
+		NBTTagList list = nbt.getTagList("Items", 10);
+		inventory = new ItemStack[INV_SIZE];
+		for(int i = 0;i<list.tagCount();i++)
+		{
+			NBTTagCompound data = list.getCompoundTagAt(i);
+			int slot = data.getInteger("Slot");
+			if(slot >= 0 && slot < INV_SIZE)
+			{
+				inventory[slot] = ItemStack.loadItemStackFromNBT(data);
+			}
+		}
+	}
+
+	public void writeToNBT(NBTTagCompound nbt)
+	{
+		NBTTagList list = new NBTTagList();
+		for(int i = 0;i<INV_SIZE;i++)
+		{
+			ItemStack stack = inventory[i];
+			if(stack != null)
+			{
+				NBTTagCompound data = new NBTTagCompound();
+				stack.writeToNBT(data);
+				data.setInteger("Slot", i);
+				list.appendTag(data);
+			}
+		}
+		nbt.setTag("Items", list);
+	}
+
+	@Override
+	public int getSizeInventory()
+	{
+		return inventory.length;
+	}
+
+	public ItemStack[] getInventory(){
+		return inventory;
+	}
+
+	@Override
+	public ItemStack getStackInSlot(int slot)
+	{
+		return inventory[slot];
+	}
+
+	@Override
+	public void setInventorySlotContents(int slot, ItemStack stack)
+	{
+		inventory[slot] = stack;
+
+		if (stack != null && stack.stackSize > getInventoryStackLimit())
+		{
+			stack.stackSize = getInventoryStackLimit();
+		}
+
+		// Don't forget this line or your inventory will not be saved!
+		markDirty();
+	}
+
+	// 1.7.2+ renamed to getInventoryName
+	@Override
+	public String getInventoryName()
+	{
+		return name;
+	}
+
+	// 1.7.2+ renamed to hasCustomInventoryName
+	@Override
+	public boolean hasCustomInventoryName()
+	{
+		return name.length() > 0;
+	}
+
+	@Override
+	public int getInventoryStackLimit()
+	{
+		return 1;
+	}
+
+	/**
+	 * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
+	 * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
+	 * let you change things in your inventory without ever opening a Gui, if you want.
+	 */
+	// 1.7.2+ renamed to markDirty
+	@Override
+	public void markDirty()
+	{
+		for (int i = 0; i < getSizeInventory(); ++i)
+		{
+			if (getStackInSlot(i) != null && getStackInSlot(i).stackSize == 0) {
+				inventory[i] = null;
+			}
+		}
+	}
+
+	@Override
+	public boolean isUseableByPlayer(EntityPlayer entityplayer)
+	{
+		return true;
+	}
+
+	// 1.7.2+ renamed to openInventory(EntityPlayer player)
+	@Override
+	public void openInventory() {}
+
+	// 1.7.2+ renamed to closeInventory(EntityPlayer player)
+	@Override
+	public void closeInventory() {}
+
+	/**
+	 * This method doesn't seem to do what it claims to do, as
+	 * items can still be left-clicked and placed in the inventory
+	 * even when this returns false
+	 */
+	@Override
+	public boolean isItemValidForSlot(int slot, ItemStack itemstack)
+	{	
+		return false;
+	}
+
+	/** A list of one item containing the result of the crafting formula */
+	private ItemStack[] stackResult = new ItemStack[1];
+
+	/**
+	 * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a
+	 * new stack.
+	 */
+	/*@Override
+	public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_)
+	{
+		ItemStack stack = getStackInSlot(0);
+		if (this.stackResult[0] != null)
+		{
+			ItemStack itemstack = this.stackResult[0];
+			this.stackResult[0] = null;
+			return itemstack;
+		}
+		if(stack != null)
+		{
+			if(stack.stackSize > p_70298_2_)
+			{
+				stack = stack.splitStack(p_70298_2_);
+				// Don't forget this line or your inventory will not be saved!
+				markDirty();
+			}
+			else
+			{
+				// this method also calls markDirty, so we don't need to call it again
+				setInventorySlotContents(p_70298_1_, null);
+			}
+		}
+		return stack;
+	}*/
+	@Override
+	public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_)
+    {
+		if (getStackInSlot(0) != null){
+			Utils.LOG_INFO("getStackInSlot(0) contains "+getStackInSlot(0).getDisplayName());
+			if (this.stackResult[0] == null){
+				Utils.LOG_INFO("this.stackResult[0] == null");
+				this.stackResult[0] = getStackInSlot(0);
+			}
+			else if (this.stackResult[0] != null){
+				Utils.LOG_INFO("this.stackResult[0] != null");
+				if (this.stackResult[0].getDisplayName().toLowerCase().equals(getStackInSlot(0).getDisplayName().toLowerCase())){
+					Utils.LOG_INFO("Items are the same?");
+				}
+				else {
+					Utils.LOG_INFO("Items are not the same.");
+				}
+			}
+		}
+		
+        if (this.stackResult[0] != null)
+        {
+			Utils.LOG_INFO("this.stackResult[0] == null - Really never should be here though. - Returning "+this.stackResult[0].getDisplayName());
+            ItemStack itemstack = this.stackResult[0];
+            this.stackResult[0] = null;
+            return itemstack;
+        }
+		return null;
+    }
+
+	/**
+	 * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem -
+	 * like when you close a workbench GUI.
+	 */
+	@Override
+	public ItemStack getStackInSlotOnClosing(int p_70304_1_)
+	{
+		if (this.stackResult[0] != null)
+		{
+			ItemStack itemstack = this.stackResult[0];
+			this.stackResult[0] = null;
+			return itemstack;
+		}
+		return null;
+	}
+
+}
+
+
+
+//Default Behaviour
+/*@Override
+public ItemStack decrStackSize(int slot, int amount)
+{
+	if(stack != null)
+	{
+		if(stack.stackSize > amount)
+		{
+			stack = stack.splitStack(amount);
+			// Don't forget this line or your inventory will not be saved!
+			markDirty();
+		}
+		else
+		{
+			// this method also calls markDirty, so we don't need to call it again
+			setInventorySlotContents(slot, null);
+		}
+	}
+	return stack;
+}*/
+
+//Default Behaviour
+/*@Override
+public ItemStack getStackInSlotOnClosing(int slot)
+{
+	ItemStack stack = getStackInSlot(slot);
+	setInventorySlotContents(slot, null);
+	return stack;
+}*/
+