Skip to content

Commit 3df9250

Browse files
tksimejitksimeji
committed
refactor: move net.azisaba.vanilife.island"s" to net.azisaba.vanilife.island
1 parent 326a014 commit 3df9250

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+108
-110
lines changed

plugins/plugin-islands/build.gradle.kts renamed to plugins/plugin-island/build.gradle.kts

File renamed without changes.

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/CoastSide.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/CoastSide.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

33
import com.github.retrooper.packetevents.util.Quaternion4f
44
import net.azisaba.vanilife.world.IslandPos
@@ -7,13 +7,13 @@ import kotlin.math.sin
77
import kotlin.math.sqrt
88

99
enum class CoastSide(val axisX: Boolean, val axisZ: Boolean, val yaw: Float, val coastNormalSign: Double, val rotation: Quaternion4f) {
10-
NORTH(false, true, -90f, -1.0, axisAngle(-1f, 1f, 1f, 120f)),
11-
SOUTH(false, true, -90f, 1.0, axisAngle(-1f, -1f, -1f, 120f)),
12-
EAST(true, false, 90f, 1.0, axisAngle(0f, 1f, 1f, 180f)),
13-
WEST(true, false, 90f, -1.0, axisAngle(1f, 0f, 0f, -90f));
10+
NORTH(false, true, -90f, -1.0, _root_ide_package_.net.azisaba.vanilife.island.axisAngle(-1f, 1f, 1f, 120f)),
11+
SOUTH(false, true, -90f, 1.0, _root_ide_package_.net.azisaba.vanilife.island.axisAngle(-1f, -1f, -1f, 120f)),
12+
EAST(true, false, 90f, 1.0, _root_ide_package_.net.azisaba.vanilife.island.axisAngle(0f, 1f, 1f, 180f)),
13+
WEST(true, false, 90f, -1.0, _root_ide_package_.net.azisaba.vanilife.island.axisAngle(1f, 0f, 0f, -90f));
1414
}
1515

