aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-07-05 18:58:45 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-07-05 18:58:45 +1000
commit943116768eab1f30696d4c0e6bc5f119c8765ac2 (patch)
tree92e812794907d8014d69d357fa1854de55a70b0a /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators
parent05740f41d632a0155173c2b1575c501218f9fa5a (diff)
downloadGT5-Unofficial-943116768eab1f30696d4c0e6bc5f119c8765ac2.tar.gz
GT5-Unofficial-943116768eab1f30696d4c0e6bc5f119c8765ac2.tar.bz2
GT5-Unofficial-943116768eab1f30696d4c0e6bc5f119c8765ac2.zip
$ Fixed issue #105.
% Buffed Alloy Blast Smelter to be 20% faster than the Electric Blast Furnace. % Revised times for all GT++ Alloys during smelting. + Added 'Alkalus' to the tooltips of many things hidden within Gregtech. Re:#106. + Added some automatic calculations to the Materials Class.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java14
2 files changed, 13 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index 50d6cb9d4e..1aece5e35d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -8,6 +8,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.*;
import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_AdvancedBoiler;
import gtPlusPlus.xmod.gregtech.api.gui.GUI_AdvancedBoiler;
@@ -39,6 +40,11 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
this.mBoilerTier = aTier;
}
+ @Override
+ public String[] getDescription() {
+ return new String[]{this.mDescription, "Produces "+this.mPollutionPerSecond+" pollution/sec", CORE.GT_Tooltip};
+ }
+
public ITexture getOverlayIcon() {
return new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT);
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
index b6053d8d5e..b80352321c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
@@ -10,6 +10,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenera
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -31,6 +32,11 @@ extends GT_MetaTileEntity_BasicGenerator
}
@Override
+ public String[] getDescription() {
+ return new String[]{this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", CORE.GT_Tooltip};
+ }
+
+ @Override
public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
if (aBaseMetaTileEntity.isClientSide()){
return true;
@@ -123,13 +129,6 @@ extends GT_MetaTileEntity_BasicGenerator
return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)};
}
-
- @Override
- public String[] getDescription()
- {
- return new String[] {"Generates power from Lava/Pahoehoe at " + this.getEfficiency() + "% Efficiency per tick"};
- }
-
@Override
public GT_Recipe_Map getRecipes()
{
@@ -137,6 +136,7 @@ extends GT_MetaTileEntity_BasicGenerator
}
+ @Override
public int getPollution() {
return 100;
}