From d406964a27243fb3a5a5c03dbd3e4060adc86bee Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Mon, 4 Nov 2013 23:12:44 -0500 Subject: [PATCH] Auto-Sync --- .../dark/assembly/client/gui/GuiEncoderBase.java | 2 +- .../common/machine/InvInteractionHelper.java | 6 +++--- .../dark/assembly/common/machine/InventoryCrate.java | 5 ++--- .../assembly/common/machine/TileEntityAssembly.java | 2 +- .../common/machine/TileEntityManipulator.java | 1 + .../common/machine/belt/TileEntityConveyorBelt.java | 2 +- .../common/machine/processor/BlockProcessor.java | 2 +- .../common/machine/processor/ContainerProcessor.java | 4 ++-- .../machine/processor/TileEntityProcessor.java | 12 ++++++------ 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/minecraft/dark/assembly/client/gui/GuiEncoderBase.java b/src/minecraft/dark/assembly/client/gui/GuiEncoderBase.java index 411185b30..1aa4b0315 100644 --- a/src/minecraft/dark/assembly/client/gui/GuiEncoderBase.java +++ b/src/minecraft/dark/assembly/client/gui/GuiEncoderBase.java @@ -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 diff --git a/src/minecraft/dark/assembly/common/machine/InvInteractionHelper.java b/src/minecraft/dark/assembly/common/machine/InvInteractionHelper.java index 0cf4eecec..99c7b8212 100644 --- a/src/minecraft/dark/assembly/common/machine/InvInteractionHelper.java +++ b/src/minecraft/dark/assembly/common/machine/InvInteractionHelper.java @@ -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 diff --git a/src/minecraft/dark/assembly/common/machine/InventoryCrate.java b/src/minecraft/dark/assembly/common/machine/InventoryCrate.java index e85568c64..0ed2114d8 100644 --- a/src/minecraft/dark/assembly/common/machine/InventoryCrate.java +++ b/src/minecraft/dark/assembly/common/machine/InventoryCrate.java @@ -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 diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java b/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java index 4b1cd32b7..1cd1be4f3 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java @@ -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 { diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java b/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java index 0a781951e..c08f2372d 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java @@ -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 diff --git a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java index 3be2d1050..ced211497 100644 --- a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java @@ -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 { diff --git a/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java b/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java index 02bbd5a71..171215723 100644 --- a/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java +++ b/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java @@ -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; diff --git a/src/minecraft/dark/assembly/common/machine/processor/ContainerProcessor.java b/src/minecraft/dark/assembly/common/machine/processor/ContainerProcessor.java index 78d63693e..96321a2c0 100644 --- a/src/minecraft/dark/assembly/common/machine/processor/ContainerProcessor.java +++ b/src/minecraft/dark/assembly/common/machine/processor/ContainerProcessor.java @@ -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)) { diff --git a/src/minecraft/dark/assembly/common/machine/processor/TileEntityProcessor.java b/src/minecraft/dark/assembly/common/machine/processor/TileEntityProcessor.java index 6264f253e..6e9c2151a 100644 --- a/src/minecraft/dark/assembly/common/machine/processor/TileEntityProcessor.java +++ b/src/minecraft/dark/assembly/common/machine/processor/TileEntityProcessor.java @@ -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; }