Skip to content

Commit d8afce2

Browse files
kennytvkennytv
committed
Split thrown potion
1 parent 91a38cd commit d8afce2

File tree

8 files changed

+103
-49
lines changed

8 files changed

+103
-49
lines changed

‎paper-api/src/main/java/org/bukkit/entity/EntityType.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,13 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
110110
*/
111111
EYE_OF_ENDER("eye_of_ender", EnderSignal.class, 15),
112112
/**
113-
* A flying splash potion.
113+
* A thrown splash potion.
114114
*/
115-
POTION("potion", ThrownPotion.class, 16),
115+
SPLASH_POTION("splash_potion", SplashPotion.class, 16),
116+
/**
117+
* A thrown lingering potion.
118+
*/
119+
LINGERING_POTION("lingering_potion", LingeringPotion.class, -1),
116120
/**
117121
* A flying experience bottle.
118122
*/

‎paper-api/src/main/java/org/bukkit/entity/LingeringPotion.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
/**
44
* Represents a thrown lingering potion bottle
5-
*
6-
* @deprecated should not be used for anything, use {@link ThrownPotion} and
7-
* set the potion via the methods there.
85
*/
9-
@Deprecated(since = "1.20.5", forRemoval = true) // Paper
10-
public interface LingeringPotion extends ThrownPotion { }
6+
public interface LingeringPotion extends ThrownPotion {
7+
}

‎paper-api/src/main/java/org/bukkit/entity/SplashPotion.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
/**
44
* Represents a thrown splash potion bottle
5-
*
6-
* @deprecated should not be used for anything, use {@link ThrownPotion} and
7-
* set the potion via the methods there.
85
*/
9-
@Deprecated(since = "1.14", forRemoval = true) // Paper
10-
public interface SplashPotion extends ThrownPotion { }
6+
public interface SplashPotion extends ThrownPotion {
7+
}

‎paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.bukkit.craftbukkit.block.data.CraftBlockData;
3737
import org.bukkit.craftbukkit.entity.CraftEntity;
3838
import org.bukkit.craftbukkit.entity.CraftEntityTypes;
39-
import org.bukkit.craftbukkit.inventory.CraftItemStack;
4039
import org.bukkit.craftbukkit.util.BlockStateListPopulator;
4140
import org.bukkit.craftbukkit.util.CraftLocation;
4241
import org.bukkit.craftbukkit.util.RandomSourceWrapper;
@@ -48,7 +47,6 @@
4847
import org.bukkit.entity.Fireball;
4948
import org.bukkit.entity.Horse;
5049
import org.bukkit.entity.LargeFireball;
51-
import org.bukkit.entity.LingeringPotion;
5250
import org.bukkit.entity.LivingEntity;
5351
import org.bukkit.entity.Minecart;
5452
import org.bukkit.entity.SizedFireball;
@@ -57,7 +55,6 @@
5755
import org.bukkit.entity.TippedArrow;
5856
import org.bukkit.entity.minecart.RideableMinecart;
5957
import org.bukkit.event.entity.CreatureSpawnEvent;
60-
import org.bukkit.inventory.ItemStack;
6158
import org.bukkit.potion.PotionType;
6259