16-
fun IslandPos.boundaryBlock(coastSide: CoastSide): Int = when {
16+
fun IslandPos.boundaryBlock(coastSide: net.azisaba.vanilife.island.CoastSide): Int = when {
1717
coastSide.axisX && coastSide.coastNormalSign < 0 -> minBlockX()
1818
coastSide.axisX && coastSide.coastNormalSign > 0 -> maxBlockX()
1919
coastSide.axisZ && coastSide.coastNormalSign < 0 -> minBlockZ()

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Configuration.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/Configuration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

33
import com.charleskorn.kaml.Yaml
44
import kotlinx.serialization.SerialName

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Database.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/Database.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

33
import com.zaxxer.hikari.HikariConfig
44
import com.zaxxer.hikari.HikariDataSource
5-
import net.azisaba.vanilife.islands.enchantment.DatabaseIslandEnchantmentRepository
6-
import net.azisaba.vanilife.islands.repository.DatabaseIslandRepository
5+
import net.azisaba.vanilife.island.enchantment.DatabaseIslandEnchantmentRepository
6+
import net.azisaba.vanilife.island.repository.DatabaseIslandRepository
77
import org.jetbrains.exposed.v1.jdbc.Database
88
import org.jetbrains.exposed.v1.jdbc.SchemaUtils
99
import org.jetbrains.exposed.v1.jdbc.transactions.transaction

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/EventListeners.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/EventListeners.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

3-
import net.azisaba.vanilife.islands.enchantment.EnchantingTableBehaviour
4-
import net.azisaba.vanilife.islands.listener.EnchantingTableListener
5-
import net.azisaba.vanilife.islands.listener.IslandPlayerListener
3+
import net.azisaba.vanilife.island.listener.EnchantingTableListener
4+
import net.azisaba.vanilife.island.enchantment.EnchantingTableBehaviour
5+
import net.azisaba.vanilife.island.listener.IslandPlayerListener
66
import org.koin.core.Koin
77

88
internal fun Main.setupEventListeners(koin: Koin) {

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Island.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/Island.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

33
import com.github.shynixn.mccoroutine.folia.launch
44
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -7,14 +7,14 @@ import kotlinx.coroutines.channels.Channel
77
import kotlinx.coroutines.delay
88
import kotlinx.coroutines.future.await
99
import kotlinx.coroutines.isActive
10-
import net.azisaba.vanilife.islands.enchantment.EnchantmentAccessor
11-
import net.azisaba.vanilife.islands.enchantment.IslandEnchantmentAccessor
12-
import net.azisaba.vanilife.islands.enchantment.IslandEnchantmentRepository
13-
import net.azisaba.vanilife.islands.repository.PrimaryIslandData
14-
import net.azisaba.vanilife.islands.waves.IslandWaveAccessor
15-
import net.azisaba.vanilife.islands.waves.WaveAccessor
16-
import net.azisaba.vanilife.islands.wrack.IslandWrackAccessor
17-
import net.azisaba.vanilife.islands.wrack.WrackAccessor
10+
import net.azisaba.vanilife.island.enchantment.EnchantmentAccessor
11+
import net.azisaba.vanilife.island.enchantment.IslandEnchantmentAccessor
12+
import net.azisaba.vanilife.island.enchantment.IslandEnchantmentRepository
13+
import net.azisaba.vanilife.island.repository.PrimaryIslandData
14+
import net.azisaba.vanilife.island.waves.IslandWaveAccessor
15+
import net.azisaba.vanilife.island.waves.WaveAccessor
16+
import net.azisaba.vanilife.island.wrack.IslandWrackAccessor
17+
import net.azisaba.vanilife.island.wrack.WrackAccessor
1818
import net.azisaba.vanilife.world.IslandPos
1919
import net.azisaba.vanilife.world.IslandsWorld
2020
import net.kyori.adventure.audience.Audience

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/IslandsFonts.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/IslandFonts.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

33
import net.azisaba.packed.PackedKey
44
import net.azisaba.packed.font
55
import net.azisaba.packed.font.CharCodeFactory
66
import net.azisaba.packed.font.PackFont
77
import net.azisaba.packed.font.provider.PackBitmapFontProvider
88
import net.azisaba.vanilife.Vanilife
9-
import net.kyori.adventure.inventory.Book
109
import net.kyori.adventure.key.Key
1110

12-
object IslandsFonts {
11+
object IslandFonts {
1312
private const val WAVE_ASCENT: Int = 511
1413
private const val WAVE_HEIGHT: Int = 512
1514

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/IslandInfo.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/IslandInfo.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

3-
import net.azisaba.vanilife.islands.repository.PrimaryIslandData
3+
import net.azisaba.vanilife.island.repository.PrimaryIslandData
44
import net.azisaba.vanilife.world.IslandPos
55
import java.util.*
66

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/IslandManager.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/IslandManager.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

3-
import net.azisaba.vanilife.islands.enchantment.IslandEnchantmentRepository
4-
import net.azisaba.vanilife.islands.repository.IslandRepository
5-
import net.azisaba.vanilife.islands.repository.PrimaryIslandData
3+
import net.azisaba.vanilife.island.enchantment.IslandEnchantmentRepository
4+
import net.azisaba.vanilife.island.repository.IslandRepository
5+
import net.azisaba.vanilife.island.repository.PrimaryIslandData
66
import net.azisaba.vanilife.world.IslandPos
77
import net.azisaba.vanilife.world.IslandsWorld
88
import org.bukkit.plugin.Plugin

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Main.kt renamed to plugins/plugin-island/src/main/kotlin/net/azisaba/vanilife/island/Main.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package net.azisaba.vanilife.islands
1+
package net.azisaba.vanilife.island
22

33
import com.github.retrooper.packetevents.PacketEvents
44
import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder
55
import me.tofaa.entitylib.APIConfig
66
import me.tofaa.entitylib.EntityLib
77
import me.tofaa.entitylib.spigot.SpigotEntityLibPlatform
88
import net.azisaba.vanilife.Vanilife
9-
import net.azisaba.vanilife.islands.enchantment.DatabaseIslandEnchantmentRepository
10-
import net.azisaba.vanilife.islands.enchantment.IslandEnchantmentRepository
11-
import net.azisaba.vanilife.islands.repository.DatabaseIslandRepository
12-
import net.azisaba.vanilife.islands.repository.IslandRepository
13-
import net.azisaba.vanilife.islands.wrack.WrackType
9+
import net.azisaba.vanilife.island.enchantment.DatabaseIslandEnchantmentRepository
10+
import net.azisaba.vanilife.island.enchantment.IslandEnchantmentRepository
11+
import net.azisaba.vanilife.island.repository.DatabaseIslandRepository
12+
import net.azisaba.vanilife.island.repository.IslandRepository
13+
import net.azisaba.vanilife.island.wrack.WrackType
1414
import org.bukkit.plugin.Plugin
1515
import org.bukkit.plugin.java.JavaPlugin
1616
import org.jetbrains.exposed.v1.jdbc.Database

0 commit comments

Comments
 (0)