New Module Textures.

This commit is contained in:
Emasher 2015-07-25 13:24:57 -05:00
parent 964c41b8b0
commit 82bc9b73dd
21 changed files with 22 additions and 2 deletions

BIN
psds/assembler-external.psd Normal file

Binary file not shown.

BIN
psds/assembler-inner.psd Normal file

Binary file not shown.

BIN
psds/assembler-outer.psd Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View file

@ -0,0 +1,5 @@
{ "animation": {
"width":1,
"height":2
"frametime":6
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View file

@ -0,0 +1,5 @@
{ "animation": {
"width":1,
"height":2
"frametime":6
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -0,0 +1,10 @@
package emasher.modules
import emasher.api.SocketModule
class ModRummager( id: Int ) extends SocketModule( id, "eng_toolbox:rummager", "eng_toolbox:rummager-magnet" ) {
override def getLocalizedName = "Rummager"
}

View file

@ -2,7 +2,7 @@ package emasher.util
import emasher.EngineersToolbox
import emasher.api.{SocketTileAccess, Util}
import emasher.modules.ModMagnet
import emasher.modules.{ModRummager, ModMagnet}
import emasher.packethandling.{AdapterSideMessage, ChangerSideMessage}
import emasher.tileentities.{TileAdapterBase, TileDirectionChanger, TileFrame}
import net.minecraft.block.Block
@ -158,7 +158,7 @@ object FrameMovementUtil {
for( i <- 0 to 5 ) {
val d = ForgeDirection.getOrientation( i )
val m = ts.getSide( d )
if( m.isInstanceOf[ ModMagnet ] ) {
if( m.isInstanceOf[ ModMagnet ] || ( m.isInstanceOf[ModRummager] && ts.getConfigForSide( d ).meta == 1 ) ) {
result.append( d )
}
}