Merge pull request #156 from thatsIch/Semicolon

Semicolon

README.md

@@ -64,7 +64,7 @@ If you are still willing to contribute to this project, you can contribute via [
 6. Push to your fork `git push`
 7. Create a Pull-Request on GitHub
 
-If you are only doing single file pull requests, GitHub supports using a quick way without the need of cloning your fork.
+If you are only doing single file pull requests, GitHub supports using a quick way without the need of cloning your fork. Also read up about [synching](https://help.github.com/articles/syncing-a-fork) if you plan to contribute on regular basis.
 
 ## Credits
 

src/api/java/appeng/api

@@ -1 +1 @@
-Subproject commit 74e4e50c76e812cc227bea020f3c8646eacfedb1
+Subproject commit 65dfd7ace777c4972e920df715b34d84530ec637

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

@@ -79,7 +79,7 @@ public class GuiSecurity extends GuiMEMonitorable
 			}
 		}
 
-	};
+	}
 
 	protected String getBackground()
 	{

src/main/java/appeng/client/gui/widgets/GuiImgButton.java

@@ -57,7 +57,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			return d.setting.equals( setting ) && d.value.equals( value );
 		}
 
-	};
+	}
 
 	class BtnAppearance
 	{
@@ -65,7 +65,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
 		public int index;
 		public String DisplayName;
 		public String DisplayValue;
-	};
+	}
 
 	public boolean halfSize = false;
 	public String FillVar;

src/main/java/appeng/client/gui/widgets/GuiProgressBar.java

@@ -11,7 +11,7 @@ public class GuiProgressBar extends GuiButton implements ITooltip
 	public enum Direction
 	{
 		HORIZONTAL, VERTICAL
-	};
+	}
 
 	private ResourceLocation texture;
 	private int fill_u;

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

@@ -102,7 +102,7 @@ public class BusRenderHelper implements IPartRenderHelper
 			return false;
 		}
 
-	};
+	}
 
 	BoundBoxCalculator bbc = new BoundBoxCalculator();
 

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

@@ -126,7 +126,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
 			lightHash = 0;
 		}
 
-	};
+	}
 
 	private LightingCache lightState = new LightingCache();
 

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

@@ -149,7 +149,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		{
 			return getCellUpgradeInventory().isItemValidForSlot( i, itemstack );
 		}
-	};
+	}
 
 	IInventory UpgradeInventoryWrapper;
 

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

@@ -59,7 +59,7 @@ public class ContainerInterfaceTerminal extends AEBaseContainer
 		IInventory server;
 		public long sortBy;
 
-	};
+	}
 
 	Map<IInterfaceHost, InvTracker> diList = new HashMap();
 	Map<Long, InvTracker> byId = new HashMap();
@@ -89,7 +89,7 @@ public class ContainerInterfaceTerminal extends AEBaseContainer
 			return itemstack != null && itemstack.getItem() instanceof ItemEncodedPattern;
 		}
 
-	};
+	}
 
 	@Override
 	public void doAction(EntityPlayerMP player, InventoryAction action, int slot, long id)

src/main/java/appeng/container/slot/AppEngSlot.java

@@ -13,7 +13,7 @@ public class AppEngSlot extends Slot
 	public enum hasCalculatedValidness
 	{
 		NotAvailable, Valid, Invalid
-	};
+	}
 
 	public boolean isDraggable = true;
 	public boolean isPlayerSide = false;

src/main/java/appeng/container/slot/SlotPlayerInv.java

@@ -9,7 +9,7 @@ public class SlotPlayerInv extends AppEngSlot
 
 	public SlotPlayerInv(IInventory par1iInventory, int par2, int par3, int par4) {
 		super( par1iInventory, par2, par3, par4 );
-		;
+
 		isPlayerSide = true;
 	}
 }

src/main/java/appeng/container/slot/SlotRestrictedInput.java

@@ -45,7 +45,7 @@ public class SlotRestrictedInput extends AppEngSlot
 		private PlacableItemType(int o) {
 			IIcon = o;
 		}
-	};
+	}
 
 	@Override
 	public int getSlotStackLimit()

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

@@ -15,7 +15,7 @@ public class WorldGenRegistry implements IWorldGen
 		HashSet<Class<? extends WorldProvider>> badProviders = new HashSet();
 		HashSet<Integer> badDimensions = new HashSet();
 
