applied I18Wrapper

MrTroble · Sep 28, 2023 · 37f2129 · 37f2129
1 parent 748dd0a
commit 37f2129
Show file tree

Hide file tree

Showing 9 changed files with 209 additions and 186 deletions.
diff --git a/guilib b/guilib
diff --git a/src/main/java/com/troblecodings/signals/SEProperty.java b/src/main/java/com/troblecodings/signals/SEProperty.java
@@ -7,12 +7,12 @@
 import java.util.function.Predicate;
 
 import com.google.common.collect.ImmutableList;
+import com.troblecodings.core.I18Wrapper;
 import com.troblecodings.core.NBTWrapper;
 import com.troblecodings.guilib.ecs.interfaces.IIntegerable;
 import com.troblecodings.signals.core.JsonEnum;
 import com.troblecodings.signals.enums.ChangeableStage;
 
-import net.minecraft.client.resources.language.I18n;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.model.data.IModelData;
@@ -141,7 +141,8 @@ public SEAutoNameProp(final String name, final JsonEnum parent, final String def
         @OnlyIn(Dist.CLIENT)
         @Override
         public String getNamedObj(final int obj) {
-            return I18n.get("property." + this.getName() + ".name") + ": " + getObjFromID(obj);
+            return I18Wrapper.format("property." + this.getName() + ".name") + ": "
+                    + getObjFromID(obj);
         }
     }
 }
diff --git a/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java b/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java
@@ -8,6 +8,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import com.troblecodings.core.I18Wrapper;
 import com.troblecodings.core.ReadBuffer;
 import com.troblecodings.core.WriteBuffer;
 import com.troblecodings.guilib.ecs.ContainerBase;
