diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Config.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Config.kt index cff66fa..f171890 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Config.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Config.kt @@ -1,12 +1,12 @@ package com.artillexstudios.axminions.api.config import com.artillexstudios.axapi.config.Config +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.dvs.versioning.BasicVersioning +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.dumper.DumperSettings +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.general.GeneralSettings +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.loader.LoaderSettings +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.updater.UpdaterSettings import com.artillexstudios.axminions.api.AxMinionsAPI -import dev.dejvokep.boostedyaml.dvs.versioning.BasicVersioning -import dev.dejvokep.boostedyaml.settings.dumper.DumperSettings -import dev.dejvokep.boostedyaml.settings.general.GeneralSettings -import dev.dejvokep.boostedyaml.settings.loader.LoaderSettings -import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings import java.io.File import java.io.InputStream diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Messages.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Messages.kt index aa787ce..636df8c 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Messages.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/config/Messages.kt @@ -1,13 +1,13 @@ package com.artillexstudios.axminions.api.config import com.artillexstudios.axapi.config.Config +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.dvs.versioning.BasicVersioning +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.dumper.DumperSettings +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.general.GeneralSettings +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.loader.LoaderSettings +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.updater.UpdaterSettings import com.artillexstudios.axapi.utils.StringUtils import com.artillexstudios.axminions.api.AxMinionsAPI -import dev.dejvokep.boostedyaml.dvs.versioning.BasicVersioning -import dev.dejvokep.boostedyaml.settings.dumper.DumperSettings -import dev.dejvokep.boostedyaml.settings.general.GeneralSettings -import dev.dejvokep.boostedyaml.settings.loader.LoaderSettings -import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings import java.io.File import java.io.InputStream diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/miniontype/MinionType.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/miniontype/MinionType.kt index 151933f..f3cd28e 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/miniontype/MinionType.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/miniontype/MinionType.kt @@ -1,10 +1,10 @@ package com.artillexstudios.axminions.api.minions.miniontype import com.artillexstudios.axapi.config.Config +import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.block.implementation.Section import com.artillexstudios.axapi.utils.ItemBuilder import com.artillexstudios.axminions.api.AxMinionsAPI import com.artillexstudios.axminions.api.minions.Minion -import dev.dejvokep.boostedyaml.block.implementation.Section import org.bukkit.Location import org.bukkit.inventory.ItemStack import org.bukkit.persistence.PersistentDataType diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/Warning.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/Warning.kt index c3cd2de..2511f82 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/Warning.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/Warning.kt @@ -1,8 +1,8 @@ package com.artillexstudios.axminions.api.warnings import com.artillexstudios.axapi.hologram.HologramFactory +import com.artillexstudios.axapi.libs.kyori.adventure.text.Component import com.artillexstudios.axminions.api.minions.Minion -import net.kyori.adventure.text.Component abstract class Warning(private val name: String) { diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningContainerFull.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningContainerFull.kt index 0dd5271..3824837 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningContainerFull.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningContainerFull.kt @@ -1,9 +1,9 @@ package com.artillexstudios.axminions.api.warnings.impl +import com.artillexstudios.axapi.libs.kyori.adventure.text.Component import com.artillexstudios.axapi.utils.StringUtils import com.artillexstudios.axminions.api.config.Messages import com.artillexstudios.axminions.api.warnings.Warning -import net.kyori.adventure.text.Component class WarningContainerFull : Warning("container_full") { diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoContainer.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoContainer.kt index 3760a5a..9655e5a 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoContainer.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoContainer.kt @@ -1,9 +1,9 @@ package com.artillexstudios.axminions.api.warnings.impl +import com.artillexstudios.axapi.libs.kyori.adventure.text.Component import com.artillexstudios.axapi.utils.StringUtils import com.artillexstudios.axminions.api.config.Messages import com.artillexstudios.axminions.api.warnings.Warning -import net.kyori.adventure.text.Component class WarningNoContainer : Warning("no_container") { diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoTool.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoTool.kt index 9a3b559..bf287fc 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoTool.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoTool.kt @@ -1,9 +1,9 @@ package com.artillexstudios.axminions.api.warnings.impl +import com.artillexstudios.axapi.libs.kyori.adventure.text.Component import com.artillexstudios.axapi.utils.StringUtils import com.artillexstudios.axminions.api.config.Messages import com.artillexstudios.axminions.api.warnings.Warning -import net.kyori.adventure.text.Component class WarningNoTool : Warning("no_tool") { diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoWaterNearby.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoWaterNearby.kt index 0f42c4a..bd54fb6 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoWaterNearby.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/warnings/impl/WarningNoWaterNearby.kt @@ -1,9 +1,9 @@ package com.artillexstudios.axminions.api.warnings.impl +import com.artillexstudios.axapi.libs.kyori.adventure.text.Component import com.artillexstudios.axapi.utils.StringUtils import com.artillexstudios.axminions.api.config.Messages import com.artillexstudios.axminions.api.warnings.Warning -import net.kyori.adventure.text.Component class WarningNoWaterNearby : Warning("no_water_nearby") { diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt b/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt index 262fc85..3d26d00 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt @@ -2,6 +2,9 @@ package com.artillexstudios.axminions import com.artillexstudios.axapi.AxPlugin import com.artillexstudios.axapi.data.ThreadedQueue +import com.artillexstudios.axapi.libs.lamp.bukkit.BukkitCommandHandler +import com.artillexstudios.axapi.libs.libby.libby.BukkitLibraryManager +import com.artillexstudios.axapi.libs.libby.libby.Library import com.artillexstudios.axminions.api.AxMinionsAPI import com.artillexstudios.axminions.api.AxMinionsAPIImpl import com.artillexstudios.axminions.api.config.Config @@ -15,10 +18,7 @@ import com.artillexstudios.axminions.listeners.MinionPlaceListener import com.artillexstudios.axminions.minions.MinionTicker import com.artillexstudios.axminions.minions.miniontype.CollectorMinionType import com.artillexstudios.axminions.minions.miniontype.FarmerMinionType -import net.byteflux.libby.BukkitLibraryManager -import net.byteflux.libby.Library import org.bukkit.Bukkit -import revxrsal.commands.bukkit.BukkitCommandHandler import java.io.File class AxMinionsPlugin : AxPlugin() { diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt index 644e1fa..709d443 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt @@ -1,20 +1,15 @@ package com.artillexstudios.axminions.commands +import com.artillexstudios.axapi.libs.kyori.adventure.text.minimessage.tag.resolver.Placeholder +import com.artillexstudios.axapi.libs.lamp.annotation.* +import com.artillexstudios.axapi.libs.lamp.bukkit.annotation.CommandPermission import com.artillexstudios.axapi.utils.StringUtils import com.artillexstudios.axminions.AxMinionsPlugin import com.artillexstudios.axminions.api.config.Messages import com.artillexstudios.axminions.api.minions.miniontype.MinionType import com.artillexstudios.axminions.api.minions.miniontype.MinionTypes -import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder import org.bukkit.command.CommandSender import org.bukkit.entity.Player -import revxrsal.commands.annotation.AutoComplete -import revxrsal.commands.annotation.Command -import revxrsal.commands.annotation.Default -import revxrsal.commands.annotation.Description -import revxrsal.commands.annotation.Range -import revxrsal.commands.annotation.Subcommand -import revxrsal.commands.bukkit.annotation.CommandPermission @Command("axminions", "minion", "minions") class AxMinionsCommand { diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt index 980846a..ded45c1 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt @@ -1,5 +1,6 @@ package com.artillexstudios.axminions.listeners +import com.artillexstudios.axapi.libs.kyori.adventure.text.minimessage.tag.resolver.Placeholder import com.artillexstudios.axapi.utils.StringUtils import com.artillexstudios.axminions.AxMinionsPlugin import com.artillexstudios.axminions.api.AxMinionsAPI @@ -7,7 +8,6 @@ import com.artillexstudios.axminions.api.config.Messages import com.artillexstudios.axminions.api.minions.Direction import com.artillexstudios.axminions.api.minions.miniontype.MinionTypes import com.artillexstudios.axminions.minions.Minion -import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder import org.bukkit.Material import org.bukkit.event.EventHandler import org.bukkit.event.Listener diff --git a/libs/AxAPI-1.0-SNAPSHOT.jar b/libs/AxAPI-1.0-SNAPSHOT.jar index 1ce3adb..f59a449 100644 Binary files a/libs/AxAPI-1.0-SNAPSHOT.jar and b/libs/AxAPI-1.0-SNAPSHOT.jar differ