diff options
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:"); @@ -142,6 +142,11 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { } @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 @@ -45,6 +45,11 @@ public class GT_TileEntity_VoidMiners { } @Override + protected String getCasingName() { + return "UV Machine Casing"; + } + + @Override protected Materials getFrameMaterial() { return Materials.Europium; } @@ -76,6 +81,11 @@ public class GT_TileEntity_VoidMiners { } @Override + protected String getCasingName() { + return "Mining Black Plutonium Casing"; + } + + @Override protected Materials getFrameMaterial() { return Materials.BlackPlutonium; } @@ -107,6 +117,11 @@ public class GT_TileEntity_VoidMiners { } @Override + protected String getCasingName() { + return "Mining Neutronium Casing"; + } + + @Override protected Materials getFrameMaterial() { return Materials.Neutronium; } |