@@ -29,7 +30,6 @@
 import com.troblecodings.signals.signalbox.entrys.PathEntryType;
 import com.troblecodings.signals.signalbox.entrys.PathOptionEntry;
 
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.Rotation;
@@ -119,11 +119,11 @@ public void deserializeClient(final ReadBuffer buffer) {
                 break;
             }
             case NO_PW_FOUND: {
-                infoUpdates.accept(I18n.get("error.nopathfound"));
+                infoUpdates.accept(I18Wrapper.format("error.nopathfound"));
                 break;
             }
             case NO_OUTPUT_UPDATE: {
-                infoUpdates.accept(I18n.get("error.nooutputupdate"));
+                infoUpdates.accept(I18Wrapper.format("error.nooutputupdate"));
                 break;
             }
             case OUTPUT_UPDATE: {

diff --git a/src/main/java/com/troblecodings/signals/guis/GuiPlacementtool.java b/src/main/java/com/troblecodings/signals/guis/GuiPlacementtool.java
@@ -5,6 +5,7 @@
 import java.util.function.IntConsumer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.troblecodings.core.I18Wrapper;
 import com.troblecodings.core.NBTWrapper;
 import com.troblecodings.core.WriteBuffer;
 import com.troblecodings.guilib.ecs.GuiBase;
@@ -24,7 +25,6 @@
 import com.troblecodings.signals.enums.ChangeableStage;
 import com.troblecodings.signals.items.Placementtool;
 
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -101,7 +101,7 @@ private void initInternal() {
         lowerEntity.setInheritHeight(true);
         lowerEntity.setInheritWidth(true);
 
-        final UILabel titlelabel = new UILabel(I18n.get("property.signal.name"));
+        final UILabel titlelabel = new UILabel(I18Wrapper.format("property.signal.name"));
         titlelabel.setCenterX(false);
 
         final UIEntity titel = new UIEntity();
@@ -150,7 +150,7 @@ public void updateFromContainer() {
         textfield.setInheritWidth(true);
         if (currentSelectedBlock.canHaveCustomname(new HashMap<>())) {
             final UITextInput name = new UITextInput(container.signalName);
-            textfield.add(new UIToolTip(I18n.get("property.customname.desc")));
+            textfield.add(new UIToolTip(I18Wrapper.format("property.customname.desc")));
             name.setOnTextUpdate(this::sendName);
             textfield.add(name);
             list.add(textfield);

diff --git a/src/main/java/com/troblecodings/signals/guis/GuiSignalBox.java b/src/main/java/com/troblecodings/signals/guis/GuiSignalBox.java
diff --git a/src/main/java/com/troblecodings/signals/guis/GuiSignalController.java b/src/main/java/com/troblecodings/signals/guis/GuiSignalController.java
@@ -5,10 +5,11 @@
 import java.util.List;
 import java.util.Map;
 
+import com.troblecodings.core.I18Wrapper;
+import com.troblecodings.core.WriteBuffer;
 import com.troblecodings.guilib.ecs.DrawUtil.DisableIntegerable;
 import com.troblecodings.guilib.ecs.DrawUtil.EnumIntegerable;
 import com.troblecodings.guilib.ecs.DrawUtil.SizeIntegerables;
-import com.troblecodings.core.WriteBuffer;
 import com.troblecodings.guilib.ecs.GuiBase;
 import com.troblecodings.guilib.ecs.GuiElements;
 import com.troblecodings.guilib.ecs.GuiInfo;
@@ -37,7 +38,6 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.player.Player;
@@ -228,7 +228,7 @@ private void addRSInputMode() {
                 SizeIntegerables.of("profile", 32, in -> String.valueOf(in)));
         lowerEntity.add(GuiElements.createEnumElement(profile, e -> sendRSInputProfileToServer(e),
                 controller.linkedRSInputProfile));
-        lowerEntity.add(GuiElements.createButton(I18n.get("gui.unlink"), e -> {
+        lowerEntity.add(GuiElements.createButton(I18Wrapper.format("gui.unlink"), e -> {
             unlinkInputPos();
             label.setText("Linked To: not linked");
         }));
@@ -244,7 +244,7 @@ private void initInternal() {
         }
         lowerEntity.setInherits(true);
 
-        final String name = I18n.get("tile." + signal.delegate.name().getPath() + ".name")
+        final String name = I18Wrapper.format("tile." + signal.delegate.name().getPath() + ".name")
                 + "; Name: "
                 + ClientNameHandler.getClientName(new NameStateInfo(mc.level, controller.getPos()));
 

diff --git a/src/main/java/com/troblecodings/signals/guis/NamableGui.java b/src/main/java/com/troblecodings/signals/guis/NamableGui.java
@@ -1,5 +1,6 @@
 package com.troblecodings.signals.guis;
 
+import com.troblecodings.core.I18Wrapper;
 import com.troblecodings.core.WriteBuffer;
 import com.troblecodings.guilib.ecs.GuiBase;
 import com.troblecodings.guilib.ecs.GuiElements;
@@ -15,7 +16,6 @@
 import com.troblecodings.signals.init.OSBlocks;
 import com.troblecodings.signals.tileentitys.RedstoneIOTileEntity;
 
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.world.entity.player.Player;
 
 public class NamableGui extends GuiBase {
@@ -62,10 +62,10 @@ private void initOwn() {
 
         final UITextInput input = new UITextInput(container.tile.getNameWrapper());
         textfield.add(input);
-        textfield.add(new UIToolTip(I18n.get("property.customname.desc")));
+        textfield.add(new UIToolTip(I18Wrapper.format("property.customname.desc")));
 
         hbox.add(textfield);
-        final UIEntity apply = GuiElements.createButton(I18n.get("btn.apply"),
+        final UIEntity apply = GuiElements.createButton(I18Wrapper.format("btn.apply"),
                 _u -> this.updateText(input.getText()));
         apply.setInheritWidth(false);
         apply.setWidth(60);
@@ -74,7 +74,7 @@ private void initOwn() {
         if (!(container.tile instanceof RedstoneIOTileEntity)) {
             return;
         }
-        inner.add(GuiElements.createLabel(I18n.get("label.linkedto")));
+        inner.add(GuiElements.createLabel(I18Wrapper.format("label.linkedto")));
         final UIEntity list = new UIEntity();
         list.setInheritHeight(true);
         list.setInheritWidth(true);
+2 −2		src/com/troblecodings/guilib/ecs/DrawUtil.java
+2 −2		src/com/troblecodings/guilib/ecs/entitys/render/UIToolTip.java
+5 −4		src/com/troblecodings/guilib/ecs/interfaces/IIntegerable.java