rename define to register
This commit is contained in:
parent
49e1d7f074
commit
c1cdf290cb
1 changed files with 82 additions and 82 deletions
|
@ -15,11 +15,11 @@ import java.util.List;
|
||||||
public class NpcTypeRegistry {
|
public class NpcTypeRegistry {
|
||||||
private final List<NpcTypeImpl> types = new ArrayList<>();
|
private final List<NpcTypeImpl> types = new ArrayList<>();
|
||||||
|
|
||||||
private NpcTypeImpl define(NpcTypeImpl.Builder builder) {
|
private NpcTypeImpl register(NpcTypeImpl.Builder builder) {
|
||||||
return define(builder.build());
|
return register(builder.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
private NpcTypeImpl define(NpcTypeImpl type) {
|
private NpcTypeImpl register(NpcTypeImpl type) {
|
||||||
types.add(type);
|
types.add(type);
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
@ -27,107 +27,107 @@ public class NpcTypeRegistry {
|
||||||
public void registerDefault(PacketEventsAPI<Plugin> packetEvents) {
|
public void registerDefault(PacketEventsAPI<Plugin> packetEvents) {
|
||||||
ServerVersion version = packetEvents.getServerManager().getVersion();
|
ServerVersion version = packetEvents.getServerManager().getVersion();
|
||||||
|
|
||||||
define(new NpcTypeImpl.Builder("player", EntityTypes.PLAYER).setHologramOffset(-0.15D)
|
register(new NpcTypeImpl.Builder("player", EntityTypes.PLAYER).setHologramOffset(-0.15D)
|
||||||
.addProperties(EntityPropertyImpl.SKIN, EntityPropertyImpl.SKIN_LAYERS));
|
.addProperties(EntityPropertyImpl.SKIN, EntityPropertyImpl.SKIN_LAYERS));
|
||||||
|
|
||||||
define(new NpcTypeImpl.Builder("armor_stand", EntityTypes.ARMOR_STAND));
|
register(new NpcTypeImpl.Builder("armor_stand", EntityTypes.ARMOR_STAND));
|
||||||
define(new NpcTypeImpl.Builder("bat", EntityTypes.BAT).setHologramOffset(-1.365));
|
register(new NpcTypeImpl.Builder("bat", EntityTypes.BAT).setHologramOffset(-1.365));
|
||||||
define(new NpcTypeImpl.Builder("blaze", EntityTypes.BLAZE));
|
register(new NpcTypeImpl.Builder("blaze", EntityTypes.BLAZE));
|
||||||
define(new NpcTypeImpl.Builder("cat", EntityTypes.CAT));
|
register(new NpcTypeImpl.Builder("cat", EntityTypes.CAT));
|
||||||
define(new NpcTypeImpl.Builder("cave_spider", EntityTypes.CAVE_SPIDER));
|
register(new NpcTypeImpl.Builder("cave_spider", EntityTypes.CAVE_SPIDER));
|
||||||
define(new NpcTypeImpl.Builder("chicken", EntityTypes.CHICKEN));
|
register(new NpcTypeImpl.Builder("chicken", EntityTypes.CHICKEN));
|
||||||
define(new NpcTypeImpl.Builder("cow", EntityTypes.COW));
|
register(new NpcTypeImpl.Builder("cow", EntityTypes.COW));
|
||||||
define(new NpcTypeImpl.Builder("creeper", EntityTypes.CREEPER).setHologramOffset(-0.3D));
|
register(new NpcTypeImpl.Builder("creeper", EntityTypes.CREEPER).setHologramOffset(-0.3D));
|
||||||
define(new NpcTypeImpl.Builder("donkey", EntityTypes.DONKEY));
|
register(new NpcTypeImpl.Builder("donkey", EntityTypes.DONKEY));
|
||||||
define(new NpcTypeImpl.Builder("elder_guardian", EntityTypes.ELDER_GUARDIAN));
|
register(new NpcTypeImpl.Builder("elder_guardian", EntityTypes.ELDER_GUARDIAN));
|
||||||
define(new NpcTypeImpl.Builder("ender_dragon", EntityTypes.ENDER_DRAGON));
|
register(new NpcTypeImpl.Builder("ender_dragon", EntityTypes.ENDER_DRAGON));
|
||||||
define(new NpcTypeImpl.Builder("enderman", EntityTypes.ENDERMAN));
|
register(new NpcTypeImpl.Builder("enderman", EntityTypes.ENDERMAN));
|
||||||
define(new NpcTypeImpl.Builder("endermite", EntityTypes.ENDERMITE));
|
register(new NpcTypeImpl.Builder("endermite", EntityTypes.ENDERMITE));
|
||||||
define(new NpcTypeImpl.Builder("ghast", EntityTypes.GHAST));
|
register(new NpcTypeImpl.Builder("ghast", EntityTypes.GHAST));
|
||||||
define(new NpcTypeImpl.Builder("giant", EntityTypes.GIANT));
|
register(new NpcTypeImpl.Builder("giant", EntityTypes.GIANT));
|
||||||
define(new NpcTypeImpl.Builder("guardian", EntityTypes.GUARDIAN));
|
register(new NpcTypeImpl.Builder("guardian", EntityTypes.GUARDIAN));
|
||||||
define(new NpcTypeImpl.Builder("horse", EntityTypes.HORSE));
|
register(new NpcTypeImpl.Builder("horse", EntityTypes.HORSE));
|
||||||
define(new NpcTypeImpl.Builder("iron_golem", EntityTypes.IRON_GOLEM));
|
register(new NpcTypeImpl.Builder("iron_golem", EntityTypes.IRON_GOLEM));
|
||||||
define(new NpcTypeImpl.Builder("magma_cube", EntityTypes.MAGMA_CUBE));
|
register(new NpcTypeImpl.Builder("magma_cube", EntityTypes.MAGMA_CUBE));
|
||||||
define(new NpcTypeImpl.Builder("mooshroom", EntityTypes.MOOSHROOM));
|
register(new NpcTypeImpl.Builder("mooshroom", EntityTypes.MOOSHROOM));
|
||||||
define(new NpcTypeImpl.Builder("mule", EntityTypes.MULE));
|
register(new NpcTypeImpl.Builder("mule", EntityTypes.MULE));
|
||||||
define(new NpcTypeImpl.Builder("ocelot", EntityTypes.OCELOT));
|
register(new NpcTypeImpl.Builder("ocelot", EntityTypes.OCELOT));
|
||||||
define(new NpcTypeImpl.Builder("pig", EntityTypes.PIG));
|
register(new NpcTypeImpl.Builder("pig", EntityTypes.PIG));
|
||||||
define(new NpcTypeImpl.Builder("rabbit", EntityTypes.RABBIT));
|
register(new NpcTypeImpl.Builder("rabbit", EntityTypes.RABBIT));
|
||||||
define(new NpcTypeImpl.Builder("sheep", EntityTypes.SHEEP));
|
register(new NpcTypeImpl.Builder("sheep", EntityTypes.SHEEP));
|
||||||
define(new NpcTypeImpl.Builder("silverfish", EntityTypes.SILVERFISH));
|
register(new NpcTypeImpl.Builder("silverfish", EntityTypes.SILVERFISH));
|
||||||
define(new NpcTypeImpl.Builder("skeleton", EntityTypes.SKELETON));
|
register(new NpcTypeImpl.Builder("skeleton", EntityTypes.SKELETON));
|
||||||
define(new NpcTypeImpl.Builder("skeleton_horse", EntityTypes.SKELETON_HORSE));
|
register(new NpcTypeImpl.Builder("skeleton_horse", EntityTypes.SKELETON_HORSE));
|
||||||
define(new NpcTypeImpl.Builder("slime", EntityTypes.SLIME));
|
register(new NpcTypeImpl.Builder("slime", EntityTypes.SLIME));
|
||||||
define(new NpcTypeImpl.Builder("snow_golem", EntityTypes.SNOW_GOLEM));
|
register(new NpcTypeImpl.Builder("snow_golem", EntityTypes.SNOW_GOLEM));
|
||||||
define(new NpcTypeImpl.Builder("spider", EntityTypes.SPIDER));
|
register(new NpcTypeImpl.Builder("spider", EntityTypes.SPIDER));
|
||||||
define(new NpcTypeImpl.Builder("squid", EntityTypes.SQUID));
|
register(new NpcTypeImpl.Builder("squid", EntityTypes.SQUID));
|
||||||
define(new NpcTypeImpl.Builder("villager", EntityTypes.VILLAGER));
|
register(new NpcTypeImpl.Builder("villager", EntityTypes.VILLAGER));
|
||||||
define(new NpcTypeImpl.Builder("witch", EntityTypes.WITCH));
|
register(new NpcTypeImpl.Builder("witch", EntityTypes.WITCH));
|
||||||
define(new NpcTypeImpl.Builder("wither", EntityTypes.WITHER));
|
register(new NpcTypeImpl.Builder("wither", EntityTypes.WITHER));
|
||||||
define(new NpcTypeImpl.Builder("wither_skeleton", EntityTypes.WITHER_SKELETON));
|
register(new NpcTypeImpl.Builder("wither_skeleton", EntityTypes.WITHER_SKELETON));
|
||||||
define(new NpcTypeImpl.Builder("wolf", EntityTypes.WOLF));
|
register(new NpcTypeImpl.Builder("wolf", EntityTypes.WOLF));
|
||||||
define(new NpcTypeImpl.Builder("zombie", EntityTypes.ZOMBIE));
|
register(new NpcTypeImpl.Builder("zombie", EntityTypes.ZOMBIE));
|
||||||
define(new NpcTypeImpl.Builder("zombie_horse", EntityTypes.ZOMBIE_HORSE));
|
register(new NpcTypeImpl.Builder("zombie_horse", EntityTypes.ZOMBIE_HORSE));
|
||||||
define(new NpcTypeImpl.Builder("zombie_villager", EntityTypes.ZOMBIE_VILLAGER));
|
register(new NpcTypeImpl.Builder("zombie_villager", EntityTypes.ZOMBIE_VILLAGER));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_9)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_9)) return;
|
||||||
define(new NpcTypeImpl.Builder("shulker", EntityTypes.SHULKER));
|
register(new NpcTypeImpl.Builder("shulker", EntityTypes.SHULKER));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_10)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_10)) return;
|
||||||
define(new NpcTypeImpl.Builder("husk", EntityTypes.HUSK));
|
register(new NpcTypeImpl.Builder("husk", EntityTypes.HUSK));
|
||||||
define(new NpcTypeImpl.Builder("polar_bear", EntityTypes.POLAR_BEAR));
|
register(new NpcTypeImpl.Builder("polar_bear", EntityTypes.POLAR_BEAR));
|
||||||
define(new NpcTypeImpl.Builder("stray", EntityTypes.STRAY));
|
register(new NpcTypeImpl.Builder("stray", EntityTypes.STRAY));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_11)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_11)) return;
|
||||||
define(new NpcTypeImpl.Builder("evoker", EntityTypes.EVOKER));
|
register(new NpcTypeImpl.Builder("evoker", EntityTypes.EVOKER));
|
||||||
define(new NpcTypeImpl.Builder("llama", EntityTypes.LLAMA));
|
register(new NpcTypeImpl.Builder("llama", EntityTypes.LLAMA));
|
||||||
define(new NpcTypeImpl.Builder("vex", EntityTypes.VEX));
|
register(new NpcTypeImpl.Builder("vex", EntityTypes.VEX));
|
||||||
define(new NpcTypeImpl.Builder("vindicator", EntityTypes.VINDICATOR));
|
register(new NpcTypeImpl.Builder("vindicator", EntityTypes.VINDICATOR));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_12)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_12)) return;
|
||||||
define(new NpcTypeImpl.Builder("illusioner", EntityTypes.ILLUSIONER));
|
register(new NpcTypeImpl.Builder("illusioner", EntityTypes.ILLUSIONER));
|
||||||
define(new NpcTypeImpl.Builder("parrot", EntityTypes.PARROT));
|
register(new NpcTypeImpl.Builder("parrot", EntityTypes.PARROT));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_13)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_13)) return;
|
||||||
define(new NpcTypeImpl.Builder("cod", EntityTypes.COD));
|
register(new NpcTypeImpl.Builder("cod", EntityTypes.COD));
|
||||||
define(new NpcTypeImpl.Builder("dolphin", EntityTypes.DOLPHIN));
|
register(new NpcTypeImpl.Builder("dolphin", EntityTypes.DOLPHIN));
|
||||||
define(new NpcTypeImpl.Builder("drowned", EntityTypes.DROWNED));
|
register(new NpcTypeImpl.Builder("drowned", EntityTypes.DROWNED));
|
||||||
define(new NpcTypeImpl.Builder("phantom", EntityTypes.PHANTOM));
|
register(new NpcTypeImpl.Builder("phantom", EntityTypes.PHANTOM));
|
||||||
define(new NpcTypeImpl.Builder("pufferfish", EntityTypes.PUFFERFISH));
|
register(new NpcTypeImpl.Builder("pufferfish", EntityTypes.PUFFERFISH));
|
||||||
define(new NpcTypeImpl.Builder("salmon", EntityTypes.SALMON));
|
register(new NpcTypeImpl.Builder("salmon", EntityTypes.SALMON));
|
||||||
define(new NpcTypeImpl.Builder("tropical_fish", EntityTypes.TROPICAL_FISH));
|
register(new NpcTypeImpl.Builder("tropical_fish", EntityTypes.TROPICAL_FISH));
|
||||||
define(new NpcTypeImpl.Builder("turtle", EntityTypes.TURTLE));
|
register(new NpcTypeImpl.Builder("turtle", EntityTypes.TURTLE));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_14)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_14)) return;
|
||||||
define(new NpcTypeImpl.Builder("fox", EntityTypes.FOX));
|
register(new NpcTypeImpl.Builder("fox", EntityTypes.FOX));
|
||||||
define(new NpcTypeImpl.Builder("panda", EntityTypes.PANDA));
|
register(new NpcTypeImpl.Builder("panda", EntityTypes.PANDA));
|
||||||
define(new NpcTypeImpl.Builder("pillager", EntityTypes.PILLAGER));
|
register(new NpcTypeImpl.Builder("pillager", EntityTypes.PILLAGER));
|
||||||
define(new NpcTypeImpl.Builder("ravager", EntityTypes.RAVAGER));
|
register(new NpcTypeImpl.Builder("ravager", EntityTypes.RAVAGER));
|
||||||
define(new NpcTypeImpl.Builder("trader_llama", EntityTypes.TRADER_LLAMA));
|
register(new NpcTypeImpl.Builder("trader_llama", EntityTypes.TRADER_LLAMA));
|
||||||
define(new NpcTypeImpl.Builder("wandering_trader", EntityTypes.WANDERING_TRADER));
|
register(new NpcTypeImpl.Builder("wandering_trader", EntityTypes.WANDERING_TRADER));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_15)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_15)) return;
|
||||||
define(new NpcTypeImpl.Builder("bee", EntityTypes.BEE));
|
register(new NpcTypeImpl.Builder("bee", EntityTypes.BEE));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_16)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_16)) return;
|
||||||
define(new NpcTypeImpl.Builder("hoglin", EntityTypes.HOGLIN));
|
register(new NpcTypeImpl.Builder("hoglin", EntityTypes.HOGLIN));
|
||||||
define(new NpcTypeImpl.Builder("piglin", EntityTypes.PIGLIN));
|
register(new NpcTypeImpl.Builder("piglin", EntityTypes.PIGLIN));
|
||||||
define(new NpcTypeImpl.Builder("piglin_brute", EntityTypes.PIGLIN_BRUTE));
|
register(new NpcTypeImpl.Builder("piglin_brute", EntityTypes.PIGLIN_BRUTE));
|
||||||
define(new NpcTypeImpl.Builder("strider", EntityTypes.STRIDER));
|
register(new NpcTypeImpl.Builder("strider", EntityTypes.STRIDER));
|
||||||
define(new NpcTypeImpl.Builder("zoglin", EntityTypes.ZOGLIN));
|
register(new NpcTypeImpl.Builder("zoglin", EntityTypes.ZOGLIN));
|
||||||
define(new NpcTypeImpl.Builder("zombified_piglin", EntityTypes.ZOMBIFIED_PIGLIN));
|
register(new NpcTypeImpl.Builder("zombified_piglin", EntityTypes.ZOMBIFIED_PIGLIN));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_17)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_17)) return;
|
||||||
define(new NpcTypeImpl.Builder("axolotl", EntityTypes.AXOLOTL));
|
register(new NpcTypeImpl.Builder("axolotl", EntityTypes.AXOLOTL));
|
||||||
define(new NpcTypeImpl.Builder("glow_squid", EntityTypes.GLOW_SQUID));
|
register(new NpcTypeImpl.Builder("glow_squid", EntityTypes.GLOW_SQUID));
|
||||||
define(new NpcTypeImpl.Builder("goat", EntityTypes.GOAT));
|
register(new NpcTypeImpl.Builder("goat", EntityTypes.GOAT));
|
||||||
|
|
||||||
if (!version.isNewerThanOrEquals(ServerVersion.V_1_19)) return;
|
if (!version.isNewerThanOrEquals(ServerVersion.V_1_19)) return;
|
||||||
define(new NpcTypeImpl.Builder("allay", EntityTypes.ALLAY));
|
register(new NpcTypeImpl.Builder("allay", EntityTypes.ALLAY));
|
||||||
define(new NpcTypeImpl.Builder("frog", EntityTypes.FROG));
|
register(new NpcTypeImpl.Builder("frog", EntityTypes.FROG));
|
||||||
define(new NpcTypeImpl.Builder("tadpole", EntityTypes.TADPOLE));
|
register(new NpcTypeImpl.Builder("tadpole", EntityTypes.TADPOLE));
|
||||||
define(new NpcTypeImpl.Builder("warden", EntityTypes.WARDEN));
|
register(new NpcTypeImpl.Builder("warden", EntityTypes.WARDEN));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Collection<NpcTypeImpl> getAll() {
|
public Collection<NpcTypeImpl> getAll() {
|
||||||
|
|
Loading…
Reference in a new issue