From 76d52e365e61edf7dcfd121bbaa682c42378a625 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 27 Sep 2014 21:15:39 +0200 Subject: [PATCH 1/5] Added synching information --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74d1cc395..0db83c58f 100644 --- a/README.md +++ b/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 From 8b4501c89d4afa186a1f686d2a855df469c0020a Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sun, 28 Sep 2014 00:50:06 +0200 Subject: [PATCH 2/5] Removes unnecessary semicolons --- .../client/gui/implementations/GuiSecurity.java | 2 +- .../java/appeng/client/gui/widgets/GuiImgButton.java | 4 ++-- .../appeng/client/gui/widgets/GuiProgressBar.java | 2 +- .../java/appeng/client/render/BusRenderHelper.java | 2 +- .../appeng/client/render/RenderBlocksWorkaround.java | 2 +- .../implementations/ContainerCellWorkbench.java | 2 +- .../implementations/ContainerInterfaceTerminal.java | 4 ++-- src/main/java/appeng/container/slot/AppEngSlot.java | 2 +- .../java/appeng/container/slot/SlotPlayerInv.java | 2 +- .../appeng/container/slot/SlotRestrictedInput.java | 2 +- .../core/features/registries/WorldGenRegistry.java | 2 +- .../appeng/core/sync/AppEngPacketHandlerBase.java | 2 +- src/main/java/appeng/crafting/CraftingJob.java | 2 +- src/main/java/appeng/crafting/CraftingWatcher.java | 2 +- src/main/java/appeng/entity/EntityChargedQuartz.java | 2 +- src/main/java/appeng/fmp/CableBusPart.java | 2 +- src/main/java/appeng/fmp/FMPPlacementHelper.java | 2 +- src/main/java/appeng/helpers/DualityInterface.java | 2 +- src/main/java/appeng/helpers/MeteoritePlacer.java | 12 ++++++------ src/main/java/appeng/helpers/PatternHelper.java | 4 ++-- src/main/java/appeng/hooks/MeteoriteWorldGen.java | 2 +- src/main/java/appeng/hooks/QuartzWorldGen.java | 2 +- src/main/java/appeng/hooks/TickHandler.java | 4 ++-- src/main/java/appeng/integration/modules/RB.java | 2 +- src/main/java/appeng/items/parts/ItemMultiPart.java | 2 +- .../items/tools/powered/ToolColorApplicator.java | 2 +- .../items/tools/powered/ToolEntropyManipulator.java | 2 +- .../tools/powered/powersink/AERootPoweredItem.java | 2 +- src/main/java/appeng/me/GridSplitDetector.java | 2 +- src/main/java/appeng/me/NetworkEventBus.java | 6 +++--- src/main/java/appeng/me/cache/CraftingGridCache.java | 2 +- src/main/java/appeng/me/cache/GridStorageCache.java | 4 ++-- .../java/appeng/me/cache/helpers/Connections.java | 2 +- .../java/appeng/me/cache/helpers/TickTracker.java | 2 +- .../cluster/implementations/CraftingCPUCluster.java | 2 +- .../cluster/implementations/SpatialPylonCluster.java | 2 +- src/main/java/appeng/me/energy/EnergyWatcher.java | 2 +- .../appeng/me/helpers/GenericInterestManager.java | 2 +- src/main/java/appeng/me/pathfinding/PathSegment.java | 2 +- src/main/java/appeng/me/storage/ItemWatcher.java | 2 +- .../java/appeng/me/storage/MEMonitorIInventory.java | 2 +- src/main/java/appeng/parts/PartPlacement.java | 2 +- .../appeng/parts/automation/PartLevelEmitter.java | 4 ++-- src/main/java/appeng/parts/misc/PartStorageBus.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PBCPower.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PIC2Power.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PItems.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PLiquids.java | 4 ++-- src/main/java/appeng/parts/p2p/PartP2PRedstone.java | 2 +- .../java/appeng/parts/reporting/PartMonitor.java | 1 - src/main/java/appeng/services/CompassService.java | 4 ++-- src/main/java/appeng/spatial/CachedPlane.java | 2 +- src/main/java/appeng/spatial/StorageHelper.java | 8 ++++---- src/main/java/appeng/tile/storage/TileChest.java | 4 ++-- src/main/java/appeng/transformer/asm/ASMTweaker.java | 2 +- src/main/java/appeng/util/inv/AdaptorIInventory.java | 2 +- .../appeng/util/inv/WrapperChainedInventory.java | 2 +- src/main/java/appeng/util/inv/WrapperInvSlot.java | 2 +- src/main/java/appeng/util/item/OreHelper.java | 4 ++-- 59 files changed, 78 insertions(+), 79 deletions(-) diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java index 8ce92a727..cc3a4f3cf 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java @@ -79,7 +79,7 @@ public class GuiSecurity extends GuiMEMonitorable } } - }; + } protected String getBackground() { diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index a753d9ec2..b17a91f6e 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/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; diff --git a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java b/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java index 0c145987c..54fd48ef5 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java +++ b/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; diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index 522b0c5e1..bf3995594 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -102,7 +102,7 @@ public class BusRenderHelper implements IPartRenderHelper return false; } - }; + } BoundBoxCalculator bbc = new BoundBoxCalculator(); diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java index f8794d30b..5c9fe6ac6 100644 --- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java +++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java @@ -126,7 +126,7 @@ public class RenderBlocksWorkaround extends RenderBlocks lightHash = 0; } - }; + } private LightingCache lightState = new LightingCache(); diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 4eef53973..af654546c 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -149,7 +149,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { return getCellUpgradeInventory().isItemValidForSlot( i, itemstack ); } - }; + } IInventory UpgradeInventoryWrapper; diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 9b1c78698..4d16c102c 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -59,7 +59,7 @@ public class ContainerInterfaceTerminal extends AEBaseContainer IInventory server; public long sortBy; - }; + } Map diList = new HashMap(); Map 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) diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index e5120dffe..5ab024dcf 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/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; diff --git a/src/main/java/appeng/container/slot/SlotPlayerInv.java b/src/main/java/appeng/container/slot/SlotPlayerInv.java index 9159d2c86..8cf4b5099 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerInv.java +++ b/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; } } diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 84dbd611e..ff3d8af0f 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/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() diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 53820a58b..40ac5fc44 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -15,7 +15,7 @@ public class WorldGenRegistry implements IWorldGen HashSet> badProviders = new HashSet(); HashSet badDimensions = new HashSet(); - }; + } TypeSet[] types; diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index 1386c0ae2..1a9981273 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -127,6 +127,6 @@ public class AppEngPacketHandlerBase return AppEngPacketHandlerBase.reverseLookup.get( c ); } - }; + } } diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 28b8773d2..bfe54335e 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/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 opsAndMultiplier = new HashMap(); diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/main/java/appeng/crafting/CraftingWatcher.java index 1acbb0556..8eb6535ba 100644 --- a/src/main/java/appeng/crafting/CraftingWatcher.java +++ b/src/main/java/appeng/crafting/CraftingWatcher.java @@ -46,7 +46,7 @@ public class CraftingWatcher implements ICraftingWatcher interestIterator.remove(); } - }; + } CraftingGridCache gsc; ICraftingWatcherHost myObject; diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index 550804f11..6d53d5fe7 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -62,7 +62,7 @@ final public class EntityChargedQuartz extends EntityItem } else transformTime = 0; - }; + } public boolean transform() { diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index 1b0d9b5ac..41b2952c6 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/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) diff --git a/src/main/java/appeng/fmp/FMPPlacementHelper.java b/src/main/java/appeng/fmp/FMPPlacementHelper.java index 6e3d26b31..3e32bfdbb 100644 --- a/src/main/java/appeng/fmp/FMPPlacementHelper.java +++ b/src/main/java/appeng/fmp/FMPPlacementHelper.java @@ -41,7 +41,7 @@ public class FMPPlacementHelper implements IPartHost } - }; + } final private static CableBusStorage nullStorage = new NullStorage(); diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 4c4d8e999..85418a09a 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/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) { diff --git a/src/main/java/appeng/helpers/MeteoritePlacer.java b/src/main/java/appeng/helpers/MeteoritePlacer.java index 65a5c1b4c..c10c4029e 100644 --- a/src/main/java/appeng/helpers/MeteoritePlacer.java +++ b/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 validSpawn = new HashSet(); diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 14fa708b4..f34d1e525 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -72,12 +72,12 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable failCache = new HashSet(); HashSet passCache = new HashSet(); diff --git a/src/main/java/appeng/hooks/MeteoriteWorldGen.java b/src/main/java/appeng/hooks/MeteoriteWorldGen.java index 6fe679568..bb430acf7 100644 --- a/src/main/java/appeng/hooks/MeteoriteWorldGen.java +++ b/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) diff --git a/src/main/java/appeng/hooks/QuartzWorldGen.java b/src/main/java/appeng/hooks/QuartzWorldGen.java index f13b1c7b7..f8a00979a 100644 --- a/src/main/java/appeng/hooks/QuartzWorldGen.java +++ b/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) diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index fe453de76..63ff9a12b 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/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 cliPlayerColors = new HashMap(); final private HashMap srvPlayerColors = new HashMap(); diff --git a/src/main/java/appeng/integration/modules/RB.java b/src/main/java/appeng/integration/modules/RB.java index 122d200d0..3a7058628 100644 --- a/src/main/java/appeng/integration/modules/RB.java +++ b/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; diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index ff59731c6..44c3d6973 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/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 dmgToPart = new HashMap(); diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 8f710f674..36497b695 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/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 ); diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index bfecffedb..fb6b170ad 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/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 heatUp; static private Hashtable coolDown; diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index 0cbd17810..3199379a9 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/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; diff --git a/src/main/java/appeng/me/GridSplitDetector.java b/src/main/java/appeng/me/GridSplitDetector.java index 523d464f6..222e80c26 100644 --- a/src/main/java/appeng/me/GridSplitDetector.java +++ b/src/main/java/appeng/me/GridSplitDetector.java @@ -21,4 +21,4 @@ class GridSplitDetector implements IGridVisitor return !pivotFound; } -}; +} diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index 476818ff5..b9bed5084 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/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 readClasses = new HashSet(); private static Hashtable, Hashtable> events = new Hashtable(); diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index fd2bd626c..3b59937a8 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -127,7 +127,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper // no.. } - }; + } @Override public ImmutableSet getCpus() diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 1c03e47e1..add1472e8 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/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) diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 62baa52ef..83ab1ea83 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/src/main/java/appeng/me/cache/helpers/Connections.java @@ -39,4 +39,4 @@ public class Connections implements Callable destroy = false; } -}; +} diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java index 1fb377935..2cecd3fec 100644 --- a/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -73,4 +73,4 @@ public class TickTracker implements Comparable if ( dc != null ) crashreportcategory.addCrashSection( "Location", dc ); } -}; +} diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index e03e328e7..d9cf95cc9 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -67,7 +67,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU long value; - }; + } /** * crafting job info diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 4339e1f45..3f9cc18f1 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/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; diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java index 56aadd27a..684c2c16e 100644 --- a/src/main/java/appeng/me/energy/EnergyWatcher.java +++ b/src/main/java/appeng/me/energy/EnergyWatcher.java @@ -46,7 +46,7 @@ public class EnergyWatcher implements IEnergyWatcher interestIterator.remove(); } - }; + } EnergyGridCache gsc; IEnergyWatcherHost myObject; diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index 3cefd70e8..7c4f0eade 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -22,7 +22,7 @@ public class GenericInterestManager stack = myStack; iw = watcher; } - }; + } private final SetMultimap container; private LinkedList transactions = null; diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java index 0f514ea02..2511708b2 100644 --- a/src/main/java/appeng/me/pathfinding/PathSegment.java +++ b/src/main/java/appeng/me/pathfinding/PathSegment.java @@ -21,7 +21,7 @@ public class PathSegment private static final long serialVersionUID = 810456465120286110L; - }; + } PathGridCache pgc; diff --git a/src/main/java/appeng/me/storage/ItemWatcher.java b/src/main/java/appeng/me/storage/ItemWatcher.java index 0b65b7993..ab52643f9 100644 --- a/src/main/java/appeng/me/storage/ItemWatcher.java +++ b/src/main/java/appeng/me/storage/ItemWatcher.java @@ -46,7 +46,7 @@ public class ItemWatcher implements IStackWatcher interestIterator.remove(); } - }; + } GridStorageCache gsc; IStackWatcherHost myObject; diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index c6ec818ca..8a3bd8942 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -46,7 +46,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit final ItemStack itemStack; final IAEItemStack aeStack; - }; + } final InventoryAdaptor adaptor; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index b954d2dd5..f378fc4c0 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/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) { diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 31d9563a0..5ef48f7b3 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/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() { diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index a83df64b2..c043f38a2 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/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 getCellArray(StorageChannel channel) diff --git a/src/main/java/appeng/parts/p2p/PartP2PBCPower.java b/src/main/java/appeng/parts/p2p/PartP2PBCPower.java index c62b01e66..ab20baa9b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PBCPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PBCPower.java @@ -148,7 +148,7 @@ public class PartP2PBCPower extends PartP2PTunnel implements IPo public float getPowerDrainPerTick() { return 0.5f; - }; + } @Method(iname = "MJ6") private IBatteryObject getTargetBattery() diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index bc07d1018..3c973d458 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -126,7 +126,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i public float getPowerDrainPerTick() { return 0.5f; - }; + } @Override public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index fc67d4e76..d9a184962 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -326,7 +326,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo public float getPowerDrainPerTick() { return 2.0f; - }; + } @Override public boolean canInsertItem(int i, ItemStack itemstack, int j) diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java index 192506657..fe9a5fa16 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java @@ -63,7 +63,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl public float getPowerDrainPerTick() { return 2.0f; - }; + } private int tmpUsed; @@ -119,7 +119,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl if ( in != null ) in.onTunnelNetworkChange(); } - }; + } @Override public void onTunnelNetworkChange() diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java index 38dd3bb39..caac99060 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java @@ -146,7 +146,7 @@ public class PartP2PRedstone extends PartP2PTunnel public float getPowerDrainPerTick() { return 0.5f; - }; + } @Override public void onNeighborChanged() diff --git a/src/main/java/appeng/parts/reporting/PartMonitor.java b/src/main/java/appeng/parts/reporting/PartMonitor.java index 6a1b4da12..a182fa078 100644 --- a/src/main/java/appeng/parts/reporting/PartMonitor.java +++ b/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 { diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 578702913..0de0560f5 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/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) { diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index df1a6415d..a27db55cd 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -88,7 +88,7 @@ public class CachedPlane skipThese.add( yCoord ); } - }; + } int verticalBits; diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 925aafe0d..6a857fd3f 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/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; diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 0ffcf5039..c2f413bb4 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -330,7 +330,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan // not used here } - }; + } class ChestMonitorHandler extends MEMonitorHandler { @@ -348,7 +348,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan return this.getHandler(); } - }; + } private MEMonitorHandler wrap(IMEInventoryHandler h) { diff --git a/src/main/java/appeng/transformer/asm/ASMTweaker.java b/src/main/java/appeng/transformer/asm/ASMTweaker.java index 8d7862a79..7185d1ec8 100644 --- a/src/main/java/appeng/transformer/asm/ASMTweaker.java +++ b/src/main/java/appeng/transformer/asm/ASMTweaker.java @@ -33,7 +33,7 @@ public class ASMTweaker implements IClassTransformer final String name, desc; - }; + } Multimap privateToPublicMethods = HashMultimap.create(); diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index d23a20eee..990b312c2 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -356,7 +356,7 @@ public class AdaptorIInventory extends InventoryAdaptor // nothing! } - }; + } @Override public Iterator iterator() diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index c7b016bfd..b081672c4 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/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; diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index 3b712e1d7..89d3d63b5 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/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; diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 673c76f6e..e5fb7a7f4 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -44,14 +44,14 @@ public class OreHelper return hash; } - }; + } class OreResult { public OreReference oreValue = null; - }; + } HashMap references = new HashMap(); From 704f2401c6d5e0859c341800b1539c3e5059ceda Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 27 Sep 2014 21:15:39 +0200 Subject: [PATCH 3/5] Added synching information --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74d1cc395..0db83c58f 100644 --- a/README.md +++ b/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 From 1e71e86accd43f2982f0db80c08b9c487c1a5eac Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sun, 28 Sep 2014 00:50:06 +0200 Subject: [PATCH 4/5] Removes unnecessary semicolons --- src/api/java/appeng/api | 2 +- .../client/gui/implementations/GuiSecurity.java | 2 +- .../java/appeng/client/gui/widgets/GuiImgButton.java | 4 ++-- .../appeng/client/gui/widgets/GuiProgressBar.java | 2 +- .../java/appeng/client/render/BusRenderHelper.java | 2 +- .../appeng/client/render/RenderBlocksWorkaround.java | 2 +- .../implementations/ContainerCellWorkbench.java | 2 +- .../implementations/ContainerInterfaceTerminal.java | 4 ++-- src/main/java/appeng/container/slot/AppEngSlot.java | 2 +- .../java/appeng/container/slot/SlotPlayerInv.java | 2 +- .../appeng/container/slot/SlotRestrictedInput.java | 2 +- .../core/features/registries/WorldGenRegistry.java | 2 +- .../appeng/core/sync/AppEngPacketHandlerBase.java | 2 +- src/main/java/appeng/crafting/CraftingJob.java | 2 +- src/main/java/appeng/crafting/CraftingWatcher.java | 2 +- src/main/java/appeng/entity/EntityChargedQuartz.java | 2 +- src/main/java/appeng/fmp/CableBusPart.java | 2 +- src/main/java/appeng/fmp/FMPPlacementHelper.java | 2 +- src/main/java/appeng/helpers/DualityInterface.java | 2 +- src/main/java/appeng/helpers/MeteoritePlacer.java | 12 ++++++------ src/main/java/appeng/helpers/PatternHelper.java | 4 ++-- src/main/java/appeng/hooks/MeteoriteWorldGen.java | 2 +- src/main/java/appeng/hooks/QuartzWorldGen.java | 2 +- src/main/java/appeng/hooks/TickHandler.java | 4 ++-- src/main/java/appeng/integration/modules/RB.java | 2 +- src/main/java/appeng/items/parts/ItemMultiPart.java | 2 +- .../items/tools/powered/ToolColorApplicator.java | 2 +- .../items/tools/powered/ToolEntropyManipulator.java | 2 +- .../tools/powered/powersink/AERootPoweredItem.java | 2 +- src/main/java/appeng/me/GridSplitDetector.java | 2 +- src/main/java/appeng/me/NetworkEventBus.java | 6 +++--- src/main/java/appeng/me/cache/CraftingGridCache.java | 2 +- src/main/java/appeng/me/cache/GridStorageCache.java | 4 ++-- .../java/appeng/me/cache/helpers/Connections.java | 2 +- .../java/appeng/me/cache/helpers/TickTracker.java | 2 +- .../cluster/implementations/CraftingCPUCluster.java | 2 +- .../cluster/implementations/SpatialPylonCluster.java | 2 +- src/main/java/appeng/me/energy/EnergyWatcher.java | 2 +- .../appeng/me/helpers/GenericInterestManager.java | 2 +- src/main/java/appeng/me/pathfinding/PathSegment.java | 2 +- src/main/java/appeng/me/storage/ItemWatcher.java | 2 +- .../java/appeng/me/storage/MEMonitorIInventory.java | 2 +- src/main/java/appeng/parts/PartPlacement.java | 2 +- .../appeng/parts/automation/PartLevelEmitter.java | 4 ++-- src/main/java/appeng/parts/misc/PartStorageBus.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PBCPower.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PIC2Power.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PItems.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PLiquids.java | 4 ++-- src/main/java/appeng/parts/p2p/PartP2PRedstone.java | 2 +- .../java/appeng/parts/reporting/PartMonitor.java | 1 - src/main/java/appeng/services/CompassService.java | 4 ++-- src/main/java/appeng/spatial/CachedPlane.java | 2 +- src/main/java/appeng/spatial/StorageHelper.java | 8 ++++---- src/main/java/appeng/tile/storage/TileChest.java | 4 ++-- src/main/java/appeng/transformer/asm/ASMTweaker.java | 2 +- src/main/java/appeng/util/inv/AdaptorIInventory.java | 2 +- .../appeng/util/inv/WrapperChainedInventory.java | 2 +- src/main/java/appeng/util/inv/WrapperInvSlot.java | 2 +- src/main/java/appeng/util/item/OreHelper.java | 4 ++-- 60 files changed, 79 insertions(+), 80 deletions(-) diff --git a/src/api/java/appeng/api b/src/api/java/appeng/api index 74e4e50c7..da4cad25b 160000 --- a/src/api/java/appeng/api +++ b/src/api/java/appeng/api @@ -1 +1 @@ -Subproject commit 74e4e50c76e812cc227bea020f3c8646eacfedb1 +Subproject commit da4cad25b5358b3139f97fe89645e37c5849000f diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java index 8ce92a727..cc3a4f3cf 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java @@ -79,7 +79,7 @@ public class GuiSecurity extends GuiMEMonitorable } } - }; + } protected String getBackground() { diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index a753d9ec2..b17a91f6e 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/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; diff --git a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java b/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java index 0c145987c..54fd48ef5 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java +++ b/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; diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index 522b0c5e1..bf3995594 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -102,7 +102,7 @@ public class BusRenderHelper implements IPartRenderHelper return false; } - }; + } BoundBoxCalculator bbc = new BoundBoxCalculator(); diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java index f8794d30b..5c9fe6ac6 100644 --- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java +++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java @@ -126,7 +126,7 @@ public class RenderBlocksWorkaround extends RenderBlocks lightHash = 0; } - }; + } private LightingCache lightState = new LightingCache(); diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 4eef53973..af654546c 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -149,7 +149,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { return getCellUpgradeInventory().isItemValidForSlot( i, itemstack ); } - }; + } IInventory UpgradeInventoryWrapper; diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 9b1c78698..4d16c102c 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -59,7 +59,7 @@ public class ContainerInterfaceTerminal extends AEBaseContainer IInventory server; public long sortBy; - }; + } Map diList = new HashMap(); Map 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) diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index e5120dffe..5ab024dcf 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/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; diff --git a/src/main/java/appeng/container/slot/SlotPlayerInv.java b/src/main/java/appeng/container/slot/SlotPlayerInv.java index 9159d2c86..8cf4b5099 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerInv.java +++ b/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; } } diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 84dbd611e..ff3d8af0f 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/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() diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 53820a58b..40ac5fc44 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -15,7 +15,7 @@ public class WorldGenRegistry implements IWorldGen HashSet> badProviders = new HashSet(); HashSet badDimensions = new HashSet(); - }; + } TypeSet[] types; diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index 1386c0ae2..1a9981273 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -127,6 +127,6 @@ public class AppEngPacketHandlerBase return AppEngPacketHandlerBase.reverseLookup.get( c ); } - }; + } } diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 28b8773d2..bfe54335e 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/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 opsAndMultiplier = new HashMap(); diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/main/java/appeng/crafting/CraftingWatcher.java index 1acbb0556..8eb6535ba 100644 --- a/src/main/java/appeng/crafting/CraftingWatcher.java +++ b/src/main/java/appeng/crafting/CraftingWatcher.java @@ -46,7 +46,7 @@ public class CraftingWatcher implements ICraftingWatcher interestIterator.remove(); } - }; + } CraftingGridCache gsc; ICraftingWatcherHost myObject; diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index 550804f11..6d53d5fe7 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -62,7 +62,7 @@ final public class EntityChargedQuartz extends EntityItem } else transformTime = 0; - }; + } public boolean transform() { diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index 1b0d9b5ac..41b2952c6 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/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) diff --git a/src/main/java/appeng/fmp/FMPPlacementHelper.java b/src/main/java/appeng/fmp/FMPPlacementHelper.java index 6e3d26b31..3e32bfdbb 100644 --- a/src/main/java/appeng/fmp/FMPPlacementHelper.java +++ b/src/main/java/appeng/fmp/FMPPlacementHelper.java @@ -41,7 +41,7 @@ public class FMPPlacementHelper implements IPartHost } - }; + } final private static CableBusStorage nullStorage = new NullStorage(); diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 4c4d8e999..85418a09a 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/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) { diff --git a/src/main/java/appeng/helpers/MeteoritePlacer.java b/src/main/java/appeng/helpers/MeteoritePlacer.java index 65a5c1b4c..c10c4029e 100644 --- a/src/main/java/appeng/helpers/MeteoritePlacer.java +++ b/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 validSpawn = new HashSet(); diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index d0f46de48..943be96f4 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -72,12 +72,12 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable failCache = new HashSet(); HashSet passCache = new HashSet(); diff --git a/src/main/java/appeng/hooks/MeteoriteWorldGen.java b/src/main/java/appeng/hooks/MeteoriteWorldGen.java index 6fe679568..bb430acf7 100644 --- a/src/main/java/appeng/hooks/MeteoriteWorldGen.java +++ b/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) diff --git a/src/main/java/appeng/hooks/QuartzWorldGen.java b/src/main/java/appeng/hooks/QuartzWorldGen.java index f13b1c7b7..f8a00979a 100644 --- a/src/main/java/appeng/hooks/QuartzWorldGen.java +++ b/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) diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index fe453de76..63ff9a12b 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/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 cliPlayerColors = new HashMap(); final private HashMap srvPlayerColors = new HashMap(); diff --git a/src/main/java/appeng/integration/modules/RB.java b/src/main/java/appeng/integration/modules/RB.java index 122d200d0..3a7058628 100644 --- a/src/main/java/appeng/integration/modules/RB.java +++ b/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; diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index ff59731c6..44c3d6973 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/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 dmgToPart = new HashMap(); diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 8f710f674..36497b695 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/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 ); diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index bfecffedb..fb6b170ad 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/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 heatUp; static private Hashtable coolDown; diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index 0cbd17810..3199379a9 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/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; diff --git a/src/main/java/appeng/me/GridSplitDetector.java b/src/main/java/appeng/me/GridSplitDetector.java index 523d464f6..222e80c26 100644 --- a/src/main/java/appeng/me/GridSplitDetector.java +++ b/src/main/java/appeng/me/GridSplitDetector.java @@ -21,4 +21,4 @@ class GridSplitDetector implements IGridVisitor return !pivotFound; } -}; +} diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index 476818ff5..b9bed5084 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/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 readClasses = new HashSet(); private static Hashtable, Hashtable> events = new Hashtable(); diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index a6863c71e..b6a92d331 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -128,7 +128,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper // no.. } - }; + } @Override public ImmutableSet getCpus() diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 1c03e47e1..add1472e8 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/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) diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 62baa52ef..83ab1ea83 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/src/main/java/appeng/me/cache/helpers/Connections.java @@ -39,4 +39,4 @@ public class Connections implements Callable destroy = false; } -}; +} diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java index 1fb377935..2cecd3fec 100644 --- a/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -73,4 +73,4 @@ public class TickTracker implements Comparable if ( dc != null ) crashreportcategory.addCrashSection( "Location", dc ); } -}; +} diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index e03e328e7..d9cf95cc9 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -67,7 +67,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU long value; - }; + } /** * crafting job info diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 4339e1f45..3f9cc18f1 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/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; diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java index 56aadd27a..684c2c16e 100644 --- a/src/main/java/appeng/me/energy/EnergyWatcher.java +++ b/src/main/java/appeng/me/energy/EnergyWatcher.java @@ -46,7 +46,7 @@ public class EnergyWatcher implements IEnergyWatcher interestIterator.remove(); } - }; + } EnergyGridCache gsc; IEnergyWatcherHost myObject; diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index 3cefd70e8..7c4f0eade 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -22,7 +22,7 @@ public class GenericInterestManager stack = myStack; iw = watcher; } - }; + } private final SetMultimap container; private LinkedList transactions = null; diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java index 0f514ea02..2511708b2 100644 --- a/src/main/java/appeng/me/pathfinding/PathSegment.java +++ b/src/main/java/appeng/me/pathfinding/PathSegment.java @@ -21,7 +21,7 @@ public class PathSegment private static final long serialVersionUID = 810456465120286110L; - }; + } PathGridCache pgc; diff --git a/src/main/java/appeng/me/storage/ItemWatcher.java b/src/main/java/appeng/me/storage/ItemWatcher.java index 0b65b7993..ab52643f9 100644 --- a/src/main/java/appeng/me/storage/ItemWatcher.java +++ b/src/main/java/appeng/me/storage/ItemWatcher.java @@ -46,7 +46,7 @@ public class ItemWatcher implements IStackWatcher interestIterator.remove(); } - }; + } GridStorageCache gsc; IStackWatcherHost myObject; diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index c6ec818ca..8a3bd8942 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -46,7 +46,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit final ItemStack itemStack; final IAEItemStack aeStack; - }; + } final InventoryAdaptor adaptor; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index b954d2dd5..f378fc4c0 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/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) { diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 31d9563a0..5ef48f7b3 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/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() { diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index a83df64b2..c043f38a2 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/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 getCellArray(StorageChannel channel) diff --git a/src/main/java/appeng/parts/p2p/PartP2PBCPower.java b/src/main/java/appeng/parts/p2p/PartP2PBCPower.java index c62b01e66..ab20baa9b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PBCPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PBCPower.java @@ -148,7 +148,7 @@ public class PartP2PBCPower extends PartP2PTunnel implements IPo public float getPowerDrainPerTick() { return 0.5f; - }; + } @Method(iname = "MJ6") private IBatteryObject getTargetBattery() diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index bc07d1018..3c973d458 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -126,7 +126,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i public float getPowerDrainPerTick() { return 0.5f; - }; + } @Override public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index fc67d4e76..d9a184962 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -326,7 +326,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo public float getPowerDrainPerTick() { return 2.0f; - }; + } @Override public boolean canInsertItem(int i, ItemStack itemstack, int j) diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java index 192506657..fe9a5fa16 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java @@ -63,7 +63,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl public float getPowerDrainPerTick() { return 2.0f; - }; + } private int tmpUsed; @@ -119,7 +119,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl if ( in != null ) in.onTunnelNetworkChange(); } - }; + } @Override public void onTunnelNetworkChange() diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java index 38dd3bb39..caac99060 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java @@ -146,7 +146,7 @@ public class PartP2PRedstone extends PartP2PTunnel public float getPowerDrainPerTick() { return 0.5f; - }; + } @Override public void onNeighborChanged() diff --git a/src/main/java/appeng/parts/reporting/PartMonitor.java b/src/main/java/appeng/parts/reporting/PartMonitor.java index 6a1b4da12..a182fa078 100644 --- a/src/main/java/appeng/parts/reporting/PartMonitor.java +++ b/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 { diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 578702913..0de0560f5 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/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) { diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index df1a6415d..a27db55cd 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -88,7 +88,7 @@ public class CachedPlane skipThese.add( yCoord ); } - }; + } int verticalBits; diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 925aafe0d..6a857fd3f 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/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; diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 69e5a26fe..11b378b67 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/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 extends MEMonitorHandler { @@ -390,7 +390,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan return super.extractItems(request, mode, src); } - }; + } private MEMonitorHandler wrap(IMEInventoryHandler h) { diff --git a/src/main/java/appeng/transformer/asm/ASMTweaker.java b/src/main/java/appeng/transformer/asm/ASMTweaker.java index 8d7862a79..7185d1ec8 100644 --- a/src/main/java/appeng/transformer/asm/ASMTweaker.java +++ b/src/main/java/appeng/transformer/asm/ASMTweaker.java @@ -33,7 +33,7 @@ public class ASMTweaker implements IClassTransformer final String name, desc; - }; + } Multimap privateToPublicMethods = HashMultimap.create(); diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index d23a20eee..990b312c2 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -356,7 +356,7 @@ public class AdaptorIInventory extends InventoryAdaptor // nothing! } - }; + } @Override public Iterator iterator() diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index c7b016bfd..b081672c4 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/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; diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index 3b712e1d7..89d3d63b5 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/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; diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 673c76f6e..e5fb7a7f4 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -44,14 +44,14 @@ public class OreHelper return hash; } - }; + } class OreResult { public OreReference oreValue = null; - }; + } HashMap references = new HashMap(); From 4ed7173f5cd54ae8a83ee253fb9e6faedc854d05 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sun, 28 Sep 2014 13:46:38 +0200 Subject: [PATCH 5/5] Updated submodules --- src/api/java/appeng/api | 2 +- src/main/resources/assets/appliedenergistics2/lang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/java/appeng/api b/src/api/java/appeng/api index da4cad25b..65dfd7ace 160000 --- a/src/api/java/appeng/api +++ b/src/api/java/appeng/api @@ -1 +1 @@ -Subproject commit da4cad25b5358b3139f97fe89645e37c5849000f +Subproject commit 65dfd7ace777c4972e920df715b34d84530ec637 diff --git a/src/main/resources/assets/appliedenergistics2/lang b/src/main/resources/assets/appliedenergistics2/lang index f9625d882..b0a451fec 160000 --- a/src/main/resources/assets/appliedenergistics2/lang +++ b/src/main/resources/assets/appliedenergistics2/lang @@ -1 +1 @@ -Subproject commit f9625d882cee0f6d3585aa9e08c0e9813e3b104f +Subproject commit b0a451fecd97583367e12a98439dafac29e7ae97