From ed4a371fa06a63237127b6c2eb436f15709ed4f3 Mon Sep 17 00:00:00 2001
From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
Date: Sun, 13 Feb 2022 14:41:09 -0800
Subject: [PATCH] Shootable glow berries

- Add glow berries as a potato cannon projectile type; Closes #2406
---
 .../weapons/BuiltinPotatoProjectileTypes.java    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/BuiltinPotatoProjectileTypes.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/BuiltinPotatoProjectileTypes.java
index d0b1ceb97..f9ddc997f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/BuiltinPotatoProjectileTypes.java
+++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/BuiltinPotatoProjectileTypes.java
@@ -98,6 +98,16 @@ public class BuiltinPotatoProjectileTypes {
 			.soundPitch(1.25f)
 			.registerAndAssign(Items.SWEET_BERRIES),
 
+		GLOW_BERRIES = create("glow_berry").damage(2)
+			.reloadTicks(10)
+			.knockback(0.05f)
+			.velocity(1.05f)
+			.renderTumbling()
+			.splitInto(2)
+			.soundPitch(1.2f)
+			.onEntityHit(potion(MobEffects.GLOWING, 1, 200, false))
+			.registerAndAssign(Items.GLOW_BERRIES),
+
 		CHOCOLATE_BERRIES = create("chocolate_berry").damage(4)
 			.reloadTicks(10)
 			.knockback(0.2f)
@@ -112,7 +122,7 @@ public class BuiltinPotatoProjectileTypes {
 			.knockback(0.05f)
 			.velocity(1.25f)
 			.renderTumbling()
-			.onEntityHit(potion(MobEffects.POISON, 1,160, true))
+			.onEntityHit(potion(MobEffects.POISON, 1, 160, true))
 			.registerAndAssign(Items.POISONOUS_POTATO),
 
 		CHORUS_FRUIT = create("chorus_fruit").damage(3)
@@ -188,7 +198,7 @@ public class BuiltinPotatoProjectileTypes {
 			.soundPitch(1.5f)
 			.registerAndAssign(Items.MELON_SLICE),
 
-		GLISTENING_MELON = create("glistening_melon").damage(5)
+		GLISTERING_MELON = create("glistering_melon").damage(5)
 			.reloadTicks(8)
 			.knockback(0.1f)
 			.velocity(1.45f)
@@ -283,7 +293,7 @@ public class BuiltinPotatoProjectileTypes {
 		};
 	}
 
-	public static void applyEffect(LivingEntity entity, MobEffectInstance effect) {
+	private static void applyEffect(LivingEntity entity, MobEffectInstance effect) {
 		if (effect.getEffect().isInstantenous())
 			effect.getEffect().applyInstantenousEffect(null, null, entity, effect.getDuration(), 1.0);
 		else