Get rid of slot provider interface

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.kt

@@ -623,10 +623,10 @@ abstract class MatteryScreen<T : MatteryMenu>(menu: T, inventory: Inventory, tit
 		val yFloat = y.toFloat()
 
 		for (panel in panels) {
-			val (status, slot) = panel.findSlot(xFloat, yFloat)
+			val (findPanel, interrupt) = panel.panelOfTypeUnderCursor<SlotPanel<*, *>>(xFloat, yFloat)
 
-			if (status) {
+			if (interrupt) {
-				return slot
+				return findPanel?.slot
 			}
 		}
 

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt

@@ -52,10 +52,6 @@ enum class DockResizeMode(val changeWidth: Boolean, val changeHeight: Boolean) {
 	ALL(true, true), NONE(false, false), WIDTH(true, false), HEIGHT(false, true)
 }
 
-interface ISlotPanel<out S : Slot> {
-	val slot: S
-}
-
 data class Rect2f(val x: Float, val y: Float, val width: Float, val height: Float) {
 	fun toIntRect(): Rect2i {
 		return Rect2i(x.roundToInt(), y.roundToInt(), width.roundToInt(), height.roundToInt())
@@ -972,46 +968,6 @@ open class EditablePanel<out S : Screen> @JvmOverloads constructor(
 		}
 	}
 
-	fun findSlot(mouseX: Float, mouseY: Float): Pair<Boolean, Slot?> {
-		if (!isVisible()) {
-			return false to null
-		}
-
-		if (!acceptMouseInput) {
-			return (mouseX >= absoluteX &&
-					mouseX <= absoluteX + width &&
-					mouseY >= absoluteY &&
-					mouseY <= absoluteY + height) to null
-		}
-
-		if (grabMouseInput && this is ISlotPanel<*>) {
-			return true to this.slot
-		}
-
-		for (child in visibleChildrenInternal) {
-			val (status, slot) = child.findSlot(mouseX, mouseY)
-
-			if (status) {
-				return true to slot
-			}
-		}
-
-		if (
-			mouseX >= absoluteX &&
-			mouseX <= absoluteX + width &&
-			mouseY >= absoluteY &&
-			mouseY <= absoluteY + height
-		) {
-			if (this is ISlotPanel<*>) {
-				return true to this.slot
-			}
-
-			return true to null
-		}
-
-		return false to null
-	}
-
 	data class PanelOfTypeResult<T>(val panel: T?, val interrupt: Boolean) {
 		constructor(panel: T) : this(panel, true)
 
@@ -1029,8 +985,8 @@ open class EditablePanel<out S : Screen> @JvmOverloads constructor(
 		}
 	}
 
-	inline fun <reified T> panelOfTypeUnderCursor(mouseX: Float, mouseY: Float, ignoreMouseInputLock: Boolean = false): T? {
+	inline fun <reified T> panelOfTypeUnderCursor(mouseX: Float, mouseY: Float, ignoreMouseInputLock: Boolean = false): PanelOfTypeResult<T> {
-		return panelOfTypeUnderCursor<T>(mouseX, mouseY, ignoreMouseInputLock) { it is T }.panel
+		return panelOfTypeUnderCursor<T>(mouseX, mouseY, ignoreMouseInputLock) { it is T }
 	}
 
 	fun <T> panelOfTypeUnderCursor(mouseX: Float, mouseY: Float, ignoreMouseInputLock: Boolean, tester: Predicate<EditablePanel<*>>): PanelOfTypeResult<T> {

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/FoldableSlotPanel.kt

@@ -6,9 +6,8 @@ import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.client.screen.panels.util.BackgroundPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.Dock
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
-import ru.dbotthepony.mc.otm.client.screen.panels.ISlotPanel
 
-open class FoldableSlotPanel<out S : MatteryScreen<*>, out T : Slot> @JvmOverloads constructor(
+open class FoldableSlotPanel<out S : MatteryScreen<*>, out T : Slot>(
 	screen: S,
 	parent: EditablePanel<*>?,
 	val mainSlot: SlotPanel<S, T>,
@@ -17,7 +16,7 @@ open class FoldableSlotPanel<out S : MatteryScreen<*>, out T : Slot> @JvmOverloa
 	y: Float = 0f,
 	width: Float = AbstractSlotPanel.SIZE,
 	height: Float = AbstractSlotPanel.SIZE,
-) : EditablePanel<S>(screen, parent, x, y, width, height), ISlotPanel<T> {
+) : EditablePanel<S>(screen, parent, x, y, width, height) {
 	init {
 		mainSlot.parent = this
 		mainSlot.dock = Dock.FILL
@@ -72,9 +71,6 @@ open class FoldableSlotPanel<out S : MatteryScreen<*>, out T : Slot> @JvmOverloa
 		}
 	}
 
-	override val slot: T
-		get() = mainSlot.slot
-
 	var hoveringSince: SystemTime? = null
 		protected set
 	var hoverPanel: HoverPanel? = null

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt

@@ -13,19 +13,18 @@ import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.render.Widgets18
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
-import ru.dbotthepony.mc.otm.client.screen.panels.ISlotPanel
 import javax.annotation.Nonnull
 import kotlin.math.roundToInt
 
-open class SlotPanel<out S : MatteryScreen<*>, out T : Slot> @JvmOverloads constructor(
+open class SlotPanel<out S : MatteryScreen<*>, out T : Slot>(
 	screen: S,
 	parent: EditablePanel<*>?,
-	final override val slot: T,
+	val slot: T,
 	x: Float = 0f,
 	y: Float = 0f,
 	width: Float = SIZE,
 	height: Float = SIZE,
-) : AbstractSlotPanel<S>(screen, parent, x, y, width, height), ISlotPanel<T> {
+) : AbstractSlotPanel<S>(screen, parent, x, y, width, height) {
 	override fun mouseClickedInner(x: Double, y: Double, button: Int): Boolean {
 		screen.returnSlot = slot
 		return true

src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Panel2ClickableIngredient.kt

@@ -21,7 +21,7 @@ class Panel2ClickableIngredient<P : EditablePanel<*>, T>(val panel: P, val ingre
 		inline fun <reified P : EditablePanel<*>, T : Any> find(mouseX: Double, mouseY: Double, type: IIngredientType<T>, source: Collection<EditablePanel<*>>, noinline provider: (P) -> T): Optional<IClickableIngredient<*>> {
 			return source
 				.stream()
-				.map { it.panelOfTypeUnderCursor<P>(mouseX.toFloat(), mouseY.toFloat(), ignoreMouseInputLock = true) }
+				.map { it.panelOfTypeUnderCursor<P>(mouseX.toFloat(), mouseY.toFloat(), ignoreMouseInputLock = true).panel }
 				.filterNotNull()
 				.findAny()
 				.flatMap { a -> JEIPlugin.helpers.ingredientManager.createTypedIngredient(type, provider(a)).map { a to it } }