From 592a73dd0c855ce8e06ca57cc0eea76d983c3096 Mon Sep 17 00:00:00 2001 From: payonel Date: Thu, 2 Nov 2017 00:09:00 -0700 Subject: [PATCH 1/6] check for nbt advDmg for custom damage --- .../li/cil/oc/integration/vanilla/ConverterItemStack.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala b/src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala index 667e59dbc..8dd817cce 100644 --- a/src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala +++ b/src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala @@ -41,6 +41,11 @@ object ConverterItemStack extends api.driver.Converter { mkString("\n") } + // IC2 reactor items custom damage + if (stack.hasTagCompound && stack.getTagCompound.hasKey("advDmg", NBT.TAG_INT)) { + output += "customDamage" -> Int.box(stack.getTagCompound.getInteger("advDmg")) + } + val enchantments = mutable.ArrayBuffer.empty[mutable.Map[String, Any]] EnchantmentHelper.getEnchantments(stack).collect { case (enchantment, level) => From 14d4df3c713b9c628fef28bdbe1906dde4eabc59 Mon Sep 17 00:00:00 2001 From: payonel Date: Sun, 5 Nov 2017 10:30:50 -0800 Subject: [PATCH 2/6] remove thaumcraft api it's not even being used in the build, and it was removed in >=1.11 --- src/api/java/thaumcraft/api | 1 - 1 file changed, 1 deletion(-) delete mode 160000 src/api/java/thaumcraft/api diff --git a/src/api/java/thaumcraft/api b/src/api/java/thaumcraft/api deleted file mode 160000 index 795177f28..000000000 --- a/src/api/java/thaumcraft/api +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 795177f28b9ff80ee09fc166d66294e273ef188e From dafd15367a6e8f3b62b5dc368877b7a4bce738ea Mon Sep 17 00:00:00 2001 From: payonel Date: Sun, 5 Nov 2017 10:51:07 -0800 Subject: [PATCH 3/6] better chip diamond recipe --- .../resources/assets/opencomputers/recipes/default.recipes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes index 94966bf5f..9230e0101 100644 --- a/src/main/resources/assets/opencomputers/recipes/default.recipes +++ b/src/main/resources/assets/opencomputers/recipes/default.recipes @@ -392,12 +392,14 @@ ingotIron { } chipDiamond { type: shapeless - input: gemDiamond + input: ["oc:materialCuttingWire", gemDiamond] output: 6 } gemDiamond = false -cuttingWire = false +cuttingWire { + input: [[stickWood, nuggetIron, stickWood]] +} acid { type: shapeless input: [bucketWater, sugar, slimeball, fermentedSpiderEye, bone] From 369e4e42ff09a0c5031b223cf5d235ae5870009e Mon Sep 17 00:00:00 2001 From: payonel Date: Sun, 5 Nov 2017 17:08:01 -0800 Subject: [PATCH 4/6] update tis version --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index b11d301a5..7efc75ebb 100644 --- a/build.properties +++ b/build.properties @@ -10,6 +10,6 @@ forestry.version=5.3.1.38 ic2.version=2.7.85-ex111 jei.version=4.2.11.251 mcmp.version=2.0.0_17 -tis3d.version=1.1.1.37 +tis3d.version=1.3.0.53 maven.url=file:///home/www/maven.cil.li/web From e62113de416754442ed3f494dda51a2cf88b0cd5 Mon Sep 17 00:00:00 2001 From: payonel Date: Sun, 5 Nov 2017 17:25:31 -0800 Subject: [PATCH 5/6] thaumcraft api version update --- src/api/java/thaumcraft/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/java/thaumcraft/api b/src/api/java/thaumcraft/api index 774135f44..ced30ed35 160000 --- a/src/api/java/thaumcraft/api +++ b/src/api/java/thaumcraft/api @@ -1 +1 @@ -Subproject commit 774135f441fd56f295d82069b251ee7e1e084869 +Subproject commit ced30ed35097d53cdb2a843d705477e52896e54b From e3a47c5b44e7e79b81dc374cb644569ec5bdb8b8 Mon Sep 17 00:00:00 2001 From: payonel Date: Wed, 8 Nov 2017 21:57:37 -0800 Subject: [PATCH 6/6] use data.container to access the tablet's disk drive, not the entire tablet inventory stack --- src/main/scala/li/cil/oc/common/item/Tablet.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/item/Tablet.scala b/src/main/scala/li/cil/oc/common/item/Tablet.scala index 8c58b8b98..166fc2bda 100644 --- a/src/main/scala/li/cil/oc/common/item/Tablet.scala +++ b/src/main/scala/li/cil/oc/common/item/Tablet.scala @@ -378,7 +378,7 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp def containerSlotTier: Int = if (data.container.isEmpty) Tier.None - else Option(Driver.driverFor(stack, getClass)) match { + else Option(Driver.driverFor(data.container, getClass)) match { case Some(driver: Container) => driver.providedTier(stack) case _ => Tier.None }