6360
public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -476,15 +473,12 @@ public net.minecraft.world.entity.Entity createEntity(Location location, Class<?
476473
clazz = Horse.class;
477474
} else if (clazz == Fireball.class) {
478475
clazz = LargeFireball.class;
479-
} else if (clazz == LingeringPotion.class) {
480-
clazz = ThrownPotion.class;
481-
runOld = other -> ((net.minecraft.world.entity.projectile.ThrownPotion) other).setItem(CraftItemStack.asNMSCopy(new ItemStack(org.bukkit.Material.LINGERING_POTION, 1)));
476+
} else if (clazz == ThrownPotion.class) {
477+
clazz = SplashPotion.class;
482478
} else if (clazz == Minecart.class) {
483479
clazz = RideableMinecart.class;
484480
} else if (clazz == SizedFireball.class) {
485481
clazz = LargeFireball.class;
486-
} else if (clazz == SplashPotion.class) {
487-
clazz = ThrownPotion.class;
488482
} else if (clazz == TippedArrow.class) {
489483
clazz = Arrow.class;
490484
runOld = other -> ((Arrow) other.getBukkitEntity()).setBasePotionType(PotionType.WATER);

‎paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import net.minecraft.world.entity.projectile.EyeOfEnder;
2121
import net.minecraft.world.entity.projectile.FireworkRocketEntity;
2222
import net.minecraft.world.entity.projectile.ThrownEgg;
23+
import net.minecraft.world.entity.projectile.ThrownLingeringPotion;
24+
import net.minecraft.world.entity.projectile.ThrownSplashPotion;
2325
import net.minecraft.world.entity.vehicle.AbstractMinecart;
2426
import net.minecraft.world.item.ItemStack;
2527
import net.minecraft.world.item.Items;
@@ -116,6 +118,7 @@
116118
import org.bukkit.entity.LargeFireball;
117119
import org.bukkit.entity.LeashHitch;
118120
import org.bukkit.entity.LightningStrike;
121+
import org.bukkit.entity.LingeringPotion;
119122
import org.bukkit.entity.Llama;
120123
import org.bukkit.entity.LlamaSpit;
121124
import org.bukkit.entity.MagmaCube;
@@ -152,6 +155,7 @@
152155
import org.bukkit.entity.Snowman;
153156
import org.bukkit.entity.SpectralArrow;
154157
import org.bukkit.entity.Spider;
158+
import org.bukkit.entity.SplashPotion;
155159
import org.bukkit.entity.Squid;
156160
import org.bukkit.entity.Stray;
157161
import org.bukkit.entity.Strider;
@@ -441,14 +445,12 @@ Level minecraftWorld() {
441445
combine(combine(spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null), CLEAR_MOVE_IF_NOT_RANDOMIZED), (spawnData, experienceOrb) -> { if (!spawnData.randomizeData()) { experienceOrb.setYRot(0); } }) // Paper - respect randomizeData
442446
));
443447
register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, createAndMove(net.minecraft.world.entity.EntityType.AREA_EFFECT_CLOUD))); // Paper - set area effect cloud rotation
444-
register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), new net.minecraft.world.item.ItemStack(Items.EGG))));
448+
register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), new ItemStack(Items.EGG))));
445449
register(new EntityTypeData<>(EntityType.LEASH_KNOT, LeashHitch.class, CraftLeash::new, spawnData -> new LeashFenceKnotEntity(spawnData.minecraftWorld(), BlockPos.containing(spawnData.x(), spawnData.y(), spawnData.z())))); // SPIGOT-5732: LeashHitch has no direction and is always centered at a block
446-
register(new EntityTypeData<>(EntityType.SNOWBALL, Snowball.class, CraftSnowball::new, spawnData -> new net.minecraft.world.entity.projectile.Snowball(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), new net.minecraft.world.item.ItemStack(Items.SNOWBALL))));
450+
register(new EntityTypeData<>(EntityType.SNOWBALL, Snowball.class, CraftSnowball::new, spawnData -> new net.minecraft.world.entity.projectile.Snowball(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), new ItemStack(Items.SNOWBALL))));
447451
register(new EntityTypeData<>(EntityType.EYE_OF_ENDER, EnderSignal.class, CraftEnderSignal::new, spawnData -> new EyeOfEnder(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z())));
448-
register(new EntityTypeData<>(EntityType.POTION, ThrownPotion.class, CraftThrownPotion::new, spawnData -> {
449-
net.minecraft.world.entity.projectile.ThrownPotion entity = new net.minecraft.world.entity.projectile.ThrownPotion(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), new net.minecraft.world.item.ItemStack(Items.SPLASH_POTION));
450-
return entity;
451-
}));
452+
register(new EntityTypeData<>(EntityType.SPLASH_POTION, SplashPotion.class, CraftThrownSplashPotion::new, spawnData -> new ThrownSplashPotion(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), new ItemStack(Items.SPLASH_POTION))));
453+
register(new EntityTypeData<>(EntityType.LINGERING_POTION, LingeringPotion.class, CraftThrownLingeringPotion::new, spawnData -> new ThrownLingeringPotion(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), new ItemStack(Items.LINGERING_POTION))));
452454
register(new EntityTypeData<>(EntityType.TNT, TNTPrimed.class, CraftTNTPrimed::new, combine(spawnData -> new PrimedTnt(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), null), CLEAR_MOVE_IF_NOT_RANDOMIZED))); // Paper - respect randomizeData
453455
register(new EntityTypeData<>(EntityType.FALLING_BLOCK, FallingBlock.class, CraftFallingBlock::new, spawnData -> {
454456
BlockPos pos = BlockPos.containing(spawnData.x(), spawnData.y(), spawnData.z());

‎paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownLingeringPotion.java

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package org.bukkit.craftbukkit.entity;
2+
3+
import com.google.common.base.Preconditions;
4+
import net.minecraft.world.entity.projectile.ThrownLingeringPotion;
5+
import org.bukkit.Material;
6+
import org.bukkit.craftbukkit.CraftServer;
7+
import org.bukkit.craftbukkit.inventory.CraftItemStack;
8+
import org.bukkit.entity.LingeringPotion;
9+
import org.bukkit.inventory.ItemStack;
10+
import org.bukkit.inventory.ItemType;
11+
import org.bukkit.inventory.meta.PotionMeta;
12+
13+
public class CraftThrownLingeringPotion extends CraftThrownPotion implements LingeringPotion {
14+
15+
public CraftThrownLingeringPotion(final CraftServer server, final ThrownLingeringPotion entity) {
16+
super(server, entity);
17+
}
18+
19+
@Override
20+
public void setItem(final ItemStack item) {
21+
Preconditions.checkArgument(item != null, "ItemStack cannot be null");
22+
final PotionMeta meta = item.getType() == Material.LINGERING_POTION ? null : this.getPotionMeta();
23+
this.getHandle().setItem(CraftItemStack.asNMSCopy(item));
24+
if (meta != null) {
25+
this.setPotionMeta(meta);
26+
}
27+
}
28+
29+
@Override
30+
public PotionMeta getPotionMeta() {
31+
return (PotionMeta) CraftItemStack.getItemMeta(this.getHandle().getItem(), ItemType.LINGERING_POTION);
32+
}
33+
34+
@Override
35+
public ThrownLingeringPotion getHandle() {
36+
return (ThrownLingeringPotion) this.entity;
37+
}
38+
}

‎paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java

+7-23
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package org.bukkit.craftbukkit.entity;
22

3-
import com.google.common.base.Preconditions;
43
import com.google.common.collect.ImmutableList;
54
import java.util.Collection;
65
import net.minecraft.core.component.DataComponents;
76
import net.minecraft.world.effect.MobEffectInstance;
7+
import net.minecraft.world.entity.projectile.AbstractThrownPotion;
88
import net.minecraft.world.item.alchemy.PotionContents;
9-
import org.bukkit.Material;
109
import org.bukkit.craftbukkit.CraftServer;
1110
import org.bukkit.craftbukkit.inventory.CraftItemStack;
1211
import org.bukkit.craftbukkit.potion.CraftPotionUtil;
1312
import org.bukkit.entity.ThrownPotion;
1413
import org.bukkit.inventory.ItemStack;
1514
import org.bukkit.potion.PotionEffect;
1615

17-
public class CraftThrownPotion extends CraftThrowableProjectile implements ThrownPotion, org.bukkit.entity.SplashPotion, org.bukkit.entity.LingeringPotion { // Paper - implement other classes to avoid violating spawn method generic contracts
18-
public CraftThrownPotion(CraftServer server, net.minecraft.world.entity.projectile.AbstractThrownPotion entity) {
16+
public abstract class CraftThrownPotion extends CraftThrowableProjectile implements ThrownPotion {
17+
18+
protected CraftThrownPotion(CraftServer server, AbstractThrownPotion entity) {
1919
super(server, entity);
2020
}
2121

@@ -33,22 +33,6 @@ public ItemStack getItem() {
3333
return CraftItemStack.asBukkitCopy(this.getHandle().getItem());
3434
}
3535

36-
@Override
37-
public void setItem(ItemStack item) {
38-
Preconditions.checkArgument(item != null, "ItemStack cannot be null");
39-
// Preconditions.checkArgument(item.getType() == Material.LINGERING_POTION || item.getType() == Material.SPLASH_POTION, "ItemStack material must be Material.LINGERING_POTION or Material.SPLASH_POTION but was Material.%s", item.getType()); // Paper - Projectile API
40-
org.bukkit.inventory.meta.PotionMeta meta = (item.getType() == Material.LINGERING_POTION || item.getType() == Material.SPLASH_POTION) ? null : this.getPotionMeta(); // Paper - Projectile API
41-
42-
this.getHandle().setItem(CraftItemStack.asNMSCopy(item));
43-
if (meta != null) this.setPotionMeta(meta); // Paper - Projectile API
44-
}
45-
46-
// Paper start - Projectile API
47-
@Override
48-
public org.bukkit.inventory.meta.PotionMeta getPotionMeta() {
49-
return (org.bukkit.inventory.meta.PotionMeta) CraftItemStack.getItemMeta(this.getHandle().getItem(), org.bukkit.inventory.ItemType.SPLASH_POTION);
50-
}
51-
5236
@Override
5337
public void setPotionMeta(org.bukkit.inventory.meta.PotionMeta meta) {
5438
net.minecraft.world.item.ItemStack item = this.getHandle().getItem();
@@ -60,9 +44,9 @@ public void setPotionMeta(org.bukkit.inventory.meta.PotionMeta meta) {
6044
public void splash() {
6145
this.getHandle().splash(null);
6246
}
63-
// Paper end
47+
6448
@Override
65-
public net.minecraft.world.entity.projectile.AbstractThrownPotion getHandle() {
66-
return (net.minecraft.world.entity.projectile.AbstractThrownPotion) this.entity;
49+
public AbstractThrownPotion getHandle() {
50+
return (AbstractThrownPotion) this.entity;
6751
}
6852
}

‎paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownSplashPotion.java

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package org.bukkit.craftbukkit.entity;
2+
3+
import com.google.common.base.Preconditions;
4+
import net.minecraft.world.entity.projectile.ThrownSplashPotion;
5+
import org.bukkit.Material;
6+
import org.bukkit.craftbukkit.CraftServer;
7+
import org.bukkit.craftbukkit.inventory.CraftItemStack;
8+
import org.bukkit.entity.SplashPotion;
9+
import org.bukkit.inventory.ItemStack;
10+
import org.bukkit.inventory.ItemType;
11+
import org.bukkit.inventory.meta.PotionMeta;
12+
13+
public class CraftThrownSplashPotion extends CraftThrownPotion implements SplashPotion {
14+
15+
public CraftThrownSplashPotion(final CraftServer server, final ThrownSplashPotion entity) {
16+
super(server, entity);
17+
}
18+
19+
@Override
20+
public void setItem(final ItemStack item) {
21+
Preconditions.checkArgument(item != null, "ItemStack cannot be null");
22+
final PotionMeta meta = item.getType() == Material.SPLASH_POTION ? null : this.getPotionMeta();
23+
this.getHandle().setItem(CraftItemStack.asNMSCopy(item));
24+
if (meta != null) {
25+
this.setPotionMeta(meta);
26+
}
27+
}
28+
29+
@Override
30+
public PotionMeta getPotionMeta() {
31+
return (PotionMeta) CraftItemStack.getItemMeta(this.getHandle().getItem(), ItemType.SPLASH_POTION);
32+
}
33+
34+
@Override
35+
public ThrownSplashPotion getHandle() {
36+
return (ThrownSplashPotion) this.entity;
37+
}
38+
}

0 commit comments

Comments
 (0)