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

moved pakage xyz.alexcrea to xyz.alexcrea.cuanvil

Browse source
This commit is contained in:
alexcrea 2024-02-27 19:08:03 +01:00 • committed by alexcrea
parent 379eb12940
commit 60ef3781a6
13 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/io/delilaheve/AnvilEventListener.kt
View file

@ -23,8 +23,8 @@ import org.bukkit.inventory.AnvilInventory
import org.bukkit.inventory.InventoryView.Property.REPAIR_COST import org.bukkit.inventory.InventoryView.Property.REPAIR_COST
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.Repairable import org.bukkit.inventory.meta.Repairable
import xyz.alexcrea.group.ConflictType import xyz.alexcrea.cuanvil.group.ConflictType
import xyz.alexcrea.util.UnitRepairUtil.getRepair import xyz.alexcrea.cuanvil.util.UnitRepairUtil.getRepair
import kotlin.math.min import kotlin.math.min

12
src/main/kotlin/io/delilaheve/CustomAnvil.kt
View file

@ -4,12 +4,12 @@ import io.delilaheve.util.ConfigOptions
import org.bukkit.Bukkit import org.bukkit.Bukkit
import org.bukkit.configuration.file.YamlConfiguration import org.bukkit.configuration.file.YamlConfiguration
import org.bukkit.plugin.java.JavaPlugin import org.bukkit.plugin.java.JavaPlugin
import xyz.alexcrea.command.ReloadExecutor import xyz.alexcrea.cuanvil.command.ReloadExecutor
import xyz.alexcrea.command.TestExecutor import xyz.alexcrea.cuanvil.command.TestExecutor
import xyz.alexcrea.cuanvil.util.Metrics import xyz.alexcrea.cuanvil.util.Metrics
import xyz.alexcrea.group.EnchantConflictManager import xyz.alexcrea.cuanvil.group.EnchantConflictManager
import xyz.alexcrea.group.ItemGroupManager import xyz.alexcrea.cuanvil.group.ItemGroupManager
import xyz.alexcrea.util.MetricsUtil import xyz.alexcrea.cuanvil.util.MetricsUtil
import java.io.File import java.io.File
import java.io.FileReader import java.io.FileReader
@ -147,7 +147,7 @@ class CustomAnvil : JavaPlugin() {
return yamlConfig return yamlConfig
} }
fun prepareCommand(): Unit { fun prepareCommand() {
var command = getCommand(commandReloadName) var command = getCommand(commandReloadName)
command?.setExecutor(ReloadExecutor()) command?.setExecutor(ReloadExecutor())

2
src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
View file

@ -4,7 +4,7 @@ import io.delilaheve.CustomAnvil
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.enchantments.Enchantment import org.bukkit.enchantments.Enchantment
import org.bukkit.entity.HumanEntity import org.bukkit.entity.HumanEntity
import xyz.alexcrea.group.ConflictType import xyz.alexcrea.cuanvil.group.ConflictType
import kotlin.math.max import kotlin.math.max
import kotlin.math.min import kotlin.math.min

2
src/main/kotlin/xyz/alexcrea/command/ReloadExecutor.kt → src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
View file

@ -1,4 +1,4 @@
package xyz.alexcrea.command package xyz.alexcrea.cuanvil.command
import io.delilaheve.CustomAnvil import io.delilaheve.CustomAnvil
import org.bukkit.command.Command import org.bukkit.command.Command

2
src/main/kotlin/xyz/alexcrea/command/TestExecutor.kt → src/main/kotlin/xyz/alexcrea/cuanvil/command/TestExecutor.kt
View file

@ -1,4 +1,4 @@
package xyz.alexcrea.command package xyz.alexcrea.cuanvil.command
import org.bukkit.command.Command import org.bukkit.command.Command
import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandExecutor

2
src/main/kotlin/xyz/alexcrea/group/AbstractMaterialGroup.kt → src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
View file

@ -1,4 +1,4 @@
package xyz.alexcrea.group package xyz.alexcrea.cuanvil.group
import org.bukkit.Material import org.bukkit.Material
import java.util.EnumSet import java.util.EnumSet

2
src/main/kotlin/xyz/alexcrea/group/EnchantConflictGroup.kt → src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt
View file

@ -1,4 +1,4 @@
package xyz.alexcrea.group package xyz.alexcrea.cuanvil.group
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.enchantments.Enchantment import org.bukkit.enchantments.Enchantment

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

@ -1,4 +1,4 @@
package xyz.alexcrea.group package xyz.alexcrea.cuanvil.group
import io.delilaheve.CustomAnvil import io.delilaheve.CustomAnvil
import org.bukkit.Material import org.bukkit.Material
@ -112,7 +112,7 @@ class EnchantConflictManager {
return EnchantConflictGroup(finalGroup, minBeforeBlock) return EnchantConflictGroup(finalGroup, minBeforeBlock)
} }
private fun findGroup(groupName: String,itemManager: ItemGroupManager, conflictName: String): AbstractMaterialGroup { private fun findGroup(groupName: String, itemManager: ItemGroupManager, conflictName: String): AbstractMaterialGroup {
val group = itemManager.get(groupName) val group = itemManager.get(groupName)
if(group == null){ if(group == null){
CustomAnvil.instance.logger.warning("Group $groupName do not exist but is ask by conflict $conflictName") CustomAnvil.instance.logger.warning("Group $groupName do not exist but is ask by conflict $conflictName")
@ -122,7 +122,7 @@ class EnchantConflictManager {
return group return group
} }
fun isConflicting(base: Set<Enchantment>,mat: Material, newEnchant: Enchantment): ConflictType{ fun isConflicting(base: Set<Enchantment>,mat: Material, newEnchant: Enchantment): ConflictType {
val conflictList = conflictMap[newEnchant] ?: return ConflictType.NO_CONFLICT val conflictList = conflictMap[newEnchant] ?: return ConflictType.NO_CONFLICT
var result = ConflictType.NO_CONFLICT var result = ConflictType.NO_CONFLICT

2
src/main/kotlin/xyz/alexcrea/group/ExcludeGroup.kt → src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
View file

@ -1,4 +1,4 @@
package xyz.alexcrea.group package xyz.alexcrea.cuanvil.group
import org.bukkit.Material import org.bukkit.Material
import java.util.* import java.util.*

2
src/main/kotlin/xyz/alexcrea/group/IncludeGroup.kt → src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
View file

@ -1,4 +1,4 @@
package xyz.alexcrea.group package xyz.alexcrea.cuanvil.group
import org.bukkit.Material import org.bukkit.Material
import java.util.EnumSet import java.util.EnumSet

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

@ -1,4 +1,4 @@
package xyz.alexcrea.group package xyz.alexcrea.cuanvil.group
import io.delilaheve.CustomAnvil import io.delilaheve.CustomAnvil
import org.bukkit.Material import org.bukkit.Material
@ -20,7 +20,7 @@ class ItemGroupManager {
private val FUTURE_MATERIAL = setOf("PIGLIN_HEAD","BRUSH") private val FUTURE_MATERIAL = setOf("PIGLIN_HEAD","BRUSH")
} }
private lateinit var groupMap : HashMap<String,AbstractMaterialGroup> private lateinit var groupMap : HashMap<String, AbstractMaterialGroup>
// Read and create material groups // Read and create material groups
fun prepareGroups(config: YamlConfiguration){ fun prepareGroups(config: YamlConfiguration){
@ -37,7 +37,7 @@ class ItemGroupManager {
// Create group by key // Create group by key
private fun createGroup(config: YamlConfiguration, private fun createGroup(config: YamlConfiguration,
keys: Set<String>, keys: Set<String>,
key: String): AbstractMaterialGroup{ key: String): AbstractMaterialGroup {
val groupSection = config.getConfigurationSection(key)!! val groupSection = config.getConfigurationSection(key)!!
val groupType = groupSection.getString(GROUP_TYPE_PATH,null) val groupType = groupSection.getString(GROUP_TYPE_PATH,null)

5
src/main/kotlin/xyz/alexcrea/util/MetricsUtil.kt → src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt
View file

@ -1,9 +1,8 @@
package xyz.alexcrea.util package xyz.alexcrea.cuanvil.util
import io.delilaheve.CustomAnvil import io.delilaheve.CustomAnvil
import io.delilaheve.util.ConfigOptions import io.delilaheve.util.ConfigOptions
import org.bukkit.configuration.ConfigurationSection import org.bukkit.configuration.ConfigurationSection
import xyz.alexcrea.cuanvil.util.Metrics
object MetricsUtil { object MetricsUtil {
@ -73,7 +72,7 @@ object MetricsUtil {
// Calculate hash of config // Calculate hash of config
val baseConfig = testBaseConfig(defaultConfig) val baseConfig = testBaseConfig(defaultConfig)
val limitEnchantConfig = getHashFromKey(defaultConfig, ConfigOptions.ENCHANT_LIMIT_ROOT) val limitEnchantConfig = getHashFromKey(defaultConfig, ConfigOptions.ENCHANT_LIMIT_ROOT)
val enchantValueConfig =getHashFromKey(defaultConfig, ConfigOptions.ENCHANT_VALUES_ROOT) val enchantValueConfig = getHashFromKey(defaultConfig, ConfigOptions.ENCHANT_VALUES_ROOT)
val enchantConflictConfig2 = getConfigurationHash(enchantConflictConfig) val enchantConflictConfig2 = getConfigurationHash(enchantConflictConfig)
val itemGroupConfig = getConfigurationHash(itemGroupsConfig) val itemGroupConfig = getConfigurationHash(itemGroupsConfig)
val unitRepairConfig = getConfigurationHash(unitRepairItemConfig) val unitRepairConfig = getConfigurationHash(unitRepairItemConfig)

4
src/main/kotlin/xyz/alexcrea/util/UnitRepairUtil.kt → src/main/kotlin/xyz/alexcrea/cuanvil/util/UnitRepairUtil.kt
View file

@ -1,4 +1,4 @@
package xyz.alexcrea.util package xyz.alexcrea.cuanvil.util
import io.delilaheve.CustomAnvil import io.delilaheve.CustomAnvil
import org.bukkit.configuration.ConfigurationSection import org.bukkit.configuration.ConfigurationSection
@ -30,7 +30,7 @@ object UnitRepairUtil {
} }
} }
// Get repair amount // Get repair amount
var userDefault = config.getDouble(UNIT_REPAIR_DEFAULT_PATH,DEFAULT_DEFAULT_UNIT_REPAIR) var userDefault = config.getDouble(UNIT_REPAIR_DEFAULT_PATH, DEFAULT_DEFAULT_UNIT_REPAIR)
if(userDefault <= 0){ if(userDefault <= 0){
userDefault = DEFAULT_DEFAULT_UNIT_REPAIR userDefault = DEFAULT_DEFAULT_UNIT_REPAIR
} }