diff --git a/dependencies.gradle b/dependencies.gradle index bd26edc9..14f4243f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,9 +1,8 @@ // Add your dependencies here dependencies { - compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev') + compile('com.github.GTNewHorizons:ForestryMC:4.5.2:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.79:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.2-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index 7438879a..4cc6084c 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -3,12 +3,11 @@ import static magicbees.main.utils.compat.thaumcraft.NodeHelper.getWeightedRandomAspect; import static magicbees.main.utils.compat.thaumcraft.NodeHelper.updateNode; -import cpw.mods.fml.common.Optional; +import forestry.api.apiculture.IAlleleBeeAcceleratableEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; -import gregtech.api.interfaces.IAlleleBeeAcceleratableEffect; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -24,7 +23,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; -@Optional.Interface(iface = "gregtech.api.interfaces.IAlleleBeeAcceleratableEffect", modid = "gregtech") public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAcceleratableEffect { public AlleleEffectEmpowering(String id, boolean isDominant) { @@ -56,7 +54,6 @@ protected IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedDat return storedData; } - @Optional.Method(modid = "gregtech") @Override public IEffectData doEffectAccelerated(IBeeGenome genome, IEffectData storedData, IBeeHousing housing, float did) { storedData.setInteger(0, 0); diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java index 8ff6a8b7..2d5203ea 100644 --- a/src/main/java/magicbees/main/utils/VersionInfo.java +++ b/src/main/java/magicbees/main/utils/VersionInfo.java @@ -24,7 +24,7 @@ public class VersionInfo { public static final String Logo = "/gfx/magicbees/logo.png"; public static final String Depends = - "required-after:Forestry@[4.2.5,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2;after:gregtech"; + "required-after:Forestry@[4.2.5,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2"; boolean criticalUpdate; boolean newVersion;