Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

worked on imprinter

Browse source
This commit is contained in:
Robert Seifert 2013-05-20 15:18:47 -04:00
parent 19fb2e48ed
commit cac5f0d12a
2 changed files with 51 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/minecraft/assemblyline/common/imprinter/AutoCraftingManager.java
View file

@ -12,6 +12,8 @@ import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.ReflectionHelper;
@ -25,7 +27,7 @@ import dark.library.helpers.Pair;
*/ */
public class AutoCraftingManager public class AutoCraftingManager
{ {
boolean doDebug = false; boolean doDebug = true;
TileEntity craftingEntity; TileEntity craftingEntity;
IInventory craftingInv; IInventory craftingInv;
@ -184,7 +186,7 @@ public class AutoCraftingManager
if (match != -2) if (match != -2)
{ {
containingItems[match] = this.decrStackSize(containingItems[match], recipeItem.stackSize); containingItems[match] = this.decrStackSize(containingItems[match], recipeItem.stackSize);
this.printDebug("ResourceChecker", "Match found"); this.printDebug("ResourceChecker", "Match found @" + match);
itemMatch++; itemMatch++;
} }
} }
@ -209,9 +211,11 @@ public class AutoCraftingManager
if (recipeItem != null) if (recipeItem != null)
{ {
int match = this.doesItemExist(recipeItem, containingItems); int match = this.doesItemExist(recipeItem, containingItems);
this.printDebug("ResourceChecker", "Item0" + itemInList + " = " + recipeItem.toString());
if (match != -2) if (match != -2)
{ {
containingItems[match] = this.decrStackSize(containingItems[match], recipeItem.stackSize); containingItems[match] = this.decrStackSize(containingItems[match], recipeItem.stackSize);
this.printDebug("ResourceChecker", "Match found @" + match);
itemMatch++; itemMatch++;
break; break;
} }
@ -326,4 +330,42 @@ public class AutoCraftingManager
} }
return recipeItem.isItemEqual(checkStack) || (recipeItem.itemID == checkStack.itemID && recipeItem.isItemStackDamageable() && !recipeItem.isItemDamaged()); return recipeItem.isItemEqual(checkStack) || (recipeItem.itemID == checkStack.itemID && recipeItem.isItemStackDamageable() && !recipeItem.isItemDamaged());
} }
/**
* Consumes an item checking for extra conditions like container items
*
* @param stack - starting itemStack
* @param ammount - amount to consume
* @return what is left of the itemStack if any
*/
public ItemStack consumeItem(ItemStack stack, int amount)
{
if (stack == null)
{
return null;
}
if (stack.getItem().hasContainerItem())
{
ItemStack containerStack = stack.getItem().getContainerItemStack(stack);
if (containerStack.isItemStackDamageable() && containerStack.getItemDamage() > containerStack.getMaxDamage())
{
try
{
MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(null, containerStack));
}
catch (Exception e)
{
}
return null;
}
if (containerStack != null && !stack.getItem().doesContainerItemLeaveCraftingGrid(stack))
{
return containerStack;
}
}
return this.decrStackSize(stack, amount);
}
} }

110
src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java
View file

