Skip to content

Add chat component support for fluid stack chat output #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Eldrinn-Elantey wants to merge 1 commit into from
Closed

Add chat component support for fluid stack chat output #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/com/glodblock/github/common/block/BlockFluidBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;

import java.text.NumberFormat;
import java.util.List;

import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;

import com.glodblock.github.client.render.RenderBlockFluidBuffer;
import com.glodblock.github.common.item.FCBaseItemBlock;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.common.tile.TileFluidBuffer;
import com.glodblock.github.crossmod.waila.Tooltip;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;

Expand Down Expand Up @@ -46,9 +46,9 @@ public boolean onActivated(World world, int x, int y, int z, EntityPlayer player
if (player.isSneaking() && itemStack == null) return !tile.setFluid(null);
IAEFluidStack ias = tile.getAEStoreFluidStack();
if (fs == null && ias != null) {
player.addChatMessage(
new ChatComponentText(
Tooltip.fluidFormat(ias.getFluidStack().getLocalizedName(), ias.getStackSize())));
IChatComponent msg = Util.getFluidChatComponent(ias);
msg.appendText(": " + NumberFormat.getInstance().format(ias.getStackSize()) + " mB");
player.addChatMessage(msg);
return false;
} else {
tile.setFluid(fs);
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/com/glodblock/github/util/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
import net.minecraft.item.ItemPotion;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.StatCollector;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
Expand Down Expand Up @@ -350,6 +354,19 @@ public static IAEFluidStack loadFluidStackFromNBT(final NBTTagCompound i) {
return fluid;
}

public static IChatComponent getFluidChatComponent(final IAEFluidStack fluidStack) {
if (fluidStack == null) {
return new ChatComponentText(StatCollector.translateToLocalFormatted("error.unknown"));
}

final String unlocalizedName = fluidStack.getUnlocalizedName();
if (unlocalizedName != null && !unlocalizedName.isEmpty() && StatCollector.canTranslate(unlocalizedName)) {
return new ChatComponentTranslation(unlocalizedName);
}

return new ChatComponentText(fluidStack.getDisplayName());
}

public static void mirrorFluidToPacket(IInventory packet, IAEFluidTank fluidTank) {
for (int i = 0; i < fluidTank.getSlots(); i++) {
IAEFluidStack fluid = fluidTank.getFluidInSlot(i);
Expand Down