mirror of
https://github.com/GTNewHorizons/WirelessCraftingTerminal.git
synced 2026-11-18 03:15:15 +00:00
more refactoring
This commit is contained in:
1 parent
e88eb21187
commit
b8b403a31b
12 files changed
+23
-23
No files matched your search
@@ -23,7 +23,7 @@ import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum;
|
||||
import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal;
|
||||
|
||||
|
||||
public class GuiCraftAmount extends AEBaseGui
|
||||
public class GuiCraftAmount extends WCTBaseGui
|
||||
{
|
||||
private GuiNumberBox amountToCraft;
|
||||
private GuiTabButton originalGuiBtn;
|
||||
|
||||
@@ -31,7 +31,7 @@ import appeng.core.localization.GuiText;
|
||||
import appeng.util.Platform;
|
||||
|
||||
|
||||
public class GuiCraftConfirm extends AEBaseGui
|
||||
public class GuiCraftConfirm extends WCTBaseGui
|
||||
{
|
||||
|
||||
private final ContainerCraftConfirm ccc;
|
||||
|
||||
@@ -34,7 +34,7 @@ import appeng.util.Platform;
|
||||
import appeng.util.ReadableNumberConverter;
|
||||
|
||||
|
||||
public class GuiCraftingCPU extends AEBaseGui implements ISortSource
|
||||
public class GuiCraftingCPU extends WCTBaseGui implements ISortSource
|
||||
{
|
||||
private static final int GUI_HEIGHT = 184;
|
||||
private static final int GUI_WIDTH = 238;
|
||||
|
||||
+2
-2
@@ -50,7 +50,7 @@ import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiScrollbar;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTabButton;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTrashButton;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.MEGuiTextField;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.AppEngRenderItem;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.InternalSlotME;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.SlotDisconnected;
|
||||
@@ -99,7 +99,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo
|
||||
private final List<InternalSlotME> meSlots = new LinkedList<InternalSlotME>();
|
||||
// drag y
|
||||
private final Set<Slot> drag_click = new HashSet<Slot>();
|
||||
private final AppEngRenderItem aeRenderItem = new AppEngRenderItem();
|
||||
private final WCTRenderItem aeRenderItem = new WCTRenderItem();
|
||||
private GuiScrollbar scrollBar = null;
|
||||
private boolean disableShiftClick = false;
|
||||
private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
|
||||
|
||||
+5
-5
@@ -32,7 +32,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiScrollbar;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.AppEngRenderItem;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.InternalSlotME;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.SlotDisconnected;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.SlotME;
|
||||
@@ -60,13 +60,13 @@ import appeng.container.slot.SlotRestrictedInput;
|
||||
import appeng.helpers.InventoryAction;
|
||||
|
||||
|
||||
public abstract class AEBaseGui extends GuiContainer
|
||||
public abstract class WCTBaseGui extends GuiContainer
|
||||
{
|
||||
private static boolean switchingGuis;
|
||||
private final List<InternalSlotME> meSlots = new LinkedList<InternalSlotME>();
|
||||
// drag y
|
||||
private final Set<Slot> drag_click = new HashSet<Slot>();
|
||||
private final AppEngRenderItem aeRenderItem = new AppEngRenderItem();
|
||||
private final WCTRenderItem aeRenderItem = new WCTRenderItem();
|
||||
private GuiScrollbar scrollBar = null;
|
||||
private boolean disableShiftClick = false;
|
||||
private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
|
||||
@@ -74,7 +74,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
private Slot bl_clicked;
|
||||
private boolean subGui;
|
||||
|
||||
public AEBaseGui( final Container container )
|
||||
public WCTBaseGui( final Container container )
|
||||
{
|
||||
super( container );
|
||||
this.subGui = switchingGuis;
|
||||
@@ -913,6 +913,6 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
|
||||
public static final synchronized void setSwitchingGuis( final boolean switchingGuis )
|
||||
{
|
||||
AEBaseGui.switchingGuis = switchingGuis;
|
||||
WCTBaseGui.switchingGuis = switchingGuis;
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
import appeng.client.gui.widgets.IScrollSource;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.AEBaseGui;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.WCTBaseGui;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal;
|
||||
|
||||
public class GuiScrollbar implements IScrollSource
|
||||
@@ -26,8 +26,8 @@ public class GuiScrollbar implements IScrollSource
|
||||
((GuiWirelessCraftingTerminal) g).bindTexture( "minecraft", "gui/container/creative_inventory/tabs.png" );
|
||||
|
||||
}
|
||||
else if (g instanceof AEBaseGui) {
|
||||
((AEBaseGui) g).bindTexture("minecraft", "gui/container/creative_inventory/tabs.png");
|
||||
else if (g instanceof WCTBaseGui) {
|
||||
((WCTBaseGui) g).bindTexture("minecraft", "gui/container/creative_inventory/tabs.png");
|
||||
}
|
||||
|
||||
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ import appeng.util.ReadableNumberConverter;
|
||||
* @version rv2
|
||||
* @since rv0
|
||||
*/
|
||||
public class AppEngRenderItem extends RenderItem
|
||||
public class WCTRenderItem extends RenderItem
|
||||
{
|
||||
private static final ISlimReadableNumberConverter SLIM_CONVERTER = ReadableNumberConverter.INSTANCE;
|
||||
private static final IWideReadableNumberConverter WIDE_CONVERTER = ReadableNumberConverter.INSTANCE;
|
||||
+4
-4
@@ -8,7 +8,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
* @author Nividica
|
||||
*
|
||||
*/
|
||||
public enum AEStateIconsEnum implements IStateIconTexture {
|
||||
public enum WCTStateIconsEnum implements IStateIconTexture {
|
||||
|
||||
// Redstone modes
|
||||
REDSTONE_LOW(0, 0), REDSTONE_HIGH(16, 0), REDSTONE_PULSE(32, 0), REDSTONE_IGNORE(48, 0),
|
||||
@@ -75,7 +75,7 @@ public enum AEStateIconsEnum implements IStateIconTexture {
|
||||
* @param u
|
||||
* @param v
|
||||
*/
|
||||
private AEStateIconsEnum(final int u, final int v) {
|
||||
private WCTStateIconsEnum(final int u, final int v) {
|
||||
this(u, v, STANDARD_ICON_SIZE, STANDARD_ICON_SIZE);
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ public enum AEStateIconsEnum implements IStateIconTexture {
|
||||
* @param width
|
||||
* @param height
|
||||
*/
|
||||
private AEStateIconsEnum(final int u, final int v, final int width, final int height) {
|
||||
private WCTStateIconsEnum(final int u, final int v, final int width, final int height) {
|
||||
// Set the u
|
||||
this.minU = u;
|
||||
|
||||
@@ -109,7 +109,7 @@ public enum AEStateIconsEnum implements IStateIconTexture {
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTexture() {
|
||||
return AEStateIconsEnum.AE_STATES_TEXTURE;
|
||||
return WCTStateIconsEnum.AE_STATES_TEXTURE;
|
||||
}
|
||||
|
||||
@Override
|
||||
+2
-2
@@ -40,7 +40,7 @@ public class NetworkHandler
|
||||
{
|
||||
try
|
||||
{
|
||||
return new AppEngClientPacketHandler();
|
||||
return new WCTClientPacketHandler();
|
||||
}
|
||||
catch( final Throwable t )
|
||||
{
|
||||
@@ -52,7 +52,7 @@ public class NetworkHandler
|
||||
{
|
||||
try
|
||||
{
|
||||
return new AppEngServerPacketHandler();
|
||||
return new WCTServerPacketHandler();
|
||||
}
|
||||
catch( final Throwable t )
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacketHandlerBase;
|
||||
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
|
||||
|
||||
public class AppEngClientPacketHandler extends WCTPacketHandlerBase implements IPacketHandler
|
||||
public class WCTClientPacketHandler extends WCTPacketHandlerBase implements IPacketHandler
|
||||
{
|
||||
|
||||
@Override
|
||||
+1
-1
@@ -13,7 +13,7 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacketHandlerBase;
|
||||
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
|
||||
|
||||
|
||||
public final class AppEngServerPacketHandler extends WCTPacketHandlerBase implements IPacketHandler
|
||||
public final class WCTServerPacketHandler extends WCTPacketHandlerBase implements IPacketHandler
|
||||
{
|
||||
|
||||
@Override
|
||||
@@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.AppEngRenderItem;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingMatrix;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFakeCraftingMatrix;
|
||||
|
||||
Reference in new issue
Block a user