diff --git a/build.gradle b/build.gradle index 5ea3903..5d551a7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,6 @@ plugins { dependencies { implementation project(":eco-core:core-plugin") - implementation project(":eco-core:core-proxy") - implementation project(":eco-core:core-nms:v1_16_R3") - implementation project(path: ":eco-core:core-nms:v1_17_R1", configuration: 'mapped') } allprojects { diff --git a/eco-core/core-nms/build.gradle b/eco-core/core-nms/build.gradle deleted file mode 100644 index 4aa1efc..0000000 --- a/eco-core/core-nms/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -group 'com.willfp' -version rootProject.version - -subprojects { - dependencies { - compileOnly project(':eco-core:core-proxy') - compileOnly project(':eco-core:core-plugin') - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_16_R3/build.gradle b/eco-core/core-nms/v1_16_R3/build.gradle deleted file mode 100644 index 5930f17..0000000 --- a/eco-core/core-nms/v1_16_R3/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -group 'com.willfp' -version rootProject.version - -dependencies { - compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecobosses/proxy/v1_16_R3/CustomEntitySpawner.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecobosses/proxy/v1_16_R3/CustomEntitySpawner.java deleted file mode 100644 index cb55906..0000000 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecobosses/proxy/v1_16_R3/CustomEntitySpawner.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.willfp.ecobosses.proxy.v1_16_R3; - -import com.willfp.ecobosses.proxy.proxies.CustomEntitySpawnerProxy; -import com.willfp.ecobosses.proxy.proxies.CustomIllusionerProxy; -import com.willfp.ecobosses.proxy.util.CustomEntity; -import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -@SuppressWarnings("unchecked") -public class CustomEntitySpawner implements CustomEntitySpawnerProxy { - @Override - public @Nullable T spawnCustomEntity(final Class> entityClass, - @NotNull final Location location) { - if (entityClass.equals(CustomIllusionerProxy.class)) { - return (T) CustomIllusioner.spawn(location); - } - - return null; - } -} diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecobosses/proxy/v1_16_R3/CustomIllusioner.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecobosses/proxy/v1_16_R3/CustomIllusioner.java deleted file mode 100644 index f6de909..0000000 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecobosses/proxy/v1_16_R3/CustomIllusioner.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.willfp.ecobosses.proxy.v1_16_R3; - -import com.willfp.ecobosses.proxy.proxies.CustomIllusionerProxy; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityIllagerIllusioner; -import net.minecraft.server.v1_16_R3.EntityIllagerWizard; -import net.minecraft.server.v1_16_R3.EntityInsentient; -import net.minecraft.server.v1_16_R3.EntityIronGolem; -import net.minecraft.server.v1_16_R3.EntityRaider; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityVillagerAbstract; -import net.minecraft.server.v1_16_R3.PathfinderGoalBowShoot; -import net.minecraft.server.v1_16_R3.PathfinderGoalFloat; -import net.minecraft.server.v1_16_R3.PathfinderGoalHurtByTarget; -import net.minecraft.server.v1_16_R3.PathfinderGoalLookAtPlayer; -import net.minecraft.server.v1_16_R3.PathfinderGoalMeleeAttack; -import net.minecraft.server.v1_16_R3.PathfinderGoalNearestAttackableTarget; -import net.minecraft.server.v1_16_R3.PathfinderGoalRandomStroll; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import org.bukkit.entity.Illusioner; -import org.jetbrains.annotations.NotNull; - -public class CustomIllusioner extends EntityIllagerIllusioner implements CustomIllusionerProxy { - /** - * Instantiate a new custom illusioner entity. - * - * @param location The location to spawn it at. - */ - public CustomIllusioner(@NotNull final Location location) { - super(EntityTypes.ILLUSIONER, ((CraftWorld) location.getWorld()).getHandle()); - - this.setPosition(location.getX(), location.getY(), location.getZ()); - - this.goalSelector.a(0, new PathfinderGoalFloat(this)); - this.goalSelector.a(1, new EntityIllagerWizard.b()); - this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, 1.0D, false)); - this.goalSelector.a(2, new PathfinderGoalBowShoot<>(this, 1.0D, 20, 15.0F)); - this.goalSelector.a(8, new PathfinderGoalRandomStroll(this, 0.6D)); - this.goalSelector.a(0, new PathfinderGoalFloat(this)); - this.goalSelector.a(6, new PathfinderGoalBowShoot<>(this, 0.5D, 20, 15.0F)); - this.goalSelector.a(8, new PathfinderGoalRandomStroll(this, 0.6D)); - this.goalSelector.a(9, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 3.0F, 1.0F)); - this.goalSelector.a(10, new PathfinderGoalLookAtPlayer(this, EntityInsentient.class, 8.0F)); - this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityRaider.class})).a(new Class[0])); - this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300)); - this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300)); - this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false)).a(300)); - } - - /** - * Spawn illusioner. - * - * @param location The location. - * @return The illusioner. - */ - public static Illusioner spawn(@NotNull final Location location) { - CustomIllusioner illusioner = new CustomIllusioner(location); - ((CraftWorld) location.getWorld()).getHandle().addEntity(illusioner); - return (Illusioner) illusioner.getBukkitEntity(); - } -} diff --git a/eco-core/core-nms/v1_17_R1/build.gradle b/eco-core/core-nms/v1_17_R1/build.gradle deleted file mode 100644 index 516f18e..0000000 --- a/eco-core/core-nms/v1_17_R1/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'xyz.jpenilla.special-gradle' version '1.0.0-SNAPSHOT' -} - -group 'com.willfp' -version rootProject.version - -dependencies { - compileOnly 'org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT:remapped-mojang' -} - -specialGradle { - minecraftVersion.set("1.17") - specialSourceVersion.set("1.10.0") -} - -buildTools { - quiet.set(true); -} - -configurations.create('mapped') - -artifacts { - mapped jar.outputs.files.files.toArray()[0] -} - -productionMappedJar.mustRunAfter(clean) -build.dependsOn productionMappedJar \ No newline at end of file diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecobosses/proxy/v1_17_R1/CustomEntitySpawner.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecobosses/proxy/v1_17_R1/CustomEntitySpawner.java deleted file mode 100644 index df34713..0000000 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecobosses/proxy/v1_17_R1/CustomEntitySpawner.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.willfp.ecobosses.proxy.v1_17_R1; - -import com.willfp.ecobosses.proxy.proxies.CustomEntitySpawnerProxy; -import com.willfp.ecobosses.proxy.proxies.CustomIllusionerProxy; -import com.willfp.ecobosses.proxy.util.CustomEntity; -import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -@SuppressWarnings("unchecked") -public class CustomEntitySpawner implements CustomEntitySpawnerProxy { - @Override - public @Nullable T spawnCustomEntity(final Class> entityClass, - @NotNull final Location location) { - if (entityClass.equals(CustomIllusionerProxy.class)) { - return (T) CustomIllusioner.spawn(location); - } - - return null; - } -} diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecobosses/proxy/v1_17_R1/CustomIllusioner.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecobosses/proxy/v1_17_R1/CustomIllusioner.java deleted file mode 100644 index fe14c34..0000000 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecobosses/proxy/v1_17_R1/CustomIllusioner.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.willfp.ecobosses.proxy.v1_17_R1; - -import com.willfp.ecobosses.proxy.proxies.CustomIllusionerProxy; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.ai.goal.FloatGoal; -import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; -import net.minecraft.world.entity.ai.goal.MeleeAttackGoal; -import net.minecraft.world.entity.ai.goal.RandomStrollGoal; -import net.minecraft.world.entity.ai.goal.RangedBowAttackGoal; -import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal; -import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal; -import net.minecraft.world.entity.animal.IronGolem; -import net.minecraft.world.entity.npc.AbstractVillager; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.raid.Raider; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_17_R1.CraftWorld; -import org.bukkit.entity.Illusioner; -import org.bukkit.event.entity.CreatureSpawnEvent; -import org.jetbrains.annotations.NotNull; - -public class CustomIllusioner extends net.minecraft.world.entity.monster.Illusioner implements CustomIllusionerProxy { - /** - * Instantiate a new custom illusioner entity. - * - * @param location The location to spawn it at. - */ - public CustomIllusioner(@NotNull final Location location) { - super(EntityType.ILLUSIONER, ((CraftWorld) location.getWorld()).getHandle()); - - this.setPos(location.getX(), location.getY(), location.getZ()); - - this.goalSelector.addGoal(0, new FloatGoal(this)); - this.goalSelector.addGoal(1, new Raider.HoldGroundAttackGoal(this, 25)); - this.goalSelector.addGoal(2, new MeleeAttackGoal(this, 1.0D, false)); - this.goalSelector.addGoal(2, new RangedBowAttackGoal<>(this, 1.0D, 20, 15.0F)); - this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D)); - this.goalSelector.addGoal(0, new FloatGoal(this)); - this.goalSelector.addGoal(6, new RangedBowAttackGoal<>(this, 0.5D, 20, 15.0F)); - this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D)); - this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F)); - this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers()); - this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300)); - this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300)); - this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, IronGolem.class, false)).setUnseenMemoryTicks(300)); - } - - /** - * Spawn illusioner. - * - * @param location The location. - * @return The illusioner. - */ - public static Illusioner spawn(@NotNull final Location location) { - CustomIllusioner illusioner = new CustomIllusioner(location); - ((CraftWorld) location.getWorld()).getHandle().addEntity(illusioner, CreatureSpawnEvent.SpawnReason.CUSTOM); - return (Illusioner) illusioner.getBukkitEntity(); - } -} diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 657249f..d658600 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -2,7 +2,6 @@ group 'com.willfp' version rootProject.version dependencies { - compileOnly project(":eco-core:core-proxy") compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' compileOnly 'commons-io:commons-io:2.8.0' compileOnly 'com.destroystokyo.paper:paper-api:1.16.3-R0.1-SNAPSHOT' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java index 190dcea..8dd3157 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java @@ -29,7 +29,7 @@ public class EcoBosses { * Sets that exist by default. */ private static final List DEFAULT_BOSSES = Arrays.asList( - "illusioner", + "dark_guardian", "tarantula", "steel_golem", "alpha_wolf" diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java index 761e453..2f1a15e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java @@ -1,7 +1,5 @@ package com.willfp.ecobosses.bosses.util.bosstype; -import com.willfp.ecobosses.proxy.util.CustomEntities; -import com.willfp.ecobosses.proxy.util.CustomEntity; import lombok.experimental.UtilityClass; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; @@ -21,11 +19,7 @@ public class BossEntityUtils { Class type = (Class) EntityType.valueOf(id.toUpperCase()).getEntityClass(); assert type != null; return new VanillaBossType(type); - } catch (IllegalArgumentException e) { - Class> proxy = CustomEntities.getEntityClass(id.toLowerCase()); - if (proxy != null) { - return new CustomBossType(proxy); - } + } catch (IllegalArgumentException ignored) { } return null; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/CustomBossType.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/CustomBossType.java deleted file mode 100644 index 111db59..0000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/CustomBossType.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.willfp.ecobosses.bosses.util.bosstype; - -import com.willfp.ecobosses.EcoBossesPlugin; -import com.willfp.ecobosses.proxy.proxies.CustomEntitySpawnerProxy; -import com.willfp.ecobosses.proxy.util.CustomEntity; -import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; -import org.jetbrains.annotations.NotNull; - -class CustomBossType extends BossType { - /** - * The entity type. - */ - private final Class> entityClass; - - /** - * Create new vanilla boss type. - * - * @param entityClass The entity class. - */ - CustomBossType(@NotNull final Class> entityClass) { - this.entityClass = entityClass; - } - - @Override - public LivingEntity spawnBossEntity(@NotNull final Location location) { - return EcoBossesPlugin.getInstance().getProxy(CustomEntitySpawnerProxy.class).spawnCustomEntity(entityClass, location); - } -} diff --git a/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml b/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml index c682b41..11bfbc7 100644 --- a/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml +++ b/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml @@ -1,7 +1,7 @@ enabled: true name: "&fAlpha Wolf &7| &c%health%♥ &7| &e%time%" # Display name -base-mob: wolf # Any existing mob - custom_illusioner is also accepted (like in the old Illusioner plugin) +base-mob: wolf bossbar: enabled: true diff --git a/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml b/eco-core/core-plugin/src/main/resources/bosses/dark_guardian.yml similarity index 88% rename from eco-core/core-plugin/src/main/resources/bosses/illusioner.yml rename to eco-core/core-plugin/src/main/resources/bosses/dark_guardian.yml index 919a80f..983f683 100644 --- a/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml +++ b/eco-core/core-plugin/src/main/resources/bosses/dark_guardian.yml @@ -1,7 +1,7 @@ enabled: true -name: "&9Illusioner &7| &c%health%♥ &7| &e%time%" # Display name -base-mob: custom_illusioner # Any existing mob - custom_illusioner is also accepted (like in the old Illusioner plugin) +name: "&9Dark Guardian &7| &c%health%♥ &7| &e%time%" # Display name +base-mob: enderman bossbar: enabled: true @@ -46,12 +46,12 @@ rewards: broadcast: spawn: - "" - - "&fAn &9&lIllusioner&r&f has been spawned!" + - "&fA &9&lDark Guardian&r&f has been spawned!" - "&fCome fight it at &9%x%&f, &9%y%&f, &9%z%&f!" - "" death: - "" - - "&fThe &9&lIllusioner&r&f has been killed!" + - "&fThe &9&lDark Guardian&r&f has been killed!" - "&fMost Damage:" - "&f - &9%top%&f (%top_damage% Damage)" - "&f - &9%second%&f (%second_damage% Damage)" @@ -59,13 +59,13 @@ broadcast: - "" despawn: - "" - - "&fYou ran out of time to kill the &9&lIllusioner&r&f!" + - "&fYou ran out of time to kill the &9&lDark Guardian&r&f!" - "" # Effects can be found on the wiki! https://ecobosses.willfp.com/ effects: - "summon:evoker:10" - - "summon:vindicator:10" + - "summon:enderman:10" - "shuffle-hotbar:10" - "give-potion-effect:confusion:10:200:10" - "give-potion-effect:blindness:1:40:20" @@ -107,11 +107,13 @@ sounds: spawn: # On spawn - "entity_illusioner_mirror_move:100:0.5" - "entity_wither_spawn:100:2" + - "entity_enderman_death:50:2" death: # On death - "entity_evoker_prepare_wololo:50:0.8" - "entity_illusioner_prepare_blindness:50:1" - "entity_wither_death:50:2" + - "entity_enderman_death:50:0.5" despawn: - "entity_ender_dragon_ambient:50:0.5" diff --git a/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml b/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml index 90293f5..49cffc2 100644 --- a/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml +++ b/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml @@ -1,7 +1,7 @@ enabled: true name: "&8Steel Golem &7| &c%health%♥ &7| &e%time%" # Display name -base-mob: iron_golem # Any existing mob - custom_illusioner is also accepted (like in the old Illusioner plugin) +base-mob: iron_golem bossbar: enabled: true diff --git a/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml b/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml index b016483..5eba37e 100644 --- a/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml +++ b/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml @@ -1,7 +1,7 @@ enabled: true name: "&4Tarantula &7| &c%health%♥ &7| &e%time%" # Display name -base-mob: cave_spider # Any existing mob - custom_illusioner is also accepted (like in the old Illusioner plugin) +base-mob: cave_spider bossbar: enabled: true diff --git a/eco-core/core-proxy/build.gradle b/eco-core/core-proxy/build.gradle deleted file mode 100644 index 3f90b63..0000000 --- a/eco-core/core-proxy/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -group 'com.willfp' -version rootProject.version - -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' -} \ No newline at end of file diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/proxies/CustomEntitySpawnerProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/proxies/CustomEntitySpawnerProxy.java deleted file mode 100644 index a7c0452..0000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/proxies/CustomEntitySpawnerProxy.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.willfp.ecobosses.proxy.proxies; - -import com.willfp.eco.core.proxy.AbstractProxy; -import com.willfp.ecobosses.proxy.util.CustomEntity; -import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public interface CustomEntitySpawnerProxy extends AbstractProxy { - /** - * Spawn custom entity. - * - * @param The class. - * @param entityClass The custom entity proxy class. - * @param location The location. - * @return The bukkit entity, or null if invalid class. - */ - @Nullable T spawnCustomEntity(Class> entityClass, - @NotNull Location location); -} diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/proxies/CustomIllusionerProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/proxies/CustomIllusionerProxy.java deleted file mode 100644 index cb1e5f2..0000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/proxies/CustomIllusionerProxy.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.willfp.ecobosses.proxy.proxies; - -import com.willfp.eco.core.proxy.AbstractProxy; -import com.willfp.ecobosses.proxy.util.CustomEntity; -import org.bukkit.entity.Illusioner; - -public interface CustomIllusionerProxy extends AbstractProxy, CustomEntity { - -} diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/CustomEntities.java b/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/CustomEntities.java deleted file mode 100644 index 6470f02..0000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/CustomEntities.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.willfp.ecobosses.proxy.util; - -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; -import com.willfp.ecobosses.proxy.proxies.CustomIllusionerProxy; -import lombok.experimental.UtilityClass; -import org.bukkit.entity.LivingEntity; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -@UtilityClass -public class CustomEntities { - /** - * Registered custom entities. - */ - private static final BiMap>> REGISTRY = new ImmutableBiMap.Builder>>() - .put("custom_illusioner", CustomIllusionerProxy.class) - .build(); - - /** - * Get entity class. - * - * @param id The entity id. - * @return The class. - */ - @Nullable - public Class> getEntityClass(@NotNull final String id) { - return REGISTRY.get(id); - } -} diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/CustomEntity.java b/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/CustomEntity.java deleted file mode 100644 index 18709d1..0000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/CustomEntity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.willfp.ecobosses.proxy.util; - -import org.bukkit.entity.LivingEntity; - -public interface CustomEntity { - -} diff --git a/settings.gradle b/settings.gradle index f388743..82d44d0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,8 +9,4 @@ rootProject.name = 'EcoBosses' // Core include ':eco-core' -include ':eco-core:core-nms' -include ':eco-core:core-nms:v1_16_R3' -include ':eco-core:core-nms:v1_17_R1' -include ':eco-core:core-proxy' include ':eco-core:core-plugin' \ No newline at end of file