upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-12 00:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix terminal fluid stack tooltip display error

Browse Source
This commit is contained in:
asdflj committed 2022-11-30 12:08:01 +08:00
1 parent b3fa0c09d1
commit 5b6cc1471b
3 files changed
+18 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/crossmod/waila/FCTooltipHandlerWaila.java
+3 -6
View File
@@ -6,6 +6,7 @@ import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fluids.FluidStack;
import java.util.List;
@@ -21,14 +22,10 @@ public class FCTooltipHandlerWaila extends TooltipHandlerWaila {
if (itemstack != null && itemstack.getItem() instanceof ItemFluidDrop && currenttip.size() > 0) {
FluidStack fs = ItemFluidDrop.getFluidStack(itemstack);
if (fs == null) return currenttip;
int fsid = Util.getFluidID(fs.getFluid());
currenttip.set(0, Tooltip.partFluidTerminalFluidFormat(fs));
if (Minecraft.getMinecraft().gameSettings.advancedItemTooltips) {
currenttip.set(0, String.format("%s (#%s) %s", fs.getFluid().getLocalizedName(), fsid, fsid));
} else {
currenttip.set(0, String.format("%s %s", fs.getFluid().getLocalizedName(), fsid));
currenttip.set(1, EnumChatFormatting.GRAY + String.format("%s:%s", Util.getFluidModID(fs.getFluid()), fs.getFluid().getName()) + EnumChatFormatting.RESET);
}
String modName = Util.getFluidModName(fs.getFluid());
if (modName != null && !modName.equals(""))
currenttip.set(currenttip.size() - 1, "\u00a79\u00a7o" + modName);
src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java
+14
View File
@@ -2,7 +2,10 @@ package com.glodblock.github.crossmod.waila;
import appeng.util.Utility;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.fluids.FluidStack;
public class Tooltip {
public static String fluidFormat(String name, int amount) {
@@ -23,4 +26,15 @@ public class Tooltip {
isEnable ? I18n.format(NameConst.WAILA_ENABLE) : I18n.format(NameConst.WAILA_DISABLE)
);
}
public static String partFluidTerminalFluidFormat(FluidStack fs) {
int fid = Util.getFluidID(fs.getFluid());
if (fid == -1) {
return fs.getFluid().getLocalizedName();
} else if (Minecraft.getMinecraft().gameSettings.advancedItemTooltips) {
return String.format("%s (#%s) %s", fs.getFluid().getLocalizedName(), fid, fid);
} else {
return String.format("%s %s", fs.getFluid().getLocalizedName(), fid);
}
}
}