AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-27 15:06:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
This commit is contained in:
Florian Nücke 2014-04-02 12:55:56 +02:00
commit 698638d0ce
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/assets/opencomputers/lua/rom/lib/package.lua
View File

@ -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 = {}

4
src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala
View File

@ -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()

4
src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala
View File

@ -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)

3
src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
View File

@ -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

1
src/main/scala/li/cil/oc/util/ItemCosts.scala
View File

@ -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