diff options
Diffstat (limited to 'src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java')
| -rw-r--r-- | src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java | 10 |
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 |