Most of the 1.8 Port.

This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
@@ -21,13 +21,13 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import org.lwjgl.input.Mouse;
import appeng.api.config.ActionItems;
import appeng.api.config.CopyMode;
import appeng.api.config.FuzzyMode;
@@ -19,9 +19,10 @@
package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.container.implementations.ContainerChest;
@@ -44,7 +45,7 @@ public class GuiChest extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton par1GuiButton )
protected void actionPerformed( GuiButton par1GuiButton ) throws IOException
{
super.actionPerformed( par1GuiButton );
@@ -19,11 +19,13 @@
package appeng.client.gui.implementations;
import org.lwjgl.input.Mouse;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.Settings;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiImgButton;
@@ -51,7 +53,7 @@ public class GuiCondenser extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -19,10 +19,11 @@
package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IParts;
@@ -175,7 +176,7 @@ public class GuiCraftAmount extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key )
protected void keyTyped( char character, int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -225,7 +226,7 @@ public class GuiCraftAmount extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -26,15 +26,13 @@ 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;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import appeng.api.AEApi;
import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack;
@@ -54,6 +52,8 @@ import appeng.parts.reporting.PartPatternTerminal;
import appeng.parts.reporting.PartTerminal;
import appeng.util.Platform;
import com.google.common.base.Joiner;
public class GuiCraftConfirm extends AEBaseGui
{
@@ -530,7 +530,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key )
protected void keyTyped( char character, int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -543,7 +543,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -26,15 +26,13 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Joiner;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.lwjgl.opengl.GL11;
import appeng.api.AEApi;
import appeng.api.config.SortDir;
import appeng.api.config.SortOrder;
@@ -54,6 +52,8 @@ import appeng.core.sync.packets.PacketValueConfig;
import appeng.util.Platform;
import appeng.util.ReadableNumberConverter;
import com.google.common.base.Joiner;
public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{
@@ -115,7 +115,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -25,12 +25,12 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import org.lwjgl.input.Mouse;
import appeng.api.AEApi;
import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IParts;
@@ -107,7 +107,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -23,7 +23,6 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import appeng.api.config.ActionItems;
import appeng.api.config.Settings;
import appeng.api.storage.ITerminalHost;
@@ -19,9 +19,10 @@
package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.container.implementations.ContainerDrive;
@@ -44,7 +45,7 @@ public class GuiDrive extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton par1GuiButton )
protected void actionPerformed( GuiButton par1GuiButton ) throws IOException
{
super.actionPerformed( par1GuiButton );
@@ -19,11 +19,13 @@
package appeng.client.gui.implementations;
import org.lwjgl.input.Mouse;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.FuzzyMode;
import appeng.api.config.Settings;
import appeng.api.config.YesNo;
@@ -86,7 +88,7 @@ public class GuiFormationPlane extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -20,7 +20,6 @@ package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerGrinder;
import appeng.core.localization.GuiText;
@@ -19,12 +19,14 @@
package appeng.client.gui.implementations;
import org.lwjgl.input.Mouse;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import org.lwjgl.input.Mouse;
import appeng.api.AEApi;
import appeng.api.config.FullnessMode;
import appeng.api.config.OperationMode;
@@ -110,7 +112,7 @@ public class GuiIOPort extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -20,7 +20,6 @@ package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiProgressBar;
import appeng.client.gui.widgets.GuiProgressBar.Direction;
@@ -19,11 +19,13 @@
package appeng.client.gui.implementations;
import org.lwjgl.input.Mouse;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.Settings;
import appeng.api.config.YesNo;
import appeng.client.gui.widgets.GuiImgButton;
@@ -93,7 +95,7 @@ public class GuiInterface extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -19,6 +19,7 @@
package appeng.client.gui.implementations;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -28,15 +29,13 @@ import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import com.google.common.collect.HashMultimap;
import org.lwjgl.opengl.GL11;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import org.lwjgl.opengl.GL11;
import appeng.api.AEApi;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiScrollbar;
@@ -48,6 +47,8 @@ import appeng.core.localization.GuiText;
import appeng.parts.reporting.PartMonitor;
import appeng.util.Platform;
import com.google.common.collect.HashMultimap;
public class GuiInterfaceTerminal extends AEBaseGui
{
@@ -142,7 +143,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
@Override
protected void mouseClicked( int xCoord, int yCoord, int btn )
protected void mouseClicked( int xCoord, int yCoord, int btn ) throws IOException
{
this.searchField.mouseClicked( xCoord, yCoord, btn );
@@ -185,7 +186,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key )
protected void keyTyped( char character, int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -213,7 +214,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.refreshList = true;
}
for( Object oKey : in.func_150296_c() )
for( Object oKey : in.getKeySet() )
{
String key = (String) oKey;
if( key.startsWith( "=" ) )
@@ -21,11 +21,11 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.FuzzyMode;
import appeng.api.config.LevelType;
import appeng.api.config.RedstoneMode;
@@ -167,7 +167,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -238,7 +238,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
@Override
protected void keyTyped( char character, int key )
protected void keyTyped( char character, int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -20,7 +20,6 @@ package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.api.config.RedstoneMode;
import appeng.api.config.Settings;
import appeng.client.gui.widgets.GuiImgButton;
@@ -22,14 +22,14 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import java.util.List;
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.inventory.Slot;
import net.minecraft.item.ItemStack;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import appeng.api.config.SearchBoxMode;
import appeng.api.config.Settings;
import appeng.api.config.TerminalStyle;
@@ -362,7 +362,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
@Override
protected void mouseClicked( int xCoord, int yCoord, int btn )
protected void mouseClicked( int xCoord, int yCoord, int btn ) throws IOException
{
Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
@@ -457,7 +457,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
@Override
protected void keyTyped( char character, int key )
protected void keyTyped( char character, int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -20,7 +20,6 @@ package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.api.implementations.guiobjects.IPortableCell;
import appeng.container.implementations.ContainerMEPortableCell;
@@ -19,16 +19,17 @@
package appeng.client.gui.implementations;
import java.io.IOException;
import java.util.List;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
import appeng.api.config.SortOrder;
@@ -66,7 +67,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -23,7 +23,6 @@ import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.api.implementations.guiobjects.INetworkTool;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiToggleButton;
@@ -46,7 +45,7 @@ public class GuiNetworkTool extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -25,7 +25,6 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import appeng.api.config.ActionItems;
import appeng.api.config.Settings;
import appeng.api.storage.ITerminalHost;
@@ -24,7 +24,6 @@ import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.api.definitions.IDefinitions;
@@ -185,7 +184,7 @@ public class GuiPriority extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -245,7 +244,7 @@ public class GuiPriority extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key )
protected void keyTyped( char character, int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -20,7 +20,6 @@ package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerQNB;
import appeng.core.localization.GuiText;
@@ -23,7 +23,6 @@ import java.io.IOException;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerQuartzKnife;
import appeng.core.AELog;
@@ -49,7 +48,7 @@ public class GuiQuartzKnife extends AEBaseGui
{
super.initGui();
this.name = new GuiTextField( this.fontRendererObj, this.guiLeft + 24, this.guiTop + 32, 79, this.fontRendererObj.FONT_HEIGHT );
this.name = new GuiTextField( 0,this.fontRendererObj, this.guiLeft + 24, this.guiTop + 32, 79, this.fontRendererObj.FONT_HEIGHT );
this.name.setEnableBackgroundDrawing( false );
this.name.setMaxStringLength( 32 );
this.name.setTextColor( 0xFFFFFF );
@@ -73,7 +72,7 @@ public class GuiQuartzKnife extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key )
protected void keyTyped( char character, int key ) throws IOException
{
if( this.name.textboxKeyTyped( character, key ) )
{
@@ -22,7 +22,6 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.api.config.SecurityPermissions;
import appeng.api.config.SortOrder;
import appeng.api.storage.ITerminalHost;
@@ -20,7 +20,6 @@ package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.container.implementations.ContainerSkyChest;
import appeng.core.localization.GuiText;
@@ -19,11 +19,13 @@
package appeng.client.gui.implementations;
import org.lwjgl.input.Mouse;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.Settings;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiImgButton;
@@ -48,7 +50,7 @@ public class GuiSpatialIOPort extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -21,11 +21,11 @@ package appeng.client.gui.implementations;
import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.AccessRestriction;
import appeng.api.config.ActionItems;
import appeng.api.config.FuzzyMode;
@@ -106,7 +106,7 @@ public class GuiStorageBus extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -19,11 +19,13 @@
package appeng.client.gui.implementations;
import org.lwjgl.input.Mouse;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.FuzzyMode;
import appeng.api.config.RedstoneMode;
import appeng.api.config.Settings;
@@ -158,7 +160,7 @@ public class GuiUpgradeable extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -19,10 +19,10 @@
package appeng.client.gui.implementations;
import org.lwjgl.opengl.GL11;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiProgressBar;
import appeng.client.gui.widgets.GuiProgressBar.Direction;
@@ -19,11 +19,13 @@
package appeng.client.gui.implementations;
import org.lwjgl.input.Mouse;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Mouse;
import appeng.api.config.Settings;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiImgButton;
@@ -46,7 +48,7 @@ public class GuiWireless extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -20,7 +20,6 @@ package appeng.client.gui.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import appeng.api.implementations.guiobjects.IPortableCell;