From 01656f13a636d6665afe42c5712d5c706b074e0d Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Thu, 28 Apr 2016 02:40:49 -0500 Subject: [PATCH 1/3] Basic MFR plugin, allow farm to plant/cut rubber trees (trying to plant sacreds is a ..bad idea) Centrifuge raw rubber from propolis in the absense of IC2 minor bugfix for witchery sapling ferment --- gradle.properties | 2 +- lang | 2 +- .../java/forestry/plugins/PluginManager.java | 2 + .../compat/PluginMineFactoryReloaded.java | 72 +++++++++++++++++++ .../plugins/compat/PluginWitchery.java | 2 +- 5 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 src/main/java/forestry/plugins/compat/PluginMineFactoryReloaded.java diff --git a/gradle.properties b/gradle.properties index a37096aa6..4ae23666d 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=12 +version_patch=13 diff --git a/lang b/lang index b5ac4e0d6..0e0cd6846 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit b5ac4e0d6cde3f48a37d8f4f4b515710347b2cf4 +Subproject commit 0e0cd684699578a2b9696d73b091a8c4a826686f diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 4561527f1..c61fd6054 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -57,6 +57,7 @@ import forestry.plugins.compat.PluginHarvestCraft; import forestry.plugins.compat.PluginIC2; import forestry.plugins.compat.PluginImmersiveEngineering; import forestry.plugins.compat.PluginMagicalCrops; +import forestry.plugins.compat.PluginMineFactoryReloaded; import forestry.plugins.compat.PluginNatura; import forestry.plugins.compat.PluginPlantMegaPack; import forestry.plugins.compat.PluginRotaryCraft; @@ -115,6 +116,7 @@ public class PluginManager { IMMERSIVEENGINEERING(new PluginImmersiveEngineering()), INDUSTRIALCRAFT(new PluginIC2()), MAGICALCROPS(new PluginMagicalCrops()), + MINEFACTORYRELOADED(new PluginMineFactoryReloaded()), NATURA(new PluginNatura()), PLANTMEGAPACK(new PluginPlantMegaPack()), ROTARYCRAFT(new PluginRotaryCraft()), diff --git a/src/main/java/forestry/plugins/compat/PluginMineFactoryReloaded.java b/src/main/java/forestry/plugins/compat/PluginMineFactoryReloaded.java new file mode 100644 index 000000000..f2b1dd32a --- /dev/null +++ b/src/main/java/forestry/plugins/compat/PluginMineFactoryReloaded.java @@ -0,0 +1,72 @@ +/******************************************************************************* + * 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 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.event.FMLInterModComms; +import cpw.mods.fml.common.registry.GameData; +import cpw.mods.fml.common.registry.GameRegistry; + +import forestry.api.core.ForestryAPI; +import forestry.api.recipes.RecipeManagers; +import forestry.apiculture.items.EnumPropolis; +import forestry.apiculture.items.ItemRegistryApiculture; +import forestry.core.config.Constants; +import forestry.core.fluids.Fluids; +import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.ModUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.Plugin; +import forestry.plugins.PluginApiculture; +import forestry.plugins.PluginManager; + +@Plugin(pluginID = "MinefactoryReloaded", name = "MineFactoryReloaded", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.minefactoryreloaded.description") +public class PluginMineFactoryReloaded extends ForestryPlugin { + + private static final String MFR = "MineFactoryReloaded"; + + @Override + public boolean isAvailable() { + return ModUtil.isModLoaded(MFR); + } + + @Override + public String getFailMessage() { + return "MineFactoryReloaded not found"; + } + + @Override + protected void registerRecipes() { + Block rubbersapling = GameRegistry.findBlock(MFR, "rubberwood.sapling"); + Item saplingItem = GameRegistry.findItem(MFR, "rubberwood.sapling"); + ItemStack saplingStack = new ItemStack(saplingItem, 1, 0); + ItemStack rubberRaw = GameRegistry.findItemStack(MFR,"rubber.raw", 1); + GameRegistry.findItemStack(MFR,"rubber.raw", 1); + + if (PluginManager.Module.APICULTURE.isEnabled() && !PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { + if (rubberRaw != null) { + ItemRegistryApiculture beeItems = PluginApiculture.items; + RecipeManagers.centrifugeManager.addRecipe(20, beeItems.propolis.get(EnumPropolis.NORMAL, 1), ImmutableMap.of(rubberRaw, 1.0f)); + } + } + if (rubbersapling != null && rubberRaw != null) { + RecipeUtil.addFermenterRecipes(saplingStack, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); + String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); + FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); + } + } + +} diff --git a/src/main/java/forestry/plugins/compat/PluginWitchery.java b/src/main/java/forestry/plugins/compat/PluginWitchery.java index 9f10db127..e6e7008ee 100644 --- a/src/main/java/forestry/plugins/compat/PluginWitchery.java +++ b/src/main/java/forestry/plugins/compat/PluginWitchery.java @@ -77,7 +77,7 @@ public class PluginWitchery extends ForestryPlugin { Item saplingItem = GameRegistry.findItem(Witch, "witchsapling"); ItemStack saplingStack = new ItemStack(saplingItem, 1, OreDictionary.WILDCARD_VALUE); - RecipeUtil.addFermenterRecipes(saplingStack, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(saplingStack, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); From e0df2f84a039048c9fed4f011534bdc87364e020 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Sun, 29 May 2016 18:40:57 -0500 Subject: [PATCH 2/3] Fix Fabricator glass recipes 4000mb->4 blocks --- src/main/java/forestry/plugins/PluginFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index fcad2a911..8eabddc9e 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -258,15 +258,14 @@ public class PluginFactory extends ForestryPlugin { if (PluginManager.Module.APICULTURE.isEnabled()) { ItemRegistryApiculture beeItems = PluginApiculture.items; - FluidStack liquidGlass = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME); FluidStack liquidGlassX4 = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME * 4); for (int i = 0; i < 16; i++) { - RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlass, new ItemStack(Blocks.stained_glass, 4, 15 - i), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlassX4, new ItemStack(Blocks.stained_glass, 4, 15 - i), new Object[]{ "#", "X", '#', dyes[i], 'X', beeItems.propolis.getWildcard()}); } - RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlassX4, new ItemStack(Blocks.glass, 1, 0), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlassX4, new ItemStack(Blocks.glass, 4, 0), new Object[]{ "#", "X", 'X', beeItems.propolis.getWildcard()}); } From 789da29af0fbd6b95a256bc3cb53b76dc8958b61 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Sun, 5 Jun 2016 19:18:02 -0500 Subject: [PATCH 3/3] Fix #1293 Prevent nulls from passing Agricraft harvest Update HC compat --- .../forestry/farming/logic/CropBasicAgriCraft.java | 2 ++ .../forestry/plugins/compat/PluginHarvestCraft.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java index 97750b269..b9d6e2e29 100644 --- a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java +++ b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java @@ -12,6 +12,7 @@ package forestry.farming.logic; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -47,6 +48,7 @@ public class CropBasicAgriCraft extends Crop { harvest.remove(0); Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, Blocks.melon_block, 0); world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Constants.FLAG_BLOCK_SYNCH); + harvest.removeAll(Collections.singleton(null)); //sanatize nulls that get thru from Agricraft+Harvestcraft (sesameseed) return harvest; } diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java index abc5c49dc..a674937bb 100644 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java @@ -89,7 +89,8 @@ public class PluginHarvestCraft extends ForestryPlugin { "persimmon", "avocado", "coconut", - "durian" + "durian", + "gooseberry" ); ImmutableList trees = ImmutableList.of( @@ -112,7 +113,8 @@ public class PluginHarvestCraft extends ForestryPlugin { ImmutableList spices = ImmutableList.of( "ginger", - "spiceleaf" + "spiceleaf", + "curryleaf" //"mustardseed" Mustard is inconsistent and annoying. ); @@ -149,7 +151,8 @@ public class PluginHarvestCraft extends ForestryPlugin { "wintersquash", "zucchini", "bambooshoot", - "spinach" + "spinach", + "waterchestnut" ); ImmutableList grains = ImmutableList.of( @@ -159,7 +162,8 @@ public class PluginHarvestCraft extends ForestryPlugin { ); ImmutableList cropNuts = ImmutableList.of( - "peanut" + "peanut", + "sesameseeds" ); ImmutableList nuts = ImmutableList.of(