Skip to content
This repository has been archived by the owner on Jun 4, 2023. It is now read-only.

Commit

Permalink
Renamed package
Browse files Browse the repository at this point in the history
  • Loading branch information
emortal committed Jan 6, 2022
1 parent bc7b324 commit 59d8a1f
Show file tree
Hide file tree
Showing 26 changed files with 257 additions and 240 deletions.
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
// Apply the Kotlin JVM plugin to add support for Kotlin.
id("org.jetbrains.kotlin.jvm") version "1.6.0"
id("org.jetbrains.kotlin.jvm") version "1.6.10"
// Kotlinx serialization for any data format
kotlin("plugin.serialization") version "1.6.0"
kotlin("plugin.serialization") version "1.6.10"
// Shade the plugin
id("com.github.johnrengelman.shadow") version "7.1.0"
id("com.github.johnrengelman.shadow") version "7.1.1"
// Allow publishing
`maven-publish`

Expand Down Expand Up @@ -38,12 +38,12 @@ dependencies {

implementation("com.github.emortaldev:particable:e98f138cda")
implementation("com.github.EmortalMC:Rayfast:07d8daf030")
compileOnly("com.github.Minestom:Minestom:3843cacef5")
compileOnly("com.github.EmortalMC:Immortal:0fc8d6d833")
compileOnly("com.github.emortaldev:Minestom:78aaa3e629")
compileOnly("com.github.EmortalMC:Immortal:5133ba4779")


// import kotlinx serialization
compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1")
compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")

// Use the JUpiter test library.
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
kotlin.code.style=official
name=LazerTag
mainClass=LazerTagExtension
group=emortal.lazertag
group=dev.emortal.lazertag
version=1.0.0
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package emortal.lazertag
package dev.emortal.lazertag

import dev.emortal.immortal.game.GameManager
import dev.emortal.immortal.game.GameOptions
import dev.emortal.immortal.game.WhenToRegisterEvents
import emortal.lazertag.commands.GunCommand
import emortal.lazertag.config.ConfigurationHelper
import emortal.lazertag.config.LazerTagConfig
import emortal.lazertag.game.LazerTagGame
import dev.emortal.lazertag.commands.GunCommand
import dev.emortal.lazertag.config.ConfigurationHelper
import dev.emortal.lazertag.config.LazerTagConfig
import dev.emortal.lazertag.game.LazerTagGame
import net.minestom.server.coordinate.Pos
import net.minestom.server.extensions.Extension
import world.cepi.kstom.adventure.asMini
Expand Down Expand Up @@ -49,7 +49,7 @@ class LazerTagExtension : Extension() {
maxPlayers = 15,
minPlayers = 1,
canJoinDuringGame = true,
showScoreboard = false,
showScoreboard = true,
)
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package emortal.lazertag.commands
package dev.emortal.lazertag.commands

import emortal.lazertag.gun.Gun
import emortal.lazertag.gun.Gun.Companion.heldGun
import emortal.lazertag.gun.ProjectileGun
import dev.emortal.lazertag.gun.Gun
import dev.emortal.lazertag.gun.Gun.Companion.heldGun
import net.minestom.server.command.builder.arguments.ArgumentType
import world.cepi.kstom.command.arguments.suggest
import world.cepi.kstom.command.kommand.Kommand
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package emortal.lazertag.commands
package dev.emortal.lazertag.commands

import emortal.lazertag.LazerTagExtension
import emortal.lazertag.config.ConfigurationHelper
import emortal.lazertag.config.LazerTagConfig
import dev.emortal.lazertag.LazerTagExtension
import dev.emortal.lazertag.config.ConfigurationHelper
import dev.emortal.lazertag.config.LazerTagConfig
import net.minestom.server.coordinate.Pos
import world.cepi.kstom.command.kommand.Kommand

object RefreshCommand : Kommand({
default {
LazerTagExtension.config = ConfigurationHelper.initConfigFile(LazerTagExtension.configPath, LazerTagConfig())
LazerTagExtension.config =
ConfigurationHelper.initConfigFile(LazerTagExtension.configPath, LazerTagConfig())

LazerTagExtension.maps.forEach {
if (LazerTagExtension.config.spawnPositions.contains(it)) return@forEach
Expand All @@ -17,7 +18,10 @@ object RefreshCommand : Kommand({
sender.sendMessage("Creating map config for '${it}'")
}

ConfigurationHelper.writeObjectToPath(LazerTagExtension.configPath, LazerTagExtension.config)
ConfigurationHelper.writeObjectToPath(
LazerTagExtension.configPath,
LazerTagExtension.config
)

sender.sendMessage("Refreshed spawn locations")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package emortal.lazertag.config
package dev.emortal.lazertag.config

import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package emortal.lazertag.config
package dev.emortal.lazertag.config

import kotlinx.serialization.Serializable
import net.minestom.server.coordinate.Pos
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package emortal.lazertag.game
package dev.emortal.lazertag.game

enum class GameType(val winGameKills: Int) {
STANDARD(32)
Expand Down

0 comments on commit 59d8a1f

Please sign in to comment.