.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# reformat
-f6f4c12d0304c945c03ab70556048ee8d78e4019

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id "fabric-loom" version "0.12.9"
 	id "maven-publish"
-    id "org.jetbrains.kotlin.jvm" version "1.7.10"
+    id "org.jetbrains.kotlin.jvm" version "1.6.10"
 }
 
 archivesBaseName = project.archives_base_name
@@ -79,9 +79,9 @@ repositories {
 dependencies {
 	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
 	// You may need to force-disable transitiveness on them.
-//	modImplementation "alexiil.mc.lib:libblockattributes-all:${project.libblockattributes_version}"
+	modImplementation "alexiil.mc.lib:libblockattributes-all:${project.libblockattributes_version}"
-//	include "alexiil.mc.lib:libblockattributes-core:${project.libblockattributes_version}"
+	include "alexiil.mc.lib:libblockattributes-core:${project.libblockattributes_version}"
-//	include "alexiil.mc.lib:libblockattributes-items:${project.libblockattributes_version}"
+	include "alexiil.mc.lib:libblockattributes-items:${project.libblockattributes_version}"
 
 	implementation project(":kiwi-java")
 	include project(":kiwi-java")

plugin/rei/src/main/kotlin/net/shadowfacts/phycon/plugin/rei/PhyConPluginClient.kt

@@ -17,7 +17,7 @@ import java.lang.invoke.MethodHandles
 /**
  * @author shadowfacts
  */
-object PhyConPluginClient : ClientModInitializer, REIClientPlugin, AbstractTerminalScreen.SearchQueryListener {
+object PhyConPluginClient: ClientModInitializer, REIClientPlugin, AbstractTerminalScreen.SearchQueryListener {
 
 	private val logger = LogManager.getLogger()
 	private var isHighlightingHandle: MethodHandle? = null
@@ -39,8 +39,7 @@ object PhyConPluginClient : ClientModInitializer, REIClientPlugin, AbstractTermi
 		AbstractTerminalScreen.searchQueryListener = this
 		try {
 			val clazz = Class.forName("me.shedaniel.rei.impl.client.gui.widget.search.OverlaySearchField")
-            isHighlightingHandle =
+			isHighlightingHandle = MethodHandles.publicLookup().findStaticGetter(clazz, "isHighlighting", Boolean::class.java)
-                MethodHandles.publicLookup().findStaticGetter(clazz, "isHighlighting", Boolean::class.java)
 		} catch (e: ReflectiveOperationException) {
 			logger.warn("Unable to find OverlaySearchField.isHighlighting, highlight sync will be disabled", e)
 		}

plugin/rei/src/main/kotlin/net/shadowfacts/phycon/plugin/rei/PhyConPluginCommon.kt

@@ -18,27 +18,23 @@ import java.util.stream.IntStream
 /**
  * @author shadowfacts
  */
-object PhyConPluginCommon : REIServerPlugin, PhyConPlugin {
+object PhyConPluginCommon: REIServerPlugin, PhyConPlugin {
 	const val MODID = "phycon_rei"
 
 	lateinit var REI_SYNC_KEY: TerminalSettingKey<REISyncMode>
 		private set
 
 	override fun registerMenuInfo(registry: MenuInfoRegistry) {
-        registry.register(
+		registry.register(CategoryIdentifier.of("minecraft", "plugins/crafting"), CraftingTerminalScreenHandler::class.java, SimpleMenuInfoProvider.of(::TerminalInfo))
-            CategoryIdentifier.of("minecraft", "plugins/crafting"),
-            CraftingTerminalScreenHandler::class.java,
-            SimpleMenuInfoProvider.of(::TerminalInfo)
-        )
 	}
 
 	override fun initializePhyCon(api: PhyConAPI) {
 		REI_SYNC_KEY = api.registerTerminalSetting(Identifier(MODID, "rei_sync"), REISyncMode.OFF)
 	}
 
-    class TerminalInfo<D : SimpleGridMenuDisplay>(
+	class TerminalInfo<D: SimpleGridMenuDisplay>(
 			private val display: D,
-    ) : SimpleGridMenuInfo<CraftingTerminalScreenHandler, D> {
+	): SimpleGridMenuInfo<CraftingTerminalScreenHandler, D> {
 
 		override fun getCraftingResultSlotIndex(menu: CraftingTerminalScreenHandler): Int {
 			return menu.resultSlot.id

plugin/rei/src/main/kotlin/net/shadowfacts/phycon/plugin/rei/REISyncMode.kt

@@ -8,7 +8,7 @@ import net.shadowfacts.phycon.api.TerminalSetting
 /**
  * @author shadowfacts
  */
-enum class REISyncMode : TerminalSetting {
+enum class REISyncMode: TerminalSetting {
     OFF,
     ON,
     HIGHLIGHT_ONLY;

plugin/techreborn/src/main/kotlin/net/shadowfacts/phycon/plugin/techreborn/PhyConTR.kt

@@ -14,24 +14,15 @@ import techreborn.init.TRContent
 /**
  * @author shadowfacts
  */
-object PhyConTR : ModInitializer {
+object PhyConTR: ModInitializer {
 
 	override fun onInitialize() {
 		TRContent.StorageUnit.values().forEach {
-            ItemAttributes.GROUPED_INV.setBlockAdder(
+			ItemAttributes.GROUPED_INV.setBlockAdder(AttributeSourceType.COMPAT_WRAPPER, it.block, ::addStorageUnitGroupedInv)
-                AttributeSourceType.COMPAT_WRAPPER,
-                it.block,
-                ::addStorageUnitGroupedInv
-            )
 		}
 	}
 
-    private fun addStorageUnitGroupedInv(
+	private fun addStorageUnitGroupedInv(world: World, pos: BlockPos, state: BlockState, to: AttributeList<GroupedItemInv>) {
-        world: World,
-        pos: BlockPos,
-        state: BlockState,
-        to: AttributeList<GroupedItemInv>
-    ) {
 		(world.getBlockEntity(pos) as? StorageUnitBaseBlockEntity)?.also { su ->
 			to.offer(StorageUnitWrapper(su))
 		}

plugin/techreborn/src/main/kotlin/net/shadowfacts/phycon/plugin/techreborn/StorageUnitWrapper.kt

@@ -16,7 +16,7 @@ import kotlin.math.min
  */
 class StorageUnitWrapper(
 	val be: StorageUnitBaseBlockEntity,
-) : GroupedItemInv {
+): GroupedItemInv {
 
 	override fun getStoredStacks(): Set<ItemStack> {
 		val set = ItemStackCollections.set()

src/main/java/net/shadowfacts/phycon/api/Interface.java

@@ -16,7 +16,6 @@ public interface Interface {
 
 	void send(@NotNull EthernetFrame frame);
 
-	default void cableDisconnected() {
+	default void cableDisconnected() {}
-	}
 
 }

src/main/java/net/shadowfacts/phycon/api/NetworkDevice.java

@@ -10,9 +10,9 @@ public interface NetworkDevice {
 
 	/**
 	 * The IP address of this device.
-	 * <p>
+	 *
 	 * If a device has not been assigned an address by a DHCP server, it may self-assign a randomly generated one.
-	 * <p>
+	 *
 	 * The address of a network device should never be the broadcast address.
 	 *
 	 * @return The IP address of this device.

src/main/java/net/shadowfacts/phycon/api/PhyAttributes.java

@@ -0,0 +1,13 @@
+package net.shadowfacts.phycon.api;
+
+import alexiil.mc.lib.attributes.Attribute;
+import alexiil.mc.lib.attributes.Attributes;
+
+/**
+ * @author shadowfacts
+ */
+public class PhyAttributes {
+
+	public static final Attribute<PacketSink> PACKET_SINK = Attributes.create(PacketSink.class);
+
+}

src/main/java/net/shadowfacts/phycon/api/TerminalSetting.java

@@ -13,7 +13,6 @@ public interface TerminalSetting {
 
 	int[] getUV();
 
-	@Nullable
+	@Nullable Text getTooltip();
-	Text getTooltip();
 
 }

src/main/java/net/shadowfacts/phycon/api/util/IPAddress.java

@@ -23,14 +23,12 @@ public final class IPAddress {
 	}
 
 	private static final Random ipAddressRandom = new Random();
-
 	@NotNull
 	public static IPAddress random() {
 		return random(ipAddressRandom);
 	}
 
 	private static final Pattern IP_PATTERN = Pattern.compile("^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$");
-
 	@Nullable
 	public static IPAddress parse(String s) {
 		Matcher matcher = IP_PATTERN.matcher(s);

src/main/java/net/shadowfacts/phycon/api/util/MACAddress.java

@@ -22,7 +22,6 @@ public final class MACAddress {
 	}
 
 	private static final Random macAddressRandom = new Random();
-
 	@NotNull
 	public static MACAddress random() {
 		return random(macAddressRandom);
@@ -62,7 +61,7 @@ public final class MACAddress {
 	public boolean equals(Object o) {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
-		MACAddress that = (MACAddress) o;
+		MACAddress that = (MACAddress)o;
 		return address == that.address;
 	}
 

src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java

@@ -26,7 +26,7 @@ public class MixinHandledScreen {
 			at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableDepthTest()V")
 	)
 	private void drawSlotUnderlay(MatrixStack matrixStack, Slot slot, CallbackInfo ci) {
-		if ((Object) this instanceof AbstractTerminalScreen<?, ?> self) {
+		if ((Object)this instanceof AbstractTerminalScreen<?, ?> self) {
 			self.drawSlotUnderlay(matrixStack, slot);
 		}
 	}
@@ -36,7 +36,7 @@ public class MixinHandledScreen {
 			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/ItemRenderer;renderGuiItemOverlay(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V")
 	)
 	private void drawSlotAmount(ItemRenderer itemRenderer, TextRenderer textRenderer, ItemStack stack, int x, int y, @Nullable String countLabel, MatrixStack matrixStack, Slot slot) {
-		if ((Object) this instanceof AbstractTerminalScreen<?, ?> self) {
+		if ((Object)this instanceof AbstractTerminalScreen<?, ?> self) {
 			AbstractTerminalScreenHandler<?> handler = self.getScreenHandler();
 			if (slot.id < handler.getNetworkSlotsEnd() && stack.getCount() > 1) {
 				self.drawNetworkSlotAmount(stack, x, y);

src/main/kotlin/net/shadowfacts/cacao/AbstractCacaoScreen.kt

@@ -9,8 +9,8 @@ interface AbstractCacaoScreen {
 
 	val windows: List<Window>
 
-    fun <T : Window> addWindow(window: T, index: Int): T
+	fun <T: Window> addWindow(window: T, index: Int): T
-    fun <T : Window> addWindow(window: T): T
+	fun <T: Window> addWindow(window: T): T
 
 	fun removeWindow(window: Window)
 

src/main/kotlin/net/shadowfacts/cacao/CacaoHandledScreen.kt

@@ -20,11 +20,11 @@ import java.util.*
 /**
  * @author shadowfacts
  */
-open class CacaoHandledScreen<Handler : ScreenHandler>(
+open class CacaoHandledScreen<Handler: ScreenHandler>(
 	handler: Handler,
 	playerInv: PlayerInventory,
 	title: Text,
-) : HandledScreen<Handler>(handler, playerInv, title), AbstractCacaoScreen {
+): HandledScreen<Handler>(handler, playerInv, title), AbstractCacaoScreen {
 
 	private val _windows = LinkedList<Window>()
 
@@ -33,7 +33,7 @@ open class CacaoHandledScreen<Handler : ScreenHandler>(
 	private var hasAppeared = false
 
 
-    override fun <T : Window> addWindow(window: T, index: Int): T {
+	override fun <T: Window> addWindow(window: T, index: Int): T {
 		if (window is ScreenHandlerWindow && window.screenHandler != handler) {
 			throw RuntimeException("Adding ScreenHandlerWindow to CacaoHandledScreen with different screen handler is not supported")
 		}

src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt

@@ -20,11 +20,10 @@ import java.util.*
  *
  * @author shadowfacts
  */
-open class CacaoScreen(title: Text = LiteralText("CacaoScreen")) : Screen(title), AbstractCacaoScreen {
+open class CacaoScreen(title: Text = LiteralText("CacaoScreen")): Screen(title), AbstractCacaoScreen {
 
 	// _windows is the internal, mutable object, since we only want it to by mutated by the add/removeWindow methods.
 	private val _windows = LinkedList<Window>()
-
 	/**
 	 * The list of windows that belong to this screen.
 	 *
@@ -43,7 +42,7 @@ open class CacaoScreen(title: Text = LiteralText("CacaoScreen")) : Screen(title)
 	 * @param index The index to insert the window into the window list at.
 	 * @return The window that was added, as a convenience.
 	 */
-    override fun <T : Window> addWindow(window: T, index: Int): T {
+	override fun <T: Window> addWindow(window: T, index: Int): T {
 		if (hasAppeared) {
 			window.viewController.viewWillAppear()
 		}

src/main/kotlin/net/shadowfacts/cacao/LayoutVariable.kt

@@ -14,10 +14,10 @@ class LayoutVariable(
 	val view: View?,
 	val layoutGuide: LayoutGuide?,
 	val property: String,
-) : Variable("LayoutVariable") {
+): Variable("LayoutVariable") {
 
-    constructor(view: View, property: String) : this(view, null, property)
+	constructor(view: View, property: String): this(view, null, property)
-    constructor(layoutGuide: LayoutGuide, property: String) : this(null, layoutGuide, property)
+	constructor(layoutGuide: LayoutGuide, property: String): this(null, layoutGuide, property)
 
 	init {
 		if ((view == null) == (layoutGuide == null)) {

src/main/kotlin/net/shadowfacts/cacao/README.md

@@ -1,12 +1,9 @@
 # Cacao
-
 Cacao is a UI framework for Fabric/Minecraft mods based on Apple's [Cocoa](https://en.wikipedia.org/wiki/Cocoa_(API)
 UI toolkit.
 
 ## Architecture
-
 ### Screen
-
 A [CacaoScreen][] is the object that acts as the interface between Minecraft GUI code and the Cacao framework.
 
 The CacaoScreen draws Cacao views on screen and passes Minecraft input events to the appropriate Views. The CacaoScreen
@@ -15,7 +12,6 @@ owns a group of [Window](#window) objects which are displayed on screen, one on
 [CacaoScreen]: https://git.shadowfacts.net/minecraft/ASMR/src/branch/master/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt
 
 ### Window
-
 A [Window][] object has a root [View Controller](#view-controller) that it displays on screen.
 
 The Window occupies the entire screen space and translates events from the screen to the root View Controller's View.
@@ -25,7 +21,6 @@ view hierarchy.
 [Window]: https://git.shadowfacts.net/minecraft/ASMR/src/branch/master/src/main/kotlin/net/shadowfacts/cacao/Window.kt
 
 ### View Controller
-
 A [ViewController][] object owns a view, receives lifecycle events for it, and is generally used to control the view.
 
 Each View Controller has a single root [View](#view) which in turn may have subviews.
@@ -33,7 +28,6 @@ Each View Controller has a single root [View](#view) which in turn may have subv
 [ViewController]: https://git.shadowfacts.net/minecraft/ASMR/src/branch/master/src/main/kotlin/net/shadowfacts/cacao/viewcontroller/ViewController.kt
 
 ### View
-
 A [View][] object represents a single view on screen. It handles drawing, positioning, and directly handles input. 
 
 [View]: https://git.shadowfacts.net/minecraft/ASMR/src/branch/master/src/main/kotlin/net/shadowfacts/cacao/view/View.kt

src/main/kotlin/net/shadowfacts/cacao/geometry/AxisPosition.kt

@@ -10,12 +10,10 @@ enum class AxisPosition {
 	 * Top for vertical, left for horizontal.
 	 */
 	LEADING,
-
 	/**
 	 * Center X/Y.
 	 */
 	CENTER,
-
 	/**
 	 * Bottom for vertical, right for horizontal.
 	 */

src/main/kotlin/net/shadowfacts/cacao/geometry/Point.kt

@@ -7,7 +7,7 @@ package net.shadowfacts.cacao.geometry
  */
 data class Point(val x: Double, val y: Double) {
 
-    constructor(x: Int, y: Int) : this(x.toDouble(), y.toDouble())
+	constructor(x: Int, y: Int): this(x.toDouble(), y.toDouble())
 
 	companion object {
 		val ORIGIN = Point(0.0, 0.0)

src/main/kotlin/net/shadowfacts/cacao/geometry/Rect.kt

@@ -7,7 +7,7 @@ package net.shadowfacts.cacao.geometry
  */
 data class Rect(val left: Double, val top: Double, val width: Double, val height: Double) {
 
-    constructor(origin: Point, size: Size) : this(origin.x, origin.y, size.width, size.height)
+	constructor(origin: Point, size: Size): this(origin.x, origin.y, size.width, size.height)
 
 	val right: Double by lazy {
 		left + width

src/main/kotlin/net/shadowfacts/cacao/util/Color.kt

@@ -14,7 +14,7 @@ data class Color(val red: Int, val green: Int, val blue: Int, val alpha: Int = 2
 	/**
 	 * Constructs a color from the packed RGB color.
 	 */
-    constructor(rgb: Int, alpha: Int = 255) : this(rgb shr 16, (rgb shr 8) and 255, rgb and 255, alpha)
+	constructor(rgb: Int, alpha: Int = 255): this(rgb shr 16, (rgb shr 8) and 255, rgb and 255, alpha)
 
 	/**
 	 * The ARGB packed representation of this color.

src/main/kotlin/net/shadowfacts/cacao/util/EnumHelper.kt

@@ -5,13 +5,13 @@ package net.shadowfacts.cacao.util
  */
 object EnumHelper {
 
-    fun <E : Enum<E>> next(value: E): E {
+	fun <E: Enum<E>> next(value: E): E {
 		val constants = value.declaringClass.enumConstants
 		val index = constants.indexOf(value) + 1
 		return if (index < constants.size) constants[index] else constants.first()
 	}
 
-    fun <E : Enum<E>> previous(value: E): E {
+	fun <E: Enum<E>> previous(value: E): E {
 		val constants = value.declaringClass.enumConstants
 		val index = constants.indexOf(value) - 1
 		return if (index >= 0) constants[index] else constants.last()

src/main/kotlin/net/shadowfacts/cacao/util/LayoutGuide.kt

@@ -28,11 +28,6 @@ class LayoutGuide(
 	val centerYAnchor: LayoutVariable = LayoutVariable(this, "centerY")
 
 	val frame: Rect
-        get() = Rect(
+		get() = Rect(leftAnchor.value - owningView.leftAnchor.value, topAnchor.value - owningView.topAnchor.value, widthAnchor.value, heightAnchor.value)
-            leftAnchor.value - owningView.leftAnchor.value,
-            topAnchor.value - owningView.topAnchor.value,
-            widthAnchor.value,
-            heightAnchor.value
-        )
 
 }

src/main/kotlin/net/shadowfacts/cacao/util/RenderHelper.kt

@@ -23,7 +23,7 @@ import kotlin.math.roundToInt
  *
  * @author shadowfacts
  */
-object RenderHelper : DrawableHelper() {
+object RenderHelper: DrawableHelper() {
 
 	val disabled = (System.getProperty("cacao.drawing.disabled") ?: "false").toBoolean()
 
@@ -48,27 +48,13 @@ object RenderHelper : DrawableHelper() {
 		if (disabled) return
 		RenderSystem.setShader(GameRenderer::getPositionTexShader)
 		RenderSystem.setShaderTexture(0, texture.location)
-        draw(
+		draw(matrixStack, rect.left, rect.top, texture.u, texture.v, rect.width, rect.height, texture.width, texture.height)
-            matrixStack,
-            rect.left,
-            rect.top,
-            texture.u,
-            texture.v,
-            rect.width,
-            rect.height,
-            texture.width,
-            texture.height
-        )
 	}
 
 	fun drawLine(start: Point, end: Point, z: Double, width: Float, color: Color) {
 		if (disabled) return
 
 		RenderSystem.lineWidth(width)
-        RenderSystem.enableBlend()
-        RenderSystem.disableTexture()
-        RenderSystem.defaultBlendFunc()
-        RenderSystem.setShader(GameRenderer::getPositionColorShader)
 		val tessellator = Tessellator.getInstance()
 		val buffer = tessellator.buffer
 		buffer.begin(VertexFormat.DrawMode.LINES, VertexFormats.POSITION_COLOR)
@@ -80,50 +66,18 @@ object RenderHelper : DrawableHelper() {
 	/**
 	 * Draws the bound texture with the given screen and texture position and size.
 	 */
-    fun draw(
+	fun draw(matrixStack: MatrixStack, x: Double, y: Double, u: Int, v: Int, width: Double, height: Double, textureWidth: Int, textureHeight: Int) {
-        matrixStack: MatrixStack,
-        x: Double,
-        y: Double,
-        u: Int,
-        v: Int,
-        width: Double,
-        height: Double,
-        textureWidth: Int,
-        textureHeight: Int
-    ) {
 		if (disabled) return
 		val uStart = u.toFloat() / textureWidth
 		val uEnd = (u + width).toFloat() / textureWidth
 		val vStart = v.toFloat() / textureHeight
 		val vEnd = (v + height).toFloat() / textureHeight
-        drawTexturedQuad(
+		drawTexturedQuad(matrixStack.peek().positionMatrix, x, x + width, y, y + height, 0.0, uStart, uEnd, vStart, vEnd)
-            matrixStack.peek().positionMatrix,
-            x,
-            x + width,
-            y,
-            y + height,
-            0.0,
-            uStart,
-            uEnd,
-            vStart,
-            vEnd
-        )
 	}
 
 	// Copied from net.minecraft.client.gui.DrawableHelper
 	// TODO: use an access transformer to just call minecraft's impl
-    private fun drawTexturedQuad(
+	private fun drawTexturedQuad(matrix: Matrix4f, x0: Double, x1: Double, y0: Double, y1: Double, z: Double, u0: Float, u1: Float, v0: Float, v1: Float) {
-        matrix: Matrix4f,
-        x0: Double,
-        x1: Double,
-        y0: Double,
-        y1: Double,
-        z: Double,
-        u0: Float,
-        u1: Float,
-        v0: Float,
-        v1: Float
-    ) {
 		val bufferBuilder = Tessellator.getInstance().buffer
 		bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE)
 		bufferBuilder.vertex(matrix, x0.toFloat(), y1.toFloat(), z.toFloat()).texture(u0, v1).next()
@@ -142,7 +96,7 @@ object RenderHelper : DrawableHelper() {
 		drawTooltip(matrixStack, texts.map(Text::asOrderedText), mouse)
 	}
 
-    private val dummyScreen = object : Screen(LiteralText("")) {
+	private val dummyScreen = object: Screen(LiteralText("")) {
 		init {
 			textRenderer = MinecraftClient.getInstance().textRenderer
 			itemRenderer = MinecraftClient.getInstance().itemRenderer

src/main/kotlin/net/shadowfacts/cacao/util/properties/ObservableLateInitProperty.kt

@@ -5,7 +5,7 @@ import kotlin.reflect.KProperty
 /**
  * @author shadowfacts
  */
-class ObservableLateInitProperty<T : Any>(val observer: (T) -> Unit) {
+class ObservableLateInitProperty<T: Any>(val observer: (T) -> Unit) {
 
 	lateinit var storage: T
 

src/main/kotlin/net/shadowfacts/cacao/util/texture/NinePatchTexture.kt

@@ -15,13 +15,7 @@ import net.minecraft.util.Identifier
  * @param centerWidth The width of the center patch.
  * @param centerHeight The height of the center patch.
  */
-data class NinePatchTexture(
+data class NinePatchTexture(val texture: Texture, val cornerWidth: Int, val cornerHeight: Int, val centerWidth: Int, val centerHeight: Int) {
-    val texture: Texture,
-    val cornerWidth: Int,
-    val cornerHeight: Int,
-    val centerWidth: Int,
-    val centerHeight: Int
-) {
 
 	companion object {
 		val PANEL_BG = NinePatchTexture(Texture(Identifier("textures/gui/demo_background.png"), 0, 0), 5, 5, 238, 156)

src/main/kotlin/net/shadowfacts/cacao/view/BezierCurveView.kt

@@ -9,7 +9,7 @@ import net.shadowfacts.cacao.util.RenderHelper
 /**
  * @author shadowfacts
  */
-class BezierCurveView(val curve: BezierCurve) : View() {
+class BezierCurveView(val curve: BezierCurve): View() {
 
 	private val points by lazy {
 		val step = 0.05

src/main/kotlin/net/shadowfacts/cacao/view/DialogView.kt

@@ -19,13 +19,13 @@ class DialogView(
 	val buttonTypes: Array<ButtonType>,
 	val iconTexture: Texture?,
 	val buttonCallback: (ButtonType, Window) -> Unit
-) : View() {
+): View() {
 
 	interface ButtonType {
 		val localizedName: Text
 	}
 
-    enum class DefaultButtonType : ButtonType {
+	enum class DefaultButtonType: ButtonType {
 		CANCEL, CONFIRM, OK, CLOSE;
 
 		override val localizedName: Text

src/main/kotlin/net/shadowfacts/cacao/view/Label.kt

@@ -31,7 +31,7 @@ class Label(
 		val maxLines: Int = 0,
 		val wrappingMode: WrappingMode = WrappingMode.WRAP,
 		var textAlignment: TextAlignment = TextAlignment.LEFT
-) : View() {
+): View() {
 
 	companion object {
 		private val textRenderer: TextRenderer
@@ -52,7 +52,7 @@ class Label(
 		maxLines: Int = 0,
 		wrappingMode: WrappingMode = WrappingMode.WRAP,
 		textAlignment: TextAlignment = TextAlignment.LEFT,
-    ) : this(LiteralText(text), shadow, maxLines, wrappingMode, textAlignment)
+	): this(LiteralText(text), shadow, maxLines, wrappingMode, textAlignment)
 
 	/**
 	 * The text of this label. Mutating this field will update the intrinsic content size and trigger a layout.

src/main/kotlin/net/shadowfacts/cacao/view/NinePatchView.kt

@@ -17,7 +17,7 @@ import kotlin.math.roundToInt
  * @author shadowfacts
  * @param ninePatch The nine patch texture that this view will draw.
  */
-open class NinePatchView(val ninePatch: NinePatchTexture) : View() {
+open class NinePatchView(val ninePatch: NinePatchTexture): View() {
 
 	// Corners
 	private val topLeftDelegate = ResettableLazyProperty {
@@ -26,44 +26,24 @@ open class NinePatchView(val ninePatch: NinePatchTexture) : View() {
 	protected open val topLeft by topLeftDelegate
 
 	private val topRightDelegate = ResettableLazyProperty {
-        Rect(
+		Rect(bounds.width - ninePatch.cornerWidth, 0.0, ninePatch.cornerWidth.toDouble(), ninePatch.cornerHeight.toDouble())
-            bounds.width - ninePatch.cornerWidth,
-            0.0,
-            ninePatch.cornerWidth.toDouble(),
-            ninePatch.cornerHeight.toDouble()
-        )
 	}
 	protected open val topRight by topRightDelegate
 
 	private val bottomLeftDelegate = ResettableLazyProperty {
-        Rect(
+		Rect(0.0, bounds.height - ninePatch.cornerHeight, ninePatch.cornerWidth.toDouble(), ninePatch.cornerHeight.toDouble())
-            0.0,
-            bounds.height - ninePatch.cornerHeight,
-            ninePatch.cornerWidth.toDouble(),
-            ninePatch.cornerHeight.toDouble()
-        )
 	}
 	protected open val bottomLeft by bottomLeftDelegate
 
 	private val bottomRightDelegate = ResettableLazyProperty {
-        Rect(
+		Rect(bounds.width - ninePatch.cornerWidth, bounds.height - ninePatch.cornerHeight, ninePatch.cornerWidth.toDouble(), ninePatch.cornerHeight.toDouble())
-            bounds.width - ninePatch.cornerWidth,
-            bounds.height - ninePatch.cornerHeight,
-            ninePatch.cornerWidth.toDouble(),
-            ninePatch.cornerHeight.toDouble()
-        )
 	}
 	protected open val bottomRight by bottomRightDelegate
 
 
 	// Edges
 	private val topMiddleDelegate = ResettableLazyProperty {
-        Rect(
+		Rect(ninePatch.cornerWidth.toDouble(), topLeft.top, bounds.width - 2 * ninePatch.cornerWidth, ninePatch.cornerHeight.toDouble())
-            ninePatch.cornerWidth.toDouble(),
-            topLeft.top,
-            bounds.width - 2 * ninePatch.cornerWidth,
-            ninePatch.cornerHeight.toDouble()
-        )
 	}
 	protected open val topMiddle by topMiddleDelegate
 
@@ -73,12 +53,7 @@ open class NinePatchView(val ninePatch: NinePatchTexture) : View() {
 	protected open val bottomMiddle by bottomMiddleDelegate
 
 	private val leftMiddleDelegate = ResettableLazyProperty {
-        Rect(
+		Rect(topLeft.left, ninePatch.cornerHeight.toDouble(), ninePatch.cornerWidth.toDouble(), bounds.height - 2 * ninePatch.cornerHeight)
-            topLeft.left,
-            ninePatch.cornerHeight.toDouble(),
-            ninePatch.cornerWidth.toDouble(),
-            bounds.height - 2 * ninePatch.cornerHeight
-        )
 	}
 	protected open val leftMiddle by leftMiddleDelegate
 
@@ -94,17 +69,7 @@ open class NinePatchView(val ninePatch: NinePatchTexture) : View() {
 	}
 	protected open val center by centerDelegate
 
-    private val delegates = listOf(
+	private val delegates = listOf(topLeftDelegate, topRightDelegate, bottomLeftDelegate, bottomRightDelegate, topMiddleDelegate, bottomMiddleDelegate, leftMiddleDelegate, rightMiddleDelegate, centerDelegate)
-        topLeftDelegate,
-        topRightDelegate,
-        bottomLeftDelegate,
-        bottomRightDelegate,
-        topMiddleDelegate,
-        bottomMiddleDelegate,
-        leftMiddleDelegate,
-        rightMiddleDelegate,
-        centerDelegate
-    )
 
 	override fun didLayout() {
 		super.didLayout()
@@ -128,114 +93,30 @@ open class NinePatchView(val ninePatch: NinePatchTexture) : View() {
 	private fun drawEdges(matrixStack: MatrixStack) {
 		// Horizontal
 		for (i in 0 until (topMiddle.width.roundToInt() / ninePatch.centerWidth)) {
-            RenderHelper.draw(
+			RenderHelper.draw(matrixStack, topMiddle.left + i * ninePatch.centerWidth, topMiddle.top, ninePatch.topMiddle.u, ninePatch.topMiddle.v, ninePatch.centerWidth.toDouble(), topMiddle.height, ninePatch.texture.width, ninePatch.texture.height)
-                matrixStack,
+			RenderHelper.draw(matrixStack, bottomMiddle.left + i * ninePatch.centerWidth, bottomMiddle.top, ninePatch.bottomMiddle.u, ninePatch.bottomMiddle.v, ninePatch.centerWidth.toDouble(), bottomMiddle.height, ninePatch.texture.width, ninePatch.texture.height)
-                topMiddle.left + i * ninePatch.centerWidth,
-                topMiddle.top,
-                ninePatch.topMiddle.u,
-                ninePatch.topMiddle.v,
-                ninePatch.centerWidth.toDouble(),
-                topMiddle.height,
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
-            RenderHelper.draw(
-                matrixStack,
-                bottomMiddle.left + i * ninePatch.centerWidth,
-                bottomMiddle.top,
-                ninePatch.bottomMiddle.u,
-                ninePatch.bottomMiddle.v,
-                ninePatch.centerWidth.toDouble(),
-                bottomMiddle.height,
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
 		}
 		val remWidth = topMiddle.width.roundToInt() % ninePatch.centerWidth
 		if (remWidth > 0) {
-            RenderHelper.draw(
+			RenderHelper.draw(matrixStack, topMiddle.right - remWidth, topMiddle.top, ninePatch.topMiddle.u, ninePatch.topMiddle.v, remWidth.toDouble(), ninePatch.cornerHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
-                matrixStack,
+			RenderHelper.draw(matrixStack, bottomMiddle.right - remWidth, bottomMiddle.top, ninePatch.bottomMiddle.u, ninePatch.bottomMiddle.v, remWidth.toDouble(), ninePatch.cornerHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
-                topMiddle.right - remWidth,
-                topMiddle.top,
-                ninePatch.topMiddle.u,
-                ninePatch.topMiddle.v,
-                remWidth.toDouble(),
-                ninePatch.cornerHeight.toDouble(),
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
-            RenderHelper.draw(
-                matrixStack,
-                bottomMiddle.right - remWidth,
-                bottomMiddle.top,
-                ninePatch.bottomMiddle.u,
-                ninePatch.bottomMiddle.v,
-                remWidth.toDouble(),
-                ninePatch.cornerHeight.toDouble(),
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
 		}
 
 		// Vertical
 		for (i in 0 until (leftMiddle.height.roundToInt() / ninePatch.centerHeight)) {
-            RenderHelper.draw(
+			RenderHelper.draw(matrixStack, leftMiddle.left, leftMiddle.top + i * ninePatch.centerHeight, ninePatch.leftMiddle.u, ninePatch.leftMiddle.v, ninePatch.cornerWidth.toDouble(), ninePatch.centerHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
-                matrixStack,
+			RenderHelper.draw(matrixStack, rightMiddle.left, rightMiddle.top + i * ninePatch.centerHeight, ninePatch.rightMiddle.u, ninePatch.rightMiddle.v, ninePatch.cornerWidth.toDouble(), ninePatch.centerHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
-                leftMiddle.left,
-                leftMiddle.top + i * ninePatch.centerHeight,
-                ninePatch.leftMiddle.u,
-                ninePatch.leftMiddle.v,
-                ninePatch.cornerWidth.toDouble(),
-                ninePatch.centerHeight.toDouble(),
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
-            RenderHelper.draw(
-                matrixStack,
-                rightMiddle.left,
-                rightMiddle.top + i * ninePatch.centerHeight,
-                ninePatch.rightMiddle.u,
-                ninePatch.rightMiddle.v,
-                ninePatch.cornerWidth.toDouble(),
-                ninePatch.centerHeight.toDouble(),
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
 		}
 		val remHeight = leftMiddle.height.roundToInt() % ninePatch.centerHeight
 		if (remHeight > 0) {
-            RenderHelper.draw(
+			RenderHelper.draw(matrixStack, leftMiddle.left, leftMiddle.bottom - remHeight, ninePatch.leftMiddle.u, ninePatch.leftMiddle.v, ninePatch.cornerWidth.toDouble(), remHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
-                matrixStack,
+			RenderHelper.draw(matrixStack, rightMiddle.left, rightMiddle.bottom - remHeight, ninePatch.rightMiddle.u, ninePatch.rightMiddle.v, ninePatch.cornerWidth.toDouble(), remHeight.toDouble(), ninePatch.texture.width, ninePatch.texture.height)
-                leftMiddle.left,
-                leftMiddle.bottom - remHeight,
-                ninePatch.leftMiddle.u,
-                ninePatch.leftMiddle.v,
-                ninePatch.cornerWidth.toDouble(),
-                remHeight.toDouble(),
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
-            RenderHelper.draw(
-                matrixStack,
-                rightMiddle.left,
-                rightMiddle.bottom - remHeight,
-                ninePatch.rightMiddle.u,
-                ninePatch.rightMiddle.v,
-                ninePatch.cornerWidth.toDouble(),
-                remHeight.toDouble(),
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
 		}
 	}
 
 	private fun drawCenter(matrixStack: MatrixStack) {
 		for (i in 0 until (center.height.roundToInt() / ninePatch.centerHeight)) {
-            drawCenterRow(
+			drawCenterRow(matrixStack, center.top + i * ninePatch.centerHeight.toDouble(), ninePatch.centerHeight.toDouble())
-                matrixStack,
-                center.top + i * ninePatch.centerHeight.toDouble(),
-                ninePatch.centerHeight.toDouble()
-            )
 		}
 		val remHeight = center.height.roundToInt() % ninePatch.centerHeight
 		if (remHeight > 0) {
@@ -245,31 +126,11 @@ open class NinePatchView(val ninePatch: NinePatchTexture) : View() {
 
 	private fun drawCenterRow(matrixStack: MatrixStack, y: Double, height: Double) {
 		for (i in 0 until (center.width.roundToInt() / ninePatch.centerWidth)) {
-            RenderHelper.draw(
+			RenderHelper.draw(matrixStack, center.left + i * ninePatch.centerWidth, y, ninePatch.center.u, ninePatch.center.v, ninePatch.centerWidth.toDouble(), height, ninePatch.texture.width, ninePatch.texture.height)
-                matrixStack,
-                center.left + i * ninePatch.centerWidth,
-                y,
-                ninePatch.center.u,
-                ninePatch.center.v,
-                ninePatch.centerWidth.toDouble(),
-                height,
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
 		}
 		val remWidth = center.width.roundToInt() % ninePatch.centerWidth
 		if (remWidth > 0) {
-            RenderHelper.draw(
+			RenderHelper.draw(matrixStack, center.right - remWidth, y, ninePatch.center.u, ninePatch.center.v, remWidth.toDouble(), height, ninePatch.texture.width, ninePatch.texture.height)
-                matrixStack,
-                center.right - remWidth,
-                y,
-                ninePatch.center.u,
-                ninePatch.center.v,
-                remWidth.toDouble(),
-                height,
-                ninePatch.texture.width,
-                ninePatch.texture.height
-            )
 		}
 	}
 

src/main/kotlin/net/shadowfacts/cacao/view/StackView.kt

@@ -25,11 +25,10 @@ open class StackView(
 		val axis: Axis,
 		val distribution: Distribution = Distribution.FILL,
 		val spacing: Double = 0.0
-) : View() {
+): View() {
 
 	// the internal, mutable list of arranged subviews
 	private val _arrangedSubviews = LinkedList<View>()
-
 	/**
 	 * The list of arranged subviews belonging to this stack view.
 	 * This list should never be mutated directly, only be calling the [addArrangedSubview]/[removeArrangedSubview]
@@ -51,7 +50,7 @@ open class StackView(
 	 * 				By default, adds the view to the end of the stack.
 	 * @return The view that was added, as a convenience.
 	 */
-    fun <T : View> addArrangedSubview(view: T, index: Int = arrangedSubviews.size): T {
+	fun <T: View> addArrangedSubview(view: T, index: Int = arrangedSubviews.size): T {
 		addSubview(view)
 		_arrangedSubviews.add(index, view)
 
@@ -140,16 +139,10 @@ open class StackView(
 				val previous = arrangedSubviews.getOrNull(index - 1)
 				val next = arrangedSubviews.getOrNull(index + 1)
 				if (next != null) {
-                    arrangedSubviewConnections.add(
+					arrangedSubviewConnections.add(index, anchor(TRAILING, view) equalTo (anchor(LEADING, next) + spacing))
-                        index,
-                        anchor(TRAILING, view) equalTo (anchor(LEADING, next) + spacing)
-                    )
 				}
 				if (previous != null) {
-                    arrangedSubviewConnections.add(
+					arrangedSubviewConnections.add(index - 1, anchor(TRAILING, previous) equalTo (anchor(LEADING, view) - spacing))
-                        index - 1,
-                        anchor(TRAILING, previous) equalTo (anchor(LEADING, view) - spacing)
-                    )
 				}
 			}
 		}
@@ -157,15 +150,12 @@ open class StackView(
 			when (distribution) {
 				Distribution.LEADING ->
 					perpAnchor(LEADING) equalTo perpAnchor(LEADING, view)
-
 				Distribution.TRAILING ->
 					perpAnchor(TRAILING) equalTo perpAnchor(TRAILING, view)
-
 				Distribution.FILL -> {
 					perpAnchor(LEADING) equalTo perpAnchor(LEADING, view)
 					perpAnchor(TRAILING) equalTo perpAnchor(TRAILING, view)
 				}
-
 				Distribution.CENTER ->
 					perpAnchor(CENTER) equalTo perpAnchor(CENTER, view)
 			}
@@ -175,7 +165,6 @@ open class StackView(
 	private fun anchor(position: AxisPosition, view: View = this): LayoutVariable {
 		return view.getAnchor(axis, position)
 	}
-
 	private fun perpAnchor(position: AxisPosition, view: View = this): LayoutVariable {
 		return view.getAnchor(axis.perpendicular, position)
 	}
@@ -210,7 +199,6 @@ open class StackView(
 		 * ```
 		 */
 		LEADING,
-
 		/**
 		 * The centers of the arranged subviews are pinned to the center of the stack view.
 		 * ```
@@ -234,7 +222,6 @@ open class StackView(
 		 * ```
 		 */
 		CENTER,
-
 		/**
 		 * The trailing edges of arranged subviews are pinned to the leading edge of the stack view.
 		 * ```
@@ -258,7 +245,6 @@ open class StackView(
 		 * ```
 		 */
 		TRAILING,
-
 		/**
 		 * The arranged subviews fill the perpendicular axis of the stack view.
 		 * ```

src/main/kotlin/net/shadowfacts/cacao/view/TextureView.kt

@@ -11,7 +11,7 @@ import net.shadowfacts.cacao.util.texture.Texture
  *
  * @author shadowfacts
  */
-class TextureView(var texture: Texture?) : View() {
+class TextureView(var texture: Texture?): View() {
 
 	override fun drawContent(matrixStack: MatrixStack, mouse: Point, delta: Float) {
 		texture?.also {

src/main/kotlin/net/shadowfacts/cacao/view/View.kt

@@ -20,7 +20,7 @@ import kotlin.math.floor
  *
  * @author shadowfacts
  */
-open class View() : Responder {
+open class View(): Responder {
 
 	/**
 	* The window whose view hierarchy this view belongs to.
@@ -42,7 +42,6 @@ open class View() : Responder {
 			v.solver = it
 		}
 	}
-
 	/**
 	 * The constraint solver used by the [Window] this view belongs to.
 	 * Not initialized until [wasAdded] called, using it before that will throw a runtime exception.
@@ -56,37 +55,30 @@ open class View() : Responder {
 	 * Layout anchor for the left edge of this view in the window's coordinate system.
 	 */
 	val leftAnchor = LayoutVariable(this, "left")
-
 	/**
 	 * Layout anchor for the right edge of this view in the window's coordinate system.
 	 */
 	val rightAnchor = LayoutVariable(this, "right")
-
 	/**
 	 * Layout anchor for the top edge of this view in the window's coordinate system.
 	 */
 	val topAnchor = LayoutVariable(this, "top")
-
 	/**
 	 * Layout anchor for the bottom edge of this view in the window's coordinate system.
 	 */
 	val bottomAnchor = LayoutVariable(this, "bottom")
-
 	/**
 	 * Layout anchor for the width of this view in the window's coordinate system.
 	 */
 	val widthAnchor = LayoutVariable(this, "width")
-
 	/**
 	 * Layout anchor for the height of this view in the window's coordinate system.
 	 */
 	val heightAnchor = LayoutVariable(this, "height")
-
 	/**
 	 * Layout anchor for the center X position of this view in the window's coordinate system.
 	 */
 	val centerXAnchor = LayoutVariable(this, "centerX")
-
 	/**
 	 * Layout anchor for the center Y position of this view in the window's coordinate system.
 	 */
@@ -163,7 +155,6 @@ open class View() : Responder {
 	 * This view's parent view. If `null`, this view is a top-level view in the [Window].
 	 */
 	var superview: View? = null
-
 	// _subviews is the internal, mutable object since we only want it to be mutated by the add/removeSubview methods
 	private val _subviews = LinkedList<View>()
 	private var subviewsSortedByZIndex: List<View> = listOf()
@@ -174,7 +165,7 @@ open class View() : Responder {
 	 */
 	val subviews: List<View> = _subviews
 
-    constructor(frame: Rect) : this() {
+	constructor(frame: Rect): this() {
 		this.usesConstraintBasedLayout = false
 		this.frame = frame
 	}
@@ -190,7 +181,6 @@ open class View() : Responder {
 					AxisPosition.CENTER -> centerXAnchor
 					AxisPosition.TRAILING -> rightAnchor
 				}
-
 			Axis.VERTICAL ->
 				when (position) {
 					AxisPosition.LEADING -> topAnchor
@@ -206,7 +196,7 @@ open class View() : Responder {
 	 * @param view The view to add.
 	 * @return The view that was added, as a convenience.
 	 */
-    fun <T : View> addSubview(view: T): T {
+	fun <T: View> addSubview(view: T): T {
 		_subviews.add(view)
 		subviewsSortedByZIndex = subviews.sortedBy(View::zIndex)
 
@@ -250,11 +240,7 @@ open class View() : Responder {
 				for (b in a + 1 until variables.size) {
 					// if the variable views have no common ancestor after the removed view's superview is unset,
 					// the constraint crossed the this<->view boundary and should be removed
-                    val ancestor = LowestCommonAncestor.find(
+					val ancestor = LowestCommonAncestor.find(variables[a].viewOrLayoutGuideView, variables[b].viewOrLayoutGuideView, View::superview)
-                        variables[a].viewOrLayoutGuideView,
-                        variables[b].viewOrLayoutGuideView,
-                        View::superview
-                    )
 					if (ancestor == null) {
 						return@filter true
 					}
@@ -364,12 +350,7 @@ open class View() : Responder {
 		if (usesConstraintBasedLayout) {
 			val superviewLeft = superview?.leftAnchor?.value ?: 0.0
 			val superviewTop = superview?.topAnchor?.value ?: 0.0
-            frame = Rect(
+			frame = Rect(leftAnchor.value - superviewLeft, topAnchor.value - superviewTop, widthAnchor.value, heightAnchor.value)
-                leftAnchor.value - superviewLeft,
-                topAnchor.value - superviewTop,
-                widthAnchor.value,
-                heightAnchor.value
-            )
 			bounds = Rect(0.0, 0.0, widthAnchor.value, heightAnchor.value)
 		}
 

src/main/kotlin/net/shadowfacts/cacao/view/button/AbstractButton.kt

@@ -22,7 +22,7 @@ import kotlin.math.floor
  * 					Will be added as a subview of the button and laid out using constraints.
  * @param padding The padding between the [content] and the edges of the button.
  */
-abstract class AbstractButton<Impl : AbstractButton<Impl>>(val content: View, val padding: Double = 4.0) : View() {
+abstract class AbstractButton<Impl: AbstractButton<Impl>>(val content: View, val padding: Double = 4.0): View() {
 
 	/**
 	 * The function that handles when this button is clicked.
@@ -51,7 +51,6 @@ abstract class AbstractButton<Impl : AbstractButton<Impl>>(val content: View, va
 			field = value
 			value?.also(::addBackground)
 		}
-
 	/**
 	 * The background to draw when the button is hovered over by the mouse.
 	 * If `null`, the normal [background] will be used.
@@ -63,7 +62,6 @@ abstract class AbstractButton<Impl : AbstractButton<Impl>>(val content: View, va
 			field = value
 			value?.also(::addBackground)
 		}
-
 	/**
 	 * The background to draw when the button is [disabled].
 	 * If `null`, the normal [background] will be used.

src/main/kotlin/net/shadowfacts/cacao/view/button/Button.kt

@@ -14,7 +14,7 @@ class Button(
 	content: View,
 	padding: Double = 4.0,
 	handler: ((Button) -> Unit)? = null
-) : AbstractButton<Button>(content, padding) {
+): AbstractButton<Button>(content, padding) {
 	init {
 		this.handler = handler
 	}

src/main/kotlin/net/shadowfacts/cacao/view/button/DropdownButton.kt

@@ -33,13 +33,13 @@ import net.shadowfacts.kiwidsl.dsl
  * 						Positioning of content views is handled by the dropdown.
  * @param updateView A function for updating the view used as the button's 'label' that's visible even when the dropdown isn't.
  */
-class DropdownButton<Value, ContentView : View>(
+class DropdownButton<Value, ContentView: View>(
 		val initialValue: Value,
 		val allValues: Iterable<Value>,
 		val createView: (Value) -> ContentView,
 		val updateView: (newValue: Value, view: ContentView) -> Unit,
 		padding: Double = 4.0
-) : AbstractButton<DropdownButton<Value, ContentView>>(
+): AbstractButton<DropdownButton<Value, ContentView>>(
 		StackView(Axis.HORIZONTAL),
 		padding
 ) {
@@ -144,7 +144,7 @@ private class DropdownItemBackgroundView(
 		private val first: Boolean,
 		private val last: Boolean,
 		ninePatch: NinePatchTexture
-) : NinePatchView(ninePatch) {
+): NinePatchView(ninePatch) {
 
 	// Corners
 	private val topLeftDelegate = ResettableLazyProperty {
@@ -159,12 +159,7 @@ private class DropdownItemBackgroundView(
 	override val topRight by topRightDelegate
 
 	private val bottomLeftDelegate = ResettableLazyProperty {
-        Rect(
+		Rect(topLeft.left, bounds.height - ninePatch.cornerHeight, topLeft.width, if (last) ninePatch.cornerHeight.toDouble() else 0.0)
-            topLeft.left,
-            bounds.height - ninePatch.cornerHeight,
-            topLeft.width,
-            if (last) ninePatch.cornerHeight.toDouble() else 0.0
-        )
 	}
 	override val bottomLeft by bottomLeftDelegate
 
@@ -185,12 +180,7 @@ private class DropdownItemBackgroundView(
 	override val bottomMiddle by bottomMiddleDelegate
 
 	private val leftMiddleDelegate = ResettableLazyProperty {
-        Rect(
+		Rect(topLeft.left, topLeft.bottom, topLeft.width, bounds.height - (if (first && last) 2 else if (first || last) 1 else 0) * ninePatch.cornerHeight)
-            topLeft.left,
-            topLeft.bottom,
-            topLeft.width,
-            bounds.height - (if (first && last) 2 else if (first || last) 1 else 0) * ninePatch.cornerHeight
-        )
 	}
 	override val leftMiddle by leftMiddleDelegate
 
@@ -205,17 +195,7 @@ private class DropdownItemBackgroundView(
 	}
 	override val center by centerDelegate
 
-    private val delegates = listOf(
+	private val delegates = listOf(topLeftDelegate, topRightDelegate, bottomLeftDelegate, bottomRightDelegate, topMiddleDelegate, bottomMiddleDelegate, leftMiddleDelegate, rightMiddleDelegate, centerDelegate)
-        topLeftDelegate,
-        topRightDelegate,
-        bottomLeftDelegate,
-        bottomRightDelegate,
-        topMiddleDelegate,
-        bottomMiddleDelegate,
-        leftMiddleDelegate,
-        rightMiddleDelegate,
-        centerDelegate
-    )
 
 	override fun didLayout() {
 		super.didLayout()

src/main/kotlin/net/shadowfacts/cacao/view/button/EnumButton.kt

@@ -16,10 +16,10 @@ import net.shadowfacts.cacao.view.Label
  * @param initialValue The initial enum value for this button.
  * @param localizer A function that takes an enum value and converts into a [Text] for the button's label.
  */
-class EnumButton<E : Enum<E>>(
+class EnumButton<E: Enum<E>>(
 	initialValue: E,
 	val localizer: (E) -> Text
-) : AbstractButton<EnumButton<E>>(
+): AbstractButton<EnumButton<E>>(
 	Label(localizer(initialValue), shadow = true)
 ) {
 

src/main/kotlin/net/shadowfacts/cacao/view/button/ToggleButton.kt

@@ -19,7 +19,7 @@ import net.shadowfacts.cacao.view.View
 class ToggleButton(
 	initialState: Boolean,
 	handler: ((ToggleButton) -> Unit)? = null,
-) : AbstractButton<ToggleButton>(TextureView(if (initialState) ON else OFF), padding = 0.0) {
+): AbstractButton<ToggleButton>(TextureView(if (initialState) ON else OFF), padding = 0.0) {
 
 	companion object {
 		val OFF = Texture(Identifier("textures/gui/checkbox.png"), 0, 0, 64, 64)

src/main/kotlin/net/shadowfacts/cacao/view/textfield/AbstractTextField.kt

@@ -20,9 +20,9 @@ import org.lwjgl.glfw.GLFW
  *             the exact type of text field.
  * @param initialText The initial value of the text field.
  */
-abstract class AbstractTextField<Impl : AbstractTextField<Impl>>(
+abstract class AbstractTextField<Impl: AbstractTextField<Impl>>(
 	initialText: String
-) : View() {
+): View() {
 
 	/**
 	 * A function that is invoked when the text in this text field changes.
@@ -166,8 +166,7 @@ abstract class AbstractTextField<Impl : AbstractTextField<Impl>>(
 	}
 
 	// todo: label for the TextFieldWidget?
-    private class ProxyWidget :
+	private class ProxyWidget: TextFieldWidget(MinecraftClient.getInstance().textRenderer, 0, 0, 0, 0, LiteralText("")) {
-        TextFieldWidget(MinecraftClient.getInstance().textRenderer, 0, 0, 0, 0, LiteralText("")) {
 		// AbstractButtonWidget.height is protected
 		fun setHeight(height: Int) {
 			this.height = height

src/main/kotlin/net/shadowfacts/cacao/view/textfield/NumberField.kt

@@ -6,7 +6,7 @@ package net.shadowfacts.cacao.view.textfield
 open class NumberField(
 	initialValue: Int,
 	handler: ((NumberField) -> Unit)? = null,
-) : AbstractTextField<NumberField>(initialValue.toString()) {
+): AbstractTextField<NumberField>(initialValue.toString()) {
 
 	var number: Int?
 		get() {

src/main/kotlin/net/shadowfacts/cacao/view/textfield/TextField.kt

@@ -10,7 +10,7 @@ package net.shadowfacts.cacao.view.textfield
 open class TextField(
 	initialText: String,
 	handler: ((TextField) -> Unit)? = null
-) : AbstractTextField<TextField>(initialText) {
+): AbstractTextField<TextField>(initialText) {
 	init {
 		this.handler = handler
 	}

src/main/kotlin/net/shadowfacts/cacao/viewcontroller/TabViewController.kt

@@ -34,11 +34,11 @@ import java.lang.RuntimeException
  * @param onTabChange A function invoked immediately after the active tab has changed (and the content view has been
  *                    updated).
  */
-class TabViewController<T : TabViewController.Tab>(
+class TabViewController<T: TabViewController.Tab>(
 	val tabs: List<T>,
 	initialTab: T = tabs.first(),
 	val onTabChange: ((T) -> Unit)? = null
-) : ViewController() {
+): ViewController() {
 
 	/**
 	 * The Tab interface defines the requirements for tab objects that can be used with this view controller.
@@ -83,7 +83,7 @@ class TabViewController<T : TabViewController.Tab>(
 		override val tooltip: Text? = null,
 		override val controller: ViewController,
 		private val visible: (() -> Boolean)? = null
-    ) : Tab {
+	): Tab {
 		override val isVisible: Boolean
 			get() = visible?.invoke() ?: true
 	}
@@ -99,7 +99,6 @@ class TabViewController<T : TabViewController.Tab>(
 	private lateinit var outerStack: StackView
 	private lateinit var tabStack: StackView
 	private lateinit var currentTabController: ViewController
-
 	// todo: this shouldn't be public, use layout guides
 	lateinit var tabVCContainer: View
 		private set
@@ -228,9 +227,9 @@ class TabViewController<T : TabViewController.Tab>(
 		window!!.layout()
 	}
 
-    private class TabButton<T : Tab>(
+	private class TabButton<T: Tab>(
 		val tab: T,
-    ) : AbstractButton<TabButton<T>>(
+	): AbstractButton<TabButton<T>>(
 		tab.tabView,
 		padding = 2.0
 	) {

src/main/kotlin/net/shadowfacts/cacao/viewcontroller/ViewController.kt

@@ -58,7 +58,6 @@ abstract class ViewController {
 
 	// _children is the internal, mutable object since we only want it to be mutated by the embed/removeChild methods
 	private var _children = LinkedList<ViewController>()
-
 	/**
 	 * The list of all the child VCs of this view controller.
 	 * This list should never be mutated directly, only by the [embedChild]/[removeChild] methods.

src/main/kotlin/net/shadowfacts/cacao/window/ScreenHandlerWindow.kt

@@ -9,6 +9,6 @@ import net.shadowfacts.cacao.viewcontroller.ViewController
 class ScreenHandlerWindow(
 	val screenHandler: ScreenHandler,
 	viewController: ViewController
-) : Window(viewController) {
+): Window(viewController) {
 
 }

src/main/kotlin/net/shadowfacts/cacao/window/Window.kt

@@ -48,37 +48,30 @@ open class Window(
 	 * Layout anchor for the left edge of this view in the window's coordinate system.
 	 */
 	val leftAnchor = Variable("left")
-
 	/**
 	 * Layout anchor for the right edge of this view in the window's coordinate system.
 	 */
 	val rightAnchor = Variable("right")
-
 	/**
 	 * Layout anchor for the top edge of this view in the window's coordinate system.
 	 */
 	val topAnchor = Variable("top")
-
 	/**
 	 * Layout anchor for the bottom edge of this view in the window's coordinate system.
 	 */
 	val bottomAnchor = Variable("bottom")
-
 	/**
 	 * Layout anchor for the width of this view in the window's coordinate system.
 	 */
 	val widthAnchor = Variable("width")
-
 	/**
 	 * Layout anchor for the height of this view in the window's coordinate system.
 	 */
 	val heightAnchor = Variable("height")
-
 	/**
 	 * Layout anchor for the center X position of this view in the window's coordinate system.
 	 */
 	val centerXAnchor = Variable("centerX")
-
 	/**
 	 * Layout anchor for the center Y position of this view in the window's coordinate system.
 	 */

src/main/kotlin/net/shadowfacts/kiwidsl/KiwiDSL.kt

@@ -17,8 +17,7 @@ class KiwiContext(val solver: Solver) {
 	}
 
 	fun ExpressionConvertible.equalTo(other: ExpressionConvertible, strength: Double): Constraint {
-        return Symbolics.equals(this.toExpression(), other.toExpression()).setStrength(strength)
+		return Symbolics.equals(this.toExpression(), other.toExpression()).setStrength(strength).apply(solver::addConstraint)
-            .apply(solver::addConstraint)
 	}
 
 	infix fun ExpressionConvertible.equalTo(constant: Number): Constraint {
@@ -26,8 +25,7 @@ class KiwiContext(val solver: Solver) {
 	}
 
 	fun ExpressionConvertible.equalTo(constant: Number, strength: Double): Constraint {
-        return Symbolics.equals(this.toExpression(), constant.toDouble()).setStrength(strength)
+		return Symbolics.equals(this.toExpression(), constant.toDouble()).setStrength(strength).apply(solver::addConstraint)
-            .apply(solver::addConstraint)
 	}
 
 	infix fun ExpressionConvertible.lessThanOrEqualTo(other: ExpressionConvertible): Constraint {
@@ -35,8 +33,7 @@ class KiwiContext(val solver: Solver) {
 	}
 
 	fun ExpressionConvertible.lessThanOrEqualTo(other: ExpressionConvertible, strength: Double): Constraint {
-        return Symbolics.lessThanOrEqualTo(this.toExpression(), other.toExpression()).setStrength(strength)
+		return Symbolics.lessThanOrEqualTo(this.toExpression(), other.toExpression()).setStrength(strength).apply(solver::addConstraint)
-            .apply(solver::addConstraint)
 	}
 
 	infix fun ExpressionConvertible.lessThanOrEqualTo(constant: Number): Constraint {
@@ -44,8 +41,7 @@ class KiwiContext(val solver: Solver) {
 	}
 
 	fun ExpressionConvertible.lessThanOrEqualTo(constant: Number, strength: Double): Constraint {
-        return Symbolics.lessThanOrEqualTo(this.toExpression(), constant.toDouble()).setStrength(strength)
+		return Symbolics.lessThanOrEqualTo(this.toExpression(), constant.toDouble()).setStrength(strength).apply(solver::addConstraint)
-            .apply(solver::addConstraint)
 	}
 
 	infix fun ExpressionConvertible.greaterThanOrEqualTo(other: ExpressionConvertible): Constraint {
@@ -53,8 +49,7 @@ class KiwiContext(val solver: Solver) {
 	}
 
 	fun ExpressionConvertible.greaterThanOrEqualTo(other: ExpressionConvertible, strength: Double): Constraint {
-        return Symbolics.greaterThanOrEqualTo(this.toExpression(), other.toExpression()).setStrength(strength)
+		return Symbolics.greaterThanOrEqualTo(this.toExpression(), other.toExpression()).setStrength(strength).apply(solver::addConstraint)
-            .apply(solver::addConstraint)
 	}
 
 	infix fun ExpressionConvertible.greaterThanOrEqualTo(constant: Number): Constraint {
@@ -62,8 +57,7 @@ class KiwiContext(val solver: Solver) {
 	}
 
 	fun ExpressionConvertible.greaterThanOrEqualTo(constant: Number, strength: Double): Constraint {
-        return Symbolics.greaterThanOrEqualTo(this.toExpression(), constant.toDouble()).setStrength(strength)
+		return Symbolics.greaterThanOrEqualTo(this.toExpression(), constant.toDouble()).setStrength(strength).apply(solver::addConstraint)
-            .apply(solver::addConstraint)
 	}
 
 	// Addition

src/main/kotlin/net/shadowfacts/phycon/DefaultPlugin.kt

@@ -9,14 +9,13 @@ import net.shadowfacts.phycon.util.SortMode
 /**
  * @author shadowfacts
  */
-object DefaultPlugin : PhyConPlugin {
+object DefaultPlugin: PhyConPlugin {
 
 	lateinit var SORT_MODE: TerminalSettingKey<SortMode>
 		private set
 
 	override fun initializePhyCon(api: PhyConAPI) {
-        SORT_MODE =
+		SORT_MODE = api.registerTerminalSetting(Identifier(PhysicalConnectivity.MODID, "sort"), SortMode.COUNT_HIGH_FIRST)
-            api.registerTerminalSetting(Identifier(PhysicalConnectivity.MODID, "sort"), SortMode.COUNT_HIGH_FIRST)
 		SORT_MODE.setPriority(Int.MAX_VALUE)
 	}
 

src/main/kotlin/net/shadowfacts/phycon/PhyConAPIImpl.kt

@@ -9,12 +9,9 @@ import net.shadowfacts.phycon.util.TerminalSettings
 /**
  * @author shadowfacts
  */
-object PhyConAPIImpl : PhyConAPI {
+object PhyConAPIImpl: PhyConAPI {
 
-    override fun <E> registerTerminalSetting(
+	override fun <E> registerTerminalSetting(id: Identifier, defaultValue: E): TerminalSettingKey<E> where E: Enum<E>, E: TerminalSetting? {
-        id: Identifier,
-        defaultValue: E
-    ): TerminalSettingKey<E> where E : Enum<E>, E : TerminalSetting? {
 		return TerminalSettings.register(id, defaultValue)
 	}
 

src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivity.kt

@@ -16,7 +16,7 @@ import org.apache.logging.log4j.LogManager
 /**
  * @author shadowfacts
  */
-object PhysicalConnectivity : ModInitializer {
+object PhysicalConnectivity: ModInitializer {
 
 	val MODID = "phycon"
 
@@ -33,10 +33,7 @@ object PhysicalConnectivity : ModInitializer {
 		registerGlobalReceiver(C2STerminalRequestItem)
 		registerGlobalReceiver(C2STerminalUpdateDisplayedItems)
 
-        ItemStorage.SIDED.registerForBlockEntity(
+		ItemStorage.SIDED.registerForBlockEntity(P2PReceiverBlockEntity::provideItemStorage, PhyBlockEntities.P2P_RECEIVER)
-            P2PReceiverBlockEntity::provideItemStorage,
-            PhyBlockEntities.P2P_RECEIVER
-        )
 
 		for (it in FabricLoader.getInstance().getEntrypoints("phycon", PhyConPlugin::class.java)) {
 			it.initializePhyCon(PhyConAPIImpl)

src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt

@@ -7,7 +7,6 @@ import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry
 import net.fabricmc.fabric.api.renderer.v1.RendererAccess
 import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial
 import net.shadowfacts.phycon.block.inserter.InserterScreen
-import net.shadowfacts.phycon.block.netswitch.SwitchConsoleScreen
 import net.shadowfacts.phycon.block.redstone_emitter.RedstoneEmitterScreen
 import net.shadowfacts.phycon.block.terminal.CraftingTerminalScreen
 import net.shadowfacts.phycon.init.PhyScreens
@@ -21,7 +20,7 @@ import net.shadowfacts.phycon.util.TerminalSettings
 /**
  * @author shadowfacts
  */
-object PhysicalConnectivityClient : ClientModInitializer {
+object PhysicalConnectivityClient: ClientModInitializer {
 
 	val terminalSettings = TerminalSettings()
 
@@ -45,7 +44,6 @@ object PhysicalConnectivityClient : ClientModInitializer {
 		ScreenRegistry.register(PhyScreens.CRAFTING_TERMINAL, ::CraftingTerminalScreen)
 		ScreenRegistry.register(PhyScreens.INSERTER, ::InserterScreen)
 		ScreenRegistry.register(PhyScreens.REDSTONE_EMITTER, ::RedstoneEmitterScreen)
-        ScreenRegistry.register(PhyScreens.SWITCH_CONSOLE, ::SwitchConsoleScreen)
 
 		registerGlobalReceiver(S2CTerminalUpdateDisplayedItems)
 	}

src/main/kotlin/net/shadowfacts/phycon/block/BlockWithEntity.kt

@@ -13,7 +13,7 @@ import net.minecraft.world.World
 /**
  * @author shadowfacts
  */
-abstract class BlockWithEntity<T : BlockEntity>(settings: Settings) : Block(settings), BlockEntityProvider {
+abstract class BlockWithEntity<T: BlockEntity>(settings: Settings): Block(settings), BlockEntityProvider {
 	abstract override fun createBlockEntity(pos: BlockPos, state: BlockState): T?
 
 	fun getBlockEntity(world: BlockView, pos: BlockPos): T? {

src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlock.kt

@@ -15,21 +15,11 @@ import net.shadowfacts.phycon.api.NetworkComponentBlock
 /**
  * @author shadowfacts
  */
-abstract class DeviceBlock<T : DeviceBlockEntity>(settings: Settings) : BlockWithEntity<T>(settings),
+abstract class DeviceBlock<T: DeviceBlockEntity>(settings: Settings): BlockWithEntity<T>(settings), NetworkComponentBlock {
-    NetworkComponentBlock {
 
-    abstract override fun getNetworkConnectedSides(
+	abstract override fun getNetworkConnectedSides(state: BlockState, world: WorldAccess, pos: BlockPos): Collection<Direction>
-        state: BlockState,
-        world: WorldAccess,
-        pos: BlockPos
-    ): Collection<Direction>
 
-    override fun getNetworkInterfaceForSide(
+	override fun getNetworkInterfaceForSide(side: Direction, state: BlockState, world: WorldAccess, pos: BlockPos): Interface? {
-        side: Direction,
-        state: BlockState,
-        world: WorldAccess,
-        pos: BlockPos
-    ): Interface? {
 		return getBlockEntity(world, pos)!!
 	}
 
@@ -38,11 +28,7 @@ abstract class DeviceBlock<T : DeviceBlockEntity>(settings: Settings) : BlockWit
 		getBlockEntity(world, pos)!!.onBreak()
 	}
 
-    override fun <T : BlockEntity> getTicker(
+	override fun <T: BlockEntity> getTicker(world: World, state: BlockState, type: BlockEntityType<T>): BlockEntityTicker<T>? {
-        world: World,
-        state: BlockState,
-        type: BlockEntityType<T>
-    ): BlockEntityTicker<T>? {
 		return if (world.isClient) {
 			null
 		} else {

src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlockEntity.kt

@@ -28,8 +28,7 @@ import java.util.*
 /**
  * @author shadowfacts
  */
-abstract class DeviceBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockState) :
+abstract class DeviceBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockState): BlockEntity(type, pos, state),
-    BlockEntity(type, pos, state),
 	PacketSink,
 	PacketSource,
 	Interface {
@@ -61,7 +60,6 @@ abstract class DeviceBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state:
 			is DeviceRemovedPacket -> {
 				arpTable.remove(packet.source)
 			}
-
 			is PingPacket -> {
 				sendPacket(PongPacket(ipAddress, packet.source))
 			}
@@ -74,14 +72,7 @@ abstract class DeviceBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state:
 	}
 
 	override fun receive(frame: EthernetFrame) {
-        PhysicalConnectivity.NETWORK_LOGGER.debug(
+		PhysicalConnectivity.NETWORK_LOGGER.debug("{} ({}, {}) received frame from {}: {}", this, ipAddress, macAddress, frame.source, frame)
-            "{} ({}, {}) received frame from {}: {}",
-            this,
-            ipAddress,
-            macAddress,
-            frame.source,
-            frame
-        )
 		when (frame) {
 			is ARPQueryFrame -> handleARPQuery(frame)
 			is ARPResponseFrame -> handleARPResponse(frame)
@@ -98,26 +89,14 @@ abstract class DeviceBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state:
 		PhysicalConnectivity.NETWORK_LOGGER.debug("{}, ({}), received ARP query for {}", this, ipAddress, frame.queryIP)
 		arpTable[frame.sourceIP] = frame.source
 		if (frame.queryIP == ipAddress) {
-            PhysicalConnectivity.NETWORK_LOGGER.debug(
+			PhysicalConnectivity.NETWORK_LOGGER.debug("{} ({}) sending ARP response to {} with {}", this, ipAddress, frame.sourceIP, macAddress)
-                "{} ({}) sending ARP response to {} with {}",
-                this,
-                ipAddress,
-                frame.sourceIP,
-                macAddress
-            )
 			send(ARPResponseFrame(ipAddress, macAddress, frame.source))
 		}
 	}
 
 	private fun handleARPResponse(frame: ARPResponseFrame) {
 		arpTable[frame.query] = frame.source
-        PhysicalConnectivity.NETWORK_LOGGER.debug(
+		PhysicalConnectivity.NETWORK_LOGGER.debug("{}, ({}) received ARP response for {} with {}", this, ipAddress, frame.query, frame.source)
-            "{}, ({}) received ARP response for {} with {}",
-            this,
-            ipAddress,
-            frame.query,
-            frame.source
-        )
 
 		val toRemove = packetQueue.filter { (packet, _) ->
 			if (packet.destination == frame.query) {
@@ -143,12 +122,7 @@ abstract class DeviceBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state:
 		} else {
 			packetQueue.add(PendingPacket(packet, counter))
 
-            PhysicalConnectivity.NETWORK_LOGGER.debug(
+			PhysicalConnectivity.NETWORK_LOGGER.debug("{} ({}) sending ARP query for {}", this, ipAddress, packet.destination)
-                "{} ({}) sending ARP query for {}",
-                this,
-                ipAddress,
-                packet.destination
-            )
 			send(ARPQueryFrame(packet.destination, ipAddress, macAddress))
 		}
 	}
@@ -167,7 +141,6 @@ abstract class DeviceBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state:
 					this.cachedDestination = WeakReference(it)
 				}
 			}
-
 			else -> throw RuntimeException("DeviceBlockEntity.findDestination must be overridden by devices which have more than 1 network connected side")
 		}
 	}

src/main/kotlin/net/shadowfacts/phycon/block/FaceDeviceBlock.kt

@@ -27,7 +27,7 @@ import java.util.*
 /**
  * @author shadowfacts
  */
-abstract class FaceDeviceBlock<T : DeviceBlockEntity>(settings: Settings) : DeviceBlock<T>(settings) {
+abstract class FaceDeviceBlock<T: DeviceBlockEntity>(settings: Settings): DeviceBlock<T>(settings) {
 	companion object {
 		val FACING = Properties.FACING
 		val CABLE_CONNECTION = EnumProperty.of("cable_connection", FaceCableConnection::class.java)
@@ -82,11 +82,7 @@ abstract class FaceDeviceBlock<T : DeviceBlockEntity>(settings: Settings) : Devi
 			if (cableConnection == FaceCableConnection.NONE) {
 				VoxelShapes.union(faceShapes[facing], centerShapes[facing])
 			} else {
-                VoxelShapes.union(
+				VoxelShapes.union(faceShapes[facing], centerShapes[facing], CableBlock.SIDE_SHAPES[cableConnection.direction])
-                    faceShapes[facing],
-                    centerShapes[facing],
-                    CableBlock.SIDE_SHAPES[cableConnection.direction]
-                )
 			}
 		}
 	}
@@ -96,12 +92,7 @@ abstract class FaceDeviceBlock<T : DeviceBlockEntity>(settings: Settings) : Devi
 		return if (direction != null) EnumSet.of(direction) else setOf()
 	}
 
-    override fun getNetworkInterfaceForSide(
+	override fun getNetworkInterfaceForSide(side: Direction, state: BlockState, world: WorldAccess, pos: BlockPos): Interface? {
-        side: Direction,
-        state: BlockState,
-        world: WorldAccess,
-        pos: BlockPos
-    ): Interface? {
 		return if (side == state[FACING]) {
 			null
 		} else {
@@ -117,22 +108,15 @@ abstract class FaceDeviceBlock<T : DeviceBlockEntity>(settings: Settings) : Devi
 	}
 
 	override fun getPlacementState(context: ItemPlacementContext): BlockState {
-        val facing =
+		val facing = if (context.player?.isSneaking == true) context.side.opposite else context.playerLookDirection.opposite
-            if (context.player?.isSneaking == true) context.side.opposite else context.playerLookDirection.opposite
 		// todo: this should never be called
-        val cableConnection =
+		val cableConnection = FaceCableConnection.from(getCableConnectedSide(context.world, context.blockPos, facing, DyeColor.BLUE))
-            FaceCableConnection.from(getCableConnectedSide(context.world, context.blockPos, facing, DyeColor.BLUE))
 		return defaultState
 			.with(FACING, facing)
 			.with(CABLE_CONNECTION, cableConnection)
 	}
 
-    private fun getCableConnectedSide(
+	private fun getCableConnectedSide(world: WorldAccess, pos: BlockPos, facing: Direction, color: DyeColor): Direction? {
-        world: WorldAccess,
-        pos: BlockPos,
-        facing: Direction,
-        color: DyeColor
-    ): Direction? {
 		for (side in Direction.values()) {
 			if (side == facing) {
 				continue
@@ -146,32 +130,18 @@ abstract class FaceDeviceBlock<T : DeviceBlockEntity>(settings: Settings) : Devi
 		return null
 	}
 
-    private fun canConnectTo(
+	private fun canConnectTo(world: WorldAccess, side: Direction, candidateState: BlockState, candidatePos: BlockPos, myColor: DyeColor): Boolean {
-        world: WorldAccess,
-        side: Direction,
-        candidateState: BlockState,
-        candidatePos: BlockPos,
-        myColor: DyeColor
-    ): Boolean {
 		val block = candidateState.block
 		return if (block is FaceDeviceBlock<*> && candidateState[COLOR] == myColor) {
 			true
 		} else if (block is CableBlock && block.color == myColor) {
 			true
 		} else {
-            block is NetworkComponentBlock && block.getNetworkConnectedSides(candidateState, world, candidatePos)
+			block is NetworkComponentBlock && block.getNetworkConnectedSides(candidateState, world, candidatePos).contains(side.opposite)
-                .contains(side.opposite)
 		}
 	}
 
-    override fun getStateForNeighborUpdate(
+	override fun getStateForNeighborUpdate(state: BlockState, side: Direction, neighborState: BlockState, world: WorldAccess, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        state: BlockState,
-        side: Direction,
-        neighborState: BlockState,
-        world: WorldAccess,
-        pos: BlockPos,
-        neighborPos: BlockPos
-    ): BlockState {
 		val current = state[CABLE_CONNECTION]
 		var newConnection = current
 
@@ -189,12 +159,7 @@ abstract class FaceDeviceBlock<T : DeviceBlockEntity>(settings: Settings) : Devi
 		return state.with(CABLE_CONNECTION, newConnection)
 	}
 
-    override fun getOutlineShape(
+	override fun getOutlineShape(state: BlockState, world: BlockView, pos: BlockPos, context: ShapeContext): VoxelShape {
-        state: BlockState,
-        world: BlockView,
-        pos: BlockPos,
-        context: ShapeContext
-    ): VoxelShape {
 		return getShape(state[FACING], state[CABLE_CONNECTION])
 	}
 

src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt

@@ -38,7 +38,7 @@ import java.util.*
  */
 class CableBlock(
 	val color: DyeColor,
-) : Block(
+): Block(
 	FabricBlockSettings.of(CABLE_MATERIAL)
 		.strength(0.3f)
 		.nonOpaque()
@@ -63,8 +63,7 @@ class CableBlock(
 				VoxelShapes.union(acc, SIDE_SHAPES[side])
 			}
 		}
-        val CONNECTIONS: Map<Direction, EnumProperty<CableConnection>> =
+		val CONNECTIONS: Map<Direction, EnumProperty<CableConnection>> = Direction.values().associate { it to EnumProperty.of(it.name.toLowerCase(), CableConnection::class.java) }
-            Direction.values().associate { it to EnumProperty.of(it.name.toLowerCase(), CableConnection::class.java) }
 
 		fun getShape(state: BlockState): VoxelShape {
 			val key = Direction.values().foldIndexed(0) { i, acc, dir ->
@@ -111,14 +110,7 @@ class CableBlock(
 		return getInitialState(context.world, context.blockPos)
 	}
 
-    override fun getStateForNeighborUpdate(
+	override fun getStateForNeighborUpdate(state: BlockState, side: Direction, neighborState: BlockState, world: WorldAccess, blockPos_1: BlockPos, blockPos_2: BlockPos): BlockState {
-        state: BlockState,
-        side: Direction,
-        neighborState: BlockState,
-        world: WorldAccess,
-        blockPos_1: BlockPos,
-        blockPos_2: BlockPos
-    ): BlockState {
 		val prop = CONNECTIONS[side]
 		val current = state[prop]
 		return when (current) {
@@ -127,11 +119,7 @@ class CableBlock(
 		}
 	}
 
-    private fun getConnectionStateInDirection(
+	private fun getConnectionStateInDirection(world: WorldAccess, pos: BlockPos, direction: Direction): CableConnection {
-        world: WorldAccess,
-        pos: BlockPos,
-        direction: Direction
-    ): CableConnection {
 		val offsetPos = pos.offset(direction)
 		val state = world.getBlockState(offsetPos)
 		val block = state.block
@@ -152,12 +140,7 @@ class CableBlock(
 		}
 	}
 
-    override fun getNetworkInterfaceForSide(
+	override fun getNetworkInterfaceForSide(side: Direction, state: BlockState, world: WorldAccess, pos: BlockPos): Interface? {
-        side: Direction,
-        state: BlockState,
-        world: WorldAccess,
-        pos: BlockPos
-    ): Interface? {
 		// cables don't have network interfaces
 		return null
 	}
@@ -186,18 +169,11 @@ class CableBlock(
 						val connectedToPos = pos.offset(side)
 						val connectedTo = world.getBlockState(connectedToPos)
 						if (connectedTo.block == this && connectedTo[CONNECTIONS[side.opposite]] == CableConnection.DISABLED) {
-                            world.setBlockState(
+							world.setBlockState(connectedToPos, connectedTo.with(CONNECTIONS[side.opposite], CableConnection.ON))
-                                connectedToPos,
-                                connectedTo.with(CONNECTIONS[side.opposite], CableConnection.ON)
-                            )
 						}
 
-                        state.with(
+						state.with(prop, if (connectedTo.block is NetworkComponentBlock) CableConnection.ON else CableConnection.OFF)
-                            prop,
-                            if (connectedTo.block is NetworkComponentBlock) CableConnection.ON else CableConnection.OFF
-                        )
 					}
-
 					else -> state.with(prop, CableConnection.DISABLED)
 				}
 				world.setBlockState(pos, newState)
@@ -219,12 +195,7 @@ class CableBlock(
 //		return false
 //	}
 
-    override fun getOutlineShape(
+	override fun getOutlineShape(state: BlockState, world: BlockView, pos: BlockPos, context: ShapeContext): VoxelShape {
-        state: BlockState,
-        world: BlockView,
-        pos: BlockPos,
-        context: ShapeContext
-    ): VoxelShape {
 		return getShape(state)
 	}
 

src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlock.kt

@@ -21,7 +21,7 @@ import kotlin.math.min
 /**
  * @author shadowfacts
  */
-class ExtractorBlock : FaceDeviceBlock<ExtractorBlockEntity>(
+class ExtractorBlock: FaceDeviceBlock<ExtractorBlockEntity>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
@@ -59,14 +59,7 @@ class ExtractorBlock : FaceDeviceBlock<ExtractorBlockEntity>(
 							arr[i] = 16.0 - arr[i]
 						}
 					}
-                    createCuboidShape(
+					createCuboidShape(min(arr[0], arr[3]), min(arr[1], arr[4]), min(arr[2], arr[5]), max(arr[0], arr[3]), max(arr[1], arr[4]), max(arr[2], arr[5]))
-                        min(arr[0], arr[3]),
-                        min(arr[1], arr[4]),
-                        min(arr[2], arr[5]),
-                        max(arr[0], arr[3]),
-                        max(arr[1], arr[4]),
-                        max(arr[2], arr[5])
-                    )
 				}
 				EXTRACTOR_SHAPES[dir] = shapes.reduce { a, b -> VoxelShapes.union(a, b) }
 			}
@@ -78,4 +71,16 @@ class ExtractorBlock : FaceDeviceBlock<ExtractorBlockEntity>(
 
 	override fun createBlockEntity(pos: BlockPos, state: BlockState) = ExtractorBlockEntity(pos, state)
 
+	override fun onPlaced(world: World, pos: BlockPos, state: BlockState, entity: LivingEntity?, stack: ItemStack) {
+		if (!world.isClient) {
+			getBlockEntity(world, pos)!!.updateInventory()
+		}
+	}
+
+	override fun neighborUpdate(state: BlockState, world: World, pos: BlockPos, neighbor: Block, neighborPos: BlockPos, bl: Boolean) {
+		if (!world.isClient) {
+			getBlockEntity(world, pos)!!.updateInventory()
+		}
+	}
+
 }

src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlockEntity.kt

@@ -1,14 +1,13 @@
 package net.shadowfacts.phycon.block.extractor
 
-import net.fabricmc.fabric.api.lookup.v1.block.BlockApiCache
+import alexiil.mc.lib.attributes.SearchOptions
-import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage
+import alexiil.mc.lib.attributes.Simulation
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
+import alexiil.mc.lib.attributes.item.FixedItemInv
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage
+import alexiil.mc.lib.attributes.item.ItemAttributes
-import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction
+import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter
 import net.minecraft.block.BlockState
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.server.world.ServerWorld
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.shadowfacts.phycon.api.packet.Packet
@@ -24,15 +23,12 @@ import net.shadowfacts.phycon.packet.ItemStackPacket
 import net.shadowfacts.phycon.packet.RemoteActivationPacket
 import net.shadowfacts.phycon.util.ActivationMode
 import net.shadowfacts.phycon.util.ClientConfigurableDevice
-import net.shadowfacts.phycon.util.copyWithCount
-import kotlin.math.min
 import kotlin.properties.Delegates
 
 /**
  * @author shadowfacts
  */
-class ExtractorBlockEntity(pos: BlockPos, state: BlockState) :
+class ExtractorBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.EXTRACTOR, pos, state),
-    DeviceBlockEntity(PhyBlockEntities.EXTRACTOR, pos, state),
 	NetworkStackDispatcher<ExtractorBlockEntity.PendingInsertion>,
 	ActivationController.ActivatableDevice,
 	ClientConfigurableDevice {
@@ -44,19 +40,20 @@ class ExtractorBlockEntity(pos: BlockPos, state: BlockState) :
 	private val facing: Direction
 		get() = cachedState[FaceDeviceBlock.FACING]
 
-    private var inventory: Pair<BlockState, BlockApiCache<Storage<ItemVariant>, Direction>>? = null
+	private var inventory: FixedItemInv? = null
 	override val pendingInsertions = mutableListOf<PendingInsertion>()
 	override val dispatchStackTimeout = 1L
 	override val controller = ActivationController(SLEEP_TIME, this)
 
-    private fun getInventory(): Storage<ItemVariant>? {
+	fun updateInventory() {
-        if (inventory == null) {
 		val offsetPos = pos.offset(facing)
-            val cachedFacedBlock = world!!.getBlockState(offsetPos)
+		val option = SearchOptions.inDirection(facing)
-            val inventory = BlockApiCache.create(ItemStorage.SIDED, world!! as ServerWorld, offsetPos)
+		inventory = ItemAttributes.FIXED_INV.getFirstOrNull(world, offsetPos, option)
-            this.inventory = Pair(cachedFacedBlock, inventory)
 	}
-        return inventory!!.second.find(inventory!!.first, facing.opposite)
+
+	private fun getInventory(): FixedItemInv? {
+		if (inventory == null) updateInventory()
+		return inventory
 	}
 
 	override fun handle(packet: Packet) {
@@ -78,15 +75,10 @@ class ExtractorBlockEntity(pos: BlockPos, state: BlockState) :
 		val inventory = getInventory() ?: return insertion.stack
 		// if the inventory has changed, the old slot index is meaningless
 		if (inventory !== insertion.inventory) return insertion.stack
-        val transaction = Transaction.openOuter()
+		val extracted = inventory.extractStack(insertion.inventorySlot, ExactItemStackFilter(insertion.stack), ItemStack.EMPTY, insertion.totalCapacity, Simulation.ACTION)
-        val extractedAmount = inventory.extract(ItemVariant.of(insertion.stack), insertion.stack.count.toLong(), transaction).toInt()
+		if (extracted.isEmpty) return insertion.stack
-        transaction.commit()
-        if (extractedAmount == 0) {
-            return insertion.stack
-        } else if (extractedAmount != insertion.stack.count) {
 		// if we extracted less than expected, make sure super.finishInsertion doesn't send more than we actually have
-            insertion.stack = insertion.stack.copyWithCount(extractedAmount)
+		insertion.stack = extracted
-        }
 		return super.finishInsertion(insertion)
 	}
 
@@ -102,15 +94,14 @@ class ExtractorBlockEntity(pos: BlockPos, state: BlockState) :
 
 	override fun activate(): Boolean {
 		val inventory = getInventory() ?: return false
-        for (view in inventory.iterator(null)) {
+		for (slot in 0 until inventory.slotCount) {
-            if (view.amount <= 0) continue
+			val slotStack = inventory.getInvStack(slot)
-            val transaction = Transaction.openOuter()
+			if (slotStack.isEmpty) continue
-            var extractableAmount = inventory.simulateExtract(view.resource, view.amount, transaction).toInt()
+			val extractable = inventory.extractStack(slot, ExactItemStackFilter(slotStack), ItemStack.EMPTY, slotStack.count, Simulation.SIMULATE)
-            transaction.close()
+			if (extractable.isEmpty) continue
-            if (extractableAmount <= 0) continue
+			dispatchItemStack(extractable) { insertion ->
-            extractableAmount = min(extractableAmount, view.resource.item.maxCount)
-            dispatchItemStack(view.resource.toStack(extractableAmount)) { insertion ->
 				insertion.inventory = inventory
+				insertion.inventorySlot = slot
 			}
 			return true
 		}
@@ -135,9 +126,8 @@ class ExtractorBlockEntity(pos: BlockPos, state: BlockState) :
 		controller.activationMode = ActivationMode.valueOf(tag.getString("ActivationMode"))
 	}
 
-    class PendingInsertion(stack: ItemStack, timestamp: Long) :
+	class PendingInsertion(stack: ItemStack, timestamp: Long): NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
-        NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
+		lateinit var inventory: FixedItemInv
-        lateinit var inventory: Storage<ItemVariant>
 		var inventorySlot by Delegates.notNull<Int>()
 	}
 }

src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterBlock.kt

@@ -31,7 +31,7 @@ import kotlin.math.min
 /**
  * @author shadowfacts
  */
-class InserterBlock : FaceDeviceBlock<InserterBlockEntity>(
+class InserterBlock: FaceDeviceBlock<InserterBlockEntity>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
@@ -68,14 +68,7 @@ class InserterBlock : FaceDeviceBlock<InserterBlockEntity>(
 							arr[i] = 16.0 - arr[i]
 						}
 					}
-                    createCuboidShape(
+					createCuboidShape(min(arr[0], arr[3]), min(arr[1], arr[4]), min(arr[2], arr[5]), max(arr[0], arr[3]), max(arr[1], arr[4]), max(arr[2], arr[5]))
-                        min(arr[0], arr[3]),
-                        min(arr[1], arr[4]),
-                        min(arr[2], arr[5]),
-                        max(arr[0], arr[3]),
-                        max(arr[1], arr[4]),
-                        max(arr[2], arr[5])
-                    )
 				}
 				INSERTER_SHAPES[dir] = shapes.reduce { a, b -> VoxelShapes.union(a, b) }
 			}
@@ -87,20 +80,25 @@ class InserterBlock : FaceDeviceBlock<InserterBlockEntity>(
 
 	override fun createBlockEntity(pos: BlockPos, state: BlockState) = InserterBlockEntity(pos, state)
 
-    override fun onUse(
+	override fun onPlaced(world: World, pos: BlockPos, state: BlockState, entity: LivingEntity?, stack: ItemStack) {
-        state: BlockState,
+		if (!world.isClient) {
-        world: World,
+			getBlockEntity(world, pos)!!.updateInventory()
-        pos: BlockPos,
+		}
-        player: PlayerEntity,
+	}
-        hand: Hand,
+
-        hitResult: BlockHitResult
+	override fun neighborUpdate(state: BlockState, world: World, pos: BlockPos, neighborBlock: Block, neighborPos: BlockPos, bl: Boolean) {
-    ): ActionResult {
+		if (!world.isClient) {
+			getBlockEntity(world, pos)!!.updateInventory()
+		}
+	}
+
+	override fun onUse(state: BlockState, world: World, pos: BlockPos, player: PlayerEntity, hand: Hand, hitResult: BlockHitResult): ActionResult {
 		if (!world.isClient) {
 			val be = getBlockEntity(world, pos)!!
 
 			be.markUpdate()
 
-            val factory = object : ExtendedScreenHandlerFactory {
+			val factory = object: ExtendedScreenHandlerFactory {
 				override fun createMenu(syncId: Int, playerInv: PlayerInventory, player: PlayerEntity): ScreenHandler {
 					return InserterScreenHandler(syncId, playerInv, be)
 				}

src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterBlockEntity.kt

@@ -1,14 +1,13 @@
 package net.shadowfacts.phycon.block.inserter
 
-import net.fabricmc.fabric.api.lookup.v1.block.BlockApiCache
+import alexiil.mc.lib.attributes.SearchOptions
-import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage
+import alexiil.mc.lib.attributes.Simulation
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
+import alexiil.mc.lib.attributes.item.ItemAttributes
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage
+import alexiil.mc.lib.attributes.item.ItemInsertable
-import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction
+import alexiil.mc.lib.attributes.item.ItemStackUtil
 import net.minecraft.block.BlockState
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.server.world.ServerWorld
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.shadowfacts.phycon.api.packet.Packet
@@ -20,13 +19,15 @@ import net.shadowfacts.phycon.component.NetworkStackProvider
 import net.shadowfacts.phycon.component.handleItemStack
 import net.shadowfacts.phycon.init.PhyBlockEntities
 import net.shadowfacts.phycon.packet.*
-import net.shadowfacts.phycon.util.*
+import net.shadowfacts.phycon.util.ActivationMode
+import net.shadowfacts.phycon.util.ClientConfigurableDevice
+import net.shadowfacts.phycon.util.GhostInv
 import kotlin.math.min
 
 /**
  * @author shadowfacts
  */
-class InserterBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(PhyBlockEntities.INSERTER, pos, state),
+class InserterBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.INSERTER, pos, state),
 	ItemStackPacketHandler,
 	ActivationController.ActivatableDevice,
 	ClientConfigurableDevice,
@@ -40,25 +41,24 @@ class InserterBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(
 	private val facing: Direction
 		get() = cachedState[FaceDeviceBlock.FACING]
 
-    private var inventory: Pair<BlockState, BlockApiCache<Storage<ItemVariant>, Direction>>? = null
+	private var inventory: ItemInsertable? = null
 	private var currentRequest: PendingExtractRequest? = null
 	var stackToExtract: ItemStack = ItemStack.EMPTY
 	override var ghostSlotStack: ItemStack
 		get() = stackToExtract
-        set(value) {
+		set(value) { stackToExtract = value }
-            stackToExtract = value
-        }
 	var amountToExtract = 1
 	override val controller = ActivationController(SLEEP_TIME, this)
 
-    private fun getInventory(): Storage<ItemVariant>? {
+	fun updateInventory() {
-        if (inventory == null) {
 		val offsetPos = pos.offset(facing)
-            val cachedFacedBlock = world!!.getBlockState(offsetPos)
+		val option = SearchOptions.inDirection(facing)
-            val inventory = BlockApiCache.create(ItemStorage.SIDED, world!! as ServerWorld, offsetPos)
+		inventory = ItemAttributes.INSERTABLE.getFirstOrNull(world, offsetPos, option)
-            this.inventory = Pair(cachedFacedBlock, inventory)
 	}
-        return inventory!!.second.find(inventory!!.first, facing.opposite)
+
+	private fun getInventory(): ItemInsertable? {
+		if (inventory == null) updateInventory()
+		return inventory
 	}
 
 	override fun handle(packet: Packet) {
@@ -71,26 +71,17 @@ class InserterBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(
 
 	override fun doHandleItemStack(packet: ItemStackPacket): ItemStack {
 		val inventory = getInventory()
-        if (inventory != null) {
+		return if (inventory != null) {
-            val transaction = Transaction.openOuter()
+			inventory.attemptInsertion(packet.stack, Simulation.ACTION)
-            val inserted = inventory.insert(ItemVariant.of(packet.stack), packet.stack.count.toLong(), transaction).toInt()
-            transaction.commit()
-            return if (inserted == 0) {
-                packet.stack
-            } else if (inserted == packet.stack.count) {
-                ItemStack.EMPTY
-            } else {
-                packet.stack.copyWithCount(packet.stack.count - inserted)
-            }
 		} else {
 			// no inventory, entire stack remains
-            return packet.stack
+			packet.stack
 		}
 	}
 
 	private fun handleStackLocation(packet: StackLocationPacket) {
 		val request = currentRequest
-        if (request != null && request.stack.equalsIgnoringAmount(packet.stack)) {
+		if (request != null && ItemStackUtil.areEqualIgnoreAmounts(request.stack, packet.stack)) {
 			request.results.add(packet.amount to packet.stackProvider)
 			if (request.isFinishable(counter)) {
 				finishRequest()

src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterScreen.kt

@@ -22,7 +22,7 @@ class InserterScreen(
 	handler: InserterScreenHandler,
 	playerInv: PlayerInventory,
 	title: Text,
-) : HandledScreen<InserterScreenHandler>(
+): HandledScreen<InserterScreenHandler>(
 	handler,
 	playerInv,
 	title

src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterScreenHandler.kt

@@ -22,13 +22,13 @@ class InserterScreenHandler(
 	syncId: Int,
 	playerInv: PlayerInventory,
 	val inserter: InserterBlockEntity,
-) : ScreenHandler(PhyScreens.INSERTER, syncId) {
+): ScreenHandler(PhyScreens.INSERTER, syncId) {
 
 	companion object {
 		val ID = Identifier(PhysicalConnectivity.MODID, "inserter")
 	}
 
-    constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf) :
+	constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf):
 			this(
 				syncId,
 				playerInv,

src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlock.kt

@@ -23,7 +23,7 @@ import java.util.*
 /**
  * @author shadowfacts
  */
-class MinerBlock : DeviceBlock<MinerBlockEntity>(
+class MinerBlock: DeviceBlock<MinerBlockEntity>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
@@ -38,12 +38,7 @@ class MinerBlock : DeviceBlock<MinerBlockEntity>(
 		return EnumSet.of(state[FACING].opposite)
 	}
 
-    override fun getNetworkInterfaceForSide(
+	override fun getNetworkInterfaceForSide(side: Direction, state: BlockState, world: WorldAccess, pos: BlockPos): Interface? {
-        side: Direction,
-        state: BlockState,
-        world: WorldAccess,
-        pos: BlockPos
-    ): Interface? {
 		return if (side == state[FACING]) {
 			null
 		} else {
@@ -69,14 +64,7 @@ class MinerBlock : DeviceBlock<MinerBlockEntity>(
 		}
 	}
 
-    override fun neighborUpdate(
+	override fun neighborUpdate(state: BlockState, world: World, pos: BlockPos, neighbor: Block, neighborPos: BlockPos, bl: Boolean) {
-        state: BlockState,
-        world: World,
-        pos: BlockPos,
-        neighbor: Block,
-        neighborPos: BlockPos,
-        bl: Boolean
-    ) {
 		if (!world.isClient) {
 //			getBlockEntity(world, pos)!!.updateBlockToMine()
 		}

src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlockEntity.kt

@@ -1,10 +1,8 @@
 package net.shadowfacts.phycon.block.miner
 
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
+import alexiil.mc.lib.attributes.item.GroupedItemInvView
-import net.fabricmc.fabric.api.transfer.v1.storage.StorageView
+import alexiil.mc.lib.attributes.item.ItemStackUtil
-import net.fabricmc.fabric.api.transfer.v1.storage.base.ExtractionOnlyStorage
+import alexiil.mc.lib.attributes.item.filter.ItemFilter
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext
-import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.item.ItemStack
@@ -24,13 +22,12 @@ import net.shadowfacts.phycon.packet.*
 import net.shadowfacts.phycon.util.ActivationMode
 import net.shadowfacts.phycon.util.ClientConfigurableDevice
 import net.shadowfacts.phycon.util.copyWithCount
-import net.shadowfacts.phycon.util.equalsIgnoringAmount
 import kotlin.math.min
 
 /**
  * @author shadowfacts
  */
-class MinerBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(PhyBlockEntities.MINER, pos, state),
+class MinerBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.MINER, pos, state),
 	NetworkStackProvider,
 	NetworkStackDispatcher<MinerBlockEntity.PendingInsertion>,
 	ActivationController.ActivatableDevice,
@@ -39,7 +36,7 @@ class MinerBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(Phy
 	private val facing: Direction
 		get() = cachedState[MinerBlock.FACING]
 
-    private val invProxy = MinerStorageProxy(this)
+	private val invProxy = MinerInvProxy(this)
 
 	override val pendingInsertions = mutableListOf<PendingInsertion>()
 	override val dispatchStackTimeout = AbstractTerminalBlockEntity.INSERTION_TIMEOUT
@@ -63,16 +60,16 @@ class MinerBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(Phy
 		if (minerMode != MinerMode.ON_DEMAND || packet.kind != RequestInventoryPacket.Kind.GROUPED) {
 			return
 		}
-        sendPacket(ReadItemStoragePacket(invProxy, ipAddress, packet.source))
+		sendPacket(ReadGroupedInventoryPacket(invProxy, ipAddress, packet.source))
 	}
 
 	private fun handleLocateStack(packet: LocateStackPacket) {
 		if (minerMode != MinerMode.ON_DEMAND) {
 			return
 		}
-        val amount = invProxy.simulateExtract(ItemVariant.of(packet.stack), Long.MAX_VALUE, null)
+		val amount = invProxy.getAmount(packet.stack)
 		if (amount > 0) {
-            sendPacket(StackLocationPacket(packet.stack, amount.toInt(), this, ipAddress, packet.source))
+			sendPacket(StackLocationPacket(packet.stack, amount, this, ipAddress, packet.source))
 		}
 	}
 
@@ -83,8 +80,7 @@ class MinerBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(Phy
 
 		// always recalculate immediately before breaking
 		val drops = invProxy.getDrops(recalculate = true)
-        val amount = invProxy.simulateExtract(ItemVariant.of(packet.stack), packet.amount.toLong(), null)
+		if (invProxy.getAmount(packet.stack) > 0) {
-        if (amount > 0) {
 			world!!.breakBlock(pos.offset(facing), false)
 
 			// send the requested amount back to the requester
@@ -93,7 +89,7 @@ class MinerBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(Phy
 				if (remaining <= 0) {
 					break
 				}
-                if (!droppedStack.equalsIgnoringAmount(packet.stack)) {
+				if (!ItemStackUtil.areEqualIgnoreAmounts(droppedStack, packet.stack)) {
 					continue
 				}
 
@@ -188,15 +184,13 @@ class MinerBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(Phy
 		val friendlyName = TranslatableText("gui.phycon.miner_mode.${name.lowercase()}")
 	}
 
-    class MinerStorageProxy(val miner: MinerBlockEntity) :
+	class MinerInvProxy(val miner: MinerBlockEntity): GroupedItemInvView {
-        SnapshotParticipant<Pair<BlockState, List<ItemStack>>?>(),
-        ExtractionOnlyStorage<ItemVariant>
-    {
 		companion object {
 			val TOOL = ItemStack(Items.DIAMOND_PICKAXE)
 		}
 
-        private var cache: Pair<BlockState, List<ItemStack>>? = null
+		private var cachedState: BlockState? = null
+		private var cachedDrops: List<ItemStack>? = null
 
 		private val world: World
 			get() = miner.world!!
@@ -208,78 +202,39 @@ class MinerBlockEntity(pos: BlockPos, state: BlockState) : DeviceBlockEntity(Phy
 		fun getDrops(recalculate: Boolean = false): List<ItemStack> {
 			val targetPos = pos.offset(facing)
 			val realState = world.getBlockState(targetPos)
-            val cache = this.cache
 			// todo: does BlockState.equals actually work or is reference equality fine for BlockStates?
-            if (cache == null || realState != cache.first || recalculate) {
+			if (cachedDrops == null || realState != cachedState || recalculate) {
+				cachedState = realState
+
 				val be = if (realState.hasBlockEntity()) world.getBlockEntity(targetPos) else null
-                val drops = Block.getDroppedStacks(realState, world as ServerWorld, targetPos, be, null, TOOL)
+				cachedDrops = Block.getDroppedStacks(realState, world as ServerWorld, targetPos, be, null, TOOL)
-                this.cache = Pair(realState, drops)
-                return drops
 			}
-            return cache.second
+			return cachedDrops!!
 		}
 
-        override fun createSnapshot(): Pair<BlockState, List<ItemStack>>? {
+		override fun getStoredStacks(): Set<ItemStack> {
-            return cache
+			if (miner.minerMode != MinerMode.ON_DEMAND) {
+				return setOf()
+			}
+			return getDrops().toSet()
 		}
 
-        override fun readSnapshot(snapshot: Pair<BlockState, List<ItemStack>>?) {
+		override fun getTotalCapacity(): Int {
-            cache = snapshot
+			return Int.MAX_VALUE
 		}
 
-        override fun extract(resource: ItemVariant, maxAmount: Long, transaction: TransactionContext): Long {
+		override fun getStatistics(filter: ItemFilter): GroupedItemInvView.ItemInvStatistic {
-            val drops = getDrops()
+			var totalCount = 0
-            val (matched, unmatched) = drops.partition { resource.matches(it) }
+			for (s in storedStacks) {
-            if (matched.isEmpty()) {
+				if (filter.matches(s)) {
-                return 0
+					totalCount += s.count
-            }
-            val matchedCount = matched.sumOf { it.count }.toLong()
-            val extracted = min(maxAmount, matchedCount)
-            transaction.addCloseCallback { context, result ->
-                if (result.wasCommitted()) {
-                    world.breakBlock(pos.offset(facing), false)
-                    // send any un-extracted drops to the network
-                    if (matchedCount > extracted) {
-                        miner.dispatchItemStack(resource.toStack().copyWithCount((matchedCount - extracted).toInt()))
-                    }
-                    for (stack in unmatched) {
-                        miner.dispatchItemStack(stack)
 				}
 			}
-            }
+			return GroupedItemInvView.ItemInvStatistic(filter, totalCount, 0, Int.MAX_VALUE)
-            return extracted
-        }
-
-        override fun iterator(transaction: TransactionContext): Iterator<StorageView<ItemVariant>> {
-            return getDrops().map { View(it, this) }.iterator()
-        }
-
-        class View(val stack: ItemStack, val proxy: MinerStorageProxy) : StorageView<ItemVariant> {
-            override fun extract(resource: ItemVariant, maxAmount: Long, transaction: TransactionContext): Long {
-                return proxy.extract(resource, maxAmount, transaction)
-            }
-
-            override fun isResourceBlank(): Boolean {
-                return false
-            }
-
-            override fun getResource(): ItemVariant {
-                return ItemVariant.of(stack)
-            }
-
-            override fun getAmount(): Long {
-                return stack.count.toLong()
-            }
-
-            override fun getCapacity(): Long {
-                // TODO: ehh? we have stuff stored, but nothing can be inserted, so...
-                return 0
-            }
 		}
 	}
 
-    class PendingInsertion(stack: ItemStack, timestamp: Long) :
+	class PendingInsertion(stack: ItemStack, timestamp: Long): NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
-        NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
 	}
 
 }

src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlock.kt

@@ -1,5 +1,7 @@
 package net.shadowfacts.phycon.block.netinterface
 
+import alexiil.mc.lib.attributes.AttributeList
+import alexiil.mc.lib.attributes.AttributeProvider
 import net.minecraft.block.*
 import net.minecraft.entity.LivingEntity
 import net.minecraft.item.ItemStack
@@ -16,12 +18,13 @@ import net.shadowfacts.phycon.block.FaceDeviceBlock
 /**
  * @author shadowfacts
  */
-class InterfaceBlock : FaceDeviceBlock<InterfaceBlockEntity>(
+class InterfaceBlock: FaceDeviceBlock<InterfaceBlockEntity>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
 ),
-    NetworkComponentBlock {
+	NetworkComponentBlock,
+	AttributeProvider {
 
 	companion object {
 		val ID = Identifier(PhysicalConnectivity.MODID, "network_interface")
@@ -39,4 +42,20 @@ class InterfaceBlock : FaceDeviceBlock<InterfaceBlockEntity>(
 
 	override fun createBlockEntity(pos: BlockPos, state: BlockState) = InterfaceBlockEntity(pos, state)
 
+	override fun onPlaced(world: World, pos: BlockPos, state: BlockState, placer: LivingEntity?, stack: ItemStack) {
+		if (!world.isClient) {
+			getBlockEntity(world, pos)!!.updateInventory()
+		}
+	}
+
+	override fun neighborUpdate(state: BlockState, world: World, pos: BlockPos, neighborBlock: Block, neighborPos: BlockPos, boolean_1: Boolean) {
+		if (!world.isClient) {
+			getBlockEntity(world, pos)!!.updateInventory()
+		}
+	}
+
+	override fun addAllAttributes(world: World, pos: BlockPos, state: BlockState, to: AttributeList<*>) {
+		to.offer(getBlockEntity(world, pos))
+	}
+
 }

src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlockEntity.kt

@@ -1,14 +1,12 @@
 package net.shadowfacts.phycon.block.netinterface
 
-import net.fabricmc.fabric.api.lookup.v1.block.BlockApiCache
+import alexiil.mc.lib.attributes.SearchOptions
-import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage
+import alexiil.mc.lib.attributes.Simulation
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
+import alexiil.mc.lib.attributes.item.GroupedItemInv
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage
+import alexiil.mc.lib.attributes.item.ItemAttributes
-import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction
 import net.minecraft.block.BlockState
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.server.world.ServerWorld
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.shadowfacts.phycon.api.packet.Packet
@@ -21,14 +19,13 @@ import net.shadowfacts.phycon.component.NetworkStackReceiver
 import net.shadowfacts.phycon.component.handleItemStack
 import net.shadowfacts.phycon.packet.*
 import net.shadowfacts.phycon.util.ClientConfigurableDevice
-import net.shadowfacts.phycon.util.copyWithCount
+import java.lang.ref.WeakReference
 import kotlin.math.min
 
 /**
  * @author shadowfacts
  */
-class InterfaceBlockEntity(pos: BlockPos, state: BlockState) :
+class InterfaceBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.INTERFACE, pos, state),
-    DeviceBlockEntity(PhyBlockEntities.INTERFACE, pos, state),
 	ItemStackPacketHandler,
 	NetworkStackProvider,
 	NetworkStackReceiver,
@@ -41,17 +38,21 @@ class InterfaceBlockEntity(pos: BlockPos, state: BlockState) :
 	override var receiverPriority = 0
 	var syncPriorities = true
 
-    private var cachedFacedBlock: BlockState? = null
+	private var inventory: WeakReference<GroupedItemInv>? = null
-    private var inventoryCache: BlockApiCache<Storage<ItemVariant>, Direction>? = null
 
-    private fun getInventory(): Storage<ItemVariant>? {
+	fun updateInventory() {
-        if (cachedFacedBlock == null) {
+		val offsetPos = pos.offset(facing)
-            cachedFacedBlock = world!!.getBlockState(pos.offset(facing))
+		val option = SearchOptions.inDirection(facing)
+		inventory = ItemAttributes.GROUPED_INV.getFirstOrNull(world, offsetPos, option).let {
+			WeakReference(it)
 		}
-        if (inventoryCache == null) {
-            inventoryCache = BlockApiCache.create(ItemStorage.SIDED, world!! as ServerWorld, pos.offset(facing))
 	}
-        return inventoryCache!!.find(cachedFacedBlock!!, facing.opposite)
+
+	private fun getInventory(): GroupedItemInv? {
+		// if we don't have an inventory, try to get one
+		// this happens when readAll is called before a neighbor state changes, such as immediately after world load
+		if (inventory?.get() == null) updateInventory()
+		return inventory?.get()
 	}
 
 	override fun handle(packet: Packet) {
@@ -69,50 +70,46 @@ class InterfaceBlockEntity(pos: BlockPos, state: BlockState) :
 			return
 		}
 		getInventory()?.also { inv ->
-            sendPacket(ReadItemStoragePacket(inv, ipAddress, packet.source))
+			sendPacket(ReadGroupedInventoryPacket(inv, ipAddress, packet.source))
 		}
 	}
 
 	private fun handleLocateStack(packet: LocateStackPacket) {
 		getInventory()?.also { inv ->
-            val transaction = Transaction.openOuter()
+			val amount = inv.getAmount(packet.stack)
-            val amount = inv.simulateExtract(ItemVariant.of(packet.stack), Long.MAX_VALUE, transaction);
+			sendPacket(StackLocationPacket(packet.stack, amount, this, ipAddress, packet.source))
-            transaction.close()
-            sendPacket(StackLocationPacket(packet.stack, amount.toInt(), this, ipAddress, packet.source))
 		}
 	}
 
 	private fun handleExtractStack(packet: ExtractStackPacket) {
 		getInventory()?.also { inv ->
-            var remaining = packet.amount
+			var amount = packet.amount
-            while (remaining > 0) {
+			while (amount > 0) {
-                val toExtract = min(remaining, packet.stack.maxCount)
+				val extracted = inv.extract(packet.stack, min(amount, packet.stack.maxCount))
-                val transaction = Transaction.openOuter()
+				if (extracted.isEmpty) {
-                val extracted = inv.extract(ItemVariant.of(packet.stack), toExtract.toLong(), transaction)
+					break
-                transaction.commit()
+				} else {
-                remaining -= extracted.toInt()
+					amount -= extracted.count
-                sendPacket(ItemStackPacket(packet.stack.copyWithCount(extracted.toInt()), ipAddress, packet.source))
+					sendPacket(ItemStackPacket(extracted, ipAddress, packet.source))
+				}
 			}
 		}
 	}
 
 	private fun handleCheckCapacity(packet: CheckCapacityPacket) {
 		getInventory()?.also { inv ->
-            val transaction = Transaction.openOuter()
+			val remaining = inv.attemptInsertion(packet.stack, Simulation.SIMULATE)
-            val inserted = inv.simulateInsert(ItemVariant.of(packet.stack), packet.stack.count.toLong(), transaction)
+			val couldAccept = packet.stack.count - remaining.count
-            transaction.close()
+			sendPacket(CapacityPacket(packet.stack, couldAccept, this, ipAddress, packet.source))
-            sendPacket(CapacityPacket(packet.stack, inserted.toInt(), this, ipAddress, packet.source))
 		}
 	}
 
 	override fun doHandleItemStack(packet: ItemStackPacket): ItemStack {
 		val inventory = getInventory()
 		if (inventory != null) {
-            val transaction = Transaction.openOuter()
+			val remaining = inventory.insert(packet.stack)
-            val inserted = inventory.insert(ItemVariant.of(packet.stack), packet.stack.count.toLong(), transaction)
+			// whatever could not be inserted will be sent back to the packet's source
-            transaction.commit()
+			return remaining
-            val remaining = packet.stack.count - inserted.toInt()
-            return packet.stack.copyWithCount(remaining)
 		} else {
 			return packet.stack
 		}

src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlock.kt

@@ -1,5 +1,7 @@
 package net.shadowfacts.phycon.block.netswitch
 
+import alexiil.mc.lib.attributes.AttributeList
+import alexiil.mc.lib.attributes.AttributeProvider
 import net.minecraft.block.BlockState
 import net.minecraft.block.Material
 import net.minecraft.block.entity.BlockEntity
@@ -9,6 +11,7 @@ import net.minecraft.sound.BlockSoundGroup
 import net.minecraft.util.Identifier
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
+import net.minecraft.world.BlockView
 import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.shadowfacts.phycon.PhysicalConnectivity
@@ -20,12 +23,13 @@ import java.util.*
 /**
  * @author shadowfacts
  */
-class SwitchBlock : BlockWithEntity<SwitchBlockEntity>(
+class SwitchBlock: BlockWithEntity<SwitchBlockEntity>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
 ),
-    NetworkComponentBlock {
+	NetworkComponentBlock,
+	AttributeProvider {
 
 	companion object {
 		val ID = Identifier(PhysicalConnectivity.MODID, "switch")
@@ -35,22 +39,13 @@ class SwitchBlock : BlockWithEntity<SwitchBlockEntity>(
 		return EnumSet.allOf(Direction::class.java)
 	}
 
-    override fun getNetworkInterfaceForSide(
+	override fun getNetworkInterfaceForSide(side: Direction, state: BlockState, world: WorldAccess, pos: BlockPos): Interface? {
-        side: Direction,
-        state: BlockState,
-        world: WorldAccess,
-        pos: BlockPos
-    ): Interface? {
 		return getBlockEntity(world, pos)?.interfaces?.find { it.side == side }
 	}
 
 	override fun createBlockEntity(pos: BlockPos, state: BlockState) = SwitchBlockEntity(pos, state)
 
-    override fun <T : BlockEntity> getTicker(
+	override fun <T: BlockEntity> getTicker(world: World, state: BlockState, type: BlockEntityType<T>): BlockEntityTicker<T>? {
-        world: World,
-        state: BlockState,
-        type: BlockEntityType<T>
-    ): BlockEntityTicker<T>? {
 		return if (world.isClient) {
 			null
 		} else {
@@ -59,4 +54,8 @@ class SwitchBlock : BlockWithEntity<SwitchBlockEntity>(
 			}
 		}
 	}
+
+	override fun addAllAttributes(world: World, pos: BlockPos, state: BlockState, to: AttributeList<*>) {
+		to.offer(getBlockEntity(world, pos))
+	}
 }

src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlockEntity.kt

@@ -20,7 +20,6 @@ import net.shadowfacts.phycon.frame.BasePacketFrame
 import net.shadowfacts.phycon.frame.NetworkSplitFrame
 import net.shadowfacts.phycon.init.PhyBlockEntities
 import net.shadowfacts.phycon.packet.ItemStackPacket
-import net.shadowfacts.phycon.util.IntRingBuffer
 import net.shadowfacts.phycon.util.NetworkUtil
 import java.lang.ref.WeakReference
 import java.util.Deque
@@ -29,7 +28,7 @@ import java.util.LinkedList
 /**
  * @author shadowfacts
  */
-class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlockEntities.SWITCH, pos, state) {
+class SwitchBlockEntity(pos: BlockPos, state: BlockState): BlockEntity(PhyBlockEntities.SWITCH, pos, state) {
 
 	companion object {
 		var SWITCHING_CAPACITY = 256 // 256 packets/tick
@@ -39,13 +38,9 @@ class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlock
 
 	private val macTable = mutableMapOf<MACAddress, Direction>()
 	private val destinationCache = Array<WeakReference<Interface>?>(6) { null }
-    val packetStatistics = IntRingBuffer(60) // 1 minute's worth
-    private val currentSecondPacketStatistics = IntRingBuffer(20)
 	private var packetsHandledThisTick = 0
 	private var delayedPackets: Deque<Pair<PacketFrame, SwitchInterface>> = LinkedList()
 
-    var statisticsObserver: (() -> Unit)? = null
-
 	fun interfaceForSide(side: Direction): SwitchInterface {
 		return interfaces.find { it.side == side }!!
 	}
@@ -69,14 +64,7 @@ class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlock
 	private fun resend(frame: EthernetFrame, fromItf: SwitchInterface) {
 		if (frame.destination.type != MACAddress.Type.BROADCAST && macTable.containsKey(frame.destination)) {
 			val dir = macTable[frame.destination]!!
-            PhysicalConnectivity.NETWORK_LOGGER.debug(
+			PhysicalConnectivity.NETWORK_LOGGER.debug("{} ({}, {}) forwarding {} to side {}", this, fromItf.side, fromItf.macAddress, frame, dir)
-                "{} ({}, {}) forwarding {} to side {}",
-                this,
-                fromItf.side,
-                fromItf.macAddress,
-                frame,
-                dir
-            )
 			interfaceForSide(dir).send(frame)
 		} else {
 			flood(frame, fromItf)
@@ -84,13 +72,7 @@ class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlock
 	}
 
 	private fun flood(frame: EthernetFrame, source: SwitchInterface) {
-        PhysicalConnectivity.NETWORK_LOGGER.debug(
+		PhysicalConnectivity.NETWORK_LOGGER.debug("{} ({}, {}) flooding {}", this, source.side, source.macAddress, frame)
-            "{} ({}, {}) flooding {}",
-            this,
-            source.side,
-            source.macAddress,
-            frame
-        )
 		for (itf in interfaces) {
 			if (source == itf) continue
 			itf.send(frame)
@@ -116,16 +98,6 @@ class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlock
 	}
 
 	fun tick() {
-        if (statisticsObserver != null) {
-            if (currentSecondPacketStatistics.size == 20) {
-                packetStatistics.add(currentSecondPacketStatistics.sum())
-                currentSecondPacketStatistics.clear()
-                statisticsObserver?.invoke()
-            } else {
-                currentSecondPacketStatistics.add(packetsHandledThisTick)
-            }
-        }
-
 		packetsHandledThisTick = 0
 
 		while (delayedPackets.isNotEmpty() && packetsHandledThisTick <= SWITCHING_CAPACITY) {
@@ -175,11 +147,6 @@ class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlock
 				delayedPackets.addLast(frame to fromItf)
 			}
 		}
-        tag.getIntArray("PacketStatistics")?.also { statistics ->
-            if (statistics.isNotEmpty()) {
-                packetStatistics.replace(statistics)
-            }
-        }
 	}
 
 	override fun toUpdatePacket(): Packet<ClientPlayPacketListener>? {
@@ -189,7 +156,6 @@ class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlock
 	override fun toInitialChunkDataNbt(): NbtCompound {
 		val tag = NbtCompound()
 		tag.putLongArray("InterfaceAddresses", interfaces.map { it.macAddress.address })
-        tag.putIntArray("PacketStatistics", packetStatistics.asContiguousArray())
 		return tag
 	}
 
@@ -197,7 +163,7 @@ class SwitchBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(PhyBlock
 		val side: Direction,
 		val switch: WeakReference<SwitchBlockEntity>,
 		@JvmField var macAddress: MACAddress,
-    ) : Interface {
+	): Interface {
 		override fun getMACAddress() = macAddress
 
 		override fun receive(frame: EthernetFrame) {

src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchConsoleScreen.kt

@@ -1,100 +0,0 @@
-package net.shadowfacts.phycon.block.netswitch
-
-import net.minecraft.client.util.math.MatrixStack
-import net.minecraft.entity.player.PlayerInventory
-import net.minecraft.text.LiteralText
-import net.minecraft.text.Text
-import net.shadowfacts.cacao.CacaoHandledScreen
-import net.shadowfacts.cacao.geometry.Point
-import net.shadowfacts.cacao.geometry.Rect
-import net.shadowfacts.cacao.geometry.Size
-import net.shadowfacts.cacao.util.Color
-import net.shadowfacts.cacao.util.RenderHelper
-import net.shadowfacts.cacao.view.Label
-import net.shadowfacts.cacao.view.View
-import net.shadowfacts.cacao.viewcontroller.ViewController
-import net.shadowfacts.cacao.window.ScreenHandlerWindow
-import net.shadowfacts.kiwidsl.dsl
-import org.lwjgl.glfw.GLFW
-
-/**
- * @author shadowfacts
- */
-class SwitchConsoleScreen(
-    handler: SwitchConsoleScreenHandler,
-    playerInventory: PlayerInventory,
-    title: Text,
-) : CacaoHandledScreen<SwitchConsoleScreenHandler>(
-    handler,
-    playerInventory,
-    title,
-) {
-
-    val root = SwitchConsoleViewController(handler.switch)
-
-    init {
-        addWindow(ScreenHandlerWindow(handler, root))
-    }
-
-    override fun shouldPause() = false
-
-    override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-        if (keyCode == GLFW.GLFW_KEY_E) {
-            close()
-            return true
-        }
-        return super.keyPressed(keyCode, scanCode, modifiers)
-    }
-
-}
-
-class SwitchConsoleViewController(val switch: SwitchBlockEntity) : ViewController() {
-    override fun viewDidLoad() {
-        super.viewDidLoad()
-
-        val stats = SwitchPacketStatisticsView(switch)
-        view.addSubview(stats)
-        view.solver.dsl {
-            stats.centerXAnchor equalTo (view.centerXAnchor + 50)
-            stats.centerYAnchor equalTo (view.centerYAnchor + 50)
-        }
-    }
-}
-
-class SwitchPacketStatisticsView(val switch: SwitchBlockEntity) : View() {
-
-    init {
-        intrinsicContentSize = Size(180.0, 90.0)
-    }
-
-    override fun drawContent(matrixStack: MatrixStack, mouse: Point, delta: Float) {
-        RenderHelper.fill(matrixStack, bounds, Color.BLACK)
-        if (switch.packetStatistics.size == 0) {
-            return
-        }
-        // TODO: drawLine isn't working for some reason
-        RenderHelper.drawLine(
-            Point(bounds.left, bounds.top),
-            Point(bounds.right, bounds.bottom),
-            1.0,
-            2f,
-            Color.MAGENTA
-        )
-        return
-        val maxPackets = switch.packetStatistics.maxOf { it }
-        val maxDataPointsCount = 60
-        var lastPoint: Point? = null
-        val size = Size(3.0, 3.0)
-        for ((index, packets) in switch.packetStatistics.withIndex()) {
-            val x = (1 - (switch.packetStatistics.size - index).toDouble() / maxDataPointsCount) * bounds.width
-            val y = (1 - (packets.toDouble() / maxPackets)) * (bounds.height)
-            val point = Point(x, y)
-            if (lastPoint != null) {
-//                RenderHelper.fill(matrixStack, Rect(lastPoint, 3.0, 3.0), Color.RED)
-                RenderHelper.drawLine(lastPoint, point, 1.0, 2f, Color.RED)
-            }
-            lastPoint = point
-        }
-    }
-
-}

src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchConsoleScreenHandler.kt

@@ -1,46 +0,0 @@
-package net.shadowfacts.phycon.block.netswitch
-
-import net.minecraft.entity.player.PlayerEntity
-import net.minecraft.entity.player.PlayerInventory
-import net.minecraft.network.PacketByteBuf
-import net.minecraft.screen.ScreenHandler
-import net.minecraft.util.Identifier
-import net.shadowfacts.phycon.PhysicalConnectivity
-import net.shadowfacts.phycon.init.PhyBlocks
-import net.shadowfacts.phycon.init.PhyScreens
-
-/**
- * @author shadowfacts
- */
-class SwitchConsoleScreenHandler(
-    syncId: Int,
-    val switch: SwitchBlockEntity,
-) : ScreenHandler(PhyScreens.SWITCH_CONSOLE, syncId) {
-
-    companion object {
-        val ID = Identifier(PhysicalConnectivity.MODID, "switch_console")
-    }
-
-    constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf) :
-            this(
-                syncId,
-                PhyBlocks.SWITCH.getBlockEntity(playerInv.player.world, buf.readBlockPos())!!
-            )
-
-    init {
-        switch.statisticsObserver = {
-            switch.world!!.updateListeners(switch.pos, switch.cachedState, switch.cachedState, 3)
-        }
-    }
-
-    override fun canUse(player: PlayerEntity): Boolean {
-        return true
-    }
-
-    override fun close(player: PlayerEntity) {
-        super.close(player)
-
-        switch.statisticsObserver = null
-    }
-
-}

src/main/kotlin/net/shadowfacts/phycon/block/p2p/P2PInterfaceBlock.kt

@@ -12,7 +12,7 @@ import net.shadowfacts.phycon.block.FaceDeviceBlock
 /**
  * @author shadowfacts
  */
-class P2PInterfaceBlock : FaceDeviceBlock<P2PInterfaceBlockEntity>(
+class P2PInterfaceBlock: FaceDeviceBlock<P2PInterfaceBlockEntity>(
         Settings.of(Material.METAL)
                 .strength(1.5f)
                 .sounds(BlockSoundGroup.METAL)

src/main/kotlin/net/shadowfacts/phycon/block/p2p/P2PInterfaceBlockEntity.kt

@@ -15,8 +15,7 @@ import net.shadowfacts.phycon.packet.RequestInventoryPacket
 /**
  * @author shadowfacts
  */
-class P2PInterfaceBlockEntity(pos: BlockPos, state: BlockState) :
+class P2PInterfaceBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.P2P_INTERFACE, pos, state) {
-    DeviceBlockEntity(PhyBlockEntities.P2P_INTERFACE, pos, state) {
 
     private var inventory: Storage<ItemVariant>? = null
 

src/main/kotlin/net/shadowfacts/phycon/block/p2p/P2PReceiverBlock.kt

@@ -16,7 +16,7 @@ import net.shadowfacts.phycon.block.FaceDeviceBlock
 /**
  * @author shadowfacts
  */
-class P2PReceiverBlock : FaceDeviceBlock<P2PReceiverBlockEntity>(
+class P2PReceiverBlock: FaceDeviceBlock<P2PReceiverBlockEntity>(
         Settings.of(Material.METAL)
                 .strength(1.5f)
                 .sounds(BlockSoundGroup.METAL)

src/main/kotlin/net/shadowfacts/phycon/block/p2p/P2PReceiverBlockEntity.kt

@@ -21,8 +21,7 @@ import java.lang.ref.WeakReference
 /**
  * @author shadowfacts
  */
-class P2PReceiverBlockEntity(pos: BlockPos, state: BlockState) :
+class P2PReceiverBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.P2P_RECEIVER, pos, state),
-    DeviceBlockEntity(PhyBlockEntities.P2P_RECEIVER, pos, state),
     ClientConfigurableDevice {
 
     enum class Status {

src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlock.kt

@@ -18,7 +18,7 @@ import net.shadowfacts.phycon.block.FaceDeviceBlock
 /**
  * @author shadowfacts
  */
-class RedstoneControllerBlock : FaceDeviceBlock<RedstoneControllerBlockEntity>(
+class RedstoneControllerBlock: FaceDeviceBlock<RedstoneControllerBlockEntity>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
@@ -51,14 +51,7 @@ class RedstoneControllerBlock : FaceDeviceBlock<RedstoneControllerBlockEntity>(
 		return state.with(POWERED, isPowered(context.world, context.blockPos, state[FACING]))
 	}
 
-    override fun neighborUpdate(
+	override fun neighborUpdate(state: BlockState, world: World, pos: BlockPos, neighborBlock: Block, neighborPos: BlockPos, bl: Boolean) {
-        state: BlockState,
-        world: World,
-        pos: BlockPos,
-        neighborBlock: Block,
-        neighborPos: BlockPos,
-        bl: Boolean
-    ) {
 		// this can't be done in getStateForNeighborUpdate because getEmittedRedstonePower is defined in World not WorldAccess
 		if (!world.isClient) {
 			val wasLit = state[POWERED]

src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt

@@ -14,8 +14,7 @@ import net.shadowfacts.phycon.util.RedstoneMode
 /**
  * @author shadowfacts
  */
-class RedstoneControllerBlockEntity(pos: BlockPos, state: BlockState) :
+class RedstoneControllerBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.REDSTONE_CONTROLLER, pos, state),
-    DeviceBlockEntity(PhyBlockEntities.REDSTONE_CONTROLLER, pos, state),
 	ClientConfigurableDevice {
 
 	var managedDevices = Array<IPAddress?>(5) { null }

src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterBlock.kt

@@ -24,7 +24,7 @@ import net.shadowfacts.phycon.block.FaceDeviceBlock
 /**
  * @author shadowfacts
  */
-class RedstoneEmitterBlock : FaceDeviceBlock<RedstoneEmitterBlockEntity>(
+class RedstoneEmitterBlock: FaceDeviceBlock<RedstoneEmitterBlockEntity>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
@@ -51,12 +51,7 @@ class RedstoneEmitterBlock : FaceDeviceBlock<RedstoneEmitterBlockEntity>(
 		return true
 	}
 
-    override fun getStrongRedstonePower(
+	override fun getStrongRedstonePower(state: BlockState, world: BlockView, pos: BlockPos, receivingSide: Direction): Int {
-        state: BlockState,
-        world: BlockView,
-        pos: BlockPos,
-        receivingSide: Direction
-    ): Int {
 		return if (receivingSide.opposite == state[FACING]) {
 			getBlockEntity(world, pos)!!.cachedEmittedPower
 		} else {
@@ -64,29 +59,17 @@ class RedstoneEmitterBlock : FaceDeviceBlock<RedstoneEmitterBlockEntity>(
 		}
 	}
 
-    override fun getWeakRedstonePower(
+	override fun getWeakRedstonePower(state: BlockState, world: BlockView, pos: BlockPos, receivingSide: Direction): Int {
-        state: BlockState,
-        world: BlockView,
-        pos: BlockPos,
-        receivingSide: Direction
-    ): Int {
 		return getStrongRedstonePower(state, world, pos, receivingSide)
 	}
 
-    override fun onUse(
+	override fun onUse(state: BlockState, world: World, pos: BlockPos, player: PlayerEntity, hand: Hand, result: BlockHitResult): ActionResult {
-        state: BlockState,
-        world: World,
-        pos: BlockPos,
-        player: PlayerEntity,
-        hand: Hand,
-        result: BlockHitResult
-    ): ActionResult {
 		if (!world.isClient) {
 			val be = getBlockEntity(world, pos)!!
 
 			be.markUpdate()
 
-            val factory = object : ExtendedScreenHandlerFactory {
+			val factory = object: ExtendedScreenHandlerFactory {
 				override fun createMenu(syncId: Int, playerInv: PlayerInventory, player: PlayerEntity): ScreenHandler {
 					return RedstoneEmitterScreenHandler(syncId, playerInv, be)
 				}

src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterBlockEntity.kt

@@ -1,7 +1,6 @@
 package net.shadowfacts.phycon.block.redstone_emitter
 
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
+import alexiil.mc.lib.attributes.item.GroupedItemInvView
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage
 import net.minecraft.block.BlockState
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
@@ -13,29 +12,27 @@ import net.shadowfacts.phycon.block.DeviceBlockEntity
 import net.shadowfacts.phycon.block.FaceDeviceBlock
 import net.shadowfacts.phycon.init.PhyBlockEntities
 import net.shadowfacts.phycon.packet.DeviceRemovedPacket
-import net.shadowfacts.phycon.packet.ReadItemStoragePacket
+import net.shadowfacts.phycon.packet.ReadGroupedInventoryPacket
 import net.shadowfacts.phycon.packet.RequestInventoryPacket
 import net.shadowfacts.phycon.util.ClientConfigurableDevice
 import net.shadowfacts.phycon.util.GhostInv
+import kotlin.math.round
 
 /**
  * @author shadowfacts
  */
-class RedstoneEmitterBlockEntity(pos: BlockPos, state: BlockState) :
+class RedstoneEmitterBlockEntity(pos: BlockPos, state: BlockState): DeviceBlockEntity(PhyBlockEntities.REDSTONE_EMITTER, pos, state),
-    DeviceBlockEntity(PhyBlockEntities.REDSTONE_EMITTER, pos, state),
 	ClientConfigurableDevice,
 	GhostInv {
 
-    private val inventoryCache = mutableMapOf<IPAddress, Storage<ItemVariant>>()
+	private val inventoryCache = mutableMapOf<IPAddress, GroupedItemInvView>()
 	var cachedEmittedPower: Int = 0
 		private set
 
 	var stackToMonitor: ItemStack = ItemStack.EMPTY
 	override var ghostSlotStack: ItemStack
 		get() = stackToMonitor
-        set(value) {
+		set(value) { stackToMonitor = value }
-            stackToMonitor = value
-        }
 	var maxAmount = 64
 	var mode = Mode.ANALOG
 		set(value) {
@@ -45,12 +42,12 @@ class RedstoneEmitterBlockEntity(pos: BlockPos, state: BlockState) :
 
 	override fun handle(packet: Packet) {
 		when (packet) {
-            is ReadItemStoragePacket -> handleReadItemStorage(packet)
+			is ReadGroupedInventoryPacket -> handleReadInventory(packet)
 			is DeviceRemovedPacket -> handleDeviceRemoved(packet)
 		}
 	}
 
-    private fun handleReadItemStorage(packet: ReadItemStoragePacket) {
+	private fun handleReadInventory(packet: ReadGroupedInventoryPacket) {
 		inventoryCache[packet.source] = packet.inventory
 		recalculateRedstone()
 	}
@@ -66,10 +63,11 @@ class RedstoneEmitterBlockEntity(pos: BlockPos, state: BlockState) :
 		if (!world!!.isClient && counter % 20 == 0L) {
 			if (counter % 80 == 0L) {
 				updateInventories()
-            }
+			} else if (counter % 20 == 0L) {
 				recalculateRedstone()
 			}
 		}
+	}
 
 	private fun updateInventories() {
 		sendPacket(RequestInventoryPacket(RequestInventoryPacket.Kind.GROUPED, ipAddress))
@@ -83,18 +81,16 @@ class RedstoneEmitterBlockEntity(pos: BlockPos, state: BlockState) :
 			updateWorld()
 			return
 		}
-        val variant = ItemVariant.of(stackToMonitor)
 		val networkAmount = inventoryCache.values.fold(0) { acc, inv ->
-            acc + inv.simulateExtract(variant, Long.MAX_VALUE, null).toInt()
+			acc + inv.getAmount(stackToMonitor)
 		}
 		cachedEmittedPower =
 			when (mode) {
 				Mode.ANALOG -> if (networkAmount == 0) {
 					0
 				} else {
-                    1 + (networkAmount / maxAmount.toDouble() * 14).toInt()
+					1 + round(networkAmount / maxAmount.toDouble() * 14).toInt()
 				}
-
 				Mode.DIGITAL -> if (networkAmount >= maxAmount) 15 else 0
 			}
 

src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterScreen.kt

@@ -30,7 +30,7 @@ class RedstoneEmitterScreen(
 	handler: RedstoneEmitterScreenHandler,
 	playerInv: PlayerInventory,
 	title: Text
-) : CacaoHandledScreen<RedstoneEmitterScreenHandler>(
+): CacaoHandledScreen<RedstoneEmitterScreenHandler>(
 	handler,
 	playerInv,
 	title
@@ -59,7 +59,7 @@ class RedstoneEmitterScreen(
 
 	class ViewController(
 		private val emitter: RedstoneEmitterBlockEntity,
-    ) : net.shadowfacts.cacao.viewcontroller.ViewController() {
+	): net.shadowfacts.cacao.viewcontroller.ViewController() {
 
 		lateinit var halfLabel: Label
 		lateinit var fullLabel: Label
@@ -90,12 +90,7 @@ class RedstoneEmitterScreen(
 			view.addSubview(hStack)
 
 			val zeroStack = hStack.addArrangedSubview(StackView(Axis.VERTICAL))
-            zeroStack.addArrangedSubview(
+			zeroStack.addArrangedSubview(Label(TranslatableText("gui.phycon.emitter.count", 0), textAlignment = Label.TextAlignment.CENTER)).apply {
-                Label(
-                    TranslatableText("gui.phycon.emitter.count", 0),
-                    textAlignment = Label.TextAlignment.CENTER
-                )
-            ).apply {
 				textColor = Color.TEXT
 			}
 			zeroStack.addArrangedSubview(View())

src/main/kotlin/net/shadowfacts/phycon/block/redstone_emitter/RedstoneEmitterScreenHandler.kt

@@ -21,13 +21,13 @@ class RedstoneEmitterScreenHandler(
 	syncId: Int,
 	playerInv: PlayerInventory,
 	val emitter: RedstoneEmitterBlockEntity,
-) : ScreenHandler(PhyScreens.REDSTONE_EMITTER, syncId) {
+): ScreenHandler(PhyScreens.REDSTONE_EMITTER, syncId) {
 
 	companion object {
 		val ID = Identifier(PhysicalConnectivity.MODID, "redstone_emitter")
 	}
 
-    constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf) :
+	constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf):
 			this(
 				syncId,
 				playerInv,

src/main/kotlin/net/shadowfacts/phycon/block/terminal/AbstractTerminalBlock.kt

@@ -1,5 +1,7 @@
 package net.shadowfacts.phycon.block.terminal
 
+import alexiil.mc.lib.attributes.AttributeList
+import alexiil.mc.lib.attributes.AttributeProvider
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.block.Material
@@ -10,11 +12,15 @@ import net.minecraft.state.StateManager
 import net.minecraft.state.property.Properties
 import net.minecraft.util.ActionResult
 import net.minecraft.util.Hand
+import net.minecraft.util.Identifier
+import net.minecraft.util.ItemScatterer
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
+import net.minecraft.world.BlockView
 import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
+import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.api.NetworkComponentBlock
 import net.shadowfacts.phycon.block.DeviceBlock
 import java.util.EnumSet
@@ -22,12 +28,13 @@ import java.util.EnumSet
 /**
  * @author shadowfacts
  */
-abstract class AbstractTerminalBlock<T : AbstractTerminalBlockEntity> : DeviceBlock<T>(
+abstract class AbstractTerminalBlock<T: AbstractTerminalBlockEntity>: DeviceBlock<T>(
 	Settings.of(Material.METAL)
 		.strength(1.5f)
 		.sounds(BlockSoundGroup.METAL)
 ),
-    NetworkComponentBlock {
+	NetworkComponentBlock,
+	AttributeProvider {
 
 	companion object {
 		val FACING = Properties.FACING
@@ -48,14 +55,7 @@ abstract class AbstractTerminalBlock<T : AbstractTerminalBlockEntity> : DeviceBl
 		return defaultState.with(FACING, context.playerLookDirection.opposite)
 	}
 
-    override fun onUse(
+	override fun onUse(state: BlockState, world: World, pos: BlockPos, player: PlayerEntity, hand: Hand, hitResult: BlockHitResult): ActionResult {
-        state: BlockState,
-        world: World,
-        pos: BlockPos,
-        player: PlayerEntity,
-        hand: Hand,
-        hitResult: BlockHitResult
-    ): ActionResult {
 		getBlockEntity(world, pos)!!.onActivate(player)
 		return ActionResult.SUCCESS
 	}
@@ -68,4 +68,8 @@ abstract class AbstractTerminalBlock<T : AbstractTerminalBlockEntity> : DeviceBl
 			super.onStateReplaced(state, world, pos, newState, moved)
 		}
 	}
+
+	override fun addAllAttributes(world: World, pos: BlockPos, state: BlockState, to: AttributeList<*>) {
+		to.offer(getBlockEntity(world, pos))
+	}
 }

src/main/kotlin/net/shadowfacts/phycon/block/terminal/AbstractTerminalBlockEntity.kt

@@ -1,9 +1,8 @@
 package net.shadowfacts.phycon.block.terminal
 
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
+import alexiil.mc.lib.attributes.item.GroupedItemInvView
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
+import alexiil.mc.lib.attributes.item.ItemStackCollections
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage
+import alexiil.mc.lib.attributes.item.ItemStackUtil
-import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction
 import net.minecraft.block.BlockState
 import net.minecraft.block.entity.BlockEntityType
 import net.minecraft.entity.player.PlayerEntity
@@ -19,9 +18,9 @@ import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.api.util.IPAddress
 import net.shadowfacts.phycon.block.DeviceBlockEntity
 import net.shadowfacts.phycon.component.*
+import net.shadowfacts.phycon.frame.NetworkSplitFrame
 import net.shadowfacts.phycon.packet.*
 import net.shadowfacts.phycon.util.NetworkUtil
-import net.shadowfacts.phycon.util.equalsIgnoringAmount
 import java.lang.ref.WeakReference
 import java.util.*
 import java.util.function.IntBinaryOperator
@@ -31,8 +30,7 @@ import kotlin.properties.Delegates
 /**
  * @author shadowfacts
  */
-abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockState) :
+abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockState): DeviceBlockEntity(type, pos, state),
-    DeviceBlockEntity(type, pos, state),
 	InventoryChangedListener,
 	ItemStackPacketHandler,
 	NetworkStackDispatcher<AbstractTerminalBlockEntity.PendingInsertion> {
@@ -45,14 +43,14 @@ abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockP
 		val REQUEST_INVENTORY_TIMEOUT: Long = 1 // ticks
 	}
 
-    protected val inventoryCache = mutableMapOf<IPAddress, Storage<ItemVariant>>()
+	protected val inventoryCache = mutableMapOf<IPAddress, GroupedItemInvView>()
 	val internalBuffer = TerminalBufferInventory(18)
 
 	protected val pendingRequests = LinkedList<StackLocateRequest>()
 	override val pendingInsertions = mutableListOf<PendingInsertion>()
 	override val dispatchStackTimeout = INSERTION_TIMEOUT
 
-    val cachedNetItems = Object2IntOpenHashMap<ItemVariant>()
+	val cachedNetItems = ItemStackCollections.intMap()
 	private var requestInventoryTimestamp: Long? = null
 
 	// todo: multiple players could have the terminal open simultaneously
@@ -79,7 +77,7 @@ abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockP
 
 	override fun handle(packet: Packet) {
 		when (packet) {
-            is ReadItemStoragePacket -> handleReadItemStorage(packet)
+			is ReadGroupedInventoryPacket -> handleReadInventory(packet)
 			is DeviceRemovedPacket -> handleDeviceRemoved(packet)
 			is StackLocationPacket -> handleStackLocation(packet)
 			is ItemStackPacket -> handleItemStack(packet)
@@ -87,7 +85,7 @@ abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockP
 		}
 	}
 
-    private fun handleReadItemStorage(packet: ReadItemStoragePacket) {
+	private fun handleReadInventory(packet: ReadGroupedInventoryPacket) {
 		inventoryCache[packet.source] = packet.inventory
 		updateAndSync()
 	}
@@ -99,7 +97,7 @@ abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockP
 
 	private fun handleStackLocation(packet: StackLocationPacket) {
 		val request = pendingRequests.firstOrNull {
-            it.stack.equalsIgnoringAmount(packet.stack)
+			ItemStackUtil.areEqualIgnoreAmounts(it.stack, packet.stack)
 		}
 		if (request != null) {
 			request.results.add(packet.amount to packet.stackProvider)
@@ -138,12 +136,10 @@ abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockP
 	private fun updateNetItems() {
 		cachedNetItems.clear()
 		for (inventory in inventoryCache.values) {
-            val transaction = Transaction.openOuter()
+			for (stack in inventory.storedStacks) {
-            for (view in inventory.iterator(transaction)) {
+				val amount = inventory.getAmount(stack)
-                val amount = view.amount.toInt()
+				cachedNetItems.mergeInt(stack, amount, IntBinaryOperator { a, b -> a + b })
-                cachedNetItems.mergeInt(view.resource, amount, IntBinaryOperator { a, b -> a + b })
 			}
-            transaction.close()
 		}
 	}
 
@@ -263,8 +259,7 @@ abstract class AbstractTerminalBlockEntity(type: BlockEntityType<*>, pos: BlockP
 		fun netItemsChanged()
 	}
 
-    class PendingInsertion(stack: ItemStack, timestamp: Long) :
+	class PendingInsertion(stack: ItemStack, timestamp: Long): NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
-        NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
 		var bufferSlot by Delegates.notNull<Int>()
 	}
 

src/main/kotlin/net/shadowfacts/phycon/block/terminal/AbstractTerminalScreen.kt

@@ -27,13 +27,13 @@ import kotlin.math.min
 /**
  * @author shadowfacts
  */
-abstract class AbstractTerminalScreen<BE : AbstractTerminalBlockEntity, T : AbstractTerminalScreenHandler<BE>>(
+abstract class AbstractTerminalScreen<BE: AbstractTerminalBlockEntity, T: AbstractTerminalScreenHandler<BE>>(
 	handler: T,
 	playerInv: PlayerInventory,
 	title: Text,
 	val terminalBackgroundWidth: Int,
 	val terminalBackgroundHeight: Int,
-) : CacaoHandledScreen<T>(handler, playerInv, title) {
+): CacaoHandledScreen<T>(handler, playerInv, title) {
 
 	interface SearchQueryListener {
 		fun terminalSearchQueryChanged(newValue: String)
@@ -80,13 +80,7 @@ abstract class AbstractTerminalScreen<BE : AbstractTerminalBlockEntity, T : Abst
 
 	fun requestUpdatedItems() {
 		val player = MinecraftClient.getInstance().player!!
-        player.networkHandler.sendPacket(
+		player.networkHandler.sendPacket(C2STerminalUpdateDisplayedItems(handler.terminal, searchQuery, scrollPosition.toFloat()))
-            C2STerminalUpdateDisplayedItems(
-                handler.terminal,
-                searchQuery,
-                scrollPosition.toFloat()
-            )
-        )
 	}
 
 	private fun showRequestAmountDialog(stack: ItemStack) {
@@ -121,12 +115,10 @@ abstract class AbstractTerminalScreen<BE : AbstractTerminalBlockEntity, T : Abst
 				val format = if (amount < 10_000) DECIMAL_FORMAT else FORMAT
 				format.format(amount / 1_000.0) + "K"
 			}
-
 			amount < 1_000_000_000 -> {
 				val format = if (amount < 10_000_000) DECIMAL_FORMAT else FORMAT
 				format.format(amount / 1_000_000.0) + "M"
 			}
-
 			else -> {
 				DECIMAL_FORMAT.format(amount / 1000000000.0).toString() + "B"
 			}
@@ -144,18 +136,7 @@ abstract class AbstractTerminalScreen<BE : AbstractTerminalBlockEntity, T : Abst
 		val immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().buffer)
 		val textX = (1 / scale * 18) - textRenderer.getWidth(s).toFloat() - 3
 		val textY = (1 / scale * 18) - 11
-        textRenderer.draw(
+		textRenderer.draw(s, textX, textY, 0xffffff, true, matrixStack.peek().positionMatrix, immediate, false, 0, 0xF000F0)
-            s,
-            textX,
-            textY,
-            0xffffff,
-            true,
-            matrixStack.peek().positionMatrix,
-            immediate,
-            false,
-            0,
-            0xF000F0
-        )
 		RenderSystem.enableDepthTest()
 		immediate.draw()
 	}

src/main/kotlin/net/shadowfacts/phycon/block/terminal/AbstractTerminalScreenHandler.kt

@@ -1,20 +1,24 @@
 package net.shadowfacts.phycon.block.terminal
 
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
 import net.minecraft.screen.slot.Slot
 import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.entity.player.PlayerInventory
 import net.minecraft.item.ItemStack
+import net.minecraft.network.PacketByteBuf
 import net.minecraft.screen.ScreenHandler
 import net.minecraft.screen.ScreenHandlerType
 import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
 import net.shadowfacts.phycon.DefaultPlugin
+import net.shadowfacts.phycon.PhysicalConnectivity
+import net.shadowfacts.phycon.init.PhyBlocks
+import net.shadowfacts.phycon.init.PhyScreens
 import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems
 import net.shadowfacts.phycon.util.SortMode
 import net.shadowfacts.phycon.util.TerminalSettings
-import net.shadowfacts.phycon.util.name
+import net.shadowfacts.phycon.util.copyWithCount
 import java.lang.ref.WeakReference
 import kotlin.math.ceil
 import kotlin.math.max
@@ -24,12 +28,12 @@ import kotlin.math.roundToInt
 /**
  * @author shadowfacts
  */
-abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
+abstract class AbstractTerminalScreenHandler<T: AbstractTerminalBlockEntity>(
 	handlerType: ScreenHandlerType<*>,
 	syncId: Int,
 	val playerInv: PlayerInventory,
 	val terminal: T,
-) : ScreenHandler(handlerType, syncId),
+): ScreenHandler(handlerType, syncId),
 	AbstractTerminalBlockEntity.NetItemObserver {
 
 	private val rowsDisplayed = 6
@@ -45,7 +49,7 @@ abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
 			field = value
 			if (terminal.world!!.isClient) {
 				itemsForDisplay = value.map {
-                    it.variant.toStack(it.amount)
+					it.stack.copyWithCount(it.amount)
 				}
 			}
 		}
@@ -102,8 +106,6 @@ abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
 					return@filter true
 				}
 			}
-            // TODO: this is happening on the logical server, won't work with localization
-            // should filtering happen on the client?
 			it.key.name.string.contains(searchQuery, true)
 		}
 
@@ -123,16 +125,7 @@ abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
 
 //		itemEntries = sorted.map { Entry(it.key, it.intValue) }
 
-        (player as ServerPlayerEntity).networkHandler.sendPacket(
+		(player as ServerPlayerEntity).networkHandler.sendPacket(S2CTerminalUpdateDisplayedItems(terminal, itemEntries, searchQuery, settings, scrollPosition, totalEntries))
-            S2CTerminalUpdateDisplayedItems(
-                terminal,
-                itemEntries,
-                searchQuery,
-                settings,
-                scrollPosition,
-                totalEntries
-            )
-        )
 	}
 
 	fun totalRows(): Int {
@@ -151,12 +144,7 @@ abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
 		return currentScrollOffsetInRows() * 9
 	}
 
-    fun sendUpdatedItemsToClient(
+	fun sendUpdatedItemsToClient(player: ServerPlayerEntity, query: String, settings: TerminalSettings, scrollPosition: Float) {
-        player: ServerPlayerEntity,
-        query: String,
-        settings: TerminalSettings,
-        scrollPosition: Float
-    ) {
 		this.searchQuery = query
 		this.settings = settings
 		this.scrollPosition = scrollPosition
@@ -187,8 +175,7 @@ abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
 			// todo: why does this think it's quick_craft sometimes?
 			if ((actionType == SlotActionType.PICKUP || actionType == SlotActionType.QUICK_CRAFT) && !cursorStack.isEmpty) {
 				// placing cursor stack into buffer
-                val bufferSlot =
+				val bufferSlot = slotId - bufferSlotsStart // subtract 54 to convert the handler slot ID to a valid buffer index
-                    slotId - bufferSlotsStart // subtract 54 to convert the handler slot ID to a valid buffer index
 				terminal.internalBuffer.markSlot(bufferSlot, TerminalBufferInventory.Mode.TO_NETWORK)
 			}
 		}
@@ -216,16 +203,8 @@ abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
 				terminal.internalBuffer.markSlot(slotId - bufferSlotsStart, TerminalBufferInventory.Mode.UNASSIGNED)
 			}
 		} else if (isPlayerSlot(slotId)) {
-            val slotsInsertedInto = tryInsertItem(
+			val slotsInsertedInto = tryInsertItem(slot.stack, bufferSlotsStart until playerSlotsStart) { terminal.internalBuffer.getMode(it - bufferSlotsStart) != TerminalBufferInventory.Mode.FROM_NETWORK }
-                slot.stack,
+			slotsInsertedInto.forEach { terminal.internalBuffer.markSlot(it - bufferSlotsStart, TerminalBufferInventory.Mode.TO_NETWORK) }
-                bufferSlotsStart until playerSlotsStart
-            ) { terminal.internalBuffer.getMode(it - bufferSlotsStart) != TerminalBufferInventory.Mode.FROM_NETWORK }
-            slotsInsertedInto.forEach {
-                terminal.internalBuffer.markSlot(
-                    it - bufferSlotsStart,
-                    TerminalBufferInventory.Mode.TO_NETWORK
-                )
-            }
 			if (slotsInsertedInto.isEmpty()) {
 				return ItemStack.EMPTY
 			}
@@ -271,5 +250,5 @@ abstract class AbstractTerminalScreenHandler<T : AbstractTerminalBlockEntity>(
 	fun isBufferSlot(id: Int) = id in bufferSlotsStart until playerSlotsStart
 	fun isPlayerSlot(id: Int) = id >= playerSlotsStart
 
-    data class Entry(val variant: ItemVariant, val amount: Int)
+	data class Entry(val stack: ItemStack, val amount: Int)
 }

src/main/kotlin/net/shadowfacts/phycon/block/terminal/AbstractTerminalViewController.kt

@@ -19,11 +19,11 @@ import net.shadowfacts.phycon.util.TerminalSettings
 /**
  * @author shadowfacts
  */
-abstract class AbstractTerminalViewController<BE : AbstractTerminalBlockEntity, S : AbstractTerminalScreen<BE, H>, H : AbstractTerminalScreenHandler<BE>>(
+abstract class AbstractTerminalViewController<BE: AbstractTerminalBlockEntity, S: AbstractTerminalScreen<BE, H>, H: AbstractTerminalScreenHandler<BE>>(
 	val screen: S,
 	val handler: H,
 	val terminal: BE = handler.terminal,
-) : ViewController() {
+): ViewController() {
 
 	private lateinit var scrollTrack: ScrollTrackView
 	lateinit var settingsView: View
@@ -162,13 +162,13 @@ abstract class AbstractTerminalViewController<BE : AbstractTerminalBlockEntity,
 		screen.requestUpdatedItems()
 	}
 
-    class TerminalSearchField : TextField("") {
+	class TerminalSearchField: TextField("") {
 		override fun mouseClickedOutside(point: Point, mouseButton: MouseButton) {
 			// no-op
 		}
 	}
 
-    class ScrollHandlingView(val vc: AbstractTerminalViewController<*, *, *>) : View() {
+	class ScrollHandlingView(val vc: AbstractTerminalViewController<*, *, *>): View() {
 		override fun mouseScrolled(point: Point, amount: Double): Boolean {
 			var newOffsetInRows = vc.handler.currentScrollOffsetInRows() - amount.toInt()
 			newOffsetInRows = MathHelper.clamp(newOffsetInRows, 0, vc.handler.maxScrollOffsetInRows())

src/main/kotlin/net/shadowfacts/phycon/block/terminal/CraftingTerminalBlock.kt

@@ -9,7 +9,7 @@ import net.shadowfacts.phycon.PhysicalConnectivity
 /**
  * @author shadowfacts
  */
-class CraftingTerminalBlock : AbstractTerminalBlock<CraftingTerminalBlockEntity>() {
+class CraftingTerminalBlock: AbstractTerminalBlock<CraftingTerminalBlockEntity>() {
 
 	companion object {
 		val ID = Identifier(PhysicalConnectivity.MODID, "crafting_terminal")

src/main/kotlin/net/shadowfacts/phycon/block/terminal/CraftingTerminalBlockEntity.kt

@@ -1,9 +1,8 @@
 package net.shadowfacts.phycon.block.terminal
 
-import it.unimi.dsi.fastutil.ints.IntBinaryOperator
+import alexiil.mc.lib.attributes.item.ItemStackCollections
-import it.unimi.dsi.fastutil.objects.Object2IntArrayMap
+import alexiil.mc.lib.attributes.item.ItemStackUtil
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant
 import net.minecraft.block.BlockState
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.entity.player.PlayerInventory
@@ -18,16 +17,16 @@ import net.minecraft.util.math.BlockPos
 import net.shadowfacts.phycon.init.PhyBlockEntities
 import net.shadowfacts.phycon.packet.ItemStackPacket
 import net.shadowfacts.phycon.packet.LocateStackPacket
-import net.shadowfacts.phycon.util.equalsIgnoringAmount
+import net.shadowfacts.phycon.packet.RequestInventoryPacket
 import net.shadowfacts.phycon.util.fromTag
 import net.shadowfacts.phycon.util.toTag
 import java.util.LinkedList
+import kotlin.math.min
 
 /**
  * @author shadowfacts
  */
-class CraftingTerminalBlockEntity(pos: BlockPos, state: BlockState) :
+class CraftingTerminalBlockEntity(pos: BlockPos, state: BlockState): AbstractTerminalBlockEntity(PhyBlockEntities.CRAFTING_TERMINAL, pos, state) {
-    AbstractTerminalBlockEntity(PhyBlockEntities.CRAFTING_TERMINAL, pos, state) {
 
 	val craftingInv = SimpleInventory(9)
 
@@ -37,7 +36,7 @@ class CraftingTerminalBlockEntity(pos: BlockPos, state: BlockState) :
 		super.onActivate(player)
 
 		if (!world!!.isClient) {
-            val factory = object : ExtendedScreenHandlerFactory {
+			val factory = object: ExtendedScreenHandlerFactory {
 				override fun createMenu(syncId: Int, playerInv: PlayerInventory, player: PlayerEntity): ScreenHandler? {
 					return CraftingTerminalScreenHandler(syncId, playerInv, this@CraftingTerminalBlockEntity)
 				}
@@ -53,23 +52,20 @@ class CraftingTerminalBlockEntity(pos: BlockPos, state: BlockState) :
 	}
 
 	fun requestItemsForCrafting(maxAmount: Int) {
-        // use an array map because we have at most 9 items
+		val amounts = ItemStackCollections.map<IntArray>()
-        // values are bitfields of which slots contain the item
-        val stackToSlotsMap = Object2IntArrayMap<ItemVariant>()
 
-        val or = IntBinaryOperator { a, b -> a or b }
 		for (i in 0 until craftingInv.size()) {
 			val craftingInvStack = craftingInv.getStack(i)
 			if (craftingInvStack.isEmpty) continue
 			if (craftingInvStack.count >= craftingInvStack.maxCount) continue
 
-            stackToSlotsMap.mergeInt(ItemVariant.of(craftingInvStack), 1 shl i, or)
+			if (craftingInvStack !in amounts) amounts[craftingInvStack] = IntArray(9) { 0 }
+			amounts[craftingInvStack]!![i] = min(maxAmount, craftingInvStack.maxCount - craftingInvStack.count)
 		}
 
-        for ((variant, slots) in stackToSlotsMap) {
+		for ((stack, amountPerSlot) in amounts) {
-            val total = slots.countOneBits()
+			val total = amountPerSlot.sum()
-            val stack = variant.toStack()
+			val request = CraftingStackLocateRequest(stack, total, counter, amountPerSlot)
-            val request = CraftingStackLocateRequest(stack, total, counter, slots)
 			pendingRequests.add(request)
 			sendPacket(LocateStackPacket(stack, ipAddress))
 		}
@@ -84,29 +80,27 @@ class CraftingTerminalBlockEntity(pos: BlockPos, state: BlockState) :
 	}
 
 	override fun doHandleItemStack(packet: ItemStackPacket): ItemStack {
-        val craftingReq =
+		val craftingReq = completedCraftingStackRequests.find { ItemStackUtil.areEqualIgnoreAmounts(it.stack, packet.stack) }
-            completedCraftingStackRequests.find { it.stack.equalsIgnoringAmount(packet.stack) }
 		if (craftingReq != null) {
 			var remaining = packet.stack.copy()
 
 			for (i in 0 until craftingInv.size()) {
 				val currentStack = craftingInv.getStack(i)
 				if (currentStack.count >= currentStack.maxCount) continue
-                if (!currentStack.equalsIgnoringAmount(remaining)) continue
+				if (!ItemStackUtil.areEqualIgnoreAmounts(currentStack, remaining)) continue
 
-                currentStack.count += 1
+				val toInsert = minOf(remaining.count, currentStack.maxCount - currentStack.count, craftingReq.amountPerSlot[i])
-                remaining.count -= 1
+				currentStack.count += toInsert
-
+				remaining.count -= toInsert
-                craftingReq.slots = craftingReq.slots and (1 shl i).inv()
+				craftingReq.amountPerSlot[i] -= toInsert
-                craftingReq.received += 1
+				craftingReq.received += toInsert
 
 				if (remaining.isEmpty) {
 					break
 				}
 			}
 
-            // if slots == 0, there are no more slots needing items for this request
+			if (craftingReq.amountPerSlot.sum() == 0 || craftingReq.received >= craftingReq.totalResultAmount) {
-            if (craftingReq.slots == 0 || craftingReq.received >= craftingReq.totalResultAmount) {
 				completedCraftingStackRequests.remove(craftingReq)
 			}
 
@@ -136,11 +130,8 @@ class CraftingTerminalBlockEntity(pos: BlockPos, state: BlockState) :
 		stack: ItemStack,
 		amount: Int,
 		timestamp: Long,
-        /**
+		val amountPerSlot: IntArray,
-         * Values are bitfields of which slots in the crafting inventory this request is for.
+	): StackLocateRequest(stack, amount, timestamp) {
-         */
-        var slots: Int,
-    ) : StackLocateRequest(stack, amount, timestamp) {
 		var received: Int = 0
 	}
 

src/main/kotlin/net/shadowfacts/phycon/block/terminal/CraftingTerminalScreen.kt

@@ -15,7 +15,7 @@ class CraftingTerminalScreen(
 	handler: CraftingTerminalScreenHandler,
 	playerInv: PlayerInventory,
 	title: Text,
-) : AbstractTerminalScreen<CraftingTerminalBlockEntity, CraftingTerminalScreenHandler>(
+): AbstractTerminalScreen<CraftingTerminalBlockEntity, CraftingTerminalScreenHandler>(
 	handler,
 	playerInv,
 	title,

src/main/kotlin/net/shadowfacts/phycon/block/terminal/CraftingTerminalScreenHandler.kt

@@ -23,12 +23,7 @@ class CraftingTerminalScreenHandler(
 	syncId: Int,
 	playerInv: PlayerInventory,
 	terminal: CraftingTerminalBlockEntity,
-) : AbstractTerminalScreenHandler<CraftingTerminalBlockEntity>(
+): AbstractTerminalScreenHandler<CraftingTerminalBlockEntity>(PhyScreens.CRAFTING_TERMINAL, syncId, playerInv, terminal) {
-    PhyScreens.CRAFTING_TERMINAL,
-    syncId,
-    playerInv,
-    terminal
-) {
 
 	val craftingInv = CraftingInv(this)
 	val result = CraftingResultInventory()
@@ -41,7 +36,7 @@ class CraftingTerminalScreenHandler(
 	override val xOffset: Int
 		get() = 5
 
-    constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf) :
+	constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf):
 			this(
 				syncId,
 				playerInv,
@@ -78,14 +73,7 @@ class CraftingTerminalScreenHandler(
 					ItemStack.EMPTY
 				}
 			result.setStack(0, resultStack)
-            player.networkHandler.sendPacket(
+			player.networkHandler.sendPacket(ScreenHandlerSlotUpdateS2CPacket(syncId, nextRevision(), resultSlot.id, resultStack))
-                ScreenHandlerSlotUpdateS2CPacket(
-                    syncId,
-                    nextRevision(),
-                    resultSlot.id,
-                    resultStack
-                )
-            )
 		}
 	}
 
@@ -137,7 +125,7 @@ class CraftingTerminalScreenHandler(
 	}
 
 	// RecipeType.CRAFTING wants a CraftingInventory, but we can't store a CraftingInventory on the BE without a screen handler, so...
-    class CraftingInv(val handler: CraftingTerminalScreenHandler) : CraftingInventory(handler, 3, 3) {
+	class CraftingInv(val handler: CraftingTerminalScreenHandler): CraftingInventory(handler, 3, 3) {
 		private val backing = handler.terminal.craftingInv
 
 		override fun isEmpty(): Boolean {

src/main/kotlin/net/shadowfacts/phycon/block/terminal/CraftingTerminalViewController.kt

@@ -23,7 +23,7 @@ import org.lwjgl.glfw.GLFW
 class CraftingTerminalViewController(
 	screen: CraftingTerminalScreen,
 	handler: CraftingTerminalScreenHandler,
-) : AbstractTerminalViewController<CraftingTerminalBlockEntity, CraftingTerminalScreen, CraftingTerminalScreenHandler>(
+): AbstractTerminalViewController<CraftingTerminalBlockEntity, CraftingTerminalScreen, CraftingTerminalScreenHandler>(
 	screen,
 	handler,
 ) {
@@ -57,7 +57,7 @@ class CraftingTerminalViewController(
 		}
 
 		val clearIcon = TextureView(CLEAR_ICON).apply {
-            intrinsicContentSize = Size(3.0, 3.0)
+			intrinsicContentSize = Size(3.0,3.0)
 		}
 		val clearButton = view.addSubview(Button(clearIcon, padding = 2.0, handler = ::clearPressed)).apply {
 			background = TextureView(SMALL_BUTTON)
@@ -73,7 +73,7 @@ class CraftingTerminalViewController(
 			intrinsicContentSize = Size(3.0, 3.0)
 		}
 		val plusButton = view.addSubview(Button(plusIcon, padding = 2.0, handler = ::plusPressed)).apply {
-            background = TextureView(SMALL_BUTTON)
+			background= TextureView(SMALL_BUTTON)
 			hoveredBackground = TextureView(SMALL_BUTTON_HOVERED)
 			tooltip = TranslatableText("gui.phycon.terminal.more_crafting")
 		}
@@ -84,12 +84,7 @@ class CraftingTerminalViewController(
 	}
 
 	private fun clearPressed(button: Button) {
-        MinecraftClient.getInstance().player!!.networkHandler.sendPacket(
+		MinecraftClient.getInstance().player!!.networkHandler.sendPacket(C2STerminalCraftingButton(terminal, C2STerminalCraftingButton.Action.CLEAR_GRID))
-            C2STerminalCraftingButton(
-                terminal,
-                C2STerminalCraftingButton.Action.CLEAR_GRID
-            )
-        )
 	}
 
 	private fun plusPressed(button: Button) {

src/main/kotlin/net/shadowfacts/phycon/block/terminal/SettingButton.kt

@@ -17,12 +17,12 @@ import java.util.EnumMap
  */
 class SettingButton<E>(
 	val key: TerminalSettings.SettingKey<E>,
-) : AbstractButton<SettingButton<E>>(
+): AbstractButton<SettingButton<E>>(
 	TextureView(null).apply {
 		intrinsicContentSize = Size(16.0, 16.0)
 	},
 	padding = 2.0
-) where E : Enum<E>, E : TerminalSetting {
+) where E: Enum<E>, E: TerminalSetting {
 
 	private val textureCache = EnumMap<E, Texture>(key.clazz)
 

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlock.kt

@@ -8,7 +8,7 @@ import net.shadowfacts.phycon.PhysicalConnectivity
 /**
  * @author shadowfacts
  */
-class TerminalBlock : AbstractTerminalBlock<TerminalBlockEntity>() {
+class TerminalBlock: AbstractTerminalBlock<TerminalBlockEntity>() {
 
 	companion object {
 		val ID = Identifier(PhysicalConnectivity.MODID, "terminal")

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlockEntity.kt

@@ -10,18 +10,18 @@ import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.text.TranslatableText
 import net.minecraft.util.math.BlockPos
 import net.shadowfacts.phycon.init.PhyBlockEntities
+import net.shadowfacts.phycon.packet.RequestInventoryPacket
 
 /**
  * @author shadowfacts
  */
-class TerminalBlockEntity(pos: BlockPos, state: BlockState) :
+class TerminalBlockEntity(pos: BlockPos, state: BlockState): AbstractTerminalBlockEntity(PhyBlockEntities.TERMINAL, pos, state) {
-    AbstractTerminalBlockEntity(PhyBlockEntities.TERMINAL, pos, state) {
 
 	override fun onActivate(player: PlayerEntity) {
 		super.onActivate(player)
 
 		if (!world!!.isClient) {
-            val factory = object : ExtendedScreenHandlerFactory {
+			val factory = object: ExtendedScreenHandlerFactory {
 				override fun createMenu(syncId: Int, playerInv: PlayerInventory, player: PlayerEntity): ScreenHandler {
 					return TerminalScreenHandler(syncId, playerInv, this@TerminalBlockEntity)
 				}

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBufferInventory.kt

@@ -1,10 +1,10 @@
 package net.shadowfacts.phycon.block.terminal
 
+import alexiil.mc.lib.attributes.item.ItemStackUtil
 import net.minecraft.inventory.SimpleInventory
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtIntArray
-import net.shadowfacts.phycon.util.equalsIgnoringAmount
 import net.shadowfacts.phycon.util.fromTag
 import net.shadowfacts.phycon.util.toTag
 import kotlin.math.min
@@ -12,7 +12,7 @@ import kotlin.math.min
 /**
  * @author shadowfacts
  */
-class TerminalBufferInventory(size: Int) : SimpleInventory(size) {
+class TerminalBufferInventory(size: Int): SimpleInventory(size) {
 
 	enum class Mode {
 		TO_NETWORK, FROM_NETWORK, UNASSIGNED
@@ -54,7 +54,7 @@ class TerminalBufferInventory(size: Int) : SimpleInventory(size) {
 			setStack(slot, stack)
 			markSlot(slot, mode)
 			return ItemStack.EMPTY
-        } else if (stack.equalsIgnoringAmount(current)) {
+		} else if (ItemStackUtil.areEqualIgnoreAmounts(stack, current)) {
 			val toTransfer = min(current.maxCount - current.count, stack.count)
 			current.count += toTransfer
 			stack.count -= toTransfer

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalFakeSlot.kt

@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack
 /**
  * @author shadowfacts
  */
-class TerminalFakeSlot(fakeInv: FakeInventory, slot: Int, x: Int, y: Int) : Slot(fakeInv, slot, x, y) {
+class TerminalFakeSlot(fakeInv: FakeInventory, slot: Int, x: Int, y: Int): Slot(fakeInv, slot, x, y) {
 
 	override fun canInsert(stack: ItemStack): Boolean {
 		return false
@@ -23,7 +23,7 @@ class TerminalFakeSlot(fakeInv: FakeInventory, slot: Int, x: Int, y: Int) : Slot
 
 }
 
-class FakeInventory(val screenHandler: AbstractTerminalScreenHandler<*>) : Inventory {
+class FakeInventory(val screenHandler: AbstractTerminalScreenHandler<*>): Inventory {
 	override fun getStack(slot: Int): ItemStack {
 		if (slot >= screenHandler.itemsForDisplay.size) return ItemStack.EMPTY
 		return screenHandler.itemsForDisplay[slot]

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalRequestAmountViewController.kt

@@ -21,11 +21,10 @@ import kotlin.math.floor
 class TerminalRequestAmountViewController(
 	val screen: AbstractTerminalScreen<*, *>,
 	val stack: ItemStack,
-) : ViewController() {
+): ViewController() {
 
 	companion object {
-        private val BACKGROUND =
+		private val BACKGROUND = Texture(Identifier(PhysicalConnectivity.MODID, "textures/gui/terminal_amount.png"), 0, 0)
-            Texture(Identifier(PhysicalConnectivity.MODID, "textures/gui/terminal_amount.png"), 0, 0)
 	}
 
 	lateinit var field: NumberField
@@ -138,7 +137,7 @@ class TerminalRequestAmountViewController(
 		screen.amountVC = null
 	}
 
-    class AmountField(val vc: TerminalRequestAmountViewController) : NumberField(1) {
+	class AmountField(val vc: TerminalRequestAmountViewController): NumberField(1) {
 		override fun keyPressed(keyCode: Int, modifiers: KeyModifiers): Boolean {
 			return if (keyCode == GLFW.GLFW_KEY_ENTER) {
 				vc.doRequest()

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreen.kt

@@ -12,7 +12,7 @@ class TerminalScreen(
 	handler: TerminalScreenHandler,
 	playerInv: PlayerInventory,
 	title: Text,
-) : AbstractTerminalScreen<TerminalBlockEntity, TerminalScreenHandler>(
+): AbstractTerminalScreen<TerminalBlockEntity, TerminalScreenHandler>(
 	handler,
 	playerInv,
 	title,

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt

@@ -12,9 +12,9 @@ class TerminalScreenHandler(
 	syncId: Int,
 	playerInv: PlayerInventory,
 	terminal: TerminalBlockEntity,
-) : AbstractTerminalScreenHandler<TerminalBlockEntity>(PhyScreens.TERMINAL, syncId, playerInv, terminal) {
+): AbstractTerminalScreenHandler<TerminalBlockEntity>(PhyScreens.TERMINAL, syncId, playerInv, terminal) {
 
-    constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf) :
+	constructor(syncId: Int, playerInv: PlayerInventory, buf: PacketByteBuf):
 			this(
 				syncId,
 				playerInv,

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalViewController.kt

@@ -6,7 +6,7 @@ package net.shadowfacts.phycon.block.terminal
 class TerminalViewController(
 	screen: TerminalScreen,
 	handler: TerminalScreenHandler,
-) : AbstractTerminalViewController<TerminalBlockEntity, TerminalScreen, TerminalScreenHandler>(
+): AbstractTerminalViewController<TerminalBlockEntity, TerminalScreen, TerminalScreenHandler>(
 	screen,
 	handler,
 ) {