Skip to content
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

Fix unlocalized name of GT fluids in drums #2361

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Fix unlocalized name of GT fluids in drums #2361

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
11 changes: 6 additions & 5 deletions src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityDrum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import codechicken.lib.vec.Matrix4;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.io.IOException;
Expand Down Expand Up @@ -97,7 +98,7 @@ protected void initializeInventory() {
IPropertyFluidFilter filter = this.material.getProperty(PropertyKey.FLUID_PIPE);
if (filter == null) {
throw new IllegalArgumentException(
String.format("Material %s requires FluidPipePropety for Drums", material));
String.format("Material %s requires FluidPipeProperty for Drums", material));
}
this.fluidInventory = this.fluidTank = new FilteredFluidHandler(tankSize).setFilter(filter);
}
Expand Down Expand Up @@ -129,7 +130,7 @@ public ICapabilityProvider initItemStackCapabilities(ItemStack itemStack) {
}

@Override
public void writeInitialSyncData(PacketBuffer buf) {
public void writeInitialSyncData(@NotNull PacketBuffer buf) {
super.writeInitialSyncData(buf);
FluidStack fluidStack = fluidTank.getFluid();
buf.writeBoolean(fluidStack != null);
Expand All @@ -142,7 +143,7 @@ public void writeInitialSyncData(PacketBuffer buf) {
}

@Override
public void receiveInitialSyncData(PacketBuffer buf) {
public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
super.receiveInitialSyncData(buf);
FluidStack fluidStack = null;
if (buf.readBoolean()) {
Expand All @@ -156,7 +157,7 @@ public void receiveInitialSyncData(PacketBuffer buf) {
}

@Override
public void receiveCustomData(int dataId, PacketBuffer buf) {
public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
super.receiveCustomData(dataId, buf);
if (dataId == UPDATE_AUTO_OUTPUT) {
this.isAutoOutput = buf.readBoolean();
Expand Down Expand Up @@ -266,7 +267,7 @@ public void addInformation(ItemStack stack, @Nullable World player, List<String>
FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tagCompound.getCompoundTag("Fluid"));
if (fluidStack == null) return;
tooltip.add(I18n.format("gregtech.machine.fluid_tank.fluid", fluidStack.amount,
I18n.format(fluidStack.getUnlocalizedName())));
fluidStack.getFluid().getLocalizedName(fluidStack)));
}
}

Expand Down
Loading