From b815282dfb292f90dc4e72d51c8431666df3a134 Mon Sep 17 00:00:00 2001 From: HellFirePvP Date: Wed, 20 Apr 2016 01:09:31 +0200 Subject: [PATCH] - Sorry TTinkerer. It had to be done. --- .../gadomancy/common/aura/AuraEffects.java | 9 ++++ .../IntegrationThaumicTinkerer.java | 43 +++++++++++++++++++ .../registration/RegisteredIntegrations.java | 2 + 3 files changed, 54 insertions(+) create mode 100644 src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java index 216bfaa..9110cc6 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java @@ -2,6 +2,7 @@ package makeo.gadomancy.common.aura; import makeo.gadomancy.api.AuraEffect; import makeo.gadomancy.common.events.EventHandlerEntity; +import makeo.gadomancy.common.integration.IntegrationThaumicTinkerer; import makeo.gadomancy.common.registration.RegisteredIntegrations; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.registration.RegisteredPotions; @@ -596,6 +597,14 @@ public class AuraEffects { if (block.getTickRandomly()) { world.scheduleBlockUpdate(coordinates.posX, coordinates.posY, coordinates.posZ, block, world.rand.nextInt(8) + 2); } + if(IntegrationThaumicTinkerer.isCropBlock(block)) { + TileEntity te = world.getTileEntity(coordinates.posX, coordinates.posY, coordinates.posZ); + if(te != null && IntegrationThaumicTinkerer.isCropTile(te)) { + for (int i = 0; i < 10; i++) { + te.updateEntity(); //Badumm tss.. + } + } + } } private static void addOrExtendPotionEffect(Potion potion, EntityLivingBase entityLiving, int cap, int durToAdd, int amplifier, boolean ambient) { diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java new file mode 100644 index 0000000..251b1bc --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java @@ -0,0 +1,43 @@ +package makeo.gadomancy.common.integration; + +import makeo.gadomancy.common.Gadomancy; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; + +/** + * HellFirePvP@Admin + * Date: 20.04.2016 / 00:43 + * on Gadomancy + * IntegrationThaumicTinkerer + */ +public class IntegrationThaumicTinkerer extends IntegrationMod { + + private static Class infusedCropBlockClass, infusedCropTile; + + @Override + public String getModId() { + return "ThaumicTinkerer"; + } + + @Override + public void doInit() { + try { + infusedCropBlockClass = Class.forName("thaumic.tinkerer.common.block.BlockInfusedGrain"); + infusedCropTile = Class.forName("thaumic.tinkerer.common.block.tile.TileInfusedGrain"); + if(infusedCropBlockClass != null && infusedCropTile != null) { + Gadomancy.log.info("Hooked TTinkerer magic-crops"); + } + } catch (Throwable tr) {} + } + + public static boolean isCropBlock(Block block) { + if(infusedCropBlockClass == null) return false; + return block.getClass().equals(infusedCropBlockClass) || infusedCropBlockClass.isAssignableFrom(block.getClass()); + } + + public static boolean isCropTile(TileEntity te) { + if(infusedCropTile == null) return false; + return te.getClass().equals(infusedCropTile) || infusedCropTile.isAssignableFrom(te.getClass()); + } + +} diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java index 95be8ca..8662e0c 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java @@ -21,6 +21,7 @@ public class RegisteredIntegrations { public static IntegrationAutomagy automagy; public static IntegrationNEI nei; public static IntegrationMystcraft mystcraft; + public static IntegrationThaumicTinkerer thaumicTinkerer; private RegisteredIntegrations() {} @@ -30,6 +31,7 @@ public class RegisteredIntegrations { automagy = registerIndependent(IntegrationAutomagy.class); nei = registerIndependent(IntegrationNEI.class); mystcraft = registerIndependent(IntegrationMystcraft.class); + thaumicTinkerer = registerIndependent(IntegrationThaumicTinkerer.class); registerDependent("ThaumicHorizons", "makeo.gadomancy.common.integration.thaumichorizions.IntegrationThaumicHorizions"); registerDependent("Waila", "makeo.gadomancy.common.integration.waila.IntegrationWaila");