From f9fb9a17a9c61250b72138876cdfdfd265a33d75 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 15 Feb 2019 15:20:36 -0800 Subject: [PATCH] defining entitytype (wip) --- .../src/main/java/com/gmail/nossr50/core/TODO | 10 +- .../nossr50/core/mcmmo/entity/EntityType.java | 105 +++++++++++++++++- 2 files changed, 111 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/gmail/nossr50/core/TODO b/core/src/main/java/com/gmail/nossr50/core/TODO index bd54d3d0d..449d0c8d1 100644 --- a/core/src/main/java/com/gmail/nossr50/core/TODO +++ b/core/src/main/java/com/gmail/nossr50/core/TODO @@ -1,7 +1,7 @@ This file is just going to take note of all the caveats of mcMMO code as I abstract out bukkit 1) In several places mcMMO is disabling itself, pretty sure this is not a good idea and this should be changed - eg: in McMMOPlayer, and when loading configs and finding bad vlaues + eg: in McMMOPlayer, and when loading configs and finding bad values 2) mcMMO uses a a global reference of its Plugin class for Bukkit in order to schedule tasks @@ -9,4 +9,10 @@ This file is just going to take note of all the caveats of mcMMO code as I abstr 4) Safety check the hardcore/vampirism commands -5) Tweak configs to not do any string operations \ No newline at end of file +5) Tweak configs to not do any string operations + +6) Need to add and check validation for all current configs + +7) Weird stuff going on with ageables and strings in general in StringUtils + +8) Reduce the amount of string operations in mcMMO as much as possible \ No newline at end of file diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/EntityType.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/EntityType.java index 7aaed73a1..4c2b636a3 100644 --- a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/EntityType.java +++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/EntityType.java @@ -1,10 +1,111 @@ package com.gmail.nossr50.core.mcmmo.entity; +/** + * Used bukkit as a reference for this, should probably make sure nothing weird is in here + */ public enum EntityType { //TODO: Fill this out + AREA_EFFECT_CLOUD, + ARROW, + BAT, + BLAZE, + BOAT, + CAVE_SPIDER, + CHICKEN, + COD, + COMPLEX_PART, + COW, + CREEPER, + DOLPHIN, + DONKEY, + DRAGON_FIREBALL, + DROPPED_ITEM, + DROWNED, + EGG, + ELDER_GUARDIAN, + ENDER_CRYSTAL, + ENDER_DRAGON, + ENDER_PEARL, + ENDER_SIGNAL, + ENDERMAN, + ENDERMITE, + EVOKER, + EVOKER_FANGS, + EXPERIENCE_ORB, + FALLING_BLOCK, + FIREBALL, + FIREWORK, + FISHING_HOOK, + GHAST, + GIANT, + GUARDIAN, + HORSE, + HUSK, + ILLUSIONER, + IRON_GOLEM, + ITEM_FRAME, + LEASH_HITCH, + LIGHTNING, + LINGERING_POTION, + LLAMA, + LLAMA_SPIT, + MAGMA_CUBE, + MINECART, + MINECART_CHEST, + MINECART_COMMAND, + MINECART_FURNACE, + MINECART_HOPPER, + MINECART_MOB_SPAWNER, + MINECART_TNT, + MULE, + MUSHROOM_COW, + OCELOT, + PAINTING, + PARROT, + PHANTOM, + PIG, + PIG_ZOMBIE, + PLAYER, + POLAR_BEAR, + PRIMED_TNT, + PUFFERFISH, + RABBIT, + SALMON, + SHEEP, + SHULKER, + SHULKER_BULLET, + SILVERFISH, + SKELETON, + SKELETON_HORSE, + SLIME, + SMALL_FIREBALL, + SNOWBALL, + SNOWMAN, + SPECTRAL_ARROW, + SPIDER, + SPLASH_POTION, + SQUID, + STRAY, + THROWN_XP_BOTTLE, + TIPPED_ARROW, + TRIDENT, + TROPICAL_FISH, + TURTLE, + VEX, + VILLAGER, + VINDICATOR, + WEATHER, + WITCH, + WITHER, + WITHER_SKELETON, + WITHER_SKULL, WOLF, - OCELOT; + ZOMBIE, + ZOMBIE_HORSE, + ZOMBIE_VILLAGER; //TODO: Wire this up - public String getConfigName() { return toString(); } + public String getConfigName() { + //return toString(); + } }