alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-23 16:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Write conflict to file when write conflict is called.

Browse source 
Allow custom default rarity.
Update ConflictBuilder javadoc.
Allow null source for ConflictBuilder.
Log conflict origin on warning.
This commit is contained in:
alexcrea 2024-07-08 00:15:07 +02:00
parent 06b3dc89c2
commit e1f6c3f5a8
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
5 changed files with 174 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
View file

@ -28,7 +28,7 @@ class EnchantConflictManager {
private const val FUTURE_USE_PATH = "useInFuture"
// Default name for a joining group
public const val DEFAULT_GROUP_NAME = "joinedGroup"
const val DEFAULT_GROUP_NAME = "joinedGroup"
// 1.20.5 compatibility TODO better update system
private val SWEEPING_EDGE_ENCHANT =
@ -175,7 +175,7 @@ class EnchantConflictManager {
if(doConflict){
return ConflictType.ENCHANTMENT_CONFLICT
}
;
}
}
@ -188,7 +188,7 @@ class EnchantConflictManager {
}
return result;
return result
}
private fun createPartialResult(item: ItemStack, enchantments: Map<CAEnchantment, Int>): ItemStack {