Merge branch 'master' of github.com:Vazkii/Botania into 1.16.x

This commit is contained in:
Vincent Lee committed 2020-06-28 16:02:40 -05:00
commit f7785a0a54
3 files changed
+9 -9

No files matched your search

@@ -46,7 +46,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower {
private int cooldown = 0;
private int digestingMana = 0;
private List<ItemStack> lastFoods = new LinkedList<>();
private int streakLength = 0;
private int streakLength = -1;
private int lastFoodCount = 0;
public SubTileGourmaryllis() {
@@ -109,7 +109,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower {
addMana(digestingMana);
digestingMana = 0;
float burpPitch = 1 - (lastFoodCount - 1) * 0.05F;
float burpPitch = (float) Math.pow(2.0, (streakLength == 0 ? -lastFoodCount : streakLength) / 12.0);
getWorld().playSound(null, getEffectivePos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, burpPitch);
sync();
} else if (cooldown % munchInterval == 0) {
@@ -31,10 +31,10 @@ public class ModPotions {
public static void registerPotions(RegistryEvent.Register<Effect> evt) {
IForgeRegistry<Effect> r = evt.getRegistry();
register(r, LibPotionNames.SOUL_CROSS, soulCross);
register(r, LibPotionNames.FEATHER_FEET, soulCross);
register(r, LibPotionNames.EMPTINESS, soulCross);
register(r, LibPotionNames.BLOODTHIRST, soulCross);
register(r, LibPotionNames.ALLURE, soulCross);
register(r, LibPotionNames.CLEAR, soulCross);
register(r, LibPotionNames.FEATHER_FEET, featherfeet);
register(r, LibPotionNames.EMPTINESS, emptiness);
register(r, LibPotionNames.BLOODTHIRST, bloodthrst);
register(r, LibPotionNames.ALLURE, allure);
register(r, LibPotionNames.CLEAR, clear);
}
}