From b254a705d7e565bd4b628e67a258c9738af5755e Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 15 Feb 2023 14:23:57 +0700 Subject: [PATCH] applyNetworkPayload -> read --- .../ru/dbotthepony/mc/otm/android/AndroidFeature.kt | 2 +- .../ru/dbotthepony/mc/otm/android/AndroidResearch.kt | 2 +- .../dbotthepony/mc/otm/network/FieldSynchronizer.kt | 4 +--- .../mc/otm/network/MatteryPlayerNetworkChannel.kt | 4 ++-- .../dbotthepony/mc/otm/network/MenuNetworkChannel.kt | 2 +- .../mc/otm/network/WorldNetworkChannel.kt | 2 +- .../mc/otm/tests/FieldSynchronizerTests.kt | 12 ++++++------ 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt index 51010446e..736a3da2c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt @@ -40,7 +40,7 @@ abstract class AndroidFeature(val type: AndroidFeatureType<*>, val android: Matt } open fun applyNetworkPayload(stream: InputStream) { - synchronizer.applyNetworkPayload(stream) + synchronizer.read(stream) } override fun serializeNBT(): CompoundTag { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt index 03553c2d2..154d7dba9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt @@ -196,7 +196,7 @@ class AndroidResearch(val type: AndroidResearchType, val capability: MatteryPlay } fun applyNetworkPayload(stream: InputStream) { - synchronizer.applyNetworkPayload(stream) + synchronizer.read(stream) } val canResearch: Boolean get() { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt index af8e37281..d9e3f8068 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt @@ -39,13 +39,11 @@ import java.io.InputStream import java.lang.ref.WeakReference import java.math.BigDecimal import java.util.* -import java.util.function.Consumer import java.util.function.Supplier import kotlin.ConcurrentModificationException import kotlin.collections.ArrayList import kotlin.collections.HashMap import kotlin.properties.ReadOnlyProperty -import kotlin.properties.ReadWriteProperty import kotlin.reflect.KMutableProperty0 import kotlin.reflect.KProperty import kotlin.reflect.KProperty0 @@ -1112,7 +1110,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa private val missingFields = ObjectArraySet() private val missingFieldsMap = Int2ObjectArrayMap() - fun applyNetworkPayload(stream: InputStream, sizeLimit: NbtAccounter = NbtAccounter(1L shl 21 /* 2 MiB */)): Int { + fun read(stream: InputStream, sizeLimit: NbtAccounter = NbtAccounter(1L shl 21 /* 2 MiB */)): Int { if (stream.read() > 0) { idToField.clear() missingFieldsMap.clear() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt index 0abf41fb7..1d66bc2fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt @@ -60,9 +60,9 @@ class MatteryPlayerFieldPacket(val bytes: ByteArray, val length: Int, val isPubl } if (isPublic) { - player.publicSynchronizer.applyNetworkPayload(ByteArrayInputStream(bytes, 0, length)) + player.publicSynchronizer.read(ByteArrayInputStream(bytes, 0, length)) } else { - player.synchronizer.applyNetworkPayload(ByteArrayInputStream(bytes, 0, length)) + player.synchronizer.read(ByteArrayInputStream(bytes, 0, length)) } } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt index f5d70c0af..0c5fd3cb4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt @@ -32,7 +32,7 @@ class MenuFieldPacket(val bytes: ByteArray, val length: Int) : MatteryPacket { override fun play(context: Supplier) { context.packetHandled = true context.get().enqueueWork { - (minecraft.player?.containerMenu as? MatteryMenu)?.mSynchronizer?.applyNetworkPayload(ByteArrayInputStream(bytes, 0, length)) + (minecraft.player?.containerMenu as? MatteryMenu)?.mSynchronizer?.read(ByteArrayInputStream(bytes, 0, length)) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/WorldNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/WorldNetworkChannel.kt index f9d56b474..9e8cfc865 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/WorldNetworkChannel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/WorldNetworkChannel.kt @@ -25,7 +25,7 @@ class BlockEntitySyncPacket(val position: BlockPos, val buffer: ByteArray, val v val blockEntity = level.getBlockEntity(position) as? SynchronizedBlockEntity ?: return@enqueueWork try { - blockEntity.synchronizer.applyNetworkPayload(FastByteArrayInputStream(buffer, 0, validBytes)) + blockEntity.synchronizer.read(FastByteArrayInputStream(buffer, 0, validBytes)) } catch(err: Throwable) { LOGGER.error("Exception while reading synchronized BlockEntity data!\nPosition: $position\nBlock: ${level.getBlockState(position)}\nBlock entity: $blockEntity", err) throw err diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FieldSynchronizerTests.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FieldSynchronizerTests.kt index 1d70b17a4..550469f3f 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FieldSynchronizerTests.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FieldSynchronizerTests.kt @@ -31,7 +31,7 @@ object FieldSynchronizerTests { intA2.value = 348488 intA3.value = -4 - b.applyNetworkPayload(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) + b.read(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) assertEquals(boolA.value, boolB.value) assertEquals(intA.value, intB.value) @@ -62,7 +62,7 @@ object FieldSynchronizerTests { //intA2.setValue(348488) intA3.value = -4 - b.applyNetworkPayload(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) + b.read(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) assertEquals(boolA.value, boolB.value) assertEquals(intA.value, intB.value) @@ -95,8 +95,8 @@ object FieldSynchronizerTests { f4.value = 80L - b.applyNetworkPayload(bEndpoint.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) - c.applyNetworkPayload(cEndpoint.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) + b.read(bEndpoint.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) + c.read(cEndpoint.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) for ((i, field) in bFields.withIndex()) { assertEquals(aFields[i].value, field.value) @@ -125,7 +125,7 @@ object FieldSynchronizerTests { fieldsa[i].value = i } - b.applyNetworkPayload(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) + b.read(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) for (i in 0 .. 900) { assertEquals(fieldsa[i].value, fieldsb[i].value) @@ -153,7 +153,7 @@ object FieldSynchronizerTests { fieldsa[i].value = i } - b.applyNetworkPayload(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) + b.read(a.collectNetworkPayload()!!.let { ByteArrayInputStream(it.array, 0, it.length) }) for (i in 0 .. 900) { assertEquals(fieldsa[i].value, fieldsb[i].value)