Moved custom tooltip handling to Better Advanced Tooltips mod, JIJ'd it, updated gradle

Author: LatvianModder

build.gradle

@@ -5,12 +5,13 @@ plugins {
 	id 'java'
 	id 'idea'
 	id 'maven-publish'
-	id 'net.neoforged.moddev' version "2.0.112"
+	id 'net.neoforged.moddev' version "2.0.137"
 	id "me.shedaniel.unified-publishing" version "0.1.+"
 }
 
-ext.ENV = System.getenv()
-def isLocal = !ENV.containsKey("GITHUB_RUN_NUMBER")
+var ENV = System.getenv()
+var CI = ENV.CI == "true"
+var isLocal = !ENV.containsKey("GITHUB_RUN_NUMBER")
 
 version = "${mod_version}-${isLocal ? "local.${Instant.now().epochSecond}" : "build.${ENV.GITHUB_RUN_NUMBER}"}"
 group = project.maven_group
@@ -19,47 +20,50 @@ base.archivesName = project.archives_base_name
 println("Building version: ${version}")
 
 neoForge {
-	version = project.neoforge_version
-	validateAccessTransformers = true
+	enable {
+		version = project.neoforge_version
+		validateAccessTransformers = !CI
+		disableRecompilation = CI
 
-	accessTransformers {
-		publish(project.file('src/main/resources/META-INF/accesstransformer.cfg'))
-	}
-
-	interfaceInjectionData {
-		from(file('interfaces.json'))
-		publish(file('interfaces.json'))
-	}
-
-	runs {
-		configureEach {
-			logLevel = org.slf4j.event.Level.INFO
+		accessTransformers {
+			publish(project.file('src/main/resources/META-INF/accesstransformer.cfg'))
 		}
 
-		client {
-			ideName = 'Client'
-			client()
-			systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+		interfaceInjectionData {
+			from(file('interfaces.json'))
+			publish(file('interfaces.json'))
+		}
 
-			if (ENV.MC_CLIENT_ARGS) {
-				programArguments.addAll(ENV.MC_CLIENT_ARGS.split(' '))
+		runs {
+			configureEach {
+				logLevel = org.slf4j.event.Level.INFO
 			}
 
-			jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition")
-			gameDirectory = file 'runs/client'
-		}
+			client {
+				ideName = 'Client'
+				client()
+				systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+
+				if (ENV.MC_CLIENT_ARGS) {
+					programArguments.addAll(ENV.MC_CLIENT_ARGS.split(' '))
+				}
 
-		server {
-			ideName = 'Server'
-			server()
-			programArgument("--nogui")
-			gameDirectory = file 'runs/server'
+				jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition")
+				gameDirectory = file 'runs/client'
+			}
+
+			server {
+				ideName = 'Server'
+				server()
+				programArgument("--nogui")
+				gameDirectory = file 'runs/server'
+			}
 		}
-	}
 
-	mods {
-		kubejs {
-			sourceSet sourceSets.main
+		mods {
+			kubejs {
+				sourceSet sourceSets.main
+			}
 		}
 	}
 }
@@ -105,29 +109,15 @@ repositories {
 	}
 
 	maven {
-		url "https://maven.architectury.dev/"
-	}
-
-	maven {
-		url "https://maven.blamejared.com"
+		url "https://maven.latvian.dev/mirror"
 		content {
+			includeGroup "dev.architectury"
+			includeGroup "me.shedaniel"
+			includeGroup "me.shedaniel.cloth"
 			includeGroup "mezz.jei"
 			includeGroup "net.darkhax.bookshelf"
 			includeGroup "net.darkhax.gamestages"
-		}
-	}
-
-	maven {
-		name = "TerraformersMC"
-		url = "https://maven.terraformersmc.com/"
-		content {
 			includeGroup "dev.emi"
-		}
-	}
-
-	maven {
-		url 'https://jitpack.io'
-		content {
 			includeGroup "com.github.rtyley"
 		}
 	}
@@ -154,6 +144,13 @@ dependencies {
 			prefer "animated-gif-lib-$gif_lib_version"
 		}
 	}
+
+	jarJar(implementation('dev.latvian.mods:better-advanced-tooltips')) {
+		version {
+			strictly "[$bat_version,)"
+			prefer "$bat_version"
+		}
+	}
 }
 
 processResources {
@@ -164,6 +161,7 @@ processResources {
 			"jei_version"     : project.jei_version,
 			"rei_version"     : project.rei_version,
 			"emi_version"     : project.emi_version,
+			"bat_version": project.bat_version,
 	]
 
 	println("[Process Resources] Replacing properties in resources: " + toReplace)
@@ -243,33 +241,35 @@ unifiedPublishing {
 
 idea {
 	module {
-		downloadSources = true
-		downloadJavadoc = true
-
-		["client", "server"].each {
-			[
-					".architectury-transformer",
-					"config",
-					"crash-reports",
-					"debug",
-					"downloads",
-					"dumps",
-					"flashback",
-					"local",
-					"logs",
-					"mods",
-					"pack-sync",
-					"profilekeys",
-					"saves",
-					"command_history.txt",
-					"options.txt",
-					"server.properties",
-					"world",
-					"emi.json",
-					"usercache.json",
-					"usernamecache.json"
-			].each { ext ->
-				excludeDirs.add(file("runs/$it/$ext"))
+		if (!CI) {
+			downloadSources = true
+			downloadJavadoc = true
+
+			["client", "server"].each {
+				[
+						".architectury-transformer",
+						"config",
+						"crash-reports",
+						"debug",
+						"downloads",
+						"dumps",
+						"flashback",
+						"local",
+						"logs",
+						"mods",
+						"profilekeys",
+						"saves",
+						"voicechat_recordings",
+						"command_history.txt",
+						"options.txt",
+						"server.properties",
+						"world",
+						"emi.json",
+						"usercache.json",
+						"usernamecache.json"
+				].each { ext ->
+					excludeDirs.add(file("runs/$it/$ext"))
+				}
 			}
 		}
 	}

gradle.properties

@@ -19,6 +19,7 @@ neoForge.parchment.mappingsVersion=2024.11.17
 rhino_version=2101.2.7-build.81
 tiny_server_version=1.0.0-build.33
 gif_lib_version=1.7
+bat_version=2101.1.0-build.1
 
 architectury_version=13.0.8
 rei_version=16.0.799

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/dev/latvian/mods/kubejs/client/ClientProperties.java

@@ -22,12 +22,7 @@ public static void reload() {
 	// private static final ColourScheme.Colour DEFAULT_FOREGROUND_COLOR = new ColourScheme.Colour(236, 239, 244); // #ECEFF4
 
 	public String windowTitle;
-	public boolean showTagNames;
-	public boolean showComponents;
-	public boolean showFuelValue;
 	public boolean disableRecipeBook;
-	public boolean disableComponentCountTooltip;
-	public boolean disableTabNameTooltip;
 	public boolean exportAtlases;
 	// public ColourScheme.Colour launchBackgroundColor;
 	// public ColourScheme.Colour launchForegroundColor;
@@ -45,12 +40,7 @@ private ClientProperties() {
 	@Override
 	protected void load() {
 		windowTitle = get("window_title", "");
-		showTagNames = get("show_tag_names", true);
-		showComponents = get("show_components", true);
-		showFuelValue = get("show_fuel_value", true);
 		disableRecipeBook = get("disable_recipe_book", false);
-		disableComponentCountTooltip = get("disable_component_count_tooltip", true);
-		disableTabNameTooltip = get("disable_tab_name_tooltip", false);
 		exportAtlases = get("export_atlases", false);
 		// launchBackgroundColor = getColor("launch_background_color", DEFAULT_BACKGROUND_COLOR);
 		// launchForegroundColor = getColor("launch_foreground_color", DEFAULT_FOREGROUND_COLOR);