Skip to content

Commit 7b363b5

Browse files
MairwunNxMairwunNx
committed
Small mod behavior improvements.
Code cleanup.
1 parent b5a81ba commit 7b363b5

File tree

14 files changed

+98
-186
lines changed

14 files changed

+98
-186
lines changed

‎build.gradle‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@ dependencies {
9191
compile(
9292
group: "com.github.projectessentials",
9393
name: "ProjectEssentials-Permissions",
94-
version: "v1.14.4-0.1.0.2"
94+
version: "v1.14.4-0.1.1.0"
95+
)
96+
compile(
97+
group: "com.github.projectessentials",
98+
name: "ProjectEssentials-Core",
99+
version: "v1.14.4-1.0.2.0"
95100
)
96101
}
97102

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mappingsChannelVersion=20190719-1.14.3
1414
kotlinJdkVersionTarget=jdk8
1515
kotlinxSerializationVersion=0.12.0
1616
kotlinVersion=1.3.50
17-
projectEssentialsVersion=1.14.4-1.0.0.2
17+
projectEssentialsVersion=1.14.4-1.0.1.0
1818
projectEssentialsName=Project Essentials Spawn
1919
projectEssentialsId=project_essentials_spawn
2020
projectEssentialsVendor=MairwunNx (Pavel Erokhin)

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/EntryPoint.kt‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.mairwunnx.projectessentials.projectessentialsspawn
22

33
import com.mairwunnx.projectessentials.projectessentialsspawn.commands.SetSpawnCommand
44
import com.mairwunnx.projectessentials.projectessentialsspawn.commands.SpawnCommand
5-
import com.mairwunnx.projectessentials.projectessentialsspawn.helpers.validateForgeVersion
65
import com.mairwunnx.projectessentials.projectessentialsspawn.models.SpawnModelBase
6+
import com.mairwunnx.projectessentialscore.EssBase
77
import com.mojang.brigadier.CommandDispatcher
88
import net.minecraft.command.CommandSource
99
import net.minecraft.entity.player.ServerPlayerEntity
@@ -17,47 +17,25 @@ import net.minecraftforge.fml.event.server.FMLServerStartingEvent
1717
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent
1818
import org.apache.logging.log4j.LogManager
1919

