Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public int getInventoryStackLimit() {
@Override
public void markDirty() {
dirtyInventory();
saveToNBT(containerStack.stackTagCompound);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.common.util.Constants.NBT;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;

import com.darkona.adventurebackpack.common.Constants;
import com.darkona.adventurebackpack.reference.GeneralReference;

public class InventoryCoalJetpack extends InventoryAdventure {

Expand Down Expand Up @@ -77,7 +77,7 @@ public void loadFromNBT(NBTTagCompound compound) {
coolTicks = jetpackTag.getInteger("coolTicks");
currentItemBurnTime = jetpackTag.getInteger("currentBurn");
if (steamTank.getFluid() != null && steamTank.getFluid().getFluid().getName().equals("water")) {
steamTank.setFluid(new FluidStack(FluidRegistry.getFluid("steam"), steamTank.getFluid().amount));
steamTank.setFluid(new FluidStack(GeneralReference.getSteamFluid(), steamTank.getFluid().amount));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.darkona.adventurebackpack.network.messages.EntityParticlePacket;
import com.darkona.adventurebackpack.network.messages.EntitySoundPacket;
import com.darkona.adventurebackpack.proxy.ClientProxy;
import com.darkona.adventurebackpack.reference.GeneralReference;
import com.darkona.adventurebackpack.util.BackpackUtils;
import com.darkona.adventurebackpack.util.Resources;
import com.darkona.adventurebackpack.util.TipUtils;
Expand Down Expand Up @@ -188,7 +189,7 @@ private void runBoiler(InventoryCoalJetpack inv, World world, EntityPlayer playe
if (inv.getSteamTank().getFluidAmount() < inv.getSteamTank().getCapacity()) {
if (inv.getWaterTank().getFluid() != null) {
int steam = inv.getWaterTank().drain((temperature / 100), true).amount;
inv.getSteamTank().fill(new FluidStack(FluidRegistry.getFluid("steam"), steam * 4), true);
inv.getSteamTank().fill(new FluidStack(GeneralReference.getSteamFluid(), steam * 4), true);
inv.dirtyTanks();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;

import com.darkona.adventurebackpack.config.ConfigHandler;
Expand Down Expand Up @@ -102,4 +103,18 @@ public static boolean isValidFuel(String fluidName) {
public static Float getFuelRate(String fluidName) {
return liquidFuels.get(fluidName);
}

private static Fluid steam;

public static Fluid getSteamFluid() {
if (steam != null) {
return steam;
}
// prefer actual steam over water
steam = FluidRegistry.getFluid("steam");
if (steam == null) {
steam = FluidRegistry.getFluid("water");
}
return steam;
}
}
Loading