From c804ba9acb7cc693810d775b561ace7ee28c12bd Mon Sep 17 00:00:00 2001 From: Bixilon Date: Fri, 30 Apr 2021 14:36:29 +0200 Subject: [PATCH] replace invoke functions with postfix functions --- .../bixilon/minosoft/data/assets/MultiAssetsManager.kt | 2 +- .../bixilon/minosoft/data/entities/entities/Entity.kt | 2 +- .../minosoft/data/mappings/versions/VersionMapping.kt | 4 ++-- .../minosoft/gui/input/key/RenderWindowInputHandler.kt | 10 +++++----- .../de/bixilon/minosoft/gui/rendering/RenderWindow.kt | 6 +++--- .../minosoft/gui/rendering/TintColorCalculator.kt | 2 +- .../gui/rendering/hud/elements/input/TextField.kt | 3 ++- .../gui/rendering/hud/nodes/layout/AbsoluteLayout.kt | 9 +++------ .../gui/rendering/hud/nodes/primitive/LabelNode.kt | 1 - .../minosoft/modding/event/CallbackEventInvoker.kt | 4 ++-- .../minosoft/modding/event/EventInvokerMethod.kt | 4 ++-- .../minosoft/protocol/network/connection/Connection.kt | 4 ++-- .../protocol/network/connection/StatusConnection.kt | 4 ++-- .../bixilon/minosoft/protocol/protocol/InByteBuffer.kt | 2 +- src/main/java/de/bixilon/minosoft/util/logging/Log.kt | 2 +- 15 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt b/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt index 13ebe27d0..726537e0a 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt @@ -46,7 +46,7 @@ class MultiAssetsManager( for (assetManager in assetsManagers) { try { - return runnable.invoke(assetManager) + return runnable(assetManager) } catch (ignored: FileNotFoundException) { continue } diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt index 9769c0cf2..96e139e69 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt @@ -182,7 +182,7 @@ abstract class Entity( if (values.containsKey(resourceLocation)) { continue } - val methodRetValue = method.invoke(this) ?: continue + val methodRetValue = method(this) ?: continue values[resourceLocation] = methodRetValue } catch (e: IllegalAccessException) { e.printStackTrace() diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt index af5149297..6158cf763 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt @@ -109,7 +109,7 @@ class VersionMapping { field = value for (parentableField in PARENTABLE_FIELDS) { - PARENTABLE_SET_PARENT_METHOD.invoke(parentableField.get(this), value?.let { parentableField.get(it) }) + PARENTABLE_SET_PARENT_METHOD(parentableField.get(this), value?.let { parentableField.get(it) }) } } @@ -243,7 +243,7 @@ class VersionMapping { if (!field.type.isAssignableFrom(Clearable::class.java)) { continue } - field.javaClass.getMethod("clear").invoke(this) + field.javaClass.getMethod("clear")(this) } } diff --git a/src/main/java/de/bixilon/minosoft/gui/input/key/RenderWindowInputHandler.kt b/src/main/java/de/bixilon/minosoft/gui/input/key/RenderWindowInputHandler.kt index 1818393a4..b6846b8e5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/input/key/RenderWindowInputHandler.kt +++ b/src/main/java/de/bixilon/minosoft/gui/input/key/RenderWindowInputHandler.kt @@ -55,7 +55,7 @@ class RenderWindowInputHandler( var currentKeyConsumer: KeyConsumer? = null - fun invoke(windowId: Long, key: Int, char: Int, action: Int, modifierKey: Int) { + fun keyInput(windowId: Long, key: Int, char: Int, action: Int, modifierKey: Int) { if (windowId != renderWindow.windowId) { return } @@ -186,7 +186,7 @@ class RenderWindowInputHandler( // Log.debug("Changing $resourceLocation because of $keyCode -> $thisKeyBindingDown") pair.lastChange = System.currentTimeMillis() for (callback in pair.callback) { - callback.invoke(thisKeyBindingDown) + callback(thisKeyBindingDown) } if (thisKeyBindingDown) { @@ -204,7 +204,7 @@ class RenderWindowInputHandler( } } - fun invoke(windowId: Long, char: Int) { + fun charInput(windowId: Long, char: Int) { if (windowId != renderWindow.windowId) { return } @@ -215,7 +215,7 @@ class RenderWindowInputHandler( currentKeyConsumer?.charInput(char.toChar()) } - fun invoke(windowId: Long, xPos: Double, yPos: Double) { + fun mouseMove(windowId: Long, xPos: Double, yPos: Double) { if (windowId != renderWindow.windowId) { return } @@ -232,7 +232,7 @@ class RenderWindowInputHandler( if (currentKeyConsumer != null) { return@add } - callback.invoke(it) + callback(it) } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt index ca595160b..1bdd6b59e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt @@ -253,10 +253,10 @@ class RenderWindow( }) } }) - glfwSetKeyCallback(this.windowId, inputHandler::invoke) + glfwSetKeyCallback(this.windowId, inputHandler::keyInput) - glfwSetCharCallback(windowId, inputHandler::invoke) - glfwSetCursorPosCallback(windowId, inputHandler::invoke) + glfwSetCharCallback(windowId, inputHandler::charInput) + glfwSetCursorPosCallback(windowId, inputHandler::mouseMove) registerGlobalKeyCombinations() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt index 67cf3fa0e..806332f56 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt @@ -114,7 +114,7 @@ class TintColorCalculator(val world: World) { if (color == RenderConstants.WHITE_COLOR) { color = RenderConstants.GRASS_FAILOVER_COLOR } - biome.grassColorModifier.modifier.invoke(color) + biome.grassColorModifier.modifier(color) } TINTS[GRASS_TINT_RESOURCE_LOCATION] = grassTintCalculator TINTS[SUGAR_CANE_TINT_RESOURCE_LOCATION] = grassTintCalculator diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/input/TextField.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/input/TextField.kt index c6b92c1fe..9d926c97e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/input/TextField.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/input/TextField.kt @@ -16,6 +16,7 @@ package de.bixilon.minosoft.gui.rendering.hud.elements.input import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.gui.rendering.RenderWindow +import de.bixilon.minosoft.gui.rendering.font.text.TextSetProperties import de.bixilon.minosoft.gui.rendering.hud.nodes.layout.AbsoluteLayout import de.bixilon.minosoft.gui.rendering.hud.nodes.primitive.LabelNode import de.bixilon.minosoft.util.MMath @@ -27,7 +28,7 @@ open class TextField( val properties: TextFieldProperties, ) : AbsoluteLayout(renderWindow), KeyConsumer, MouseConsumer { private var textBuilder: StringBuilder = StringBuilder(properties.defaultText) - val textElement = LabelNode(renderWindow, sizing = sizing, text = ChatComponent.of(text), background = false) + val textElement = LabelNode(renderWindow, sizing = sizing.copy(), setProperties = TextSetProperties(hardWrap = 100), text = ChatComponent.of(text), background = false) private var position = text.length var text: String diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/layout/AbsoluteLayout.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/layout/AbsoluteLayout.kt index e60581ea9..4f0496cbf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/layout/AbsoluteLayout.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/layout/AbsoluteLayout.kt @@ -82,12 +82,9 @@ open class AbsoluteLayout( } private fun recalculateSize() { - if (children.isEmpty()) { - sizing.currentSize = Vec2i(sizing.minSize) - } else { - for ((childNode, start) in children) { - checkSize(childNode, start) - } + sizing.currentSize = Vec2i(sizing.minSize) + for ((childNode, start) in children) { + checkSize(childNode, start) } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/primitive/LabelNode.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/primitive/LabelNode.kt index f7295b821..ad7c72bed 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/primitive/LabelNode.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/nodes/primitive/LabelNode.kt @@ -38,7 +38,6 @@ class LabelNode( set(value) { field = value prepare() - apply() } var sText: String diff --git a/src/main/java/de/bixilon/minosoft/modding/event/CallbackEventInvoker.kt b/src/main/java/de/bixilon/minosoft/modding/event/CallbackEventInvoker.kt index d4c665072..d976444c7 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/CallbackEventInvoker.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/CallbackEventInvoker.kt @@ -21,8 +21,8 @@ class CallbackEventInvoker private constructor( override val eventType: Class, ) : EventInvoker(ignoreCancelled, Priorities.NORMAL, null) { - override fun invoke(event: Event) { - callback.invoke(event as E) + override operator fun invoke(event: Event) { + callback(event as E) } companion object { diff --git a/src/main/java/de/bixilon/minosoft/modding/event/EventInvokerMethod.kt b/src/main/java/de/bixilon/minosoft/modding/event/EventInvokerMethod.kt index c527b1e18..157ee5e6d 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/EventInvokerMethod.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/EventInvokerMethod.kt @@ -28,14 +28,14 @@ class EventInvokerMethod( constructor(annotation: EventHandler, listener: EventListener, method: Method) : this(annotation.ignoreCancelled, annotation.priority, listener, method) - override fun invoke(event: Event) { + override operator fun invoke(event: Event) { if (!method.parameters[0].type.isAssignableFrom(event.javaClass)) { return } if (!this.isIgnoreCancelled && event is CancelableEvent && event.isCancelled) { return } - method.invoke(listener, event) + method(listener, event) } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/Connection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/Connection.kt index 867f28775..bf7820f2d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/Connection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/Connection.kt @@ -51,7 +51,7 @@ abstract class Connection { fun fireEvent(connectionEvent: ConnectionEvent): Boolean { for (eventManager in Minosoft.EVENT_MANAGERS) { for (eventListener in eventManager.globalEventListeners) { - eventListener.invoke(connectionEvent) + eventListener(connectionEvent) } } @@ -59,7 +59,7 @@ abstract class Connection { if (!eventInvoker.eventType.isAssignableFrom(connectionEvent::class.java)) { continue } - eventInvoker.invoke(connectionEvent) + eventInvoker(connectionEvent) } if (connectionEvent is CancelableEvent) { return connectionEvent.isCancelled diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt index 51ef9bc19..6f07fcf8d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt @@ -149,9 +149,9 @@ class StatusConnection( val wasPingDone = wasPingDone() if (method.eventType.isAssignableFrom(ServerListStatusArriveEvent::class.java) && wasPingDone) { // ping done - method.invoke(ServerListStatusArriveEvent(this, this.lastPing)) + method(ServerListStatusArriveEvent(this, this.lastPing)) } else if (method.eventType.isAssignableFrom(ServerListPongEvent::class.java) && wasPingDone && this.pong != null) { - method.invoke(this.pong!!) + method(this.pong!!) } else { super.registerEvent(method) } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt index 691ae3e00..67655cc9c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt @@ -58,7 +58,7 @@ open class InByteBuffer { check(length <= size) { "Trying to allocate to much memory!" } val array: MutableList = mutableListOf() for (i in 0 until length) { - array.add(i, reader.invoke()) + array.add(i, reader()) } return array.toTypedArray() } diff --git a/src/main/java/de/bixilon/minosoft/util/logging/Log.kt b/src/main/java/de/bixilon/minosoft/util/logging/Log.kt index a2d93289a..bb23a239b 100644 --- a/src/main/java/de/bixilon/minosoft/util/logging/Log.kt +++ b/src/main/java/de/bixilon/minosoft/util/logging/Log.kt @@ -133,7 +133,7 @@ object Log { } } } - log(logMessageType, level, additionalPrefix, messageBuilder.invoke()) + log(logMessageType, level, additionalPrefix, messageBuilder()) } @JvmStatic