No more duplicated key II (#1457)

* no more duplicated key II

* spotlessApply

7 files changed, 30 insertions, 18 deletions

diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java
index 382ccf3d8f..1d6d794542 100644
--- a/src/main/java/gregtech/api/util/GT_LanguageManager.java
+++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java
@@ -371,7 +371,7 @@ public class GT_LanguageManager {
                 "Interaction_DESCRIPTION_Index_207", "Pump speed: %dL every %d ticks, %.2f L/sec on average");
         addStringLocalization("Interaction_DESCRIPTION_Index_208", " L");
         addStringLocalization("Interaction_DESCRIPTION_Index_209", " ticks");
-        addStringLocalization("Interaction_DESCRIPTION_Index_209.1", " ticks");
+        addStringLocalization("Interaction_DESCRIPTION_Index_209.1", " tick");
         addStringLocalization("Interaction_DESCRIPTION_Index_210", "Average: %.2f L/sec");
         addStringLocalization("Interaction_DESCRIPTION_Index_211", "Items per side: ");
         addStringLocalization("Interaction_DESCRIPTION_Index_212", "Input enabled");
@@ -417,6 +417,7 @@ public class GT_LanguageManager {
         addStringLocalization("Interaction_DESCRIPTION_Index_252", "Rotor < 80%");
         addStringLocalization("Interaction_DESCRIPTION_Index_253", "Rotor < 100%");
         addStringLocalization("Interaction_DESCRIPTION_Index_254", "Detect slot#");
+        addStringLocalization("Interaction_DESCRIPTION_Index_254.0", "Detect Slot");
         addStringLocalization("Interaction_DESCRIPTION_Index_254.1", "Internal slot#");
         addStringLocalization("Interaction_DESCRIPTION_Index_255", "Adjacent slot#");
         addStringLocalization("Interaction_DESCRIPTION_Index_256", "Universal Storage");
@@ -473,6 +474,11 @@ public class GT_LanguageManager {
         addStringLocalization("Interaction_DESCRIPTION_Index_328", "Channel");
         addStringLocalization("Interaction_DESCRIPTION_Index_329", "Public/Private");
         addStringLocalization("Interaction_DESCRIPTION_Index_330", "Sneak Rightclick to switch Mode");
+        addStringLocalization("Interaction_DESCRIPTION_Index_331", "AND Gate");
+        addStringLocalization("Interaction_DESCRIPTION_Index_332", "NAND Gate");
+        addStringLocalization("Interaction_DESCRIPTION_Index_333", "OR Gate");
+        addStringLocalization("Interaction_DESCRIPTION_Index_334", "NOR Gate");
+        addStringLocalization("Interaction_DESCRIPTION_Index_335", "Gate Mode");
         addStringLocalization("Interaction_DESCRIPTION_Index_500", "Fitting: Loose - More Flow");
         addStringLocalization("Interaction_DESCRIPTION_Index_501", "Fitting: Tight - More Efficiency");
         addStringLocalization("Interaction_DESCRIPTION_Index_502", "Mining chunk loading enabled");
@@ -480,7 +486,7 @@ public class GT_LanguageManager {
         addStringLocalization("Interaction_DESCRIPTION_Index_505", "Enable with Signal (Safe)");
         addStringLocalization("Interaction_DESCRIPTION_Index_506", "Disable with Signal (Safe)");
         addStringLocalization("Interaction_DESCRIPTION_Index_507", "Safe Mode");
-        addStringLocalization("Interaction_DESCRIPTION_Index_601", "Use Private Frequency");
+        addStringLocalization("Interaction_DESCRIPTION_Index_602", "Use Private Frequency");
         addStringLocalization("Interaction_DESCRIPTION_Index_756", "Connectable: ");
         addStringLocalization("Interaction_DESCRIPTION_Index_ALL", "All");
         addStringLocalization("Interaction_DESCRIPTION_Index_ANY", "Any");
@@ -494,9 +500,9 @@ public class GT_LanguageManager {
         addStringLocalization("Item_DESCRIPTION_Index_003", "Attack Damage: %s");
         addStringLocalization("Item_DESCRIPTION_Index_004", "Mining Speed: %s");
         addStringLocalization("Item_DESCRIPTION_Index_005", "Turbine Efficiency: %s");
-        addStringLocalization("Item_DESCRIPTION_Index_006", "Optimal Steam flow: %sL/sec");
-        addStringLocalization("Item_DESCRIPTION_Index_007", "Optimal Gas flow(EU burnvalue per tick): %sEU/t");
-        addStringLocalization("Item_DESCRIPTION_Index_008", "Optimal Plasma flow(Plasma energyvalue per tick): %sEU/t");
+        addStringLocalization("Item_DESCRIPTION_Index_006", "Optimal Steam flow: %s L/t");
+        addStringLocalization("Item_DESCRIPTION_Index_007", "Energy from Optimal Gas Flow: %s EU/t");
+        addStringLocalization("Item_DESCRIPTION_Index_008", "Energy from Optimal Plasma Flow: %s EU/t");
         addStringLocalization("Item_DESCRIPTION_Index_009", "Contains %s EU   Tier: %s");
         addStringLocalization("Item_DESCRIPTION_Index_010", "Empty. You should recycle it properly.");
         addStringLocalization("Item_DESCRIPTION_Index_011", "%s / %s EU - Voltage: %s");
@@ -504,11 +510,15 @@ public class GT_LanguageManager {
         addStringLocalization("Item_DESCRIPTION_Index_013", "%sL / %sL");
         addStringLocalization("Item_DESCRIPTION_Index_014", "Missing Coodinates!");
         addStringLocalization("Item_DESCRIPTION_Index_015", "Device at:");
-        addStringLocalization("Item_DESCRIPTION_Index_016", "Amount: %s L");
-        addStringLocalization("Item_DESCRIPTION_Index_017", "Temperature: %s K");
         addStringLocalization("Item_DESCRIPTION_Index_018", "State: %s");
+        addStringLocalization("Item_DESCRIPTION_Index_019", "Bath with neutron in a hot reactor");
+        addStringLocalization("Item_DESCRIPTION_Index_020", "Progress: %s/%s");
+        addStringLocalization("Item_DESCRIPTION_Index_021", "Radiation Hazard");
         addStringLocalization("Item_DESCRIPTION_Index_500", "Turbine Efficiency (Loose): %s");
         addStringLocalization("Item_DESCRIPTION_Index_501", "Optimal Steam flow (Loose): %s L/t");
+        addStringLocalization("Item_DESCRIPTION_Index_502", "Overflow Efficiency Tier: %s");
+        addStringLocalization("Item_DESCRIPTION_Index_900", "Energy from Optimal Steam Flow: %s EU/t");
+        addStringLocalization("Item_DESCRIPTION_Index_901", "Energy from Optimal Steam Flow (Loose): %s EU/t");
 
         addStringLocalization(FACE_ANY, "Any Side");
         addStringLocalization(FACE_BOTTOM, "Bottom");
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
index a024400094..f69050da14 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
@@ -230,7 +230,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
                             textColor);
             this.getFontRenderer()
                     .drawString(
-                            GT_Utility.trans("601", "Use Private Frequency"),
+                            GT_Utility.trans("602", "Use Private Frequency"),
                             startX + spaceX * 1,
                             startY + spaceY * 2 + 4,
                             textColor);
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
index 233be511a3..d3bf278a94 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
@@ -124,28 +124,28 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
                             startX + spaceX * 0,
                             startY + spaceY * 2,
                             GT_GuiIcon.AND_GATE)
-                    .setTooltipText(GT_Utility.trans("006", "AND Gate"));
+                    .setTooltipText(GT_Utility.trans("331", "AND Gate"));
             new GT_GuiIconButton(
                             this,
                             gateModeButtonIdStart + 1,
                             startX + spaceX * 1,
                             startY + spaceY * 2,
                             GT_GuiIcon.NAND_GATE)
-                    .setTooltipText(GT_Utility.trans("006", "NAND Gate"));
+                    .setTooltipText(GT_Utility.trans("332", "NAND Gate"));
             new GT_GuiIconButton(
                             this,
                             gateModeButtonIdStart + 2,
                             startX + spaceX * 2,
                             startY + spaceY * 2,
                             GT_GuiIcon.OR_GATE)
-                    .setTooltipText(GT_Utility.trans("006", "OR Gate"));
+                    .setTooltipText(GT_Utility.trans("333", "OR Gate"));
             new GT_GuiIconButton(
                             this,
                             gateModeButtonIdStart + 3,
                             startX + spaceX * 3,
                             startY + spaceY * 2,
                             GT_GuiIcon.NOR_GATE)
-                    .setTooltipText(GT_Utility.trans("006", "NOR Gate"));
+                    .setTooltipText(GT_Utility.trans("334", "NOR Gate"));
             new GT_GuiIconButton(
                             this,
                             gateModeButtonIdStart + 4,
@@ -161,7 +161,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
             super.drawExtras(mouseX, mouseY, parTicks);
             this.getFontRenderer()
                     .drawString(
-                            GT_Utility.trans("601", "Gate Mode"),
+                            GT_Utility.trans("335", "Gate Mode"),
                             startX + spaceX * 5,
                             4 + startY + spaceY * 2,
                             textColor);
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
index 07592a00dc..2af243861a 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
@@ -55,7 +55,9 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<
             float aY,
             float aZ) {
         aCoverVariable.invert = !aCoverVariable.invert;
-        GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("055", aCoverVariable.invert ? "Inverted" : "Normal"));
+        GT_Utility.sendChatToPlayer(
+                aPlayer,
+                aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal"));
 
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
index a3f37e5f28..a57b99fd83 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
@@ -286,7 +286,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<
                             textColor);
             this.getFontRenderer()
                     .drawString(
-                            GT_Utility.trans("601", "Use Private Frequency"),
+                            GT_Utility.trans("602", "Use Private Frequency"),
                             startX + spaceX * privateExtraColumn,
                             4 + startY + spaceY * buttonRow,
                             textColor);
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
index 2f4e57647d..772332820b 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
@@ -142,7 +142,7 @@ public class GT_Cover_WirelessFluidDetector
         public void drawExtras(int mouseX, int mouseY, float parTicks) {
             super.drawExtras(mouseX, mouseY, parTicks);
             this.getFontRenderer()
-                    .drawString(GT_Utility.trans("222", "Fluid Threshold"), startX + spaceX * 5, 4 + startY, textColor);
+                    .drawString(GT_Utility.trans("222", "Fluid threshold"), startX + spaceX * 5, 4 + startY, textColor);
         }
 
         @Override
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java
index 2e632f5dd2..46e428e1e9 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java
@@ -193,13 +193,13 @@ public class GT_Cover_WirelessItemDetector
             super.drawExtras(mouseX, mouseY, parTicks);
             this.getFontRenderer()
                     .drawString(
-                            GT_Utility.trans("221", "Item Threshold"),
+                            GT_Utility.trans("221", "Item threshold"),
                             startX + spaceX * 5,
                             4 + startY + spaceY * 2,
                             textColor);
             this.getFontRenderer()
                     .drawString(
-                            GT_Utility.trans("254", "Detect Slot"),
+                            GT_Utility.trans("254.0", "Detect Slot"),
                             startX + spaceX * 5,
                             4 + startY + spaceY * 3,
                             textColor);