Widen some explicit uses of ILangEntry implementations to accepting ILangEntry in general

Author: pupnewfster

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

@@ -12,6 +12,7 @@
 import mekanism.api.text.APILang;
 import mekanism.api.text.EnumColor;
 import mekanism.api.text.IHasTranslationKey;
+import mekanism.api.text.ILangEntry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
@@ -52,12 +53,12 @@ public enum Upgrade implements IHasTranslationKey, StringRepresentable {
     public static final StreamCodec<ByteBuf, Upgrade> STREAM_CODEC = ByteBufCodecs.idMapper(BY_ID, Upgrade::ordinal);
 
     private final String name;
-    private final APILang langKey;
-    private final APILang descLangKey;
+    private final ILangEntry langKey;
+    private final ILangEntry descLangKey;
     private final int maxStack;
     private final EnumColor color;
 
-    Upgrade(String name, APILang langKey, APILang descLangKey, int maxStack, EnumColor color) {
+    Upgrade(String name, ILangEntry langKey, ILangEntry descLangKey, int maxStack, EnumColor color) {
         this.name = name;
         this.langKey = langKey;
         this.descLangKey = descLangKey;

src/api/java/mekanism/api/text/EnumColor.java

@@ -75,18 +75,18 @@ public enum EnumColor implements IIncrementalEnum<EnumColor>, SupportsColorMap,
 
     private int[] rgbCode;
     private TextColor color;
-    private final APILang langEntry;
+    private final ILangEntry langEntry;
     private final String englishName;
     private final String registryPrefix;
     @Nullable
     private final DyeColor dyeColor;
     private final MapColor mapColor;
 
-    EnumColor(String s, APILang langEntry, String englishName, String registryPrefix, int[] rgbCode, DyeColor dyeColor) {
+    EnumColor(String s, ILangEntry langEntry, String englishName, String registryPrefix, int[] rgbCode, DyeColor dyeColor) {
         this(s, langEntry, englishName, registryPrefix, rgbCode, dyeColor.getMapColor(), dyeColor);
     }
 
-    EnumColor(String code, APILang langEntry, String englishName, String registryPrefix, int[] rgbCode, MapColor mapColor, @Nullable DyeColor dyeColor) {
+    EnumColor(String code, ILangEntry langEntry, String englishName, String registryPrefix, int[] rgbCode, MapColor mapColor, @Nullable DyeColor dyeColor) {
         this.code = code;
         this.langEntry = langEntry;
         this.englishName = englishName;
@@ -146,7 +146,7 @@ public MutableComponent getName() {
     /**
      * @apiNote For use by the data generators.
      */
-    public APILang getLangEntry() {
+    public ILangEntry getLangEntry() {
         return langEntry;
     }
 

src/main/java/mekanism/common/MekanismLang.java

@@ -878,7 +878,7 @@ public String getTranslationKey() {
         return key;
     }
 
-    public static MekanismLang get(EquipmentSlot type) {
+    public static ILangEntry get(EquipmentSlot type) {
         return switch (type) {
             case HEAD -> HEAD;
             case CHEST, BODY -> BODY;

src/main/java/mekanism/common/content/blocktype/FactoryType.java

@@ -4,6 +4,7 @@
 import java.util.function.Supplier;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.text.IHasTranslationKey;
+import mekanism.api.text.ILangEntry;
 import mekanism.common.MekanismLang;
 import mekanism.common.content.blocktype.Machine.FactoryMachine;
 import mekanism.common.registration.impl.BlockRegistryObject;
@@ -23,11 +24,11 @@ public enum FactoryType implements IHasTranslationKey {
     SAWING("sawing", MekanismLang.SAWING, () -> MekanismBlockTypes.PRECISION_SAWMILL, () -> MekanismBlocks.PRECISION_SAWMILL);
 
     private final String registryNameComponent;
-    private final MekanismLang langEntry;
+    private final ILangEntry langEntry;
     private final Supplier<FactoryMachine<?>> baseMachine;
     private final Supplier<BlockRegistryObject<?, ?>> baseBlock;
 
-    FactoryType(String registryNameComponent, MekanismLang langEntry, Supplier<FactoryMachine<?>> baseMachine, Supplier<BlockRegistryObject<?, ?>> baseBlock) {
+    FactoryType(String registryNameComponent, ILangEntry langEntry, Supplier<FactoryMachine<?>> baseMachine, Supplier<BlockRegistryObject<?, ?>> baseBlock) {
         this.registryNameComponent = registryNameComponent;
         this.langEntry = langEntry;
         this.baseMachine = baseMachine;

src/main/java/mekanism/common/content/blocktype/Machine.java

@@ -1,8 +1,7 @@
 package mekanism.common.content.blocktype;
 
 import java.util.function.Supplier;
-import mekanism.api.Upgrade;
-import mekanism.common.MekanismLang;
+import mekanism.api.text.ILangEntry;
 import mekanism.common.block.attribute.AttributeFactoryType;
 import mekanism.common.block.attribute.AttributeParticleFX;
 import mekanism.common.block.attribute.AttributeStateFacing;
@@ -19,7 +18,7 @@
 
 public class Machine<TILE extends TileEntityMekanism> extends BlockTypeTile<TILE> {
 
-    public Machine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar, MekanismLang description) {
+    public Machine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar, ILangEntry description) {
         super(tileEntityRegistrar, description);
         // add default particle effects
         add(new AttributeParticleFX()
@@ -31,7 +30,7 @@ public Machine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
 
     public static class FactoryMachine<TILE extends TileEntityMekanism> extends Machine<TILE> {
 
-        public FactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntitySupplier, MekanismLang description, FactoryType factoryType) {
+        public FactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntitySupplier, ILangEntry description, FactoryType factoryType) {
             super(tileEntitySupplier, description);
             add(new AttributeFactoryType(factoryType), new AttributeUpgradeable(() -> MekanismBlocks.getFactory(FactoryTier.BASIC, getFactoryType())));
         }
@@ -47,12 +46,13 @@ protected MachineBuilder(MACHINE holder) {
             super(holder);
         }
 
-        public static <TILE extends TileEntityMekanism> MachineBuilder<Machine<TILE>, TILE, ?> createMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar, MekanismLang description) {
+        public static <TILE extends TileEntityMekanism> MachineBuilder<Machine<TILE>, TILE, ?> createMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
+              ILangEntry description) {
             return new MachineBuilder<>(new Machine<>(tileEntityRegistrar, description));
         }
 
         public static <TILE extends TileEntityMekanism> MachineBuilder<FactoryMachine<TILE>, TILE, ?> createFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
-              MekanismLang description, FactoryType factoryType) {
+              ILangEntry description, FactoryType factoryType) {
             return new MachineBuilder<>(new FactoryMachine<>(tileEntityRegistrar, description, factoryType));
         }
     }

src/main/java/mekanism/common/registration/impl/SoundEventRegistryObject.java

@@ -1,14 +1,14 @@
 package mekanism.common.registration.impl;
 
 import mekanism.api.annotations.NothingNullByDefault;
-import mekanism.api.text.ILangEntry;
+import mekanism.api.text.IHasTranslationKey;
 import mekanism.common.registration.MekanismDeferredHolder;
 import net.minecraft.Util;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.sounds.SoundEvent;
 
 @NothingNullByDefault
-public class SoundEventRegistryObject<SOUND extends SoundEvent> extends MekanismDeferredHolder<SoundEvent, SOUND> implements ILangEntry {
+public class SoundEventRegistryObject<SOUND extends SoundEvent> extends MekanismDeferredHolder<SoundEvent, SOUND> implements IHasTranslationKey {
 
     private final String translationKey;