tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed a few bugs

Browse source
This commit is contained in:
Aidan C. Brady 2014-08-05 16:53:40 -04:00
parent 5b3cd7e2a4
commit 27b61e288a
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java
View file

@ -74,9 +74,19 @@ public class ContainerChemicalOxidizer extends Container
if(RecipeHandler.getItemToGasOutput(slotStack, false, Recipe.CHEMICAL_OXIDIZER.get()) != null)
{
if(!mergeItemStack(slotStack, 0, 1, true))
if(slotID != 0)
{
return null;
if(!mergeItemStack(slotStack, 0, 1, true))
{
return null;
}
}
else if(slotID == 0)
{
if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true))
{
return null;
}
}
}
else if(ChargeUtils.canBeDischarged(slotStack))

9
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
View file

@ -9,6 +9,7 @@ import mekanism.common.Mekanism;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.FluidContainerUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.PipeUtils;
import mekanism.generators.common.MekanismGenerators;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@ -322,7 +323,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{
return (fluid == FluidRegistry.LAVA) && (from != ForgeDirection.getOrientation(facing));
return fluid == FluidRegistry.LAVA && from != ForgeDirection.getOrientation(facing);
}
@Override
@ -334,9 +335,11 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
if(from == ForgeDirection.getOrientation(facing)){
return new FluidTankInfo[0];
if(from == ForgeDirection.getOrientation(facing))
{
return PipeUtils.EMPTY;
}
return new FluidTankInfo[] {lavaTank.getInfo()};
}