BrassGoggledCoders
/
SteamCraft2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Register steam canisters as fluid containers.

dev
Arona Jones 2015-09-03 14:03:06 +01:00
parent 46982ef0f7
commit 04fc854bc1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/steamcraft/common/init/InitItems.java
View File

@ -23,6 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import boilerplate.common.utils.helpers.RegistryHelper;
import steamcraft.common.Steamcraft;
@ -348,9 +349,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");

2
src/main/java/steamcraft/common/tiles/TileBaseBoiler.java
View File

@ -47,7 +47,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);

4
src/main/java/steamcraft/common/tiles/container/slot/SlotFluidContainer.java
View File

@ -4,7 +4,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import steamcraft.common.items.ItemCanister;
import net.minecraftforge.fluids.FluidContainerRegistry;
public class SlotFluidContainer extends Slot
{
@ -17,6 +17,6 @@ public class SlotFluidContainer extends Slot
@Override
public boolean isItemValid(ItemStack stack)
{
return stack.getItem() instanceof ItemCanister;
return FluidContainerRegistry.isContainer(stack) || FluidContainerRegistry.isBucket(stack);
}
}