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

Replaces all local variables regarding their naming conventions

Browse Source
This commit is contained in:
thatsIch
2015-05-08 23:34:24 +02:00
parent d8ac614a17
commit 513292cd08
18 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
+10 -10
View File
@@ -24,6 +24,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.concurrent.Future;
import com.google.common.collect.ImmutableSet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
@@ -32,8 +34,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.world.World;
import com.google.common.collect.ImmutableSet;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.SecurityPermissions;
@@ -323,27 +323,27 @@ public class ContainerCraftConfirm extends AEBaseContainer
public void startJob()
{
GuiBridge OriginalGui = null;
GuiBridge originalGui = null;
IActionHost ah = this.getActionHost();
if( ah instanceof WirelessTerminalGuiObject )
{
OriginalGui = GuiBridge.GUI_WIRELESS_TERM;
originalGui = GuiBridge.GUI_WIRELESS_TERM;
}
if( ah instanceof PartTerminal )
{
OriginalGui = GuiBridge.GUI_ME;
originalGui = GuiBridge.GUI_ME;
}
if( ah instanceof PartCraftingTerminal )
{
OriginalGui = GuiBridge.GUI_CRAFTING_TERMINAL;
originalGui = GuiBridge.GUI_CRAFTING_TERMINAL;
}
if( ah instanceof PartPatternTerminal )
{
OriginalGui = GuiBridge.GUI_PATTERN_TERMINAL;
originalGui = GuiBridge.GUI_PATTERN_TERMINAL;
}
if( this.result != null && !this.simulation )
@@ -351,12 +351,12 @@ public class ContainerCraftConfirm extends AEBaseContainer
ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
ICraftingLink g = cc.submitJob( this.result, null, this.selectedCpu == -1 ? null : this.cpus.get( this.selectedCpu ).cpu, true, this.getActionSrc() );
this.autoStart = false;
if( g != null && OriginalGui != null && this.openContext != null )
if( g != null && originalGui != null && this.openContext != null )
{
NetworkHandler.instance.sendTo( new PacketSwitchGuis( OriginalGui ), (EntityPlayerMP) this.invPlayer.player );
NetworkHandler.instance.sendTo( new PacketSwitchGuis( originalGui ), (EntityPlayerMP) this.invPlayer.player );
TileEntity te = this.openContext.getTile();
Platform.openGUI( this.invPlayer.player, te, this.openContext.side, OriginalGui );
Platform.openGUI( this.invPlayer.player, te, this.openContext.side, originalGui );
}
}
}
src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
+2 -2
View File
@@ -240,9 +240,9 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
this.updatePowerStatus();
boolean oldCanAccessViewCells = this.canAccessViewCells;
boolean oldAccessible = this.canAccessViewCells;
this.canAccessViewCells = this.hasAccess( SecurityPermissions.BUILD, false );
if( this.canAccessViewCells != oldCanAccessViewCells )
if( this.canAccessViewCells != oldAccessible )
{
for( int y = 0; y < 5; y++ )
{