mirror of
https://github.com/GTNewHorizons/WirelessCraftingTerminal.git
synced 2026-11-18 03:15:15 +00:00
refactoring
This commit is contained in:
1 parent
26e842226f
commit
e88eb21187
19 files changed
+55
-55
No files matched your search
@@ -30,7 +30,7 @@ import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
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.InternalSlotME;
|
||||
@@ -416,7 +416,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
slotNum = slot.slotNumber;
|
||||
}
|
||||
|
||||
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
||||
( (WCTBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
||||
final PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
|
||||
NetworkHandler.instance.sendToServer( p );
|
||||
return;
|
||||
@@ -505,7 +505,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
|
||||
if( action != null )
|
||||
{
|
||||
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
||||
( (WCTBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
||||
final PacketInventoryAction p = new PacketInventoryAction( action, this.getInventorySlots().size(), 0 );
|
||||
NetworkHandler.instance.sendToServer( p );
|
||||
}
|
||||
@@ -574,9 +574,9 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
final List<Slot> slots = this.getInventorySlots();
|
||||
for( final Slot s : slots )
|
||||
{
|
||||
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
|
||||
if( s.getSlotIndex() == j && s.inventory == ( (WCTBaseContainer) this.inventorySlots ).getPlayerInv() )
|
||||
{
|
||||
if( !s.canTakeStack( ( (AEBaseContainer) this.inventorySlots ).getPlayerInv().player ) )
|
||||
if( !s.canTakeStack( ( (WCTBaseContainer) this.inventorySlots ).getPlayerInv().player ) )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -592,7 +592,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
{
|
||||
for( final Slot s : slots )
|
||||
{
|
||||
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
|
||||
if( s.getSlotIndex() == j && s.inventory == ( (WCTBaseContainer) this.inventorySlots ).getPlayerInv() )
|
||||
{
|
||||
NetworkHandler.instance.sendToServer( new PacketSwapSlots( s.slotNumber, theSlot.slotNumber ) );
|
||||
return true;
|
||||
@@ -656,7 +656,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
final IAEItemStack item = ( (SlotME) slot ).getAEStack();
|
||||
if( item != null )
|
||||
{
|
||||
( (AEBaseContainer) this.inventorySlots ).setTargetStack( item );
|
||||
( (WCTBaseContainer) this.inventorySlots ).setTargetStack( item );
|
||||
final InventoryAction direction = wheel > 0 ? InventoryAction.ROLL_DOWN : InventoryAction.ROLL_UP;
|
||||
final int times = Math.abs( wheel );
|
||||
final int inventorySize = this.getInventorySlots().size();
|
||||
@@ -704,16 +704,16 @@ public abstract class AEBaseGui extends GuiContainer
|
||||
|
||||
private boolean hasCustomInventoryName()
|
||||
{
|
||||
if( this.inventorySlots instanceof AEBaseContainer )
|
||||
if( this.inventorySlots instanceof WCTBaseContainer )
|
||||
{
|
||||
return ( (AEBaseContainer) this.inventorySlots ).getCustomName() != null;
|
||||
return ( (WCTBaseContainer) this.inventorySlots ).getCustomName() != null;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private String getInventoryName()
|
||||
{
|
||||
return ( (AEBaseContainer) this.inventorySlots ).getCustomName();
|
||||
return ( (WCTBaseContainer) this.inventorySlots ).getCustomName();
|
||||
}
|
||||
|
||||
private void drawSlot( final Slot s )
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ import appeng.api.storage.data.IAEItemStack;
|
||||
import appeng.tile.inventory.AppEngInternalInventory;
|
||||
|
||||
|
||||
public class ContainerCraftAmount extends AEBaseContainer
|
||||
public class ContainerCraftAmount extends WCTBaseContainer
|
||||
{
|
||||
|
||||
private final Slot craftingItem;
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ import appeng.api.storage.data.IItemList;
|
||||
import appeng.util.Platform;
|
||||
|
||||
|
||||
public class ContainerCraftConfirm extends AEBaseContainer
|
||||
public class ContainerCraftConfirm extends WCTBaseContainer
|
||||
{
|
||||
|
||||
private final ArrayList<CraftingCPURecord> cpus = new ArrayList<CraftingCPURecord>();
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ import appeng.tile.crafting.TileCraftingTile;
|
||||
import appeng.util.Platform;
|
||||
|
||||
|
||||
public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorHandlerReceiver<IAEItemStack>, ICustomNameObject
|
||||
public class ContainerCraftingCPU extends WCTBaseContainer implements IMEMonitorHandlerReceiver<IAEItemStack>, ICustomNameObject
|
||||
{
|
||||
|
||||
private final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
|
||||
|
||||
+4
-4
@@ -62,7 +62,7 @@ import appeng.util.inv.AdaptorPlayerHand;
|
||||
import appeng.util.item.AEItemStack;
|
||||
|
||||
|
||||
public abstract class AEBaseContainer extends Container
|
||||
public abstract class WCTBaseContainer extends Container
|
||||
{
|
||||
|
||||
private final InventoryPlayer invPlayer;
|
||||
@@ -82,12 +82,12 @@ public abstract class AEBaseContainer extends Container
|
||||
private int ticksSinceCheck = 900;
|
||||
private IAEItemStack clientRequestedTargetItem = null;
|
||||
|
||||
public AEBaseContainer( final InventoryPlayer ip, final TileEntity myTile, final IPart myPart )
|
||||
public WCTBaseContainer( final InventoryPlayer ip, final TileEntity myTile, final IPart myPart )
|
||||
{
|
||||
this( ip, myTile, myPart, null );
|
||||
}
|
||||
|
||||
public AEBaseContainer( final InventoryPlayer ip, final TileEntity myTile, final IPart myPart, final IGuiItemObject gio )
|
||||
public WCTBaseContainer( final InventoryPlayer ip, final TileEntity myTile, final IPart myPart, final IGuiItemObject gio )
|
||||
{
|
||||
this.invPlayer = ip;
|
||||
this.tileEntity = myTile;
|
||||
@@ -136,7 +136,7 @@ public abstract class AEBaseContainer extends Container
|
||||
}
|
||||
}
|
||||
|
||||
public AEBaseContainer( final InventoryPlayer ip, final Object anchor )
|
||||
public WCTBaseContainer( final InventoryPlayer ip, final Object anchor )
|
||||
{
|
||||
this.invPlayer = ip;
|
||||
this.tileEntity = anchor instanceof TileEntity ? (TileEntity) anchor : null;
|
||||
+5
-5
@@ -7,7 +7,7 @@ import java.util.EnumSet;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.ICrafting;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler;
|
||||
@@ -26,8 +26,8 @@ public class SyncData
|
||||
if (container instanceof ContainerWirelessCraftingTerminal) {
|
||||
this.source = (ContainerWirelessCraftingTerminal) container;
|
||||
}
|
||||
else if (container instanceof AEBaseContainer) {
|
||||
this.source = (AEBaseContainer) container;
|
||||
else if (container instanceof WCTBaseContainer) {
|
||||
this.source = (WCTBaseContainer) container;
|
||||
}
|
||||
else {
|
||||
this.source = container;
|
||||
@@ -186,8 +186,8 @@ public class SyncData
|
||||
if (this.source instanceof ContainerWirelessCraftingTerminal) {
|
||||
((ContainerWirelessCraftingTerminal) this.source).onUpdate( this.field.getName(), oldValue, this.field.get( this.source ) );
|
||||
}
|
||||
if (this.source instanceof AEBaseContainer) {
|
||||
((AEBaseContainer) this.source).onUpdate( this.field.getName(), oldValue, this.field.get( this.source ) );
|
||||
if (this.source instanceof WCTBaseContainer) {
|
||||
((WCTBaseContainer) this.source).onUpdate( this.field.getName(), oldValue, this.field.get( this.source ) );
|
||||
}
|
||||
}
|
||||
catch( final IllegalArgumentException e )
|
||||
|
||||
+7
-7
@@ -5,7 +5,7 @@ import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
|
||||
import appeng.tile.inventory.AppEngInternalInventory;
|
||||
|
||||
@@ -95,8 +95,8 @@ public class AppEngSlot extends Slot
|
||||
if (this.getContainer() instanceof ContainerWirelessCraftingTerminal) {
|
||||
((ContainerWirelessCraftingTerminal) this.getContainer()).onSlotChange( this );
|
||||
}
|
||||
if (this.getContainer() instanceof AEBaseContainer) {
|
||||
((AEBaseContainer) this.getContainer()).onSlotChange( this );
|
||||
if (this.getContainer() instanceof WCTBaseContainer) {
|
||||
((WCTBaseContainer) this.getContainer()).onSlotChange( this );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -228,8 +228,8 @@ public class AppEngSlot extends Slot
|
||||
if (this.myContainer instanceof ContainerWirelessCraftingTerminal) {
|
||||
return (ContainerWirelessCraftingTerminal) this.myContainer;
|
||||
}
|
||||
if (this.myContainer instanceof AEBaseContainer) {
|
||||
return (AEBaseContainer) this.myContainer;
|
||||
if (this.myContainer instanceof WCTBaseContainer) {
|
||||
return (WCTBaseContainer) this.myContainer;
|
||||
}
|
||||
return this.myContainer;
|
||||
}
|
||||
@@ -239,8 +239,8 @@ public class AppEngSlot extends Slot
|
||||
if (this.myContainer instanceof ContainerWirelessCraftingTerminal) {
|
||||
this.myContainer = (ContainerWirelessCraftingTerminal) myContainer;
|
||||
}
|
||||
else if (this.myContainer instanceof AEBaseContainer) {
|
||||
this.myContainer = (AEBaseContainer) myContainer;
|
||||
else if (this.myContainer instanceof WCTBaseContainer) {
|
||||
this.myContainer = (WCTBaseContainer) myContainer;
|
||||
}
|
||||
else {
|
||||
this.myContainer = myContainer;
|
||||
|
||||
+10
-10
@@ -15,7 +15,7 @@ import net.minecraft.inventory.Container;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftAmount;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerOpenContext;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
|
||||
@@ -111,9 +111,9 @@ public class PacketInventoryAction extends WCTPacket
|
||||
context = ((ContainerWirelessCraftingTerminal) baseContainer).getOpenContext();
|
||||
}
|
||||
|
||||
if( sender.openContainer instanceof AEBaseContainer ) {
|
||||
baseContainer = (AEBaseContainer) sender.openContainer;
|
||||
context = ((AEBaseContainer) baseContainer).getOpenContext();
|
||||
if( sender.openContainer instanceof WCTBaseContainer ) {
|
||||
baseContainer = (WCTBaseContainer) sender.openContainer;
|
||||
context = ((WCTBaseContainer) baseContainer).getOpenContext();
|
||||
}
|
||||
|
||||
if( this.action == InventoryAction.AUTO_CRAFT )
|
||||
@@ -140,11 +140,11 @@ public class PacketInventoryAction extends WCTPacket
|
||||
}
|
||||
}
|
||||
|
||||
if (baseContainer instanceof AEBaseContainer) {
|
||||
if( ((AEBaseContainer) baseContainer).getTargetStack() != null )
|
||||
if (baseContainer instanceof WCTBaseContainer) {
|
||||
if( ((WCTBaseContainer) baseContainer).getTargetStack() != null )
|
||||
{
|
||||
cca.getCraftingItem().putStack( ((AEBaseContainer) baseContainer).getTargetStack().getItemStack() );
|
||||
cca.setItemToCraft( ((AEBaseContainer) baseContainer).getTargetStack() );
|
||||
cca.getCraftingItem().putStack( ((WCTBaseContainer) baseContainer).getTargetStack().getItemStack() );
|
||||
cca.setItemToCraft( ((WCTBaseContainer) baseContainer).getTargetStack() );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,8 +157,8 @@ public class PacketInventoryAction extends WCTPacket
|
||||
if (baseContainer instanceof ContainerWirelessCraftingTerminal) {
|
||||
((ContainerWirelessCraftingTerminal) baseContainer).doAction( sender, this.action, this.slot, this.id );
|
||||
}
|
||||
if (baseContainer instanceof AEBaseContainer) {
|
||||
((AEBaseContainer) baseContainer).doAction( sender, this.action, this.slot, this.id );
|
||||
if (baseContainer instanceof WCTBaseContainer) {
|
||||
((WCTBaseContainer) baseContainer).doAction( sender, this.action, this.slot, this.id );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo;
|
||||
@@ -45,9 +45,9 @@ public class PacketPartialItem extends WCTPacket
|
||||
{
|
||||
( (ContainerWirelessCraftingTerminal) player.openContainer ).postPartial( this );
|
||||
}
|
||||
if( player.openContainer instanceof AEBaseContainer )
|
||||
if( player.openContainer instanceof WCTBaseContainer )
|
||||
{
|
||||
( (AEBaseContainer) player.openContainer ).postPartial( this );
|
||||
( (WCTBaseContainer) player.openContainer ).postPartial( this );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -5,7 +5,7 @@ import io.netty.buffer.Unpooled;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo;
|
||||
@@ -47,9 +47,9 @@ public class PacketProgressBar extends WCTPacket
|
||||
{
|
||||
( (ContainerWirelessCraftingTerminal) c ).updateFullProgressBar( this.id, this.value );
|
||||
}
|
||||
if( c instanceof AEBaseContainer )
|
||||
if( c instanceof WCTBaseContainer )
|
||||
{
|
||||
( (AEBaseContainer) c ).updateFullProgressBar( this.id, this.value );
|
||||
( (WCTBaseContainer) c ).updateFullProgressBar( this.id, this.value );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,9 +61,9 @@ public class PacketProgressBar extends WCTPacket
|
||||
{
|
||||
( (ContainerWirelessCraftingTerminal) c ).updateFullProgressBar( this.id, this.value );
|
||||
}
|
||||
if( c instanceof AEBaseContainer )
|
||||
if( c instanceof WCTBaseContainer )
|
||||
{
|
||||
( (AEBaseContainer) c ).updateFullProgressBar( this.id, this.value );
|
||||
( (WCTBaseContainer) c ).updateFullProgressBar( this.id, this.value );
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -3,7 +3,7 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket;
|
||||
import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo;
|
||||
@@ -41,8 +41,8 @@ public class PacketSwapSlots extends WCTPacket
|
||||
if (player.openContainer instanceof ContainerWirelessCraftingTerminal) {
|
||||
( (ContainerWirelessCraftingTerminal) player.openContainer ).swapSlotContents( this.slotA, this.slotB );
|
||||
}
|
||||
if (player.openContainer instanceof AEBaseContainer) {
|
||||
( (AEBaseContainer) player.openContainer ).swapSlotContents( this.slotA, this.slotB );
|
||||
if (player.openContainer instanceof WCTBaseContainer) {
|
||||
( (WCTBaseContainer) player.openContainer ).swapSlotContents( this.slotA, this.slotB );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+5
-5
@@ -19,7 +19,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftingCPU;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.AEBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConfirm;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftingCPU;
|
||||
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftingStatus;
|
||||
@@ -130,8 +130,8 @@ public class PacketValueConfig extends WCTPacket
|
||||
if (c instanceof ContainerWirelessCraftingTerminal) {
|
||||
( (ContainerWirelessCraftingTerminal) c ).setCustomName( this.Value );
|
||||
}
|
||||
if (c instanceof AEBaseContainer) {
|
||||
( (AEBaseContainer) c ).setCustomName( this.Value );
|
||||
if (c instanceof WCTBaseContainer) {
|
||||
( (WCTBaseContainer) c ).setCustomName( this.Value );
|
||||
}
|
||||
}
|
||||
else if( this.Name.startsWith( "SyncDat." ) )
|
||||
@@ -139,8 +139,8 @@ public class PacketValueConfig extends WCTPacket
|
||||
if (c instanceof ContainerWirelessCraftingTerminal) {
|
||||
( (ContainerWirelessCraftingTerminal) c ).stringSync( Integer.parseInt( this.Name.substring( 8 ) ), this.Value );
|
||||
}
|
||||
if (c instanceof AEBaseContainer) {
|
||||
( (AEBaseContainer) c ).stringSync( Integer.parseInt( this.Name.substring( 8 ) ), this.Value );
|
||||
if (c instanceof WCTBaseContainer) {
|
||||
( (WCTBaseContainer) c ).stringSync( Integer.parseInt( this.Name.substring( 8 ) ), this.Value );
|
||||
}
|
||||
}
|
||||
else if( this.Name.equals( "CraftingStatus" ) && this.Value.equals( "Clear" ) )
|
||||
|
||||
Reference in new issue
Block a user