From b7254735740324b11b0e701a8e1f2bff37cbcbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 25 Mar 2014 13:21:23 +0100 Subject: [PATCH] fixed gregtech analyzer recipe (needed wildcard for sensor damage) --- .../assets/opencomputers/recipes/gregtech.recipes | 2 +- src/main/scala/li/cil/oc/common/SaveHandler.scala | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/resources/assets/opencomputers/recipes/gregtech.recipes b/src/main/resources/assets/opencomputers/recipes/gregtech.recipes index 76e040c14..98c76932f 100644 --- a/src/main/resources/assets/opencomputers/recipes/gregtech.recipes +++ b/src/main/resources/assets/opencomputers/recipes/gregtech.recipes @@ -5,7 +5,7 @@ include file("hardmode.recipes") analyzer { input: [["oc:craftingTransistor", torchRedstoneActive, "oc:craftingTransistor"] - ["oc:circuitTier2", "item.GT_Scanner", "oc:circuitTier2"] + ["oc:circuitTier2",{item="item.GT_Scanner", subID=any}, "oc:circuitTier2"] [screwAluminium, craftingToolScrewdriver, screwAluminium]] } diff --git a/src/main/scala/li/cil/oc/common/SaveHandler.scala b/src/main/scala/li/cil/oc/common/SaveHandler.scala index 5a1410ea7..5422d819a 100644 --- a/src/main/scala/li/cil/oc/common/SaveHandler.scala +++ b/src/main/scala/li/cil/oc/common/SaveHandler.scala @@ -20,10 +20,12 @@ object SaveHandler { def scheduleSave(dimension: Int, chunk: ChunkCoordIntPair, name: String, data: Array[Byte]) = saveData.synchronized { if (chunk == null) throw new IllegalArgumentException("chunk is null") else { - val chunks = saveData.getOrElseUpdate(dimension, mutable.Map.empty) // Make sure we get rid of old versions (e.g. left over by other mods - // triggering a save - this is mostly used for RiM compatibility). - chunks.values.foreach(_ -= name) + // triggering a save - this is mostly used for RiM compatibility). We + // need to do this for *each* dimension, in case computers are teleported + // across dimensions. + for (chunks <- saveData.values) chunks.values.foreach(_ -= name) + val chunks = saveData.getOrElseUpdate(dimension, mutable.Map.empty) chunks.getOrElseUpdate(chunk, mutable.Map.empty) += name -> data } }