From 0b64248a5ac603b4ab187d35242e67d86c70d567 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Wed, 19 Jun 2013 06:25:22 -0400 Subject: [PATCH] updated dark lib --- Dark-Library | 2 +- src/minecraft/assemblyline/common/AssemblyLine.java | 2 +- .../assemblyline/common/imprinter/ContainerImprinter.java | 8 ++++---- .../common/imprinter/TileEntityImprinter.java | 6 +++--- .../common/machine/encoder/ContainerEncoder.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dark-Library b/Dark-Library index ed2868d98..cf1d9f459 160000 --- a/Dark-Library +++ b/Dark-Library @@ -1 +1 @@ -Subproject commit ed2868d981c816954e5f321e011a1b2fa6874e0b +Subproject commit cf1d9f45980405e4872b67e61a589989d5fb6ebd diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index cb6d61be0..a373c61d1 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -51,7 +51,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import dark.core.DarkMain; -import dark.core.power.PowerSystems; +import dark.core.PowerSystems; @ModstatInfo(prefix = "asmline") @Mod(modid = AssemblyLine.CHANNEL, name = AssemblyLine.MOD_NAME, version = AssemblyLine.VERSION, dependencies = "after:BasicComponents; after:IC2", useMetadata = true) diff --git a/src/minecraft/assemblyline/common/imprinter/ContainerImprinter.java b/src/minecraft/assemblyline/common/imprinter/ContainerImprinter.java index 8a6dfee80..46e4c00c9 100644 --- a/src/minecraft/assemblyline/common/imprinter/ContainerImprinter.java +++ b/src/minecraft/assemblyline/common/imprinter/ContainerImprinter.java @@ -6,10 +6,10 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import assemblyline.common.AssemblyLine; -import dark.library.inv.ISlotWatcher; -import dark.library.inv.SlotCraftingResult; -import dark.library.inv.SlotRestricted; -import dark.library.inv.WatchedSlot; +import dark.library.gui.ISlotWatcher; +import dark.library.gui.SlotCraftingResult; +import dark.library.gui.SlotRestricted; +import dark.library.gui.WatchedSlot; public class ContainerImprinter extends Container implements ISlotWatcher { diff --git a/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java b/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java index 906398fb6..2e6cc4cf3 100644 --- a/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java +++ b/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java @@ -29,9 +29,9 @@ import assemblyline.common.AssemblyLine; import com.google.common.io.ByteArrayDataInput; import dark.helpers.Pair; -import dark.library.inv.ISlotPickResult; -import dark.library.machine.crafting.AutoCraftingManager; -import dark.library.machine.crafting.IAutoCrafter; +import dark.library.gui.ISlotPickResult; +import dark.library.machine.AutoCraftingManager; +import dark.library.machine.IAutoCrafter; public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInventory, IArmbotUseable, IPacketReceiver, ISlotPickResult, IAutoCrafter { diff --git a/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java index 130047aea..e0c09866e 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java +++ b/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import assemblyline.common.AssemblyLine; -import dark.library.inv.SlotRestricted; +import dark.library.gui.SlotRestricted; public class ContainerEncoder extends Container {