Conflicts:
	src/minecraft/assemblyline/client/render/RenderHelper.java
	src/minecraft/assemblyline/client/render/RenderImprintable.java
This commit is contained in:
Brian Ricketts 2012-12-29 18:24:45 -06:00
commit 85cf225efb
2 changed files with 31 additions and 31 deletions

View file

@ -1,6 +1,6 @@
package assemblyline.common.machine.imprinter;
public interface ISlotWatcher
{
public void slotContentsChanged();
}
package assemblyline.common.machine.imprinter;
public interface ISlotWatcher
{
public void slotContentsChanged();
}

View file

@ -1,25 +1,25 @@
package assemblyline.common.machine.imprinter;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
public class WatchedSlot extends Slot
{
ISlotWatcher slotWatcher;
public WatchedSlot(IInventory inventory, int id, int xPosition, int yPosition, ISlotWatcher slotWatcher)
{
super(inventory, id, xPosition, yPosition);
this.slotWatcher = slotWatcher;
}
@Override
public void onSlotChanged()
{
if (slotWatcher != null)
{
slotWatcher.slotContentsChanged();
}
}
}
package assemblyline.common.machine.imprinter;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
public class WatchedSlot extends Slot
{
ISlotWatcher slotWatcher;
public WatchedSlot(IInventory inventory, int id, int xPosition, int yPosition, ISlotWatcher slotWatcher)
{
super(inventory, id, xPosition, yPosition);
this.slotWatcher = slotWatcher;
}
@Override
public void onSlotChanged()
{
if (slotWatcher != null)
{
slotWatcher.slotContentsChanged();
}
}
}