Skip to content

feat: parse patterns from 1.20 entities & block entities correctly #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Olfi01 wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

feat: parse patterns from 1.20 entities & block entities correctly #1230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/math/HexPattern.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,30 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
append("]")
}

data class RawHexPatternLegacy(val angles: List<Byte>, val startDir: Byte)
data class RawHexPattern(val anglesSignature: String, val startDir: String)

companion object {
const val TAG_START_DIR = "start_dir"
const val TAG_ANGLES = "angles"

@JvmField
val CODEC: Codec<HexPattern> = RecordCodecBuilder.create { instance ->
val DIRECTIONS = arrayOf("NORTH_EAST", "EAST", "SOUTH_EAST", "SOUTH_WEST", "WEST", "NORTH_WEST")
val ANGLES = arrayOf("w", "e", "d", "s", "a", "q")
val CODEC_1_20: Codec<HexPattern> = RecordCodecBuilder.create { instance ->
instance.group(
Codec.list(Codec.BYTE).fieldOf("angles").forGetter(RawHexPatternLegacy::angles),
Codec.BYTE.fieldOf("start_dir").forGetter(RawHexPatternLegacy::startDir)
).apply(instance, ::RawHexPatternLegacy)
}.flatXmap({
val dir = HexDir.fromString(DIRECTIONS[it.startDir.toInt()])
try {
return@flatXmap DataResult.success(fromAnglesUnchecked(it.angles.joinToString(separator = "") { a -> ANGLES[a.toInt()] }, dir))
} catch (exception: IllegalArgumentException) {
return@flatXmap DataResult.error { exception.message }
}
}, { DataResult.error { "Refusing to serialize pattern using legacy codec" } })

val CODEC_1_21: Codec<HexPattern> = RecordCodecBuilder.create { instance ->
instance.group(
Codec.STRING.fieldOf(TAG_ANGLES).forGetter(RawHexPattern::anglesSignature),
Codec.STRING.fieldOf(TAG_START_DIR).forGetter(RawHexPattern::startDir)
Expand All @@ -140,6 +156,9 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
}
}, { DataResult.success(RawHexPattern(it.anglesSignature(), it.startDir.name)) })

@JvmField
val CODEC: Codec<HexPattern> = Codec.withAlternative(CODEC_1_21, CODEC_1_20)

@JvmField
val STREAM_CODEC: StreamCodec<RegistryFriendlyByteBuf, HexPattern> = StreamCodec.composite(
ByteBufCodecs.STRING_UTF8, HexPattern::anglesSignature,
Expand Down
Loading