Prefilled Gas Tanks option

This commit is contained in:
aidancbrady committed 2016-04-25 17:43:11 -04:00
1 parent 541a802228
commit 1325b779b0
4 files changed
+15 -10

No files matched your search

@@ -44,7 +44,8 @@ public class MekanismConfig
public static boolean blacklistIC2;
public static boolean blacklistRF;
public static boolean destroyDisabledBlocks;
public static boolean prefilledPortableTanks;
public static boolean prefilledFluidTanks;
public static boolean prefilledGasTanks;
public static double armoredJetpackDamageRatio;
public static int armoredJetpackDamageMax;
public static boolean aestheticWorldDamage;
@@ -276,7 +276,8 @@ public class CommonProxy implements IGuiProvider
//If this is less than 1, upgrades make machines worse. If less than 0, I don't even know.
general.maxUpgradeMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpgradeModifier", 10, null, 1, Integer.MAX_VALUE).getInt();
general.minerSilkMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MinerSilkMultiplier", 6).getDouble();
general.prefilledPortableTanks = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "PrefilledPortableTanks", true).getBoolean();
general.prefilledFluidTanks = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "PrefilledFluidTanks", true).getBoolean();
general.prefilledGasTanks = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "PrefilledGasTanks", true).getBoolean();
general.armoredJetpackDamageRatio = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ArmoredJetpackDamageRatio", 0.8).getDouble();
general.armoredJetpackDamageMax = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ArmoredJepackDamageMax", 115).getInt();
general.aestheticWorldDamage = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AestheticWorldDamage", true).getBoolean();
@@ -537,7 +537,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
list.add(stack);
}
if(general.prefilledPortableTanks)
if(general.prefilledFluidTanks)
{
for(Fluid f : FluidRegistry.getRegisteredFluids().values())
{
@@ -5,6 +5,7 @@ import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.general;
import mekanism.api.Range4D;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasRegistry;
@@ -193,18 +194,20 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
{
ItemStack empty = new ItemStack(this);
setBaseTier(empty, tier.getBaseTier());
setGas(empty, null);
list.add(empty);
}
for(Gas type : GasRegistry.getRegisteredGasses())
if(general.prefilledGasTanks)
{
if(type.isVisible())
for(Gas type : GasRegistry.getRegisteredGasses())
{
ItemStack filled = new ItemStack(this);
setBaseTier(filled, BaseTier.ULTIMATE);
setGas(filled, new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled)));
list.add(filled);
if(type.isVisible())
{
ItemStack filled = new ItemStack(this);
setBaseTier(filled, BaseTier.ULTIMATE);
setGas(filled, new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled)));
list.add(filled);
}
}
}
}