diff --git a/src/main/java/de/katzenpapst/amunra/AmunRa.java b/src/main/java/de/katzenpapst/amunra/AmunRa.java index 3bd6bdd6..9cb480a4 100755 --- a/src/main/java/de/katzenpapst/amunra/AmunRa.java +++ b/src/main/java/de/katzenpapst/amunra/AmunRa.java @@ -285,7 +285,8 @@ public void postInit(final FMLPostInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(AmunRa.instance, new GuiHandler()); FMLCommonHandler.instance().bus().register(new TickHandlerServer()); - TileEntityMothershipEngineJet.jetFuel = FluidRegistry.getFluid(config.validEngineFuel); + TileEntityMothershipEngineJet.jetFuel = FluidRegistry.getFluid(config.validJetEngineFuel); + TileEntityMothershipEngineIon.coolant = FluidRegistry.getFluid(config.validIonThrusterCoolant); // failsafes this.doCompatibilityChecks(); diff --git a/src/main/java/de/katzenpapst/amunra/config/ARConfig.java b/src/main/java/de/katzenpapst/amunra/config/ARConfig.java index 580fc6c8..6f6f9181 100755 --- a/src/main/java/de/katzenpapst/amunra/config/ARConfig.java +++ b/src/main/java/de/katzenpapst/amunra/config/ARConfig.java @@ -51,7 +51,8 @@ public class ARConfig { // bodies which motherships cannot orbit public Set mothershipBodiesNoOrbit; - public String validEngineFuel; + public String validJetEngineFuel; + public String validIonThrusterCoolant; // *** sky rendering and related *** // bodies not to render @@ -196,8 +197,14 @@ public void processConfig(final Configuration config) { emptySet, "Bodies which should not be orbitable by motherships"); - this.validEngineFuel = config - .getString("validEngineFuels", "motherships", "fuel", "These fluids can be used by Jet Engines"); + this.validJetEngineFuel = config + .getString("validJetEngineFuel", "motherships", "fuel", "This fluid can be used by Jet Engines"); + + this.validIonThrusterCoolant = config.getString( + "validIonThrusterCoolant", + "motherships", + "liquidnitrogen", + "This fluid can be used by Ion Thrusters"); // mothershipUserRestriction = config.getBoolean("restrictMothershipToOwner", "mothership", true, "If true, only // the one who built the mothership will be able to use it. If false, anyone can"); diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java index 6d48d528..990fae82 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java @@ -24,17 +24,17 @@ import micdoodle8.mods.galacticraft.core.GalacticraftCore; import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; -import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule; public class TileEntityMothershipEngineIon extends TileEntityMothershipEngineAbstract { protected MothershipFuelDisplay fuelType = null; protected MothershipFuelDisplay fuelTypeEnergy = null; + public static Fluid coolant; public TileEntityMothershipEngineIon() { this.boosterBlock = ARBlocks.blockMsEngineIonBooster; this.containingItems = new ItemStack[2]; - this.fuel = AsteroidsModule.fluidLiquidNitrogen; + this.fuel = coolant; // AsteroidsItems.canisterLN2 this.fuelType = new MothershipFuelDisplayFluid(this.fuel);