fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1420 from thatsIch/e-method-parameter-naming-conventions

Browse Source 
Replaces all method parameter regarding their naming conventions
This commit is contained in:
thatsIch
2015-05-08 23:45:28 +02:00
parent c451a25c7f f193c2adc4
commit 5832e2d828
76 changed files with 381 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseGui.java
+12 -12
View File
@@ -30,6 +30,9 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Joiner;
import com.google.common.base.Stopwatch;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
@@ -49,9 +52,6 @@ import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import com.google.common.base.Joiner;
import com.google.common.base.Stopwatch;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.gui.widgets.GuiScrollbar;
import appeng.client.gui.widgets.ITooltip;
@@ -156,14 +156,14 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
public void drawScreen( int mouse_x, int mouse_y, float btn )
public void drawScreen( int mouseX, int mouseY, float btn )
{
super.drawScreen( mouse_x, mouse_y, btn );
super.drawScreen( mouseX, mouseY, btn );
boolean hasClicked = Mouse.isButtonDown( 0 );
if( hasClicked && this.myScrollBar != null )
{
this.myScrollBar.click( this, mouse_x - this.guiLeft, mouse_y - this.guiTop );
this.myScrollBar.click( this, mouseX - this.guiLeft, mouseY - this.guiTop );
}
for( Object c : this.buttonList )
@@ -174,9 +174,9 @@ public abstract class AEBaseGui extends GuiContainer
int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
int y = tooltip.yPos(); // ((GuiImgButton) c).yPosition;
if( x < mouse_x && x + tooltip.getWidth() > mouse_x && tooltip.isVisible() )
if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
{
if( y < mouse_y && y + tooltip.getHeight() > mouse_y )
if( y < mouseY && y + tooltip.getHeight() > mouseY )
{
if( y < 15 )
{
@@ -194,14 +194,14 @@ public abstract class AEBaseGui extends GuiContainer
}
}
public void drawTooltip( int par2, int par3, int forceWidth, String Msg )
public void drawTooltip( int par2, int par3, int forceWidth, String message )
{
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
RenderHelper.disableStandardItemLighting();
GL11.glDisable( GL11.GL_LIGHTING );
GL11.glDisable( GL11.GL_DEPTH_TEST );
String[] var4 = Msg.split( "\n" );
String[] var4 = message.split( "\n" );
if( var4.length > 0 )
{
@@ -590,7 +590,7 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
protected boolean checkHotbarKeys( int p_146983_1_ )
protected boolean checkHotbarKeys( int keyCode )
{
Slot theSlot;
@@ -607,7 +607,7 @@ public abstract class AEBaseGui extends GuiContainer
{
for( int j = 0; j < 9; ++j )
{
if( p_146983_1_ == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode() )
if( keyCode == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode() )
{
final List<Slot> slots = this.getInventorySlots();
for( Slot s : slots )
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+6 -6
View File
@@ -26,6 +26,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import com.google.common.base.Joiner;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
@@ -33,8 +35,6 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import com.google.common.base.Joiner;
import appeng.api.AEApi;
import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack;
@@ -131,7 +131,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
@Override
public void drawScreen( int mouse_x, int mouse_y, float btn )
public void drawScreen( int mouseX, int mouseY, float btn )
{
this.updateCPUButtonText();
@@ -152,9 +152,9 @@ public class GuiCraftConfirm extends AEBaseGui
int minX = gx + 9 + x * 67;
int minY = gy + 22 + y * offY;
if( minX < mouse_x && minX + 67 > mouse_x )
if( minX < mouseX && minX + 67 > mouseX )
{
if( minY < mouse_y && minY + offY - 2 > mouse_y )
if( minY < mouseY && minY + offY - 2 > mouseY )
{
this.tooltip = z;
break;
@@ -170,7 +170,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
}
super.drawScreen( mouse_x, mouse_y, btn );
super.drawScreen( mouseX, mouseY, btn );
}
private void updateCPUButtonText()
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+6 -6
View File
@@ -25,14 +25,14 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import com.google.common.base.Joiner;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import com.google.common.base.Joiner;
import appeng.api.AEApi;
import appeng.api.config.SortDir;
import appeng.api.config.SortOrder;
@@ -122,7 +122,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
@Override
public void drawScreen( int mouse_x, int mouse_y, float btn )
public void drawScreen( int mouseX, int mouseY, float btn )
{
this.cancel.enabled = !this.visual.isEmpty();
@@ -140,9 +140,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
int minX = gx + 9 + x * 67;
int minY = gy + 22 + y * offY;
if( minX < mouse_x && minX + 67 > mouse_x )
if( minX < mouseX && minX + 67 > mouseX )
{
if( minY < mouse_y && minY + offY - 2 > mouse_y )
if( minY < mouseY && minY + offY - 2 > mouseY )
{
this.tooltip = z;
break;
@@ -158,7 +158,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
}
super.drawScreen( mouse_x, mouse_y, btn );
super.drawScreen( mouseX, mouseY, btn );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java
+4 -4
View File
@@ -89,7 +89,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
@Override
public void drawScreen( int mouse_x, int mouse_y, float btn )
public void drawScreen( int mouseX, int mouseY, float btn )
{
int x = 0;
int y = 0;
@@ -104,9 +104,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
int minX = gx + 14 + x * 31;
int minY = gy + 41 + y * 18;
if( minX < mouse_x && minX + 28 > mouse_x )
if( minX < mouseX && minX + 28 > mouseX )
{
if( minY < mouse_y && minY + 20 > mouse_y )
if( minY < mouseY && minY + 20 > mouseY )
{
this.tooltip = z;
break;
@@ -122,7 +122,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
}
super.drawScreen( mouse_x, mouse_y, btn );
super.drawScreen( mouseX, mouseY, btn );
}
@Override
src/main/java/appeng/client/gui/widgets/GuiNumberBox.java
+2 -2
View File
@@ -28,9 +28,9 @@ public class GuiNumberBox extends GuiTextField
final Class type;
public GuiNumberBox( FontRenderer p_i1032_1_, int p_i1032_2_, int p_i1032_3_, int p_i1032_4_, int p_i1032_5_, Class type )
public GuiNumberBox( FontRenderer fontRenderer, int x, int y, int width, int height, Class type )
{
super( p_i1032_1_, p_i1032_2_, p_i1032_3_, p_i1032_4_, p_i1032_5_ );
super( fontRenderer, x, y, width, height );
this.type = type;
}
src/main/java/appeng/client/gui/widgets/GuiProgressBar.java
+6 -6
View File
@@ -38,20 +38,20 @@ public class GuiProgressBar extends GuiButton implements ITooltip
private final String titleName;
private String fullMsg;
public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int _width, int _height, Direction dir )
public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int width, int height, Direction dir )
{
this( source, texture, posX, posY, u, y, _width, _height, dir, null );
this( source, texture, posX, posY, u, y, width, height, dir, null );
}
public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int _width, int _height, Direction dir, String title )
public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int width, int height, Direction dir, String title )
{
super( posX, posY, _width, "" );
super( posX, posY, width, "" );
this.source = source;
this.xPosition = posX;
this.yPosition = posY;
this.texture = new ResourceLocation( "appliedenergistics2", "textures/" + texture );
this.width = _width;
this.height = _height;
this.width = width;
this.height = height;
this.fill_u = u;
this.fill_v = y;
this.layout = dir;
src/main/java/appeng/client/render/BaseBlockRender.java
+2 -2
View File
@@ -70,10 +70,10 @@ public class BaseBlockRender
this( false, 20 );
}
public BaseBlockRender( boolean enableTESR, double tileEntitySpecialRendererRange )
public BaseBlockRender( boolean enableTESR, double renderDistance )
{
this.hasTESR = enableTESR;
this.renderDistance = tileEntitySpecialRendererRange;
this.renderDistance = renderDistance;
setOriMap();
}
src/main/java/appeng/client/render/BlockRenderInfo.java
+15 -15
View File
@@ -49,31 +49,31 @@ public class BlockRenderInfo
this.rendererInstance = inst;
}
public void updateIcons( FlippableIcon Bottom, FlippableIcon Top, FlippableIcon North, FlippableIcon South, FlippableIcon East, FlippableIcon West )
public void updateIcons( FlippableIcon bottom, FlippableIcon top, FlippableIcon north, FlippableIcon south, FlippableIcon east, FlippableIcon west )
{
this.topIcon = Top;
this.bottomIcon = Bottom;
this.southIcon = South;
this.northIcon = North;
this.eastIcon = East;
this.westIcon = West;
this.topIcon = top;
this.bottomIcon = bottom;
this.southIcon = south;
this.northIcon = north;
this.eastIcon = east;
this.westIcon = west;
}
public void setTemporaryRenderIcon( IIcon IIcon )
public void setTemporaryRenderIcon( IIcon icon )
{
if( IIcon == null )
if( icon == null )
{
this.useTmp = false;
}
else
{
this.useTmp = true;
this.tmpTopIcon.setOriginal( IIcon );
this.tmpBottomIcon.setOriginal( IIcon );
this.tmpSouthIcon.setOriginal( IIcon );
this.tmpNorthIcon.setOriginal( IIcon );
this.tmpEastIcon.setOriginal( IIcon );
this.tmpWestIcon.setOriginal( IIcon );
this.tmpTopIcon.setOriginal( icon );
this.tmpBottomIcon.setOriginal( icon );
this.tmpSouthIcon.setOriginal( icon );
this.tmpNorthIcon.setOriginal( icon );
this.tmpEastIcon.setOriginal( icon );
this.tmpWestIcon.setOriginal( icon );
}
}
src/main/java/appeng/client/render/BusRenderHelper.java
+10 -10
View File
@@ -22,6 +22,9 @@ package appeng.client.render;
import java.util.EnumSet;
import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
@@ -31,9 +34,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.api.parts.IBoxProvider;
@@ -374,16 +374,16 @@ public final class BusRenderHelper implements IPartRenderHelper
}
@Override
public void setTexture( IIcon Down, IIcon Up, IIcon North, IIcon South, IIcon West, IIcon East )
public void setTexture( IIcon down, IIcon up, IIcon north, IIcon south, IIcon west, IIcon east )
{
IIcon[] list = new IIcon[6];
list[0] = Down;
list[1] = Up;
list[2] = North;
list[3] = South;
list[4] = West;
list[5] = East;
list[0] = down;
list[1] = up;
list[2] = north;
list[3] = south;
list[4] = west;
list[5] = east;
for( AEBaseBlock baseBlock : this.maybeBaseBlock.asSet() )
{
src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java
+7 -7
View File
@@ -201,49 +201,49 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
return true;
}
public void renderCableAt( double Thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, double pull, boolean covered )
public void renderCableAt( double thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, double pull, boolean covered )
{
IIcon texture = null;
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.WEST, covered ) );
if( texture != null )
{
renderer.setRenderBounds( 0.0D, 0.5D - Thickness, 0.5D - Thickness, 0.5D - Thickness - pull, 0.5D + Thickness, 0.5D + Thickness );
renderer.setRenderBounds( 0.0D, 0.5D - thickness, 0.5D - thickness, 0.5D - thickness - pull, 0.5D + thickness, 0.5D + thickness );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.EAST, covered ) );
if( texture != null )
{
renderer.setRenderBounds( 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D - Thickness, 1.0D, 0.5D + Thickness, 0.5D + Thickness );
renderer.setRenderBounds( 0.5D + thickness + pull, 0.5D - thickness, 0.5D - thickness, 1.0D, 0.5D + thickness, 0.5D + thickness );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.NORTH, covered ) );
if( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.0D, 0.5D + Thickness, 0.5D + Thickness, 0.5D - Thickness - pull );
renderer.setRenderBounds( 0.5D - thickness, 0.5D - thickness, 0.0D, 0.5D + thickness, 0.5D + thickness, 0.5D - thickness - pull );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.SOUTH, covered ) );
if( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D + Thickness, 0.5D + Thickness, 1.0D );
renderer.setRenderBounds( 0.5D - thickness, 0.5D - thickness, 0.5D + thickness + pull, 0.5D + thickness, 0.5D + thickness, 1.0D );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.DOWN, covered ) );
if( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.0D, 0.5D - Thickness, 0.5D + Thickness, 0.5D - Thickness - pull, 0.5D + Thickness );
renderer.setRenderBounds( 0.5D - thickness, 0.0D, 0.5D - thickness, 0.5D + thickness, 0.5D - thickness - pull, 0.5D + thickness );
renderer.renderStandardBlock( block, x, y, z );
}
block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.UP, covered ) );
if( texture != null )
{
renderer.setRenderBounds( 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D + Thickness, 1.0D, 0.5D + Thickness );
renderer.setRenderBounds( 0.5D - thickness, 0.5D + thickness + pull, 0.5D - thickness, 0.5D + thickness, 1.0D, 0.5D + thickness );
renderer.renderStandardBlock( block, x, y, z );
}