20-
// todo: move to core project as abstract class
21-
const val MOD_ID = "project_essentials_spawn"
22-
const val MOD_NAME = "Project Essentials Spawn"
23-
const val PART_OF_MOD = "Project Essentials"
24-
const val MOD_VERSION = "1.14.4-1.0.0.2"
25-
const val MOD_MAINTAINER = "MairwunNx (Pavel Erokhin)"
26-
const val MOD_TARGET_FORGE = "28.0.X"
27-
const val MOD_TARGET_FORGE_REGEX = "^28\\.0\\..\\d{1,}|28\\.0\\.[\\d]\$"
28-
const val MOD_TARGET_MC = "1.14.4"
29-
const val MOD_SOURCES_LINK = "https://github.com/ProjectEssentials/ProjectEssentials-Spawn/"
30-
const val MOD_TELEGRAM_LINK = "https://t.me/minecraftforge"
31-
3220
@Suppress("unused")
33-
@Mod(MOD_ID)
34-
class EntryPoint {
21+
@Mod("project_essentials_spawn")
22+
class EntryPoint : EssBase() {
3523
private val logger = LogManager.getLogger()
3624

3725
init {
26+
modInstance = this
27+
modVersion = "1.14.4-1.0.1.0"
3828
logBaseInfo()
3929
validateForgeVersion()
40-
logger.debug("Register event bus for $MOD_NAME mod ...")
30+
logger.debug("Register event bus for $modName mod ...")
4131
MinecraftForge.EVENT_BUS.register(this)
42-
logger.info("Loading $MOD_NAME world spawn data ...")
32+
logger.info("Loading $modName world spawn data ...")
4333
SpawnModelBase.loadData()
4434
}
4535

46-
// todo: Move to core project
47-
private fun logBaseInfo() {
48-
logger.info("$MOD_NAME starting initializing ...")
49-
logger.info(" - Mod Id: $MOD_ID")
50-
logger.info(" - Version: $MOD_VERSION")
51-
logger.info(" - Maintainer: $MOD_MAINTAINER")
52-
logger.info(" - Target Forge version: $MOD_TARGET_FORGE")
53-
logger.info(" - Target Minecraft version: $MOD_TARGET_MC")
54-
logger.info(" - Source code: $MOD_SOURCES_LINK")
55-
logger.info(" - Telegram chat: $MOD_TELEGRAM_LINK")
56-
}
57-
5836
@SubscribeEvent(priority = EventPriority.HIGH)
5937
fun onServerStarting(event: FMLServerStartingEvent) {
60-
logger.info("$MOD_NAME starting mod loading ...")
38+
logger.info("$modName starting mod loading ...")
6139
registerCommands(event.server.commandManager.dispatcher)
6240
processFirstSession(event)
6341
SpawnModelBase.assignSpawn(event.server)
@@ -96,7 +74,7 @@ class EntryPoint {
9674
@Suppress("UNUSED_PARAMETER")
9775
@SubscribeEvent
9876
fun onServerStopping(it: FMLServerStoppingEvent) {
99-
logger.info("Shutting down $MOD_NAME mod ...")
77+
logger.info("Shutting down $modName mod ...")
10078
logger.info(" - Saving world spawn data ...")
10179
SpawnModelBase.saveData()
10280
}
@@ -107,4 +85,8 @@ class EntryPoint {
10785
SpawnCommand.moveToSpawn(event.player as ServerPlayerEntity)
10886
}
10987
}
88+
89+
companion object {
90+
lateinit var modInstance: EntryPoint
91+
}
11092
}

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/commands/SetSpawnCommand.kt‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.mairwunnx.projectessentials.projectessentialsspawn.commands
22

3-
import com.mairwunnx.projectessentials.projectessentialsspawn.extensions.isPlayerSender
4-
import com.mairwunnx.projectessentials.projectessentialsspawn.extensions.sendMsg
53
import com.mairwunnx.projectessentials.projectessentialsspawn.models.SpawnModelBase
4+
import com.mairwunnx.projectessentialscore.extensions.isPlayerSender
5+
import com.mairwunnx.projectessentialscore.extensions.sendMsg
6+
import com.mairwunnx.projectessentialscore.helpers.ONLY_PLAYER_CAN
7+
import com.mairwunnx.projectessentialscore.helpers.PERMISSION_LEVEL
68
import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
79
import com.mojang.brigadier.CommandDispatcher
8-
import com.mojang.brigadier.builder.LiteralArgumentBuilder
10+
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
911
import com.mojang.brigadier.context.CommandContext
1012
import net.minecraft.command.CommandSource
1113
import net.minecraft.util.math.BlockPos
@@ -21,7 +23,7 @@ object SetSpawnCommand {
2123
logger.info(" - register \"/setspawn\" command ...")
2224
aliases.forEach { command ->
2325
dispatcher.register(
24-
LiteralArgumentBuilder.literal<CommandSource>(command).executes {
26+
literal<CommandSource>(command).executes {
2527
return@executes execute(it)
2628
}
2729
)
@@ -39,7 +41,7 @@ object SetSpawnCommand {
3941
SpawnModelBase.spawnModel.pitch = player.rotationPitch
4042
SpawnModelBase.spawnModel.worldId = player.serverWorld.worldType.id
4143
player.world.spawnPoint = BlockPos(player.posX, player.posY, player.posZ)
42-
sendMsg(c.source, "spawn.set.success")
44+
sendMsg("spawn", c.source, "spawn.set.success")
4345
logger.info("New spawn point installed by ${player.name.string} with data: ")
4446
logger.info(" - xpos: ${player.posX}")
4547
logger.info(" - ypos: ${player.posY}")
@@ -48,11 +50,15 @@ object SetSpawnCommand {
4850
logger.info(" - pitch: ${player.rotationPitch}")
4951
logger.info("Executed command \"/${c.input}\" from ${player.name.string}")
5052
} else {
51-
sendMsg(c.source, "spawn.set.restricted")
53+
sendMsg("spawn", c.source, "spawn.set.restricted")
54+
logger.info(
55+
PERMISSION_LEVEL
56+
.replace("%0", player.name.string)
57+
.replace("%1", "setspawn")
58+
)
5259
}
5360
} else {
54-
// todo: use ModErrorHelper
55-
logger.info("Server failed to executing \"${c.input}\" command")
61+
logger.info(ONLY_PLAYER_CAN.replace("%0", "setspawn"))
5662
}
5763
return 0
5864
}

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/commands/SpawnCommand.kt‎

Lines changed: 48 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.mairwunnx.projectessentials.projectessentialsspawn.commands
22

3-
import com.mairwunnx.projectessentials.projectessentialsspawn.*
4-
import com.mairwunnx.projectessentials.projectessentialsspawn.extensions.isPlayerSender
5-
import com.mairwunnx.projectessentials.projectessentialsspawn.extensions.sendMsg
3+
import com.mairwunnx.projectessentials.projectessentialsspawn.EntryPoint
64
import com.mairwunnx.projectessentials.projectessentialsspawn.models.SpawnModelBase
5+
import com.mairwunnx.projectessentialscore.extensions.isPlayerSender
6+
import com.mairwunnx.projectessentialscore.extensions.sendMsg
7+
import com.mairwunnx.projectessentialscore.helpers.ONLY_PLAYER_CAN
8+
import com.mairwunnx.projectessentialscore.helpers.PERMISSION_LEVEL
79
import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
810
import com.mojang.brigadier.CommandDispatcher
911
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -47,13 +49,17 @@ object SpawnCommand {
4749
if (PermissionsAPI.hasPermission(playerName, "ess.spawn")) {
4850
moveToSpawn(c.source.asPlayer())
4951
logger.info("Executed command \"/${c.input}\" from $playerName")
50-
sendMsg(c.source, "spawn.success")
52+
sendMsg("spawn", c.source, "spawn.success")
5153
} else {
52-
sendMsg(c.source, "spawn.restricted")
54+
sendMsg("spawn", c.source, "spawn.restricted")
55+
logger.info(
56+
PERMISSION_LEVEL
57+
.replace("%0", playerName)
58+
.replace("%1", "spawn")
59+
)
5360
}
5461
} else {
55-
// todo: use ModErrorHelper
56-
logger.info("Server failed to executing \"${c.input}\" command")
62+
logger.info(ONLY_PLAYER_CAN.replace("%0", "spawn"))
5763
}
5864
return 0
5965
}
@@ -75,7 +81,12 @@ object SpawnCommand {
7581
if (c.isPlayerSender()) {
7682
val playerName = c.source.asPlayer().name.string
7783
if (!PermissionsAPI.hasPermission(playerName, "ess.spawn.reload")) {
78-
sendMsg(c.source, "spawn.reload.restricted")
84+
sendMsg("spawn", c.source, "spawn.reload.restricted")
85+
logger.info(
86+
PERMISSION_LEVEL
87+
.replace("%0", playerName)
88+
.replace("%1", "spawn reload")
89+
)
7990
return 0
8091
}
8192
}
@@ -84,7 +95,7 @@ object SpawnCommand {
8495
if (c.isPlayerSender()) {
8596
val playerName = c.source.asPlayer().name.string
8697
logger.info("Executed command \"/${c.input}\" from $playerName")
87-
sendMsg(c.source, "spawn.reload.success")
98+
sendMsg("spawn", c.source, "spawn.reload.success")
8899
} else {
89100
logger.info("World spawn configuration reloaded.")
90101
}
@@ -95,15 +106,20 @@ object SpawnCommand {
95106
if (c.isPlayerSender()) {
96107
val playerName = c.source.asPlayer().name.string
97108
if (!PermissionsAPI.hasPermission(playerName, "ess.spawn.save")) {
98-
sendMsg(c.source, "spawn.save.restricted")
109+
sendMsg("spawn", c.source, "spawn.save.restricted")
110+
logger.info(
111+
PERMISSION_LEVEL
112+
.replace("%0", playerName)
113+
.replace("%1", "spawn save")
114+
)
99115
return 0
100116
}
101117
}
102118
SpawnModelBase.saveData()
103119
if (c.isPlayerSender()) {
104120
val playerName = c.source.asPlayer().name.string
105121
logger.info("Executed command \"/${c.input}\" from $playerName")
106-
sendMsg(c.source, "spawn.save.success")
122+
sendMsg("spawn", c.source, "spawn.save.success")
107123
} else {
108124
logger.info("World spawn configuration saved.")
109125
}
@@ -114,32 +130,38 @@ object SpawnCommand {
114130
if (c.isPlayerSender()) {
115131
val playerName = c.source.asPlayer().name.string
116132
if (!PermissionsAPI.hasPermission(playerName, "ess.spawn.version")) {
117-
sendMsg(c.source, "spawn.version.restricted")
133+
sendMsg("spawn", c.source, "spawn.version.restricted")
134+
logger.info(
135+
PERMISSION_LEVEL
136+
.replace("%0", playerName)
137+
.replace("%1", "spawn version")
138+
)
118139
return 0
119140
}
120141
}
121142
if (c.isPlayerSender()) {
122143
val playerName = c.source.asPlayer().name.string
123144
sendMsg(
145+
"spawn",
124146
c.source,
125147
"spawn.version.success",
126-
MOD_NAME,
127-
MOD_VERSION,
128-
MOD_MAINTAINER,
129-
MOD_TARGET_FORGE,
130-
MOD_TARGET_MC,
131-
MOD_SOURCES_LINK,
132-
MOD_TELEGRAM_LINK
148+
EntryPoint.modInstance.modName,
149+
EntryPoint.modInstance.modVersion,
150+
EntryPoint.modInstance.modMaintainer,
151+
EntryPoint.modInstance.modTargetForge,
152+
EntryPoint.modInstance.modTargetMC,
153+
EntryPoint.modInstance.modSources,
154+
EntryPoint.modInstance.modTelegram
133155
)
134156
logger.info("Executed command \"/${c.input}\" from $playerName")
135157
} else {
136-
logger.info(" $MOD_NAME")
137-
logger.info("Version: $MOD_VERSION")
138-
logger.info("Maintainer: $MOD_MAINTAINER")
139-
logger.info("Target Forge version: $MOD_TARGET_FORGE")
140-
logger.info("Target Minecraft version: $MOD_TARGET_MC")
141-
logger.info("Source code: $MOD_SOURCES_LINK")
142-
logger.info("Telegram chat: $MOD_TELEGRAM_LINK")
158+
logger.info(" ${EntryPoint.modInstance.modName}")
159+
logger.info("Version: ${EntryPoint.modInstance.modVersion}")
160+
logger.info("Maintainer: ${EntryPoint.modInstance.modMaintainer}")
161+
logger.info("Target Forge version: ${EntryPoint.modInstance.modTargetForge}")
162+
logger.info("Target Minecraft version: ${EntryPoint.modInstance.modTargetMC}")
163+
logger.info("Source code: ${EntryPoint.modInstance.modSources}")
164+
logger.info("Telegram chat: ${EntryPoint.modInstance.modTelegram}")
143165
}
144166
return 0
145167
}

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/enums/ForgeRootPaths.kt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/extensions/CommandContextExtensions.kt‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/extensions/CommandSourceExtensions.kt‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/helpers/ForgePathHelper.kt‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/helpers/ForgeVersionHelper.kt‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)