mirror of
https://github.com/alexcrea/CustomAnvil.git
synced 2026-06-23 16:16:17 +02:00
Hacky fix for 1.20.5.
Also: - version up - metric fix (expected as config was changed) - Prepared for long term update system
This commit is contained in:
parent
2861238f58
commit
46ff34deea
7 changed files with 43 additions and 11 deletions
|
|
@ -217,7 +217,7 @@ object ConfigOptions {
|
|||
* Get the given [enchantment]'s limit
|
||||
*/
|
||||
fun enchantLimit(enchantment: Enchantment): Int {
|
||||
val path = "${ENCHANT_LIMIT_ROOT}.${enchantment.enchantmentName}"
|
||||
val path = "${ENCHANT_LIMIT_ROOT}.${getEnchantKey(enchantment)}"
|
||||
return CustomAnvil.instance
|
||||
.config
|
||||
.getInt(path, defaultEnchantLimit)
|
||||
|
|
@ -234,7 +234,7 @@ object ConfigOptions {
|
|||
isFromBook: Boolean
|
||||
): Int {
|
||||
val typeKey = if (isFromBook) KEY_BOOK else KEY_ITEM
|
||||
val path = "${ENCHANT_VALUES_ROOT}.${enchantment.enchantmentName}.$typeKey"
|
||||
val path = "${ENCHANT_VALUES_ROOT}.${getEnchantKey(enchantment)}.$typeKey"
|
||||
return CustomAnvil.instance
|
||||
.config
|
||||
.getInt(path, DEFAULT_ENCHANT_VALUE)
|
||||
|
|
@ -242,6 +242,13 @@ object ConfigOptions {
|
|||
?: DEFAULT_ENCHANT_VALUE
|
||||
}
|
||||
|
||||
fun getEnchantKey(enchantment: Enchantment) : String{
|
||||
val enchantKey = enchantment.enchantmentName
|
||||
if(enchantKey == "sweeping_edge"){ // compatibility with 1.20.5. TODO better update system
|
||||
return "sweeping"
|
||||
}
|
||||
return enchantKey
|
||||
}
|
||||
/**
|
||||
* Get an array of key of basic config options
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -24,6 +24,12 @@ class EnchantConflictManager {
|
|||
|
||||
// Default name for a joining group
|
||||
private const val DEFAULT_GROUP_NAME = "joinedGroup"
|
||||
|
||||
// 1.20.5 compatibility TODO better update system
|
||||
private val SWEEPING_EDGE_ENCHANT =
|
||||
Enchantment.getByKey(NamespacedKey.minecraft("sweeping_edge")) ?:
|
||||
Enchantment.SWEEPING_EDGE
|
||||
|
||||
}
|
||||
|
||||
private lateinit var conflictMap: HashMap<Enchantment, ArrayList<EnchantConflictGroup>>
|
||||
|
|
@ -76,8 +82,7 @@ class EnchantConflictManager {
|
|||
// Read and add enchantment to conflict
|
||||
val enchantList = section.getStringList(ENCH_LIST_PATH)
|
||||
for (enchantName in enchantList) {
|
||||
val enchantKey = NamespacedKey.minecraft(enchantName)
|
||||
val enchant = Enchantment.getByKey(enchantKey)
|
||||
val enchant = getEnchantByName(enchantName);
|
||||
if (enchant == null) {
|
||||
if (!futureUse) {
|
||||
CustomAnvil.instance.logger.warning("Enchantment $enchantName do not exist but was asked for conflict $conflictName")
|
||||
|
|
@ -95,6 +100,20 @@ class EnchantConflictManager {
|
|||
return conflict
|
||||
}
|
||||
|
||||
private fun getEnchantByName(enchantName: String): Enchantment? {
|
||||
|
||||
// Teporary solution for 1.20.5
|
||||
when(enchantName){
|
||||
"sweeping", "sweeping_edge" -> {
|
||||
return SWEEPING_EDGE_ENCHANT
|
||||
}
|
||||
}
|
||||
|
||||
val enchantKey = NamespacedKey.minecraft(enchantName)
|
||||
return Enchantment.getByKey(enchantKey);
|
||||
}
|
||||
|
||||
|
||||
private fun createConflictObject(
|
||||
section: ConfigurationSection,
|
||||
itemManager: ItemGroupManager,
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ import xyz.alexcrea.cuanvil.config.ConfigHolder
|
|||
object MetricsUtil {
|
||||
|
||||
private const val baseConfigHash = -1592940914
|
||||
private const val enchantLimitsConfigHash = -1014133828
|
||||
private const val enchantValuesConfigHash = 1072574774
|
||||
private const val enchantConflictConfigHash = 1406650190
|
||||
private const val enchantLimitsConfigHash = -275034280
|
||||
private const val enchantValuesConfigHash = -17048020
|
||||
private const val enchantConflictConfigHash = 546475833
|
||||
private const val itemGroupsConfigHash = 1406650190
|
||||
private const val unitRepairItemConfigHash = 536871958
|
||||
private const val customAnvilCraftConfigHash = 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue