Hello~ I hope I'm in the right section... Um basically I have added block versions of Potion bottles to my mod 

 As seen here https://i.imgur.com/vR61nSy.png

however my issue is with the Water Bottle :< It drops Uncraftable Potion instead of the default water bottle due to the Uncraftable Potion have no NBT tags so I'm in need of some help~
I have looked around for a few hours however anything I did find was for Bukkit or Spigot.

 

/		@Override
		public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
			List<ItemStack> dropsOriginal = super.getDrops(state, builder);
			if (!dropsOriginal.isEmpty())
				return dropsOriginal;
			return Collections.singletonList(new ItemStack(Items.POTION, (int) (0)));
		}
	}

 

This is my first time requiring to add NBT to a dropped item and I'm not sure how to go about it

To get any potion item properly, you should use PotionUtils::addPotionToItemStack. You do not need to supply a count as that can be 1 by default. Also, move this to an actual loot table instead of overriding #getDrops.