From cac4cbd8f4b7f0a0cb086b428a703f35caa0837a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 1 Apr 2014 20:14:28 +0200 Subject: [PATCH 1/3] fixed invalid chars not being rendered as '?' but not at all --- .../li/cil/oc/client/renderer/MonospaceFontRenderer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala index c2ca64c47..2fb4278c8 100644 --- a/src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala @@ -107,10 +107,10 @@ object MonospaceFontRenderer { // unless every char has a different color this should be quite efficient. var cfg = -1 for ((ch, col) <- value.zip(color.map(PackedColor.unpackForeground(_, depth)))) { - val index = 1 + chars.indexOf(ch) match { + val index = 1 + (chars.indexOf(ch) match { case -1 => chars.indexOf('?') case i => i - } + }) if (col != cfg) { // Color changed, force flush and adjust colors. flush() From 3217c721c3f491d29fcbeff1e72e08938e26b4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 1 Apr 2014 20:36:27 +0200 Subject: [PATCH 2/3] fixed a render glitch on cables probably noone would ever have noticed (slightly stretched on one face) --- .../oc/client/renderer/tileentity/CableRenderer.scala | 4 ++-- .../scala/li/cil/oc/common/asm/ClassTransformer.scala | 9 ++++----- src/main/scala/li/cil/oc/util/ItemCosts.scala | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala index 9f2770394..49e7c8254 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala @@ -66,8 +66,8 @@ object CableRenderer extends TileEntitySpecialRenderer { if (connects) { val (axis, sign, uv1, uv2, uv3, uv4) = side match { - case ForgeDirection.WEST => (0, -1, 1, 1, 1, 1) - case ForgeDirection.EAST => (0, 1, 3, 3, 1, 1) + case ForgeDirection.WEST => (0, -1, 1, 1, 0, 0) + case ForgeDirection.EAST => (0, 1, 2, 2, 1, 1) case ForgeDirection.DOWN => (1, -1, 1, 3, 2, 0) case ForgeDirection.UP => (1, 1, 2, 0, 3, 1) case ForgeDirection.NORTH => (2, -1, 0, 2, 1, 1) diff --git a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala index cf8101da7..f43ae4a63 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -24,11 +24,10 @@ class ClassTransformer extends IClassTransformer { transformedClass = ensureStargateTechCompatibility(transformedClass) } if (transformedClass != null - && !name.startsWith( """net.minecraft.""") - && !name.startsWith( """net.minecraftforge.""") - && !name.startsWith( """li.cil.oc.common.asm.""") - && !name.startsWith( """li.cil.oc.api.""")) { - if (name.startsWith( """li.cil.oc.""")) { + && !name.startsWith("""net.minecraft.""") + && !name.startsWith("""net.minecraftforge.""") + && !name.startsWith("""li.cil.oc.common.asm.""")) { + if (name.startsWith("""li.cil.oc.""")) { // Strip foreign interfaces from scala generated classes. This is // primarily intended to clean up mix-ins / synthetic classes // generated by Scala. diff --git a/src/main/scala/li/cil/oc/util/ItemCosts.scala b/src/main/scala/li/cil/oc/util/ItemCosts.scala index ae9b09a9d..d975ba40c 100644 --- a/src/main/scala/li/cil/oc/util/ItemCosts.scala +++ b/src/main/scala/li/cil/oc/util/ItemCosts.scala @@ -6,7 +6,6 @@ import net.minecraft.block.Block import net.minecraft.item.crafting._ import net.minecraft.item.{Item, ItemStack} import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe, ShapedOreRecipe} -import scala.Some import scala.collection.convert.WrapAsScala._ import scala.collection.mutable From 1acdd5f8ae8956cf5c75a58f234c281710f37b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 2 Apr 2014 12:43:31 +0200 Subject: [PATCH 3/3] Adjusted package search path to search in working directory last. This is similar to the change that was made a while back to the PATH env variable. It's also like it is in standard Lua. Should mostly avoid issues like #191. --- src/main/resources/assets/opencomputers/lua/rom/lib/package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/opencomputers/lua/rom/lib/package.lua b/src/main/resources/assets/opencomputers/lua/rom/lib/package.lua index d0dcd8eab..b83119b0b 100644 --- a/src/main/resources/assets/opencomputers/lua/rom/lib/package.lua +++ b/src/main/resources/assets/opencomputers/lua/rom/lib/package.lua @@ -1,6 +1,6 @@ local package = {} -package.path = "./?.lua;/lib/?.lua;/usr/lib/?.lua;/home/lib/?.lua" +package.path = "/lib/?.lua;/usr/lib/?.lua;/home/lib/?.lua;./?.lua" local loading = {}