Merge branch 'master' into development
Conflicts: common/mekanism/common/tileentity/TileEntityChemicalFormulator.java
This commit is contained in:
commit
389f3cd988
6 changed files with 24 additions and 3 deletions
|
@ -139,6 +139,7 @@ public class TileComponentEjector implements ITileComponent, IEjector
|
|||
}
|
||||
|
||||
tileEntity.inventory[slotID] = stack;
|
||||
tileEntity.onInventoryChanged();
|
||||
}
|
||||
|
||||
tickDelay = 20;
|
||||
|
|
|
@ -62,7 +62,7 @@ public class TileComponentUpgrade implements ITileComponent
|
|||
tileEntity.inventory[upgradeSlot] = null;
|
||||
}
|
||||
|
||||
MekanismUtils.saveChunk(tileEntity);
|
||||
tileEntity.onInventoryChanged();
|
||||
}
|
||||
}
|
||||
else if(tileEntity.inventory[upgradeSlot].isItemEqual(new ItemStack(Mekanism.SpeedUpgrade)) && speedMultiplier < 8)
|
||||
|
@ -83,7 +83,7 @@ public class TileComponentUpgrade implements ITileComponent
|
|||
tileEntity.inventory[upgradeSlot] = null;
|
||||
}
|
||||
|
||||
MekanismUtils.saveChunk(tileEntity);
|
||||
tileEntity.onInventoryChanged();
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -108,6 +108,15 @@ public class TileEntityChemicalFormulator extends TileEntityElectricBlock implem
|
|||
|
||||
gasTank.receive(stack, true);
|
||||
operatingTicks = 0;
|
||||
|
||||
inventory[0].stackSize--;
|
||||
|
||||
if(inventory[0].stackSize <= 0)
|
||||
{
|
||||
inventory[0] = null;
|
||||
}
|
||||
|
||||
onInventoryChanged();
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -233,6 +233,8 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock
|
|||
structure.inventory[1].stackSize++;
|
||||
}
|
||||
|
||||
onInventoryChanged();
|
||||
|
||||
structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount;
|
||||
|
||||
if(structure.fluidStored.amount == 0)
|
||||
|
@ -274,6 +276,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock
|
|||
structure.inventory[1].stackSize++;
|
||||
}
|
||||
|
||||
onInventoryChanged();
|
||||
filled = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -77,6 +77,8 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
|
|||
{
|
||||
inventory[0] = null;
|
||||
}
|
||||
|
||||
onInventoryChanged();
|
||||
}
|
||||
else if(tempStack.isItemEqual(inventory[1]) && tempStack.getMaxStackSize() > inventory[1].stackSize)
|
||||
{
|
||||
|
@ -89,6 +91,8 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
|
|||
{
|
||||
inventory[0] = null;
|
||||
}
|
||||
|
||||
onInventoryChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -289,7 +289,11 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
|
|||
break;
|
||||
}
|
||||
|
||||
if(didOp) break;
|
||||
if(didOp)
|
||||
{
|
||||
onInventoryChanged();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue