mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-22 12:59:48 +00:00
- Sorry TTinkerer. It had to be done.
This commit is contained in:
1 parent
c2baa36a14
commit
b815282dfb
3 files changed
+54
No files matched your search
@@ -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) {
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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");
|
||||
|
||||
Reference in new issue
Block a user