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

More work on inscriber, still not done yet.

Browse Source
This commit is contained in:
AlgorithmX2
2014-03-11 01:52:48 -05:00
parent a61b1525f0
commit 08df0f8b06
3 changed files with 163 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container/implementations/ContainerInscriber.java
+56
View File
@@ -1,19 +1,75 @@
package appeng.container.implementations;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
import appeng.container.AEBaseContainer;
import appeng.container.slot.SlotOutput;
import appeng.container.slot.SlotRestrictedInput;
import appeng.container.slot.SlotRestrictedInput.PlaceableItemType;
import appeng.tile.misc.TileInscriber;
import appeng.util.Platform;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ContainerInscriber extends AEBaseContainer
{
TileInscriber myte;
public int maxProessingTime = -1;
public int processingTime = -1;
public ContainerInscriber(InventoryPlayer ip, TileInscriber te) {
super( ip, te, null );
myte = te;
addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.INSCRIBER_PLATE, myte, 0, 45, 16 ) );
addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.INSCRIBER_INPUT, myte, 2, 63, 39 ) );
addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.INSCRIBER_PLATE, myte, 1, 45, 62 ) );
addSlotToContainer( new SlotOutput( myte, 3, 113, 40, -1 ) );
bindPlayerInventory( ip, 0, 176 - /* height of playerinventory */82 );
}
@Override
public void detectAndSendChanges()
{
super.detectAndSendChanges();
if ( Platform.isServer() )
{
int localMax = this.maxProessingTime;
int localTime = this.processingTime;
for (int i = 0; i < this.crafters.size(); ++i)
{
ICrafting icrafting = (ICrafting) this.crafters.get( i );
if ( this.maxProessingTime != localMax )
{
icrafting.sendProgressBarUpdate( this, 0, localMax );
}
if ( this.processingTime != localTime )
{
icrafting.sendProgressBarUpdate( this, 1, localTime );
}
}
this.maxProessingTime = localMax;
this.processingTime = localTime;
}
}
@Override
@SideOnly(Side.CLIENT)
public void updateProgressBar(int idx, int value)
{
if ( idx == 0 )
this.maxProessingTime = value;
if ( idx == 1 )
this.processingTime = value;
}
}
recipes/handlers/Inscribe.java
+21 -2
View File
@@ -1,6 +1,7 @@
package appeng.recipes.handlers;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.item.ItemStack;
@@ -15,8 +16,26 @@ import appeng.util.Platform;
public class Inscribe implements ICraftHandler, IWebsiteSeralizer
{
public class InscriberRecipe
{
public InscriberRecipe(ItemStack[] imprintable, ItemStack plateA, ItemStack plateB, ItemStack out) {
this.imprintable = imprintable;
this.plateA = plateA;
this.plateB = plateB;
output = out;
}
final public ItemStack plateA;
final public ItemStack[] imprintable;
final public ItemStack plateB;
final public ItemStack output;
};
public static HashSet<ItemStack> plates = new HashSet();
public static HashSet<ItemStack> inputs = new HashSet();
public static LinkedList<InscriberRecipe> recipes = new LinkedList();
IIngredient imprintable;
@@ -63,8 +82,8 @@ public class Inscribe implements ICraftHandler, IWebsiteSeralizer
for (ItemStack s : plateB.getItemStackSet())
plates.add( s );
// TODO: REAL REGISTRATION
InscriberRecipe ir = new InscriberRecipe( imprintable.getItemStackSet(), plateA.getItemStack(), plateB.getItemStack(), output.getItemStack() );
recipes.add( ir );
}
@Override
tile/misc/TileInscriber.java
+86 -4
View File
@@ -9,8 +9,14 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.networking.IGridNode;
import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.util.AECableType;
import appeng.me.GridAccessException;
import appeng.recipes.handlers.Inscribe;
import appeng.recipes.handlers.Inscribe.InscriberRecipe;
import appeng.tile.events.AETileEventHandler;
import appeng.tile.events.TileEventType;
import appeng.tile.grid.AENetworkPowerTile;
@@ -19,7 +25,7 @@ import appeng.tile.inventory.InvOperation;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class TileInscriber extends AENetworkPowerTile
public class TileInscriber extends AENetworkPowerTile implements IGridTickable
{
final int top[] = new int[] { 0 };
@@ -27,7 +33,9 @@ public class TileInscriber extends AENetworkPowerTile
final int sides[] = new int[] { 2, 3 };
AppEngInternalInventory inv = new AppEngInternalInventory( this, 4 );
int processingTime = 0;
public final int maxProessingTime = 100;
public int processingTime = 0;
@Override
public AECableType getCableConnectionType(ForgeDirection dir)
@@ -61,7 +69,7 @@ public class TileInscriber extends AENetworkPowerTile
for (int num = 0; num < inv.getSizeInventory(); num++)
{
if ( (slot | (1 << num)) > 0 )
if ( (slot & (1 << num)) > 0 )
inv.setInventorySlotContents( num, AEItemStack.loadItemStackFromPacket( data ).getItemStack() );
else
inv.setInventorySlotContents( num, null );
@@ -81,9 +89,10 @@ public class TileInscriber extends AENetworkPowerTile
slot = slot | (1 << num);
}
data.writeByte( slot );
for (int num = 0; num < inv.getSizeInventory(); num++)
{
if ( (slot | (1 << num)) > 0 )
if ( (slot & (1 << num)) > 0 )
{
AEItemStack st = AEItemStack.create( inv.getStackInSlot( num ) );
st.writeToPacket( data );
@@ -169,7 +178,80 @@ public class TileInscriber extends AENetworkPowerTile
@Override
public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added)
{
try
{
processingTime = 0;
gridProxy.getTick().wakeDevice( gridProxy.getNode() );
}
catch (GridAccessException e)
{
// :P
}
}
private ItemStack getTask()
{
for (InscriberRecipe i : Inscribe.recipes)
{
ItemStack PlateA = getStackInSlot( 0 );
ItemStack PlateB = getStackInSlot( 1 );
boolean matchA = (PlateA == null && i.plateA == null) || (Platform.isSameItemPrecise( PlateA, i.plateA )) && // and...
(PlateB == null && i.plateB == null) | (Platform.isSameItemPrecise( PlateB, i.plateB ));
boolean matchB = (PlateB == null && i.plateA == null) || (Platform.isSameItemPrecise( PlateB, i.plateA )) && // and...
(PlateA == null && i.plateB == null) | (Platform.isSameItemPrecise( PlateA, i.plateB ));
if ( matchA || matchB )
{
for (ItemStack opion : i.imprintable)
{
if ( Platform.isSameItemPrecise( opion, getStackInSlot( 2 ) ) )
return i.output;
}
}
}
return null;
}
private boolean hasWork()
{
if ( getTask() != null )
return true;
processingTime = 0;
return false;
}
@Override
public TickingRequest getTickingRequest(IGridNode node)
{
return new TickingRequest( 1, 1, !hasWork(), false );
}
@Override
public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall)
{
if ( processingTime == 0 )
processingTime++;
else
processingTime += TicksSinceLastCall;
if ( processingTime > maxProessingTime )
{
processingTime = 0;
ItemStack out = getTask();
if ( out != null )
{
setInventorySlotContents( 2, null );
setInventorySlotContents( 3, out );
}
}
return hasWork() ? TickRateModulation.URGENT : TickRateModulation.SLEEP;
}
}