Add translations for world config, and ensure all our enum based conf…

…ig values have nice translations for the config GUI

src/additions/resources/META-INF/neoforge.mods.toml

@@ -11,7 +11,7 @@ license="MIT"
     authors="Aidancbrady, Thommy101, Thiakil, pupnewfster, dizzyd"
     credits="unpairedbracket, CyanideX, Ridanisaurus and many others"
     logoFile="logo.png"
-    description='''Additions module for Mekanism, contains things that don't quite fit in the other modules.'''
+    description='''Additions module for Mekanism, contains miscellaneous things that do not thematically fit in the other modules.'''
 
 [[dependencies.mekanismadditions]]
     modId="mekanism"

src/api/java/mekanism/api/MekanismAPI.java

@@ -25,7 +25,7 @@ private MekanismAPI() {
     /**
      * The version of the api classes - may not always match the mod's version
      */
-    public static final String API_VERSION = "10.7.1";
+    public static final String API_VERSION = "10.7.3";
     /**
      * Mekanism's Mod ID
      */

src/api/java/mekanism/api/MekanismAPITags.java

@@ -89,7 +89,7 @@ private Chemicals() {
         /**
          * Chemicals in this tag cannot be inserted into framed blocks
          *
-         * @since 10.7.1
+         * @since 10.7.3
          */
         public static final TagKey<Chemical> FRAMEDBLOCKS_BLACKLISTED = tag("framedblocks_blacklisted");
 

src/api/java/mekanism/api/RelativeSide.java

@@ -6,7 +6,7 @@
 import java.util.function.IntFunction;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.text.APILang;
-import mekanism.api.text.IHasTranslationKey;
+import mekanism.api.text.IHasTranslationKey.IHasEnumNameTranslationKey;
 import mekanism.api.text.ILangEntry;
 import net.minecraft.core.Direction;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -15,7 +15,7 @@
 import net.minecraft.util.StringRepresentable;
 
 @NothingNullByDefault
-public enum RelativeSide implements IHasTranslationKey, StringRepresentable {
+public enum RelativeSide implements IHasEnumNameTranslationKey, StringRepresentable {
     FRONT(APILang.FRONT),
     LEFT(APILang.LEFT),
     RIGHT(APILang.RIGHT),

src/api/java/mekanism/api/Upgrade.java

@@ -12,7 +12,7 @@
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.text.APILang;
 import mekanism.api.text.EnumColor;
-import mekanism.api.text.IHasTranslationKey;
+import mekanism.api.text.IHasTranslationKey.IHasEnumNameTranslationKey;
 import mekanism.api.text.ILangEntry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -25,7 +25,7 @@
 import org.jetbrains.annotations.Nullable;
 
 @NothingNullByDefault
-public enum Upgrade implements IHasTranslationKey, StringRepresentable {
+public enum Upgrade implements IHasEnumNameTranslationKey, StringRepresentable {
     SPEED("speed", APILang.UPGRADE_SPEED, APILang.UPGRADE_SPEED_DESCRIPTION, 8, EnumColor.RED),
     ENERGY("energy", APILang.UPGRADE_ENERGY, APILang.UPGRADE_ENERGY_DESCRIPTION, 8, EnumColor.BRIGHT_GREEN),
     FILTER("filter", APILang.UPGRADE_FILTER, APILang.UPGRADE_FILTER_DESCRIPTION, 1, EnumColor.DARK_AQUA),

src/api/java/mekanism/api/security/SecurityMode.java

@@ -8,7 +8,7 @@
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.text.APILang;
 import mekanism.api.text.EnumColor;
-import mekanism.api.text.IHasTextComponent;
+import mekanism.api.text.IHasTextComponent.IHasEnumNameTextComponent;
 import mekanism.api.text.ILangEntry;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -22,7 +22,7 @@
  * @since 10.2.1
  */
 @NothingNullByDefault
-public enum SecurityMode implements IIncrementalEnum<SecurityMode>, IHasTextComponent, StringRepresentable {
+public enum SecurityMode implements IIncrementalEnum<SecurityMode>, IHasEnumNameTextComponent, StringRepresentable {
     /**
      * Public Security: Everyone is allowed access.
      */

src/api/java/mekanism/api/text/IHasTextComponent.java

@@ -2,6 +2,8 @@
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.network.chat.Component;
+import net.neoforged.neoforge.common.TranslatableEnum;
+import org.jetbrains.annotations.NotNull;
 
 @MethodsReturnNonnullByDefault
 public interface IHasTextComponent {
@@ -14,4 +16,17 @@ public interface IHasTextComponent {
      * Gets the text component that represents this object.
      */
     Component getTextComponent();
+
+    /**
+     * Helper interface that also implements Neo's TranslatableEnum interface
+     * @since 10.7.3
+     */
+    interface IHasEnumNameTextComponent extends IHasTextComponent, TranslatableEnum {
+
+        @NotNull
+        @Override
+        default Component getTranslatedName() {
+            return getTextComponent();
+        }
+    }
 }

src/api/java/mekanism/api/text/IHasTranslationKey.java

@@ -1,6 +1,9 @@
 package mekanism.api.text;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.network.chat.Component;
+import net.neoforged.neoforge.common.TranslatableEnum;
+import org.jetbrains.annotations.NotNull;
 
 @MethodsReturnNonnullByDefault
 public interface IHasTranslationKey {
@@ -9,4 +12,17 @@ public interface IHasTranslationKey {
      * Gets the translation key for this object.
      */
     String getTranslationKey();
+
+    /**
+     * Helper interface that also implements Neo's TranslatableEnum interface
+     * @since 10.7.3
+     */
+    interface IHasEnumNameTranslationKey extends IHasTranslationKey, TranslatableEnum {
+
+        @NotNull
+        @Override
+        default Component getTranslatedName() {
+            return TextComponentUtil.translate(getTranslationKey());
+        }
+    }
 }

src/api/java/mekanism/api/text/TextComponentUtil.java

@@ -18,6 +18,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Fluid;
+import net.neoforged.neoforge.common.TranslatableEnum;
 import net.neoforged.neoforge.fluids.FluidStack;
 
 public class TextComponentUtil {

src/datagen/additions/java/mekanism/additions/client/AdditionsLangProvider.java

@@ -128,7 +128,7 @@ private void addAdvancements() {
     }
 
     private void addMisc() {
-        addModInfo("Additions module for Mekanism, contains things that don't quite fit in the other modules");
+        addModInfo("Additions module for Mekanism, contains miscellaneous things that do not thematically fit in the other modules");
         addPackData(AdditionsLang.MEKANISM_ADDITIONS, AdditionsLang.PACK_DESCRIPTION);
         add(AdditionsLang.CHANNEL, "Channel: %1$s");
         add(AdditionsLang.CHANNEL_CHANGE, "Channel changed to: %1$s");