Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 21:01:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:Steveice10/MCProtocolLib into 1.14

Browse source 
Conflicts:
  src/main/java/com/github/steveice10/mc/protocol/data/MagicValues.java
  src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/MobType.java
This commit is contained in:
Paul Heidenreich 2019-05-03 16:46:02 +02:00
commit 36e5eafd28
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/MobType.java
View file

@ -1,7 +1,9 @@
package com.github.steveice10.mc.protocol.data.game.entity.type;
public enum MobType {
AREA_EFFECT_CLOUD,
ARMOR_STAND,
ARROW,
BAT,
BLAZE,
CAT,
@ -12,8 +14,10 @@ public enum MobType {
CREEPER,
DONKEY,
DOLPHIN,
DRAGON_FIREBALL,
DROWNED,
ELDER_GUARDIAN,
ENDER_CRYSTAL,
ENDER_DRAGON,
ENDERMAN,
ENDERMITE,
@ -26,7 +30,15 @@ public enum MobType {
HUSK,
ILLUSIONER,
LLAMA,
LLAMA_SPIT,
MAGMA_CUBE,
MINECART_RIDEABLE,
MINECART_CHEST,
MINECART_COMMAND_BLOCK,
MINECART_FURNACE,
MINECART_HOPPER,
MINECART_SPAWNER,
MINECART_TNT,
MULE,
MOOSHROOM,
OCELOT,
@ -36,10 +48,12 @@ public enum MobType {
PUFFERFISH,
ZOMBIE_PIGMAN,
POLAR_BEAR,
PRIMED_TNT,
RABBIT,
SALMON,
SHEEP,
SHULKER,
SHULKER_BULLET,
SILVERFISH,
SKELETON,
SKELETON_HORSE,
@ -51,6 +65,10 @@ public enum MobType {
TRADER_LLAMA,
TROPICAL_FISH,
TURTLE,
THROWN_EGG,
THROWN_ENDERPEARL,
THROWN_EXP_BOTTLE,
THROWN_POTION,
VEX,
VILLAGER,
IRON_GOLEM,
@ -60,6 +78,7 @@ public enum MobType {
WITCH,
WITHER,
WITHER_SKELETON,
WITHER_SKULL,
WOLF,
ZOMBIE,
ZOMBIE_HORSE,