What is this I can't even

src/main/java/steamcraft/api/item/UniversalWrench.java

@@ -1,96 +0,0 @@
-/**
- * This class was created by BrassGoggledCoders modding team.
- * This class is available as part of the BoilerCraft Mod for Minecraft.
- *
- * BoilerCraft is open-source and is distributed under the MMPL v1.0 License.
- * (http://www.mod-buildcraft.com/MMPL-1.0.txt)
- *
- */
-package steamcraft.api.item;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-import cpw.mods.fml.common.Optional;
-
-import boilerplate.common.baseclasses.items.RootItem;
-
-/**
- * @author decebaldecebal
- *
- */
-public abstract class UniversalWrench extends RootItem implements IUniversalWrench
-{
-	@Override
-	@Optional.Method(modid = "BuildCraft|Core")
-	public boolean canWrench(EntityPlayer player, int x, int y, int z)
-	{
-		return true;
-	}
-
-	@Override
-	@Optional.Method(modid = "BuildCraft|Core")
-	public void wrenchUsed(EntityPlayer player, int x, int y, int z)
-	{
-
-	}
-
-	@Override
-	public boolean isUsable(ItemStack item, EntityLivingBase user, int x, int y, int z)
-	{
-		return true;
-	}
-
-	@Override
-	public void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z)
-	{
-
-	}
-
-	@Override
-	@Optional.Method(modid = "Railcraft")
-	public boolean canWhack(EntityPlayer player, ItemStack crowbar, int x, int y, int z)
-	{
-		return true;
-	}
-
-	@Override
-	@Optional.Method(modid = "Railcraft")
-	public void onWhack(EntityPlayer player, ItemStack crowbar, int x, int y, int z)
-	{
-		crowbar.damageItem(2, player);
-		player.swingItem();
-	}
-
-	@Override
-	@Optional.Method(modid = "Railcraft")
-	public boolean canLink(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
-	{
-		return player.isSneaking();
-	}
-
-	@Override
-	@Optional.Method(modid = "Railcraft")
-	public void onLink(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
-	{
-		crowbar.damageItem(2, player);
-		player.swingItem();
-	}
-
-	@Override
-	@Optional.Method(modid = "Railcraft")
-	public boolean canBoost(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
-	{
-		return !this.canLink(player, crowbar, cart);
-	}
-
-	@Override
-	@Optional.Method(modid = "Railcraft")
-	public void onBoost(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
-	{
-		crowbar.damageItem(2, player);
-		player.swingItem();
-	}
-}

src/main/java/steamcraft/common/blocks/BlockSteamcraftOre.java

@@ -109,13 +109,13 @@ public class BlockSteamcraftOre extends BaseMetadataBlock implements IHammerable
 		switch (metadata)
 		{
 		case 4:
-			drop.add(new ItemStack(InitItems.itemResource, 1, 4));
+			drop.add(new ItemStack(InitItems.itemResource, 1, 3));
 			break;
 		case 5:
-			drop.add(new ItemStack(InitItems.itemResource, 2 + world.rand.nextInt(3), 1));
+			drop.add(new ItemStack(InitItems.itemResource, 2 + world.rand.nextInt(3), 0));
 			break;
 		case 6:
-			drop.add(new ItemStack(InitItems.itemResource, 2 + world.rand.nextInt(3), 3));
+			drop.add(new ItemStack(InitItems.itemResource, 2 + world.rand.nextInt(3), 1));
 			break;
 		default:
 			drop.add(0, new ItemStack(InitBlocks.blockCustomOre, 1, metadata));

src/main/java/steamcraft/common/init/InitItems.java

@@ -22,6 +22,7 @@ import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 import steamcraft.common.Steamcraft;
 import steamcraft.common.items.*;
 import steamcraft.common.items.armor.*;
@@ -282,9 +283,13 @@ public class InitItems
 		// Containers
 		itemCanisterSteam = new ItemCanister(10000, 20).setUnlocalizedName("itemCanisterSteam");
 		registerItem(itemCanisterSteam, "ItemCanisterSteam");
+		FluidContainerRegistry.registerFluidContainer(new FluidStack(FluidRegistry.getFluid("steam"), 10000),
+				((ItemCanister) itemCanisterSteam).getFilledCanister(), new ItemStack(itemCanisterSteam));
 
 		itemReinforcedCanisterSteam = new ItemCanister(20000, 40).setUnlocalizedName("itemReinforcedCanisterSteam");
 		registerItem(itemReinforcedCanisterSteam, "ItemReinforcedCanisterSteam");
+		FluidContainerRegistry.registerFluidContainer(new FluidStack(FluidRegistry.getFluid("steam"), 20000),
+				((ItemCanister) itemReinforcedCanisterSteam).getFilledCanister(), new ItemStack(itemReinforcedCanisterSteam));
 
 		itemElectricJarSmall = new ElectricItem(80, 80, 40).setUnlocalizedName("itemElectricJarSmall");
 		itemElectricJarMedium = new ElectricItem(400, 400, 125).setUnlocalizedName("itemElectricJarMedium");

src/main/java/steamcraft/common/items/ItemSpanner.java

@@ -14,14 +14,17 @@ package steamcraft.common.items;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityMinecart;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import steamcraft.api.item.UniversalWrench;
+import steamcraft.api.item.IUniversalWrench;
 import steamcraft.common.Steamcraft;
 import steamcraft.common.init.InitBlocks;
 import steamcraft.common.lib.ModInfo;
@@ -32,7 +35,7 @@ import steamcraft.common.tiles.energy.TileCopperWire;
  * @author warlordjones
  *
  */
-public class ItemSpanner extends UniversalWrench
+public class ItemSpanner extends BaseItem implements IUniversalWrench
 {
 	public ItemSpanner()
 	{
@@ -71,4 +74,75 @@ public class ItemSpanner extends UniversalWrench
 	{
 		this.itemIcon = par1IconRegister.registerIcon(ModInfo.PREFIX + this.getUnlocalizedName().substring(5));
 	}
+
+	@Override
+	@Optional.Method(modid = "BuildCraft|Core")
+	public boolean canWrench(EntityPlayer player, int x, int y, int z)
+	{
+		return true;
+	}
+
+	@Override
+	@Optional.Method(modid = "BuildCraft|Core")
+	public void wrenchUsed(EntityPlayer player, int x, int y, int z)
+	{
+
+	}
+
+	@Override
+	public boolean isUsable(ItemStack item, EntityLivingBase user, int x, int y, int z)
+	{
+		return true;
+	}
+
+	@Override
+	public void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z)
+	{
+
+	}
+
+	@Override
+	@Optional.Method(modid = "Railcraft")
+	public boolean canWhack(EntityPlayer player, ItemStack crowbar, int x, int y, int z)
+	{
+		return true;
+	}
+
+	@Override
+	@Optional.Method(modid = "Railcraft")
+	public void onWhack(EntityPlayer player, ItemStack crowbar, int x, int y, int z)
+	{
+		crowbar.damageItem(2, player);
+		player.swingItem();
+	}
+
+	@Override
+	@Optional.Method(modid = "Railcraft")
+	public boolean canLink(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
+	{
+		return player.isSneaking();
+	}
+
+	@Override
+	@Optional.Method(modid = "Railcraft")
+	public void onLink(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
+	{
+		crowbar.damageItem(2, player);
+		player.swingItem();
+	}
+
+	@Override
+	@Optional.Method(modid = "Railcraft")
+	public boolean canBoost(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
+	{
+		return !this.canLink(player, crowbar, cart);
+	}
+
+	@Override
+	@Optional.Method(modid = "Railcraft")
+	public void onBoost(EntityPlayer player, ItemStack crowbar, EntityMinecart cart)
+	{
+		crowbar.damageItem(2, player);
+		player.swingItem();
+	}
 }

src/main/java/steamcraft/common/tiles/TileBaseBoiler.java

@@ -24,8 +24,10 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.oredict.OreDictionary;
 
 import boilerplate.common.baseclasses.BaseTileWithInventory;
+import boilerplate.common.utils.FluidUtils;
 import steamcraft.common.blocks.machines.BlockBaseBoiler;
 import steamcraft.common.items.ItemCanister;
 
@@ -47,7 +49,7 @@ public abstract class TileBaseBoiler extends BaseTileWithInventory implements IF
 
 	public TileBaseBoiler()
 	{
-		super(3);
+		super(4);
 
 		this.waterTank = new FluidTank(new FluidStack(FluidRegistry.WATER, 0), 5000);
 		this.steamTank = new FluidTank(new FluidStack(FluidRegistry.getFluid("steam"), 0), 10000);
@@ -102,24 +104,37 @@ public abstract class TileBaseBoiler extends BaseTileWithInventory implements IF
 			{
 				FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(this.inventory[1]);
 
-				if ((liquid != null) && (this.waterTank.fill(new FluidStack(FluidRegistry.getFluid("water"), liquid.amount), false) == liquid.amount))
-					if (liquid.getFluid() == FluidRegistry.WATER)
-					{
-						this.waterTank.fill(new FluidStack(FluidRegistry.getFluid("water"), liquid.amount), true);
-
-						if (this.inventory[1].stackSize > 1)
-							this.inventory[1].stackSize--;
-						else
-							this.inventory[1] = this.inventory[1].getItem().getContainerItem(this.inventory[1]);
-					}
-			}
-			if ((this.inventory[2] != null) && (this.inventory[2].getItem() instanceof ItemCanister))
-			{
-				ItemCanister canister = (ItemCanister) this.inventory[2].getItem();
-				if ((this.steamTank.getFluidAmount() >= steamPerTick) && (canister.getFluidAmount(this.inventory[2]) != canister.maxSteam))
+				if ((liquid != null) && liquid.getFluid() == FluidRegistry.WATER)
 				{
-					canister.fill(this.inventory[2], new FluidStack(FluidRegistry.getFluid("steam"), steamPerTick), true);
-					this.steamTank.drain(steamPerTick, true);
+					ItemStack emptyContainer = FluidUtils.drainFluidContainer(this.waterTank, this.inventory[1]);
+					if (inventory[2] != null && OreDictionary.itemMatches(inventory[2], emptyContainer, true))
+						inventory[2].stackSize += emptyContainer.stackSize;
+					else if (inventory[2] == null)
+						inventory[2] = emptyContainer.copy();
+					this.decrStackSize(1, emptyContainer.stackSize);
+				}
+			}
+			if ((this.inventory[3] != null))
+			{
+				if ((this.inventory[3].getItem() instanceof ItemCanister))
+				{
+					ItemCanister canister = (ItemCanister) this.inventory[3].getItem();
+					if ((this.steamTank.getFluidAmount() >= steamPerTick) && (canister.getFluidAmount(this.inventory[3]) != canister.maxSteam))
+					{
+						canister.fill(this.inventory[3], new FluidStack(FluidRegistry.getFluid("steam"), steamPerTick), true);
+						this.steamTank.drain(steamPerTick, true);
+					}
+				}
+				else
+				{
+					ItemStack filledContainer = FluidUtils.fillFluidContainer(steamTank, this.inventory[3]);
+					if (filledContainer != null)
+					{
+						if (inventory[3] != null && OreDictionary.itemMatches(inventory[3], filledContainer, true))
+							inventory[3].stackSize += filledContainer.stackSize;
+						else if (inventory[3] == null)
+							inventory[3] = filledContainer.copy();
+					}
 				}
 			}
 

src/main/java/steamcraft/common/tiles/TileLiquidBoiler.java

@@ -60,7 +60,9 @@ public class TileLiquidBoiler extends TileBaseBoiler implements IOpenableGUI
 		this.fuelTank = new FluidTank(5000);
 		this.fuels.put(FluidRegistry.LAVA, defaultFuelValue * 2);
 		this.fuels.put(FluidRegistry.getFluid("whaleoil"), defaultFuelValue);
-		this.fuels.put(FluidRegistry.getFluid("oil"), defaultFuelValue);
+		this.fuels.put(FluidRegistry.getFluid("oil"), defaultFuelValue / 2);
+		this.fuels.put(FluidRegistry.getFluid("biodisel"), defaultFuelValue);
+		this.fuels.put(FluidRegistry.getFluid("fuel"), defaultFuelValue);
 	}
 
 	@Override

src/main/java/steamcraft/common/tiles/container/ContainerSteamBoiler.java

@@ -29,6 +29,8 @@ import net.minecraftforge.fluids.FluidStack;
 import boilerplate.common.baseclasses.blocks.BaseContainer;
 import steamcraft.common.items.ItemCanister;
 import steamcraft.common.tiles.TileSteamBoiler;
+import steamcraft.common.tiles.container.slot.SlotFluidContainer;
+import steamcraft.common.tiles.container.slot.SlotOutput;
 
 /**
  * @author Decebaldecebal
@@ -49,22 +51,9 @@ public class ContainerSteamBoiler extends BaseContainer
 		this.setTile(this.tileent);
 
 		this.addSlotToContainer(new Slot(tile, 0, 42, 52));
-		this.addSlotToContainer(new Slot(tile, 1, 132, 57)
-		{
-			@Override
-			public boolean isItemValid(ItemStack stack)
-			{
-				return FluidContainerRegistry.isContainer(stack);
-			}
-		});
-		this.addSlotToContainer(new Slot(tile, 2, 132, 21)
-		{
-			@Override
-			public boolean isItemValid(ItemStack stack)
-			{
-				return stack.getItem() instanceof ItemCanister;
-			}
-		});
+		this.addSlotToContainer(new SlotFluidContainer(tile, 1, 115, 57));
+		this.addSlotToContainer(new SlotOutput(tile, 2, 149, 57));
+		this.addSlotToContainer(new SlotFluidContainer(tile, 3, 149, 21));
 
 		int var3;
 

src/main/java/steamcraft/common/tiles/container/slot/SlotFluidContainer.java

@@ -0,0 +1,22 @@
+package steamcraft.common.tiles.container.slot;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fluids.FluidContainerRegistry;
+
+public class SlotFluidContainer extends Slot
+{
+	public SlotFluidContainer(IInventory p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_)
+	{
+		super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public boolean isItemValid(ItemStack stack)
+	{
+		return FluidContainerRegistry.isContainer(stack) || FluidContainerRegistry.isBucket(stack);
+	}
+}

src/main/java/steamcraft/common/tiles/container/slot/SlotOutput.java

@@ -0,0 +1,19 @@
+package steamcraft.common.tiles.container.slot;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class SlotOutput extends Slot
+{
+	public SlotOutput(IInventory p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_)
+	{
+		super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
+	}
+
+	@Override
+	public boolean isItemValid(ItemStack stack)
+	{
+		return false;
+	}
+}

src/main/resources/assets/steamcraft/lang/en_US.lang

@@ -193,9 +193,9 @@ fluid.boilingmudFluid=Boiling Mud
 #Items
 item.itemResource.0.name=Sulfur
 item.itemResource.1.name=Phosphorus
-item.itemResource.2.name=Uranium
-item.itemResource.3.name=Uranium Pellets
-item.itemResource.4.name=Sulfuric Acid
+item.itemResource.2.name=Sulfuric Acid
+item.itemResource.3.name=Uranium
+item.itemResource.4.name=Uranium Pellets
 item.itemTeaLeaves.name=Tea Leaf
 item.itemTeaSeed.name=Tea Seeds
 item.itemTeaSeed.desc=Obtained from breaking grass