diff options
Diffstat (limited to 'src/Java/miscutil/core')
8 files changed, 109 insertions, 9 deletions
diff --git a/src/Java/miscutil/core/block/general/fluids/FluidRegistryHandler.java b/src/Java/miscutil/core/block/general/fluids/FluidRegistryHandler.java index bf03203247..09f7236e33 100644 --- a/src/Java/miscutil/core/block/general/fluids/FluidRegistryHandler.java +++ b/src/Java/miscutil/core/block/general/fluids/FluidRegistryHandler.java @@ -40,8 +40,9 @@ public class FluidRegistryHandler { fluidJackDaniels.setTemperature(420); fluidJackDaniels.setViscosity(750); fluidJackDaniels.setGaseous(true); + fluidJackDaniels.setUnlocalizedName("fluidJackDaniels"); FluidRegistry.registerFluid(fluidJackDaniels); - blockFluidJackDaniels = new BlockFluidJackDaniels(fluidJackDaniels, Material.water).setBlockName("fluidJackDaniels"); + blockFluidJackDaniels = new BlockFluidJackDaniels(fluidJackDaniels, Material.water).setBlockName("fluidBlockJackDaniels"); GameRegistry.registerBlock(blockFluidJackDaniels, CORE.MODID + "_" + blockFluidJackDaniels.getUnlocalizedName().substring(5)); fluidJackDaniels.setUnlocalizedName(blockFluidJackDaniels.getUnlocalizedName()); } diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 499ea28eb6..ac1aa32801 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -5,6 +5,7 @@ import miscutil.core.block.ModBlocks; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.gui.ModGUI; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.handler.COMPAT_IntermodStaging; import miscutil.core.handler.events.PickaxeBlockBreakEventHandler; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; @@ -35,13 +36,15 @@ public class CommonProxy { Utils.LOG_WARNING("Development mode not set."); } AddToCreativeTab.initialiseTabs(); + //Apparently I should do this here. Might put it in Init for a test. + //Growthcraft_Handler.run(); } public void init(FMLInitializationEvent e) { //Debug Loading if (CORE.DEBUG){ DEBUG_INIT.registerHandlers(); - } + } ModItems.init(); ModBlocks.init(); MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); @@ -50,6 +53,7 @@ public class CommonProxy { COMPAT_HANDLER.registerMyModsOreDictEntries(); COMPAT_HANDLER.registerGregtechMachines(); COMPAT_HANDLER.intermodOreDictionarySupport(); + COMPAT_IntermodStaging.load(); } public void postInit(FMLPostInitializationEvent e) { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java index c0b52c5250..8b25360f1f 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java @@ -1,7 +1,6 @@ package miscutil.core.common.compat; -import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.item.UtilsItems; @@ -43,11 +42,11 @@ public class COMPAT_IC2 { RemoveRecipeQueue.add("IC2:itemCable:6"); RemoveRecipeQueue.add("IC2:itemCable:10"); RemoveRecipeQueue.add("IC2:itemCable:13"); - RemoveRecipeQueue.add(itemCropnalyzer); - RemoveRecipeQueue.add(itemSolarHelmet); + //RemoveRecipeQueue.add(itemCropnalyzer); + //RemoveRecipeQueue.add(itemSolarHelmet); - AddRecipeQueue.add(Cropnalyzer); - AddRecipeQueue.add(SolarHelmet); + //AddRecipeQueue.add(Cropnalyzer); + //AddRecipeQueue.add(SolarHelmet); } } diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java new file mode 100644 index 0000000000..b3c7934c9a --- /dev/null +++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java @@ -0,0 +1,18 @@ +package miscutil.core.handler; + +import growthcraft.core.GrowthCraftCore; +import miscutil.core.intermod.growthcraft.Growthcraft_Handler; +import miscutil.core.lib.LoadedMods; + +public class COMPAT_IntermodStaging { + + public static void load(){ + if (LoadedMods.Growthcraft || GrowthCraftCore.instance != null){ + Growthcraft_Handler.run(); + } + + + } + + +} diff --git a/src/Java/miscutil/core/intermod/growthcraft/Growthcraft_Handler.java b/src/Java/miscutil/core/intermod/growthcraft/Growthcraft_Handler.java new file mode 100644 index 0000000000..96912df9bc --- /dev/null +++ b/src/Java/miscutil/core/intermod/growthcraft/Growthcraft_Handler.java @@ -0,0 +1,61 @@ +package miscutil.core.intermod.growthcraft; + +import growthcraft.api.cellar.Booze; +import growthcraft.api.cellar.CellarRegistry; +import growthcraft.cellar.block.BlockFluidBooze; +import growthcraft.cellar.item.ItemBoozeBottle; +import growthcraft.cellar.item.ItemBoozeBucketDEPRECATED; +import growthcraft.cellar.item.ItemBucketBooze; +import growthcraft.cellar.utils.BoozeRegistryHelper; +import growthcraft.hops.GrowthCraftHops; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.potion.Potion; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import cpw.mods.fml.common.registry.GameRegistry; + +public class Growthcraft_Handler { + + public static BlockFluidBooze[] jackDanielsWhiskeyFluids; + public static Item jackDaniels; + public static Item jackDanielsSeeds; + public static Item jackDanielsWhiskey; + public static Item jackDanielsWhiskeyBucket_deprecated; + public static ItemBucketBooze[] jackDanielsWhiskeyBuckets; + public static Fluid[] jackDanielsWhiskeyBooze; + //private static int internalColour = FluidRegistry.getFluid("fluidJackDaniels").getColor(); + private static int internalColour = 0000000; + + //Run me during Pre-Init + public static void run(){ + start(); + } + + private static void start(){ + jackDaniels = GrowthCraftHops.hops; + jackDanielsSeeds = GrowthCraftHops.hopSeeds; + + jackDanielsWhiskeyBooze = new Booze[5]; + jackDanielsWhiskeyFluids = new BlockFluidBooze[jackDanielsWhiskeyBooze.length]; + jackDanielsWhiskeyBuckets = new ItemBucketBooze[jackDanielsWhiskeyBooze.length]; + BoozeRegistryHelper.initializeBooze(jackDanielsWhiskeyBooze, jackDanielsWhiskeyFluids, jackDanielsWhiskeyBuckets, "grc.jackDanielsWhiskey", internalColour); + + jackDanielsWhiskey = new ItemBoozeBottle(6, -0.5F, jackDanielsWhiskeyBooze).setColor(internalColour).setTipsy(0.7F, 900).setPotionEffects(new int[] { Potion.digSpeed.id }, new int[] { 3600 }); + jackDanielsWhiskeyBucket_deprecated = new ItemBoozeBucketDEPRECATED(jackDanielsWhiskeyBooze).setColor(internalColour); + + + //GameRegistry.registerItem(jackDaniels, "grc.jackDaniels"); + //GameRegistry.registerItem(jackDanielsSeeds, "grc.jackDanielsSeeds"); + GameRegistry.registerItem(jackDanielsWhiskey, "grc.jackDanielsWhiskey"); + GameRegistry.registerItem(jackDanielsWhiskeyBucket_deprecated, "grc.jackDanielsWhiskey_bucket"); + + BoozeRegistryHelper.registerBooze(jackDanielsWhiskeyBooze, jackDanielsWhiskeyFluids, jackDanielsWhiskeyBuckets, jackDanielsWhiskey, "grc.jackDanielsWhiskey", jackDanielsWhiskeyBucket_deprecated); + + CellarRegistry.instance().brew().addBrewing(FluidRegistry.WATER, Items.wheat, jackDanielsWhiskeyBooze[4], 200, 60, 0.4F); + CellarRegistry.instance().brew().addBrewing(jackDanielsWhiskeyBooze[4], jackDaniels, jackDanielsWhiskeyBooze[0], 350, 60, 0.1F); + + + } + +} diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java b/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java new file mode 100644 index 0000000000..9d0f1f2729 --- /dev/null +++ b/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java @@ -0,0 +1,11 @@ +package miscutil.core.intermod.psychedelicraft; + + +public class Psychedelicraft_Booze { + + public static void run(){ + //Psychedelicraft; + ivtoolkit + } + +} diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index 019ac09b89..7e234b970b 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -21,6 +21,7 @@ public class LoadedMods { public static boolean ForbiddenMagic = false; public static boolean CompactWindmills = false; public static boolean Railcraft = false; + public static boolean Growthcraft = false; public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper @@ -89,6 +90,11 @@ public class LoadedMods { Railcraft = true; totalMods++; } + if (Loader.isModLoaded("Growthcraft") == true){ + Growthcraft = true; + totalMods++; + } + Utils.LOG_INFO("Content found for "+totalMods+" mods"); diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index e2949eb79c..6f74b873b4 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -440,9 +440,9 @@ public class RECIPES_Machines { //Industrial Coke Oven UtilsRecipe.recipeBuilder( - plateCobalt, circuitTier3, plateCobalt, + plateCobalt, circuitTier4, plateCobalt, machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, - plateCobalt, circuitTier3, plateCobalt, + plateCobalt, circuitTier5, plateCobalt, RECIPE_IndustrialCokeOvenController); //Coke Oven Frame Casing |