@ -4,31 +4,22 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;
import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.server.management.ServerConfigurationManager;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityChest;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper; import universalelectricity.core.vector.VectorHelper;
import universalelectricity.prefab.TranslationHelper; import universalelectricity.prefab.TranslationHelper;
@ -43,7 +34,6 @@ import assemblyline.common.AssemblyLine;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.ReflectionHelper;
import dark.library.helpers.Pair; import dark.library.helpers.Pair;
import dark.library.inv.ISlotPickResult; import dark.library.inv.ISlotPickResult;
@ -316,10 +306,9 @@ public class TileEntityImprinter extends TileEntityAdvanced implements net.minec
if (inventoryCrafting != null) if (inventoryCrafting != null)
{ {
ItemStack matrixOutput = CraftingManager.getInstance().findMatchingRecipe(inventoryCrafting, this.worldObj); ItemStack matrixOutput = CraftingManager.getInstance().findMatchingRecipe(inventoryCrafting, this.worldObj);
if (matrixOutput != null) if (matrixOutput != null && this.craftingManager.getIdealRecipe(matrixOutput) != null)
{ {
this.imprinterMatrix[2] = matrixOutput; this.imprinterMatrix[2] = matrixOutput;
didCraft = true; didCraft = true;
@ -370,15 +359,15 @@ public class TileEntityImprinter extends TileEntityAdvanced implements net.minec
@Override @Override
public void onPickUpFromSlot(EntityPlayer entityPlayer, int s, ItemStack itemStack) public void onPickUpFromSlot(EntityPlayer entityPlayer, int s, ItemStack itemStack)
{ {
if (itemStack != null) if (itemStack != null)
{ {
if (craftingManager == null) if (craftingManager == null)
{ {
craftingManager = new AutoCraftingManager(this); craftingManager = new AutoCraftingManager(this);
} }
// System.out.println("PickResult:" + worldObj.isRemote + " managing item " +
// itemStack.toString()); System.out.println("PickResult:" + worldObj.isRemote + " managing item " + itemStack.toString());
if (this.isImprinting) if (this.isImprinting)
{ {
this.imprinterMatrix[0] = null; this.imprinterMatrix[0] = null;
@ -391,36 +380,16 @@ public class TileEntityImprinter extends TileEntityAdvanced implements net.minec
*/ */
if (idealRecipeItem != null) if (idealRecipeItem != null)
{ {
// System.out.println("PickResult: ideal recipe "); System.out.println("PickResult: ideal recipe ");
ItemStack[] requiredItems = idealRecipeItem.getValue().clone(); ItemStack[] requiredItems = idealRecipeItem.getValue().clone();
if (requiredItems != null) if (requiredItems != null)
{ {
for (int i = 0; i < requiredItems.length; i++) System.out.println("PickResult: valid resources ");
{
ItemStack sta = requiredItems[i];
if (sta != null && sta.itemID < Block.blocksList.length && sta.getItemDamage() == 32767)
{
requiredItems[i] = new ItemStack(sta.itemID, sta.stackSize, 0);
}
}
// System.out.println("PickResult: valid resources ");
for (ItemStack searchStack : requiredItems) for (ItemStack searchStack : requiredItems)
{ {
if (searchStack != null) if (searchStack != null)
{ {
/**
* inventories: for (IInventory inventory :
* getAvaliableInventories()) { for (int i = 0; i <
* inventory.getSizeInventory(); i++) { ItemStack checkStack =
* inventory.getStackInSlot(i);
*
* if (checkStack != null) { if (areStacksEqual(searchStack,
* checkStack)) { inventory.decrStackSize(i, 1);
* //System.out.println("Consumed Item From Chest: " +
* checkStack.toString()); break inventories; } } } }
*/
for (int i = 0; i < this.containingItems.length; i++) for (int i = 0; i < this.containingItems.length; i++)
{ {
ItemStack checkStack = this.containingItems[i]; ItemStack checkStack = this.containingItems[i];
@ -430,8 +399,7 @@ public class TileEntityImprinter extends TileEntityAdvanced implements net.minec
if (craftingManager.areStacksEqual(searchStack, checkStack)) if (craftingManager.areStacksEqual(searchStack, checkStack))
{ {
this.decrStackSize(i + INVENTORY_START, 1); this.decrStackSize(i + INVENTORY_START, 1);
// System.out.println("Consumed Item From Inv: " + System.out.println("Consumed Item From Inv: " + checkStack.toString());
// checkStack.toString());
break; break;
} }
} }
@ -442,71 +410,7 @@ public class TileEntityImprinter extends TileEntityAdvanced implements net.minec
} }
else else
{ {
int slot = 0;
try
{
InventoryCrafting inventoryCrafting = this.getCraftingMatrix();
GameRegistry.onItemCrafted(entityPlayer, itemStack, inventoryCrafting);
for (slot = 0; slot < inventoryCrafting.getSizeInventory(); ++slot)
{
ItemStack slotStack = inventoryCrafting.getStackInSlot(slot);
if (slotStack != null)
{
inventoryCrafting.decrStackSize(slot, 1);
if (slotStack.getItem().hasContainerItem())
{
ItemStack containerStack = slotStack.getItem().getContainerItemStack(slotStack);
if (containerStack.isItemStackDamageable() && containerStack.getItemDamage() > containerStack.getMaxDamage())
{
MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(entityPlayer, containerStack));
containerStack = null;
}
if (containerStack != null && !slotStack.getItem().doesContainerItemLeaveCraftingGrid(slotStack))
{
if (inventoryCrafting.getStackInSlot(slot) == null)
{
inventoryCrafting.setInventorySlotContents(slot, containerStack);
}
else
{
entityPlayer.dropPlayerItem(containerStack);
}
}
}
}
}
this.replaceCraftingMatrix(inventoryCrafting);
}
catch (Exception e)
{
System.out.println("Imprinter: Failed to craft item: " + itemStack.getDisplayName());
System.out.println("Vaporizing items to prevent inf crafting");
for (slot = slot; slot < this.craftingMatrix.length; ++slot)
{
ItemStack slotStack = this.getStackInSlot(slot);
if (slotStack != null)
{
if (slotStack.getItem().hasContainerItem())
{
this.setInventorySlotContents(slot, slotStack.getItem().getContainerItemStack(slotStack));
}
else
{
this.decrStackSize(slot, 1);
}
}
}
// this.craftingMatrix = new ItemStack[9];
e.printStackTrace();
}
} }
} }
} }