From f753bc67e33c2e389ede0d0bec14e4d6ab900e74 Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 15 Aug 2022 19:04:05 +0900 Subject: Add localization to MC language list (#1260) * Add localization to MC language list * Revert workaround patches --- .../machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java | 5 ----- .../machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java | 5 ----- .../machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java | 2 +- .../tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java | 1 + .../tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java | 5 ----- .../tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java | 5 ----- .../tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java | 5 ----- .../machines/multi/GT_MetaTileEntity_OilDrillBase.java | 2 +- .../machines/multi/GT_MetaTileEntity_OilDrillInfinite.java | 7 +------ .../machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java | 5 ----- .../machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java | 5 ----- .../machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java | 5 ----- .../machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java | 5 ----- .../machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java | 2 +- 14 files changed, 5 insertions(+), 54 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java index c432330f95..af1468396b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java @@ -30,11 +30,6 @@ public class GT_MetaTileEntity_ConcreteBackfiller1 extends GT_MetaTileEntity_Con return ItemList.Casing_SolidSteel; } - @Override - protected String getCasingName() { - return "Solid Steel Machine Casing"; - } - @Override protected Materials getFrameMaterial() { return Materials.Steel; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java index d045bd15ff..05646676e7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java @@ -30,11 +30,6 @@ public class GT_MetaTileEntity_ConcreteBackfiller2 extends GT_MetaTileEntity_Con return ItemList.Casing_StableTitanium; } - @Override - protected String getCasingName() { - return "Stable Titanium Machine"; - } - @Override protected Materials getFrameMaterial() { return Materials.Titanium; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java index e83aba4b1d..52bc0b66e4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java @@ -24,7 +24,7 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi } protected GT_Multiblock_Tooltip_Builder createTooltip(String aStructureName) { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Concrete Backfiller") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index cf9ccdfc35..b98b1f7b81 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -450,6 +450,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_En protected abstract ItemList getCasingBlockItem(); + @Deprecated protected String getCasingName() { return null; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java index 840e59a2d4..610c21e89b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java @@ -30,11 +30,6 @@ public class GT_MetaTileEntity_OilDrill1 extends GT_MetaTileEntity_OilDrillBase return ItemList.Casing_SolidSteel; } - @Override - protected String getCasingName() { - return "Solid Steel Machine Casing"; - } - @Override protected Materials getFrameMaterial() { return Materials.Steel; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java index 925a063d0b..eab1ebf614 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java @@ -30,11 +30,6 @@ public class GT_MetaTileEntity_OilDrill2 extends GT_MetaTileEntity_OilDrillBase return ItemList.Casing_StableTitanium; } - @Override - protected String getCasingName() { - return "Stable Titanium Machine"; - } - @Override protected Materials getFrameMaterial() { return Materials.Titanium; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java index c2b50faacc..738f60544b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java @@ -30,11 +30,6 @@ public class GT_MetaTileEntity_OilDrill3 extends GT_MetaTileEntity_OilDrillBase return ItemList.Casing_RobustTungstenSteel; } - @Override - protected String getCasingName() { - return "Robust Tungstensteel Machine Casing"; - } - @Override protected Materials getFrameMaterial() { return Materials.TungstenSteel; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index 83864a99be..9af495bcb3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -79,7 +79,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D } protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Pump") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java index a7d01d0cb1..5eb5333045 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java @@ -21,7 +21,7 @@ public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDri @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Pump") @@ -56,11 +56,6 @@ public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDri return ItemList.Casing_MiningNeutronium; } - @Override - protected String getCasingName() { - return "Mining Neutronium Casing"; - } - @Override protected Materials getFrameMaterial() { return Materials.Neutronium; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java index e94140d5de..ac3e40c5f5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java @@ -32,11 +32,6 @@ public class GT_MetaTileEntity_OreDrillingPlant1 extends GT_MetaTileEntity_OreDr return ItemList.Casing_SolidSteel; } - @Override - protected String getCasingName() { - return "Solid Steel Machine Casing"; - } - @Override protected Materials getFrameMaterial() { return Materials.Steel; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java index ee286e024d..bf9c628911 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java @@ -32,11 +32,6 @@ public class GT_MetaTileEntity_OreDrillingPlant2 extends GT_MetaTileEntity_OreDr return ItemList.Casing_StableTitanium; } - @Override - protected String getCasingName() { - return "Stable Titanium Machine"; - } - @Override protected Materials getFrameMaterial() { return Materials.Titanium; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java index 7c784234ff..411bbef3a7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java @@ -32,11 +32,6 @@ public class GT_MetaTileEntity_OreDrillingPlant3 extends GT_MetaTileEntity_OreDr return ItemList.Casing_RobustTungstenSteel; } - @Override - protected String getCasingName() { - return "Robust Tungstensteel Machine Casing"; - } - @Override protected Materials getFrameMaterial() { return Materials.TungstenSteel; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java index b393b019f8..d7daea327c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java @@ -32,11 +32,6 @@ public class GT_MetaTileEntity_OreDrillingPlant4 extends GT_MetaTileEntity_OreDr return ItemList.Casing_MiningOsmiridium; } - @Override - protected String getCasingName() { - return "Mining Osmiridium Casing"; - } - @Override protected Materials getFrameMaterial() { return Materials.Osmiridium; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index e2d5026551..188525c7c9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -365,7 +365,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile protected abstract int getBaseProgressTime(); protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) { - String casings = getCasingName() != null ? getCasingName() : "Casing"; + String casings = getCasingBlockItem().get(0).getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Miner") -- cgit