-	};
+	}
 
 	TypeSet[] types;
 

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

@@ -127,6 +127,6 @@ public class AppEngPacketHandlerBase
 			return AppEngPacketHandlerBase.reverseLookup.get( c );
 		}
 
-	};
+	}
 
 }

src/main/java/appeng/crafting/CraftingJob.java

@@ -127,7 +127,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 
 		public long perOp = 0;
 		public long times = 0;
-	};
+	}
 
 	HashMap<String, twoIntegers> opsAndMultiplier = new HashMap();
 

src/main/java/appeng/crafting/CraftingWatcher.java

@@ -46,7 +46,7 @@ public class CraftingWatcher implements ICraftingWatcher
 			interestIterator.remove();
 		}
 
-	};
+	}
 
 	CraftingGridCache gsc;
 	ICraftingWatcherHost myObject;

src/main/java/appeng/entity/EntityChargedQuartz.java

@@ -62,7 +62,7 @@ final public class EntityChargedQuartz extends EntityItem
 		}
 		else
 			transformTime = 0;
-	};
+	}
 
 	public boolean transform()
 	{

src/main/java/appeng/fmp/CableBusPart.java

@@ -243,7 +243,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
 	{
 		canUpdate = false;
 		cb.removeFromWorld();
-	};
+	}
 
 	@Override
 	public boolean canConnectRedstone(int side)

src/main/java/appeng/fmp/FMPPlacementHelper.java

@@ -41,7 +41,7 @@ public class FMPPlacementHelper implements IPartHost
 
 		}
 
-	};
+	}
 
 	final private static CableBusStorage nullStorage = new NullStorage();
 

src/main/java/appeng/helpers/DualityInterface.java

@@ -405,7 +405,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
 			return super.extractItems( request, type, src );
 		}
 
-	};
+	}
 
 	private boolean usePlan(int x, IAEItemStack itemStack)
 	{

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

@@ -65,7 +65,7 @@ public class MeteoritePlacer
 				put( w, x, y, z, Platform.air );
 		}
 
-	};
+	}
 
 	private class FalloutCopy extends Fallout
 	{
@@ -102,7 +102,7 @@ public class MeteoritePlacer
 			else
 				getOther( w, x, y, z, a - 0.1 );
 		}
-	};
+	}
 
 	private class FalloutSand extends FalloutCopy
 	{
@@ -122,7 +122,7 @@ public class MeteoritePlacer
 				put( w, x, y, z, Blocks.glass );
 		}
 
-	};
+	}
 
 	private class FalloutSnow extends FalloutCopy
 	{
@@ -144,7 +144,7 @@ public class MeteoritePlacer
 				put( w, x, y, z, Blocks.ice );
 		}
 
-	};
+	}
 
 	public interface IMeteoriteWorld
 	{
@@ -175,7 +175,7 @@ public class MeteoritePlacer
 
 		void done();
 
-	};
+	}
 
 	static public class StandardWorld implements IMeteoriteWorld
 	{
@@ -369,7 +369,7 @@ public class MeteoritePlacer
 		{
 			return Math.min( in, (cz + 1) << 4 );
 		}
-	};
+	}
 
 	int minBLocks = 200;
 	HashSet<Block> validSpawn = new HashSet();

src/main/java/appeng/helpers/PatternHelper.java

@@ -72,12 +72,12 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 			return b.slot == slot && b.ref == ref;
 		}
 
-	};
+	}
 
 	enum TestStatus
 	{
 		ACCEPT, DECLINE, TEST
-	};
+	}
 
 	HashSet<TestLookup> failCache = new HashSet();
 	HashSet<TestLookup> passCache = new HashSet();

src/main/java/appeng/hooks/MeteoriteWorldGen.java

@@ -33,7 +33,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator
 				distance = Double.MAX_VALUE;
 		}
 
-	};
+	}
 
 	@Override
 	public void generate(Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)

src/main/java/appeng/hooks/QuartzWorldGen.java

@@ -30,7 +30,7 @@ final public class QuartzWorldGen implements IWorldGenerator
 		}
 		else
 			oreNormal = oreCharged = null;
-	};
+	}
 
 	@Override
 	public void generate(Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)

src/main/java/appeng/hooks/TickHandler.java

@@ -53,7 +53,7 @@ public class TickHandler
 			networks = new NetworkList();
 		}
 
