non-silent exception handling, some other fixes and improvements

server/src/main/kotlin/net/horizonsend/ion/server/command/misc/TransportDebugCommand.kt

@@ -212,7 +212,7 @@ object TransportDebugCommand : SLCommand() {
 		sender.highlightBlocks(destinations.map(::toVec3i), 50L)
 	}
 
-	const val COLLECT_TRANSPORT_METRICS = true
+	const val COLLECT_TRANSPORT_METRICS = false
 
 	val floodFillTimes = LinkedBlockingDeque<Long>(10_000)
 	val solarFloodFillTimes = LinkedBlockingDeque<Long>(10_000)

server/src/main/kotlin/net/horizonsend/ion/server/features/gui/custom/filter/ItemFilterGui.kt

@@ -93,7 +93,7 @@ class ItemFilterGui(val viewer: Player, private val data: FilterData<ItemStack,
 			if (cursor.isEmpty) {
 				entry.value = null
 			} else {
-				entry.value = cursor.clone()
+				entry.value = cursor.asQuantity(1)
 			}
 
 			notifyWindows()

server/src/main/kotlin/net/horizonsend/ion/server/features/transport/NewTransport.kt

@@ -30,8 +30,8 @@ import kotlin.concurrent.fixedRateTimer
 object NewTransport : IonServerComponent(runAfterTick = true /* Run after tick to wait on the full server startup. */) {
 	private val transportManagers = ConcurrentHashMap.newKeySet<TransportManager<*>>()
 
-	lateinit var monitorThread: Timer
-	lateinit var executor: ExecutorService
+	private lateinit var monitorThread: Timer
+	private lateinit var executor: ExecutorService
 
 	override fun onEnable() {
 		executor = Executors.newFixedThreadPool(64, Tasks.namedThreadFactory("wire-transport"))
@@ -58,6 +58,17 @@ object NewTransport : IonServerComponent(runAfterTick = true /* Run after tick t
 		saveExtractors()
 	}
 
+	fun runTask(task: () -> Unit) {
+		executor.execute {
+			try {
+				task.invoke()
+			} catch (e: Throwable) {
+				log.error("Encountered exception when executing async transport task: ${e.message}")
+				e.printStackTrace()
+			}
+		}
+	}
+
 	fun registerTransportManager(manager: TransportManager<*>) {
 		transportManagers.add(manager)
 	}

server/src/main/kotlin/net/horizonsend/ion/server/features/transport/filters/FilterType.kt

@@ -1,6 +1,7 @@
 package net.horizonsend.ion.server.features.transport.filters
 
 import net.horizonsend.ion.common.utils.text.toComponent
+import net.horizonsend.ion.server.IonServerComponent
 import net.horizonsend.ion.server.features.transport.filters.FilterMeta.EmptyFilterMeta
 import net.horizonsend.ion.server.features.transport.filters.FilterMeta.ItemFilterMeta
 import net.horizonsend.ion.server.features.transport.fluids.Fluid
@@ -109,7 +110,7 @@ abstract class FilterType<T : Any, M : FilterMeta>(
 		}
 	}
 
-	companion object {
+	companion object : IonServerComponent() {
 		private val byId = mapOf("FLUID" to FluidType, "ITEMS" to ItemType)
 
 		operator fun get(identifier: String): FilterType<*, *> = byId[identifier] ?: throw NoSuchElementException("Filter type $identifier not found")

server/src/main/kotlin/net/horizonsend/ion/server/features/transport/nodes/cache/FluidTransportCache.kt

@@ -44,21 +44,21 @@ class FluidTransportCache(holder: CacheHolder<FluidTransportCache>): TransportCa
 		.addSimpleNode(Material.LAPIS_BLOCK, FluidNode.FluidInvertedMergeNode)
 		.build()
 
-	override fun tickExtractor(location: BlockKey, delta: Double, metaData: ExtractorMetaData?) { NewTransport.executor.submit {
+	override fun tickExtractor(location: BlockKey, delta: Double, metaData: ExtractorMetaData?) { NewTransport.runTask {
 		val world = holder.getWorld()
 		val sources = getExtractorSourceEntities<FluidStoringEntity>(location) { it.isEmpty() }
-		val source = sources.randomOrNull() ?: return@submit //TODO take from all
+		val source = sources.randomOrNull() ?: return@runTask //TODO take from all
 
-		if (source.getStoredResources().isEmpty()) return@submit
+		if (source.getStoredResources().isEmpty()) return@runTask
 
-		val originNode = holder.nodeProvider.invoke(type, holder.getWorld(), location) ?: return@submit
+		val originNode = holder.nodeProvider.invoke(type, holder.getWorld(), location) ?: return@runTask
 
 		// Flood fill on the network to find power inputs, and check input data for multiblocks using that input that can store any power
 		val destinations: Collection<BlockKey> = getNetworkDestinations<FluidNode.FluidInputNode>(location, originNode) { node ->
 			world.ion.inputManager.getHolders(type, node.position).any { entity -> entity is FluidStoringEntity && !entity.isFull() }
 		}
 
-		if (destinations.isEmpty()) return@submit
+		if (destinations.isEmpty()) return@runTask
 
 		val transferLimit = (transportSettings().extractorConfiguration.maxFluidRemovedPerExtractorTick * delta).roundToInt()
 		val resources = source.getExtractableResources()

server/src/main/kotlin/net/horizonsend/ion/server/features/transport/nodes/cache/ItemTransportCache.kt

@@ -15,32 +15,32 @@ import net.horizonsend.ion.server.features.transport.nodes.types.ItemNode
 import net.horizonsend.ion.server.features.transport.nodes.types.ItemNode.SolidGlassNode
 import net.horizonsend.ion.server.features.transport.nodes.types.Node
 import net.horizonsend.ion.server.features.transport.util.CacheType
+import net.horizonsend.ion.server.features.transport.util.transaction.Change
 import net.horizonsend.ion.server.features.transport.util.transaction.ItemTransaction
 import net.horizonsend.ion.server.miscellaneous.utils.ADJACENT_BLOCK_FACES
+import net.horizonsend.ion.server.miscellaneous.utils.LegacyItemUtils
 import net.horizonsend.ion.server.miscellaneous.utils.STAINED_GLASS_PANE_TYPES
 import net.horizonsend.ion.server.miscellaneous.utils.STAINED_GLASS_TYPES
 import net.horizonsend.ion.server.miscellaneous.utils.coordinates.BlockKey
-import net.horizonsend.ion.server.miscellaneous.utils.coordinates.Vec3i
 import net.horizonsend.ion.server.miscellaneous.utils.coordinates.getRelative
 import net.horizonsend.ion.server.miscellaneous.utils.coordinates.toBlockKey
 import net.horizonsend.ion.server.miscellaneous.utils.coordinates.toVec3i
 import net.horizonsend.ion.server.miscellaneous.utils.debugAudience
 import net.horizonsend.ion.server.miscellaneous.utils.minecraft
 import net.minecraft.core.BlockPos
 import net.minecraft.world.Container
+import net.minecraft.world.level.block.entity.BlockEntity
 import org.bukkit.Material
 import org.bukkit.Material.CRAFTING_TABLE
 import org.bukkit.block.BlockFace
-import org.bukkit.block.BlockState
 import org.bukkit.block.data.type.CommandBlock
 import org.bukkit.block.data.type.Hopper
 import org.bukkit.craftbukkit.block.impl.CraftGrindstone
 import org.bukkit.craftbukkit.inventory.CraftInventory
-import org.bukkit.inventory.Inventory
 import org.bukkit.inventory.ItemStack
 import kotlin.reflect.KClass
 
-class ItemTransportCache(holder: CacheHolder<ItemTransportCache>): TransportCache(holder) {
+class ItemTransportCache(override val holder: CacheHolder<ItemTransportCache>): TransportCache(holder) {
 	override val type: CacheType = CacheType.ITEMS
 	override val extractorNodeClass: KClass<out Node> = ItemNode.ItemExtractorNode::class
 	override val nodeFactory: NodeCacheFactory = NodeCacheFactory.builder()
@@ -70,7 +70,7 @@ class ItemTransportCache(holder: CacheHolder<ItemTransportCache>): TransportCach
 		delta: Double,
 		metaData: ExtractorMetaData?,
 	) {
-		NewTransport.executor.submit {
+		NewTransport.runTask {
 			measureOrFallback(TransportDebugCommand.extractorTickTimes) {
 				handleExtractorTick(location, delta, metaData as? ItemExtractorMetaData)
 			}
@@ -105,7 +105,7 @@ class ItemTransportCache(holder: CacheHolder<ItemTransportCache>): TransportCach
 			debugAudience.information("Checking ${item.type} [$count]")
 			val destinations: List<BlockKey> = getNetworkDestinations<ItemNode.InventoryNode>(location, originNode) { node ->
 				val inventory = getInventory(node.position)
-				inventory != null && inventory.isEmpty //TODO full
+				inventory != null && LegacyItemUtils.canFit(inventory, item, 1)
 			}.toList()
 
 			if (destinations.isEmpty()) {
@@ -128,7 +128,7 @@ class ItemTransportCache(holder: CacheHolder<ItemTransportCache>): TransportCach
 				) { node, blockFace ->
 					if (node !is ItemNode.FilterNode) return@findPath true
 					debugAudience.serverError("checking filter")
-					node.matches(item)
+					node.matches(item).apply { debugAudience.serverError("filter returned $this") }
 				}
 			} }
 
@@ -155,36 +155,46 @@ class ItemTransportCache(holder: CacheHolder<ItemTransportCache>): TransportCach
 				destinations.minBy { key -> extractorPosition.distance(toVec3i(key)) }
 			}
 
-			val path = destinationMap[destination]!!
+			debugAudience.information("Selected destination ${toVec3i(destination)}")
 
-			val transact = ItemTransaction(holder as CacheHolder<ItemTransportCache>, { stack1, stack2 ->
+//			val path = destinationMap[destination]!!
+			val diffProvider = { stack1: ItemStack, stack2: ItemStack ->
 				stack1.isSimilar(stack2) //TODO
-			})
+			}
+			debugAudience.information("1")
+
+			val transact = ItemTransaction(holder)
+			debugAudience.information("2")
 
 			for (source in sources) {
-				val key = toBlockKey(Vec3i((source.holder as BlockState).location))
+				println("source holder: ${source.inventory}")
+				val key = toBlockKey((source.inventory as BlockEntity).blockPos.toVec3i())
+				debugAudience.information("3 ${toVec3i(key)}")
 
-				transact.addRemoval(key, ItemTransaction.ItemDiff(item, -count))
+				transact.addRemoval(key, Change.ItemRemoval(item, count, diffProvider))
 			}
+			debugAudience.information("4")
 
-			transact.addAddition(destination,  ItemTransaction.ItemDiff(item, count))
+			transact.addAddition(destination, Change.ItemAddition(item, count))
 
+			debugAudience.information("Committing transaction")
 			transact.commit()
+			debugAudience.information("Finished transaction")
 
 			debugAudience.highlightBlock(toVec3i(destination), 40L)
 		}
 	}
 
-	fun getInventory(localKey: BlockKey): Inventory? {
+	fun getInventory(localKey: BlockKey): CraftInventory? {
 		val globalVec = holder.transportManager.getGlobalCoordinate(toVec3i(localKey))
 		val nmsChunk = holder.getWorld().minecraft.getChunkIfLoaded(globalVec.x.shr(4), globalVec.z.shr(4)) ?: return null
 		val tileEntity = nmsChunk.getBlockEntity(BlockPos(globalVec.x, globalVec.y, globalVec.z)) as? Container ?: return null
 
 		return CraftInventory(tileEntity)
 	}
 
-	fun getSources(extractorLocation: BlockKey): Set<Inventory> {
-		val inventories = mutableSetOf<Inventory>()
+	fun getSources(extractorLocation: BlockKey): Set<CraftInventory> {
+		val inventories = mutableSetOf<CraftInventory>()
 
 		for (face in ADJACENT_BLOCK_FACES) {
 			val inventoryLocation = getRelative(extractorLocation, face)

server/src/main/kotlin/net/horizonsend/ion/server/features/transport/nodes/cache/PowerTransportCache.kt

@@ -50,7 +50,7 @@ class PowerTransportCache(holder: CacheHolder<PowerTransportCache>) : TransportC
 		tickPowerExtractor(location, delta)
 	}
 
-	private fun tickPowerExtractor(location: BlockKey, delta: Double) = NewTransport.executor.submit {
+	private fun tickPowerExtractor(location: BlockKey, delta: Double) = NewTransport.runTask {
 		measureOrFallback(TransportDebugCommand.extractorTickTimes) {
 			val world = holder.getWorld()
 
@@ -95,7 +95,7 @@ class PowerTransportCache(holder: CacheHolder<PowerTransportCache>) : TransportC
 		}
 	}
 
-	private fun tickSolarPanel(location: BlockKey, delta: Double, solarCache: SolarPanelCache) = NewTransport.executor.submit {
+	private fun tickSolarPanel(location: BlockKey, delta: Double, solarCache: SolarPanelCache) = NewTransport.runTask {
 		measureOrFallback(TransportDebugCommand.solarTickTimes) {
 			val transportPower = solarCache.getPower(holder.getWorld(), location, delta)
 			if (transportPower == 0) return@measureOrFallback

server/src/main/kotlin/net/horizonsend/ion/server/features/transport/nodes/cache/TransportCache.kt

@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap
 import kotlin.jvm.optionals.getOrNull
 import kotlin.reflect.KClass
 
-abstract class TransportCache(val holder: CacheHolder<*>) {
+abstract class TransportCache(open val holder: CacheHolder<*>) {
 	/**
 	 * Cache containing a cache state at their corresponding block position.
 	 * The state can either be empty, or present. Empty key / value pairs have not been cached.

server/src/main/kotlin/net/horizonsend/ion/server/features/transport/util/transaction/Change.kt

@@ -12,7 +12,7 @@ interface Change {
 
 	class ItemRemoval(val item: ItemStack, val amount: Int, val similarityProvider: (ItemStack, ItemStack) -> Boolean) : Change {
 		override fun check(inventory: Inventory): Boolean {
-			TODO("Not yet implemented")
+			return true //TODO
 		}
 
 		override fun execute(inventory: Inventory): Boolean {
@@ -51,14 +51,10 @@ interface Change {
 
 	class ItemAddition(val item: ItemStack, val amount: Int) : Change {
 		override fun check(inventory: Inventory): Boolean {
-			TODO("Not yet implemented")
+			return LegacyItemUtils.canFit(inventory, item, amount) //TODO
 		}
 
 		override fun execute(inventory: Inventory): Boolean {
-			if (!LegacyItemUtils.canFit(inventory, item, amount)) {
-				return false
-			}
-
 			val stacks = mutableListOf<ItemStack>()
 
 			var remaining = amount

server/src/main/kotlin/net/horizonsend/ion/server/miscellaneous/registrations/Components.kt

@@ -88,6 +88,7 @@ import net.horizonsend.ion.server.features.starship.hyperspace.HyperspaceBeacons
 import net.horizonsend.ion.server.features.starship.movement.PlanetTeleportCooldown
 import net.horizonsend.ion.server.features.starship.subsystem.shield.StarshipShields
 import net.horizonsend.ion.server.features.transport.NewTransport
+import net.horizonsend.ion.server.features.transport.filters.FilterType
 import net.horizonsend.ion.server.features.transport.fluids.FluidRegistry
 import net.horizonsend.ion.server.features.transport.old.TransportConfig
 import net.horizonsend.ion.server.features.transport.old.Wires
@@ -144,6 +145,7 @@ val components: List<IonComponent> = listOf(
 
 	TransportConfig.Companion,
 	Pipes,
+	FilterType,
 	Filters,
 	Wires,
 	NewTransport,