mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Transition from null stacks to ItemStack.EMPTY
This commit is contained in:
1 parent
fa7b9b49bc
commit
01ab160ff9
100 files changed
+596
-616
No files matched your search
@@ -35,6 +35,7 @@ import mekanism.common.util.StatUtils;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
|
||||
@@ -82,7 +83,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||
|
||||
gasTank = new GasTank(MAX_GAS);
|
||||
|
||||
inventory = new ItemStack[5];
|
||||
inventory = NonNullList.withSize(5, ItemStack.EMPTY);
|
||||
|
||||
BASE_SECONDARY_ENERGY_PER_TICK = secondaryPerTick;
|
||||
secondaryEnergyPerTick = secondaryPerTick;
|
||||
@@ -146,11 +147,11 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||
//Advanced Machine
|
||||
factory.gasTank.setGas(gasTank.getGas());
|
||||
|
||||
factory.inventory[5] = inventory[0];
|
||||
factory.inventory[4] = inventory[1];
|
||||
factory.inventory[5+3] = inventory[2];
|
||||
factory.inventory[1] = inventory[3];
|
||||
factory.inventory[0] = inventory[4];
|
||||
factory.inventory.set(5, inventory.get(0));
|
||||
factory.inventory.set(4, inventory.get(1));
|
||||
factory.inventory.set(5+3, inventory.get(2));
|
||||
factory.inventory.set(1, inventory.get(3));
|
||||
factory.inventory.set(0, inventory.get(4));
|
||||
|
||||
for(Upgrade upgrade : factory.upgradeComponent.getSupportedTypes())
|
||||
{
|
||||
@@ -226,21 +227,16 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||
|
||||
public void handleSecondaryFuel()
|
||||
{
|
||||
if(inventory[1] != null && gasTank.getNeeded() > 0)
|
||||
if(!inventory.get(1).isEmpty() && gasTank.getNeeded() > 0)
|
||||
{
|
||||
GasStack stack = getItemGas(inventory[1]);
|
||||
GasStack stack = getItemGas(inventory.get(1));
|
||||
int gasNeeded = gasTank.getNeeded();
|
||||
|
||||
if(stack != null && gasTank.canReceive(stack.getGas()) && gasNeeded >= stack.amount)
|
||||
{
|
||||
gasTank.receive(stack, true);
|
||||
|
||||
inventory[1].shrink(1);
|
||||
|
||||
if(inventory[1].getCount() == 0)
|
||||
{
|
||||
inventory[1] = null;
|
||||
}
|
||||
inventory.get(1).shrink(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -291,7 +287,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||
@Override
|
||||
public AdvancedMachineInput getInput()
|
||||
{
|
||||
return new AdvancedMachineInput(inventory[0], prevGas);
|
||||
return new AdvancedMachineInput(inventory.get(0), prevGas);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user