Skip to content

fix: unknown enchantment type skip #134

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
spode-sleep wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: unknown enchantment type skip #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a71ed6
fix: unknown enchantment type skip
spode-sleep Oct 4, 2024
94e4e0b
chore: changed version of grgit to 5.3.0
spode-sleep Apr 9, 2025
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
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repositories {
}

dependencies {
implementation("org.ajoberstar.grgit:grgit-core:4.1.0")
implementation("org.ajoberstar.grgit:grgit-core:5.3.0")
implementation("com.charleskorn.kaml:kaml:0.37.0")
}
22 changes: 14 additions & 8 deletions fabric/src/main/kotlin/FabricGameAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ fun toServerWorld(world: World): MCServerWorld {
return (world as MCServerWorld).level
}

private fun toEnchantmentType(mcType: MCEnchantmentType): EnchantmentType {
private fun toEnchantmentType(mcType: MCEnchantmentType): EnchantmentType? {
return when (mcType) {
MCEnchantmentType.ARMOR -> EnchantmentType.ARMOR
MCEnchantmentType.ARMOR_FEET -> EnchantmentType.ARMOR_FEET
Expand All @@ -110,6 +110,7 @@ private fun toEnchantmentType(mcType: MCEnchantmentType): EnchantmentType {
MCEnchantmentType.WEARABLE -> EnchantmentType.WEARABLE
MCEnchantmentType.CROSSBOW -> EnchantmentType.CROSSBOW
MCEnchantmentType.VANISHABLE -> EnchantmentType.VANISHABLE
else -> null
}
}

Expand Down Expand Up @@ -164,13 +165,18 @@ object FabricGameAPI : GameAPI {
)
}

enchantments = BuiltInRegistries.ENCHANTMENT.entrySet().map {
Enchantment(
it.key.location().toString(),
type = toEnchantmentType(it.value.category),
maxLevel = it.value.maxLevel,
isCurse = it.value.isCurse,
)
enchantments = BuiltInRegistries.ENCHANTMENT.entrySet().mapNotNull {
val enchantmentType = toEnchantmentType(it.value.category)
if (enchantmentType == null) {
null
} else {
Enchantment(
it.key.location().toString(),
type = enchantmentType,
maxLevel = it.value.maxLevel,
isCurse = it.value.isCurse,
)
}
}
}

Expand Down
22 changes: 14 additions & 8 deletions forge/src/main/kotlin/ForgeGameAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ fun toServerWorld(world: World): MCServerWorld {
return (world as MCServerWorld).level
}

private fun toEnchantmentType(mcType: MCEnchantmentType): EnchantmentType {
private fun toEnchantmentType(mcType: MCEnchantmentType): EnchantmentType? {
return when (mcType) {
MCEnchantmentType.ARMOR -> EnchantmentType.ARMOR
MCEnchantmentType.ARMOR_FEET -> EnchantmentType.ARMOR_FEET
Expand All @@ -106,6 +106,7 @@ private fun toEnchantmentType(mcType: MCEnchantmentType): EnchantmentType {
MCEnchantmentType.WEARABLE -> EnchantmentType.WEARABLE
MCEnchantmentType.CROSSBOW -> EnchantmentType.CROSSBOW
MCEnchantmentType.VANISHABLE -> EnchantmentType.VANISHABLE
else -> null
}
}

Expand Down Expand Up @@ -160,13 +161,18 @@ object ForgeGameAPI : GameAPI {
)
}

enchantments = ForgeRegistries.ENCHANTMENTS.entries.map {
Enchantment(
it.key.location().toString(),
type = toEnchantmentType(it.value.category),
maxLevel = it.value.maxLevel,
isCurse = it.value.isCurse,
)
enchantments = ForgeRegistries.ENCHANTMENTS.entries.mapNotNull {
val enchantmentType = toEnchantmentType(it.value.category)
if (enchantmentType == null) {
null
} else {
Enchantment(
it.key.location().toString(),
type = enchantmentType,
maxLevel = it.value.maxLevel,
isCurse = it.value.isCurse,
)
}
}
}

Expand Down