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

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
@@ -53,9 +53,9 @@ public class GuiCellWorkbench extends GuiUpgradeable
private GuiImgButton partition;
private GuiToggleButton copyMode;
public GuiCellWorkbench( final InventoryPlayer inventoryPlayer, final TileCellWorkbench te )
public GuiCellWorkbench( final PlayerInventory PlayerInventory, final TileCellWorkbench te )
{
super( new ContainerCellWorkbench( inventoryPlayer, te ) );
super( new ContainerCellWorkbench( PlayerInventory, te ) );
this.workbench = (ContainerCellWorkbench) this.inventorySlots;
this.ySize = 251;
}
src/main/java/appeng/client/gui/implementations/GuiChest.java
+3 -3
View File
@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
@@ -39,9 +39,9 @@ public class GuiChest extends AEBaseGui
private GuiTabButton priority;
public GuiChest( final InventoryPlayer inventoryPlayer, final TileChest te )
public GuiChest( final PlayerInventory PlayerInventory, final TileChest te )
{
super( new ContainerChest( inventoryPlayer, te ) );
super( new ContainerChest( PlayerInventory, te ) );
this.ySize = 166;
}
src/main/java/appeng/client/gui/implementations/GuiCondenser.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.Settings;
import appeng.client.gui.AEBaseGui;
@@ -45,9 +45,9 @@ public class GuiCondenser extends AEBaseGui
private GuiProgressBar pb;
private GuiImgButton mode;
public GuiCondenser( final InventoryPlayer inventoryPlayer, final TileCondenser te )
public GuiCondenser( final PlayerInventory PlayerInventory, final TileCondenser te )
{
super( new ContainerCondenser( inventoryPlayer, te ) );
super( new ContainerCondenser( PlayerInventory, te ) );
this.cvc = (ContainerCondenser) this.inventorySlots;
this.ySize = 197;
}
src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java
+3 -3
View File
@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
@@ -66,9 +66,9 @@ public class GuiCraftAmount extends AEBaseGui
private GuiBridge originalGui;
@Reflected
public GuiCraftAmount( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiCraftAmount( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
super( new ContainerCraftAmount( inventoryPlayer, te ) );
super( new ContainerCraftAmount( PlayerInventory, te ) );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+3 -3
View File
@@ -31,7 +31,7 @@ import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
@@ -74,9 +74,9 @@ public class GuiCraftConfirm extends AEBaseGui
private GuiButton selectCPU;
private int tooltip = -1;
public GuiCraftConfirm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiCraftConfirm( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
super( new ContainerCraftConfirm( inventoryPlayer, te ) );
super( new ContainerCraftConfirm( PlayerInventory, te ) );
this.xSize = 238;
this.ySize = 206;
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+3 -3
View File
@@ -31,7 +31,7 @@ import org.apache.commons.lang3.time.DurationFormatUtils;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
@@ -92,9 +92,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
private GuiButton cancel;
private int tooltip = -1;
public GuiCraftingCPU( final InventoryPlayer inventoryPlayer, final Object te )
public GuiCraftingCPU( final PlayerInventory PlayerInventory, final Object te )
{
this( new ContainerCraftingCPU( inventoryPlayer, te ) );
this( new ContainerCraftingCPU( PlayerInventory, te ) );
}
protected GuiCraftingCPU( final ContainerCraftingCPU container )
src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java
+3 -3
View File
@@ -28,7 +28,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
@@ -59,9 +59,9 @@ public class GuiCraftingStatus extends GuiCraftingCPU
private GuiBridge originalGui;
private ItemStack myIcon = ItemStack.EMPTY;
public GuiCraftingStatus( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiCraftingStatus( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
super( new ContainerCraftingStatus( inventoryPlayer, te ) );
super( new ContainerCraftingStatus( PlayerInventory, te ) );
this.status = (ContainerCraftingStatus) this.inventorySlots;
final Object target = this.status.getTarget();
src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java
+3 -3
View File
@@ -20,7 +20,7 @@ package appeng.client.gui.implementations;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
@@ -41,9 +41,9 @@ public class GuiCraftingTerm extends GuiMEMonitorable
private GuiImgButton clearBtn;
public GuiCraftingTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiCraftingTerm( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
super( inventoryPlayer, te, new ContainerCraftingTerm( inventoryPlayer, te ) );
super( PlayerInventory, te, new ContainerCraftingTerm( PlayerInventory, te ) );
this.setReservedSpace( 73 );
}
src/main/java/appeng/client/gui/implementations/GuiDrive.java
+3 -3
View File
@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
@@ -39,9 +39,9 @@ public class GuiDrive extends AEBaseGui
private GuiTabButton priority;
public GuiDrive( final InventoryPlayer inventoryPlayer, final TileDrive te )
public GuiDrive( final PlayerInventory PlayerInventory, final TileDrive te )
{
super( new ContainerDrive( inventoryPlayer, te ) );
super( new ContainerDrive( PlayerInventory, te ) );
this.ySize = 199;
}
src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.FuzzyMode;
import appeng.api.config.Settings;
@@ -46,9 +46,9 @@ public class GuiFormationPlane extends GuiUpgradeable
private GuiTabButton priority;
private GuiImgButton placeMode;
public GuiFormationPlane( final InventoryPlayer inventoryPlayer, final PartFormationPlane te )
public GuiFormationPlane( final PlayerInventory PlayerInventory, final PartFormationPlane te )
{
super( new ContainerFormationPlane( inventoryPlayer, te ) );
super( new ContainerFormationPlane( PlayerInventory, te ) );
this.ySize = 251;
}
src/main/java/appeng/client/gui/implementations/GuiGrinder.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerGrinder;
@@ -30,9 +30,9 @@ import appeng.tile.grindstone.TileGrinder;
public class GuiGrinder extends AEBaseGui
{
public GuiGrinder( final InventoryPlayer inventoryPlayer, final TileGrinder te )
public GuiGrinder( final PlayerInventory PlayerInventory, final TileGrinder te )
{
super( new ContainerGrinder( inventoryPlayer, te ) );
super( new ContainerGrinder( PlayerInventory, te ) );
this.ySize = 176;
}
src/main/java/appeng/client/gui/implementations/GuiIOPort.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.AEApi;
import appeng.api.config.FullnessMode;
@@ -46,9 +46,9 @@ public class GuiIOPort extends GuiUpgradeable
private GuiImgButton fullMode;
private GuiImgButton operationMode;
public GuiIOPort( final InventoryPlayer inventoryPlayer, final TileIOPort te )
public GuiIOPort( final PlayerInventory PlayerInventory, final TileIOPort te )
{
super( new ContainerIOPort( inventoryPlayer, te ) );
super( new ContainerIOPort( PlayerInventory, te ) );
this.ySize = 166;
}
src/main/java/appeng/client/gui/implementations/GuiInscriber.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiProgressBar;
@@ -36,9 +36,9 @@ public class GuiInscriber extends AEBaseGui
private final ContainerInscriber cvc;
private GuiProgressBar pb;
public GuiInscriber( final InventoryPlayer inventoryPlayer, final TileInscriber te )
public GuiInscriber( final PlayerInventory PlayerInventory, final TileInscriber te )
{
super( new ContainerInscriber( inventoryPlayer, te ) );
super( new ContainerInscriber( PlayerInventory, te ) );
this.cvc = (ContainerInscriber) this.inventorySlots;
this.ySize = 176;
this.xSize = this.hasToolbox() ? 246 : 211;
src/main/java/appeng/client/gui/implementations/GuiInterface.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.Settings;
import appeng.api.config.YesNo;
@@ -47,9 +47,9 @@ public class GuiInterface extends GuiUpgradeable
private GuiImgButton BlockMode;
private GuiToggleButton interfaceMode;
public GuiInterface( final InventoryPlayer inventoryPlayer, final IInterfaceHost te )
public GuiInterface( final PlayerInventory PlayerInventory, final IInterfaceHost te )
{
super( new ContainerInterface( inventoryPlayer, te ) );
super( new ContainerInterface( PlayerInventory, te ) );
this.ySize = 211;
}
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+7 -7
View File
@@ -32,10 +32,10 @@ import java.util.WeakHashMap;
import com.google.common.collect.HashMultimap;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.NBTTagList;
import appeng.api.AEApi;
@@ -69,9 +69,9 @@ public class GuiInterfaceTerminal extends AEBaseGui
private boolean refreshList = false;
private MEGuiTextField searchField;
public GuiInterfaceTerminal( final InventoryPlayer inventoryPlayer, final PartInterfaceTerminal te )
public GuiInterfaceTerminal( final PlayerInventory PlayerInventory, final PartInterfaceTerminal te )
{
super( new ContainerInterfaceTerminal( inventoryPlayer, te ) );
super( new ContainerInterfaceTerminal( PlayerInventory, te ) );
final GuiScrollbar scrollbar = new GuiScrollbar();
this.setScrollBar( scrollbar );
@@ -209,7 +209,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
}
public void postUpdate( final NBTTagCompound in )
public void postUpdate( final CompoundNBT in )
{
if( in.getBoolean( "clear" ) )
{
@@ -225,7 +225,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
try
{
final long id = Long.parseLong( key.substring( 1 ), Character.MAX_RADIX );
final NBTTagCompound invData = in.getCompoundTag( key );
final CompoundNBT invData = in.getCompoundTag( key );
final ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) );
for( int x = 0; x < current.getInventory().getSlots(); x++ )
@@ -331,7 +331,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
return false;
}
final NBTTagCompound encodedValue = itemStack.getTagCompound();
final CompoundNBT encodedValue = itemStack.getTagCompound();
if( encodedValue == null )
{
src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.FuzzyMode;
import appeng.api.config.LevelType;
@@ -61,9 +61,9 @@ public class GuiLevelEmitter extends GuiUpgradeable
private GuiImgButton levelMode;
private GuiImgButton craftingMode;
public GuiLevelEmitter( final InventoryPlayer inventoryPlayer, final PartLevelEmitter te )
public GuiLevelEmitter( final PlayerInventory PlayerInventory, final PartLevelEmitter te )
{
super( new ContainerLevelEmitter( inventoryPlayer, te ) );
super( new ContainerLevelEmitter( PlayerInventory, te ) );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiMAC.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.RedstoneMode;
import appeng.api.config.Settings;
@@ -37,9 +37,9 @@ public class GuiMAC extends GuiUpgradeable
private final ContainerMAC container;
private GuiProgressBar pb;
public GuiMAC( final InventoryPlayer inventoryPlayer, final TileMolecularAssembler te )
public GuiMAC( final PlayerInventory PlayerInventory, final TileMolecularAssembler te )
{
super( new ContainerMAC( inventoryPlayer, te ) );
super( new ContainerMAC( PlayerInventory, te ) );
this.ySize = 197;
this.container = (ContainerMAC) this.inventorySlots;
}
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+4 -4
View File
@@ -26,7 +26,7 @@ import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
@@ -101,12 +101,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
private int currentMouseX = 0;
private int currentMouseY = 0;
public GuiMEMonitorable( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiMEMonitorable( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
this( inventoryPlayer, te, new ContainerMEMonitorable( inventoryPlayer, te ) );
this( PlayerInventory, te, new ContainerMEMonitorable( PlayerInventory, te ) );
}
public GuiMEMonitorable( final InventoryPlayer inventoryPlayer, final ITerminalHost te, final ContainerMEMonitorable c )
public GuiMEMonitorable( final PlayerInventory PlayerInventory, final ITerminalHost te, final ContainerMEMonitorable c )
{
super( c );
src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.implementations.guiobjects.IPortableCell;
import appeng.container.implementations.ContainerMEPortableCell;
@@ -28,9 +28,9 @@ import appeng.container.implementations.ContainerMEPortableCell;
public class GuiMEPortableCell extends GuiMEMonitorable
{
public GuiMEPortableCell( final InventoryPlayer inventoryPlayer, final IPortableCell te )
public GuiMEPortableCell( final PlayerInventory PlayerInventory, final IPortableCell te )
{
super( inventoryPlayer, te, new ContainerMEPortableCell( inventoryPlayer, te ) );
super( PlayerInventory, te, new ContainerMEPortableCell( PlayerInventory, te ) );
}
int defaultGetMaxRows()
src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java
+3 -3
View File
@@ -27,7 +27,7 @@ import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
@@ -57,9 +57,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
private GuiImgButton units;
private int tooltip = -1;
public GuiNetworkStatus( final InventoryPlayer inventoryPlayer, final INetworkTool te )
public GuiNetworkStatus( final PlayerInventory PlayerInventory, final INetworkTool te )
{
super( new ContainerNetworkStatus( inventoryPlayer, te ) );
super( new ContainerNetworkStatus( PlayerInventory, te ) );
final GuiScrollbar scrollbar = new GuiScrollbar();
this.setScrollBar( scrollbar );
src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java
+3 -3
View File
@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.implementations.guiobjects.INetworkTool;
import appeng.client.gui.AEBaseGui;
@@ -39,9 +39,9 @@ public class GuiNetworkTool extends AEBaseGui
private GuiToggleButton tFacades;
public GuiNetworkTool( final InventoryPlayer inventoryPlayer, final INetworkTool te )
public GuiNetworkTool( final PlayerInventory PlayerInventory, final INetworkTool te )
{
super( new ContainerNetworkTool( inventoryPlayer, te ) );
super( new ContainerNetworkTool( PlayerInventory, te ) );
this.ySize = 166;
}
src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java
+4 -4
View File
@@ -22,8 +22,8 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.block.Blocks;
import net.minecraft.item.ItemStack;
import appeng.api.config.ActionItems;
@@ -61,9 +61,9 @@ public class GuiPatternTerm extends GuiMEMonitorable
private GuiImgButton encodeBtn;
private GuiImgButton clearBtn;
public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiPatternTerm( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
super( inventoryPlayer, te, new ContainerPatternTerm( inventoryPlayer, te ) );
super( PlayerInventory, te, new ContainerPatternTerm( PlayerInventory, te ) );
this.container = (ContainerPatternTerm) this.inventorySlots;
this.setReservedSpace( 81 );
}
src/main/java/appeng/client/gui/implementations/GuiPriority.java
+3 -3
View File
@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import appeng.client.gui.AEBaseGui;
@@ -56,9 +56,9 @@ public class GuiPriority extends AEBaseGui
private GuiBridge OriginalGui;
public GuiPriority( final InventoryPlayer inventoryPlayer, final IPriorityHost te )
public GuiPriority( final PlayerInventory PlayerInventory, final IPriorityHost te )
{
super( new ContainerPriority( inventoryPlayer, te ) );
super( new ContainerPriority( PlayerInventory, te ) );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiQNB.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerQNB;
@@ -30,9 +30,9 @@ import appeng.tile.qnb.TileQuantumBridge;
public class GuiQNB extends AEBaseGui
{
public GuiQNB( final InventoryPlayer inventoryPlayer, final TileQuantumBridge te )
public GuiQNB( final PlayerInventory PlayerInventory, final TileQuantumBridge te )
{
super( new ContainerQNB( inventoryPlayer, te ) );
super( new ContainerQNB( PlayerInventory, te ) );
this.ySize = 166;
}
src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java
+3 -3
View File
@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerQuartzKnife;
@@ -38,9 +38,9 @@ public class GuiQuartzKnife extends AEBaseGui
private GuiTextField name;
public GuiQuartzKnife( final InventoryPlayer inventoryPlayer, final QuartzKnifeObj te )
public GuiQuartzKnife( final PlayerInventory PlayerInventory, final QuartzKnifeObj te )
{
super( new ContainerQuartzKnife( inventoryPlayer, te ) );
super( new ContainerQuartzKnife( PlayerInventory, te ) );
this.ySize = 184;
}
src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java
+8 -8
View File
@@ -21,7 +21,7 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.SecurityPermissions;
import appeng.api.config.SortOrder;
@@ -43,9 +43,9 @@ public class GuiSecurityStation extends GuiMEMonitorable
private GuiToggleButton build;
private GuiToggleButton security;
public GuiSecurityStation( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiSecurityStation( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
super( inventoryPlayer, te, new ContainerSecurityStation( inventoryPlayer, te ) );
super( PlayerInventory, te, new ContainerSecurityStation( PlayerInventory, te ) );
this.setCustomSortOrder( false );
this.setReservedSpace( 33 );
@@ -102,19 +102,19 @@ public class GuiSecurityStation extends GuiMEMonitorable
final int top = this.guiTop + this.ySize - 116;
this.buttonList.add( this.inject = new GuiToggleButton( this.guiLeft + 56, top, 11 * 16, 12 * 16, SecurityPermissions.INJECT
.getUnlocalizedName(), SecurityPermissions.INJECT.getUnlocalizedTip() ) );
.getTranslationKey(), SecurityPermissions.INJECT.getUnlocalizedTip() ) );
this.buttonList.add( this.extract = new GuiToggleButton( this.guiLeft + 56 + 18, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT
.getUnlocalizedName(), SecurityPermissions.EXTRACT.getUnlocalizedTip() ) );
.getTranslationKey(), SecurityPermissions.EXTRACT.getUnlocalizedTip() ) );
this.buttonList.add( this.craft = new GuiToggleButton( this.guiLeft + 56 + 18 * 2, top, 11 * 16 + 2, 12 * 16 + 2, SecurityPermissions.CRAFT
.getUnlocalizedName(), SecurityPermissions.CRAFT.getUnlocalizedTip() ) );
.getTranslationKey(), SecurityPermissions.CRAFT.getUnlocalizedTip() ) );
this.buttonList.add( this.build = new GuiToggleButton( this.guiLeft + 56 + 18 * 3, top, 11 * 16 + 3, 12 * 16 + 3, SecurityPermissions.BUILD
.getUnlocalizedName(), SecurityPermissions.BUILD.getUnlocalizedTip() ) );
.getTranslationKey(), SecurityPermissions.BUILD.getUnlocalizedTip() ) );
this.buttonList.add( this.security = new GuiToggleButton( this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY
.getUnlocalizedName(), SecurityPermissions.SECURITY.getUnlocalizedTip() ) );
.getTranslationKey(), SecurityPermissions.SECURITY.getUnlocalizedTip() ) );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiSkyChest.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerSkyChest;
@@ -31,9 +31,9 @@ import appeng.tile.storage.TileSkyChest;
public class GuiSkyChest extends AEBaseGui
{
public GuiSkyChest( final InventoryPlayer inventoryPlayer, final TileSkyChest te )
public GuiSkyChest( final PlayerInventory PlayerInventory, final TileSkyChest te )
{
super( new ContainerSkyChest( inventoryPlayer, te ) );
super( new ContainerSkyChest( PlayerInventory, te ) );
this.ySize = 195;
}
src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.Settings;
import appeng.client.gui.AEBaseGui;
@@ -42,9 +42,9 @@ public class GuiSpatialIOPort extends AEBaseGui
private final ContainerSpatialIOPort container;
private GuiImgButton units;
public GuiSpatialIOPort( final InventoryPlayer inventoryPlayer, final TileSpatialIOPort te )
public GuiSpatialIOPort( final PlayerInventory PlayerInventory, final TileSpatialIOPort te )
{
super( new ContainerSpatialIOPort( inventoryPlayer, te ) );
super( new ContainerSpatialIOPort( PlayerInventory, te ) );
this.ySize = 199;
this.container = (ContainerSpatialIOPort) this.inventorySlots;
}
src/main/java/appeng/client/gui/implementations/GuiStorageBus.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.AccessRestriction;
import appeng.api.config.ActionItems;
@@ -53,9 +53,9 @@ public class GuiStorageBus extends GuiUpgradeable
private GuiImgButton partition;
private GuiImgButton clear;
public GuiStorageBus( final InventoryPlayer inventoryPlayer, final PartStorageBus te )
public GuiStorageBus( final PlayerInventory PlayerInventory, final PartStorageBus te )
{
super( new ContainerStorageBus( inventoryPlayer, te ) );
super( new ContainerStorageBus( PlayerInventory, te ) );
this.ySize = 251;
}
src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.FuzzyMode;
import appeng.api.config.RedstoneMode;
@@ -54,9 +54,9 @@ public class GuiUpgradeable extends AEBaseGui
protected GuiImgButton craftMode;
protected GuiImgButton schedulingMode;
public GuiUpgradeable( final InventoryPlayer inventoryPlayer, final IUpgradeableHost te )
public GuiUpgradeable( final PlayerInventory PlayerInventory, final IUpgradeableHost te )
{
this( new ContainerUpgradeable( inventoryPlayer, te ) );
this( new ContainerUpgradeable( PlayerInventory, te ) );
}
public GuiUpgradeable( final ContainerUpgradeable te )
src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java
+3 -3
View File
@@ -20,7 +20,7 @@ package appeng.client.gui.implementations;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiProgressBar;
@@ -36,9 +36,9 @@ public class GuiVibrationChamber extends AEBaseGui
private final ContainerVibrationChamber cvc;
private GuiProgressBar pb;
public GuiVibrationChamber( final InventoryPlayer inventoryPlayer, final TileVibrationChamber te )
public GuiVibrationChamber( final PlayerInventory PlayerInventory, final TileVibrationChamber te )
{
super( new ContainerVibrationChamber( inventoryPlayer, te ) );
super( new ContainerVibrationChamber( PlayerInventory, te ) );
this.cvc = (ContainerVibrationChamber) this.inventorySlots;
this.ySize = 166;
}
src/main/java/appeng/client/gui/implementations/GuiWireless.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.Settings;
import appeng.client.gui.AEBaseGui;
@@ -41,9 +41,9 @@ public class GuiWireless extends AEBaseGui
private GuiImgButton units;
public GuiWireless( final InventoryPlayer inventoryPlayer, final TileWireless te )
public GuiWireless( final PlayerInventory PlayerInventory, final TileWireless te )
{
super( new ContainerWireless( inventoryPlayer, te ) );
super( new ContainerWireless( PlayerInventory, te ) );
this.ySize = 166;
}
src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.implementations.guiobjects.IPortableCell;
@@ -27,9 +27,9 @@ import appeng.api.implementations.guiobjects.IPortableCell;
public class GuiWirelessTerm extends GuiMEPortableCell
{
public GuiWirelessTerm( final InventoryPlayer inventoryPlayer, final IPortableCell te )
public GuiWirelessTerm( final PlayerInventory PlayerInventory, final IPortableCell te )
{
super( inventoryPlayer, te );
super( PlayerInventory, te );
}
@Override