Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1565 from Blood-Asp/FlaskFix

Browse source 
Made Volumetric Flasks more flexible.
This commit is contained in:
Alkalus 2020-05-26 19:20:08 +01:00 committed by GitHub
commit f83d381a69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/gregtech/common/items/GT_VolumetricFlask.java
View file

@ -32,12 +32,14 @@ import static ic2.core.util.LiquidUtil.*;
public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContainerItem { public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContainerItem {
private final int maxCapacity; private final int maxCapacity;
private final String unlocalFlaskName;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon iconWindow; public IIcon iconWindow;
public GT_VolumetricFlask(String unlocalized, String english, int maxCapacity) { public GT_VolumetricFlask(String unlocalized, String english, int maxCapacity) {
super(unlocalized, english, null); super(unlocalized, english, null);
this.maxCapacity = maxCapacity; this.maxCapacity = maxCapacity;
unlocalFlaskName = unlocalized;
setMaxStackSize(16); setMaxStackSize(16);
setNoRepair(); setNoRepair();
if (Loader.isModLoaded("NotEnoughItems")) { if (Loader.isModLoaded("NotEnoughItems")) {
@ -122,7 +124,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
@Override @Override
public void registerIcons(IIconRegister aIconRegister) { public void registerIcons(IIconRegister aIconRegister) {
super.registerIcons(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) { public void setCapacity(ItemStack stack, int capacity) {