tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Auto-Sync

Browse source
This commit is contained in:
DarkGuardsman 2013-11-04 23:12:44 -05:00
parent 1bc39b050a
commit d406964a27
9 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/minecraft/dark/assembly/common/machine/InventoryCrate.java
View file

@ -53,10 +53,9 @@ public class InventoryCrate extends InvChest
}
@Override
public void saveInv(NBTTagCompound nbt)
public NBTTagCompound saveInv(NBTTagCompound nbt)
{
// TODO Auto-generated method stub
return nbt;
}
@Override

1
src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java
View file

@ -269,6 +269,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
this.setOutput(!this.isOutput());
}
@Override
public double getExtraLoad()
{
return .01;//1J/t or 20J/t

2
src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java
View file

@ -19,7 +19,7 @@ import com.builtbroken.common.Pair;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ProcessorRecipes.ProcessorType;
import dark.api.reciepes.ProcessorType;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.CommonProxy;

4
src/minecraft/dark/assembly/common/machine/processor/ContainerProcessor.java
View file

@ -9,7 +9,7 @@ import net.minecraft.inventory.SlotFurnace;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ProcessorRecipes;
import dark.api.reciepes.MachineRecipeHandler;
public class ContainerProcessor extends Container
{
@ -128,7 +128,7 @@ public class ContainerProcessor extends Container
}
else if (slotID != 1 && slotID != 0)
{
if (ProcessorRecipes.getOuput(tileEntity.getProcessorData().type, slotStack, true) != null)
if (MachineRecipeHandler.getProcessorOutput(tileEntity.getProcessorData().type, slotStack) != null)
{
if (!this.mergeItemStack(slotStack, tileEntity.slotInput, 1, false))
{

12
src/minecraft/dark/assembly/common/machine/processor/TileEntityProcessor.java
View file

@ -9,8 +9,8 @@ import net.minecraftforge.common.ForgeDirection;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.api.ProcessorRecipes;
import dark.api.ProcessorRecipes.ProcessorType;
import dark.api.reciepes.MachineRecipeHandler;
import dark.api.reciepes.ProcessorType;
import dark.assembly.common.machine.processor.BlockProcessor.ProcessorData;
import dark.core.interfaces.IInvBox;
import dark.core.network.PacketHandler;
@ -123,7 +123,7 @@ public class TileEntityProcessor extends TileEntityEnergyMachine
/** Updates the animation calculation for the renderer to use */
public void updateAnimation()
{
if (this.getProcessorData().type == ProcessorType.CRUSHER || this.getProcessorData().type == ProcessorType.PRESS)
if (this.getProcessorData().type == ProcessorType.CRUSHER)
{
if (invertPiston)
{
@ -164,7 +164,7 @@ public class TileEntityProcessor extends TileEntityEnergyMachine
{
inputStack = inputStack.copy();
inputStack.stackSize = 1;
ItemStack[] outputResult = ProcessorRecipes.getOuput(this.getProcessorData().type, inputStack, true);
ItemStack[] outputResult = MachineRecipeHandler.getProcessorOutput(this.getProcessorData().type, inputStack);
if (outputResult != null)
{
if (outputStack == null)
@ -198,7 +198,7 @@ public class TileEntityProcessor extends TileEntityEnergyMachine
inputSlotStack = inputSlotStack.copy();
inputSlotStack.stackSize = 1;
ItemStack[] receipeResult = ProcessorRecipes.getOuput(this.getProcessorData().type, inputSlotStack, true);
ItemStack[] receipeResult = MachineRecipeHandler.getProcessorOutput(this.getProcessorData().type, inputSlotStack);
if (receipeResult != null && this.outputBuffer == null)
{
this.getInventory().decrStackSize(this.slotInput, 1);
@ -220,7 +220,7 @@ public class TileEntityProcessor extends TileEntityEnergyMachine
@Override
public boolean canStore(ItemStack stack, int slot, ForgeDirection side)
{
if (slotInput == slot && ProcessorRecipes.getOuput(this.getProcessorData().type, stack, true) != null)
if (slotInput == slot && MachineRecipeHandler.getProcessorOutput(this.getProcessorData().type, stack) != null)
{
return true;
}