Merge pull request #1103 from thatsIch/b-1013-rotarycraft-power

Fixes #1013 Energy acceptor can receive RotaryCraft Power again

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

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"
 }

src/main/java/appeng/core/WorldSettings.java

@@ -61,7 +61,7 @@ public class WorldSettings extends Configuration
 
 	private static WorldSettings instance;
 	private final List<Integer> storageCellDims = new ArrayList<Integer>();
-	private final File aeFolder;
+	private final File spawnDataFolder;
 	private final CompassService compass;
 	private final PlayerMappings mappings;
 	private final Map<GridStorageSearch, WeakReference<GridStorageSearch>> loadedStorage = new WeakHashMap<GridStorageSearch, WeakReference<GridStorageSearch>>();
@@ -70,8 +70,8 @@ public class WorldSettings extends Configuration
 
 	public WorldSettings( File aeFolder )
 	{
-		super( new File( aeFolder.getPath() + File.separatorChar + "settings.cfg" ) );
-		this.aeFolder = aeFolder;
+		super( new File( aeFolder.getPath(), "settings.cfg" ) );
+		this.spawnDataFolder = new File( aeFolder, SPAWNDATA_FOLDER );
 		this.compass = new CompassService( aeFolder );
 
 		for ( int dimID : this.get( "DimensionManager", "StorageCells", new int[0] ).getIntList() )
@@ -101,7 +101,7 @@ public class WorldSettings extends Configuration
 		{
 			File world = DimensionManager.getCurrentSaveRootDirectory();
 
-			File aeBaseFolder = new File( world.getPath() + File.separatorChar + "AE2" );
+			File aeBaseFolder = new File( world.getPath(), "AE2" );
 
 			if ( !aeBaseFolder.isDirectory() && !aeBaseFolder.mkdir() )
 			{
@@ -161,7 +161,7 @@ public class WorldSettings extends Configuration
 			throw new RuntimeException( "Invalid Request" );
 
 		NBTTagCompound data = null;
-		File file = new File( this.aeFolder, SPAWNDATA_FOLDER + File.separatorChar + dim + '_' + ( chunkX >> 4 ) + '_' + ( chunkZ >> 4 ) + ".dat" );
+		File file = new File( this.spawnDataFolder, dim + '_' + ( chunkX >> 4 ) + '_' + ( chunkZ >> 4 ) + ".dat" );
 
 		if ( file.isFile() )
 		{
@@ -227,7 +227,7 @@ public class WorldSettings extends Configuration
 		if ( !Thread.holdsLock( WorldSettings.class ) )
 			throw new RuntimeException( "Invalid Request" );
 
-		File file = new File( this.aeFolder, SPAWNDATA_FOLDER + File.separatorChar + dim + '_' + ( chunkX >> 4 ) + '_' + ( chunkZ >> 4 ) + ".dat" );
+		File file = new File( this.spawnDataFolder, dim + '_' + ( chunkX >> 4 ) + '_' + ( chunkZ >> 4 ) + ".dat" );
 		FileOutputStream fileOutputStream = null;
 
 		try

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
 	{
 
 	}
-
 }

src/main/java/appeng/services/compass/CompassRegion.java

@@ -185,6 +185,6 @@ public class CompassRegion
 				AELog.info( "Failed to create AE2/compass/" );
 		}
 
-		return new File( folder + File.separatorChar + this.world + '_' + this.low_x + '_' + this.low_z + ".dat" );
+		return new File( folder, this.world + '_' + this.low_x + '_' + this.low_z + ".dat" );
 	}
 }

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)
 	{