From ad7f7b95550d8a27cc5cddc8c419898d8d836713 Mon Sep 17 00:00:00 2001
From: iouter <62897714+iouter@users.noreply.github.com>
Date: Sat, 1 Oct 2022 16:52:15 +0800
Subject: no-more-duplicate-key (#1424)

---
 src/main/java/gregtech/common/covers/GT_Cover_Arm.java            | 2 +-
 src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java     | 8 ++++----
 src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java | 2 +-
 src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java     | 8 ++++----
 src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java | 8 ++++----
 src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java   | 2 +-
 src/main/java/gregtech/common/power/Power.java                    | 2 +-
 src/main/java/gregtech/common/power/UnspecifiedEUPower.java       | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/main/java/gregtech/common')

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
index 7d824565cb..fb556989c1 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
@@ -359,7 +359,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
 
             this.getFontRenderer()
                     .drawString(
-                            GT_Utility.trans("254", "Internal slot#"),
+                            GT_Utility.trans("254.1", "Internal slot#"),
                             startX + spaceX * 3,
                             4 + startY + spaceY * 1,
                             textColor);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
index 1332fa66c6..8c52ade5d2 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
@@ -64,10 +64,10 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
         aCoverVariable.mFlags = ((aCoverVariable.mFlags + 1) & 15);
         GT_Utility.sendChatToPlayer(
                 aPlayer,
-                ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128", "Redstone ") : "")
-                        + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129", "Energy ") : "")
-                        + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130", "Fluids ") : "")
-                        + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131", "Items ") : ""));
+                ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "")
+                        + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "")
+                        + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "")
+                        + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : ""));
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
index fa20d8206e..2d6fc685c3 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -461,7 +461,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
                             textColor);
             this.getFontRenderer()
                     .drawString(
-                            GT_Utility.trans("229", "Conditional"),
+                            GT_Utility.trans("230", "Conditional"),
                             startX + spaceX * 4,
                             4 + startY + spaceY * 1,
                             textColor);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
index aee762f36c..2fa545d76d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
@@ -130,8 +130,8 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
         GT_Utility.sendChatToPlayer(
                 aPlayer,
                 aCoverVariable.mWhitelist
-                        ? GT_Utility.trans("125", "Whitelist Mode")
-                        : GT_Utility.trans("124", "Blacklist Mode"));
+                        ? GT_Utility.trans("125.1", "Whitelist Mode")
+                        : GT_Utility.trans("124.1", "Blacklist Mode"));
         return aCoverVariable;
     }
 
@@ -290,8 +290,8 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
                     startY + spaceY * 0,
                     GT_GuiIcon.WHITELIST,
                     GT_GuiIcon.BLACKLIST,
-                    GT_Utility.trans("125", "Whitelist Mode"),
-                    GT_Utility.trans("124", "Blacklist Mode"));
+                    GT_Utility.trans("125.1", "Whitelist Mode"),
+                    GT_Utility.trans("124.1", "Blacklist Mode"));
 
             itemFilterButtons =
                     new GT_GuiFakeItemButton(this, startX + spaceX * 0, startY + spaceY * 2, GT_GuiIcon.SLOT_GRAY);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
index 338a214ada..a77119b413 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
@@ -97,10 +97,10 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
         }
         switch (aCoverVariable) {
             case 0:
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068", "Emit if any Player is close"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close"));
                 break;
             case 1:
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069", "Emit if other Player is close"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close"));
                 break;
             case 2:
                 GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close"));
@@ -181,9 +181,9 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
             this.coverVariable = aCoverVariable;
 
             new GT_GuiIconCheckButton(this, 0, startX + spaceX * 0, startY + spaceY * 0, GT_GuiIcon.CHECKMARK, null)
-                    .setTooltipText(GT_Utility.trans("068", "Emit if any Player is close"));
+                    .setTooltipText(GT_Utility.trans("068.1", "Emit if any Player is close"));
             new GT_GuiIconCheckButton(this, 1, startX + spaceX * 0, startY + spaceY * 1, GT_GuiIcon.CHECKMARK, null)
-                    .setTooltipText(GT_Utility.trans("069", "Emit if other Player is close"));
+                    .setTooltipText(GT_Utility.trans("069.1", "Emit if other Player is close"));
             new GT_GuiIconCheckButton(this, 2, startX + spaceX * 0, startY + spaceY * 2, GT_GuiIcon.CHECKMARK, null)
                     .setTooltipText(GT_Utility.trans("070", "Emit if you are close"));
         }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
index 135c20dafe..e42e145eb3 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
@@ -36,7 +36,7 @@ public class GT_Container_OutputHatch extends GT_Container_BasicTank {
             if (tReadyLockFluid == null
                     || (tMode >= 8 && tReadyLockFluid.getFluid().getName().equals(tHatch.getLockedFluidName()))) {
                 tHatch.setLockedFluidName(null);
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("300", "Fluid Lock Cleared."));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("300.1", "Fluid Lock Cleared."));
                 tHatch.lockFluid(false);
             } else {
                 tHatch.setLockedFluidName(tReadyLockFluid.getFluid().getName());
diff --git a/src/main/java/gregtech/common/power/Power.java b/src/main/java/gregtech/common/power/Power.java
index eac33e7997..9ce749801d 100644
--- a/src/main/java/gregtech/common/power/Power.java
+++ b/src/main/java/gregtech/common/power/Power.java
@@ -39,7 +39,7 @@ public abstract class Power {
     }
 
     public String getDurationStringTicks() {
-        return GT_Utility.formatNumbers(getDurationTicks()) + GT_Utility.trans("224", " ticks");
+        return GT_Utility.formatNumbers(getDurationTicks()) + GT_Utility.trans("209", " ticks");
     }
 
     public abstract String getTotalPowerString();
diff --git a/src/main/java/gregtech/common/power/UnspecifiedEUPower.java b/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
index c2e3615ad1..5ac85adfee 100644
--- a/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
+++ b/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
@@ -3,8 +3,8 @@ package gregtech.common.power;
 import gregtech.api.util.GT_Utility;
 
 public class UnspecifiedEUPower extends EUPower {
-    private final String VOLTAGE = GT_Utility.trans("156", "unspecified");
-    private final String AMPERAGE = GT_Utility.trans("157", "unspecified");
+    private final String VOLTAGE = GT_Utility.trans("271", "unspecified");
+    private final String AMPERAGE = GT_Utility.trans("271", "unspecified");
 
     public UnspecifiedEUPower(byte tier, int amperage) {
         super(tier, amperage);
-- 
cgit