Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues 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

2
src/minecraft/dark/assembly/client/gui/GuiEncoderBase.java
View file

@ -18,7 +18,7 @@ import dark.core.prefab.invgui.GuiBase;
import dark.core.prefab.invgui.GuiButtonImage;
/** A base class for all ICBM Sentry GUIs.
*
*
* @author Calclavia */
@SideOnly(Side.CLIENT)
public abstract class GuiEncoderBase extends GuiBase

6
src/minecraft/dark/assembly/common/machine/InvInteractionHelper.java
View file

@ -40,7 +40,7 @@ public class InvInteractionHelper
}
/** Throws the items from the manipulator into the world.
*
*
* @param outputPosition
* @param items */
public void throwItem(Vector3 outputPosition, ItemStack items)
@ -57,7 +57,7 @@ public class InvInteractionHelper
}
/** Tries to place an itemStack in a specific position if it is an inventory.
*
*
* @return The ItemStack remained after place attempt */
public ItemStack tryPlaceInPosition(ItemStack itemStack, Vector3 position, ForgeDirection dir)
{
@ -194,7 +194,7 @@ public class InvInteractionHelper
}
/** Tries to get an item from a position
*
*
* @param position - location of item
* @param direction - direction this item is from the original
* @param ammount - amount up to one stack to grab

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

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

@ -17,7 +17,7 @@ import dark.core.prefab.tilenetwork.NetworkTileEntities;
/** A class to be inherited by all machines on the assembly line. This class acts as a single peace
* in a network of similar tiles allowing all to share power from one or more sources
*
*
* @author DarkGuardsman */
public abstract class TileEntityAssembly extends TileEntityEnergyMachine implements INetworkEnergyPart
{

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/belt/TileEntityConveyorBelt.java
View file

@ -23,7 +23,7 @@ import dark.core.common.DarkMain;
import dark.core.network.PacketHandler;
/** Conveyer belt TileEntity that allows entities of all kinds to be moved
*
*
* @author DarkGuardsman */
public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt, IRotatable
{

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;
}