aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-06-27 01:59:26 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-06-27 01:59:26 +1000
commit5e44f3a2178f34d31889d51ec03c2533cc506e7a (patch)
tree3de58cdac3d58d8ef2f29b04c64331299b7a4b35 /src/Java/gtPlusPlus/xmod
parent48aeddfb03a8a459e4b2bdf95018df09d5424f1a (diff)
downloadGT5-Unofficial-5e44f3a2178f34d31889d51ec03c2533cc506e7a.tar.gz
GT5-Unofficial-5e44f3a2178f34d31889d51ec03c2533cc506e7a.tar.bz2
GT5-Unofficial-5e44f3a2178f34d31889d51ec03c2533cc506e7a.zip
% Added Tooltip to Adv. EBF to note the new requirement of a Pyrotheum Vent.
% Improved Custom Fluid Hatch Tooltips.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java43
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java7
2 files changed, 48 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
index 5a12905756..64c98feff0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
@@ -1,7 +1,9 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -59,11 +61,48 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
return this.mFluidCapacity;
}
+ private FluidStack mLockedStack = null;
+ private Integer mLockedTemp = null;
+ private String mTempMod = null;
+
@Override
- public String[] getDescription() {
+ public String[] getDescription() {
+ if (mLockedStack == null) {
+ mLockedStack = FluidUtils.getFluidStack(mLockedFluid, 1);
+ }
+ if (mLockedTemp == null) {
+ if (mLockedStack != null) {
+ mLockedTemp = mLockedStack.getFluid().getTemperature();
+ }
+ }
+ if (mLockedTemp != null) {
+ if (mLockedTemp <= -3000) {
+ mTempMod = ""+EnumChatFormatting.DARK_PURPLE;
+ }
+ else if (mLockedTemp >= -2999 && mLockedTemp <= -500) {
+ mTempMod = ""+EnumChatFormatting.DARK_BLUE;
+ }
+ else if (mLockedTemp >= -499 && mLockedTemp <= -50) {
+ mTempMod = ""+EnumChatFormatting.BLUE;
+ }
+ else if (mLockedTemp >= 30 && mLockedTemp <= 300) {
+ mTempMod = ""+EnumChatFormatting.AQUA;
+ }
+ else if (mLockedTemp >= 301 && mLockedTemp <= 800) {
+ mTempMod = ""+EnumChatFormatting.YELLOW;
+ }
+ else if (mLockedTemp >= 801 && mLockedTemp <= 1500) {
+ mTempMod = ""+EnumChatFormatting.GOLD;
+ }
+ else if (mLockedTemp >= 1501) {
+ mTempMod = ""+EnumChatFormatting.RED;
+ }
+ }
+
String[] s2 = new String[]{
"Fluid Input for Multiblocks",
- "Capacity: " + getCapacity()+"L"
+ "Capacity: " + getCapacity()+"L",
+ "Accepted Fluid: " + mTempMod + mLockedStack.getLocalizedName()
};
return s2;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index 9d2928fa0e..196094f5a5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -39,6 +39,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
public static int CASING_TEXTURE_ID;
public static String mHotFuelName = "Blazing Pyrotheum";
public static String mCasingName = "Advanced Blast Furnace Casing";
+ public static String mHatchName = "Pyrotheum Hatch";
private int mHeatingCapacity = 0;
private int controllerY;
@@ -50,6 +51,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11);
mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName();
mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 11);
+ mHatchName = ItemUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 968);
}
public GregtechMetaTileEntity_Adv_EBF(String aName) {
@@ -57,6 +59,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11);
mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName();
mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 11);
+ mHatchName = ItemUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 968);
}
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
@@ -71,12 +74,16 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
if (mHotFuelName.toLowerCase().contains(".")) {
mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName();
}
+ if (mHatchName.toLowerCase().contains(".name")) {
+ mHatchName = ItemUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 968);
+ }
return new String[]{
"Controller Block for the Advanced Electric Blast Furnace",
"Consumes 1L of "+mHotFuelName+"/t during operation",
"Size(WxHxD): 3x4x3 (Hollow), Controller (Front middle bottom)",
"16x Heating Coils (Two middle Layers, hollow)",
+ "1x " + mHatchName + " (Any bottom layer casing)",
"1x Input Hatch/Bus (Any bottom layer casing)",
"1x Output Hatch/Bus (Any bottom layer casing)",
"1x Energy Hatch (Any bottom layer casing)",