AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-12 16:57:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Should fix tablet disassembly ignoring upgrade container, closes #1838.

Browse Source
This commit is contained in:
Florian Nücke 2016-05-30 20:36:37 +02:00
parent ce77d77baf
commit 9acb5eb26f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/li/cil/oc/api/IMC.java
View File

@ -166,9 +166,17 @@ public final class IMC {
* Signature of callbacks must be: * Signature of callbacks must be:
* <pre> * <pre>
* boolean select(ItemStack stack) * boolean select(ItemStack stack)
* ItemStack[] disassemble(ItemStack stack, ItemStack[] ingredients) * Object disassemble(ItemStack stack, ItemStack[] ingredients)
* </pre> * </pre>
* <p/> * <p/>
* Where the <code>Object</code> returned from the <code>disassemble</code>
* method must be one of the following:
* <ul>
* <li><code>ItemStack[]</code>: list of resulting items, subject to random failure.</li>
* <li><code>Object[]{ItemStack[],ItemStack[]}</code>: two lists of resulting items, the first being subject to
* random failure, the second being guaranteed drops (e.g. for item inventory contents).</li>
* </ul>
* <p/>
* Callbacks must be declared as <tt>packagePath.className.methodName</tt>. * Callbacks must be declared as <tt>packagePath.className.methodName</tt>.
* For example: <tt>com.example.Integration.callbackMethod</tt>. * For example: <tt>com.example.Integration.callbackMethod</tt>.
* *

4
src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
View File

@ -57,9 +57,9 @@ object TabletTemplate extends Template {
def disassemble(stack: ItemStack, ingredients: Array[ItemStack]) = { def disassemble(stack: ItemStack, ingredients: Array[ItemStack]) = {
val info = new TabletData(stack) val info = new TabletData(stack)
val itemName = Constants.ItemName.TabletCase(info.tier) val itemName = Constants.ItemName.TabletCase(info.tier)
Array(api.Items.get(itemName).createItemStack(1)) ++ info.items.collect { (Array(api.Items.get(itemName).createItemStack(1), info.container.orNull) ++ info.items.collect {
case Some(item) => item case Some(item) => item
}.drop(1) // Screen. }.drop(1) /* Screen */).filter(_ != null)
} }
def register() { def register() {