-	};
+	}
 
 	final public static TickHandler instance = new TickHandler();
 
@@ -81,7 +81,7 @@ public class TickHandler
 			ticksLeft = ticks;
 		}
 
-	};
+	}
 
 	final private HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap();
 	final private HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap();

src/main/java/appeng/integration/modules/RB.java

@@ -42,7 +42,7 @@ public class RB extends BaseModule implements IRB
 			internal.setOrientation( Forward, Up );
 		}
 
-	};
+	}
 
 	public static RB instance;
 

src/main/java/appeng/items/parts/ItemMultiPart.java

@@ -41,7 +41,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
 
 		@SideOnly(Side.CLIENT)
 		IIcon ico;
-	};
+	}
 
 	HashMap<Integer, PartTypeIst> dmgToPart = new HashMap();
 

src/main/java/appeng/items/tools/powered/ToolColorApplicator.java

@@ -71,7 +71,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 			oreToColor.put( OreDictionary.getOreID( "dye" + col.name() ), col );
 		}
 
-	};
+	}
 
 	public ToolColorApplicator() {
 		super( ToolColorApplicator.class, null );

src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java

@@ -57,7 +57,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 			return blk == ((Combo) obj).blk && meta == ((Combo) obj).meta;
 		}
 
-	};
+	}
 
 	static private Hashtable<Combo, InWorldToolOperationResult> heatUp;
 	static private Hashtable<Combo, InWorldToolOperationResult> coolDown;

src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java

@@ -21,7 +21,7 @@ public class AERootPoweredItem extends AEBaseItem implements IAEItemPowerStorage
 	private enum batteryOperation
 	{
 		STORAGE, INJECT, EXTRACT
-	};
+	}
 
 	public double maxStoredPower = 200000;
 

src/main/java/appeng/me/GridSplitDetector.java

@@ -21,4 +21,4 @@ class GridSplitDetector implements IGridVisitor
 
 		return !pivotFound;
 	}
-};
+}

src/main/java/appeng/me/NetworkEventBus.java

@@ -19,7 +19,7 @@ public class NetworkEventBus
 
 		private static final long serialVersionUID = -3079021487019171205L;
 
-	};
+	}
 
 	class EventMethod
 	{
@@ -52,7 +52,7 @@ public class NetworkEventBus
 			if ( e.isCanceled() )
 				throw new NetworkEventDone();
 		}
-	};
+	}
 
 	class MENetworkEventInfo
 	{
@@ -69,7 +69,7 @@ public class NetworkEventBus
 			for (EventMethod em : methods)
 				em.invoke( obj, e );
 		}
-	};
+	}
 
 	private static Set<Class> readClasses = new HashSet();
 	private static Hashtable<Class<? extends MENetworkEvent>, Hashtable<Class, MENetworkEventInfo>> events = new Hashtable();

src/main/java/appeng/me/cache/CraftingGridCache.java

@@ -128,7 +128,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			// no..
 		}
 
-	};
+	}
 
 	@Override
 	public ImmutableSet<ICraftingCPU> getCpus()

src/main/java/appeng/me/cache/GridStorageCache.java

@@ -90,7 +90,7 @@ public class GridStorageCache implements IStorageGrid
 			postChangesToNetwork( channel, up_or_down, list, src );
 		}
 
-	};
+	}
 
 	private class CellChangeTracker
 	{
@@ -107,7 +107,7 @@ public class GridStorageCache implements IStorageGrid
 			for (CellChangeTrackerRecord rec : data)
 				rec.applyChanges();
 		}
-	};
+	}
 
 	@Override
 	public void registerCellProvider(ICellProvider provider)

src/main/java/appeng/me/cache/helpers/Connections.java

@@ -39,4 +39,4 @@ public class Connections implements Callable
 		destroy = false;
 	}
 
-};
+}

src/main/java/appeng/me/cache/helpers/TickTracker.java

@@ -73,4 +73,4 @@ public class TickTracker implements Comparable<TickTracker>
 		if ( dc != null )
 			crashreportcategory.addCrashSection( "Location", dc );
 	}
-};
+}

src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java

@@ -67,7 +67,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
 
 		long value;
 
