minecraft
/
PhysicalConnectivity
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Code cleanup

This commit is contained in:
Shadowfacts 2021-02-14 16:03:40 -05:00
parent 633f9d94aa
commit 583afd3dc9
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlock.kt
View File

@ -14,6 +14,8 @@ import net.shadowfacts.phycon.block.BlockWithEntity
*/ */
abstract class DeviceBlock<T: DeviceBlockEntity>(settings: Settings): BlockWithEntity<T>(settings), NetworkComponentBlock { abstract class DeviceBlock<T: DeviceBlockEntity>(settings: Settings): BlockWithEntity<T>(settings), NetworkComponentBlock {
abstract override fun getNetworkConnectedSides(state: BlockState, world: World, pos: BlockPos): Collection<Direction>
override fun getNetworkInterfaceForSide(side: Direction, state: BlockState, world: World, pos: BlockPos): Interface? { override fun getNetworkInterfaceForSide(side: Direction, state: BlockState, world: World, pos: BlockPos): Interface? {
return getBlockEntity(world, pos)!! return getBlockEntity(world, pos)!!
} }

9
src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlockEntity.kt
View File

@ -36,9 +36,8 @@ class SwitchBlockEntity: BlockEntity(PhyBlockEntities.SWITCH),
return interfaces.find { it.side == side }!! return interfaces.find { it.side == side }!!
} }
private fun handle(frame: EthernetFrame, fromItf: Interface) { private fun handle(frame: EthernetFrame, fromItf: SwitchInterface) {
val itfSide = (fromItf as SwitchInterface).side macTable[frame.source] = fromItf.side
macTable[frame.source] = itfSide
if (frame is PacketFrame && frame.packet is ItemStackPacket) { if (frame is PacketFrame && frame.packet is ItemStackPacket) {
val packet = frame.packet as ItemStackPacket val packet = frame.packet as ItemStackPacket
@ -54,10 +53,10 @@ class SwitchBlockEntity: BlockEntity(PhyBlockEntities.SWITCH),
if (frame.destination.type != MACAddress.Type.BROADCAST && macTable.containsKey(frame.destination)) { if (frame.destination.type != MACAddress.Type.BROADCAST && macTable.containsKey(frame.destination)) {
val dir = macTable[frame.destination]!! val dir = macTable[frame.destination]!!
println("$this ($itfSide, ${fromItf.macAddress}) forwarding $frame to side $dir") println("$this (${fromItf.side}, ${fromItf.macAddress}) forwarding $frame to side $dir")
interfaceForSide(dir).send(frame) interfaceForSide(dir).send(frame)
} else { } else {
println("$this ($itfSide, ${fromItf.macAddress}) flooding $frame") println("$this (${fromItf.side}, ${fromItf.macAddress}) flooding $frame")
flood(frame, fromItf) flood(frame, fromItf)
} }
} }