From 6b1ca058f85f7de08608a4605c27e1ccdc4c8eef Mon Sep 17 00:00:00 2001 From: miozune Date: Tue, 9 Aug 2022 06:29:38 +0900 Subject: Fix localization failure with driller (#178) * Fix localization failure with driller * Fix Former-commit-id: 476453a57b8b6a6be52709854e36d6b83092ac5d --- dependencies.gradle | 2 +- .../common/tileentities/multis/GT_TileEntity_DEHP.java | 7 ++++++- .../galacticgreg/GT_TileEntity_VoidMiner_Base.java | 2 +- .../crossmod/galacticgreg/GT_TileEntity_VoidMiners.java | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7abb0e2f5d..cc9a6f5db4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.78:dev") + compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.88:dev") compile("com.github.GTNewHorizons:StructureLib:1.0.16:dev") compile("com.github.GTNewHorizons:TecTech:4.10.18:dev") compile("com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev") diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java index 3b67ee2a9e..010cc53cce 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java @@ -106,7 +106,7 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - String casings = getCasingBlockItem().get(0).getDisplayName(); + String casings = getCasingName() != null ? getCasingName() : "Casing"; tt.addMachineType("Geothermal Heat Pump") .addInfo("Consumes " + GT_Values.V[this.mTier + 2] + "EU/t") .addInfo("Has 4 Modes, use the Screwdriver to change them:"); @@ -141,6 +141,11 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { return ItemList.Casing_HeatProof; } + @Override + protected String getCasingName() { + return "Heat Proof Machine Casing"; + } + @Override protected Materials getFrameMaterial() { return Materials.Tungsten; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java index 5d92af979d..adc7979bdd 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java @@ -171,7 +171,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { - String casings = getCasingBlockItem().get(0).getDisplayName(); + String casings = getCasingName() != null ? getCasingName() : "Casing"; final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Miner") diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java index a5058a34d7..fb87f050b8 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java @@ -44,6 +44,11 @@ public class GT_TileEntity_VoidMiners { return ItemList.Casing_UV; } + @Override + protected String getCasingName() { + return "UV Machine Casing"; + } + @Override protected Materials getFrameMaterial() { return Materials.Europium; @@ -75,6 +80,11 @@ public class GT_TileEntity_VoidMiners { return ItemList.Casing_MiningBlackPlutonium; } + @Override + protected String getCasingName() { + return "Mining Black Plutonium Casing"; + } + @Override protected Materials getFrameMaterial() { return Materials.BlackPlutonium; @@ -106,6 +116,11 @@ public class GT_TileEntity_VoidMiners { return ItemList.Casing_MiningNeutronium; } + @Override + protected String getCasingName() { + return "Mining Neutronium Casing"; + } + @Override protected Materials getFrameMaterial() { return Materials.Neutronium; -- cgit