From e5d324f4fac92040db2f52debc642f98d61e8dff Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 29 Jul 2023 17:06:46 +0700 Subject: [PATCH] Get rid of registry network channel and merge it into generic network channel --- .../dbotthepony/mc/otm/OverdriveThatMatters.java | 1 - .../mc/otm/android/AndroidResearchManager.kt | 6 +++--- .../ru/dbotthepony/mc/otm/matter/MatterManager.kt | 4 ++-- .../mc/otm/network/GenericNetworkChannel.kt | 7 ++++++- .../mc/otm/network/RegistryNetworkChannel.kt | 15 --------------- 5 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 src/main/kotlin/ru/dbotthepony/mc/otm/network/RegistryNetworkChannel.kt diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java index 4161c855d..641f7c3b9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java +++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java @@ -201,7 +201,6 @@ public final class OverdriveThatMatters { MatteryPlayerNetworkChannel.INSTANCE.register(); MenuNetworkChannel.INSTANCE.register(); WeaponNetworkChannel.INSTANCE.register(); - RegistryNetworkChannel.INSTANCE.register(); GenericNetworkChannel.INSTANCE.register(); ITEM_STORAGE = StorageRegistry.register(ItemStackWrapper.class, ItemStackWrapper.EMPTY, new Decimal("3.125")); diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchManager.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchManager.kt index 7062117f1..654d97ca4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchManager.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchManager.kt @@ -25,8 +25,8 @@ import ru.dbotthepony.mc.otm.core.fromJsonStrict import ru.dbotthepony.mc.otm.core.fromNetwork import ru.dbotthepony.mc.otm.core.set import ru.dbotthepony.mc.otm.core.toNetwork +import ru.dbotthepony.mc.otm.network.GenericNetworkChannel import ru.dbotthepony.mc.otm.network.MatteryPacket -import ru.dbotthepony.mc.otm.network.RegistryNetworkChannel import ru.dbotthepony.mc.otm.network.enqueueWork import ru.dbotthepony.mc.otm.network.packetHandled import ru.dbotthepony.mc.otm.onceServer @@ -102,9 +102,9 @@ object AndroidResearchManager : SimpleJsonResourceReloadListener(GsonBuilder().s val packet = SyncPacket(researchMap.values) if (event.player != null) { - RegistryNetworkChannel.send(event.player!!, packet) + GenericNetworkChannel.send(event.player!!, packet) } else { - RegistryNetworkChannel.send(PacketDistributor.ALL.noArg(), packet) + GenericNetworkChannel.send(PacketDistributor.ALL.noArg(), packet) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt index f033af5ad..298cf1383 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt @@ -93,8 +93,8 @@ import ru.dbotthepony.mc.otm.core.util.writeBinaryComponent import ru.dbotthepony.mc.otm.core.util.writeCollection import ru.dbotthepony.mc.otm.core.writeItemType import ru.dbotthepony.mc.otm.milliTime +import ru.dbotthepony.mc.otm.network.GenericNetworkChannel import ru.dbotthepony.mc.otm.network.MatteryPacket -import ru.dbotthepony.mc.otm.network.RegistryNetworkChannel import ru.dbotthepony.mc.otm.registry.RegistryDelegate import ru.dbotthepony.mc.otm.secondTime import ru.dbotthepony.mc.otm.storage.ItemStackWrapper @@ -1705,7 +1705,7 @@ object MatterManager { LOGGER.debug("Encoding matter registry packet took ${time.millis}ms, (${stream.length} bytes total, $totalSize bytes compressed)") for (chunk in chunks) { - RegistryNetworkChannel.send(distributor, chunk) + GenericNetworkChannel.send(distributor, chunk) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/GenericNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/GenericNetworkChannel.kt index 778f084d1..c98aa769d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/GenericNetworkChannel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/GenericNetworkChannel.kt @@ -9,11 +9,13 @@ import net.minecraft.world.level.Level import net.minecraftforge.network.NetworkDirection import net.minecraftforge.network.NetworkEvent import org.apache.logging.log4j.LogManager +import ru.dbotthepony.mc.otm.android.AndroidResearchManager import ru.dbotthepony.mc.otm.android.feature.ItemEntityDataPacket import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.onceClient import ru.dbotthepony.mc.otm.item.QuantumBatteryItem +import ru.dbotthepony.mc.otm.matter.MatterManager import java.util.* import java.util.function.Supplier import kotlin.collections.ArrayList @@ -94,7 +96,7 @@ class BlockEntitySyncPacket(val position: BlockPos, val buffer: ByteArray, val v } object GenericNetworkChannel : MatteryNetworkChannel( - version = "2", + version = "3", name = "generic" ) { fun register() { @@ -102,5 +104,8 @@ object GenericNetworkChannel : MatteryNetworkChannel( add(BlockEntitySyncPacket::class.java, BlockEntitySyncPacket.Companion::read, NetworkDirection.PLAY_TO_CLIENT) add(ItemEntityDataPacket::class.java, ItemEntityDataPacket.Companion::read, NetworkDirection.PLAY_TO_CLIENT) + + add(AndroidResearchManager.SyncPacket::class.java, AndroidResearchManager::readSyncPacket, NetworkDirection.PLAY_TO_CLIENT) + add(MatterManager.SyncPacket::class.java, MatterManager::readSyncPacket, NetworkDirection.PLAY_TO_CLIENT) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/RegistryNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/RegistryNetworkChannel.kt deleted file mode 100644 index 8106c4a41..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/RegistryNetworkChannel.kt +++ /dev/null @@ -1,15 +0,0 @@ -package ru.dbotthepony.mc.otm.network - -import net.minecraftforge.network.NetworkDirection -import ru.dbotthepony.mc.otm.android.AndroidResearchManager -import ru.dbotthepony.mc.otm.matter.MatterManager - -object RegistryNetworkChannel : MatteryNetworkChannel( - version = "2", - name = "registry" -) { - fun register() { - add(AndroidResearchManager.SyncPacket::class.java, AndroidResearchManager::readSyncPacket, NetworkDirection.PLAY_TO_CLIENT) - add(MatterManager.SyncPacket::class.java, MatterManager::readSyncPacket, NetworkDirection.PLAY_TO_CLIENT) - } -}