Initial commit for OS Utils (#14)

Author: Jonathing

.github/workflows/build_os-utils.yaml

@@ -0,0 +1,25 @@
+name: Build Download Utils
+on:
+  push:
+    branches: [master]
+    paths:
+    - os-utils/**
+    - '!.github/workflows/**'
+    - '!settings.gradle'
+permissions:
+  contents: read
+jobs:
+  build:
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@v0
+    with:
+      java: 21
+      gradle_tasks: :os-utils:check :os-utils:publish
+      project_path: os-utils
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
+      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
+      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      GRADLE_CACHE_KEY: ${{ secrets.GRADLE_CACHE_KEY }}

.gitversion.toml

@@ -14,6 +14,10 @@ tag = "log"
 path = "json-data-utils"
 tag = "json-data"
 
+[os]
+path = "os-utils"
+tag = "os"
+
 [download]
 path = "download-utils"
 tag = "download"

json-data-utils/build.gradle

@@ -25,6 +25,7 @@ dependencies {
     compileOnly libs.nulls
 
     api libs.gson
+    api projects.osUtils
 }
 
 tasks.named('jar', Jar) {

json-data-utils/src/main/java/net/minecraftforge/util/data/MCJsonUtils.java

@@ -4,21 +4,28 @@
  */
 package net.minecraftforge.util.data;
 
+import net.minecraftforge.util.os.OS;
+
 import java.io.File;
 
 public class MCJsonUtils {
+    @Deprecated
+    public static File getMCDir() {
+        return getMCDir(OS.current());
+    }
+
     /**
      * Gets the Minecraft directory used by Minecraft Launcher. This is the directory where the launcher stores
      * libraries, which we can use instead of downloading them again.
      *
      * @return The Minecraft directory
      */
-    public static File getMCDir() {
+    public static File getMCDir(OS os) {
         String userHomeDir = System.getProperty("user.home", ".");
         String mcDir = ".minecraft";
-        if (OS.CURRENT == OS.WINDOWS && System.getenv("APPDATA") != null)
+        if (os == OS.WINDOWS && System.getenv("APPDATA") != null)
             return new File(System.getenv("APPDATA"), mcDir);
-        else if (OS.CURRENT == OS.MACOS)
+        else if (os == OS.MACOS)
             return new File(userHomeDir, "Library/Application Support/minecraft");
         return new File(userHomeDir, mcDir);
     }

json-data-utils/src/main/java/net/minecraftforge/util/data/OS.java

@@ -4,18 +4,15 @@
  */
 package net.minecraftforge.util.data.json;
 
-import net.minecraftforge.util.data.OS;
+import net.minecraftforge.util.os.OS;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 // TODO: [MCMaven][Documentation][MinecraftVersion] What in here is nullable?
 /** Represents a Minecraft version and its artifacts. */
@@ -136,20 +133,20 @@ public static class Rule {
         public static class OS {
             public String name;
 
-            public static net.minecraftforge.util.data.OS toOS(String name) {
+            public static net.minecraftforge.util.os.OS toOS(String name) {
                 switch (name) {
                     case "windows":
-                        return net.minecraftforge.util.data.OS.WINDOWS;
+                        return net.minecraftforge.util.os.OS.WINDOWS;
                     case "linux":
-                        return net.minecraftforge.util.data.OS.LINUX;
+                        return net.minecraftforge.util.os.OS.LINUX;
                     case "osx":
-                        return net.minecraftforge.util.data.OS.MACOS;
+                        return net.minecraftforge.util.os.OS.MACOS;
                     default:
-                        return net.minecraftforge.util.data.OS.UNKNOWN;
+                        return net.minecraftforge.util.os.OS.UNKNOWN;
                 }
             }
 
-            public net.minecraftforge.util.data.OS toOS() {
+            public net.minecraftforge.util.os.OS toOS() {
                 return toOS(this.name);
             }
         }

json-data-utils/src/main/java/net/minecraftforge/util/data/json/MinecraftVersion.java

@@ -0,0 +1,74 @@
+plugins {
+    id 'java-library'
+    id 'idea'
+    id 'eclipse'
+    id 'maven-publish'
+    alias libs.plugins.licenser
+    alias libs.plugins.gradleutils
+    alias libs.plugins.gitversion
+    alias libs.plugins.changelog
+}
+
+gradleutils.displayName = 'OS Utils'
+description = 'Utilities for identifying operating systems, architectures, and their defaults.'
+group = 'net.minecraftforge'
+version = gitversion.tagOffset
+
+println "Version: $version"
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
+    withSourcesJar()
+    //withJavadocJar()
+}
+
+dependencies {
+    compileOnly libs.nulls
+}
+
+tasks.named('jar', Jar) {
+    manifest {
+        attributes('Automatic-Module-Name': 'net.minecraftforge.utils.os')
+
+        gradleutils.manifestDefaults(it, 'net/minecraftforge/util/os/')
+    }
+}
+
+license {
+    header = rootProject.file('LICENSE-header.txt')
+    newLine = false
+    exclude '**/*.properties'
+}
+
+changelog {
+    fromBase()
+}
+
+publishing {
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
+
+    publications.register('mavenJava', MavenPublication) {
+        from components.java
+
+        changelog.publish(it)
+        gradleutils.promote(it)
+
+        pom { pom ->
+            name = gradleutils.displayName
+            description = project.description
+
+            gradleutils.pom.addRemoteDetails(pom)
+
+            licenses {
+                license gradleutils.pom.licenses.LGPLv2_1
+            }
+
+            developers {
+                developer gradleutils.pom.developers.LexManos
+                developer gradleutils.pom.developers.Jonathing
+            }
+        }
+    }
+}