From 170271666d5f4d2254116cdca403744dbae20bb4 Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 29 Dec 2022 16:02:29 +0100 Subject: [PATCH] Use new config compiler --- build.gradle.kts | 4 +--- gradle.properties | 10 +++++----- settings.gradle.kts | 4 ---- src/client/java/io/gitlab/jfronny/translater/Cfg.java | 4 ++++ .../io/gitlab/jfronny/translater/mixin/Plugin.java | 2 ++ src/client/resources/namecache.ini | 6 +++++- src/main/resources/fabric.mod.json | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d225f01..87e57f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,7 @@ import io.gitlab.jfronny.scripts.* plugins { - id("jfmod") version "1.2-SNAPSHOT" - id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") + id("jfmod") version "1.3-SNAPSHOT" } dependencies { @@ -10,7 +9,6 @@ dependencies { modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${prop("libjf_version")}") // Dev env - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") modLocalRuntime("com.terraformersmc:modmenu:${prop("modmenu_version")}") diff --git a/gradle.properties b/gradle.properties index 203ae6c..a324825 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # https://fabricmc.net/develop/ minecraft_version=1.19.3 -yarn_mappings=build.2 -loader_version=0.14.11 +yarn_mappings=build.5 +loader_version=0.14.12 maven_group=io.gitlab.jfronny archives_base_name=translater @@ -13,6 +13,6 @@ curseforge_id=394823 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu -libjf_version=3.3.0 -fabric_version=0.68.1+1.19.3 -modmenu_version=5.0.0-alpha.4 +libjf_version=3.4.1 +fabric_version=0.70.0+1.19.3 +modmenu_version=5.0.2 diff --git a/settings.gradle.kts b/settings.gradle.kts index 4c80169..9b87845 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,13 +1,9 @@ pluginManagement { - val libjf_version: String by settings repositories { maven("https://maven.fabricmc.net/") // FabricMC maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts gradlePluginPortal() } - plugins { - id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") version libjf_version - } } rootProject.name = "translater" \ No newline at end of file diff --git a/src/client/java/io/gitlab/jfronny/translater/Cfg.java b/src/client/java/io/gitlab/jfronny/translater/Cfg.java index c84fc9a..cb43fd7 100644 --- a/src/client/java/io/gitlab/jfronny/translater/Cfg.java +++ b/src/client/java/io/gitlab/jfronny/translater/Cfg.java @@ -10,4 +10,8 @@ public class Cfg { @Entry public static String targetLanguage = "en"; @Entry public static ProgressMode renderProgress = ProgressMode.None; @Entry public static boolean forceRegenerate = false; + + static { + JFC_Cfg.ensureInitialized(); + } } diff --git a/src/client/java/io/gitlab/jfronny/translater/mixin/Plugin.java b/src/client/java/io/gitlab/jfronny/translater/mixin/Plugin.java index e173c06..fdce4d9 100644 --- a/src/client/java/io/gitlab/jfronny/translater/mixin/Plugin.java +++ b/src/client/java/io/gitlab/jfronny/translater/mixin/Plugin.java @@ -1,5 +1,6 @@ package io.gitlab.jfronny.translater.mixin; +import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.translater.Translater; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; @@ -22,6 +23,7 @@ public class Plugin implements IMixinConfigPlugin { @SuppressWarnings("ReferenceToMixin") @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + LibJf.setup(); if (Objects.equals(mixinClassName, LanguageMixin.class.getName()) || Objects.equals(mixinClassName, TranslationStorageAccessor.class.getName())) return true; diff --git a/src/client/resources/namecache.ini b/src/client/resources/namecache.ini index 1d1f929..4afb29c 100644 --- a/src/client/resources/namecache.ini +++ b/src/client/resources/namecache.ini @@ -1,5 +1,5 @@ #---Lang--- -#Wed Dec 07 21:54:20 CET 2022 +#Thu Dec 29 16:00:32 CET 2022 = \nYour\ ban\ will\ be\ removed\ on\ %s=\nYour ban will be lifted %s \ \ ExtraLarge\:\ 0.001=\ ExtraLarge\: 0.001 @@ -8019,6 +8019,7 @@ Don't\ lose\ it=Do not miss it Don't\ mess\ with\ these\ settings\ for\ normal\ gameplay.=Don't mess with these settings for normal gameplay. Don't\ tell\ your\ viewers.=Don&\#39;t tell your audience Don't\ use\ fluids.=Do not use liquids. +Donate=to give Done=Made Donkey=Ass Donkey\ Chest\ equips=Out of the Box and mounted @@ -10794,6 +10795,7 @@ Gingerbread\ Sheet=Chips with gingerbread Gingerbread\ Snowman=ginger ice Gingerbread\ Star=ginger star GitHub\ Releases=Start GitHub +GitHub\ Sponsors=GitHub Contributors Give=Give Give\ Command\:=Give Command\: Give\ Feedback=Leave A Review @@ -15488,6 +15490,7 @@ Master\ Procrastinator=Procrastination teacher Master\ Volume=Captain Tom's Master\ Volume\ Slider=Master volume slider Master\ Wand=lady&\#39;s wand +Mastodon=mastodon mastodon Match=school Match\ Any=Match Any Match\ Block\ Only=Diary is just horizontal @@ -17991,6 +17994,7 @@ Pavement\ for\ road\ building=pavement for road construction Paxel\ Attack\ Speed=Paxel Attack Speed Paxel\ Durability\ Factor=Paxel Durability Factor Pay\ Dirt=Pay for the dirt +PayPal=Through PayPal Peace\ in\ the\ world,\ or\ the\ world\ in\ pieces\!=Peace in the world, or the world in pieces\! Peace\ of\ Mind=Inner peace Peaceful=Nice diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c0f3917..f5efaa8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,7 +15,7 @@ "icon": "assets/translater/icon.png", "environment": "client", "entrypoints": { - "libjf:config": ["io.gitlab.jfronny.translater.Cfg"] + "libjf:config": ["io.gitlab.jfronny.translater.JFC_Cfg"] }, "mixins": [ "translater.mixins.json"