AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 01:39:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor rendering tweaks.

Browse Source
This commit is contained in:
Florian Nücke 2015-02-12 00:49:20 +01:00
parent 22759e827b
commit 284c4fd3d0
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/assets/opencomputers/models/block/assembler.json
View File

@ -10,11 +10,11 @@
"to": [ 16, 7, 16 ], "to": [ 16, 7, 16 ],
"faces": { "faces": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"north": { "uv": [ 0, 0, 16, 7 ], "texture": "#side" }, "north": { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 7 ], "texture": "#side" }, "south": { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 7 ], "texture": "#side" }, "west": { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 7 ], "texture": "#side" } "east": { "uv": [ 0, 0, 16, 7 ], "texture": "#side", "cullface": "east" }
} }
}, },
{ "from": [ 2, 7, 2 ], { "from": [ 2, 7, 2 ],
@ -31,12 +31,12 @@
{ "from": [ 0, 9, 0 ], { "from": [ 0, 9, 0 ],
"to": [ 16, 16, 16 ], "to": [ 16, 16, 16 ],
"faces": { "faces": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
"north": { "uv": [ 0, 9, 16, 16 ], "texture": "#side" }, "north": { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 9, 16, 16 ], "texture": "#side" }, "south": { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 9, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 9, 16, 16 ], "texture": "#side" } "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#side", "cullface": "east" }
} }
} }
] ]

2
src/main/scala/li/cil/oc/common/block/Assembler.scala
View File

@ -14,7 +14,7 @@ class Assembler extends SimpleBlock with traits.PowerAcceptor with traits.StateA
override def isOpaqueCube = false override def isOpaqueCube = false
override def isVisuallyOpaque = super.isVisuallyOpaque override def isFullCube = false
override def isBlockSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = side == EnumFacing.DOWN || side == EnumFacing.UP override def isBlockSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = side == EnumFacing.DOWN || side == EnumFacing.UP

4
src/main/scala/li/cil/oc/common/block/ServerRack.scala
View File

@ -30,6 +30,10 @@ class ServerRack extends RedstoneAware with traits.PowerAcceptor with traits.Rot
} }
} }
override def isOpaqueCube = false
override def isFullCube = false
override def isBlockSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = side == EnumFacing.SOUTH override def isBlockSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = side == EnumFacing.SOUTH
override def isSideSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = toLocal(world, pos, side) != EnumFacing.SOUTH override def isSideSolid(world: IBlockAccess, pos: BlockPos, side: EnumFacing) = toLocal(world, pos, side) != EnumFacing.SOUTH