Use Labs' Server MOTD Substitutions (Nomi-CEu#863)

[SKIP]
Doniazade · Aug 4, 2024 · 371c9f6 · 371c9f6
1 parent c6a6e17
commit 371c9f6
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 78 deletions.
diff --git a/manifest.json b/manifest.json
@@ -746,7 +746,7 @@
     },
     {
       "projectID": 932060,
-      "fileID": 5594636,
+      "fileID": 5595320,
       "required": true
     },
     {

diff --git a/overrides/config/nomilabs.cfg b/overrides/config/nomilabs.cfg
@@ -92,6 +92,12 @@ advanced {
     # NOMI
     S:languageModifyOption=NOMI
 
+    # Whether to enable Substitutions for the Server Properties MOTD.
+    # Substitutions: {version} for the Modpack Formatted Version (from 'nomilabs-version.cfg'), {mode} for the Modpack Formatted Mode (from LabsModeHelper & the PackMode Mod).
+    # Note: Only the First Substitution in the String is Replaced!
+    # [default: false]
+    B:serverMotdSubstitutions=true
+
     ##########################################################################################################
     # fluid registry
     #--------------------------------------------------------------------------------------------------------#
@@ -424,8 +430,8 @@ content {
 ##########################################################################################################
 
 "groovyscript settings" {
-    # Whether to enable GroovyScript Hand Additions.
-    # [default: true]
+    # Whether to enable Labs' GroovyScript Hand Additions.
+    # [default: false]
     B:enableGroovyHandAdditions=false
 
     # Mode to Use for GT Recipe Output Searching.

diff --git a/serverfiles/server.properties b/serverfiles/server.properties
@@ -1,22 +1,26 @@
-# FOR DEVELOPMENT, DO NOT EDIT THIS FILE! EDIT THE TEMPlATES INSTEAD!
-# See https://github.com/Nomi-CEu/Nomi-CEu/wiki/Part-1:-Contributing-Information#section-5-template-information!
 #Minecraft server properties
+#Sun Aug 04 22:13:15 AEST 2024
+generator-settings=
 op-permission-level=4
+allow-nether=true
 level-name=world
+enable-query=false
 allow-flight=true
 prevent-proxy-connections=false
 server-port=25565
 max-world-size=29999984
-level-seed=
+level-type=lostcities
+enable-rcon=false
 force-gamemode=false
+level-seed=
 server-ip=
 network-compression-threshold=256
 max-build-height=256
 spawn-npcs=true
 white-list=false
 spawn-animals=true
 hardcore=false
-snooper-enabled=true
+snooper-enabled=false
 resource-pack-sha1=
 online-mode=true
 resource-pack=
@@ -26,9 +30,8 @@ enable-command-block=false
 gamemode=0
 player-idle-timeout=0
 max-players=20
+max-tick-time=60000
 spawn-monsters=true
 view-distance=10
 generate-structures=true
-motd=Nomi CEu Server, v1.7-beta-5c, Normal Mode
-level-type=lostcities
-generator-settings=
+motd=Nomi CEu Server, {version}, {mode} Mode
diff --git a/tools/gulpfile.ts b/tools/gulpfile.ts
@@ -8,7 +8,6 @@ export const pruneCache = pruneCacheTask;
 import * as transformFiles from "./tasks/misc/transformFiles.ts";
 export const updateFilesIssue = transformFiles.updateFilesIssue;
 export const updateFilesLabsVersion = transformFiles.updateFilesVersion;
-export const updateFilesServer = transformFiles.updateFilesServer;
 export const updateFilesMainMenu = transformFiles.updateFilesMainMenu;
 export const updateFilesAll = transformFiles.updateAll;
 

diff --git a/tools/tasks/misc/transformFiles.ts b/tools/tasks/misc/transformFiles.ts
@@ -217,29 +217,11 @@ export async function updateLabsVersion(rootDir: string): Promise<void> {
 	return modifyFile(readPath, writePath, replacementObject);
 }
 
-export async function updateServerProperties(rootDir: string): Promise<void> {
-	const fileName = "server.properties";
-	const readPath: string = upath.join(templatesFolder, fileName);
-	const writePath: string = upath.join(rootDir, fileName);
-
-	const replacementObject: Record<string, unknown> = {
-		versionTitle: updateFiles
-			? updateFileTransformedVersion
-			: buildData.transformedVersion,
-	};
-
-	return modifyFile(readPath, writePath, replacementObject);
-}
-
 // Main Closures
 const updateFilesLabsVersion = async () => {
 	await updateLabsVersion(rootDirectory);
 };
 
-const updateFilesServerProperties = async () => {
-	await updateServerProperties(upath.join(rootDirectory, "serverfiles"));
-};
-
 export const updateFilesIssue = gulp.series(
 	updateFilesSetup,
 	updateIssueTemplates,
@@ -248,10 +230,6 @@ export const updateFilesVersion = gulp.series(
 	updateFilesSetup,
 	updateFilesLabsVersion,
 );
-export const updateFilesServer = gulp.series(
-	updateFilesSetup,
-	updateFilesServerProperties,
-);
 export const updateFilesMainMenu = gulp.series(
 	updateFilesSetup,
 	updateMainMenuConfig,
@@ -262,7 +240,6 @@ export const updateAll = gulp.series(
 	gulp.parallel(
 		updateIssueTemplates,
 		updateFilesLabsVersion,
-		updateFilesServerProperties,
 		updateMainMenuConfig,
 	),
 );
diff --git a/tools/tasks/server/index.ts b/tools/tasks/server/index.ts
@@ -19,10 +19,6 @@ import {
 	sharedDestDirectory,
 } from "#globals";
 import { deleteAsync } from "del";
-import {
-	updateFilesBuildSetup,
-	updateServerProperties,
-} from "../misc/transformFiles.ts";
 import logInfo, { logWarn } from "#utils/log.ts";
 
 let g_forgeJar: string | undefined = undefined;
@@ -262,10 +258,6 @@ function processLaunchscripts() {
 		.pipe(dest(serverDestDirectory));
 }
 
-const updateBuildServerProperties = async () => {
-	await updateServerProperties(serverDestDirectory);
-};
-
 export default series(
 	serverCleanUp,
 	createServerDirs,
@@ -278,6 +270,4 @@ export default series(
 	copyServerChangelog,
 	copyServerUpdateNotes,
 	processLaunchscripts,
-	updateFilesBuildSetup,
-	updateBuildServerProperties,
 );
diff --git a/tools/tasks/shared/index.ts b/tools/tasks/shared/index.ts
@@ -49,7 +49,6 @@ async function createSharedDirs() {
  * Copies modpack overrides.
  */
 async function copyOverrides() {
-	// Don't copy server.properties files in config-overrides, it is auto transformed into the server build folder
 	// Copy, not Symlink, so we can transform the files as we wish
 	return new Promise((resolve) => {
 		src(buildConfig.copyToSharedDirGlobs, {

diff --git a/tools/templates/server.properties b/tools/templates/server.properties
diff --git a/tools/utils/buildConfig.default.json b/tools/utils/buildConfig.default.json
@@ -7,7 +7,7 @@
 	"launchscriptsMinRAM": "2048M",
 	"launchscriptsMaxRAM": "2048M",
 	"launchscriptsJVMArgs": "",
-	"copyToSharedDirGlobs": ["overrides/**/*", "!overrides/**/server.properties"],
+	"copyToSharedDirGlobs": ["overrides/**/*"],
 	"copyFromSharedServerGlobs": ["overrides/**/*", "!overrides/resources/**/*"],
 	"copyFromSharedClientGlobs": ["overrides/**/*"],
 	"buildDestinationDirectory": "../build",