Fixed Fluid Barrel container item definition (issue #178).

This commit is contained in:
stfwi 2021-05-07 19:45:14 +02:00
parent c6529cf5ed
commit eaac51b9ff
4 changed files with 7 additions and 3 deletions

View file

@ -5,4 +5,4 @@ version_minecraft=1.16.4
version_forge_minecraft=1.16.4-35.1.10 version_forge_minecraft=1.16.4-35.1.10
version_fml_mappings=20201028-1.16.3 version_fml_mappings=20201028-1.16.3
version_jei=1.16.4:7.6.1.63 version_jei=1.16.4:7.6.1.63
version_engineersdecor=1.1.13 version_engineersdecor=1.1.14-b1

View file

@ -1,6 +1,7 @@
{ {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.16.4": { "1.16.4": {
"1.1.14-b1": "[F] Fixed Fluid Barrel container item definition (issue #178, thx Wormbo).",
"1.1.13": "[R] Release build v1.1.13.\n[A] Added debug logging feature.", "1.1.13": "[R] Release build v1.1.13.\n[A] Added debug logging feature.",
"1.1.13-b2": "[F] Fixed explosion resistance values for standard blocks.\n[F] Sandstone Ornated Clinker loot table fixed (ty czbuendel, Valen).", "1.1.13-b2": "[F] Fixed explosion resistance values for standard blocks.\n[F] Sandstone Ornated Clinker loot table fixed (ty czbuendel, Valen).",
"1.1.13-b1": "[F] Hotfix Electrical Furnace inventory import from Storage Drawers (issue #174, ty anto-fire/IchigoGames).", "1.1.13-b1": "[F] Hotfix Electrical Furnace inventory import from Storage Drawers (issue #174, ty anto-fire/IchigoGames).",
@ -36,6 +37,6 @@
}, },
"promos": { "promos": {
"1.16.4-recommended": "1.1.13", "1.16.4-recommended": "1.1.13",
"1.16.4-latest": "1.1.13" "1.16.4-latest": "1.1.14-b1"
} }
} }

View file

@ -11,6 +11,8 @@ Mod sources for Minecraft version 1.16.x.
## Version history ## Version history
- v1.1.14-b1 [F] Fixed Fluid Barrel container item definition (issue #178, thx Wormbo).
- v1.1.13 [R] Release build v1.1.13. - v1.1.13 [R] Release build v1.1.13.
[A] Added debug logging feature. [A] Added debug logging feature.

View file

@ -411,11 +411,12 @@ public class EdFluidBarrel
@Override @Override
public boolean hasContainerItem(ItemStack stack) public boolean hasContainerItem(ItemStack stack)
{ return true; } { return (stack.getCount()==1) && (!getFluid(stack).isEmpty()); }
@Override @Override
public ItemStack getContainerItem(ItemStack stack) public ItemStack getContainerItem(ItemStack stack)
{ {
if(stack.getCount()!=1) return ItemStack.EMPTY;
FluidStack fs = getFluid(stack); FluidStack fs = getFluid(stack);
if(fs.getAmount() > 1000) fs.shrink(1000); else fs = FluidStack.EMPTY; if(fs.getAmount() > 1000) fs.shrink(1000); else fs = FluidStack.EMPTY;
return setFluid(stack, fs); return setFluid(stack, fs);