From 22b965e15a94bb732c455b73374cb752657af8ee Mon Sep 17 00:00:00 2001 From: thatsIch Date: Thu, 26 Mar 2015 20:28:34 +0100 Subject: [PATCH] Fixes #1013 Energy acceptor can receive RotaryCraft Power again --- build.properties | 2 +- gradle/scripts/dependencies.gradle | 2 +- .../integration/modules/RotaryCraft.java | 9 ++++---- .../appeng/tile/powersink/RotaryCraft.java | 21 +------------------ 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/build.properties b/build.properties index b51e0b46..ff078cff 100644 --- a/build.properties +++ b/build.properties @@ -37,5 +37,5 @@ api_mfr_version=1 api_railcraft_version=1 api_rblocks_version=1 api_rf_version=2 -api_rotarycraft_version=1 +api_rotarycraft_version=V5c api_waila_version=1.5.10_1.7.10 \ No newline at end of file diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index fdcb1cea..4404aadd 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -57,8 +57,8 @@ dependencies { compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}") compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}") compile(group: 'api', name: 'rf', version: "${config.api_rf_version}") - compile(group: 'api', name: 'rotarycraft', version: "${config.api_rotarycraft_version}") compile "appeng:Waila:${config.api_waila_version}:api" + compile "appeng:RotaryCraft:${config.api_rotarycraft_version}:api" testCompile "junit:junit:4.11" } diff --git a/src/main/java/appeng/integration/modules/RotaryCraft.java b/src/main/java/appeng/integration/modules/RotaryCraft.java index 0792b957..71383e65 100644 --- a/src/main/java/appeng/integration/modules/RotaryCraft.java +++ b/src/main/java/appeng/integration/modules/RotaryCraft.java @@ -18,15 +18,17 @@ package appeng.integration.modules; + import appeng.integration.BaseModule; + public class RotaryCraft extends BaseModule { - public static RotaryCraft instance; - public RotaryCraft() { - this.testClassExistence( Reika.RotaryCraft.API.ShaftPowerReceiver.class ); + public RotaryCraft() + { + this.testClassExistence( Reika.RotaryCraft.API.Power.ShaftPowerReceiver.class ); } @Override @@ -40,5 +42,4 @@ public class RotaryCraft extends BaseModule { } - } diff --git a/src/main/java/appeng/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java index e7d45e14..42061f5a 100644 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ b/src/main/java/appeng/tile/powersink/RotaryCraft.java @@ -20,7 +20,7 @@ package appeng.tile.powersink; import net.minecraftforge.common.util.ForgeDirection; -import Reika.RotaryCraft.API.ShaftPowerReceiver; +import Reika.RotaryCraft.API.Power.ShaftPowerReceiver; import appeng.api.config.PowerUnits; import appeng.tile.TileEvent; @@ -82,25 +82,6 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver this.alpha = io; } - - @Override - final public int getMachineX() - { - return this.xCoord; - } - - @Override - final public int getMachineY() - { - return this.yCoord; - } - - @Override - final public int getMachineZ() - { - return this.zCoord; - } - @Override final public void setOmega(int o) {