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/client/gui/implementations/GuiCraftAmount.java

@@ -48,8 +48,14 @@ public class GuiCraftAmount extends AEBaseGui
 
 	GuiButton next;
 
-	GuiButton plus1, plus10, plus100, plus1000;
-	GuiButton minus1, minus10, minus100, minus1000;
+	GuiButton plus1;
+	GuiButton plus10;
+	GuiButton plus100;
+	GuiButton plus1000;
+	GuiButton minus1;
+	GuiButton minus10;
+	GuiButton minus100;
+	GuiButton minus1000;
 
 	GuiBridge OriginalGui;
 

src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java

@@ -309,7 +309,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 				IAEItemStack pendingStack = this.pending.findPrecise( refStack );
 
 				int lines = 0;
-				boolean active = false, scheduled = false;
+				boolean active = false;
+				boolean scheduled = false;
 
 				if ( stored != null && stored.getStackSize() > 0 )
 				{

src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java

@@ -47,8 +47,14 @@ public class GuiLevelEmitter extends GuiUpgradeable
 
 	GuiNumberBox level;
 
-	GuiButton plus1, plus10, plus100, plus1000;
-	GuiButton minus1, minus10, minus100, minus1000;
+	GuiButton plus1;
+	GuiButton plus10;
+	GuiButton plus100;
+	GuiButton plus1000;
+	GuiButton minus1;
+	GuiButton minus10;
+	GuiButton minus100;
+	GuiButton minus1000;
 
 	GuiImgButton levelMode;
 	GuiImgButton craftingMode;

src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java

@@ -97,7 +97,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 	GuiImgButton SortByBox;
 	GuiImgButton SortDirBox;
 
-	GuiImgButton searchBoxSettings, terminalStyleBox;
+	GuiImgButton searchBoxSettings;
+	GuiImgButton terminalStyleBox;
 	final boolean viewCell;
 
 	final ItemStack[] myCurrentViewCells = new ItemStack[5];

src/main/java/appeng/client/gui/implementations/GuiPriority.java

@@ -51,8 +51,14 @@ public class GuiPriority extends AEBaseGui
 	GuiNumberBox priority;
 	GuiTabButton originalGuiBtn;
 
-	GuiButton plus1, plus10, plus100, plus1000;
-	GuiButton minus1, minus10, minus100, minus1000;
+	GuiButton plus1;
+	GuiButton plus10;
+	GuiButton plus100;
+	GuiButton plus1000;
+	GuiButton minus1;
+	GuiButton minus10;
+	GuiButton minus100;
+	GuiButton minus1000;
 
 	GuiBridge OriginalGui;
 

src/main/java/appeng/client/gui/implementations/GuiSecurity.java

@@ -46,7 +46,11 @@ public class GuiSecurity extends GuiMEMonitorable
 		this.standardSize = this.xSize;
 	}
 
-	GuiToggleButton inject, extract, craft, build, security;
+	GuiToggleButton inject;
+	GuiToggleButton extract;
+	GuiToggleButton craft;
+	GuiToggleButton build;
+	GuiToggleButton security;
 
 	@Override
 	public void initGui()

src/main/java/appeng/client/render/BaseBlockRender.java

