New Module Textures.
BIN
psds/assembler-external.psd
Normal file
BIN
psds/assembler-inner.psd
Normal file
BIN
psds/assembler-outer.psd
Normal file
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 20 KiB |
|
@ -0,0 +1,5 @@
|
|||
{ "animation": {
|
||||
"width":1,
|
||||
"height":2
|
||||
"frametime":6
|
||||
} }
|
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 20 KiB |
|
@ -0,0 +1,5 @@
|
|||
{ "animation": {
|
||||
"width":1,
|
||||
"height":2
|
||||
"frametime":6
|
||||
} }
|
After Width: | Height: | Size: 19 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 19 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 19 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 18 KiB |
10
src/main/scala/emasher/modules/ModRummager.scala
Normal 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"
|
||||
|
||||
|
||||
}
|
|
@ -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 )
|
||||
}
|
||||
}
|
||||
|
|