diff --git a/lang b/lang index 265a8e573..cb5900228 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 265a8e573ab1e32146a2373118be3b8b6d836254 +Subproject commit cb5900228ed0e4ec7a8a16aa69dc329c1a11afb9 diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index c8ab1be25..4561527f1 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -59,6 +59,7 @@ import forestry.plugins.compat.PluginImmersiveEngineering; import forestry.plugins.compat.PluginMagicalCrops; import forestry.plugins.compat.PluginNatura; import forestry.plugins.compat.PluginPlantMegaPack; +import forestry.plugins.compat.PluginRotaryCraft; import forestry.plugins.compat.PluginWitchery; public class PluginManager { @@ -116,6 +117,7 @@ public class PluginManager { MAGICALCROPS(new PluginMagicalCrops()), NATURA(new PluginNatura()), PLANTMEGAPACK(new PluginPlantMegaPack()), + ROTARYCRAFT(new PluginRotaryCraft()), WITCHERY(new PluginWitchery()); static { diff --git a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java index bf03c0776..f06dbf356 100644 --- a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java +++ b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java @@ -41,7 +41,7 @@ public class PluginImmersiveEngineering extends ForestryPlugin { } @Override - protected void registerRecipes() { + protected void postInit() { ItemStack hempSeed = GameRegistry.findItemStack(ImEng, "seed", 1); Block hempCrop = GameRegistry.findBlock(ImEng, "hemp"); diff --git a/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java b/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java new file mode 100644 index 000000000..ddb3f135f --- /dev/null +++ b/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.plugins.compat; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import cpw.mods.fml.common.registry.GameRegistry; + +import forestry.api.core.ForestryAPI; +import forestry.api.farming.Farmables; +import forestry.api.recipes.RecipeManagers; +import forestry.core.config.Constants; +import forestry.core.fluids.Fluids; +import forestry.core.utils.ModUtil; +import forestry.farming.logic.FarmableBasicFruit; +import forestry.farming.logic.FarmableGenericCrop; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; + +@Plugin(pluginID = "RotaryCraft", name = "RotaryCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.rotarycraft.description") +public class PluginRotaryCraft extends ForestryPlugin { + + private static final String RC = "RotaryCraft"; + + @Override + public boolean isAvailable() { + return ModUtil.isModLoaded(RC); + } + + @Override + public String getFailMessage() { + return "RotaryCraft not found"; + } + + @Override + protected void registerRecipes() { + + ItemStack canolaSeed = GameRegistry.findItemStack(RC, "rotarycraft_item_canola", 1); + Block canolaCrop = GameRegistry.findBlock(RC, "rotarycraft_block_canola"); + + int seedAmount = (ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed")/16); + seedAmount = Math.max(seedAmount, 1); // Produce at least 1 mb. + if (canolaSeed != null && canolaCrop != null) { + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{canolaSeed}, Fluids.SEEDOIL.getFluid(seedAmount)); + Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(canolaSeed, canolaCrop, 9)); + Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(canolaCrop, 9)); + } + } + +}