Skip to content

Commit

Permalink
Merge pull request #1565 from Blood-Asp/FlaskFix
Browse files Browse the repository at this point in the history
Made Volumetric Flasks more flexible.
  • Loading branch information
draknyte1 authored May 26, 2020
2 parents 2f5bf6e + 016ea46 commit f83d381
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/main/java/gregtech/common/items/GT_VolumetricFlask.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@

public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContainerItem {
private final int maxCapacity;
private final String unlocalFlaskName;
@SideOnly(Side.CLIENT)
public IIcon iconWindow;

public GT_VolumetricFlask(String unlocalized, String english, int maxCapacity) {
super(unlocalized, english, null);
this.maxCapacity = maxCapacity;
unlocalFlaskName = unlocalized;
setMaxStackSize(16);
setNoRepair();
if (Loader.isModLoaded("NotEnoughItems")) {
Expand Down Expand Up @@ -122,7 +124,7 @@ public int getCapacity(ItemStack stack) {
@Override
public void registerIcons(IIconRegister aIconRegister) {
super.registerIcons(aIconRegister);
iconWindow = aIconRegister.registerIcon(RES_PATH_ITEM + "gt.Volumetric_Flask.window");
iconWindow = aIconRegister.registerIcon(RES_PATH_ITEM + "gt."+unlocalFlaskName+".window");
}

public void setCapacity(ItemStack stack, int capacity) {
Expand Down

0 comments on commit f83d381

Please sign in to comment.