From 65291460b1a482cb0fd7f0cae6ff3b651d104bba Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Sat, 20 Jul 2024 18:43:01 -0400 Subject: [PATCH 1/2] Fix button i18n Also make sure GT is no longer hard depped --- dependencies.gradle | 10 ++++++---- src/main/java/klaxon/klaxon/goverlays/Backend.java | 5 +++++ .../goverlays/navigator/PollutionButtonManager.java | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c6fb526..6d50b38 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -36,15 +36,17 @@ dependencies { // Required for building and running - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.93:dev') // Duh -// { exclude group: "com.github.GTNewHorizons", module: "DetravScannerMod"} api('com.github.GTNewHorizons:GTNHLib:0.3.2:dev') // Fastutil + config api('com.github.GTNewHorizons:Navigator:1.0.6') api(rfg.deobf('maven.modrinth:journeymap:5.2.5')) + // Pollution backends... only one, for now + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.93:dev') + + runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.93:dev') + // For testing - runtimeOnlyNonPublishable("com.github.GTNewHorizons:DetravScannerMod:1.8.1") + // Creative sources/sinks/pipes runtimeOnlyNonPublishable('com.github.GTNewHorizons:StorageDrawers:1.13.6-GTNH-test') runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.17') - } diff --git a/src/main/java/klaxon/klaxon/goverlays/Backend.java b/src/main/java/klaxon/klaxon/goverlays/Backend.java index f76c87f..60d9f91 100644 --- a/src/main/java/klaxon/klaxon/goverlays/Backend.java +++ b/src/main/java/klaxon/klaxon/goverlays/Backend.java @@ -1,5 +1,10 @@ package klaxon.klaxon.goverlays; +/** + * As of right now, it's not possible to run GT5NH and HBM together, and GT6 doesn't have pollution, so there's no point + * supporting multiple backends in parallel. My hope is that if GT6 adds pollution it'll cooperate with NTM so I don't + * have to make another one... + */ public enum Backend { GT5U, HBM_NTM, // shhhh diff --git a/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java b/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java index 84a0e45..828ab92 100644 --- a/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java +++ b/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java @@ -6,6 +6,7 @@ import com.gtnewhorizons.navigator.api.model.buttons.ButtonManager; import klaxon.klaxon.goverlays.GregtorioOverlays; +import net.minecraft.util.StatCollector; public class PollutionButtonManager extends ButtonManager { @@ -18,6 +19,6 @@ public ResourceLocation getIcon(SupportedMods mod, String theme) { @Override public String getButtonText() { - return "goverlays.button.pollution"; + return StatCollector.translateToLocal("goverlays.button.pollution"); } } From 84b4acc07d3841349f44784f9095381b9dcc23a3 Mon Sep 17 00:00:00 2001 From: GitHub GTNH Actions <> Date: Sat, 20 Jul 2024 23:44:38 +0000 Subject: [PATCH 2/2] spotlessApply --- .../klaxon/goverlays/navigator/PollutionButtonManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java b/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java index 828ab92..e1cca5b 100644 --- a/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java +++ b/src/main/java/klaxon/klaxon/goverlays/navigator/PollutionButtonManager.java @@ -1,12 +1,12 @@ package klaxon.klaxon.goverlays.navigator; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import com.gtnewhorizons.navigator.api.model.SupportedMods; import com.gtnewhorizons.navigator.api.model.buttons.ButtonManager; import klaxon.klaxon.goverlays.GregtorioOverlays; -import net.minecraft.util.StatCollector; public class PollutionButtonManager extends ButtonManager {