Multiple variables in one declaration
This commit is contained in:
parent
b609b08f98
commit
81c32d5181
26 changed files with 103 additions and 37 deletions
|
@ -48,8 +48,14 @@ public class GuiCraftAmount extends AEBaseGui
|
||||||
|
|
||||||
GuiButton next;
|
GuiButton next;
|
||||||
|
|
||||||
GuiButton plus1, plus10, plus100, plus1000;
|
GuiButton plus1;
|
||||||
GuiButton minus1, minus10, minus100, minus1000;
|
GuiButton plus10;
|
||||||
|
GuiButton plus100;
|
||||||
|
GuiButton plus1000;
|
||||||
|
GuiButton minus1;
|
||||||
|
GuiButton minus10;
|
||||||
|
GuiButton minus100;
|
||||||
|
GuiButton minus1000;
|
||||||
|
|
||||||
GuiBridge OriginalGui;
|
GuiBridge OriginalGui;
|
||||||
|
|
||||||
|
|
|
@ -309,7 +309,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
|
||||||
IAEItemStack pendingStack = this.pending.findPrecise( refStack );
|
IAEItemStack pendingStack = this.pending.findPrecise( refStack );
|
||||||
|
|
||||||
int lines = 0;
|
int lines = 0;
|
||||||
boolean active = false, scheduled = false;
|
boolean active = false;
|
||||||
|
boolean scheduled = false;
|
||||||
|
|
||||||
if ( stored != null && stored.getStackSize() > 0 )
|
if ( stored != null && stored.getStackSize() > 0 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -47,8 +47,14 @@ public class GuiLevelEmitter extends GuiUpgradeable
|
||||||
|
|
||||||
GuiNumberBox level;
|
GuiNumberBox level;
|
||||||
|
|
||||||
GuiButton plus1, plus10, plus100, plus1000;
|
GuiButton plus1;
|
||||||
GuiButton minus1, minus10, minus100, minus1000;
|
GuiButton plus10;
|
||||||
|
GuiButton plus100;
|
||||||
|
GuiButton plus1000;
|
||||||
|
GuiButton minus1;
|
||||||
|
GuiButton minus10;
|
||||||
|
GuiButton minus100;
|
||||||
|
GuiButton minus1000;
|
||||||
|
|
||||||
GuiImgButton levelMode;
|
GuiImgButton levelMode;
|
||||||
GuiImgButton craftingMode;
|
GuiImgButton craftingMode;
|
||||||
|
|
|
@ -97,7 +97,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
|
||||||
GuiImgButton SortByBox;
|
GuiImgButton SortByBox;
|
||||||
GuiImgButton SortDirBox;
|
GuiImgButton SortDirBox;
|
||||||
|
|
||||||
GuiImgButton searchBoxSettings, terminalStyleBox;
|
GuiImgButton searchBoxSettings;
|
||||||
|
GuiImgButton terminalStyleBox;
|
||||||
final boolean viewCell;
|
final boolean viewCell;
|
||||||
|
|
||||||
final ItemStack[] myCurrentViewCells = new ItemStack[5];
|
final ItemStack[] myCurrentViewCells = new ItemStack[5];
|
||||||
|
|
|
@ -51,8 +51,14 @@ public class GuiPriority extends AEBaseGui
|
||||||
GuiNumberBox priority;
|
GuiNumberBox priority;
|
||||||
GuiTabButton originalGuiBtn;
|
GuiTabButton originalGuiBtn;
|
||||||
|
|
||||||
GuiButton plus1, plus10, plus100, plus1000;
|
GuiButton plus1;
|
||||||
GuiButton minus1, minus10, minus100, minus1000;
|
GuiButton plus10;
|
||||||
|
GuiButton plus100;
|
||||||
|
GuiButton plus1000;
|
||||||
|
GuiButton minus1;
|
||||||
|
GuiButton minus10;
|
||||||
|
GuiButton minus100;
|
||||||
|
GuiButton minus1000;
|
||||||
|
|
||||||
GuiBridge OriginalGui;
|
GuiBridge OriginalGui;
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,11 @@ public class GuiSecurity extends GuiMEMonitorable
|
||||||
this.standardSize = this.xSize;
|
this.standardSize = this.xSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
GuiToggleButton inject, extract, craft, build, security;
|
GuiToggleButton inject;
|
||||||
|
GuiToggleButton extract;
|
||||||
|
GuiToggleButton craft;
|
||||||
|
GuiToggleButton build;
|
||||||
|
GuiToggleButton security;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initGui()
|
public void initGui()
|
||||||
|
|
|
@ -606,9 +606,15 @@ public class BaseBlockRender
|
||||||
{
|
{
|
||||||
Tessellator tess = Tessellator.instance;
|
Tessellator tess = Tessellator.instance;
|
||||||
|
|
||||||
double offsetX = 0.0, offsetY = 0.0, offsetZ = 0.0;
|
double offsetX = 0.0;
|
||||||
double layerAX = 0.0, layerAY = 0.0, layerAZ = 0.0;
|
double offsetY = 0.0;
|
||||||
double layerBX = 0.0, layerBY = 0.0, layerBZ = 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;
|
boolean flip = false;
|
||||||
switch (orientation)
|
switch (orientation)
|
||||||
|
|
|
@ -45,7 +45,9 @@ public class CableRenderHelper
|
||||||
|
|
||||||
private void setSide(ForgeDirection s)
|
private void setSide(ForgeDirection s)
|
||||||
{
|
{
|
||||||
ForgeDirection ax, ay, az;
|
ForgeDirection ax;
|
||||||
|
ForgeDirection ay;
|
||||||
|
ForgeDirection az;
|
||||||
|
|
||||||
switch (s)
|
switch (s)
|
||||||
{
|
{
|
||||||
|
@ -205,7 +207,9 @@ public class CableRenderHelper
|
||||||
IPart part = cableBusContainer.getPart( s );
|
IPart part = cableBusContainer.getPart( s );
|
||||||
if ( part != null )
|
if ( part != null )
|
||||||
{
|
{
|
||||||
ForgeDirection ax, ay, az;
|
ForgeDirection ax;
|
||||||
|
ForgeDirection ay;
|
||||||
|
ForgeDirection az;
|
||||||
|
|
||||||
switch (s)
|
switch (s)
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,9 @@ public class ContainerOpenContext
|
||||||
{
|
{
|
||||||
|
|
||||||
public World w;
|
public World w;
|
||||||
public int x, y, z;
|
public int x;
|
||||||
|
public int y;
|
||||||
|
public int z;
|
||||||
public ForgeDirection side;
|
public ForgeDirection side;
|
||||||
final public boolean isItem;
|
final public boolean isItem;
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,9 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
|
||||||
this.upgradeable = te;
|
this.upgradeable = te;
|
||||||
|
|
||||||
World w = null;
|
World w = null;
|
||||||
int xCoord = 0, yCoord = 0, zCoord = 0;
|
int xCoord = 0;
|
||||||
|
int yCoord = 0;
|
||||||
|
int zCoord = 0;
|
||||||
|
|
||||||
if ( te instanceof TileEntity )
|
if ( te instanceof TileEntity )
|
||||||
{
|
{
|
||||||
|
|
|
@ -109,7 +109,8 @@ public enum Achievements
|
||||||
|
|
||||||
public final ItemStack stack;
|
public final ItemStack stack;
|
||||||
public final AchievementType type;
|
public final AchievementType type;
|
||||||
private final int x, y;
|
private final int x;
|
||||||
|
private final int y;
|
||||||
|
|
||||||
private Achievement parent;
|
private Achievement parent;
|
||||||
private Achievement stat;
|
private Achievement stat;
|
||||||
|
|
|
@ -38,7 +38,9 @@ import appeng.util.item.AEItemStack;
|
||||||
public class PacketAssemblerAnimation extends AppEngPacket
|
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 byte rate;
|
||||||
final public IAEItemStack is;
|
final public IAEItemStack is;
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,9 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba
|
||||||
{
|
{
|
||||||
|
|
||||||
final public long attunement;
|
final public long attunement;
|
||||||
final public int cx, cz, cdy;
|
final public int cx;
|
||||||
|
final public int cz;
|
||||||
|
final public int cdy;
|
||||||
|
|
||||||
EntityPlayer talkBackTo;
|
EntityPlayer talkBackTo;
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,9 @@ public class PacketCompassResponse extends AppEngPacket
|
||||||
{
|
{
|
||||||
|
|
||||||
final public long attunement;
|
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;
|
public CompassResult cr;
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,10 @@ import appeng.parts.PartPlacement;
|
||||||
public class PacketPartPlacement extends AppEngPacket
|
public class PacketPartPlacement extends AppEngPacket
|
||||||
{
|
{
|
||||||
|
|
||||||
int x, y, z, face;
|
int x;
|
||||||
|
int y;
|
||||||
|
int z;
|
||||||
|
int face;
|
||||||
float eyeHeight;
|
float eyeHeight;
|
||||||
|
|
||||||
// automatic.
|
// automatic.
|
||||||
|
|
|
@ -313,7 +313,8 @@ public class MeteoritePlacer
|
||||||
|
|
||||||
int verticalBits = 0;
|
int verticalBits = 0;
|
||||||
|
|
||||||
final int cx, cz;
|
final int cx;
|
||||||
|
final int cz;
|
||||||
|
|
||||||
public ChunkOnly(World w, int cx, int cz) {
|
public ChunkOnly(World w, int cx, int cz) {
|
||||||
super( w );
|
super( w );
|
||||||
|
|
|
@ -32,7 +32,8 @@ public class Splotch
|
||||||
this.color = col;
|
this.color = col;
|
||||||
this.lumen = lit;
|
this.lumen = lit;
|
||||||
|
|
||||||
double x, y;
|
double x;
|
||||||
|
double y;
|
||||||
|
|
||||||
if ( side == ForgeDirection.SOUTH || side == ForgeDirection.NORTH )
|
if ( side == ForgeDirection.SOUTH || side == ForgeDirection.NORTH )
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,7 +35,9 @@ public class CompassManager
|
||||||
final int hash;
|
final int hash;
|
||||||
|
|
||||||
final long attunement;
|
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) {
|
public CompassRequest(long attunement, int x, int y, int z) {
|
||||||
this.attunement = attunement;
|
this.attunement = attunement;
|
||||||
|
|
|
@ -253,7 +253,9 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
|
||||||
@Override
|
@Override
|
||||||
public String getUnlocalizedGroupName(Set<ItemStack> others, ItemStack is)
|
public String getUnlocalizedGroupName(Set<ItemStack> others, ItemStack is)
|
||||||
{
|
{
|
||||||
boolean importBus = false, exportBus = false, group = false;
|
boolean importBus = false;
|
||||||
|
boolean exportBus = false;
|
||||||
|
boolean group = false;
|
||||||
|
|
||||||
PartType u = this.getTypeByStack( is );
|
PartType u = this.getTypeByStack( is );
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,9 @@ public class PartCraftingTerminal extends PartTerminal
|
||||||
@Override
|
@Override
|
||||||
public GuiBridge getGui( EntityPlayer p )
|
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 )
|
if ( this.getHost().getTile() != null )
|
||||||
{
|
{
|
||||||
x = this.tile.xCoord;
|
x = this.tile.xCoord;
|
||||||
|
|
|
@ -80,7 +80,9 @@ public class PartPatternTerminal extends PartTerminal
|
||||||
@Override
|
@Override
|
||||||
public GuiBridge getGui( EntityPlayer p )
|
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 )
|
if ( this.getHost().getTile() != null )
|
||||||
{
|
{
|
||||||
x = this.tile.xCoord;
|
x = this.tile.xCoord;
|
||||||
|
|
|
@ -45,7 +45,8 @@ public class CompassService implements ThreadFactory
|
||||||
|
|
||||||
public final World world;
|
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 int doubleChunkY; // 32 blocks instead of 16.
|
||||||
public final boolean value;
|
public final boolean value;
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,8 @@ public class StorageHelper
|
||||||
*/
|
*/
|
||||||
public Entity teleportEntity(Entity entity, TelDestination link)
|
public Entity teleportEntity(Entity entity, TelDestination link)
|
||||||
{
|
{
|
||||||
WorldServer oldWorld, newWorld;
|
WorldServer oldWorld;
|
||||||
|
WorldServer newWorld;
|
||||||
EntityPlayerMP player;
|
EntityPlayerMP player;
|
||||||
|
|
||||||
try
|
try
|
||||||
|
|
|
@ -20,9 +20,6 @@ package appeng.transformer.asm;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
import com.google.common.collect.HashMultimap;
|
|
||||||
import com.google.common.collect.Multimap;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.Level;
|
import org.apache.logging.log4j.Level;
|
||||||
import org.objectweb.asm.ClassReader;
|
import org.objectweb.asm.ClassReader;
|
||||||
import org.objectweb.asm.ClassWriter;
|
import org.objectweb.asm.ClassWriter;
|
||||||
|
@ -38,6 +35,9 @@ import net.minecraft.launchwrapper.IClassTransformer;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.FMLRelaunchLog;
|
import cpw.mods.fml.relauncher.FMLRelaunchLog;
|
||||||
|
|
||||||
|
import com.google.common.collect.HashMultimap;
|
||||||
|
import com.google.common.collect.Multimap;
|
||||||
|
|
||||||
public class ASMTweaker implements IClassTransformer
|
public class ASMTweaker implements IClassTransformer
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -49,7 +49,8 @@ public class ASMTweaker implements IClassTransformer
|
||||||
this.desc = desc;
|
this.desc = desc;
|
||||||
}
|
}
|
||||||
|
|
||||||
final String name, desc;
|
final String name;
|
||||||
|
final String desc;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,9 @@ public class BlockUpdate implements Callable
|
||||||
{
|
{
|
||||||
|
|
||||||
final World w;
|
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) {
|
public BlockUpdate(World w, int x, int y, int z) {
|
||||||
this.w = w;
|
this.w = w;
|
||||||
|
|
|
@ -327,7 +327,9 @@ public class Platform
|
||||||
if ( isClient() )
|
if ( isClient() )
|
||||||
return;
|
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 )
|
if ( tile != null )
|
||||||
{
|
{
|
||||||
x = tile.xCoord;
|
x = tile.xCoord;
|
||||||
|
@ -1602,7 +1604,8 @@ public class Platform
|
||||||
|
|
||||||
public static void configurePlayer(EntityPlayer player, ForgeDirection side, TileEntity tile)
|
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;
|
player.yOffset = 1.8f;
|
||||||
|
|
||||||
switch (side)
|
switch (side)
|
||||||
|
|
Loading…
Reference in a new issue