From 4b4d42cda62f4c095d1635d286e459b070de2ac7 Mon Sep 17 00:00:00 2001 From: Szum123321 Date: Sun, 4 Jun 2023 11:54:36 +0200 Subject: [PATCH] final prod version fo 1.20 --- build.gradle | 4 ++-- gradle.properties | 12 ++++++------ .../net/szum123321/textile_backup/TextileLogger.java | 2 +- .../szum123321/textile_backup/config/ConfigPOJO.java | 2 -- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 4c3b6b8..5dcdb51 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name -version = "${project.mod_version}-${project.minecraft_version}" +version = "${project.mod_version}-${getMcMinor(project.minecraft_version)}" group = project.maven_group repositories { @@ -105,7 +105,7 @@ publishing { } static def getMcMinor(ver) { - String[] arr = ((String)ver).split("\\.") + String[] arr = ((String)ver).split("[.-]") if(arr.length < 2) return ver diff --git a/gradle.properties b/gradle.properties index 5ddf9f0..0bbd976 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,15 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -minecraft_version=1.20-pre1 -yarn_mappings=1.20-pre1+build.2 -loader_version=0.14.19 +minecraft_version=1.20-rc1 +yarn_mappings=1.20-rc1+build.2 +loader_version=0.14.21 #Fabric api -fabric_version=0.80.2+1.20 +fabric_version=0.83.0+1.20 #Cloth Config -cloth_version=11.0.97 +cloth_version=11.0.98 #ModMenu modmenu_version=7.0.0-beta.2 @@ -20,6 +20,6 @@ databreaker_version=0.2.10 pgzip_commit_hash=af5f5c297e735f3f2df7aa4eb0e19a5810b8aff6 # Mod Properties -mod_version = 3.0.0-b +mod_version = 3.0.0 maven_group = net.szum123321 archives_base_name = textile_backup \ No newline at end of file diff --git a/src/main/java/net/szum123321/textile_backup/TextileLogger.java b/src/main/java/net/szum123321/textile_backup/TextileLogger.java index 0a38389..08b5dc7 100644 --- a/src/main/java/net/szum123321/textile_backup/TextileLogger.java +++ b/src/main/java/net/szum123321/textile_backup/TextileLogger.java @@ -94,7 +94,7 @@ public class TextileLogger { else if(level.intLevel() <= Level.WARN.intLevel()) text.formatted(Formatting.RED); else text.formatted(Formatting.WHITE); - source.sendFeedback(prefixText.copy().append(text), false); + source.sendFeedback(() -> prefixText.copy().append(text), false); return true; } else { diff --git a/src/main/java/net/szum123321/textile_backup/config/ConfigPOJO.java b/src/main/java/net/szum123321/textile_backup/config/ConfigPOJO.java index e695347..7ab41ca 100644 --- a/src/main/java/net/szum123321/textile_backup/config/ConfigPOJO.java +++ b/src/main/java/net/szum123321/textile_backup/config/ConfigPOJO.java @@ -115,8 +115,6 @@ public class ConfigPOJO implements ConfigData { \nAvailable formats are: ZIP - normal zip archive using standard deflate compression GZIP - tar.gz using gzip compression - BZIP2 - tar.bz2 archive using bzip2 compression - LZMA - tar.xz using lzma compression TAR - .tar with no compression """) @ConfigEntry.Gui.Tooltip() diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cbf3e57..3b349e6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -40,7 +40,7 @@ "depends": { "fabricloader": ">=0.14.0", "fabric": "*", - "minecraft": "1.20-beta.1", + "minecraft": "^1.20-", "cloth-config2": "*", "java": ">=16" },