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 = {} 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 0ac1343f4..9ae19dd4d 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() 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 3faf5e3f8..72b6f3208 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 77eabebb8..6eee2c185 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -26,8 +26,7 @@ class ClassTransformer extends IClassTransformer { if (transformedClass != null && !name.startsWith("""net.minecraft.""") && !name.startsWith("""net.minecraftforge.""") - && !name.startsWith("""li.cil.oc.common.asm.""") - && !name.startsWith("""li.cil.oc.api.""")) { + && !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 diff --git a/src/main/scala/li/cil/oc/util/ItemCosts.scala b/src/main/scala/li/cil/oc/util/ItemCosts.scala index 00ab77e6e..7562ef070 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.init.{Items, Blocks} 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