Skip to content

Commit ae149ef

Browse files
MairwunNxMairwunNx
committed
Fixed compiler errors.
Version changed to semver. Updated dependencies. Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent 19d93fd commit ae149ef

5 files changed

Lines changed: 28 additions & 47 deletions

File tree

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ kotlin_jdk_version_target=jdk8
1313
project_jvm_version_target=1.8
1414
kotlin_version=1.3.61
1515
kotlinx_serialization_version=0.14.0
16-
ess_core_version=v1.14.4-1.+
17-
ess_perm_version=v1.14.4-0.+
18-
ess_cooldown_version=v1.14.4-1.+
19-
module_version=1.14.4-0.2.0.0
16+
ess_core_version=v1.14.4-1.1.0.0
17+
ess_perm_version=v1.14.4-1.1.0.0
18+
ess_cooldown_version=v1.14.4-1.0.2.0
19+
module_version=1.14.4-0.2.0
2020
module_name=Project Essentials Chat
2121
module_id=project_essentials_chat
2222
module_vendor=MairwunNx (Pavel Erokhin)

‎src/main/kotlin/com/mairwunnx/projectessentials/chat/ChatUtils.kt‎

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

33
import com.mairwunnx.projectessentials.chat.EntryPoint.Companion.hasPermission
44
import com.mairwunnx.projectessentials.chat.models.ChatModelUtils
5-
import com.mairwunnx.projectessentialscore.extensions.empty
6-
import com.mairwunnx.projectessentialscore.extensions.sendMsg
5+
import com.mairwunnx.projectessentials.core.extensions.empty
6+
import com.mairwunnx.projectessentials.core.extensions.sendMsg
77
import net.minecraft.util.Tuple
88
import net.minecraftforge.event.ServerChatEvent
99

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.mairwunnx.projectessentials.chat
22

