diff --git a/gradle.properties b/gradle.properties index 06022c37f..6cfa0b1ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.4.1566-1.7.10 version_major=4 version_minor=2 -version_patch=7 +version_patch=8 diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index f8044d829..51939f79c 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -51,22 +51,25 @@ public class FarmLogicOrchard extends FarmLogic { public FarmLogicOrchard(IFarmHousing housing) { super(housing); this.farmables = Farmables.farmables.get("farmOrchard"); + ImmutableList.Builder traversalBlocksBuilder = ImmutableList.builder(); if (PluginManager.Module.AGRICRAFT.isEnabled() || PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { traversalBlocksBuilder.add(Blocks.farmland); } - if (PluginManager.Module.GROWTHCRAFT.isEnabled()) { + if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { + traversalBlocksBuilder.add(Blocks.dirt); + } + if (PluginManager.Module.PLANTMEGAPACK.isEnabled()) { + traversalBlocksBuilder.add(Blocks.water); + } + + { Block grapeVine = GameRegistry.findBlock("Growthcraft|Grapes", "grc.grapeVine1"); if (grapeVine != null) { traversalBlocksBuilder.add(grapeVine); } } - if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { - traversalBlocksBuilder.add(Blocks.dirt); - } - if (PluginManager.Module.PLANTMEGAPACK.isEnabled()) { - traversalBlocksBuilder.add(Blocks.water); - } + traversalBlocksBuilder.build(); this.traversalBlocks = traversalBlocksBuilder.build(); } diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index eaee10493..1f7f00721 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -72,16 +72,22 @@ public class PluginBiomesOPlenty extends ForestryPlugin { persimmon = new ItemStack(food, 1, 8); } - addFlowers(); - addFarmCrops(); + if (PluginManager.Module.APICULTURE.isEnabled()) { + addFlowers(); + } + if (PluginManager.Module.FARMING.isEnabled()) { + addFarmCrops(); + } } @Override protected void registerRecipes() { super.registerRecipes(); - addFermenterRecipes(); - addSqueezerRecipes(); + if (PluginManager.Module.FACTORY.isEnabled()) { + addFermenterRecipes(); + addSqueezerRecipes(); + } } private static void addFarmCrops() { @@ -100,12 +106,12 @@ public class PluginBiomesOPlenty extends ForestryPlugin { FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } - if (PluginManager.Module.FARMING.isEnabled() && saplings != null && persimmon != null) { + if (saplings != null && persimmon != null) { Farmables.farmables.get("farmArboreal").add(new FarmableGenericSapling(saplings, 15, persimmon)); } Block boPTurnip = GameRegistry.findBlock(BoP, "turnip"); - if (PluginManager.Module.FARMING.isEnabled() && boPTurnip != null) { + if (boPTurnip != null) { Item boPTurnipSeeds = GameRegistry.findItem(BoP, "turnipSeeds"); if (boPTurnipSeeds != null) { Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(boPTurnipSeeds, 1, 0), boPTurnip, 7)); diff --git a/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java b/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java index 012a1477b..b52529c30 100644 --- a/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java @@ -13,6 +13,7 @@ package forestry.plugins.compat; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; @@ -39,7 +40,7 @@ public class PluginGrowthCraft extends ForestryPlugin { @Override public boolean isAvailable() { - return ModUtil.isModLoaded(GC); + return ModUtil.isModLoaded(GC, "[1.7.10-1.0.0,1.7.10-2.5.0)"); } @Override @@ -92,18 +93,20 @@ public class PluginGrowthCraft extends ForestryPlugin { Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(riceBlock, 7, true, false)); //need to set paddyfield to 7 } - ItemStack emptyComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 0); - RecipeManagers.centrifugeManager.addRecipe(20, emptyComb, ImmutableMap.of( - PluginCore.items.beeswax.getItemStack(), 1.0f) - ); - if (PluginManager.Module.APICULTURE.isEnabled()) { - ItemStack fullComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 1); - RecipeManagers.centrifugeManager.addRecipe(20, fullComb, ImmutableMap.of( - PluginCore.items.beeswax.getItemStack(), 1.0f, - PluginApiculture.items.honeyDrop.getItemStack(), 0.9f, - PluginApiculture.items.honeydew.getItemStack(), 0.1f) - ); + Item comb = GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"); + if (comb != null) { + ItemStack emptyComb = new ItemStack(comb, 1, 0); + RecipeManagers.centrifugeManager.addRecipe(20, emptyComb, ImmutableMap.of( + PluginCore.items.beeswax.getItemStack(), 1.0f) + ); + ItemStack fullComb = new ItemStack(comb, 1, 1); + RecipeManagers.centrifugeManager.addRecipe(20, fullComb, ImmutableMap.of( + PluginCore.items.beeswax.getItemStack(), 1.0f, + PluginApiculture.items.honeyDrop.getItemStack(), 0.9f, + PluginApiculture.items.honeydew.getItemStack(), 0.1f) + ); + } } ItemStack bamboo = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bamboo", 1); @@ -124,7 +127,7 @@ public class PluginGrowthCraft extends ForestryPlugin { ItemStack grapes = GameRegistry.findItemStack("Growthcraft|Grapes", "grc.grapes", 1); //squeeze - if (grapes != null) { + if (grapes.getItem() != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{grapes}, Fluids.JUICE.getFluid(juiceAmount)); BackpackManager.backpackItems[2].add(grapes); }