Squashed commit of the following:

commit 824fb1e Author: Jab125 <[email protected]> Date: Sun Jan 5 16:00:48 2025 +1100 Update en_us.json commit 7b7a1b0 Author: Jab125 <[email protected]> Date: Sun Jan 5 15:53:58 2025 +1100 fix most of the translation keys commit c63fb1e Author: Jab125 <[email protected]> Date: Sun Jan 5 15:24:11 2025 +1100 keep track of parent tweak for translation purposes commit 74e4a9b Author: Jab125 <[email protected]> Date: Sun Jan 5 15:11:43 2025 +1100 Update en_us.json commit 99374aa Author: Jab125 <[email protected]> Date: Sun Jan 5 15:11:29 2025 +1100 Update en_us.json commit 48abef5 Author: Jab125 <[email protected]> Date: Sun Jan 5 15:07:30 2025 +1100 Update Tweak.java commit 0e67ba0 Author: Jab125 <[email protected]> Date: Sun Jan 5 15:06:53 2025 +1100 Update Tweak.java commit 1a7b374 Author: Jab125 <[email protected]> Date: Sun Jan 5 15:03:34 2025 +1100 Update en_us.json commit 4070e8e Author: Jab125 <[email protected]> Date: Sun Jan 5 15:02:47 2025 +1100 fix part 1 commit 63ccc36 Author: Jab125 <[email protected]> Date: Sun Jan 5 14:50:01 2025 +1100 Replace Strings with Translation Keys (#2) * Translation Keys 3/13 * Translation Keys 13/13 * Repair Title * Repair Option Names --------- Co-authored-by: S-N00B-1 <[email protected]>
ViolaFlower · Jan 5, 2025 · e58a51f · e58a51f
1 parent 23bec81
commit e58a51f
Show file tree

Hide file tree

Showing 17 changed files with 207 additions and 122 deletions.
diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/client/gui/screen/LTScreen.java b/src/main/java/xyz/violaflower/legacy_tweaks/client/gui/screen/LTScreen.java
@@ -39,7 +39,7 @@ public LTScreen(Screen parent, TweakParent tweakParent) {
 
     private static Component getTitle(Screen parent, TweakParent tweakParent) {
         if (parent instanceof LTScreen ltScreen) {
-            return ltScreen.title.copy().append(" / " + ((Tweak) tweakParent).getTweakID());
+            return ltScreen.title.copy().append(" / ").append(((Tweak) tweakParent).getTweakName());
         }
         if (parent instanceof SettingsScreen settingsScreen) {
             return getTitle(settingsScreen.getParent(), tweakParent);
@@ -99,8 +99,8 @@ class SettingEntry extends ContainerObjectSelectionList.Entry<SettingEntry> {
             protected final List<AbstractWidget> children = Lists.newArrayList();
 
             public SettingEntry(final Tweak tweak) {
-                this.title = Component.literal(tweak.getTweakID() + " - " + tweak.getTweakAuthor());
-                this.label = LTScreen.this.minecraft.font.split(Component.literal(tweak.getTweakDescription()).withStyle(ChatFormatting.GRAY), 175);
+                this.title = Component.empty().append(tweak.getTweakName()).append(" - " + tweak.getTweakAuthor());
+                this.label = LTScreen.this.minecraft.font.split(Component.empty().append(tweak.getTweakDescription()).withStyle(ChatFormatting.GRAY), 175);
 
                 if (!tweak.isGroup()) {
                     toggleButton = Button.builder(Component.translatable(tweak.isEnabled() ? "lt.main.enabled" : "lt.main.disabled"), button -> {

diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/Tweak.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/Tweak.java
@@ -18,12 +18,11 @@
 public abstract class Tweak implements TweakParent {
     private String id; // this probably shouldn't have a default
     private String author = "Legacy JohnTweaks";
-    private String description = "Changes... something.";
-    private String exDescription = "Changes something, I think... Maybe?";
     private String version = "1.0.0";
     private boolean isEnabled = true;
     private boolean isGroup = false;
     private final Map<String, Tweak> subTweaks = new LinkedHashMap<>();
+    private Tweak parentTweak;
 
     public Tweak() {
 
@@ -33,10 +32,9 @@ public Tweak(String id) {
         this.id = id;
     }
 
-    public Tweak(String id, String author, String description) {
+    public Tweak(String id, String author) {
         this.id = id;
         this.author = author;
-        this.description = description;
     }
     public boolean isEnabled() {
         return isEnabled;
@@ -74,10 +72,23 @@ public String getTweakID() {
         return id;
     }
 
+    private Tweak getParentTweak() {
+        return parentTweak;
+    }
+
+    public String getTweakTranslationId() {
+        Tweak parentTweak = getParentTweak();
+        return parentTweak != null ? parentTweak.getTweakTranslationId() + "." + id : id;
+    }
+
     public void setTweakID(String id) {
         this.id = id;
     }
 
+    public Component getTweakName() {
+        return Component.translatable("lt.tweak." + getTweakTranslationId());
+    }
+
     public void setTweakAuthor(String... author) {
         this.author = Arrays.stream(author).collect(Collectors.joining(", "));
     }
@@ -86,20 +97,12 @@ public String getTweakAuthor() {
         return this.author;
     }
 
-    public void setTweakDescription(String description) {
-        this.description = description;
-    }
-
-    public String getTweakDescription() {
-        return this.description;
-    }
-
-    public void setTweakExtendedDescription(String exDescription) {
-        this.exDescription = exDescription;
+    public Component getTweakDescription() {
+        return Component.translatable("lt.tweak." + getTweakTranslationId() + ".description");
     }
 
-    public String getTweakExtendedDescription() {
-        return this.exDescription;
+    public Component getTweakExtendedDescription() {
+        return Component.translatable("lt.tweak." + getTweakTranslationId() + ".extendedDescription");
     }
 
     public void setTweakVersion(String version) {
@@ -121,6 +124,7 @@ public <T extends Tweak> T getSubTweak(String tweakID) {
 
     public void addSubTweak(Tweak tweak) {
         subTweaks.put(tweak.getTweakID(), tweak);
+        tweak.parentTweak = this;
     }
 
     public void onToggled() {

diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/TweakBuilder.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/TweakBuilder.java
@@ -1,9 +1,10 @@
 package xyz.violaflower.legacy_tweaks.tweaks;
 
+import net.minecraft.network.chat.Component;
+
 public class TweakBuilder {
 
 	private String id;
-	private String description;
 	private boolean defaultEnabled = true;
 	private String[] authors;
 	private Runnable onToggled = () -> {};
@@ -20,11 +21,6 @@ public TweakBuilder tweakID(String string) {
 		return this;
 	}
 
-	public TweakBuilder description(String description) {
-		this.description = description;
-		return this;
-	}
-
 	public TweakBuilder authors(String... authors) {
 		this.authors = authors;
 		return this;
@@ -59,7 +55,6 @@ public void onToggled() {
 				onToggled.run();
 			}
 		};
-		tweak.setTweakDescription(description);
 		tweak.setDefaultEnabled(defaultEnabled);
 		tweak.setTweakAuthor(authors);
 		return tweak;

diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/Crash.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/Crash.java
@@ -1,14 +1,14 @@
 package xyz.violaflower.legacy_tweaks.tweaks.impl;
 
+import net.minecraft.network.chat.Component;
 import xyz.violaflower.legacy_tweaks.tweaks.Tweak;
 
 import sun.misc.Unsafe;
 import java.lang.reflect.Field;
 
 public class Crash extends Tweak {
     public Crash() {
-        setTweakID("Crash");
-        setTweakDescription("You should enable this ;)");
+        setTweakID("crash");
         setTweakAuthor("Jeremiah");
         setEnabled(false);
     }

diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/EyeCandy.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/EyeCandy.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
 import xyz.violaflower.legacy_tweaks.tweaks.Tweak;
 import xyz.violaflower.legacy_tweaks.tweaks.TweakBuilder;
 
@@ -15,17 +16,16 @@ public class EyeCandy extends Tweak {
 	public final Tweak legacyWaterColors;
 
 	public EyeCandy() {
-		setTweakID("Eye Candy");
+		setTweakID("eyeCandy");
 		setGroup();
 		setTweakAuthor("Jab125");
-		setTweakDescription("Various cosmetic changes");
 		addSubTweak(legacyTextShadows = new LegacyTextShadows());
 		addSubTweak(fineTunedUIScale = new FineTunedUIScale());
 		addSubTweak(sunsetColors = new SunsetColors());
 		addSubTweak(models = new Models());
-		addSubTweak(smallerStars = new TweakBuilder("Smaller Stars").description("Makes the stars smaller, like LCE").authors("Permdog99").setDefaultEnabled(true).build());
-		addSubTweak(oldButton = new TweakBuilder("Pre 1.15 button").description("Reverts buttons to their pre 1.15 state").authors("Jab125").setDefaultEnabled(true).build());
-		addSubTweak(legacyWaterColors = new TweakBuilder("Legacy Water Colors").description("앚졸딩도알lk노wn라w소f아v이앋이온텔에잇노왜압에엣호울d베압렏오f뤼잊윙살엗오옷말l독엗잊f앋릳t렙옫요ff텍로운d텝에어f조울세f리엣안위왭엦아웃엡에엣돈t잘에w핱움안s틴깃임봈입레").authors("Jab125", "dexrn").setDefaultEnabled(true).onToggled(() -> {
+		addSubTweak(smallerStars = new TweakBuilder("smallerStars").authors("Permdog99").setDefaultEnabled(true).build());
+		addSubTweak(oldButton = new TweakBuilder("oldButton").authors("Jab125").setDefaultEnabled(true).build());
+		addSubTweak(legacyWaterColors = new TweakBuilder("legacyWaterColors").authors("Jab125", "dexrn").setDefaultEnabled(true).onToggled(() -> {
 			//noinspection ConstantValue
 			if (Minecraft.getInstance().levelRenderer != null) {
 				Minecraft.getInstance().levelRenderer.allChanged();
@@ -35,19 +35,17 @@ public EyeCandy() {
 	public static class LegacyTextShadows extends Tweak {
 		public final IntSliderOption shadowOffset;
 		public LegacyTextShadows() {
-			setTweakID("Legacy Text Shadows");
+			setTweakID("legacyTextShadows");
 			setTweakAuthor("Jab125");
-			setTweakDescription("Makes shadows consistent with the screen's actual size, not the scaled size.");
 			shadowOffset = addSliderOption("shadowOffset", 0, 10);
 			shadowOffset.set(1);
 		}
 	}
 	public static class FineTunedUIScale extends Tweak {
 		public final DoubleSliderOption uiScale;
 		public FineTunedUIScale() {
-			setTweakID("Fine Tuned UI Scale");
+			setTweakID("fineTunedUIScale");
 			setTweakAuthor("Jab125");
-			setTweakDescription(ChatFormatting.RED + "Don't use this unless you know what you're doing!");
 			setEnabled(false, false);
 			uiScale = addSliderOption("uiScale", 0.8D, 5D);
 			uiScale.set(1d);
@@ -64,9 +62,8 @@ public static class SunsetColors extends Tweak {
 		public final IntSliderOption sunsetColors; // TODO change to Enum
 
 		public SunsetColors() {
-			setTweakID("Sunset Colors");
+			setTweakID("sunsetColors");
 			setTweakAuthor("Permdog99");
-			setTweakDescription("[Currently TU5 does nothing] Sunset & sunrise colors, based on Xbox 360 LCE update version.");
 
 			sunsetColors = addSliderOption("sunsetColors", 1, 3);
 			sunsetColors.set(3);
@@ -78,12 +75,11 @@ public static class Models extends Tweak {
 		public final Tweak legacyFireworkModel;
 
 		public Models() {
-			setTweakID("Models");
+			setTweakID("models");
 			setTweakAuthor("Permdog99");
-			setTweakDescription("Legacy-styled models for entities and other objects.");
 
-			addSubTweak(legacyWitchHat = new TweakBuilder("Legacy Witch Hat").description("Legacy-styled witch hat.").authors("Permdog99, Legacy4J 1.7.5-beta").setDefaultEnabled(false).build());
-			addSubTweak(legacyFireworkModel = new TweakBuilder("Legacy Firework").description("Legacy-styled firework model").authors("Permdog99, Legacy4J 1.7.5-beta").setDefaultEnabled(true).build());
+			addSubTweak(legacyWitchHat = new TweakBuilder("legacyWitchHat").authors("Permdog99, Legacy4J 1.7.5-beta").setDefaultEnabled(false).build());
+			addSubTweak(legacyFireworkModel = new TweakBuilder("legacyFirework").authors("Permdog99, Legacy4J 1.7.5-beta").setDefaultEnabled(true).build());
 		}
 	}
 }
diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/F3Info.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/F3Info.java
@@ -1,15 +1,16 @@
 package xyz.violaflower.legacy_tweaks.tweaks.impl;
 
+import net.minecraft.network.chat.Component;
 import xyz.violaflower.legacy_tweaks.tweaks.Tweak;
 
 public class F3Info extends Tweak {
     public final BooleanOption showEnabledTweaks;
 
     public F3Info() {
-        setTweakID("F3 Info");
+        setTweakID("f3Info");
         setTweakAuthor("DexrnZacAttack", "Jab125");
-        setTweakDescription("Adds LegacyTweaks related info to the F3 debug screen.");
         // localize hopefully
+        // LOCALISED! - S_N00B
         showEnabledTweaks = addBooleanOption("showEnabledTweaks");
     }
 }
diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/FatChat.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/FatChat.java
@@ -1,5 +1,6 @@
 package xyz.violaflower.legacy_tweaks.tweaks.impl;
 
+import net.minecraft.network.chat.Component;
 import xyz.violaflower.legacy_tweaks.tweaks.Tweak;
 
 public class FatChat extends Tweak {
@@ -8,38 +9,35 @@ public class FatChat extends Tweak {
 
     // Dexrn: TODO: Adding a sub tweak breaks top-level settings?
     public FatChat() {
-        setTweakID("Legacy Chat");
+        setTweakID("legacyChat");
         setTweakAuthor("DexrnZacAttack", "Jab125");
-        setTweakDescription("Various tweaks to make the chat look and function like it does in LCE.");
-        messageWidthSpansScreen = addBooleanOption("Legacy Chat Message Width");
-        messageWidthSpansScreen.set(true);
-        legacyMessageHeight = addBooleanOption("Legacy Chat Message Height");
-        legacyMessageHeight.set(true);
         addSubTweak(new DimensionNotification());
         addSubTweak(new NoAdvancementMessage());
+        messageWidthSpansScreen = addBooleanOption("messageWidthSpansScreen");
+        messageWidthSpansScreen.set(true);
+        legacyMessageHeight = addBooleanOption("legacyMessageHeight");
+        legacyMessageHeight.set(true);
     }
 
     public static class DimensionNotification extends Tweak {
         public final BooleanOption leaveMessage;
         public final BooleanOption entranceMessage;
         public DimensionNotification() {
-            setTweakID("Dimension Notifications");
+            setTweakID("dimensionNotifications");
             setTweakAuthor("DexrnZacAttack", "Jab125");
-            setTweakDescription("Sends a message when a player enters/leaves a dimension.");
             setTweakVersion("1.0.0");
             setDefaultEnabled(true);
-            entranceMessage = addBooleanOption("The End Entrance Message");
+            entranceMessage = addBooleanOption("entranceMessage");
             entranceMessage.set(true);
-            leaveMessage = addBooleanOption("The End Leave Message");
+            leaveMessage = addBooleanOption("departureMessage");
             leaveMessage.set(true);
         }
     }
 
     public static class NoAdvancementMessage extends Tweak {
         public NoAdvancementMessage() {
-            setTweakID("No achievement announcement");
+            setTweakID("noAchievementAnnouncement");
             setTweakAuthor("DexrnZacAttack");
-            setTweakDescription("Doesn't send a message when a player gets an achievement.");
             setTweakVersion("1.0.0");
             setDefaultEnabled(false);
         }

diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/Gamma.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/Gamma.java
@@ -1,6 +1,7 @@
 package xyz.violaflower.legacy_tweaks.tweaks.impl;
 
 import net.minecraft.client.renderer.PostChain;
+import net.minecraft.network.chat.Component;
 import xyz.violaflower.legacy_tweaks.tweaks.Tweak;
 
 public class Gamma extends Tweak {

diff --git a/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/LegacyAttack.java b/src/main/java/xyz/violaflower/legacy_tweaks/tweaks/impl/LegacyAttack.java
@@ -1,14 +1,14 @@
 package xyz.violaflower.legacy_tweaks.tweaks.impl;
 
+import net.minecraft.network.chat.Component;
 import xyz.violaflower.legacy_tweaks.tweaks.Tweak;
 import xyz.violaflower.legacy_tweaks.tweaks.TweakManager;
 
 public class LegacyAttack extends Tweak {
     public LegacyAttack() {
-        setTweakID("Legacy Attack");
+        setTweakID("legacyAttack");
         setTweakAuthor("Jab125", "DexrnZacAttack");
         // pls change later
-        setTweakDescription("Various tweaks to fighting.");
         setTweakVersion("1.0.0");
         setDefaultEnabled(false);
         setGroup();
@@ -18,18 +18,16 @@ public LegacyAttack() {
 
     public static class RemoveCooldown extends Tweak {
         public RemoveCooldown() {
-            setTweakID("No Attack Cooldown");
+            setTweakID("noAttackCooldown");
             setTweakAuthor("Jab125");
-            setTweakDescription("Removes attack cooldown from every item, excluding the Mace.");
             setTweakVersion("1.0.0");
             setDefaultEnabled(false);
         }
     }
     public static class LessAxeDamage extends Tweak {
         public LessAxeDamage() {
-            setTweakID("Less Axe Damage");
+            setTweakID("lessAxeDamage");
             setTweakAuthor("Jab125");
-            setTweakDescription("Restores the Axe's damage to its pre-Combat Update (1.9) values.");
             setTweakVersion("1.0.0");
             setDefaultEnabled(false);
         }