fix: beta 2

JamCoreModding · Oct 26, 2023 · 40026b8 · 40026b8
1 parent aa1ef3d
commit 40026b8
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
     id "com.github.breadmoirai.github-release" version "2.4.1"
+    id "maven-publish"
 }
 
 if (System.getenv("GITHUB_TOKEN") != null) {
@@ -73,17 +74,12 @@ allprojects {
     java {
         withSourcesJar()
     }
+}
 
-    processResources {
-        filesMatching(["pack.mcmeta", "fabric.mod.json", "mods.toml", "*.mixins.json", "quilt.mod.json"]) {
-            expand project.properties
-        }
-    }
-
-    tasks.publish {
-        dependsOn("githubRelease")
-        dependsOn("fabric:publishUnified")
-        dependsOn("quilt:publishUnified")
-        dependsOn("forge:publishUnified")
-    }
+tasks.publish {
+    dependsOn(":githubRelease")
+    dependsOn(":publishAllPublicationsToMavenRepository")
+    dependsOn("fabric:publishUnified")
+    dependsOn("quilt:publishUnified")
+    dependsOn("forge:publishUnified")
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -13,3 +13,24 @@ dependencies {
     annotationProcessor libs.mixin.extras.common
     api libs.jankson
 }
+
+publishing {
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId = rootProject.archivesBaseName
+            from components.java
+        }
+    }
+
+    repositories {
+        if (System.getenv("MAVEN_USERNAME") != null && System.getenv("MAVEN_PASSWORD") != null) {
+            maven {
+                url = "https://maven.jamalam.tech/releases"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
+    }
+}
diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java
@@ -58,6 +58,8 @@ public ConfigManager(String modId, String configName, Class<T> configClass) {
 		this.modId = modId;
 		this.configClass = configClass;
 
+		this.validateConfigClass();
+
 		if (!Files.exists(this.configPath)) {
 			this.config = this.createDefaultConfig();
 			this.save();
@@ -136,6 +138,20 @@ public void reloadFromDisk() {
 		}
 	}
 
+	private void validateConfigClass() {
+		T defaultConfig = this.createDefaultConfig();
+
+		try {
+			for (Field field : this.configClass.getFields()) {
+				if (field.get(defaultConfig) == null) {
+					throw new IllegalArgumentException("Config field " + field.getName() + " is null by default. Config fields cannot be null by default.");
+				}
+			}
+		} catch (Exception e) {
+			JamLib.LOGGER.error("Failed to validate config class " + this.configClass.getName(), e);
+		}
+	}
+
 	private T createDefaultConfig() {
 		try {
 			return this.configClass.getConstructor().newInstance();

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -63,6 +63,35 @@ if (System.getenv("CURSEFORGE_API_KEY") != null && System.getenv("MODRINTH_API_K
 //    }
 }
 
+publishing {
+    publications {
+        mavenFabric(MavenPublication) {
+            artifactId = rootProject.archivesBaseName + "-fabric"
+            from components.java
+        }
+    }
+
+    repositories {
+        if (System.getenv("MAVEN_USERNAME") != null && System.getenv("MAVEN_PASSWORD") != null) {
+            maven {
+                url = "https://maven.jamalam.tech/releases"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
+    }
+}
+
+processResources {
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+
+    inputs.property "version", project.version
+}
+
 shadowJar {
     exclude "architectury.common.json"
 

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -74,6 +74,27 @@ if (System.getenv("CURSEFORGE_API_KEY") != null && System.getenv("MODRINTH_API_K
 //    }
 }
 
+publishing {
+    publications {
+        mavenForge(MavenPublication) {
+            artifactId = rootProject.archivesBaseName + "-forge"
+            from components.java
+        }
+    }
+
+    repositories {
+        if (System.getenv("MAVEN_USERNAME") != null && System.getenv("MAVEN_PASSWORD") != null) {
+            maven {
+                url = "https://maven.jamalam.tech/releases"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
+    }
+}
+
 shadowJar {
     exclude "fabric.mod.json"
     exclude "architectury.common.json"

diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,10 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
-version=1.0.0
+version=1.0.0-beta.2
 minecraft_version=1.20.2
 branch=1.20.2
-group=io.github.jamalam360.jamlib
+group=io.github.jamalam360
 mod_name=JamLib
 mod_id=jamlib
-# architectury boilerplate
 enabled_platforms=fabric,forge,quilt
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -6,7 +6,7 @@ mixin-extras = "0.2.0"
 architectury = "10.0.8"
 
 # https://files.minecraftforge.net/net/minecraftforge/forge/
-forge = "1.20.2-48.0.31"
+forge = "1.20.2-48.0.33"
 
 # https://fabricmc.net/develop
 fabric-loader = "0.14.23"

diff --git a/quilt/build.gradle b/quilt/build.gradle
@@ -73,6 +73,35 @@ if (System.getenv("CURSEFORGE_API_KEY") != null && System.getenv("MODRINTH_API_K
 //    }
 }
 
+publishing {
+    publications {
+        mavenQuilt(MavenPublication) {
+            artifactId = rootProject.archivesBaseName + "-quilt"
+            from components.java
+        }
+    }
+
+    repositories {
+        if (System.getenv("MAVEN_USERNAME") != null && System.getenv("MAVEN_PASSWORD") != null) {
+            maven {
+                url = "https://maven.jamalam.tech/releases"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
+    }
+}
+
+processResources {
+    filesMatching("quilt.mod.json") {
+        expand "version": project.version
+    }
+
+    inputs.property "version", project.version
+}
+
 shadowJar {
     exclude "architectury.common.json"