From c1b64f033bb479ebbb031eb7b33ac8831d040c00 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 22 Jan 2017 19:04:57 +1000 Subject: + Added a FarmAI to the Tree Farmer, which handles Forestry saplings. (Will eventually also do block breaks too). + Added handling of the block break particles. --- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 18 ++++++++++++++++++ .../xmod/forestry/trees/TreefarmManager.java | 5 +++++ 2 files changed, 23 insertions(+) (limited to 'src/Java/gtPlusPlus/xmod/forestry') diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index cc2e77c448..e92aa40ca2 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -1,10 +1,14 @@ package gtPlusPlus.xmod.forestry; +import forestry.core.proxy.Proxies; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.forestry.bees.alveary.AlvearyHandler; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; +import net.minecraft.block.Block; +import net.minecraft.world.World; +import cpw.mods.fml.common.Optional; public class HANDLER_FR { @@ -29,4 +33,18 @@ public class HANDLER_FR { FR_Gregtech_Recipes.registerItems(); } } + + public static boolean createBlockBreakParticles(World world, int x, int y, int z, Block block){ + if (LoadedMods.Forestry){ + createBlockBreakParticles_INTERNAL(world, x, y, z, block); + } + return false; + } + + @Optional.Method(modid = "Forestry") + private static void createBlockBreakParticles_INTERNAL(World world, int x, int y, int z, Block block){ + Proxies.common.addBlockDestroyEffects(world, x, y, z, block, 0); + } + + } diff --git a/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java b/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java index 121c1849b5..5617d820d0 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java +++ b/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java @@ -67,6 +67,11 @@ public class TreefarmManager { if (log == Blocks.log || log == Blocks.log2){ return true; } + + //Forestry/General Compat + if (log.getClass().getName().toLowerCase().contains("blocklog")){ + return true; + } //IC2 Rubber Tree Compat if (log.getClass().getName().toLowerCase().contains("rubwood") || log.getClass().getName().toLowerCase().contains("rubleaves")){ -- cgit