Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-10-02 00:10:06 +02:00
Fixup entity type hierarchy
Dieser Commit ist enthalten in:
Ursprung
cdc9c3ae95
Commit
73ed425bf7
@ -38,12 +38,12 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
EXPERIENCE_ORB(ENTITY),
|
EXPERIENCE_ORB(ENTITY),
|
||||||
EYE_OF_ENDER(ENTITY),
|
EYE_OF_ENDER(ENTITY),
|
||||||
FALLING_BLOCK(ENTITY),
|
FALLING_BLOCK(ENTITY),
|
||||||
FIREWORK_ROCKET(ENTITY),
|
FIREWORK_ROCKET(PROJECTILE_ABSTRACT),
|
||||||
ITEM(ENTITY),
|
ITEM(ENTITY),
|
||||||
LLAMA_SPIT(ENTITY),
|
LLAMA_SPIT(PROJECTILE_ABSTRACT),
|
||||||
TNT(ENTITY),
|
TNT(ENTITY),
|
||||||
SHULKER_BULLET(ENTITY),
|
SHULKER_BULLET(PROJECTILE_ABSTRACT),
|
||||||
FISHING_BOBBER(ENTITY),
|
FISHING_BOBBER(PROJECTILE_ABSTRACT),
|
||||||
OMINOUS_ITEM_SPAWNER(ENTITY),
|
OMINOUS_ITEM_SPAWNER(ENTITY),
|
||||||
|
|
||||||
LIVINGENTITY(ENTITY, null),
|
LIVINGENTITY(ENTITY, null),
|
||||||
@ -60,22 +60,23 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
ABSTRACT_INSENTIENT(LIVINGENTITY, null),
|
ABSTRACT_INSENTIENT(LIVINGENTITY, null),
|
||||||
ENDER_DRAGON(ABSTRACT_INSENTIENT),
|
ENDER_DRAGON(ABSTRACT_INSENTIENT),
|
||||||
|
|
||||||
BEE(ABSTRACT_INSENTIENT),
|
BEE(ABSTRACT_ANIMAL),
|
||||||
|
|
||||||
ABSTRACT_CREATURE(ABSTRACT_INSENTIENT, null),
|
ABSTRACT_CREATURE(ABSTRACT_INSENTIENT, null),
|
||||||
|
|
||||||
ABSTRACT_AGEABLE(ABSTRACT_CREATURE, null),
|
ABSTRACT_AGEABLE(ABSTRACT_CREATURE, null),
|
||||||
VILLAGER(ABSTRACT_AGEABLE),
|
ABSTRACT_VILLAGER(ABSTRACT_AGEABLE, null),
|
||||||
WANDERING_TRADER(ABSTRACT_AGEABLE),
|
VILLAGER(ABSTRACT_VILLAGER),
|
||||||
|
WANDERING_TRADER(ABSTRACT_VILLAGER),
|
||||||
|
|
||||||
// Animals
|
// Animals
|
||||||
ABSTRACT_ANIMAL(ABSTRACT_AGEABLE, null),
|
ABSTRACT_ANIMAL(ABSTRACT_AGEABLE, null),
|
||||||
AXOLOTL(ABSTRACT_ANIMAL),
|
AXOLOTL(ABSTRACT_ANIMAL),
|
||||||
DOLPHIN(ABSTRACT_INSENTIENT),
|
DOLPHIN(ABSTRACT_WATERMOB),
|
||||||
CHICKEN(ABSTRACT_ANIMAL),
|
CHICKEN(ABSTRACT_ANIMAL),
|
||||||
COW(ABSTRACT_ANIMAL),
|
COW(ABSTRACT_ANIMAL),
|
||||||
MOOSHROOM(COW),
|
MOOSHROOM(COW),
|
||||||
PANDA(ABSTRACT_INSENTIENT),
|
PANDA(ABSTRACT_ANIMAL),
|
||||||
PIG(ABSTRACT_ANIMAL),
|
PIG(ABSTRACT_ANIMAL),
|
||||||
POLAR_BEAR(ABSTRACT_ANIMAL),
|
POLAR_BEAR(ABSTRACT_ANIMAL),
|
||||||
RABBIT(ABSTRACT_ANIMAL),
|
RABBIT(ABSTRACT_ANIMAL),
|
||||||
@ -92,8 +93,7 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
OCELOT(ABSTRACT_TAMEABLE_ANIMAL),
|
OCELOT(ABSTRACT_TAMEABLE_ANIMAL),
|
||||||
WOLF(ABSTRACT_TAMEABLE_ANIMAL),
|
WOLF(ABSTRACT_TAMEABLE_ANIMAL),
|
||||||
|
|
||||||
ABSTRACT_PARROT(ABSTRACT_TAMEABLE_ANIMAL, null),
|
PARROT(ABSTRACT_TAMEABLE_ANIMAL),
|
||||||
PARROT(ABSTRACT_PARROT),
|
|
||||||
|
|
||||||
// Horses
|
// Horses
|
||||||
ABSTRACT_HORSE(ABSTRACT_ANIMAL, null),
|
ABSTRACT_HORSE(ABSTRACT_ANIMAL, null),
|
||||||
@ -114,11 +114,12 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
SHULKER(ABSTRACT_GOLEM),
|
SHULKER(ABSTRACT_GOLEM),
|
||||||
|
|
||||||
// Fish
|
// Fish
|
||||||
ABSTRACT_FISHES(ABSTRACT_CREATURE, null),
|
ABSTRACT_FISHES(ABSTRACT_WATERMOB, null),
|
||||||
COD(ABSTRACT_FISHES),
|
ABSTRACT_SCHOOLING_FISH(ABSTRACT_FISHES, null),
|
||||||
|
COD(ABSTRACT_SCHOOLING_FISH),
|
||||||
PUFFERFISH(ABSTRACT_FISHES),
|
PUFFERFISH(ABSTRACT_FISHES),
|
||||||
SALMON(ABSTRACT_FISHES),
|
SALMON(ABSTRACT_SCHOOLING_FISH),
|
||||||
TROPICAL_FISH(ABSTRACT_FISHES),
|
TROPICAL_FISH(ABSTRACT_SCHOOLING_FISH),
|
||||||
|
|
||||||
// Monsters
|
// Monsters
|
||||||
ABSTRACT_MONSTER(ABSTRACT_CREATURE, null),
|
ABSTRACT_MONSTER(ABSTRACT_CREATURE, null),
|
||||||
@ -129,9 +130,9 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
GIANT(ABSTRACT_MONSTER),
|
GIANT(ABSTRACT_MONSTER),
|
||||||
SILVERFISH(ABSTRACT_MONSTER),
|
SILVERFISH(ABSTRACT_MONSTER),
|
||||||
VEX(ABSTRACT_MONSTER),
|
VEX(ABSTRACT_MONSTER),
|
||||||
WITCH(ABSTRACT_MONSTER),
|
WITCH(ABSTRACT_RAIDER),
|
||||||
WITHER(ABSTRACT_MONSTER),
|
WITHER(ABSTRACT_MONSTER),
|
||||||
RAVAGER(ABSTRACT_MONSTER),
|
RAVAGER(ABSTRACT_RAIDER),
|
||||||
BREEZE(ABSTRACT_MONSTER),
|
BREEZE(ABSTRACT_MONSTER),
|
||||||
|
|
||||||
ABSTRACT_PIGLIN(ABSTRACT_MONSTER, null),
|
ABSTRACT_PIGLIN(ABSTRACT_MONSTER, null),
|
||||||
@ -146,7 +147,8 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
WARDEN(ABSTRACT_MONSTER),
|
WARDEN(ABSTRACT_MONSTER),
|
||||||
|
|
||||||
// Illagers
|
// Illagers
|
||||||
ABSTRACT_ILLAGER_BASE(ABSTRACT_MONSTER, null),
|
ABSTRACT_RAIDER(ABSTRACT_MONSTER, null),
|
||||||
|
ABSTRACT_ILLAGER_BASE(ABSTRACT_RAIDER, null),
|
||||||
ABSTRACT_EVO_ILLU_ILLAGER(ABSTRACT_ILLAGER_BASE, null),
|
ABSTRACT_EVO_ILLU_ILLAGER(ABSTRACT_ILLAGER_BASE, null),
|
||||||
EVOKER(ABSTRACT_EVO_ILLU_ILLAGER),
|
EVOKER(ABSTRACT_EVO_ILLU_ILLAGER),
|
||||||
ILLUSIONER(ABSTRACT_EVO_ILLU_ILLAGER),
|
ILLUSIONER(ABSTRACT_EVO_ILLU_ILLAGER),
|
||||||
@ -184,7 +186,7 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
BAT(ABSTRACT_AMBIENT),
|
BAT(ABSTRACT_AMBIENT),
|
||||||
ALLAY(ABSTRACT_CREATURE),
|
ALLAY(ABSTRACT_CREATURE),
|
||||||
|
|
||||||
ABSTRACT_WATERMOB(ABSTRACT_INSENTIENT, null),
|
ABSTRACT_WATERMOB(ABSTRACT_CREATURE, null),
|
||||||
SQUID(ABSTRACT_WATERMOB),
|
SQUID(ABSTRACT_WATERMOB),
|
||||||
GLOW_SQUID(SQUID),
|
GLOW_SQUID(SQUID),
|
||||||
|
|
||||||
@ -203,20 +205,20 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
LIGHTNING_BOLT(ABSTRACT_LIGHTNING),
|
LIGHTNING_BOLT(ABSTRACT_LIGHTNING),
|
||||||
|
|
||||||
// Arrows
|
// Arrows
|
||||||
ABSTRACT_ARROW(ENTITY, null),
|
ABSTRACT_ARROW(PROJECTILE_ABSTRACT, null),
|
||||||
ARROW(ABSTRACT_ARROW),
|
ARROW(ABSTRACT_ARROW),
|
||||||
SPECTRAL_ARROW(ABSTRACT_ARROW),
|
SPECTRAL_ARROW(ABSTRACT_ARROW),
|
||||||
TRIDENT(ABSTRACT_ARROW),
|
TRIDENT(ABSTRACT_ARROW),
|
||||||
|
|
||||||
// Fireballs
|
// Fireballs
|
||||||
ABSTRACT_FIREBALL(ENTITY, null),
|
ABSTRACT_FIREBALL(ENTITY, null),
|
||||||
DRAGON_FIREBALL(ABSTRACT_FIREBALL),
|
DRAGON_FIREBALL(PROJECTILE_ABSTRACT),
|
||||||
FIREBALL(ABSTRACT_FIREBALL),
|
FIREBALL(ABSTRACT_FIREBALL),
|
||||||
SMALL_FIREBALL(ABSTRACT_FIREBALL),
|
SMALL_FIREBALL(ABSTRACT_FIREBALL),
|
||||||
WITHER_SKULL(ABSTRACT_FIREBALL),
|
WITHER_SKULL(PROJECTILE_ABSTRACT),
|
||||||
|
|
||||||
// Projectiles
|
// Projectiles
|
||||||
PROJECTILE_ABSTRACT(ENTITY, null),
|
PROJECTILE_ABSTRACT(ENTITY, null), // Not actually its own abstract type, but useful for categorizing
|
||||||
SNOWBALL(PROJECTILE_ABSTRACT),
|
SNOWBALL(PROJECTILE_ABSTRACT),
|
||||||
ENDER_PEARL(PROJECTILE_ABSTRACT),
|
ENDER_PEARL(PROJECTILE_ABSTRACT),
|
||||||
EGG(PROJECTILE_ABSTRACT),
|
EGG(PROJECTILE_ABSTRACT),
|
||||||
@ -227,7 +229,8 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
BREEZE_WIND_CHARGE(ABSTRACT_WIND_CHARGE),
|
BREEZE_WIND_CHARGE(ABSTRACT_WIND_CHARGE),
|
||||||
|
|
||||||
// Vehicles
|
// Vehicles
|
||||||
MINECART_ABSTRACT(ENTITY, null),
|
VEHICLE(ENTITY, null),
|
||||||
|
MINECART_ABSTRACT(VEHICLE, null),
|
||||||
CHESTED_MINECART_ABSTRACT(MINECART_ABSTRACT, null),
|
CHESTED_MINECART_ABSTRACT(MINECART_ABSTRACT, null),
|
||||||
CHEST_MINECART(CHESTED_MINECART_ABSTRACT),
|
CHEST_MINECART(CHESTED_MINECART_ABSTRACT),
|
||||||
HOPPER_MINECART(CHESTED_MINECART_ABSTRACT),
|
HOPPER_MINECART(CHESTED_MINECART_ABSTRACT),
|
||||||
@ -236,7 +239,7 @@ public enum EntityTypes1_20_5 implements EntityType {
|
|||||||
COMMAND_BLOCK_MINECART(MINECART_ABSTRACT),
|
COMMAND_BLOCK_MINECART(MINECART_ABSTRACT),
|
||||||
TNT_MINECART(MINECART_ABSTRACT),
|
TNT_MINECART(MINECART_ABSTRACT),
|
||||||
SPAWNER_MINECART(MINECART_ABSTRACT),
|
SPAWNER_MINECART(MINECART_ABSTRACT),
|
||||||
BOAT(ENTITY),
|
BOAT(VEHICLE),
|
||||||
CHEST_BOAT(BOAT);
|
CHEST_BOAT(BOAT);
|
||||||
|
|
||||||
private static final EntityType[] TYPES = EntityTypeUtil.createSizedArray(values());
|
private static final EntityType[] TYPES = EntityTypeUtil.createSizedArray(values());
|
||||||
|
@ -22,4 +22,4 @@ tasks.named<Jar>("sourcesJar") {
|
|||||||
from(project(":viaversion-api").sourceSets.main.get().allSource)
|
from(project(":viaversion-api").sourceSets.main.get().allSource)
|
||||||
}
|
}
|
||||||
|
|
||||||
publishShadowJar()
|
publishShadowJar()
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren