Skip to content

Commit 25e9daa

Browse files
committed
Added compatibility with forge 28.1.X.
Improved logging on mod startup and on forge version incompatibility. Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>
1 parent 6c13abc commit 25e9daa

File tree

1 file changed

+25
-16
lines changed
  • src/main/kotlin/com/mairwunnx/projectessentialscore

1 file changed

+25
-16
lines changed

src/main/kotlin/com/mairwunnx/projectessentialscore/EssBase.kt

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,39 @@ abstract class EssBase {
1818
var modVersion = "1.14.4-0.0.0.0"
1919
var modModuleName = "Null"
2020
var modMaintainer = "MairwunNx (Pavel Erokhin)"
21-
var modTargetForge = "28.0.X"
22-
var modTargetForgeRegex = "^28\\.0\\..\\d+|28\\.0\\.[\\d]\$"
21+
var modTargetForge = "28.1.X"
22+
var modTargetForgeRegex = "^28\\.0\\.[\\d]+|28\\.1\\.[\\d]+$"
2323
var modTargetMC = "1.14.4"
2424
var modSources = "https://github.com/ProjectEssentials/ProjectEssentials-Null/"
2525
var modTelegram = "https://t.me/minecraftforge"
26+
var modCurseForge = "Null"
2627

2728
init {
2829
modId = this.javaClass.getAnnotation(Mod::class.java).value
2930
modName = modId.replace("_", " ").capitalizeWords()
3031
modModuleName = modName.split(" ").last()
3132
modSources = "https://github.com/ProjectEssentials/ProjectEssentials-$modModuleName/"
33+
modCurseForge =
34+
"https://www.curseforge.com/minecraft/mc-mods/ProjectEssentials-$modModuleName"
3235
}
3336

3437
/**
3538
* Print base modification information to log.
3639
* @since 1.14.4-1.0.0.0
3740
*/
3841
fun logBaseInfo() {
39-
logger.info("$modName starting initializing ...")
40-
logger.info(" - Mod Id: $modId")
41-
logger.info(" - Version: $modVersion")
42-
logger.info(" - Maintainer: $modMaintainer")
43-
logger.info(" - Target Forge version: $modTargetForge")
44-
logger.info(" - Target Minecraft version: $modTargetMC")
45-
logger.info(" - Source code: $modSources")
46-
logger.info(" - Telegram chat: $modTelegram")
42+
logger.info(
43+
"\n" +
44+
" **** $modName starting initializing ***\n\n" +
45+
" - Mod Id: $modId\n" +
46+
" - Version: $modVersion\n" +
47+
" - Maintainer: $modMaintainer\n" +
48+
" - Target Forge version: $modTargetForge\n" +
49+
" - Target Minecraft version: $modTargetMC\n" +
50+
" - Source code: $modSources\n" +
51+
" - Telegram chat: $modTelegram\n" +
52+
" - CurseForge: $modCurseForge"
53+
)
4754
}
4855

4956
/**
@@ -53,14 +60,16 @@ abstract class EssBase {
5360
* @since 1.14.4-1.0.0.0
5461
*/
5562
fun validateForgeVersion() {
56-
logger.info("Checking forge version for compatibility with mod ...")
63+
logger.info("Checking forge version for compatibility with mod")
5764
if (Regex(modTargetForgeRegex).matches(ForgeVersion.getVersion())) {
58-
logger.info("Forge version is compatibility with mod.")
65+
logger.info("Forge version is compatibility with $modName")
5966
} else {
60-
logger.warn("Forge version may be incompatible with $modName $modVersion!")
61-
logger.warn(" - update or downgrade forge version.")
62-
logger.warn(" - update or downgrade mod version.")
63-
logger.warn(" - or just create issue on github.")
67+
logger.warn(
68+
"\n **** Forge version may be incompatible with $modName $modVersion! ****\n\n" +
69+
" - update or downgrade forge version.\n" +
70+
" - update or downgrade mod version.\n" +
71+
" - or just create issue on github."
72+
)
6473
}
6574
}
6675
}

0 commit comments

Comments
 (0)