Fixup boilerplate

This ensures that the server is targeting v18. Switched from yarn/pnpm to npm. It adds an editorconfig to [help] ensure that files do not get mixed indentation (and fixed mixed indentations). Removes IDE specific config files. Updated legacy project names. Ran prettier.

Author: Protonull

.editorconfig

@@ -0,0 +1,16 @@
+# https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+
+[*.bat]
+end_of_line = crlf
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2

.github/workflows/build-server.yml

@@ -11,19 +11,15 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        version: ["lts/*", "latest"]
     steps:
       - uses: actions/checkout@v3
-      - name: Use latest Node.js LTS
-        uses: actions/setup-node@v3
+      - name: Using nodejs v18
+        uses: actions/setup-node@v6
         with:
-          node-version: ${{ matrix.version }}
-          # cache: "yarn"
-      - run: yarn
+          node-version: "18"
+      - run: npm install
         working-directory: ./server
-      - run: yarn build
+      - run: npm run build
         working-directory: ./server
-      - run: yarn test
+      - run: npm run test
         working-directory: ./server

.run/Fabric Client.run.xml

@@ -8,15 +8,15 @@ COPY ./server/package.json /usr/src/app/package.json
 
 FROM base AS build
 
-COPY ./server/yarn.lock /usr/src/app/yarn.lock
-RUN yarn
+COPY ./server/package-lock.json /usr/src/app/package-lock.json
+RUN npm install
 
 # copy source as late as possible, to reuse docker cache with node_modules
 COPY ./server /usr/src/app
-RUN yarn build
+RUN npm run build
 
 FROM build AS test
-RUN yarn test
+RUN npm run test
 
 # final image only includes minimal files
 FROM base AS deploy
@@ -33,4 +33,4 @@ ENV MAPSYNC_DATA_DIR=/data
 
 EXPOSE 12312/tcp
 
-CMD [ "yarn", "start" ]
+CMD [ "npm", "start" ]

.vscode/settings.json

@@ -2,7 +2,7 @@
 // See Gradle's releases here: https://gradle.org/releases/
 
 plugins {
- 	id "architectury-plugin" version "3.4-SNAPSHOT"
+	id "architectury-plugin" version "3.4-SNAPSHOT"
 	id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
 }
 
@@ -48,7 +48,7 @@ allprojects {
 				includeGroup "maven.modrinth"
 			}
 		}
-        maven { url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
+		maven { url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
 	}
 
 	tasks.withType(JavaCompile) {

Dockerfile

@@ -13,12 +13,12 @@ dependencies {
 	// Do NOT use other classes from fabric loader
 	modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    // https://modrinth.com/mod/voxelmap-updated/version/1.21.11-1.15.13
-    modCompileOnly("maven.modrinth:voxelmap-updated:tRdGJKGE")
-    // https://modrinth.com/mod/journeymap/version/1.21.11-6.0.0-beta.56+fabric
-    modCompileOnly("maven.modrinth:journeymap:OSpjUIEM")
-    // https://modrinth.com/mod/xaeros-world-map/version/fabric-1.21.11-1.40.11
-    modCompileOnly("maven.modrinth:xaeros-world-map:CkZVhVE0")
+	// https://modrinth.com/mod/voxelmap-updated/version/1.21.11-1.15.13
+	modCompileOnly("maven.modrinth:voxelmap-updated:tRdGJKGE")
+	// https://modrinth.com/mod/journeymap/version/1.21.11-6.0.0-beta.56+fabric
+	modCompileOnly("maven.modrinth:journeymap:OSpjUIEM")
+	// https://modrinth.com/mod/xaeros-world-map/version/fabric-1.21.11-1.40.11
+	modCompileOnly("maven.modrinth:xaeros-world-map:CkZVhVE0")
 }
 
 tasks {

mod/build.gradle

@@ -38,16 +38,16 @@ public static MapSyncMod getMod() {
 		return INSTANCE;
 	}
 
-    public static final String MOD_ID = "mapsync";
+	public static final String MOD_ID = "mapsync";
 
-    public static final Identifier CATEGORY_ID = Identifier.fromNamespaceAndPath(MOD_ID, "general");
-    public static final KeyMapping.Category CATEGORY = KeyMapping.Category.register(CATEGORY_ID);
+	public static final Identifier CATEGORY_ID = Identifier.fromNamespaceAndPath(MOD_ID, "general");
+	public static final KeyMapping.Category CATEGORY = KeyMapping.Category.register(CATEGORY_ID);
 
 	private static final KeyMapping openGuiKey = new KeyMapping(
 			"key.map-sync.openGui",
 			InputConstants.Type.KEYSYM,
 			GLFW.GLFW_KEY_COMMA,
-            CATEGORY
+			CATEGORY
 			//"category.map-sync"
 	);
 

mod/common/build.gradle

@@ -48,11 +48,11 @@ protected void init() {
 			right = width / 2 + innerWidth / 2;
 			top = height / 3;
 
-            centerX = width / 2;
-            centerY = width / 2;
+			centerX = width / 2;
+			centerY = width / 2;
 
-            int buttonWidth = 100;
-            int buttonHeight = 20;
+			int buttonWidth = 100;
+			int buttonHeight = 20;
 
 			clearWidgets();
 

mod/common/src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java

@@ -58,7 +58,7 @@ private void renderLoop() {
 
 				if (!JourneyMapHelper.isJourneyMapNotAvailable && !JourneyMapHelper.isMapping()
 						|| !VoxelMapHelper.isVoxelMapNotAvailable && !VoxelMapHelper.isMapping()
-                        || !XaerosWorldMapHelper.isXaerosWorldMapNotAvailable && !XaerosWorldMapHelper.isMapping()
+						|| !XaerosWorldMapHelper.isXaerosWorldMapNotAvailable && !XaerosWorldMapHelper.isMapping()
 				) {
 					debugLog("render is waiting til map mod is ready");
 					Thread.sleep(1000);
@@ -80,7 +80,7 @@ private void renderLoop() {
 				} else {
 					boolean voxelRendered = VoxelMapHelper.updateWithChunkTile(chunkTile);
 					boolean renderedJM = JourneyMapHelper.updateWithChunkTile(chunkTile);
-                    boolean xaeroRendered = XaerosWorldMapHelper.updateWithChunkTile(chunkTile);
+					boolean xaeroRendered = XaerosWorldMapHelper.updateWithChunkTile(chunkTile);
 
 					debugLog("rendered? " + (voxelRendered||renderedJM|| xaeroRendered) + " " + chunkTile.chunkPos() + " queue=" + queue.size());