diff options
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/enums/HeatingCoilLevel.java | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 22 |
2 files changed, 23 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java index dd1a68601e..0ee208658b 100644 --- a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java +++ b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java @@ -1,5 +1,7 @@ package gregtech.api.enums; +import net.minecraft.util.StatCollector; + public enum HeatingCoilLevel { None, // 0 ULV, //Not implemented 901 @@ -50,6 +52,10 @@ public enum HeatingCoilLevel { return 1 << Math.max(0, this.ordinal() - 5); } + public String getName() { + return StatCollector.translateToLocal("GT5U.coil." + this); + } + public static HeatingCoilLevel getFromTier(byte tier){ if (tier < 0 || tier > getMaxTier()) return HeatingCoilLevel.None; diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index f8d030df6e..ad70b27b07 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -15,6 +15,7 @@ import codechicken.nei.recipe.RecipeCatalysts; import codechicken.nei.recipe.TemplateRecipeHandler; import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.HeatingCoilLevel; import gregtech.api.enums.OrePrefixes; import gregtech.api.gui.GT_GUIContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -32,11 +33,9 @@ import gregtech.common.power.UnspecifiedEUPower; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.IResource; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.Range; import org.lwjgl.opengl.GL11; @@ -44,7 +43,6 @@ import org.lwjgl.opengl.GL11; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.*; -import java.io.IOException; import java.lang.ref.SoftReference; import java.util.ArrayList; import java.util.Collections; @@ -418,8 +416,12 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { if (drawOptionalLine(lineCounter, getSpecialInfo(recipe.mSpecialValue) + " " + formatSpecialValueFusion(recipe.mSpecialValue, recipe.mEUt))) { lineCounter++; } - } - if (drawOptionalLine(lineCounter, getSpecialInfo(recipe.mSpecialValue))) { + } else if (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre) && this.mRecipeMap.mNEISpecialValuePre.toLowerCase().contains("heat capacity")) { + drawLine(lineCounter, getSpecialInfo(recipe.mSpecialValue)); + lineCounter++; + drawLine(lineCounter, " " + formatSpecialValueHeatCoil(recipe.mSpecialValue)); + lineCounter++; + } else if (drawOptionalLine(lineCounter, getSpecialInfo(recipe.mSpecialValue))) { lineCounter++; } if (GT_Mod.gregtechproxy.mNEIRecipeOwner) { @@ -506,6 +508,16 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { return "(MK " + tier + ")"; } + private String formatSpecialValueHeatCoil(int heat) { + for (HeatingCoilLevel heatLevel : HeatingCoilLevel.values()) { + if (heatLevel == HeatingCoilLevel.None || heatLevel == HeatingCoilLevel.ULV) continue; + if (heatLevel.getHeat() >= heat) { + return "(" + heatLevel.getName() + ")"; + } + } + return "(" + HeatingCoilLevel.MAX.getName() + "+)"; + } + @SuppressWarnings("unused") //TODO: Consider removing protected boolean drawOptionalLine(int lineNumber, String line, String prefix) { if (!(line == null || "unspecified".equals(line))) { |