-	};
+	}
 
 	/**
 	 * crafting job info

src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java

@@ -15,7 +15,7 @@ public class SpatialPylonCluster implements IAECluster
 	public enum Axis
 	{
 		X, Y, Z, UNFORMED
-	};
+	}
 
 	final public DimensionalCoord min;
 	final public DimensionalCoord max;

src/main/java/appeng/me/energy/EnergyWatcher.java

@@ -46,7 +46,7 @@ public class EnergyWatcher implements IEnergyWatcher
 			interestIterator.remove();
 		}
 
-	};
+	}
 
 	EnergyGridCache gsc;
 	IEnergyWatcherHost myObject;

src/main/java/appeng/me/helpers/GenericInterestManager.java

@@ -22,7 +22,7 @@ public class GenericInterestManager<T>
 			stack = myStack;
 			iw = watcher;
 		}
-	};
+	}
 
 	private final SetMultimap<IAEStack, T> container;
 	private LinkedList<SavedTransactions> transactions = null;

src/main/java/appeng/me/pathfinding/PathSegment.java

@@ -21,7 +21,7 @@ public class PathSegment
 
 		private static final long serialVersionUID = 810456465120286110L;
 
-	};
+	}
 
 	PathGridCache pgc;
 

src/main/java/appeng/me/storage/ItemWatcher.java

@@ -46,7 +46,7 @@ public class ItemWatcher implements IStackWatcher
 			interestIterator.remove();
 		}
 
-	};
+	}
 
 	GridStorageCache gsc;
 	IStackWatcherHost myObject;

src/main/java/appeng/me/storage/MEMonitorIInventory.java

@@ -46,7 +46,7 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
 
 		final ItemStack itemStack;
 		final IAEItemStack aeStack;
-	};
+	}
 
 	final InventoryAdaptor adaptor;
 

src/main/java/appeng/parts/PartPlacement.java

@@ -113,7 +113,7 @@ public class PartPlacement
 	public enum PlaceType
 	{
 		PLACE_ITEM, INTERACT_FIRST_PASS, INTERACT_SECOND_PASS
-	};
+	}
 
 	public static boolean place(ItemStack held, int x, int y, int z, int face, EntityPlayer player, World world, PlaceType pass, int depth)
 	{

src/main/java/appeng/parts/automation/PartLevelEmitter.java

@@ -444,7 +444,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		cenz = baseZ + 0.5;
 
 		baseY += 7.0 / 16.0;
-		;
+
 		double par10 = 0;
 		// double par11 = 0;
 		double Zero = 0;
@@ -541,7 +541,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		this.addVertexWithUV( var36, baseY + 1.0D, baseZ - var44, (double) var17, (double) var18 );
 	}
 
-	boolean status = false;;
+	boolean status = false;
 
 	private boolean isLevelEmitterOn()
 	{

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -451,7 +451,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		super.readFromNBT( data );
 		Config.readFromNBT( data, "config" );
 		priority = data.getInteger( "priority" );
-	};
+	}
 
 	@Override
 	public List<IMEInventoryHandler> getCellArray(StorageChannel channel)

src/main/java/appeng/parts/p2p/PartP2PBCPower.java

@@ -148,7 +148,7 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
 	public float getPowerDrainPerTick()
 	{
 		return 0.5f;
-	};
+	}
 
 	@Method(iname = "MJ6")
 	private IBatteryObject getTargetBattery()

src/main/java/appeng/parts/p2p/PartP2PIC2Power.java

@@ -126,7 +126,7 @@ public class PartP2PIC2Power extends PartP2PTunnel<PartP2PIC2Power> implements i
 	public float getPowerDrainPerTick()
 	{
 		return 0.5f;
-	};
+	}
 
 	@Override
 	public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage)

src/main/java/appeng/parts/p2p/PartP2PItems.java

@@ -326,7 +326,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
 	public float getPowerDrainPerTick()
 	{
 		return 2.0f;
-	};
+	}
 
 	@Override
 	public boolean canInsertItem(int i, ItemStack itemstack, int j)

src/main/java/appeng/parts/p2p/PartP2PLiquids.java

@@ -63,7 +63,7 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
 	public float getPowerDrainPerTick()
 	{
 		return 2.0f;
-	};
+	}
 
 	private int tmpUsed;
 
@@ -119,7 +119,7 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
 			if ( in != null )
 				in.onTunnelNetworkChange();
 		}
-	};
+	}
 
 	@Override
 	public void onTunnelNetworkChange()

src/main/java/appeng/parts/p2p/PartP2PRedstone.java

@@ -146,7 +146,7 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 	public float getPowerDrainPerTick()
 	{
 		return 0.5f;
-	};
+	}
 
 	@Override
 	public void onNeighborChanged()

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

@@ -137,7 +137,6 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann
 	{
 		super.writeToStream( data );
 		clientFlags = spin & 3;
-		;
 
 		try
 		{

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

@@ -50,7 +50,7 @@ public class CompassService implements ThreadFactory
 				cleanUp();
 		}
 
-	};
+	}
 
 	private class CMDirectionRequest implements Runnable
 	{
@@ -165,7 +165,7 @@ public class CompassService implements ThreadFactory
 			if ( jobSize() < 2 )
 				cleanUp();
 		}
-	};
+	}
 
 	public Future<?> getCompassDirection(DimensionalCoord coord, int maxRange, ICompassCallback cc)
 	{

src/main/java/appeng/spatial/CachedPlane.java

@@ -88,7 +88,7 @@ public class CachedPlane
 			skipThese.add( yCoord );
 		}
 
-	};
+	}
 
 	int verticalBits;
 

src/main/java/appeng/spatial/StorageHelper.java

@@ -46,7 +46,7 @@ public class StorageHelper
 			Block blk = dst.getBlock( x, y, z );
 			blk.onNeighborBlockChange( dst, x, y, z, Platform.air );
 		}
-	};
+	}
 
 	class WrapInMatrixFrame implements ISpatialVisitor
 	{
@@ -66,7 +66,7 @@ public class StorageHelper
 		{
 			dst.setBlock( x, y, z, blkID, Meta, 3 );
 		}
-	};
+	}
 
 	class TelDestination
 	{
@@ -89,7 +89,7 @@ public class StorageHelper
 		final int xOff;
 		final int yOff;
 		final int zOff;
-	};
+	}
 
 	class METeleporter extends Teleporter
 	{
@@ -126,7 +126,7 @@ public class StorageHelper
 
 		}
 
-	};
+	}
 
 	Method onEntityRemoved;
 

src/main/java/appeng/tile/storage/TileChest.java

@@ -324,7 +324,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 			// not used here
 		}
 
-	};
+	}
 
 	class ChestMonitorHandler<T extends IAEStack> extends MEMonitorHandler<T>
 	{
@@ -389,8 +389,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 				return null;
 			return super.extractItems(request, mode, src);
 		}
-
-	};
+	}
 
 	private <StackType extends IAEStack> MEMonitorHandler<StackType> wrap(IMEInventoryHandler h)
 	{

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

@@ -33,7 +33,7 @@ public class ASMTweaker implements IClassTransformer
 
 		final String name, desc;
 
-	};
+	}
 
 	Multimap<String, publicLine> privateToPublicMethods = HashMultimap.create();
 

src/main/java/appeng/util/inv/AdaptorIInventory.java

@@ -356,7 +356,7 @@ public class AdaptorIInventory extends InventoryAdaptor
 			// nothing!
 		}
 
-	};
+	}
 
 	@Override
 	public Iterator<ItemSlot> iterator()

src/main/java/appeng/util/inv/WrapperChainedInventory.java

@@ -19,7 +19,7 @@ public class WrapperChainedInventory implements IInventory
 		int offset;
 		int size;
 		IInventory i;
-	};
+	}
 
 	int fullSize = 0;
 

src/main/java/appeng/util/inv/WrapperInvSlot.java

@@ -95,7 +95,7 @@ public class WrapperInvSlot
 		{
 			return isItemValid( itemstack ) && inv.isItemValidForSlot( slot, itemstack );
 		}
-	};
+	}
 
 	private IInventory inv;
 

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

@@ -44,14 +44,14 @@ public class OreHelper
 			return hash;
 		}
 
-	};
+	}
 
 	class OreResult
 	{
 
 		public OreReference oreValue = null;
 
-	};
+	}
 
 	HashMap<ItemRef, OreResult> references = new HashMap();
 

src/main/resources/assets/appliedenergistics2/lang

@@ -1 +1 @@
-Subproject commit f9625d882cee0f6d3585aa9e08c0e9813e3b104f
+Subproject commit b0a451fecd97583367e12a98439dafac29e7ae97