From 2db8e30b1d2151fdde5d08a6c06aef55f0c397d2 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Fri, 27 Jan 2017 11:32:28 +0300 Subject: License, readme and stuff --- ihl/processing/invslots/IHLInvSlotOutput.java | 6 ++--- .../invslots/InvSlotConsumableLiquidIHL.java | 8 +++--- .../invslots/InvSlotSignalProcessor.java | 2 -- .../invslots/SlotInvSlotIronWorkbench.java | 31 ++++++++++++++++++++++ 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 ihl/processing/invslots/SlotInvSlotIronWorkbench.java (limited to 'ihl/processing/invslots') diff --git a/ihl/processing/invslots/IHLInvSlotOutput.java b/ihl/processing/invslots/IHLInvSlotOutput.java index 94bf3c8..7e10ab3 100644 --- a/ihl/processing/invslots/IHLInvSlotOutput.java +++ b/ihl/processing/invslots/IHLInvSlotOutput.java @@ -18,11 +18,12 @@ import ihl.utils.IHLUtils; public class IHLInvSlotOutput extends InvSlotOutput{ - private final Map substanceAmount = new HashMap(); + private final Map substanceAmount = new HashMap(); public IHLInvSlotOutput(TileEntityInventory base1, String name1, int oldStartIndex1, int count) { super(base1, name1, oldStartIndex1, count); } + @SuppressWarnings("rawtypes") @Override public boolean canAdd(List itemOutputs) { @@ -82,7 +83,6 @@ public class IHLInvSlotOutput extends InvSlotOutput{ public boolean objectMatchesSlot(Object obj, int slot) { - boolean matches=true; if(this.get(slot)==null) { return true; @@ -131,6 +131,7 @@ public class IHLInvSlotOutput extends InvSlotOutput{ } @Override + @SuppressWarnings("rawtypes") public int add(List itemOutputs) { if(itemOutputs==null || itemOutputs.isEmpty()) @@ -196,7 +197,6 @@ public class IHLInvSlotOutput extends InvSlotOutput{ { super.writeToNbt(nbtTagCompound); NBTTagList sAmountsList = new NBTTagList(); - int i = 0; Iterator> entrySetIterator = this.substanceAmount.entrySet().iterator(); while(entrySetIterator.hasNext()) { diff --git a/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java b/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java index c88584e..0a3b664 100644 --- a/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java +++ b/ihl/processing/invslots/InvSlotConsumableLiquidIHL.java @@ -225,11 +225,11 @@ public class InvSlotConsumableLiquidIHL extends InvSlotConsumableLiquid{ return true; } - Iterator containerItem1 = this.getPossibleFluids().iterator(); + Iterator containerItem1 = this.getPossibleFluids().iterator(); while (containerItem1.hasNext()) { - Fluid prevFluid = (Fluid)containerItem1.next(); + Fluid prevFluid = containerItem1.next(); if (FluidContainerRegistry.fillFluidContainer(new FluidStack(prevFluid, Integer.MAX_VALUE), stack) != null) { @@ -250,11 +250,11 @@ public class InvSlotConsumableLiquidIHL extends InvSlotConsumableLiquid{ } ItemStack singleStack = StackUtil.copyWithSize(stack, 1); - Iterator i$ = this.getPossibleFluids().iterator(); + Iterator i$ = this.getPossibleFluids().iterator(); while (i$.hasNext()) { - Fluid fluid = (Fluid)i$.next(); + Fluid fluid = i$.next(); if (containerItem2.fill(singleStack, new FluidStack(fluid, Integer.MAX_VALUE), false) > 0) { diff --git a/ihl/processing/invslots/InvSlotSignalProcessor.java b/ihl/processing/invslots/InvSlotSignalProcessor.java index 6663db0..f66ab13 100644 --- a/ihl/processing/invslots/InvSlotSignalProcessor.java +++ b/ihl/processing/invslots/InvSlotSignalProcessor.java @@ -1,11 +1,9 @@ package ihl.processing.invslots; -import java.util.Iterator; import net.minecraft.block.Block; import net.minecraftforge.common.util.ForgeDirection; import ic2.core.Ic2Items; import ic2.core.block.invslot.InvSlot; -import ihl.IHLMod; import ihl.datanet.Contact; import ihl.datanet.RedstoneSignalConverterTileEntity; import ihl.interfaces.IDataNode; diff --git a/ihl/processing/invslots/SlotInvSlotIronWorkbench.java b/ihl/processing/invslots/SlotInvSlotIronWorkbench.java new file mode 100644 index 0000000..94354ea --- /dev/null +++ b/ihl/processing/invslots/SlotInvSlotIronWorkbench.java @@ -0,0 +1,31 @@ +package ihl.processing.invslots; + +import net.minecraft.entity.player.EntityPlayer; +import ic2.core.slot.SlotInvSlot; +import ihl.flexible_cable.*; + +public class SlotInvSlotIronWorkbench extends SlotInvSlot { + + public IronWorkbenchInvSlot invSlot; + + public SlotInvSlotIronWorkbench(IronWorkbenchInvSlot invSlot1, int index1, + int xDisplayPosition1, int yDisplayPosition1) { + super(invSlot1, index1, xDisplayPosition1, yDisplayPosition1); + this.invSlot=invSlot1; + + } + + @Override + public boolean canTakeStack(EntityPlayer player) + { + return this.invSlot.getCanTakeStack(); + } + + + @Override + public void onSlotChanged() + { + super.onSlotChanged(); + ((IronWorkbenchTileEntity)this.invSlot.base).resetOutput(); + } +} -- cgit v1.2.3