@@ -606,9 +606,15 @@ public class BaseBlockRender
 	{
 		Tessellator tess = Tessellator.instance;
 
-		double offsetX = 0.0, offsetY = 0.0, offsetZ = 0.0;
-		double layerAX = 0.0, layerAY = 0.0, layerAZ = 0.0;
-		double layerBX = 0.0, layerBY = 0.0, layerBZ = 0.0;
+		double offsetX = 0.0;
+		double offsetY = 0.0;
+		double offsetZ = 0.0;
+		double layerAX = 0.0;
+		double layerAY = 0.0;
+		double layerAZ = 0.0;
+		double layerBX = 0.0;
+		double layerBY = 0.0;
+		double layerBZ = 0.0;
 
 		boolean flip = false;
 		switch (orientation)

src/main/java/appeng/client/render/CableRenderHelper.java

@@ -45,7 +45,9 @@ public class CableRenderHelper
 
 	private void setSide(ForgeDirection s)
 	{
-		ForgeDirection ax, ay, az;
+		ForgeDirection ax;
+		ForgeDirection ay;
+		ForgeDirection az;
 
 		switch (s)
 		{
@@ -205,7 +207,9 @@ public class CableRenderHelper
 			IPart part = cableBusContainer.getPart( s );
 			if ( part != null )
 			{
-				ForgeDirection ax, ay, az;
+				ForgeDirection ax;
+				ForgeDirection ay;
+				ForgeDirection az;
 
 				switch (s)
 				{

src/main/java/appeng/client/render/WorldRender.java

@@ -35,7 +35,7 @@ import appeng.block.AEBaseBlock;
 import appeng.core.AELog;
 
 @SideOnly(Side.CLIENT)
-public class WorldRender implements ISimpleBlockRenderingHandler
+public final class WorldRender implements ISimpleBlockRenderingHandler
 {
 
 	private final RenderBlocks renderer = new RenderBlocks();

src/main/java/appeng/container/ContainerOpenContext.java

@@ -28,7 +28,9 @@ public class ContainerOpenContext
 {
 
 	public World w;
-	public int x, y, z;
+	public int x;
+	public int y;
+	public int z;
 	public ForgeDirection side;
 	final public boolean isItem;
 

src/main/java/appeng/container/implementations/ContainerUpgradeable.java

@@ -59,7 +59,9 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
 		this.upgradeable = te;
 
 		World w = null;
-		int xCoord = 0, yCoord = 0, zCoord = 0;
+		int xCoord = 0;
+		int yCoord = 0;
+		int zCoord = 0;
 
 		if ( te instanceof TileEntity )
 		{

src/main/java/appeng/core/AELog.java

@@ -26,7 +26,7 @@ import appeng.core.features.AEFeature;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;
 
-public class AELog
+public final class AELog
 {
 
 	public static final FMLRelaunchLog instance = FMLRelaunchLog.log;

src/main/java/appeng/core/Api.java

@@ -39,7 +39,7 @@ import appeng.me.GridConnection;
 import appeng.me.GridNode;
 import appeng.util.Platform;
 
-public class Api implements IAppEngApi
+public final class Api implements IAppEngApi
 {
 
 	public static final Api INSTANCE = new Api();

src/main/java/appeng/core/AppEng.java

@@ -37,8 +37,9 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 
 import com.google.common.base.Stopwatch;
 
-import appeng.core.crash.CrashEnhancement;
 import appeng.core.crash.CrashInfo;
+import appeng.core.crash.IntegrationCrashEnhancement;
+import appeng.core.crash.ModCrashEnhancement;
 import appeng.core.features.AEFeature;
 import appeng.core.sync.GuiBridge;
 import appeng.core.sync.network.NetworkHandler;
@@ -79,7 +80,7 @@ public class AppEng
 
 		this.imcHandler = new IMCHandler();
 
-		FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( CrashInfo.MOD_VERSION ) );
+		FMLCommonHandler.instance().registerCrashCallable( new ModCrashEnhancement( CrashInfo.MOD_VERSION ) );
 	}
 
 	public final File getConfigDirectory()
@@ -167,7 +168,7 @@ public class AppEng
 
 		Registration.INSTANCE.postInit( event );
 		IntegrationRegistry.INSTANCE.postInit();
-		FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( CrashInfo.INTEGRATION ) );
+		FMLCommonHandler.instance().registerCrashCallable( new IntegrationCrashEnhancement() );
 
 		CommonHelper.proxy.postInit();
 		AEConfig.instance.save();

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/core/crash/BaseCrashEnhancement.java

@@ -21,52 +21,27 @@ package appeng.core.crash;
 
 import cpw.mods.fml.common.ICrashCallable;
 
-import appeng.core.AEConfig;
-import appeng.integration.IntegrationRegistry;
 
-
-public class CrashEnhancement implements ICrashCallable
+abstract class BaseCrashEnhancement implements ICrashCallable
 {
-
 	private final String name;
 	private final String value;
 
-	private final String ModVersion = AEConfig.CHANNEL + ' ' + AEConfig.VERSION + " for Forge " + // WHAT?
-	net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
-			+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
-			+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
-			+ net.minecraftforge.common.ForgeVersion.buildVersion;
-
-	public CrashEnhancement( CrashInfo Output )
+	public BaseCrashEnhancement( String name, String value )
 	{
-
-		if ( Output == CrashInfo.MOD_VERSION )
-		{
-			this.name = "AE2 Version";
-			this.value = this.ModVersion;
-		}
-		else if ( Output == CrashInfo.INTEGRATION )
-		{
-			this.name = "AE2 Integration";
-			this.value = IntegrationRegistry.INSTANCE.getStatus();
-		}
-		else
-		{
-			this.name = "AE2_UNKNOWN";
-			this.value = "UNKNOWN_VALUE";
-		}
+		this.name = name;
+		this.value = value;
 	}
 
 	@Override
-	public String call() throws Exception
+	public final String call() throws Exception
 	{
 		return this.value;
 	}
 
 	@Override
-	public String getLabel()
+	public final String getLabel()
 	{
 		return this.name;
 	}
-
 }

src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java

@@ -0,0 +1,13 @@
+package appeng.core.crash;
+
+
+import appeng.integration.IntegrationRegistry;
+
+
+public class IntegrationCrashEnhancement extends BaseCrashEnhancement
+{
+	public IntegrationCrashEnhancement()
+	{
+		super( "AE2 Integration", IntegrationRegistry.INSTANCE.getStatus() );
+	}
+}

src/main/java/appeng/core/crash/ModCrashEnhancement.java

@@ -0,0 +1,19 @@
+package appeng.core.crash;
+
+
+import appeng.core.AEConfig;
+
+
+public class ModCrashEnhancement extends BaseCrashEnhancement
+{
+	private static final String MOD_VERSION = AEConfig.CHANNEL + ' ' + AEConfig.VERSION + " for Forge " + // WHAT?
+			net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
+			+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
+			+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
+			+ net.minecraftforge.common.ForgeVersion.buildVersion;
+
+	public ModCrashEnhancement( CrashInfo output )
+	{
+		super( "AE2 Version", MOD_VERSION );
+	}
+}

src/main/java/appeng/core/features/registries/WorldGenRegistry.java

@@ -25,7 +25,7 @@ import net.minecraft.world.WorldProvider;
 
 import appeng.api.features.IWorldGen;
 
-public class WorldGenRegistry implements IWorldGen
+public final class WorldGenRegistry implements IWorldGen
 {
 
 	private static class TypeSet

src/main/java/appeng/core/stats/Achievements.java

@@ -109,7 +109,8 @@ public enum Achievements
 
 	public final ItemStack stack;
 	public final AchievementType type;
-	private final int x, y;
+	private final int x;
+	private final int y;
 
 	private Achievement parent;
 	private Achievement stat;

src/main/java/appeng/core/sync/GuiBridge.java

@@ -20,7 +20,6 @@ package appeng.core.sync;
 
 
 import java.lang.reflect.Constructor;
-import java.util.regex.Pattern;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -191,8 +190,6 @@ public enum GuiBridge implements IGuiHandler
 
 	GUI_CRAFTING_STATUS(ContainerCraftingStatus.class, ITerminalHost.class, ITEM_OR_WORLD, SecurityPermissions.CRAFT);
 
-	private static final Pattern PATTERN_PRE_CONTAINER = Pattern.compile( ".Container", Pattern.LITERAL );
-	private static final Pattern PATTERN_POST_CONTAINER = Pattern.compile( "container." );
 	private final Class Tile;
 	private Class Gui;
 	private final Class Container;
@@ -214,14 +211,13 @@ public enum GuiBridge implements IGuiHandler
 		if ( Platform.isClient() )
 		{
 			final String start = this.Container.getName();
-			final String guiClassPostReplaced = PATTERN_POST_CONTAINER.matcher( start ).replaceFirst( "client.gui." );
-			final String guiClassPreReplaced = PATTERN_PRE_CONTAINER.matcher( guiClassPostReplaced ).replaceAll( ".Gui" );
+			String guiClass = start.replaceFirst( "container.", "client.gui." ).replace( ".Container", ".Gui" );
 
-			if ( start.equals( guiClassPreReplaced ) )
+			if ( start.equals( guiClass ) )
 				throw new RuntimeException( "Unable to find gui class" );
-			this.Gui = ReflectionHelper.getClass( this.getClass().getClassLoader(), guiClassPreReplaced );
+			this.Gui = ReflectionHelper.getClass( this.getClass().getClassLoader(), guiClass );
 			if ( this.Gui == null )
-				throw new RuntimeException( "Cannot Load class: " + guiClassPreReplaced );
+				throw new RuntimeException( "Cannot Load class: " + guiClass );
 		}
 	}
 

src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java

@@ -38,7 +38,9 @@ import appeng.util.item.AEItemStack;
 public class PacketAssemblerAnimation extends AppEngPacket
 {
 
-	final public int x, y, z;
+	final public int x;
+	final public int y;
+	final public int z;
 	final public byte rate;
 	final public IAEItemStack is;
 

src/main/java/appeng/core/sync/packets/PacketCompassRequest.java

@@ -35,7 +35,9 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba
 {
 
 	final public long attunement;
-	final public int cx, cz, cdy;
+	final public int cx;
+	final public int cz;
+	final public int cdy;
 
 	EntityPlayer talkBackTo;
 

src/main/java/appeng/core/sync/packets/PacketCompassResponse.java

@@ -32,7 +32,9 @@ public class PacketCompassResponse extends AppEngPacket
 {
 
 	final public long attunement;
-	final public int cx, cz, cdy;
+	final public int cx;
+	final public int cz;
+	final public int cdy;
 
 	public CompassResult cr;
 

src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java

@@ -93,7 +93,7 @@ public class PacketNEIRecipe extends AppEngPacket
 		EntityPlayerMP pmp = ( EntityPlayerMP ) player;
 		Container con = pmp.openContainer;
 
-		if ( con != null && con instanceof IContainerCraftingPacket )
+		if ( con instanceof IContainerCraftingPacket )
 		{
 			IContainerCraftingPacket cct = ( IContainerCraftingPacket ) con;
 			IGridNode node = cct.getNetworkNode();

src/main/java/appeng/core/sync/packets/PacketPartPlacement.java

@@ -32,7 +32,10 @@ import appeng.parts.PartPlacement;
 public class PacketPartPlacement extends AppEngPacket
 {
 
-	int x, y, z, face;
+	int x;
+	int y;
+	int z;
+	int face;
 	float eyeHeight;
 
 	// automatic.

src/main/java/appeng/entity/EntityIds.java

@@ -18,25 +18,30 @@
 
 package appeng.entity;
 
+
 import net.minecraft.entity.Entity;
 
-public class EntityIds
-{
 
+public final class EntityIds
+{
 	public static final int TINY_TNT = 10;
 	public static final int SINGULARITY = 11;
 	public static final int CHARGED_QUARTZ = 12;
 	public static final int GROWING_CRYSTAL = 13;
 
-	public static int get(Class<? extends Entity> droppedEntity)
+	private EntityIds()
 	{
-		if ( droppedEntity == EntityTinyTNTPrimed.class )
+	}
+
+	public static int get( Class<? extends Entity> droppedEntity )
+	{
+		if( droppedEntity == EntityTinyTNTPrimed.class )
 			return TINY_TNT;
-		if ( droppedEntity == EntitySingularity.class )
+		if( droppedEntity == EntitySingularity.class )
 			return SINGULARITY;
-		if ( droppedEntity == EntityChargedQuartz.class )
+		if( droppedEntity == EntityChargedQuartz.class )
 			return CHARGED_QUARTZ;
-		if ( droppedEntity == EntityGrowingCrystal.class )
+		if( droppedEntity == EntityGrowingCrystal.class )
 			return GROWING_CRYSTAL;
 
 		throw new RuntimeException( "Missing entity id: " + droppedEntity.getName() );

src/main/java/appeng/helpers/MeteoritePlacer.java

@@ -313,7 +313,8 @@ public class MeteoritePlacer
 
 		int verticalBits = 0;
 
-		final int cx, cz;
+		final int cx;
+		final int cz;
 
 		public ChunkOnly(World w, int cx, int cz) {
 			super( w );
@@ -657,7 +658,7 @@ public class MeteoritePlacer
 		{
 			this.put( w, x, y, z, this.skychest );
 			TileEntity te = w.getTileEntity( x, y, z );
-			if ( te != null && te instanceof IInventory )
+			if ( te instanceof IInventory )
 			{
 				InventoryAdaptor ap = InventoryAdaptor.getAdaptor( te, ForgeDirection.UP );
 

src/main/java/appeng/helpers/Splotch.java

@@ -32,7 +32,8 @@ public class Splotch
 		this.color = col;
 		this.lumen = lit;
 
-		double x, y;
+		double x;
+		double y;
 
 		if ( side == ForgeDirection.SOUTH || side == ForgeDirection.NORTH )
 		{

src/main/java/appeng/hooks/CompassManager.java

@@ -35,7 +35,9 @@ public class CompassManager
 		final int hash;
 
 		final long attunement;
-		final int cx, cdy, cz;
+		final int cx;
+		final int cdy;
+		final int cz;
 
 		public CompassRequest(long attunement, int x, int y, int z) {
 			this.attunement = attunement;

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/items/parts/ItemMultiPart.java

@@ -253,7 +253,9 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
 	@Override
 	public String getUnlocalizedGroupName(Set<ItemStack> others, ItemStack is)
 	{
-		boolean importBus = false, exportBus = false, group = false;
+		boolean importBus = false;
+		boolean exportBus = false;
+		boolean group = false;
 
 		PartType u = this.getTypeByStack( is );
 

src/main/java/appeng/parts/reporting/PartCraftingTerminal.java

@@ -52,7 +52,7 @@ public class PartCraftingTerminal extends PartTerminal
 	@Override
 	public void getDrops(List<ItemStack> drops, boolean wrenched)
 	{
-		super.getDrops(drops, wrenched);
+		super.getDrops( drops, wrenched );
 
 		for (ItemStack is : this.craftingGrid)
 			if ( is != null )
@@ -70,7 +70,9 @@ public class PartCraftingTerminal extends PartTerminal
 	@Override
 	public GuiBridge getGui( EntityPlayer p )
 	{
-		int x = (int) p.posX, y = (int) p.posY, z = (int) p.posZ;
+		int x = (int) p.posX;
+		int y = (int) p.posY;
+		int z = (int) p.posZ;
 		if ( this.getHost().getTile() != null )
 		{
 			x = this.tile.xCoord;

src/main/java/appeng/parts/reporting/PartPatternTerminal.java

@@ -80,7 +80,9 @@ public class PartPatternTerminal extends PartTerminal
 	@Override
 	public GuiBridge getGui( EntityPlayer p )
 	{
-		int x = (int) p.posX, y = (int) p.posY, z = (int) p.posZ;
+		int x = (int) p.posX;
+		int y = (int) p.posY;
+		int z = (int) p.posZ;
 		if ( this.getHost().getTile() != null )
 		{
 			x = this.tile.xCoord;

src/main/java/appeng/services/CompassService.java

@@ -45,7 +45,8 @@ public class CompassService implements ThreadFactory
 
 		public final World world;
 
-		public final int chunkX, chunkZ;
+		public final int chunkX;
+		public final int chunkZ;
 		public final int doubleChunkY; // 32 blocks instead of 16.
 		public final boolean value;
 

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/spatial/StorageHelper.java

@@ -158,7 +158,8 @@ public class StorageHelper
 	 */
 	public Entity teleportEntity(Entity entity, TelDestination link)
 	{
-		WorldServer oldWorld, newWorld;
+		WorldServer oldWorld;
+		WorldServer newWorld;
 		EntityPlayerMP player;
 
 		try

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

src/main/java/appeng/transformer/asm/ASMTweaker.java

@@ -20,9 +20,6 @@ package appeng.transformer.asm;
 
 import java.util.Iterator;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 import org.apache.logging.log4j.Level;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
@@ -38,6 +35,9 @@ import net.minecraft.launchwrapper.IClassTransformer;
 
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
 public class ASMTweaker implements IClassTransformer
 {
 
@@ -49,7 +49,8 @@ public class ASMTweaker implements IClassTransformer
 			this.desc = desc;
 		}
 
-		final String name, desc;
+		final String name;
+		final String desc;
 
 	}
 

src/main/java/appeng/util/BlockUpdate.java

@@ -26,7 +26,9 @@ public class BlockUpdate implements Callable
 {
 
 	final World w;
-	final int x, y, z;
+	final int x;
+	final int y;
+	final int z;
 
 	public BlockUpdate(World w, int x, int y, int z) {
 		this.w = w;

src/main/java/appeng/util/Platform.java

@@ -327,7 +327,9 @@ public class Platform
 		if ( isClient() )
 			return;
 
-		int x = (int) p.posX, y = (int) p.posY, z = (int) p.posZ;
+		int x = (int) p.posX;
+		int y = (int) p.posY;
+		int z = (int) p.posZ;
 		if ( tile != null )
 		{
 			x = tile.xCoord;
@@ -1602,7 +1604,8 @@ public class Platform
 
 	public static void configurePlayer(EntityPlayer player, ForgeDirection side, TileEntity tile)
 	{
-		float pitch = 0.0f, yaw = 0.0f;
+		float pitch = 0.0f;
+		float yaw = 0.0f;
 		player.yOffset = 1.8f;
 
 		switch (side)

src/main/java/appeng/util/item/AEFluidStack.java

@@ -43,7 +43,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 
 	public int myHash;
 	Fluid fluid;
-	protected IAETagCompound tagCompound;
+	private IAETagCompound tagCompound;
 
 	@Override
 	public String toString()
@@ -83,7 +83,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 		this.myHash = is.myHash;
 	}
 
-	protected AEFluidStack(FluidStack is) {
+	private AEFluidStack( FluidStack is ) {
 		if ( is == null )
 			throw new RuntimeException( "Invalid Itemstack." );
 

src/main/java/appeng/util/item/AEItemStack.java

@@ -75,7 +75,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 		this.setCountRequestable( is.getCountRequestable() );
 	}
 
-	protected AEItemStack(ItemStack is) {
+	private AEItemStack( ItemStack is ) {
 		if ( is == null )
 			throw new RuntimeException( "Invalid Itemstack." );