diff --git a/magicbees_src/magicbees/item/types/FluidType.java b/magicbees_src/magicbees/item/types/FluidType.java index 0a27627..28eefe7 100644 --- a/magicbees_src/magicbees/item/types/FluidType.java +++ b/magicbees_src/magicbees/item/types/FluidType.java @@ -18,7 +18,7 @@ public enum FluidType // Forestry BIOMASS("biomass"), - ETHANOL("ethanol"), + ETHANOL("bioethanol"), // Buildcraft OIL("oil"), @@ -34,12 +34,12 @@ public enum FluidType // ExtraBees liquids ACID("acid"), POISON("poison"), - LIQUIDNITROGEN("liquidNitrogen"), - DNA("liquidDNA"), + LIQUIDNITROGEN("liquidnitrogen"), + DNA("liquiddna"), // Railcraft - CREOSOTEOIL("Creosote Oil"), - STEAM("Steam"), + CREOSOTEOIL("creosote"), + STEAM("steam"), ; public String liquidID; public int iconIdx; diff --git a/magicbees_src/magicbees/main/MagicBees.java b/magicbees_src/magicbees/main/MagicBees.java index 35f839b..5a7a53a 100644 --- a/magicbees_src/magicbees/main/MagicBees.java +++ b/magicbees_src/magicbees/main/MagicBees.java @@ -49,6 +49,9 @@ public class MagicBees @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { + this.configsPath = event.getModConfigurationDirectory().getAbsolutePath(); + this.modConfig = new Config(event.getSuggestedConfigurationFile()); + // Compatibility Helpers setup time. ForestryHelper.preInit(); ExtraBeesHelper.preInit(); @@ -56,8 +59,6 @@ public class MagicBees EquivalentExchangeHelper.preInit(); ArsMagicaHelper.preInit(); - this.configsPath = event.getModConfigurationDirectory().getAbsolutePath(); - this.modConfig = new Config(event.getSuggestedConfigurationFile()); this.modConfig.setupBlocks(); this.modConfig.setupItems(); @@ -97,6 +98,7 @@ public class MagicBees this.modConfig.saveConfigs(); CraftingManager.setupCrafting(); + CraftingManager.registerLiquidContainers(); VersionInfo.doVersionCheck(); } diff --git a/magicbees_src/magicbees/main/utils/CraftingManager.java b/magicbees_src/magicbees/main/utils/CraftingManager.java index 82f5d5f..42534f1 100644 --- a/magicbees_src/magicbees/main/utils/CraftingManager.java +++ b/magicbees_src/magicbees/main/utils/CraftingManager.java @@ -29,15 +29,18 @@ import forestry.api.recipes.RecipeManagers; public class CraftingManager { + public static void registerLiquidContainers() + { + registerLiquidContainer(Config.magicCapsule); + registerLiquidContainer(Config.voidCapsule); + } + public static void setupCrafting() { // Broken up into seperate sections to make things a bit easier to find. setupVanillaCrafting(); setupCentrifugeRecipes(); setupCarpenterRecipes(); - - registerLiquidContainer(Config.magicCapsule); - registerLiquidContainer(Config.voidCapsule); } private static void setupVanillaCrafting() @@ -614,7 +617,7 @@ public class CraftingManager if (liquid != null) { filled = new ItemStack(baseCapsule, 1, fluidType.ordinal()); - FluidContainerRegistry.registerFluidContainer(liquid, filled); + FluidContainerRegistry.registerFluidContainer(liquid, filled, empty); // Register with Squeezer/Bottler RecipeManagers.bottlerManager.addRecipe(5, liquid, empty, filled); diff --git a/magicbees_src/magicbees/main/utils/VersionInfo.java b/magicbees_src/magicbees/main/utils/VersionInfo.java index df4a0a2..4c56b70 100644 --- a/magicbees_src/magicbees/main/utils/VersionInfo.java +++ b/magicbees_src/magicbees/main/utils/VersionInfo.java @@ -30,7 +30,7 @@ public class VersionInfo public static final String Logo = "/gfx/magicbees/logo.png"; - public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct"; + public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft"; boolean criticalUpdate; boolean newVersion;