2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-11-27 09:11:43 +01:00
|
|
|
From: MiniDigger <admin@benndorf.dev>
|
2021-06-11 14:02:28 +02:00
|
|
|
Date: Fri, 3 Jan 2020 16:26:19 +0100
|
|
|
|
Subject: [PATCH] Implement Mob Goal API
|
|
|
|
|
|
|
|
|
2021-06-14 04:40:12 +02:00
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
2024-01-14 10:46:04 +01:00
|
|
|
index 450f7c03bdcc109938ba9b66328bdbb2c96c03c9..c6241f858209ed662d8720217d143340916024e9 100644
|
2021-06-14 04:40:12 +02:00
|
|
|
--- a/build.gradle.kts
|
|
|
|
+++ b/build.gradle.kts
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -44,6 +44,7 @@ dependencies {
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
|
|
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
2021-06-14 04:40:12 +02:00
|
|
|
|
|
|
|
+ testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
|
2023-09-24 09:16:58 +02:00
|
|
|
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
|
|
|
|
testImplementation("org.hamcrest:hamcrest:2.2")
|
2023-10-22 21:12:00 +02:00
|
|
|
testImplementation("org.mockito:mockito-core:5.5.0")
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
|
|
|
|
new file mode 100644
|
2024-01-23 18:01:39 +01:00
|
|
|
index 0000000000000000000000000000000000000000..8117578ced94aa6bf01871f6526a388385c4adf2
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
|
2023-12-08 21:07:56 +01:00
|
|
|
@@ -0,0 +1,376 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+import com.destroystokyo.paper.entity.RangedEntity;
|
|
|
|
+import com.destroystokyo.paper.util.set.OptimizedSmallEnumSet;
|
|
|
|
+import com.google.common.collect.BiMap;
|
|
|
|
+import com.google.common.collect.HashBiMap;
|
2021-09-09 18:57:16 +02:00
|
|
|
+import io.papermc.paper.util.ObfHelper;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import java.lang.reflect.Constructor;
|
|
|
|
+import java.util.EnumSet;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.HashSet;
|
|
|
|
+import java.util.Map;
|
|
|
|
+import java.util.Set;
|
|
|
|
+import net.minecraft.world.entity.FlyingMob;
|
|
|
|
+import net.minecraft.world.entity.PathfinderMob;
|
|
|
|
+import net.minecraft.world.entity.TamableAnimal;
|
|
|
|
+import net.minecraft.world.entity.ai.goal.Goal;
|
|
|
|
+import net.minecraft.world.entity.ambient.AmbientCreature;
|
|
|
|
+import net.minecraft.world.entity.animal.AbstractFish;
|
|
|
|
+import net.minecraft.world.entity.animal.AbstractGolem;
|
|
|
|
+import net.minecraft.world.entity.animal.AbstractSchoolingFish;
|
|
|
|
+import net.minecraft.world.entity.animal.Animal;
|
|
|
|
+import net.minecraft.world.entity.animal.Pufferfish;
|
|
|
|
+import net.minecraft.world.entity.animal.ShoulderRidingEntity;
|
|
|
|
+import net.minecraft.world.entity.animal.SnowGolem;
|
|
|
|
+import net.minecraft.world.entity.animal.WaterAnimal;
|
2022-12-08 19:23:12 +01:00
|
|
|
+import net.minecraft.world.entity.animal.camel.Camel;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
|
|
|
|
+import net.minecraft.world.entity.boss.wither.WitherBoss;
|
|
|
|
+import net.minecraft.world.entity.monster.AbstractIllager;
|
|
|
|
+import net.minecraft.world.entity.monster.EnderMan;
|
|
|
|
+import net.minecraft.world.entity.monster.PatrollingMonster;
|
|
|
|
+import net.minecraft.world.entity.monster.RangedAttackMob;
|
|
|
|
+import net.minecraft.world.entity.monster.SpellcasterIllager;
|
|
|
|
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
|
2023-12-08 21:07:56 +01:00
|
|
|
+import net.minecraft.world.entity.monster.breeze.Breeze;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import net.minecraft.world.entity.monster.piglin.AbstractPiglin;
|
|
|
|
+import org.bukkit.NamespacedKey;
|
|
|
|
+import org.bukkit.entity.AbstractHorse;
|
2021-08-06 19:05:53 +02:00
|
|
|
+import org.bukkit.entity.AbstractSkeleton;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import org.bukkit.entity.AbstractVillager;
|
|
|
|
+import org.bukkit.entity.Ageable;
|
|
|
|
+import org.bukkit.entity.Ambient;
|
|
|
|
+import org.bukkit.entity.Animals;
|
|
|
|
+import org.bukkit.entity.Bat;
|
|
|
|
+import org.bukkit.entity.Bee;
|
|
|
|
+import org.bukkit.entity.Blaze;
|
|
|
|
+import org.bukkit.entity.Cat;
|
|
|
|
+import org.bukkit.entity.CaveSpider;
|
|
|
|
+import org.bukkit.entity.ChestedHorse;
|
|
|
|
+import org.bukkit.entity.Chicken;
|
|
|
|
+import org.bukkit.entity.Cod;
|
|
|
|
+import org.bukkit.entity.Cow;
|
|
|
|
+import org.bukkit.entity.Creature;
|
|
|
|
+import org.bukkit.entity.Creeper;
|
|
|
|
+import org.bukkit.entity.Dolphin;
|
|
|
|
+import org.bukkit.entity.Donkey;
|
|
|
|
+import org.bukkit.entity.Drowned;
|
|
|
|
+import org.bukkit.entity.ElderGuardian;
|
|
|
|
+import org.bukkit.entity.EnderDragon;
|
|
|
|
+import org.bukkit.entity.Enderman;
|
|
|
|
+import org.bukkit.entity.Endermite;
|
|
|
|
+import org.bukkit.entity.Evoker;
|
|
|
|
+import org.bukkit.entity.Fish;
|
|
|
|
+import org.bukkit.entity.Flying;
|
|
|
|
+import org.bukkit.entity.Fox;
|
|
|
|
+import org.bukkit.entity.Ghast;
|
|
|
|
+import org.bukkit.entity.Giant;
|
|
|
|
+import org.bukkit.entity.Golem;
|
|
|
|
+import org.bukkit.entity.Guardian;
|
|
|
|
+import org.bukkit.entity.Hoglin;
|
|
|
|
+import org.bukkit.entity.Horse;
|
|
|
|
+import org.bukkit.entity.Husk;
|
|
|
|
+import org.bukkit.entity.Illager;
|
|
|
|
+import org.bukkit.entity.Illusioner;
|
|
|
|
+import org.bukkit.entity.IronGolem;
|
|
|
|
+import org.bukkit.entity.Llama;
|
|
|
|
+import org.bukkit.entity.MagmaCube;
|
|
|
|
+import org.bukkit.entity.Mob;
|
|
|
|
+import org.bukkit.entity.Monster;
|
|
|
|
+import org.bukkit.entity.Mule;
|
|
|
|
+import org.bukkit.entity.MushroomCow;
|
|
|
|
+import org.bukkit.entity.Ocelot;
|
|
|
|
+import org.bukkit.entity.Panda;
|
|
|
|
+import org.bukkit.entity.Parrot;
|
|
|
|
+import org.bukkit.entity.Phantom;
|
|
|
|
+import org.bukkit.entity.Pig;
|
|
|
|
+import org.bukkit.entity.PigZombie;
|
|
|
|
+import org.bukkit.entity.Piglin;
|
|
|
|
+import org.bukkit.entity.PiglinAbstract;
|
|
|
|
+import org.bukkit.entity.PiglinBrute;
|
|
|
|
+import org.bukkit.entity.Pillager;
|
|
|
|
+import org.bukkit.entity.PolarBear;
|
|
|
|
+import org.bukkit.entity.PufferFish;
|
|
|
|
+import org.bukkit.entity.Rabbit;
|
|
|
|
+import org.bukkit.entity.Raider;
|
|
|
|
+import org.bukkit.entity.Ravager;
|
|
|
|
+import org.bukkit.entity.Salmon;
|
|
|
|
+import org.bukkit.entity.Sheep;
|
|
|
|
+import org.bukkit.entity.Shulker;
|
|
|
|
+import org.bukkit.entity.Silverfish;
|
|
|
|
+import org.bukkit.entity.Skeleton;
|
|
|
|
+import org.bukkit.entity.SkeletonHorse;
|
|
|
|
+import org.bukkit.entity.Slime;
|
|
|
|
+import org.bukkit.entity.Snowman;
|
|
|
|
+import org.bukkit.entity.Spellcaster;
|
|
|
|
+import org.bukkit.entity.Spider;
|
|
|
|
+import org.bukkit.entity.Squid;
|
|
|
|
+import org.bukkit.entity.Stray;
|
|
|
|
+import org.bukkit.entity.Strider;
|
|
|
|
+import org.bukkit.entity.Tameable;
|
|
|
|
+import org.bukkit.entity.TraderLlama;
|
|
|
|
+import org.bukkit.entity.TropicalFish;
|
|
|
|
+import org.bukkit.entity.Turtle;
|
|
|
|
+import org.bukkit.entity.Vex;
|
|
|
|
+import org.bukkit.entity.Villager;
|
|
|
|
+import org.bukkit.entity.Vindicator;
|
|
|
|
+import org.bukkit.entity.WanderingTrader;
|
|
|
|
+import org.bukkit.entity.WaterMob;
|
|
|
|
+import org.bukkit.entity.Witch;
|
|
|
|
+import org.bukkit.entity.Wither;
|
|
|
|
+import org.bukkit.entity.WitherSkeleton;
|
|
|
|
+import org.bukkit.entity.Wolf;
|
|
|
|
+import org.bukkit.entity.Zoglin;
|
|
|
|
+import org.bukkit.entity.Zombie;
|
|
|
|
+import org.bukkit.entity.ZombieHorse;
|
|
|
|
+import org.bukkit.entity.ZombieVillager;
|
|
|
|
+
|
|
|
|
+public class MobGoalHelper {
|
|
|
|
+
|
|
|
|
+ private static final BiMap<String, String> deobfuscationMap = HashBiMap.create();
|
|
|
|
+ private static final Map<Class<? extends Goal>, Class<? extends Mob>> entityClassCache = new HashMap<>();
|
|
|
|
+ private static final Map<Class<? extends net.minecraft.world.entity.Mob>, Class<? extends Mob>> bukkitMap = new HashMap<>();
|
|
|
|
+
|
|
|
|
+ static final Set<String> ignored = new HashSet<>();
|
|
|
|
+
|
|
|
|
+ static {
|
|
|
|
+ // TODO these kinda should be checked on each release, in case obfuscation changes
|
2021-08-06 19:05:53 +02:00
|
|
|
+ deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2021-06-14 04:40:12 +02:00
|
|
|
+ ignored.add("goal_selector_1");
|
|
|
|
+ ignored.add("goal_selector_2");
|
2021-06-16 00:47:05 +02:00
|
|
|
+ ignored.add("selector_1");
|
|
|
|
+ ignored.add("selector_2");
|
2021-06-11 14:02:28 +02:00
|
|
|
+ ignored.add("wrapped");
|
|
|
|
+
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
|
2021-06-14 04:40:12 +02:00
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.AgeableMob.class, Ageable.class);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ bukkitMap.put(AmbientCreature.class, Ambient.class);
|
|
|
|
+ bukkitMap.put(Animal.class, Animals.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.ambient.Bat.class, Bat.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Bee.class, Bee.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Blaze.class, Blaze.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Cat.class, Cat.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.CaveSpider.class, CaveSpider.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Chicken.class, Chicken.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Cod.class, Cod.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Cow.class, Cow.class);
|
|
|
|
+ bukkitMap.put(PathfinderMob.class, Creature.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Creeper.class, Creeper.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Dolphin.class, Dolphin.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Drowned.class, Drowned.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.boss.enderdragon.EnderDragon.class, EnderDragon.class);
|
|
|
|
+ bukkitMap.put(EnderMan.class, Enderman.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Endermite.class, Endermite.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Evoker.class, Evoker.class);
|
|
|
|
+ bukkitMap.put(AbstractFish.class, Fish.class);
|
|
|
|
+ bukkitMap.put(AbstractSchoolingFish.class, Fish.class); // close enough
|
|
|
|
+ bukkitMap.put(FlyingMob.class, Flying.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Fox.class, Fox.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Ghast.class, Ghast.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Giant.class, Giant.class);
|
|
|
|
+ bukkitMap.put(AbstractGolem.class, Golem.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Guardian.class, Guardian.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.ElderGuardian.class, ElderGuardian.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.Horse.class, Horse.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.AbstractHorse.class, AbstractHorse.class);
|
|
|
|
+ bukkitMap.put(AbstractChestedHorse.class, ChestedHorse.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.Donkey.class, Donkey.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.Mule.class, Mule.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.SkeletonHorse.class, SkeletonHorse.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.ZombieHorse.class, ZombieHorse.class);
|
2022-12-08 19:23:12 +01:00
|
|
|
+ bukkitMap.put(Camel.class, org.bukkit.entity.Camel.class);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ bukkitMap.put(AbstractIllager.class, Illager.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Illusioner.class, Illusioner.class);
|
|
|
|
+ bukkitMap.put(SpellcasterIllager.class, Spellcaster.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.IronGolem.class, IronGolem.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.Llama.class, Llama.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.horse.TraderLlama.class, TraderLlama.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.MagmaCube.class, MagmaCube.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Monster.class, Monster.class);
|
2021-08-06 19:05:53 +02:00
|
|
|
+ bukkitMap.put(PatrollingMonster.class, Raider.class); // close enough
|
2021-06-11 14:02:28 +02:00
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.MushroomCow.class, MushroomCow.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Ocelot.class, Ocelot.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Panda.class, Panda.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Parrot.class, Parrot.class);
|
|
|
|
+ bukkitMap.put(ShoulderRidingEntity.class, Parrot.class); // close enough
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Phantom.class, Phantom.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Pig.class, Pig.class);
|
|
|
|
+ bukkitMap.put(ZombifiedPiglin.class, PigZombie.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Pillager.class, Pillager.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.PolarBear.class, PolarBear.class);
|
|
|
|
+ bukkitMap.put(Pufferfish.class, PufferFish.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Rabbit.class, Rabbit.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.raid.Raider.class, Raider.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Ravager.class, Ravager.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Salmon.class, Salmon.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Sheep.class, Sheep.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Shulker.class, Shulker.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Silverfish.class, Silverfish.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Skeleton.class, Skeleton.class);
|
2021-08-06 19:05:53 +02:00
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.AbstractSkeleton.class, AbstractSkeleton.class);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Stray.class, Stray.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.WitherSkeleton.class, WitherSkeleton.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Slime.class, Slime.class);
|
|
|
|
+ bukkitMap.put(SnowGolem.class, Snowman.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Spider.class, Spider.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Squid.class, Squid.class);
|
|
|
|
+ bukkitMap.put(TamableAnimal.class, Tameable.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.TropicalFish.class, TropicalFish.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Turtle.class, Turtle.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Vex.class, Vex.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.npc.Villager.class, Villager.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.npc.AbstractVillager.class, AbstractVillager.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.npc.WanderingTrader.class, WanderingTrader.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Vindicator.class, Vindicator.class);
|
|
|
|
+ bukkitMap.put(WaterAnimal.class, WaterMob.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Witch.class, Witch.class);
|
|
|
|
+ bukkitMap.put(WitherBoss.class, Wither.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.Wolf.class, Wolf.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Zombie.class, Zombie.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Husk.class, Husk.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.ZombieVillager.class, ZombieVillager.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.hoglin.Hoglin.class, Hoglin.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.piglin.Piglin.class, Piglin.class);
|
|
|
|
+ bukkitMap.put(AbstractPiglin.class, PiglinAbstract.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.piglin.PiglinBrute.class, PiglinBrute.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Strider.class, Strider.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Zoglin.class, Zoglin.class);
|
2021-06-14 04:40:12 +02:00
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.GlowSquid.class, org.bukkit.entity.GlowSquid.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.axolotl.Axolotl.class, org.bukkit.entity.Axolotl.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.goat.Goat.class, org.bukkit.entity.Goat.class);
|
2022-06-08 18:18:49 +02:00
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.frog.Frog.class, org.bukkit.entity.Frog.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.frog.Tadpole.class, org.bukkit.entity.Tadpole.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.warden.Warden.class, org.bukkit.entity.Warden.class);
|
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.allay.Allay.class, org.bukkit.entity.Allay.class);
|
2023-03-15 00:29:38 +01:00
|
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.sniffer.Sniffer.class, org.bukkit.entity.Sniffer.class);
|
2023-12-08 21:07:56 +01:00
|
|
|
+ bukkitMap.put(Breeze.class, org.bukkit.entity.Breeze.class);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static String getUsableName(Class<?> clazz) {
|
2021-09-09 18:57:16 +02:00
|
|
|
+ String name = ObfHelper.INSTANCE.deobfClassName(clazz.getName());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ name = name.substring(name.lastIndexOf(".") + 1);
|
|
|
|
+ boolean flag = false;
|
|
|
|
+ // inner classes
|
|
|
|
+ if (name.contains("$")) {
|
|
|
|
+ String cut = name.substring(name.indexOf("$") + 1);
|
|
|
|
+ if (cut.length() <= 2) {
|
|
|
|
+ name = name.replace("Entity", "");
|
|
|
|
+ name = name.replace("$", "_");
|
|
|
|
+ flag = true;
|
|
|
|
+ } else {
|
|
|
|
+ // mapped, wooo
|
|
|
|
+ name = cut;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ name = name.replace("PathfinderGoal", "");
|
2021-06-16 00:47:05 +02:00
|
|
|
+ name = name.replace("TargetGoal", "");
|
|
|
|
+ name = name.replace("Goal", "");
|
2021-06-11 14:02:28 +02:00
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
|
+ for (char c : name.toCharArray()) {
|
|
|
|
+ if (c >= 'A' && c <= 'Z') {
|
|
|
|
+ sb.append("_");
|
|
|
|
+ sb.append(Character.toLowerCase(c));
|
|
|
|
+ } else {
|
|
|
|
+ sb.append(c);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ name = sb.toString();
|
|
|
|
+ name = name.replaceFirst("_", "");
|
|
|
|
+
|
|
|
|
+ if (flag && !deobfuscationMap.containsKey(name.toLowerCase()) && !ignored.contains(name)) {
|
|
|
|
+ System.out.println("need to map " + clazz.getName() + " (" + name.toLowerCase() + ")");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // did we rename this key?
|
|
|
|
+ return deobfuscationMap.getOrDefault(name, name);
|
|
|
|
+ }
|
|
|
|
+
|
2024-01-23 18:01:39 +01:00
|
|
|
+ public static EnumSet<GoalType> vanillaToPaper(Goal goal) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ EnumSet<GoalType> goals = EnumSet.noneOf(GoalType.class);
|
|
|
|
+ for (GoalType type : GoalType.values()) {
|
2024-01-23 18:01:39 +01:00
|
|
|
+ if (goal.getFlags().contains(paperToVanilla(type))) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ goals.add(type);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static GoalType vanillaToPaper(Goal.Flag type) {
|
|
|
|
+ switch (type) {
|
|
|
|
+ case MOVE:
|
|
|
|
+ return GoalType.MOVE;
|
|
|
|
+ case LOOK:
|
|
|
|
+ return GoalType.LOOK;
|
|
|
|
+ case JUMP:
|
|
|
|
+ return GoalType.JUMP;
|
|
|
|
+ case UNKNOWN_BEHAVIOR:
|
|
|
|
+ return GoalType.UNKNOWN_BEHAVIOR;
|
|
|
|
+ case TARGET:
|
|
|
|
+ return GoalType.TARGET;
|
|
|
|
+ default:
|
|
|
|
+ throw new IllegalArgumentException("Unknown vanilla mob goal type " + type.name());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static EnumSet<Goal.Flag> paperToVanilla(EnumSet<GoalType> types) {
|
|
|
|
+ EnumSet<Goal.Flag> goals = EnumSet.noneOf(Goal.Flag.class);
|
|
|
|
+ for (GoalType type : types) {
|
|
|
|
+ goals.add(paperToVanilla(type));
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static Goal.Flag paperToVanilla(GoalType type) {
|
|
|
|
+ switch (type) {
|
|
|
|
+ case MOVE:
|
|
|
|
+ return Goal.Flag.MOVE;
|
|
|
|
+ case LOOK:
|
|
|
|
+ return Goal.Flag.LOOK;
|
|
|
|
+ case JUMP:
|
|
|
|
+ return Goal.Flag.JUMP;
|
|
|
|
+ case UNKNOWN_BEHAVIOR:
|
|
|
|
+ return Goal.Flag.UNKNOWN_BEHAVIOR;
|
|
|
|
+ case TARGET:
|
|
|
|
+ return Goal.Flag.TARGET;
|
|
|
|
+ default:
|
|
|
|
+ throw new IllegalArgumentException("Unknown paper mob goal type " + type.name());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static <T extends Mob> GoalKey<T> getKey(Class<? extends Goal> goalClass) {
|
|
|
|
+ String name = getUsableName(goalClass);
|
|
|
|
+ if (ignored.contains(name)) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ return (GoalKey<T>) GoalKey.of(Mob.class, NamespacedKey.minecraft(name));
|
|
|
|
+ }
|
|
|
|
+ return GoalKey.of(getEntity(goalClass), NamespacedKey.minecraft(name));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static <T extends Mob> Class<T> getEntity(Class<? extends Goal> goalClass) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ return (Class<T>) entityClassCache.computeIfAbsent(goalClass, key -> {
|
|
|
|
+ for (Constructor<?> ctor : key.getDeclaredConstructors()) {
|
|
|
|
+ for (int i = 0; i < ctor.getParameterCount(); i++) {
|
|
|
|
+ Class<?> param = ctor.getParameterTypes()[i];
|
|
|
|
+ if (net.minecraft.world.entity.Mob.class.isAssignableFrom(param)) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ return toBukkitClass((Class<? extends net.minecraft.world.entity.Mob>) param);
|
|
|
|
+ } else if (RangedAttackMob.class.isAssignableFrom(param)) {
|
|
|
|
+ return RangedEntity.class;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ throw new RuntimeException("Can't figure out applicable entity for mob goal " + goalClass); // maybe just return EntityInsentient?
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static Class<? extends Mob> toBukkitClass(Class<? extends net.minecraft.world.entity.Mob> nmsClass) {
|
|
|
|
+ Class<? extends Mob> bukkitClass = bukkitMap.get(nmsClass);
|
|
|
|
+ if (bukkitClass == null) {
|
|
|
|
+ throw new RuntimeException("Can't figure out applicable bukkit entity for nms entity " + nmsClass); // maybe just return Mob?
|
|
|
|
+ }
|
|
|
|
+ return bukkitClass;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java
|
|
|
|
new file mode 100644
|
2024-01-23 18:01:39 +01:00
|
|
|
index 0000000000000000000000000000000000000000..b5f75ad725f5933db8f0688b2c0b27d620919241
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java
|
2021-09-09 19:12:22 +02:00
|
|
|
@@ -0,0 +1,53 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+import org.bukkit.entity.Mob;
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Wraps api in vanilla
|
|
|
|
+ */
|
2021-06-14 04:40:12 +02:00
|
|
|
+public class PaperCustomGoal<T extends Mob> extends net.minecraft.world.entity.ai.goal.Goal {
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+ private final Goal<T> handle;
|
|
|
|
+
|
|
|
|
+ public PaperCustomGoal(Goal<T> handle) {
|
|
|
|
+ this.handle = handle;
|
|
|
|
+
|
2021-06-17 22:20:03 +02:00
|
|
|
+ this.setFlags(MobGoalHelper.paperToVanilla(handle.getTypes()));
|
2021-09-09 19:12:22 +02:00
|
|
|
+ if (this.getFlags().size() == 0) {
|
2024-01-23 18:01:39 +01:00
|
|
|
+ this.getFlags().add(Flag.UNKNOWN_BEHAVIOR);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-06-17 22:25:52 +02:00
|
|
|
+ public boolean canUse() {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return handle.shouldActivate();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-06-17 22:25:52 +02:00
|
|
|
+ public boolean canContinueToUse() {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return handle.shouldStayActive();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void start() {
|
|
|
|
+ handle.start();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-06-14 04:40:12 +02:00
|
|
|
+ public void stop() {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ handle.stop();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void tick() {
|
|
|
|
+ handle.tick();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public Goal<T> getHandle() {
|
|
|
|
+ return handle;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public GoalKey<T> getKey() {
|
|
|
|
+ return handle.getKey();
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
|
|
|
|
new file mode 100644
|
2024-01-23 18:01:39 +01:00
|
|
|
index 0000000000000000000000000000000000000000..953b0f88cbf0e73c390f8086344f772ac03192bb
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
|
2021-08-22 06:19:45 +02:00
|
|
|
@@ -0,0 +1,213 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+import java.util.Collection;
|
|
|
|
+import java.util.EnumSet;
|
|
|
|
+import java.util.HashSet;
|
|
|
|
+import java.util.LinkedList;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Set;
|
|
|
|
+import net.minecraft.world.entity.ai.goal.GoalSelector;
|
|
|
|
+import net.minecraft.world.entity.ai.goal.WrappedGoal;
|
|
|
|
+import org.bukkit.craftbukkit.entity.CraftMob;
|
|
|
|
+import org.bukkit.entity.Mob;
|
|
|
|
+
|
|
|
|
+public class PaperMobGoals implements MobGoals {
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> void addGoal(T mob, int priority, Goal<T> goal) {
|
|
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
|
|
+ getHandle(craftMob, goal.getTypes()).addGoal(priority, new PaperCustomGoal<>(goal));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> void removeGoal(T mob, Goal<T> goal) {
|
|
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
|
|
+ if (goal instanceof PaperCustomGoal) {
|
2021-06-14 04:40:12 +02:00
|
|
|
+ getHandle(craftMob, goal.getTypes()).removeGoal((net.minecraft.world.entity.ai.goal.Goal) goal);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } else if (goal instanceof PaperVanillaGoal) {
|
|
|
|
+ getHandle(craftMob, goal.getTypes()).removeGoal(((PaperVanillaGoal<?>) goal).getHandle());
|
|
|
|
+ } else {
|
2021-06-14 04:40:12 +02:00
|
|
|
+ List<net.minecraft.world.entity.ai.goal.Goal> toRemove = new LinkedList<>();
|
2022-11-20 00:53:20 +01:00
|
|
|
+ for (WrappedGoal item : getHandle(craftMob, goal.getTypes()).getAvailableGoals()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ if (((PaperCustomGoal<T>) item.getGoal()).getHandle() == goal) {
|
|
|
|
+ toRemove.add(item.getGoal());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-14 04:40:12 +02:00
|
|
|
+ for (net.minecraft.world.entity.ai.goal.Goal g : toRemove) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ getHandle(craftMob, goal.getTypes()).removeGoal(g);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> void removeAllGoals(T mob) {
|
|
|
|
+ for (GoalType type : GoalType.values()) {
|
|
|
|
+ removeAllGoals(mob, type);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> void removeAllGoals(T mob, GoalType type) {
|
|
|
|
+ for (Goal<T> goal : getAllGoals(mob, type)) {
|
|
|
|
+ removeGoal(mob, goal);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> void removeGoal(T mob, GoalKey<T> key) {
|
|
|
|
+ for (Goal<T> goal : getGoals(mob, key)) {
|
|
|
|
+ removeGoal(mob, goal);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> boolean hasGoal(T mob, GoalKey<T> key) {
|
|
|
|
+ for (Goal<T> g : getAllGoals(mob)) {
|
|
|
|
+ if (g.getKey().equals(key)) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Goal<T> getGoal(T mob, GoalKey<T> key) {
|
|
|
|
+ for (Goal<T> g : getAllGoals(mob)) {
|
|
|
|
+ if (g.getKey().equals(key)) {
|
|
|
|
+ return g;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Collection<Goal<T>> getGoals(T mob, GoalKey<T> key) {
|
|
|
|
+ Set<Goal<T>> goals = new HashSet<>();
|
|
|
|
+ for (Goal<T> g : getAllGoals(mob)) {
|
|
|
|
+ if (g.getKey().equals(key)) {
|
|
|
|
+ goals.add(g);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Collection<Goal<T>> getAllGoals(T mob) {
|
|
|
|
+ Set<Goal<T>> goals = new HashSet<>();
|
|
|
|
+ for (GoalType type : GoalType.values()) {
|
|
|
|
+ goals.addAll(getAllGoals(mob, type));
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Collection<Goal<T>> getAllGoals(T mob, GoalType type) {
|
|
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
|
|
+ Set<Goal<T>> goals = new HashSet<>();
|
2022-11-20 00:53:20 +01:00
|
|
|
+ for (WrappedGoal item : getHandle(craftMob, type).getAvailableGoals()) {
|
2024-01-23 18:01:39 +01:00
|
|
|
+ if (!item.getGoal().getFlags().contains(MobGoalHelper.paperToVanilla(type))) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
|
|
+ } else {
|
2021-08-22 06:19:45 +02:00
|
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Collection<Goal<T>> getAllGoalsWithout(T mob, GoalType type) {
|
|
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
|
|
+ Set<Goal<T>> goals = new HashSet<>();
|
|
|
|
+ for (GoalType internalType : GoalType.values()) {
|
|
|
|
+ if (internalType == type) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
2022-11-20 00:53:20 +01:00
|
|
|
+ for (WrappedGoal item : getHandle(craftMob, internalType).getAvailableGoals()) {
|
2024-01-23 18:01:39 +01:00
|
|
|
+ if (item.getGoal().getFlags().contains(MobGoalHelper.paperToVanilla(type))) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
|
|
+ } else {
|
2021-08-22 06:19:45 +02:00
|
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Collection<Goal<T>> getRunningGoals(T mob) {
|
|
|
|
+ Set<Goal<T>> goals = new HashSet<>();
|
|
|
|
+ for (GoalType type : GoalType.values()) {
|
|
|
|
+ goals.addAll(getRunningGoals(mob, type));
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Collection<Goal<T>> getRunningGoals(T mob, GoalType type) {
|
|
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
|
|
+ Set<Goal<T>> goals = new HashSet<>();
|
2021-06-14 04:40:12 +02:00
|
|
|
+ getHandle(craftMob, type).getRunningGoals()
|
2024-01-23 18:01:39 +01:00
|
|
|
+ .filter(item -> item.getGoal().getFlags().contains(MobGoalHelper.paperToVanilla(type)))
|
2021-06-11 14:02:28 +02:00
|
|
|
+ .forEach(item -> {
|
|
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
|
|
+ } else {
|
2021-08-22 06:19:45 +02:00
|
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public <T extends Mob> Collection<Goal<T>> getRunningGoalsWithout(T mob, GoalType type) {
|
|
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
|
|
+ Set<Goal<T>> goals = new HashSet<>();
|
|
|
|
+ for (GoalType internalType : GoalType.values()) {
|
|
|
|
+ if (internalType == type) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
2021-06-14 04:40:12 +02:00
|
|
|
+ getHandle(craftMob, internalType).getRunningGoals()
|
2024-01-23 18:01:39 +01:00
|
|
|
+ .filter(item -> !item.getGoal().getFlags().contains(MobGoalHelper.paperToVanilla(type)))
|
2021-06-11 14:02:28 +02:00
|
|
|
+ .forEach(item -> {
|
|
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
|
|
+ } else {
|
2021-08-22 06:19:45 +02:00
|
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ return goals;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private GoalSelector getHandle(CraftMob mob, EnumSet<GoalType> types) {
|
|
|
|
+ if (types.contains(GoalType.TARGET)) {
|
|
|
|
+ return mob.getHandle().targetSelector;
|
|
|
|
+ } else {
|
|
|
|
+ return mob.getHandle().goalSelector;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private GoalSelector getHandle(CraftMob mob, GoalType type) {
|
|
|
|
+ if (type == GoalType.TARGET) {
|
|
|
|
+ return mob.getHandle().targetSelector;
|
|
|
|
+ } else {
|
|
|
|
+ return mob.getHandle().goalSelector;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java
|
|
|
|
new file mode 100644
|
2024-01-23 18:01:39 +01:00
|
|
|
index 0000000000000000000000000000000000000000..b5c594a5499556ad452d9939c75e150af8252e90
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java
|
2021-06-14 04:40:12 +02:00
|
|
|
@@ -0,0 +1,61 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+import java.util.EnumSet;
|
|
|
|
+import net.minecraft.world.entity.ai.goal.Goal;
|
|
|
|
+import org.bukkit.entity.Mob;
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Wraps vanilla in api
|
|
|
|
+ */
|
|
|
|
+public class PaperVanillaGoal<T extends Mob> implements VanillaGoal<T> {
|
|
|
|
+
|
|
|
|
+ private final Goal handle;
|
|
|
|
+ private final GoalKey<T> key;
|
|
|
|
+
|
|
|
|
+ private final EnumSet<GoalType> types;
|
|
|
|
+
|
|
|
|
+ public PaperVanillaGoal(Goal handle) {
|
|
|
|
+ this.handle = handle;
|
|
|
|
+ this.key = MobGoalHelper.getKey(handle.getClass());
|
2024-01-23 18:01:39 +01:00
|
|
|
+ this.types = MobGoalHelper.vanillaToPaper(handle);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public Goal getHandle() {
|
|
|
|
+ return handle;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean shouldActivate() {
|
2021-06-17 22:20:03 +02:00
|
|
|
+ return handle.canUse();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean shouldStayActive() {
|
2021-06-17 22:20:03 +02:00
|
|
|
+ return handle.canContinueToUse();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void start() {
|
|
|
|
+ handle.start();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void stop() {
|
2021-06-14 04:40:12 +02:00
|
|
|
+ handle.stop();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void tick() {
|
|
|
|
+ handle.tick();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public GoalKey<T> getKey() {
|
|
|
|
+ return key;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public EnumSet<GoalType> getTypes() {
|
|
|
|
+ return types;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
2024-01-23 12:06:27 +01:00
|
|
|
index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..16f9a98b8a939e5ca7e2dc04f87134a7ed66736b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
2024-01-23 12:06:27 +01:00
|
|
|
@@ -51,7 +51,19 @@ public abstract class Goal {
|
2021-11-24 12:38:00 +01:00
|
|
|
return Mth.positiveCeilDiv(serverTicks, 2);
|
2021-06-14 04:40:12 +02:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-01-21 12:11:43 +01:00
|
|
|
+ // Paper start - Mob goal api
|
2024-01-23 12:06:27 +01:00
|
|
|
+ private com.destroystokyo.paper.entity.ai.PaperVanillaGoal<?> vanillaGoal;
|
2021-08-22 06:19:45 +02:00
|
|
|
+ public <T extends org.bukkit.entity.Mob> com.destroystokyo.paper.entity.ai.Goal<T> asPaperVanillaGoal() {
|
|
|
|
+ if(this.vanillaGoal == null) {
|
|
|
|
+ this.vanillaGoal = new com.destroystokyo.paper.entity.ai.PaperVanillaGoal<>(this);
|
|
|
|
+ }
|
|
|
|
+ //noinspection unchecked
|
|
|
|
+ return (com.destroystokyo.paper.entity.ai.Goal<T>) this.vanillaGoal;
|
|
|
|
+ }
|
2024-01-21 12:11:43 +01:00
|
|
|
+ // Paper end - Mob goal api
|
2021-08-22 06:19:45 +02:00
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
public static enum Flag {
|
2021-06-14 04:40:12 +02:00
|
|
|
+ UNKNOWN_BEHAVIOR, // Paper - add UNKNOWN_BEHAVIOR
|
|
|
|
MOVE,
|
|
|
|
LOOK,
|
|
|
|
JUMP,
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
index 0a6b283aee63adb09cf1466fb18406f941466cd0..12b76fd9d3d5e8dcca31d7e82f6956e13447ff64 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -2889,5 +2889,11 @@ public final class CraftServer implements Server {
|
2021-06-11 14:02:28 +02:00
|
|
|
public boolean isStopping() {
|
|
|
|
return net.minecraft.server.MinecraftServer.getServer().hasStopped();
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ private com.destroystokyo.paper.entity.ai.MobGoals mobGoals = new com.destroystokyo.paper.entity.ai.PaperMobGoals();
|
|
|
|
+ @Override
|
|
|
|
+ public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
|
|
|
|
+ return mobGoals;
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|