Config refactor

build.fabric.gradle

@@ -0,0 +1,104 @@
+plugins {
+	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
+	id 'maven-publish'
+}
+
+version = property("mod.version")
+
+base {
+	archivesName = project.archives_base_name
+}
+
+repositories {
+	maven { url = "https://artifacts.snackbag.net/artifactory/shitlib" } // ShitLib
+    maven {
+        name = "Terraformers"
+        url = "https://maven.terraformersmc.com/"
+    }
+}
+
+loom {
+	runConfigs.all {
+		ideConfigGenerated = true
+		runDir = "../../run"
+	}
+}
+
+fabricApi {
+	configureDataGeneration()
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${property('deps.minecraft')}"
+	mappings "net.fabricmc:yarn:${property('deps.yarn_mappings')}:v2"
+
+	modImplementation "net.fabricmc:fabric-loader:${property('deps.fabric_loader')}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${property('deps.fabric_api')}"
+
+	// ShitLib
+	implementation "net.snackbag.shit:shit:${project.shitlib_version}"
+	include "net.snackbag.shit:shit:${project.shitlib_version}"
+
+    // ModMenu
+    modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}")
+}
+
+processResources {
+	inputs.property "version", project.version
+	inputs.property "minecraft", stonecutter.current.version
+
+	def map = ["version": project.version, "minecraft": stonecutter.current.version]
+
+	filesMatching("fabric.mod.json") {
+		expand map
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 17
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
+
+	if (stonecutter.compare(stonecutter.current.version, "1.20.5") >= 0) {
+		sourceCompatibility = JavaVersion.VERSION_21
+		targetCompatibility = JavaVersion.VERSION_21
+	} else if (stonecutter.compare(stonecutter.current.version, "1.21") >= 0) {
+		sourceCompatibility = JavaVersion.VERSION_21
+		targetCompatibility = JavaVersion.VERSION_21
+	} else {
+		sourceCompatibility = JavaVersion.VERSION_17
+		targetCompatibility = JavaVersion.VERSION_17
+	}
+}
+
+jar {
+    inputs.property "archivesName", "tt20-${project.version}+mc${stonecutter.current.version}"
+
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

build.fabric_noremap.gradle

@@ -0,0 +1,97 @@
+plugins {
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
+	id 'maven-publish'
+}
+
+version = property("mod.version")
+
+base {
+	archivesName = project.archives_base_name
+}
+
+repositories {
+	maven { url = "https://artifacts.snackbag.net/artifactory/shitlib" } // ShitLib
+    maven {
+        name = "Terraformers"
+        url = "https://maven.terraformersmc.com/"
+    }
+}
+
+loom {
+	runConfigs.all {
+		ideConfigGenerated = true
+		runDir = "../../run"
+	}
+}
+
+fabricApi {
+	configureDataGeneration()
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${property('deps.minecraft')}"
+
+	implementation "net.fabricmc:fabric-loader:${property('deps.fabric_loader')}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${property('deps.fabric_api')}"
+
+	// ShitLib
+	implementation "net.snackbag.shit:shit:${project.shitlib_version}"
+	include "net.snackbag.shit:shit:${project.shitlib_version}"
+
+    // ModMenu
+    implementation("com.terraformersmc:modmenu:${project.modmenu_version}")
+}
+
+processResources {
+	inputs.property "version", project.version
+	inputs.property "minecraft", stonecutter.current.version
+
+	def map = ["version": project.version, "minecraft": stonecutter.current.version]
+
+	filesMatching("fabric.mod.json") {
+		expand map
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 25
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(25)
+	}
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
+}
+
+jar {
+    inputs.property "archivesName", "tt20-${project.version}+mc${stonecutter.current.version}"
+
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

build.gradle

@@ -1,8 +1,10 @@
 plugins {
-	id 'fabric-loom' version "${loom_version}"
+	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
 	id 'maven-publish'
 }
 
+version = property("mod.version")
+
 base {
 	archivesName = project.archives_base_name
 }
@@ -19,7 +21,6 @@ loom {
 	runConfigs.all {
 		ideConfigGenerated = true
 		runDir = "../../run"
-		accessWidenerPath = file("../../src/main/resources/tt20.accesswidener")
 	}
 }
 
@@ -31,9 +32,8 @@ dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${property('deps.minecraft')}"
 	mappings "net.fabricmc:yarn:${property('deps.yarn_mappings')}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${property('deps.fabric_loader')}"
 
-	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc:fabric-loader:${property('deps.fabric_loader')}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${property('deps.fabric_api')}"
 
 	// ShitLib
@@ -101,4 +101,4 @@ publishing {
 		// The repositories here will be used for publishing your artifact, not for
 		// retrieving dependencies.
 	}
-}
+}

gradle.properties

@@ -2,19 +2,20 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
+# Disable stonecutter warning
+dev.kikugie.stonecutter.hard_mode=true
+
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 deps.minecraft=[VERSIONED]
 deps.yarn_mappings=[VERSIONED]
-deps.fabric_loader=0.18.2
+deps.fabric_loader=0.18.6
 
-loom_version=1.14-SNAPSHOT
+loom_version=1.15-SNAPSHOT
 
 # Mod Properties
-version=0.7.2
-
 mod.id=tt20
-mod.version=0.7.1
+mod.version=0.7.2
 maven_group=net.snackbag
 archives_base_name=tt20
 
@@ -25,4 +26,4 @@ deps.fabric_api=[VERSIONED]
 shitlib_version=1.2.3
 
 # ModMenu
-modmenu_version=[VERSIONED]
+modmenu_version=[VERSIONED]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -16,15 +16,23 @@ pluginManagement {
 }
 
 plugins {
-    id "dev.kikugie.stonecutter" version "0.7.10"
+    id "org.gradle.toolchains.foojay-resolver-convention" version "1.0.0"
+    id "dev.kikugie.stonecutter" version "0.9"
 }
 
 stonecutter {
     kotlinController = false
-    centralScript = "build.gradle"
+    centralScript = "build.fabric.gradle"
 
     create(getRootProject()) {
-        versions "1.19.2", "1.20.1", "1.20.2", "1.20.3", "1.20.5", "1.21", "1.21.2", "1.21.9", "1.21.11"
+        def remapScript = "build.fabric.gradle"
+        def noremapScript = "build.fabric_noremap.gradle"
+        def allVersions = ["1.19.2", "1.20.1", "1.20.2", "1.20.3", "1.20.5", "1.21", "1.21.2", "1.21.9", "1.21.11", "26.1.1"]
+
+        allVersions.each { ver ->
+            def script = ver.matches("^26\\..*") ? noremapScript : remapScript
+            version(ver, ver).buildscript = script
+        }
         vcsVersion = "1.20.1"
     }
-}
+}

