From 1bb612b07c5772ef4ebdac5e4540641d1762ec22 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 24 Mar 2025 18:14:47 +0700 Subject: [PATCH] Fixes for last commit --- .../dbotthepony/mc/otm/matter/ComputeAction.kt | 5 +++-- .../dbotthepony/mc/otm/matter/UpdateAction.kt | 7 ++++--- .../mc/otm/network/AndroidPackets.kt | 17 +++++++++-------- .../dbotthepony/mc/otm/player/MatteryPlayer.kt | 3 ++- .../mc/otm/player/android/AndroidFeatureType.kt | 3 ++- .../mc/otm/triggers/KillAsAndroidTrigger.kt | 3 ++- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt index 75a6560a1..1571b96bf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt @@ -15,6 +15,7 @@ import net.minecraft.world.item.Item import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.PredicatedCodecList +import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import java.util.Optional import java.util.function.Predicate @@ -29,8 +30,8 @@ class ComputeAction( it.group( DecimalCodec.fieldOf("matter").forGetter(Constant::matter), Codec.DOUBLE.fieldOf("complexity").forGetter(Constant::complexity), - IMatterFunction.registry.byNameCodec().fieldOf("matterFunction").forGetter(Constant::matterFunction), - IMatterFunction.registry.byNameCodec().fieldOf("complexityFunction").forGetter(Constant::complexityFunction), + MBuiltInRegistries.MATTER_FUNCTION.byNameCodec().fieldOf("matterFunction").forGetter(Constant::matterFunction), + MBuiltInRegistries.MATTER_FUNCTION.byNameCodec().fieldOf("complexityFunction").forGetter(Constant::complexityFunction), ).apply(it, ::Constant) } to Predicate { true } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt index 7c3f4c099..9849df8aa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt @@ -11,6 +11,7 @@ import net.minecraft.world.item.Item import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.simpleCodec +import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries class UpdateAction( id: Either>, @@ -22,7 +23,7 @@ class UpdateAction( data class MatterFunction(val function: IMatterFunction, val value: Decimal) { companion object { val CODEC: Codec by lazy { - simpleCodec(::MatterFunction, MatterFunction::function, IMatterFunction.registry.byNameCodec(), MatterFunction::value, DecimalCodec) + simpleCodec(::MatterFunction, MatterFunction::function, MBuiltInRegistries.MATTER_FUNCTION.byNameCodec(), MatterFunction::value, DecimalCodec) } } } @@ -30,7 +31,7 @@ class UpdateAction( data class ComplexityFunction(val function: IMatterFunction, val value: Double) { companion object { val CODEC: Codec by lazy { - simpleCodec(::ComplexityFunction, ComplexityFunction::function, IMatterFunction.registry.byNameCodec(), ComplexityFunction::value, Codec.DOUBLE) + simpleCodec(::ComplexityFunction, ComplexityFunction::function, MBuiltInRegistries.MATTER_FUNCTION.byNameCodec(), ComplexityFunction::value, Codec.DOUBLE) } } } @@ -38,7 +39,7 @@ class UpdateAction( data class PriorityFunction(val function: IMatterFunction, val value: Int) { companion object { val CODEC: Codec by lazy { - simpleCodec(::PriorityFunction, PriorityFunction::function, IMatterFunction.registry.byNameCodec(), PriorityFunction::value, Codec.INT) + simpleCodec(::PriorityFunction, PriorityFunction::function, MBuiltInRegistries.MATTER_FUNCTION.byNameCodec(), PriorityFunction::value, Codec.INT) } } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt index b05ef757b..d008ccdae 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt @@ -26,13 +26,14 @@ import ru.dbotthepony.mc.otm.core.readComponent import ru.dbotthepony.mc.otm.core.writeComponent import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu import ru.dbotthepony.mc.otm.onceServer +import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.game.MSoundEvents class AndroidFeatureSyncPacket(val type: AndroidFeatureType<*>, val data: ByteArrayList) : CustomPacketPayload { fun write(buff: RegistryFriendlyByteBuf) { - buff.writeInt(MRegistry.ANDROID_FEATURES.getId(type)) + buff.writeInt(MBuiltInRegistries.ANDROID_FEATURE.getId(type)) buff.writeBytes(data.elements(), 0, data.size) } @@ -58,7 +59,7 @@ class AndroidFeatureSyncPacket(val type: AndroidFeatureType<*>, val data: ByteAr fun read(buff: RegistryFriendlyByteBuf): AndroidFeatureSyncPacket { return AndroidFeatureSyncPacket( - MRegistry.ANDROID_FEATURES.byIdOrThrow(buff.readInt()), + MBuiltInRegistries.ANDROID_FEATURE.byIdOrThrow(buff.readInt()), ByteArrayList.wrap(ByteArray(buff.readableBytes()).also { buff.readBytes(it) }) ) } @@ -140,7 +141,7 @@ class AndroidResearchRequestPacket(val type: AndroidResearchType) : CustomPacket class AndroidFeatureRemovePacket(val type: AndroidFeatureType<*>) : CustomPacketPayload { fun write(buff: FriendlyByteBuf) { - buff.writeInt(MRegistry.ANDROID_FEATURES.getId(type)) + buff.writeInt(MBuiltInRegistries.ANDROID_FEATURE.getId(type)) } fun play(context: IPayloadContext) { @@ -164,7 +165,7 @@ class AndroidFeatureRemovePacket(val type: AndroidFeatureType<*>) : CustomPacket StreamCodec.ofMember(AndroidFeatureRemovePacket::write, ::read) fun read(buff: FriendlyByteBuf): AndroidFeatureRemovePacket { - return AndroidFeatureRemovePacket(MRegistry.ANDROID_FEATURES.byIdOrThrow(buff.readInt())) + return AndroidFeatureRemovePacket(MBuiltInRegistries.ANDROID_FEATURE.byIdOrThrow(buff.readInt())) } } } @@ -219,7 +220,7 @@ class PlayerIterationPacket(val iteration: Int, val deathLog: List, val newState: Boolean) : CustomPacketPayload { fun write(buff: FriendlyByteBuf) { - buff.writeInt(MRegistry.ANDROID_FEATURES.getId(type)) + buff.writeInt(MBuiltInRegistries.ANDROID_FEATURE.getId(type)) buff.writeBoolean(newState) } @@ -259,14 +260,14 @@ class SwitchAndroidFeaturePacket(val type: AndroidFeatureType<*>, val newState: StreamCodec.ofMember(SwitchAndroidFeaturePacket::write, ::read) fun read(buff: FriendlyByteBuf): SwitchAndroidFeaturePacket { - return SwitchAndroidFeaturePacket(MRegistry.ANDROID_FEATURES.byIdOrThrow(buff.readInt()), buff.readBoolean()) + return SwitchAndroidFeaturePacket(MBuiltInRegistries.ANDROID_FEATURE.byIdOrThrow(buff.readInt()), buff.readBoolean()) } } } class ActivateAndroidFeaturePacket(val type: AndroidFeatureType<*>) : CustomPacketPayload { fun write(buff: FriendlyByteBuf) { - buff.writeInt(MRegistry.ANDROID_FEATURES.getId(type)) + buff.writeInt(MBuiltInRegistries.ANDROID_FEATURE.getId(type)) } fun play(context: IPayloadContext) { @@ -298,7 +299,7 @@ class ActivateAndroidFeaturePacket(val type: AndroidFeatureType<*>) : CustomPack StreamCodec.ofMember(ActivateAndroidFeaturePacket::write, ::read) fun read(buff: FriendlyByteBuf): ActivateAndroidFeaturePacket { - return ActivateAndroidFeaturePacket(MRegistry.ANDROID_FEATURES.byIdOrThrow(buff.readInt())) + return ActivateAndroidFeaturePacket(MBuiltInRegistries.ANDROID_FEATURE.byIdOrThrow(buff.readInt())) } } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt index 366b86900..ef4dbae2c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt @@ -97,6 +97,7 @@ import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu import ru.dbotthepony.mc.otm.menu.IItemStackSortingSettings import ru.dbotthepony.mc.otm.network.* import ru.dbotthepony.mc.otm.network.SmokeParticlesPacket.Companion.makeSmoke +import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.game.MItems @@ -1004,7 +1005,7 @@ class MatteryPlayer(val ply: Player) { research.clear() for (featureTag in tag.getCompoundList("features")) { - val feature = MRegistry.ANDROID_FEATURES.get(ResourceLocation.parse(featureTag.getString("id"))) + val feature = MBuiltInRegistries.ANDROID_FEATURE.get(ResourceLocation.parse(featureTag.getString("id"))) if (feature?.isApplicable(this) == true) { val instance = feature.create(this) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeatureType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeatureType.kt index 9fcc9be5c..1b32d9d96 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeatureType.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeatureType.kt @@ -6,6 +6,7 @@ import net.minecraft.network.chat.MutableComponent import net.minecraft.network.chat.contents.TranslatableContents import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.core.getKeyNullable +import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MRegistry open class AndroidFeatureType { @@ -26,7 +27,7 @@ open class AndroidFeatureType { open fun isApplicable(android: MatteryPlayer) = true val registryName by lazy { - MRegistry.ANDROID_FEATURES.getKeyNullable(this) + MBuiltInRegistries.ANDROID_FEATURE.getKeyNullable(this) } open val displayContents: ComponentContents by lazy { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt index 23fe57ee2..ca973c252 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt @@ -15,6 +15,7 @@ import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.core.ResourceLocation import ru.dbotthepony.mc.otm.data.codec.SingletonCodec +import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MRegistry import java.util.Optional import java.util.function.Predicate @@ -76,7 +77,7 @@ object KillAsAndroidTrigger : MCriterionTrigger(R } class Has(val name: ResourceLocation) : FeaturePredicate() { - private val resolved by lazy { MRegistry.ANDROID_FEATURES.get(name) } + private val resolved by lazy { MBuiltInRegistries.ANDROID_FEATURE.get(name) } override val type: PredicateType get() = PredicateType.HAS