aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorYang Xizhi <60341015+GlodBlock@users.noreply.github.com>2021-12-14 06:32:11 +0800
committerGitHub <noreply@github.com>2021-12-13 23:32:11 +0100
commit9414fc9625f2a9a854f59d19bdcc2eaa10af3048 (patch)
tree7e136ee8f86aa74e12af5a78dda24ff80b1f37ef /src/main/java/gregtech/common
parent11903e892d8de8b5722128f4c22bd150ccb4a728 (diff)
downloadGT5-Unofficial-9414fc9625f2a9a854f59d19bdcc2eaa10af3048.tar.gz
GT5-Unofficial-9414fc9625f2a9a854f59d19bdcc2eaa10af3048.tar.bz2
GT5-Unofficial-9414fc9625f2a9a854f59d19bdcc2eaa10af3048.zip
add unlocalizedname fluid map (#796)
* add unlocalizedname fluid map * change the lock name into fluid name
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
index 2e217f6b1e..31a6224535 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
@@ -13,6 +13,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -43,14 +44,14 @@ public class GT_Container_OutputHatch extends GT_Container_BasicTank {
FluidStack tReadyLockFluid = GT_Utility.getFluidForFilledItem(aPlayer.inventory.getItemStack(), true);
byte tMode = tHatch.getMode();
// If player click the locker slot with empty or the same fluid cell, clear the lock fluid
- if (tReadyLockFluid == null || (tMode >= 8 && tReadyLockFluid.getUnlocalizedName().equals(tHatch.getLockedFluidName()))) {
+ if (tReadyLockFluid == null || (tMode >= 8 && tReadyLockFluid.getFluid().getName().equals(tHatch.getLockedFluidName()))) {
tHatch.setLockedFluidName(null);
GT_Utility.sendChatToPlayer(aPlayer, trans("300", "Fluid Lock Cleared."));
tHatch.mMode = 0;
fluidName = "";
}
else {
- tHatch.setLockedFluidName(tReadyLockFluid.getUnlocalizedName());
+ tHatch.setLockedFluidName(tReadyLockFluid.getFluid().getName());
GT_Utility.sendChatToPlayer(aPlayer, String.format(trans("151.4", "Sucessfully locked Fluid to %s"), tReadyLockFluid.getLocalizedName()));
tHatch.mMode = 9;
fluidName = tReadyLockFluid.getUnlocalizedName();
@@ -115,9 +116,8 @@ public class GT_Container_OutputHatch extends GT_Container_BasicTank {
sb.append(buffer.getChar(i * Character.BYTES + Integer.BYTES + 1));
}
byte mode = buffer.get(Integer.BYTES);
- FluidStack tFluid = FluidRegistry.getFluidStack(sb.toString().replace("fluid.", "")
- .replace("tile.", "").replace(".name", "").replace("ic2.fluid", "ic2").toLowerCase(), 1);
+ FluidStack tFluid = FluidRegistry.getFluidStack(sb.toString(), 1);
if (tFluid == null || mode < 8) return "Empty";
- else return tFluid.getLocalizedName().replace("fluid.", "");
+ return tFluid.getLocalizedName().replace("fluid.", "");
}
} \ No newline at end of file