From 743f9b64f166b816c9e412f15bef463055b12474 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 18 Mar 2023 08:42:07 +0700 Subject: [PATCH] Surprised FloatSupplier does not exist in either fastutil nor java base loal --- .../kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt | 5 +++++ .../mc/otm/network/synchronizer/FieldSynchronizer.kt | 7 +++---- .../ru/dbotthepony/mc/otm/network/synchronizer/Fields.kt | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt new file mode 100644 index 000000000..79c5bdd98 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt @@ -0,0 +1,5 @@ +package ru.dbotthepony.mc.otm.core + +fun interface FloatSupplier { + fun getAsFloat(): Float +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt index e7e65743e..da6aa38ce 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt @@ -8,7 +8,6 @@ import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import it.unimi.dsi.fastutil.objects.Reference2ObjectFunction import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.ReferenceArraySet -import mekanism.api.functions.FloatSupplier import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.core.collect.ProxiedMap @@ -1078,7 +1077,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa override fun observe(): Boolean { check(!isRemoved) { "Field was removed" } - val value = getter.asFloat + val value = getter.getAsFloat() if (!isDirty && (!isRemoteSet || remote != value)) { notifyEndpoints(this) @@ -1101,13 +1100,13 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa if (isClientValue) { return clientValue } else { - return getter.asFloat + return getter.getAsFloat() } } override fun write(stream: DataOutputStream, endpoint: Endpoint) { check(!isRemoved) { "Field was removed" } - stream.writeFloat(getter.asFloat) + stream.writeFloat(getter.getAsFloat()) isDirty = false } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/Fields.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/Fields.kt index 2985be01a..3cbfeb41b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/Fields.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/Fields.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.mc.otm.network.synchronizer -import mekanism.api.functions.FloatSupplier +import ru.dbotthepony.mc.otm.core.FloatSupplier import java.io.DataInputStream import java.io.DataOutputStream import java.util.function.BooleanSupplier