tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes #1013 Energy acceptor can receive RotaryCraft Power again

Browse source
This commit is contained in:
thatsIch 2015-03-26 20:28:34 +01:00
parent db7296c0a1
commit 22b965e15a
4 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -37,5 +37,5 @@ api_mfr_version=1
api_railcraft_version=1 api_railcraft_version=1
api_rblocks_version=1 api_rblocks_version=1
api_rf_version=2 api_rf_version=2
api_rotarycraft_version=1 api_rotarycraft_version=V5c
api_waila_version=1.5.10_1.7.10 api_waila_version=1.5.10_1.7.10

2
gradle/scripts/dependencies.gradle
View file

@ -57,8 +57,8 @@ dependencies {
compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}") compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_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: '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:Waila:${config.api_waila_version}:api"
compile "appeng:RotaryCraft:${config.api_rotarycraft_version}:api"
testCompile "junit:junit:4.11" testCompile "junit:junit:4.11"
} }

9
src/main/java/appeng/integration/modules/RotaryCraft.java
View file

@ -18,15 +18,17 @@
package appeng.integration.modules; package appeng.integration.modules;
import appeng.integration.BaseModule; import appeng.integration.BaseModule;
public class RotaryCraft extends BaseModule public class RotaryCraft extends BaseModule
{ {
public static RotaryCraft instance; public static RotaryCraft instance;
public RotaryCraft() { public RotaryCraft()
this.testClassExistence( Reika.RotaryCraft.API.ShaftPowerReceiver.class ); {
this.testClassExistence( Reika.RotaryCraft.API.Power.ShaftPowerReceiver.class );
} }
@Override @Override
@ -40,5 +42,4 @@ public class RotaryCraft extends BaseModule
{ {
} }
} }

21
src/main/java/appeng/tile/powersink/RotaryCraft.java
View file

@ -20,7 +20,7 @@ package appeng.tile.powersink;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import Reika.RotaryCraft.API.ShaftPowerReceiver; import Reika.RotaryCraft.API.Power.ShaftPowerReceiver;
import appeng.api.config.PowerUnits; import appeng.api.config.PowerUnits;
import appeng.tile.TileEvent; import appeng.tile.TileEvent;
@ -82,25 +82,6 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
this.alpha = io; 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 @Override
final public void setOmega(int o) final public void setOmega(int o)
{ {