DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Surprised FloatSupplier does not exist in either fastutil nor java base

Browse Source 
loal
This commit is contained in:
DBotThePony 2023-03-18 08:42:07 +07:00
parent fdae27844a
commit 743f9b64f1
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt Normal file
View File

@ -0,0 +1,5 @@
package ru.dbotthepony.mc.otm.core
fun interface FloatSupplier {
fun getAsFloat(): Float
}

7
src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt
View File

@ -8,7 +8,6 @@ import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream
import it.unimi.dsi.fastutil.objects.Reference2ObjectFunction import it.unimi.dsi.fastutil.objects.Reference2ObjectFunction
import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap
import it.unimi.dsi.fastutil.objects.ReferenceArraySet import it.unimi.dsi.fastutil.objects.ReferenceArraySet
import mekanism.api.functions.FloatSupplier
import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ItemStack
import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.core.*
import ru.dbotthepony.mc.otm.core.collect.ProxiedMap 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 { override fun observe(): Boolean {
check(!isRemoved) { "Field was removed" } check(!isRemoved) { "Field was removed" }
val value = getter.asFloat val value = getter.getAsFloat()
if (!isDirty && (!isRemoteSet || remote != value)) { if (!isDirty && (!isRemoteSet || remote != value)) {
notifyEndpoints(this) notifyEndpoints(this)
@ -1101,13 +1100,13 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
if (isClientValue) { if (isClientValue) {
return clientValue return clientValue
} else { } else {
return getter.asFloat return getter.getAsFloat()
} }
} }
override fun write(stream: DataOutputStream, endpoint: Endpoint) { override fun write(stream: DataOutputStream, endpoint: Endpoint) {
check(!isRemoved) { "Field was removed" } check(!isRemoved) { "Field was removed" }
stream.writeFloat(getter.asFloat) stream.writeFloat(getter.getAsFloat())
isDirty = false isDirty = false
} }

2
src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/Fields.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.mc.otm.network.synchronizer 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.DataInputStream
import java.io.DataOutputStream import java.io.DataOutputStream
import java.util.function.BooleanSupplier import java.util.function.BooleanSupplier