remove curios slot validation check & config option as its only misle…

…ading
PssbleTrngle · Jul 17, 2023 · 641d060 · 641d060
1 parent c1e32cf
commit 641d060
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/curios_support_datapack.zip b/curios_support_datapack.zip
diff --git a/src/main/kotlin/com/possible_triangle/create_jetpack/config/ServerConfig.kt b/src/main/kotlin/com/possible_triangle/create_jetpack/config/ServerConfig.kt
@@ -15,7 +15,6 @@ interface IServerConfig {
     val swimModifier: Double
     val elytraBoostEnabled: Boolean
     fun isAllowed(ench: Enchantment): Boolean
-    val curioSlots: Collection<String>
 }
 
 data class SyncedConfig(
@@ -27,7 +26,6 @@ data class SyncedConfig(
     override val hoverSpeed: Double,
     override val swimModifier: Double,
     override val elytraBoostEnabled: Boolean,
-    override val curioSlots: Collection<String>,
 ) : IServerConfig {
     override fun isAllowed(ench: Enchantment) = true
 }
@@ -66,7 +64,4 @@ class ServerConfig(builder: ForgeConfigSpec.Builder) : IServerConfig {
         val contained = enchantmentsList.get().map(::ResourceLocation).any { key == it }
         return contained != enchantmentsIsBlacklist.get()
     }
-
-    private val curiosSlotList = builder.defineList("curios.allowed_slots", listOf("back")) { true }
-    override val curioSlots: List<String> get() = curiosSlotList.get()
 }
diff --git a/src/main/kotlin/com/possible_triangle/create_jetpack/config/SyncConfigMessage.kt b/src/main/kotlin/com/possible_triangle/create_jetpack/config/SyncConfigMessage.kt
@@ -20,7 +20,6 @@ class SyncConfigMessage(private val config: IServerConfig) {
                 hoverSpeed = buf.readDouble(),
                 swimModifier = buf.readDouble(),
                 elytraBoostEnabled = buf.readBoolean(),
-                curioSlots = buf.readList(FriendlyByteBuf::readUtf),
             )
             return SyncConfigMessage(config)
         }
@@ -35,7 +34,6 @@ class SyncConfigMessage(private val config: IServerConfig) {
         buf.writeDouble(config.hoverSpeed)
         buf.writeDouble(config.swimModifier)
         buf.writeBoolean(config.elytraBoostEnabled)
-        buf.writeCollection(config.curioSlots, FriendlyByteBuf::writeUtf)
     }
 
     fun handle(context: Supplier<Context>) {

diff --git a/src/main/kotlin/com/possible_triangle/create_jetpack/item/BrassJetpack.kt b/src/main/kotlin/com/possible_triangle/create_jetpack/item/BrassJetpack.kt
@@ -84,7 +84,7 @@ class BrassJetpack(properties: Properties, blockItem: ItemEntry<BacktankBlockIte
     override fun isValid(context: Context): Boolean {
         return when (val source = context.source) {
             is EquipmentSource -> source.slot == EquipmentSlot.CHEST
-            is CuriosSource -> Configs.SERVER.curioSlots.contains(source.slot)
+            is CuriosSource -> true
             else -> false
         }
     }