From a9069c7403e63200b0fe461f8d7c5a559b163de1 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sun, 1 Oct 2023 21:48:09 +0200 Subject: [PATCH] remove unneeded and deprecated resource location handling --- .../data/entities/block/JigsawBlockEntity.kt | 13 +++++------ .../player/local/PlayerItemManager.kt | 1 + .../registries/identified/ResourceLocation.kt | 18 --------------- .../data/registries/ResourceLocationTest.kt | 22 ------------------- 4 files changed, 7 insertions(+), 47 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt index ab7a068c6..f108efa31 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt @@ -13,11 +13,10 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.kutil.cast.CastUtil.nullCast import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection -import de.bixilon.minosoft.util.KUtil +import de.bixilon.minosoft.util.KUtil.toResourceLocation class JigsawBlockEntity(connection: PlayConnection) : BlockEntity(connection) { var joint: String = "rollable" @@ -33,11 +32,11 @@ class JigsawBlockEntity(connection: PlayConnection) : BlockEntity(connection) { override fun updateNBT(nbt: Map) { - nbt["joint"]?.nullCast()?.let { joint = it } - nbt["name"]?.nullCast()?.let { name = ResourceLocation.ofPath(it) } - nbt["pool"]?.nullCast()?.let { pool = ResourceLocation.ofPath(it) } - nbt["finalState"]?.nullCast()?.let { finalState = ResourceLocation.ofPath(it) } - nbt["target"]?.nullCast()?.let { target = ResourceLocation.ofPath(it) } + nbt["joint"]?.let { joint = it.toString() } + nbt["name"]?.let { name = it.toResourceLocation() } + nbt["pool"]?.let { pool = it.toResourceLocation() } + nbt["finalState"]?.let { finalState = it.toResourceLocation() } + nbt["target"]?.let { target = it.toResourceLocation() } } companion object : BlockEntityFactory { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/PlayerItemManager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/PlayerItemManager.kt index 434fa7a86..5cf13fdd8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/PlayerItemManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/local/PlayerItemManager.kt @@ -29,6 +29,7 @@ import de.bixilon.minosoft.data.registries.item.items.Item class PlayerItemManager(private val player: LocalPlayerEntity) { val inventory = PlayerInventory(this, player.connection) + @Deprecated("this is probably not needed anymore, container network packets are not async anymore") val incomplete: SynchronizedMap = synchronizedMapOf() val containers: SynchronizedBiMap = synchronizedBiMapOf( diff --git a/src/main/java/de/bixilon/minosoft/data/registries/identified/ResourceLocation.kt b/src/main/java/de/bixilon/minosoft/data/registries/identified/ResourceLocation.kt index 8463e4e36..00228339f 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/identified/ResourceLocation.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/identified/ResourceLocation.kt @@ -13,7 +13,6 @@ package de.bixilon.minosoft.data.registries.identified import de.bixilon.minosoft.data.language.translate.Translatable -import de.bixilon.minosoft.data.registries.identified.ResourceLocation.Companion.ALLOWED_PATH_PATTERN import java.util.* /** @@ -82,7 +81,6 @@ open class ResourceLocation( } companion object { - val ALLOWED_PATH_PATTERN = Regex("(?!.*//)[a-z0-9_./\\-]+") /** * Creates a resource location from a string. @@ -98,21 +96,5 @@ open class ResourceLocation( } return ResourceLocation(split[0], split[1]) } - - /** - * Creates a resource location from a string by splitting it at the first colon (:) or at the first slash (/) if there is no colon. - * If possible, use minecraft() or minosoft() instead. - * - * @param path The path to parse - * @return The parsed resource location - */ - @Deprecated("Don't know why this was a thing") - fun ofPath(path: String): ResourceLocation { - if (path.contains(':') || !path.contains('/')) { - return of(path) - } - val split = path.split('/', limit = 2) - return ResourceLocation(split[0], split[1]) - } } } diff --git a/src/test/java/de/bixilon/minosoft/data/registries/ResourceLocationTest.kt b/src/test/java/de/bixilon/minosoft/data/registries/ResourceLocationTest.kt index 94a893af7..de4e4ee94 100644 --- a/src/test/java/de/bixilon/minosoft/data/registries/ResourceLocationTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/registries/ResourceLocationTest.kt @@ -95,26 +95,4 @@ class ResourceLocationTest { assertThrows { ResourceLocationUtil.validateNamespace("^minecraft") } assertThrows { ResourceLocationUtil.validateNamespace("mine/craft") } } - - /** - * @see [de.bixilon.minosoft.data.registries.identified.ResourceLocation] - */ - @Test - fun testAllowedResourceLocationPaths() { - // Should Pass - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("minecraft"), true) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("min1234567890craft"), true) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("mine-craft"), true) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("mine_craft"), true) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("mine.craft"), true) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("mine/craft"), true) - // Should Fail - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("MineCraft"), false) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("mine craft"), false) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("minecraft!"), false) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("^minecraft"), false) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("mine//craft"), false) - kotlin.test.assertEquals(ResourceLocation.ALLOWED_PATH_PATTERN.matches("mine///craft"), false) - } - }