33
import com.mairwunnx.projectessentials.chat.models.ChatModelUtils
4-
import com.mairwunnx.projectessentialscore.EssBase
5-
import com.mairwunnx.projectessentialscore.extensions.empty
6-
import com.mairwunnx.projectessentialscore.extensions.sendMsg
7-
import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
4+
import com.mairwunnx.projectessentials.core.EssBase
5+
import com.mairwunnx.projectessentials.core.extensions.empty
6+
import com.mairwunnx.projectessentials.core.extensions.sendMsg
7+
import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
88
import net.minecraft.entity.player.ServerPlayerEntity
99
import net.minecraft.util.math.AxisAlignedBB
1010
import net.minecraft.util.text.TextComponentUtils
@@ -23,10 +23,9 @@ class EntryPoint : EssBase() {
2323

2424
init {
2525
modInstance = this
26-
modVersion = "1.14.4-0.2.0.0"
26+
modVersion = "1.14.4-0.2.0"
2727
logBaseInfo()
2828
validateForgeVersion()
29-
logger.debug("Register event bus for $modName mod ...")
3029
MinecraftForge.EVENT_BUS.register(this)
3130
loadAdditionalModules()
3231
ChatModelUtils.loadData()
@@ -59,7 +58,6 @@ class EntryPoint : EssBase() {
5958
@Suppress("UNUSED_PARAMETER")
6059
@SubscribeEvent
6160
fun onServerStopping(it: FMLServerStoppingEvent) {
62-
logger.info("Shutting down $modName mod ...")
6361
ChatModelUtils.saveData()
6462
}
6563

@@ -100,7 +98,10 @@ class EntryPoint : EssBase() {
10098
if (!ChatModelUtils.chatModel.moderation.advertisingAllowed) {
10199
if (!hasPermission(event.player, "ess.chat.advertising.bypass", 3)) {
102100
if (event.message.matches(
103-
Regex(ChatModelUtils.chatModel.moderation.advertisingRegex)
101+
Regex(
102+
ChatModelUtils.chatModel.moderation.advertisingRegex,
103+
RegexOption.IGNORE_CASE
104+
)
104105
)
105106
) {
106107
sendMsg(
@@ -184,7 +185,9 @@ class EntryPoint : EssBase() {
184185
val mentionSettings = ChatModelUtils.chatModel.mentions
185186
val mentions = mutableListOf<String>()
186187
if (mentionSettings.mentionsEnabled) {
187-
Regex("@\\S[a-zA-Z0-9]*").findAll(event.component.formattedText).forEach {
188+
Regex(
189+
"@\\S[a-zA-Z0-9]*", RegexOption.IGNORE_CASE
190+
).findAll(event.component.formattedText).forEach {
188191
if (it.value != "@e" &&
189192
it.value != "@a" &&
190193
it.value != "@p" &&

‎src/main/kotlin/com/mairwunnx/projectessentials/chat/models/ChatModelUtils.kt‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,34 @@
11
package com.mairwunnx.projectessentials.chat.models
22

3-
import com.mairwunnx.projectessentialscore.helpers.MOD_CONFIG_FOLDER
4-
import kotlinx.serialization.UnstableDefault
5-
import kotlinx.serialization.json.Json
6-
import kotlinx.serialization.json.JsonConfiguration
3+
import com.mairwunnx.projectessentials.core.helpers.MOD_CONFIG_FOLDER
4+
import com.mairwunnx.projectessentials.core.helpers.jsonInstance
75
import org.apache.logging.log4j.LogManager
86
import java.io.File
97

10-
@UseExperimental(UnstableDefault::class)
118
object ChatModelUtils {
129
private val warpsConfig = MOD_CONFIG_FOLDER + File.separator + "chat.json"
1310
private val logger = LogManager.getLogger()
1411
var chatModel = ChatModel()
15-
private val json = Json(
16-
JsonConfiguration(
17-
strictMode = false,
18-
allowStructuredMapKeys = true,
19-
prettyPrint = true
20-
)
21-
)
2212

2313
fun loadData() {
2414
logger.info("Loading chat configuration")
2515
if (!File(warpsConfig).exists()) {
2616
logger.warn("Chat configuration file not exist! creating it now!")
27-
createConfigDirs(MOD_CONFIG_FOLDER)
28-
val defaultConfig = json.stringify(
29-
ChatModel.serializer(),
30-
chatModel
17+
File(MOD_CONFIG_FOLDER).mkdirs()
18+
val defaultConfig = jsonInstance.stringify(
19+
ChatModel.serializer(), chatModel
3120
)
3221
File(warpsConfig).writeText(defaultConfig)
3322
}
3423
val warpsConfigRaw = File(warpsConfig).readText()
35-
chatModel = json.parse(ChatModel.serializer(), warpsConfigRaw)
36-
logger.info("Chat configuration loading done")
24+
chatModel = jsonInstance.parse(ChatModel.serializer(), warpsConfigRaw)
3725
}
3826

3927
fun saveData() {
40-
logger.info("Saving chat configuration to file")
41-
createConfigDirs(MOD_CONFIG_FOLDER)
42-
val spawnConfig = json.stringify(
43-
ChatModel.serializer(),
44-
chatModel
28+
File(MOD_CONFIG_FOLDER).mkdirs()
29+
val spawnConfig = jsonInstance.stringify(
30+
ChatModel.serializer(), chatModel
4531
)
4632
File(warpsConfig).writeText(spawnConfig)
47-
logger.info("Saving chat configuration done")
48-
}
49-
50-
@Suppress("SameParameterValue")
51-
private fun createConfigDirs(path: String) {
52-
logger.info("Creating config directory for chat configuration")
53-
val configDirectory = File(path)
54-
if (!configDirectory.exists()) configDirectory.mkdirs()
5533
}
5634
}

‎src/main/resources/META-INF/mods.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/ProjectEssentials/ProjectEssentials-Chat/iss
44

55
[[mods]]
66
modId="project_essentials_chat"
7-
version="1.14.4-0.2.0.0"
7+
version="1.14.4-0.2.0"
88
displayName="Project Essentials Chat"
99
updateJSONURL="https://raw.githubusercontent.com/ProjectEssentials/ProjectEssentials-Chat/MC-1.14.4/update.json"
1010
displayURL="https://github.com/ProjectEssentials/ProjectEssentials-Chat"

0 commit comments

Comments
 (0)