From 1c6c4be7f19a390fb201d2f5220791aa63d0ea5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 10 Oct 2014 18:38:28 +0200 Subject: [PATCH] Added class with slot names for reference to API. --- .../li/cil/oc/api/component/package-info.java | 2 +- src/main/java/li/cil/oc/api/driver/Item.java | 1 + .../li/cil/oc/api/driver/item/Container.java | 1 + .../java/li/cil/oc/api/driver/item/Slot.java | 22 ++++++++++++++++ .../cil/oc/api/driver/item/package-info.java | 2 +- .../li/cil/oc/api/driver/package-info.java | 2 +- .../li/cil/oc/api/event/package-info.java | 2 +- .../java/li/cil/oc/api/fs/package-info.java | 2 +- .../li/cil/oc/api/internal/package-info.java | 2 +- .../li/cil/oc/api/machine/package-info.java | 2 +- .../li/cil/oc/api/network/package-info.java | 2 +- src/main/java/li/cil/oc/api/package-info.java | 2 +- .../li/cil/oc/api/prefab/package-info.java | 2 +- src/main/scala/li/cil/oc/common/Slot.scala | 26 ++++++++++--------- 14 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 src/main/java/li/cil/oc/api/driver/item/Slot.java diff --git a/src/main/java/li/cil/oc/api/component/package-info.java b/src/main/java/li/cil/oc/api/component/package-info.java index 4de70a1bc..b17baf887 100644 --- a/src/main/java/li/cil/oc/api/component/package-info.java +++ b/src/main/java/li/cil/oc/api/component/package-info.java @@ -8,5 +8,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Component", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.component; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/driver/Item.java b/src/main/java/li/cil/oc/api/driver/Item.java index 766052741..6ad94678e 100644 --- a/src/main/java/li/cil/oc/api/driver/Item.java +++ b/src/main/java/li/cil/oc/api/driver/Item.java @@ -73,6 +73,7 @@ public interface Item { * * @param stack the item stack to get the slot type for. * @return the slot type of the specified item. + * @see li.cil.oc.api.driver.item.Slot */ String slot(ItemStack stack); diff --git a/src/main/java/li/cil/oc/api/driver/item/Container.java b/src/main/java/li/cil/oc/api/driver/item/Container.java index e3e42a2fb..23ae14119 100644 --- a/src/main/java/li/cil/oc/api/driver/item/Container.java +++ b/src/main/java/li/cil/oc/api/driver/item/Container.java @@ -22,6 +22,7 @@ public interface Container extends Item { * * @param stack the item stack to get the provided slot type for. * @return the slot type provided by that dynamic slot upgrade. + * @see li.cil.oc.api.driver.item.Slot */ String providedSlot(ItemStack stack); diff --git a/src/main/java/li/cil/oc/api/driver/item/Slot.java b/src/main/java/li/cil/oc/api/driver/item/Slot.java new file mode 100644 index 000000000..3e19fc805 --- /dev/null +++ b/src/main/java/li/cil/oc/api/driver/item/Slot.java @@ -0,0 +1,22 @@ +package li.cil.oc.api.driver.item; + +/** + * Reference list of slot types in OpenComputers. + */ +public final class Slot { + public static final String None = "none"; + public static final String Any = "any"; + + public static final String Card = "card"; + public static final String ComponentBus = "component_bus"; + public static final String Container = "container"; + public static final String CPU = "cpu"; + public static final String Floppy = "floppy"; + public static final String HDD = "hdd"; + public static final String Memory = "memory"; + public static final String Tablet = "tablet"; + public static final String Upgrade = "upgrade"; + + private Slot() { + } +} diff --git a/src/main/java/li/cil/oc/api/driver/item/package-info.java b/src/main/java/li/cil/oc/api/driver/item/package-info.java index 6cf40a061..4381f3819 100644 --- a/src/main/java/li/cil/oc/api/driver/item/package-info.java +++ b/src/main/java/li/cil/oc/api/driver/item/package-info.java @@ -7,5 +7,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Driver|Item", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.driver.item; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/driver/package-info.java b/src/main/java/li/cil/oc/api/driver/package-info.java index c33483a89..41f4ee60b 100644 --- a/src/main/java/li/cil/oc/api/driver/package-info.java +++ b/src/main/java/li/cil/oc/api/driver/package-info.java @@ -7,5 +7,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Driver", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.driver; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/event/package-info.java b/src/main/java/li/cil/oc/api/event/package-info.java index 51cc4aa3a..786326fdb 100644 --- a/src/main/java/li/cil/oc/api/event/package-info.java +++ b/src/main/java/li/cil/oc/api/event/package-info.java @@ -5,5 +5,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Event", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.event; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/fs/package-info.java b/src/main/java/li/cil/oc/api/fs/package-info.java index e72369faa..dbbc673cb 100644 --- a/src/main/java/li/cil/oc/api/fs/package-info.java +++ b/src/main/java/li/cil/oc/api/fs/package-info.java @@ -16,5 +16,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|FileSystem", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.fs; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/internal/package-info.java b/src/main/java/li/cil/oc/api/internal/package-info.java index ce9d4a559..bdcdaa0f4 100644 --- a/src/main/java/li/cil/oc/api/internal/package-info.java +++ b/src/main/java/li/cil/oc/api/internal/package-info.java @@ -16,5 +16,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Internal", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.internal; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/machine/package-info.java b/src/main/java/li/cil/oc/api/machine/package-info.java index b097143a7..99f5168ef 100644 --- a/src/main/java/li/cil/oc/api/machine/package-info.java +++ b/src/main/java/li/cil/oc/api/machine/package-info.java @@ -19,5 +19,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Machine", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.machine; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/network/package-info.java b/src/main/java/li/cil/oc/api/network/package-info.java index bcbf469cd..7f12b31f0 100644 --- a/src/main/java/li/cil/oc/api/network/package-info.java +++ b/src/main/java/li/cil/oc/api/network/package-info.java @@ -7,5 +7,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Network", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.network; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/package-info.java b/src/main/java/li/cil/oc/api/package-info.java index c8c65c252..36f3d5d77 100644 --- a/src/main/java/li/cil/oc/api/package-info.java +++ b/src/main/java/li/cil/oc/api/package-info.java @@ -37,5 +37,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Core", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api; \ No newline at end of file diff --git a/src/main/java/li/cil/oc/api/prefab/package-info.java b/src/main/java/li/cil/oc/api/prefab/package-info.java index 22bbd1731..228efcffd 100644 --- a/src/main/java/li/cil/oc/api/prefab/package-info.java +++ b/src/main/java/li/cil/oc/api/prefab/package-info.java @@ -10,5 +10,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI|Prefab", - apiVersion = "3.0.0") + apiVersion = "3.0.1") package li.cil.oc.api.prefab; \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/Slot.scala b/src/main/scala/li/cil/oc/common/Slot.scala index 590c307d1..9e628dc5e 100644 --- a/src/main/scala/li/cil/oc/common/Slot.scala +++ b/src/main/scala/li/cil/oc/common/Slot.scala @@ -1,19 +1,21 @@ package li.cil.oc.common -object Slot { - val None = "none" - val Any = "any" +import li.cil.oc.api.driver - val Card = "card" - val ComponentBus = "component_bus" - val Container = "container" - val CPU = "cpu" - val Floppy = "floppy" - val HDD = "hdd" - val Memory = "memory" - val Tablet = "tablet" +object Slot { + val None = driver.item.Slot.None + val Any = driver.item.Slot.Any + + val Card = driver.item.Slot.Card + val ComponentBus = driver.item.Slot.ComponentBus + val Container = driver.item.Slot.Container + val CPU = driver.item.Slot.CPU + val Floppy = driver.item.Slot.Floppy + val HDD = driver.item.Slot.HDD + val Memory = driver.item.Slot.Memory + val Tablet = driver.item.Slot.Tablet val Tool = "tool" - val Upgrade = "upgrade" + val Upgrade = driver.item.Slot.Upgrade val All = Array(Card, ComponentBus, Container, CPU, Floppy, HDD, Memory, Tablet, Tool, Upgrade) }