From 473b00a1e508d061a22a9752aace9a1d756f516b Mon Sep 17 00:00:00 2001 From: iouter <62897714+iouter@users.noreply.github.com> Date: Sat, 1 Oct 2022 16:52:30 +0800 Subject: no-more-duplicate-key (#381) --- .../xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java | 4 ++-- src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java | 4 ++-- .../xmod/gregtech/api/gui/GUI_MultiMachine_Default.java | 4 ++-- .../gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java | 8 ++++---- .../implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java | 2 +- .../xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java index d28e46b1d9..007669c8ba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java @@ -34,7 +34,7 @@ public class GUI_IndustrialCentrifuge extends GT_GUIContainerMetaTile_Machine { this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255); } if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 2) != 0) { - this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255); + this.fontRendererObj.drawString("Screws are loose.", 10, 24, 16448255); } if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 4) != 0) { this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255); @@ -51,7 +51,7 @@ public class GUI_IndustrialCentrifuge extends GT_GUIContainerMetaTile_Machine { if (((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode == 0) { if (((CONTAINER_IndustrialCentrifuge) this.mContainer).mActive == 0) { - this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255); + this.fontRendererObj.drawString("Hit with Soft Mallet", 10, 16, 16448255); this.fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255); this.fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java index 9dc0c8b9e2..7a42ea01cd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java @@ -41,7 +41,7 @@ public class GUI_MatterFab extends GT_GUIContainerMetaTile_Machine { this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255); } if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 2) != 0) { - this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255); + this.fontRendererObj.drawString("Screws are loose.", 10, 24, 16448255); } if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 4) != 0) { this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255); @@ -61,7 +61,7 @@ public class GUI_MatterFab extends GT_GUIContainerMetaTile_Machine { if (((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode == 0) { if (((CONTAINER_MatterFab) this.mContainer).mActive == 0) { - this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255); + this.fontRendererObj.drawString("Hit with Soft Mallet", 10, 16, 16448255); this.fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255); this.fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java index cfc2c10ef5..e8d7a5e096 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java @@ -29,7 +29,7 @@ public class GUI_MultiMachine_Default extends GT_GUIContainerMetaTile_Machine { this.fontRendererObj.drawString(this.trans("132", "Pipe is loose."), 10, 16, 16448255); } if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 0x2) != 0x0) { - this.fontRendererObj.drawString(this.trans("133", "Screws are missing."), 10, 24, 16448255); + this.fontRendererObj.drawString(this.trans("133", "Screws are loose."), 10, 24, 16448255); } if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 0x4) != 0x0) { this.fontRendererObj.drawString(this.trans("134", "Something is stuck."), 10, 32, 16448255); @@ -48,7 +48,7 @@ public class GUI_MultiMachine_Default extends GT_GUIContainerMetaTile_Machine { } if (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode == 0) { if (((CONTAINER_MultiMachine) this.mContainer).mActive == 0) { - this.fontRendererObj.drawString(this.trans("139", "Hit with Soft Hammer"), 10, 16, 16448255); + this.fontRendererObj.drawString(this.trans("139", "Hit with Soft Mallet"), 10, 16, 16448255); this.fontRendererObj.drawString(this.trans("140", "to (re-)start the Machine"), 10, 24, 16448255); this.fontRendererObj.drawString(this.trans("141", "if it doesn't start."), 10, 32, 16448255); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java index a3ed8749c6..4050b5958a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java @@ -29,7 +29,7 @@ public class GUI_Multi_Basic_Slotted extends GT_GUIContainerMetaTile_Machine { } if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 2) != 0) { - this.fontRendererObj.drawString(this.trans("133", "Screws are missing."), 10, 24, 16448255); + this.fontRendererObj.drawString(this.trans("133", "Screws are loose."), 10, 24, 16448255); } if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 4) != 0) { @@ -45,7 +45,7 @@ public class GUI_Multi_Basic_Slotted extends GT_GUIContainerMetaTile_Machine { } if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 32) != 0) { - this.fontRendererObj.drawString(this.trans("137", "That doesn\'t belong there."), 10, 56, 16448255); + this.fontRendererObj.drawString(this.trans("137", "That doesn't belong there."), 10, 56, 16448255); } if ((((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode & 64) != 0) { @@ -54,9 +54,9 @@ public class GUI_Multi_Basic_Slotted extends GT_GUIContainerMetaTile_Machine { if (((GT_Container_MultiMachine) this.mContainer).mDisplayErrorCode == 0) { if (((GT_Container_MultiMachine) this.mContainer).mActive == 0) { - this.fontRendererObj.drawString(this.trans("139", "Hit with Soft Hammer"), 10, 16, 16448255); + this.fontRendererObj.drawString(this.trans("139", "Hit with Soft Mallet"), 10, 16, 16448255); this.fontRendererObj.drawString(this.trans("140", "to (re-)start the Machine"), 10, 24, 16448255); - this.fontRendererObj.drawString(this.trans("141", "if it doesn\'t start."), 10, 32, 16448255); + this.fontRendererObj.drawString(this.trans("141", "if it doesn't start."), 10, 32, 16448255); } else { this.fontRendererObj.drawString(this.trans("142", "Running perfectly."), 10, 16, 16448255); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java index b38ddde427..2c09489ca1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java @@ -153,7 +153,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha if (aPlayer.isSneaking()) { disableSort = !disableSort; GT_Utility.sendChatToPlayer( - aPlayer, trans("200", "Automatic Item Shuffling: " + (disableSort ? "Disabled" : "Enabled"))); + aPlayer, trans("200.1", "Automatic Item Shuffling: ") + (disableSort ? trans("087", "Disabled") : trans("088", "Enabled"))); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java index 16369f570f..46a6e9d600 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java @@ -122,7 +122,7 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior { aCoverVariable = mMaxItemCapacity; } GT_Utility.sendChatToPlayer( - aPlayer, LangUtils.trans("009", "Overflow point: ") + aCoverVariable + trans("010", "L")); + aPlayer, LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L")); return aCoverVariable; } @@ -149,7 +149,7 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior { aCoverVariable = mMaxItemCapacity; } GT_Utility.sendChatToPlayer( - aPlayer, LangUtils.trans("009", "Overflow point: ") + aCoverVariable + trans("010", "L")); + aPlayer, LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L")); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); return true; } -- cgit