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

Get rid of registry network channel and merge it into generic network channel

Browse Source
This commit is contained in:
DBotThePony 2023-07-29 17:06:46 +07:00
parent 3262cdfe8d
commit e5d324f4fa
Signed by: DBot
GPG Key ID: DCC23B5715498507
5 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
View File

@ -201,7 +201,6 @@ public final class OverdriveThatMatters {
MatteryPlayerNetworkChannel.INSTANCE.register(); MatteryPlayerNetworkChannel.INSTANCE.register();
MenuNetworkChannel.INSTANCE.register(); MenuNetworkChannel.INSTANCE.register();
WeaponNetworkChannel.INSTANCE.register(); WeaponNetworkChannel.INSTANCE.register();
RegistryNetworkChannel.INSTANCE.register();
GenericNetworkChannel.INSTANCE.register(); GenericNetworkChannel.INSTANCE.register();
ITEM_STORAGE = StorageRegistry.register(ItemStackWrapper.class, ItemStackWrapper.EMPTY, new Decimal("3.125")); ITEM_STORAGE = StorageRegistry.register(ItemStackWrapper.class, ItemStackWrapper.EMPTY, new Decimal("3.125"));

6
src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchManager.kt
View File

@ -25,8 +25,8 @@ import ru.dbotthepony.mc.otm.core.fromJsonStrict
import ru.dbotthepony.mc.otm.core.fromNetwork import ru.dbotthepony.mc.otm.core.fromNetwork
import ru.dbotthepony.mc.otm.core.set import ru.dbotthepony.mc.otm.core.set
import ru.dbotthepony.mc.otm.core.toNetwork 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.MatteryPacket
import ru.dbotthepony.mc.otm.network.RegistryNetworkChannel
import ru.dbotthepony.mc.otm.network.enqueueWork import ru.dbotthepony.mc.otm.network.enqueueWork
import ru.dbotthepony.mc.otm.network.packetHandled import ru.dbotthepony.mc.otm.network.packetHandled
import ru.dbotthepony.mc.otm.onceServer import ru.dbotthepony.mc.otm.onceServer
@ -102,9 +102,9 @@ object AndroidResearchManager : SimpleJsonResourceReloadListener(GsonBuilder().s
val packet = SyncPacket(researchMap.values) val packet = SyncPacket(researchMap.values)
if (event.player != null) { if (event.player != null) {
RegistryNetworkChannel.send(event.player!!, packet) GenericNetworkChannel.send(event.player!!, packet)
} else { } else {
RegistryNetworkChannel.send(PacketDistributor.ALL.noArg(), packet) GenericNetworkChannel.send(PacketDistributor.ALL.noArg(), packet)
} }
} }

4
src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt
View File

@ -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.util.writeCollection
import ru.dbotthepony.mc.otm.core.writeItemType import ru.dbotthepony.mc.otm.core.writeItemType
import ru.dbotthepony.mc.otm.milliTime 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.MatteryPacket
import ru.dbotthepony.mc.otm.network.RegistryNetworkChannel
import ru.dbotthepony.mc.otm.registry.RegistryDelegate import ru.dbotthepony.mc.otm.registry.RegistryDelegate
import ru.dbotthepony.mc.otm.secondTime import ru.dbotthepony.mc.otm.secondTime
import ru.dbotthepony.mc.otm.storage.ItemStackWrapper 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)") LOGGER.debug("Encoding matter registry packet took ${time.millis}ms, (${stream.length} bytes total, $totalSize bytes compressed)")
for (chunk in chunks) { for (chunk in chunks) {
RegistryNetworkChannel.send(distributor, chunk) GenericNetworkChannel.send(distributor, chunk)
} }
} }

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

@ -9,11 +9,13 @@ import net.minecraft.world.level.Level
import net.minecraftforge.network.NetworkDirection import net.minecraftforge.network.NetworkDirection
import net.minecraftforge.network.NetworkEvent import net.minecraftforge.network.NetworkEvent
import org.apache.logging.log4j.LogManager 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.android.feature.ItemEntityDataPacket
import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.minecraft
import ru.dbotthepony.mc.otm.client.onceClient import ru.dbotthepony.mc.otm.client.onceClient
import ru.dbotthepony.mc.otm.item.QuantumBatteryItem import ru.dbotthepony.mc.otm.item.QuantumBatteryItem
import ru.dbotthepony.mc.otm.matter.MatterManager
import java.util.* import java.util.*
import java.util.function.Supplier import java.util.function.Supplier
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
@ -94,7 +96,7 @@ class BlockEntitySyncPacket(val position: BlockPos, val buffer: ByteArray, val v
} }
object GenericNetworkChannel : MatteryNetworkChannel( object GenericNetworkChannel : MatteryNetworkChannel(
version = "2", version = "3",
name = "generic" name = "generic"
) { ) {
fun register() { fun register() {
@ -102,5 +104,8 @@ object GenericNetworkChannel : MatteryNetworkChannel(
add(BlockEntitySyncPacket::class.java, BlockEntitySyncPacket.Companion::read, NetworkDirection.PLAY_TO_CLIENT) add(BlockEntitySyncPacket::class.java, BlockEntitySyncPacket.Companion::read, NetworkDirection.PLAY_TO_CLIENT)
add(ItemEntityDataPacket::class.java, ItemEntityDataPacket.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)
} }
} }

15
src/main/kotlin/ru/dbotthepony/mc/otm/network/RegistryNetworkChannel.kt
View File

@ -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)
}
}