src/main/java/net/snackbag/tt20/TT20.java

@@ -5,17 +5,20 @@
 import net.snackbag.tt20.command.CommandRegistry;
 import net.snackbag.tt20.config.BlockEntityMaskConfig;
 import net.snackbag.tt20.config.MainConfig;
+import net.snackbag.tt20.config.impl.TT20Config;
 import net.snackbag.tt20.util.TPSCalculator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.CompletableFuture;
 
 public class TT20 implements ModInitializer {
-    public static final Logger LOGGER = LoggerFactory.getLogger("tt20");
+    public static final String MOD_ID = "tt20";
+    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 	public static final String VERSION = "0.7.1";
 	public static final TPSCalculator TPS_CALCULATOR = new TPSCalculator();
 	public static final MainConfig config = new MainConfig();
+    public static final TT20Config Config = new TT20Config();
 	public static final BlockEntityMaskConfig blockEntityMaskConfig = new BlockEntityMaskConfig();
 
 	public static boolean warned = false;
@@ -34,5 +37,11 @@ public void onInitialize() {
 		});
 
 		CommandRegistry.registerCommands();
+
+        if (Config.reload()) {
+            LOGGER.info("Reloaded config.");
+        } else {
+            LOGGER.info("No config changes.");
+        }
 	}
 }