diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 3b0522bc7..1e4c5a5c7 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -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; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 1b238ac20..4664ad06c 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -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(); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index c3032b308..adc68705f 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -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()) { diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 467233114..d392e9157 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -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); + } } } }