mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 03:55:14 +01:00
d8b66dd93d
ffm requires 1) native access allowed (the jdk cracks down on undocumented native access in 22) and 2) reverting the default console back to java.base, so the internal jline doesnt take over
803 lines
34 KiB
Diff
803 lines
34 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MiniDigger <admin@benndorf.dev>
|
|
Date: Fri, 3 Jan 2020 16:26:19 +0100
|
|
Subject: [PATCH] Implement Mob Goal API
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 40afa9e2cfb4518e9050ccac739aec3215f95d56..fd687af4923208272b01fc03fe9b65867e49dd6e 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -54,6 +54,7 @@ dependencies {
|
|
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
|
|
|
+ testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
|
|
testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
|
|
testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
|
|
testImplementation("org.hamcrest:hamcrest:2.2")
|
|
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
|
|
index 0000000000000000000000000000000000000000..05e793e722bbb367ca64cd7f26156fa3dabb8474
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
|
|
@@ -0,0 +1,380 @@
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
+
|
|
+import com.destroystokyo.paper.entity.RangedEntity;
|
|
+import com.google.common.collect.BiMap;
|
|
+import com.google.common.collect.HashBiMap;
|
|
+import io.papermc.paper.util.ObfHelper;
|
|
+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;
|
|
+import net.minecraft.world.entity.animal.camel.Camel;
|
|
+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;
|
|
+import net.minecraft.world.entity.monster.breeze.Breeze;
|
|
+import net.minecraft.world.entity.monster.piglin.AbstractPiglin;
|
|
+import org.bukkit.NamespacedKey;
|
|
+import org.bukkit.entity.AbstractHorse;
|
|
+import org.bukkit.entity.AbstractSkeleton;
|
|
+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
|
|
+ deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
|
|
+
|
|
+ ignored.add("goal_selector_1");
|
|
+ ignored.add("goal_selector_2");
|
|
+ ignored.add("selector_1");
|
|
+ ignored.add("selector_2");
|
|
+ ignored.add("wrapped");
|
|
+
|
|
+ bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
|
|
+ bukkitMap.put(net.minecraft.world.entity.AgeableMob.class, Ageable.class);
|
|
+ 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);
|
|
+ bukkitMap.put(Camel.class, org.bukkit.entity.Camel.class);
|
|
+ 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);
|
|
+ bukkitMap.put(PatrollingMonster.class, Raider.class); // close enough
|
|
+ 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);
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.AbstractSkeleton.class, AbstractSkeleton.class);
|
|
+ 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);
|
|
+ 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);
|
|
+ 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);
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.sniffer.Sniffer.class, org.bukkit.entity.Sniffer.class);
|
|
+ bukkitMap.put(Breeze.class, org.bukkit.entity.Breeze.class);
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.armadillo.Armadillo.class, org.bukkit.entity.Armadillo.class);
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, org.bukkit.entity.Bogged.class);
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, org.bukkit.entity.Creaking.class);
|
|
+ bukkitMap.put(net.minecraft.world.entity.monster.creaking.CreakingTransient.class, org.bukkit.entity.CreakingTransient.class);
|
|
+ bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, org.bukkit.entity.Squid.class); // close enough
|
|
+ }
|
|
+
|
|
+ public static String getUsableName(Class<?> clazz) {
|
|
+ String name = io.papermc.paper.util.MappingEnvironment.reobf() ? ObfHelper.INSTANCE.deobfClassName(clazz.getName()) : clazz.getName();
|
|
+ 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", "");
|
|
+ name = name.replace("TargetGoal", "");
|
|
+ name = name.replace("Goal", "");
|
|
+ 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(java.util.Locale.ROOT)) && !ignored.contains(name)) {
|
|
+ System.out.println("need to map " + clazz.getName() + " (" + name.toLowerCase(java.util.Locale.ROOT) + ")");
|
|
+ }
|
|
+
|
|
+ // did we rename this key?
|
|
+ return deobfuscationMap.getOrDefault(name, name);
|
|
+ }
|
|
+
|
|
+ public static EnumSet<GoalType> vanillaToPaper(Goal goal) {
|
|
+ EnumSet<GoalType> goals = EnumSet.noneOf(GoalType.class);
|
|
+ for (GoalType type : GoalType.values()) {
|
|
+ if (goal.getFlags().hasElement(paperToVanilla(type))) {
|
|
+ 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
|
|
index 0000000000000000000000000000000000000000..26c745dd9ccdfdd5c5039f2acc5201b9b91fb274
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java
|
|
@@ -0,0 +1,53 @@
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
+
|
|
+import org.bukkit.entity.Mob;
|
|
+
|
|
+/**
|
|
+ * Wraps api in vanilla
|
|
+ */
|
|
+public class PaperCustomGoal<T extends Mob> extends net.minecraft.world.entity.ai.goal.Goal {
|
|
+
|
|
+ private final Goal<T> handle;
|
|
+
|
|
+ public PaperCustomGoal(Goal<T> handle) {
|
|
+ this.handle = handle;
|
|
+
|
|
+ this.setFlags(MobGoalHelper.paperToVanilla(handle.getTypes()));
|
|
+ if (this.getFlags().size() == 0) {
|
|
+ this.getFlags().addUnchecked(Flag.UNKNOWN_BEHAVIOR);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean canUse() {
|
|
+ return handle.shouldActivate();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean canContinueToUse() {
|
|
+ return handle.shouldStayActive();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void start() {
|
|
+ handle.start();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void stop() {
|
|
+ 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
|
|
index 0000000000000000000000000000000000000000..e8a427ea777af040d0e2b9cc0ba2a80b9176d026
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
|
|
@@ -0,0 +1,226 @@
|
|
+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;
|
|
+import org.jspecify.annotations.NullMarked;
|
|
+
|
|
+@NullMarked
|
|
+public class PaperMobGoals implements MobGoals {
|
|
+
|
|
+ @Override
|
|
+ public <T extends Mob> void addGoal(T mob, int priority, Goal<T> goal) {
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
+ net.minecraft.world.entity.ai.goal.Goal mojangGoal;
|
|
+
|
|
+ if (goal instanceof PaperVanillaGoal vanillaGoal) {
|
|
+ mojangGoal = vanillaGoal.getHandle();
|
|
+ } else {
|
|
+ mojangGoal = new PaperCustomGoal<>(goal);
|
|
+ }
|
|
+
|
|
+ getHandle(craftMob, goal.getTypes()).addGoal(priority, mojangGoal);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public <T extends Mob> void removeGoal(T mob, Goal<T> goal) {
|
|
+ CraftMob craftMob = (CraftMob) mob;
|
|
+ if (goal instanceof PaperCustomGoal) {
|
|
+ getHandle(craftMob, goal.getTypes()).removeGoal((net.minecraft.world.entity.ai.goal.Goal) goal);
|
|
+ } else if (goal instanceof PaperVanillaGoal) {
|
|
+ getHandle(craftMob, goal.getTypes()).removeGoal(((PaperVanillaGoal<?>) goal).getHandle());
|
|
+ } else {
|
|
+ List<net.minecraft.world.entity.ai.goal.Goal> toRemove = new LinkedList<>();
|
|
+ for (WrappedGoal item : getHandle(craftMob, goal.getTypes()).getAvailableGoals()) {
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
+ //noinspection unchecked
|
|
+ if (((PaperCustomGoal<T>) item.getGoal()).getHandle() == goal) {
|
|
+ toRemove.add(item.getGoal());
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ for (net.minecraft.world.entity.ai.goal.Goal g : toRemove) {
|
|
+ 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<>();
|
|
+ for (WrappedGoal item : getHandle(craftMob, type).getAvailableGoals()) {
|
|
+ if (!item.getGoal().getFlags().hasElement(MobGoalHelper.paperToVanilla(type))) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
+ //noinspection unchecked
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
+ } else {
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
|
+ }
|
|
+ }
|
|
+ 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;
|
|
+ }
|
|
+ for (WrappedGoal item : getHandle(craftMob, internalType).getAvailableGoals()) {
|
|
+ if (item.getGoal().getFlags().hasElement(MobGoalHelper.paperToVanilla(type))) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
+ //noinspection unchecked
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
+ } else {
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ 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<>();
|
|
+ getHandle(craftMob, type).getAvailableGoals()
|
|
+ .stream().filter(WrappedGoal::isRunning)
|
|
+ .filter(item -> item.getGoal().getFlags().hasElement(MobGoalHelper.paperToVanilla(type)))
|
|
+ .forEach(item -> {
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
+ //noinspection unchecked
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
+ } else {
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
|
+ }
|
|
+ });
|
|
+ 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;
|
|
+ }
|
|
+ getHandle(craftMob, internalType).getAvailableGoals()
|
|
+ .stream()
|
|
+ .filter(WrappedGoal::isRunning)
|
|
+ .filter(item -> !item.getGoal().getFlags().hasElement(MobGoalHelper.paperToVanilla(type)))
|
|
+ .forEach(item -> {
|
|
+ if (item.getGoal() instanceof PaperCustomGoal) {
|
|
+ //noinspection unchecked
|
|
+ goals.add(((PaperCustomGoal<T>) item.getGoal()).getHandle());
|
|
+ } else {
|
|
+ goals.add(item.getGoal().asPaperVanillaGoal());
|
|
+ }
|
|
+ });
|
|
+ }
|
|
+ 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
|
|
index 0000000000000000000000000000000000000000..b5c594a5499556ad452d9939c75e150af8252e90
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java
|
|
@@ -0,0 +1,61 @@
|
|
+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());
|
|
+ this.types = MobGoalHelper.vanillaToPaper(handle);
|
|
+ }
|
|
+
|
|
+ public Goal getHandle() {
|
|
+ return handle;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean shouldActivate() {
|
|
+ return handle.canUse();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean shouldStayActive() {
|
|
+ return handle.canContinueToUse();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void start() {
|
|
+ handle.start();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void stop() {
|
|
+ handle.stop();
|
|
+ }
|
|
+
|
|
+ @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
|
|
index a8d6d7054110b5d95830296699f004418dae10db..acc25b08ed3b9f978229fa017d23f9fa0da519e3 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
|
@@ -62,7 +62,19 @@ public abstract class Goal {
|
|
return (ServerLevel)world;
|
|
}
|
|
|
|
+ // Paper start - Mob goal api
|
|
+ private com.destroystokyo.paper.entity.ai.PaperVanillaGoal<?> vanillaGoal;
|
|
+ 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;
|
|
+ }
|
|
+ // Paper end - Mob goal api
|
|
+
|
|
public static enum Flag {
|
|
+ UNKNOWN_BEHAVIOR, // Paper - add UNKNOWN_BEHAVIOR
|
|
MOVE,
|
|
LOOK,
|
|
JUMP,
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index e5a534c3cae53811899d33664b0a985c2442582c..4108eebafddc9c271be8c6eb5afbdca70e5fbb89 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2966,5 +2966,11 @@ public final class CraftServer implements Server {
|
|
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
|
|
}
|