From 61c53173f19d9c2598c175de705be5dd624b449c Mon Sep 17 00:00:00 2001 From: bombcar Date: Fri, 8 Dec 2023 03:18:43 -0600 Subject: [PATCH] move information message to logs (#7) --- README.md | 4 +-- build.gradle | 30 +++++-------------- .../invtweaks/InvTweaksConfigManager.java | 4 +-- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 5be756da..172d996a 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Find the latest builds on the GTNH [Jenkins](http://jenkins.usrv.eu:8080/job/Inv This Open Source project (see [License](LICENSE.txt)) is a client mod for [Minecraft](https://www.minecraft.net/), a game by [Mojang AB](https://mojang.com/). It implements various features to help players with the management of inventories and chests. A lot of effort has been put to make it as customizable as possible, without being annoying to set up. -GTNH Modifications Copyright (c) 2022 The GTNH Team +GTNH Modifications Copyright (c) 2022-2024 The GTNH Team Licensed under LGPL-3.0 or later - use this however you want, but please give back any modifications -Original code is Copyright (c) 2011-2013 Marwane Kalam-Alami and was licensed under the MIT License. \ No newline at end of file +Original code is Copyright (c) 2011-2013 Marwane Kalam-Alami and was licensed under the MIT License. diff --git a/build.gradle b/build.gradle index e59189c8..8507c7df 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1697697256 +//version: 1701530445 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit buildscript { repositories { - mavenCentral() - - maven { - name 'forge' - url 'https://maven.minecraftforge.net' - } maven { // GTNH RetroFuturaGradle and ASM Fork name "GTNH Maven" url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - maven { - name 'sonatype' - url 'https://oss.sonatype.org/content/repositories/snapshots/' - } - maven { - name 'Scala CI dependencies' - url 'https://repo1.maven.org/maven2/' - } - mavenLocal() } } @@ -302,7 +287,7 @@ if (apiPackage) { } if (accessTransformersFile) { - for (atFile in accessTransformersFile.split(",")) { + for (atFile in accessTransformersFile.split(" ")) { String targetFile = "src/main/resources/META-INF/" + atFile.trim() if (!getFile(targetFile).exists()) { throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) @@ -646,7 +631,7 @@ repositories { def mixinProviderGroup = "io.github.legacymoddingmc" def mixinProviderModule = "unimixins" -def mixinProviderVersion = "0.1.7.1" +def mixinProviderVersion = "0.1.13" def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" ext.mixinProviderSpec = mixinProviderSpec @@ -793,12 +778,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.5.1' + def lwjgl3ifyVersion = '1.5.7' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} @@ -1187,9 +1172,8 @@ publishing { version = System.getenv("RELEASE_VERSION") ?: identifiedVersion } } - repositories { - if (usesMavenPublishing.toBoolean()) { + if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) { maven { url = mavenPublishUrl allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven @@ -1311,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.2.1" +def buildscriptGradleVersion = "8.5" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion diff --git a/src/main/java/invtweaks/InvTweaksConfigManager.java b/src/main/java/invtweaks/InvTweaksConfigManager.java index 71a19fea..5786147a 100644 --- a/src/main/java/invtweaks/InvTweaksConfigManager.java +++ b/src/main/java/invtweaks/InvTweaksConfigManager.java @@ -119,13 +119,13 @@ private boolean loadConfig() { if (!InvTweaksConst.CONFIG_RULES_FILE.exists() && extractFile(InvTweaksConst.DEFAULT_CONFIG_FILE, InvTweaksConst.CONFIG_RULES_FILE)) { - InvTweaks.logInGameStatic( + log.info( InvTweaksConst.CONFIG_RULES_FILE + " " + StatCollector.translateToLocal("invtweaks.loadconfig.filemissing")); } if (!InvTweaksConst.CONFIG_TREE_FILE.exists() && extractFile(InvTweaksConst.DEFAULT_CONFIG_TREE_FILE, InvTweaksConst.CONFIG_TREE_FILE)) { - InvTweaks.logInGameStatic( + log.info( InvTweaksConst.CONFIG_TREE_FILE + " " + StatCollector.translateToLocal("invtweaks.loadconfig.filemissing")); }