diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java b/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java index 6baf6e663..9ad2a71ca 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java +++ b/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; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index bd34e879b..a478026c5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/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 ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java index a02bb42cf..597297919 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java +++ b/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; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 38a40d943..b6037b101 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/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]; diff --git a/src/main/java/appeng/client/gui/implementations/GuiPriority.java b/src/main/java/appeng/client/gui/implementations/GuiPriority.java index c6d80c419..95fd0dfad 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPriority.java +++ b/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; diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java index 294aa6e24..05b15b98d 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java +++ b/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() diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 1150b143a..8bd12ea64 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/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) diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index c46f80b10..cec627144 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/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) { diff --git a/src/main/java/appeng/container/ContainerOpenContext.java b/src/main/java/appeng/container/ContainerOpenContext.java index 562ae3111..e7443156e 100644 --- a/src/main/java/appeng/container/ContainerOpenContext.java +++ b/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; diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index 2868defdd..e31ac088d 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/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 ) { diff --git a/src/main/java/appeng/core/stats/Achievements.java b/src/main/java/appeng/core/stats/Achievements.java index 0fc3d041b..3433c0ccf 100644 --- a/src/main/java/appeng/core/stats/Achievements.java +++ b/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; diff --git a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java b/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java index 76fdb62e0..6e6127ae8 100644 --- a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java +++ b/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; diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java b/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java index be765a07c..75ca6987b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java +++ b/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; diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java b/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java index ce7ede240..1c9700a4c 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java +++ b/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; diff --git a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java index fcf81ce93..8619dd0c5 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java +++ b/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. diff --git a/src/main/java/appeng/helpers/MeteoritePlacer.java b/src/main/java/appeng/helpers/MeteoritePlacer.java index fb763cd6c..bdb0d3ad8 100644 --- a/src/main/java/appeng/helpers/MeteoritePlacer.java +++ b/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 ); diff --git a/src/main/java/appeng/helpers/Splotch.java b/src/main/java/appeng/helpers/Splotch.java index d6cc1c633..96aae4f5d 100644 --- a/src/main/java/appeng/helpers/Splotch.java +++ b/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 ) { diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index 433cf14ab..c2fa6f3b9 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/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; diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index eea5962d6..f5ad2347f 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/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 others, ItemStack is) { - boolean importBus = false, exportBus = false, group = false; + boolean importBus = false; + boolean exportBus = false; + boolean group = false; PartType u = this.getTypeByStack( is ); diff --git a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java index fa9878955..f43b2d361 100644 --- a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java @@ -52,7 +52,7 @@ public class PartCraftingTerminal extends PartTerminal @Override public void getDrops(List 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; diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java index b0f514d55..8790baf3f 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java +++ b/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; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 24760d079..03bc499fa 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/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; diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 52121d153..c5b944c70 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/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 diff --git a/src/main/java/appeng/transformer/asm/ASMTweaker.java b/src/main/java/appeng/transformer/asm/ASMTweaker.java index 3e581abac..20045f158 100644 --- a/src/main/java/appeng/transformer/asm/ASMTweaker.java +++ b/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; } diff --git a/src/main/java/appeng/util/BlockUpdate.java b/src/main/java/appeng/util/BlockUpdate.java index 8cc161cb4..a87a066af 100644 --- a/src/main/java/appeng/util/BlockUpdate.java +++ b/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; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index d18ee3689..032fac1f3 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/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)