Update to 1.12. :D

To the best of my knowledge ;)
This commit is contained in:
Ali Moghnieh 2017-06-18 19:54:04 +01:00
parent 34e3582557
commit 14a02c0602
No known key found for this signature in database
GPG Key ID: F09D3A1BAF2E6D70
6 changed files with 703 additions and 61 deletions

View File

@ -73,6 +73,8 @@ public enum Mob {
VINDICATOR("Vindicator", Enemies.ENEMY, "VINDICATOR"),
LLAMA("Llama", Enemies.NEUTRAL, "LLAMA"),
HUSK("Husk", Enemies.ENEMY, "HUSK"),
ILLUSIONER("Illusioner", Enemies.ENEMY, "ILLUSIONER"),
PARROT("parrot", Enemies.NEUTRAL, "PARROT"),
;
public static final Logger logger = Logger.getLogger("Essentials");

View File

@ -89,7 +89,13 @@ public enum MobData {
SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true),
BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true),
SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true),
NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true);
NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true),
RED_PARROT("red", EntityType.PARROT, Parrot.Variant.RED, true),
GREEN_PARROT("green", EntityType.PARROT, Parrot.Variant.GREEN, true),
BLUE_PARROT("blue", EntityType.PARROT, Parrot.Variant.BLUE, true),
CYAN_PARROT("cyan", EntityType.PARROT, Parrot.Variant.CYAN, true),
GRAY_PARROT("gray", EntityType.PARROT, Parrot.Variant.GRAY, true),
;
public enum Data {
@ -244,6 +250,8 @@ public enum MobData {
InventoryWorkaround.setItemInMainHand(invent, new ItemStack((Material) this.value, 1));
InventoryWorkaround.setItemInMainHandDropChance(invent, 0.1f);
}
} else if (this.value instanceof Parrot.Variant) {
((Parrot) spawned).setVariant((Parrot.Variant) this.value);
}
}
}

View File

@ -1,9 +1,14 @@
package com.earth2me.essentials;
import net.ess3.nms.refl.ReflUtil;
import org.bukkit.*;
import org.bukkit.advancement.Advancement;
import org.bukkit.advancement.AdvancementProgress;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.block.Block;
import org.bukkit.block.PistonMoveReaction;
import org.bukkit.conversations.Conversation;
import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.entity.*;
@ -22,6 +27,8 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.util.Vector;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.InetSocketAddress;
import java.util.*;
@ -188,11 +195,6 @@ public class OfflinePlayer implements Player {
return 0D;
}
@Override
public List<Block> getLineOfSight(HashSet<Byte> hs, int i) {
return Collections.emptyList();
}
@Override
public List<Block> getLineOfSight(Set<Material> mat, int i) {
return Collections.emptyList();
@ -1114,41 +1116,6 @@ public class OfflinePlayer implements Player {
public void setScoreboard(Scoreboard scrbrd) throws IllegalArgumentException, IllegalStateException {
}
@Override
public int _INVALID_getLastDamage() {
return 0;
}
@Override
public void _INVALID_setLastDamage(int i) {
}
@Override
public void _INVALID_damage(int i) {
}
@Override
public void _INVALID_damage(int i, Entity entity) {
}
@Override
public int _INVALID_getHealth() {
return 0;
}
@Override
public void _INVALID_setHealth(int i) {
}
@Override
public int _INVALID_getMaxHealth() {
return 0;
}
@Override
public void _INVALID_setMaxHealth(int i) {
}
@Override
public void playSound(Location arg0, String arg1, float arg2, float arg3) {
}
@ -1293,8 +1260,12 @@ public class OfflinePlayer implements Player {
return base.isBanned();
}
@Override
// Removed in 1.12, retain for backwards compatibility.
@Deprecated
public void setBanned(boolean banned) {
if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_12_R1)) {
throw new UnsupportedOperationException("Cannot called setBanned on MC 1.12 and higher.");
}
if (base.getName() == null && getName() != null) {
if (banned) {
server.getBanList(BanList.Type.NAME).addBan(getName(), null, null, null);
@ -1302,7 +1273,13 @@ public class OfflinePlayer implements Player {
server.getBanList(BanList.Type.NAME).pardon(getName());
}
}
base.setBanned(banned);
try {
Method method = base.getClass().getDeclaredMethod("setBanned", boolean.class);
method.invoke(banned);
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
// This will never happen in a normal CraftBukkit pre-1.12 instance
e.printStackTrace();
}
}
@Override
@ -1425,4 +1402,80 @@ public class OfflinePlayer implements Player {
// improved to support cases where dummy null instances should be returned.
return null;
}
@Override
public void setResourcePack(String s, byte[] bytes) {
}
@Override
public AdvancementProgress getAdvancementProgress(Advancement advancement) {
return null;
}
@Override
public String getLocale() {
return null;
}
@Override
public boolean hasCooldown(Material material) {
return false;
}
@Override
public int getCooldown(Material material) {
return 0;
}
@Override
public void setCooldown(Material material, int i) {
}
@Override
public Entity getShoulderEntityLeft() {
return null;
}
@Override
public void setShoulderEntityLeft(Entity entity) {
}
@Override
public Entity getShoulderEntityRight() {
return null;
}
@Override
public void setShoulderEntityRight(Entity entity) {
}
@Override
public double getHeight() {
return 0;
}
@Override
public double getWidth() {
return 0;
}
@Override
public List<Entity> getPassengers() {
return null;
}
@Override
public boolean addPassenger(Entity entity) {
return false;
}
@Override
public boolean removePassenger(Entity entity) {
return false;
}
@Override
public PistonMoveReaction getPistonMoveReaction() {
return null;
}
}

View File

@ -3409,18 +3409,36 @@ wsclay,159,0
wstainedclay,159,0
sclay,159,0
stainedclay,159,0
whiteterracota,159,0
whiteterra,159,0
whitetcota,159,0
wterracota,159,0
wterra,159,0
wtcota,159,0
orangeclay,159,1
orangesclay,159,1
orangestainedclay,159,1
oclay,159,1
osclay,159,1
ostainedclay,159,1
orangeterracota,159,1
orangeterra,159,1
orangetcota,159,1
oterracota,159,1
oterra,159,1
otcota,159,1
magentaclay,159,2
magentasclay,159,2
magentastainedclay,159,2
mclay,159,2
msclay,159,2
mstainedclay,159,2
magentaterracota,159,2
magentaterra,159,2
magentatcota,159,2
mterracota,159,2
mterra,159,2
mtcota,159,2
lightblueclay,159,3
lightbluesclay,159,3
lightbluestainedclay,159,3
@ -3436,12 +3454,33 @@ lblustainedclay,159,3
lbclay,159,3
lbsclay,159,3
lbstainedclay,159,3
lightblueterracota,159,3
lightblueterra,159,3
lightbluetcota,159,3
lightbluterracota,159,3
lightbluterra,159,3
lightblutcota,159,3
lblueterracota,159,3
lblueterra,159,3
lbluetcota,159,3
lbluterracota,159,3
lbluterra,159,3
lblutcota,159,3
lbterracota,159,3
lbterra,159,3
lbtcota,159,3
yellowclay,159,4
yellowsclay,159,4
yellowstainedclay,159,4
yclay,159,4
ysclay,159,4
ystainedclay,159,4
yellowterracota,159,4
yellowterra,159,4
yellowtcota,159,4
yterracota,159,4
yterra,159,4
ytcota,159,4
lightgreenclay,159,5
lightgreensclay,159,5
lightgreenstainedclay,159,5
@ -3460,12 +3499,36 @@ limestainedclay,159,5
lclay,159,5
lsclay,159,5
lstainedclay,159,5
lightgreenterracota,159,5
lightgreenterra,159,5
lightgreentcota,159,5
lgreenterracota,159,5
lgreenterra,159,5
lgreentcota,159,5
lightgreterracota,159,5
lightgreterra,159,5
lightgretcota,159,5
lgreterracota,159,5
lgreterra,159,5
lgretcota,159,5
limeterracota,159,5
limeterra,159,5
limetcota,159,5
lterracota,159,5
lterra,159,5
ltcota,159,5
pinkclay,159,6
pinksclay,159,6
pinkstainedclay,159,6
piclay,159,6
pisclay,159,6
pistainedclay,159,6
pinkterracota,159,6
pinkterra,159,6
pinktcota,159,6
piterracota,159,6
piterra,159,6
pitcota,159,6
darkgrayclay,159,7
darkgraysclay,159,7
darkgraystainedclay,159,7
@ -3493,6 +3556,33 @@ greystainedclay,159,7
graclay,159,7
grasclay,159,7
grastainedclay,159,7
darkgrayterracota,159,7
darkgrayterra,159,7
darkgraytcota,159,7
dgrayterracota,159,7
dgrayterra,159,7
dgraytcota,159,7
darkgreyterracota,159,7
darkgreyterra,159,7
darkgreytcota,159,7
dgreyterracota,159,7
dgreyterra,159,7
dgreytcota,159,7
darkgraterracota,159,7
darkgraterra,159,7
darkgratcota,159,7
dgraterracota,159,7
dgraterra,159,7
dgratcota,159,7
grayterracota,159,7
grayterra,159,7
graytcota,159,7
greyterracota,159,7
greyterra,159,7
greytcota,159,7
graterracota,159,7
graterra,159,7
gratcota,159,7
lgclay,159,8
lightgrayclay,159,8
lightgraysclay,159,8
@ -3518,30 +3608,81 @@ silverstainedclay,159,8
siclay,159,8
siasclay,159,8
siastainedclay,159,8
lgterracota,159,8
lgterra,159,8
lgtcota,159,8
lightgrayterracota,159,8
lightgrayterra,159,8
lightgraytcota,159,8
lgrayterracota,159,8
lgrayterra,159,8
lgraytcota,159,8
lightgreyterracota,159,8
lightgreyterra,159,8
lightgreytcota,159,8
lgreyterracota,159,8
lgreyterra,159,8
lgreytcota,159,8
lightgraterracota,159,8
lightgraterra,159,8
lightgratcota,159,8
lgraterracota,159,8
lgraterra,159,8
lgratcota,159,8
silverterracota,159,8
silverterra,159,8
silvertcota,159,8
siterracota,159,8
siterra,159,8
sitcota,159,8
cyanclay,159,9
cyansclay,159,9
cyanstainedclay,159,9
cclay,159,9
csclay,159,9
cstainedclay,159,9
cyanterracota,159,9
cyanterra,159,9
cyantcota,159,9
cterracota,159,9
cterra,159,9
ctcota,159,9
purpleclay,159,10
purplesclay,159,10
purplestainedclay,159,10
puclay,159,10
pusclay,159,10
pustainedclay,159,10
purpleterracota,159,10
purpleterra,159,10
purpletcota,159,10
puterracota,159,10
puterra,159,10
putcota,159,10
blueclay,159,11
bluesclay,159,11
bluestainedclay,159,11
bluclay,159,11
blusclay,159,11
blustainedclay,159,11
blueterracota,159,11
blueterra,159,11
bluetcota,159,11
bluterracota,159,11
bluterra,159,11
blutcota,159,11
brownclay,159,12
brownsclay,159,12
brownstainedclay,159,12
broclay,159,12
brosclay,159,12
brostainedclay,159,12
brownterracota,159,12
brownterra,159,12
browntcota,159,12
broterracota,159,12
broterra,159,12
brotcota,159,12
darkgreenclay,159,13
darkgreensclay,159,13
darkgreenstainedclay,159,13
@ -3560,18 +3701,48 @@ dgrestainedclay,159,13
greclay,159,13
gresclay,159,13
grestainedclay,159,13
darkgreenterracota,159,13
darkgreenterra,159,13
darkgreentcota,159,13
dgreenterracota,159,13
dgreenterra,159,13
dgreentcota,159,13
greenterracota,159,13
greenterra,159,13
greentcota,159,13
darkgreterracota,159,13
darkgreterra,159,13
darkgretcota,159,13
dgreterracota,159,13
dgreterra,159,13
dgretcota,159,13
greterracota,159,13
greterra,159,13
gretcota,159,13
redclay,159,14
redsclay,159,14
redstainedclay,159,14
rclay,159,14
rsclay,159,14
rstainedclay,159,14
redterracota,159,14
redterra,159,14
redtcota,159,14
rterracota,159,14
rterra,159,14
rtcota,159,14
blackclay,159,15
blacksclay,159,15
blackstainedclay,159,15
blaclay,159,15
blasclay,159,15
blastainedclay,159,15
blackterracota,159,15
blackterra,159,15
blacktcota,159,15
blaterracota,159,15
blaterra,159,15
blatcota,159,15
wgpane,160,0
whiteglasspane,160,0
whitesglasspane,160,0
@ -4040,6 +4211,9 @@ blafloor,171,15
hardenedclay,172,0
hardclay,172,0
hclay,172,0
terracota,172,0
terra,172,0
tcota,172,0
coalblock,173,0
blockcoal,173,0
coblock,173,0
@ -4339,6 +4513,348 @@ blackshulkerbox,234,0
blashulkerbox,234,0
blackchest,234,0
blachest,234,0
whiteglazedterracota,235,0
whiteglazedterra,235,0
whiteglazedtcota,235,0
wglazedterracota,235,0
wglazedterra,235,0
wglazedtcota,235,0
orangeglazedterracota,236,0
orangeglazedterra,236,0
orangeglazedtcota,236,0
oglazedterracota,236,0
oglazedterra,236,0
oglazedtcota,236,0
magentaglazedterracota,237,0
magentaglazedterra,237,0
magentaglazedtcota,237,0
mglazedterracota,237,0
mglazedterra,237,0
mglazedtcota,237,0
lightblueglazedterracota,238,0
lightblueglazedterra,238,0
lightblueglazedtcota,238,0
lightbluglazedterracota,238,0
lightbluglazedterra,238,0
lightbluglazedtcota,238,0
lblueglazedterracota,238,0
lblueglazedterra,238,0
lblueglazedtcota,238,0
lbluglazedterracota,238,0
lbluglazedterra,238,0
lbluglazedtcota,238,0
lbglazedterracota,238,0
lbglazedterra,238,0
lbglazedtcota,238,0
yellowglazedterracota,239,0
yellowglazedterra,239,0
yellowglazedtcota,239,0
yglazedterracota,239,0
yglazedterra,239,0
yglazedtcota,239,0
lightgreenglazedterracota,240,0
lightgreenglazedterra,240,0
lightgreenglazedtcota,240,0
lgreenglazedterracota,240,0
lgreenglazedterra,240,0
lgreenglazedtcota,240,0
lightgreglazedterracota,240,0
lightgreglazedterra,240,0
lightgreglazedtcota,240,0
lgreglazedterracota,240,0
lgreglazedterra,240,0
lgreglazedtcota,240,0
limeglazedterracota,240,0
limeglazedterra,240,0
limeglazedtcota,240,0
lglazedterracota,240,0
lglazedterra,240,0
lglazedtcota,240,0
pinkglazedterracota,241,0
pinkglazedterra,241,0
pinkglazedtcota,241,0
piglazedterracota,241,0
piglazedterra,241,0
piglazedtcota,241,0
darkgrayglazedterracota,242,0
darkgrayglazedterra,242,0
darkgrayglazedtcota,242,0
dgrayglazedterracota,242,0
dgrayglazedterra,242,0
dgrayglazedtcota,242,0
darkgreyglazedterracota,242,0
darkgreyglazedterra,242,0
darkgreyglazedtcota,242,0
dgreyglazedterracota,242,0
dgreyglazedterra,242,0
dgreyglazedtcota,242,0
darkgraglazedterracota,242,0
darkgraglazedterra,242,0
darkgraglazedtcota,242,0
dgraglazedterracota,242,0
dgraglazedterra,242,0
dgraglazedtcota,242,0
grayglazedterracota,242,0
grayglazedterra,242,0
grayglazedtcota,242,0
greyglazedterracota,242,0
greyglazedterra,242,0
greyglazedtcota,242,0
graglazedterracota,242,0
graglazedterra,242,0
graglazedtcota,242,0
lgglazedterracota,243,0
lgglazedterra,243,0
lgglazedtcota,243,0
lightgrayglazedterracota,243,0
lightgrayglazedterra,243,0
lightgrayglazedtcota,243,0
lgrayglazedterracota,243,0
lgrayglazedterra,243,0
lgrayglazedtcota,243,0
lightgreyglazedterracota,243,0
lightgreyglazedterra,243,0
lightgreyglazedtcota,243,0
lgreyglazedterracota,243,0
lgreyglazedterra,243,0
lgreyglazedtcota,243,0
lightgraglazedterracota,243,0
lightgraglazedterra,243,0
lightgraglazedtcota,243,0
lgraglazedterracota,243,0
lgraglazedterra,243,0
lgraglazedtcota,243,0
silverglazedterracota,243,0
silverglazedterra,243,0
silverglazedtcota,243,0
siglazedterracota,243,0
siglazedterra,243,0
siglazedtcota,243,0
cyanglazedterracota,244,0
cyanglazedterra,244,0
cyanglazedtcota,244,0
cglazedterracota,244,0
cglazedterra,244,0
cglazedtcota,244,0
purpleglazedterracota,245,0
purpleglazedterra,245,0
purpleglazedtcota,245,0
puglazedterracota,245,0
puglazedterra,245,0
puglazedtcota,245,0
blueglazedterracota,246,0
blueglazedterra,246,0
blueglazedtcota,246,0
bluglazedterracota,246,0
bluglazedterra,246,0
bluglazedtcota,246,0
brownglazedterracota,247,0
brownglazedterra,247,0
brownglazedtcota,247,0
broglazedterracota,247,0
broglazedterra,247,0
broglazedtcota,247,0
darkgreenglazedterracota,248,0
darkgreenglazedterra,248,0
darkgreenglazedtcota,248,0
dgreenglazedterracota,248,0
dgreenglazedterra,248,0
dgreenglazedtcota,248,0
greenglazedterracota,248,0
greenglazedterra,248,0
greenglazedtcota,248,0
darkgreglazedterracota,248,0
darkgreglazedterra,248,0
darkgreglazedtcota,248,0
dgreglazedterracota,248,0
dgreglazedterra,248,0
dgreglazedtcota,248,0
greglazedterracota,248,0
greglazedterra,248,0
greglazedtcota,248,0
redglazedterracota,249,0
redglazedterra,249,0
redglazedtcota,249,0
rglazedterracota,249,0
rglazedterra,249,0
rglazedtcota,249,0
blackglazedterracota,250,0
blackglazedterra,250,0
blackglazedtcota,250,0
blaglazedterracota,250,0
blaglazedterra,250,0
blaglazedtcota,250,0
whiteconcrete,251,0
wconcrete,251,0
orangeconcrete,251,1
oconcrete,251,1
magentaconcrete,251,2
mconcrete,251,2
lightblueconcrete,251,3
lightbluconcrete,251,3
lblueconcrete,251,3
lbluconcrete,251,3
lbconcrete,251,3
yellowconcrete,251,4
yconcrete,251,4
lightgreenconcrete,251,5
lgreenconcrete,251,5
lightgreconcrete,251,5
lgreconcrete,251,5
limeconcrete,251,5
lconcrete,251,5
pinkconcrete,251,6
piconcrete,251,6
darkgrayconcrete,251,7
dgrayconcrete,251,7
darkgreyconcrete,251,7
dgreyconcrete,251,7
darkgraconcrete,251,7
dgraconcrete,251,7
grayconcrete,251,7
greyconcrete,251,7
graconcrete,251,7
lgconcrete,251,8
lightgrayconcrete,251,8
lgrayconcrete,251,8
lightgreyconcrete,251,8
lgreyconcrete,251,8
lightgraconcrete,251,8
lgraconcrete,251,8
silverconcrete,251,8
siconcrete,251,8
cyanconcrete,251,9
cconcrete,251,9
purpleconcrete,251,10
puconcrete,251,10
blueconcrete,251,11
bluconcrete,251,11
brownconcrete,251,12
broconcrete,251,12
darkgreenconcrete,251,13
dgreenconcrete,251,13
greenconcrete,251,13
darkgreconcrete,251,13
dgreconcrete,251,13
greconcrete,251,13
redconcrete,251,14
rconcrete,251,14
blackconcrete,251,15
blaconcrete,251,15
whiteconcretepowder,252,0
whiteconcretesand,252,0
wconcretepowder,252,0
wconcretesand,252,0
orangeconcretepowder,252,1
orangeconcretesand,252,1
oconcretepowder,252,1
oconcretesand,252,1
magentaconcretepowder,252,2
magentaconcretesand,252,2
mconcretepowder,252,2
mconcretesand,252,2
lightblueconcretepowder,252,3
lightblueconcretesand,252,3
lightbluconcretepowder,252,3
lightbluconcretesand,252,3
lblueconcretepowder,252,3
lblueconcretesand,252,3
lbluconcretepowder,252,3
lbluconcretesand,252,3
lbconcretepowder,252,3
lbconcretesand,252,3
yellowconcretepowder,252,4
yellowconcretesand,252,4
yconcretepowder,252,4
yconcretesand,252,4
lightgreenconcretepowder,252,5
lightgreenconcretesand,252,5
lgreenconcretepowder,252,5
lgreenconcretesand,252,5
lightgreconcretepowder,252,5
lightgreconcretesand,252,5
lgreconcretepowder,252,5
lgreconcretesand,252,5
limeconcretepowder,252,5
limeconcretesand,252,5
lconcretepowder,252,5
lconcretesand,252,5
pinkconcretepowder,252,6
pinkconcretesand,252,6
piconcretepowder,252,6
piconcretesand,252,6
darkgrayconcretepowder,252,7
darkgrayconcretesand,252,7
dgrayconcretepowder,252,7
dgrayconcretesand,252,7
darkgreyconcretepowder,252,7
darkgreyconcretesand,252,7
dgreyconcretepowder,252,7
dgreyconcretesand,252,7
darkgraconcretepowder,252,7
darkgraconcretesand,252,7
dgraconcretepowder,252,7
dgraconcretesand,252,7
grayconcretepowder,252,7
grayconcretesand,252,7
greyconcretepowder,252,7
greyconcretesand,252,7
graconcretepowder,252,7
graconcretesand,252,7
lgconcretepowder,252,8
lgconcretesand,252,8
lightgrayconcretepowder,252,8
lightgrayconcretesand,252,8
lgrayconcretepowder,252,8
lgrayconcretesand,252,8
lightgreyconcretepowder,252,8
lightgreyconcretesand,252,8
lgreyconcretepowder,252,8
lgreyconcretesand,252,8
lightgraconcretepowder,252,8
lightgraconcretesand,252,8
lgraconcretepowder,252,8
lgraconcretesand,252,8
silverconcretepowder,252,8
silverconcretesand,252,8
siconcretepowder,252,8
siconcretesand,252,8
cyanconcretepowder,252,9
cyanconcretesand,252,9
cconcretepowder,252,9
cconcretesand,252,9
purpleconcretepowder,252,10
purpleconcretesand,252,10
puconcretepowder,252,10
puconcretesand,252,10
blueconcretepowder,252,11
blueconcretesand,252,11
bluconcretepowder,252,11
bluconcretesand,252,11
brownconcretepowder,252,12
brownconcretesand,252,12
broconcretepowder,252,12
broconcretesand,252,12
darkgreenconcretepowder,252,13
darkgreenconcretesand,252,13
dgreenconcretepowder,252,13
dgreenconcretesand,252,13
greenconcretepowder,252,13
greenconcretesand,252,13
darkgreconcretepowder,252,13
darkgreconcretesand,252,13
dgreconcretepowder,252,13
dgreconcretesand,252,13
greconcretepowder,252,13
greconcretesand,252,13
redconcretepowder,252,14
redconcretesand,252,14
rconcretepowder,252,14
rconcretesand,252,14
blackconcretepowder,252,15
blackconcretesand,252,15
blaconcretepowder,252,15
blaconcretesand,252,15
structureblock,255,0
ironshovel,256,0
ironspade,256,0
@ -5277,7 +5793,64 @@ bone,352,0
sugar,353,0
whitedust,353,0
cake,354,0
bed,355,0
bed,355
whitebed,355,0
wbed,355,0
orangebed,355,1
obed,355,1
magentabed,355,2
mbed,355,2
lightbluebed,355,3
lightblubed,355,3
lbluebed,355,3
lblubed,355,3
lbbed,355,3
yellowbed,355,4
ybed,355,4
lightgreenbed,355,5
lgreenbed,355,5
lightgrebed,355,5
lgrebed,355,5
limebed,355,5
lbed,355,5
pinkbed,355,6
pibed,355,6
darkgraybed,355,7
dgraybed,355,7
darkgreybed,355,7
dgreybed,355,7
darkgrabed,355,7
dgrabed,355,7
graybed,355,7
greybed,355,7
grabed,355,7
lgbed,355,8
lightgraybed,355,8
lgraybed,355,8
lightgreybed,355,8
lgreybed,355,8
lightgrabed,355,8
lgrabed,355,8
silverbed,355,8
sibed,355,8
cyanbed,355,9
cbed,355,9
purplebed,355,10
pubed,355,10
bluebed,355,11
blubed,355,11
brownbed,355,12
brobed,355,12
darkgreenbed,355,13
dgreenbed,355,13
greenbed,355,13
darkgrebed,355,13
dgrebed,355,13
grebed,355,13
redbed,355,14
rbed,355,14
blackbed,355,15
blabed,355,15
redstonerepeater,356,0
redstonerepeat,356,0
redstonedelayer,356,0
@ -7029,6 +7602,7 @@ bearspawnegg,383,102
polarbearegg,383,102
polaregg,383,102
bearegg,383,102
parrot,383,105
villageregg,383,120
eggvillager,383,120
bottleofenchanting,384,0

1 #version: TeamCity
3409 wstainedclay,159,0
3410 sclay,159,0
3411 stainedclay,159,0
3412 whiteterracota,159,0
3413 whiteterra,159,0
3414 whitetcota,159,0
3415 wterracota,159,0
3416 wterra,159,0
3417 wtcota,159,0
3418 orangeclay,159,1
3419 orangesclay,159,1
3420 orangestainedclay,159,1
3421 oclay,159,1
3422 osclay,159,1
3423 ostainedclay,159,1
3424 orangeterracota,159,1
3425 orangeterra,159,1
3426 orangetcota,159,1
3427 oterracota,159,1
3428 oterra,159,1
3429 otcota,159,1
3430 magentaclay,159,2
3431 magentasclay,159,2
3432 magentastainedclay,159,2
3433 mclay,159,2
3434 msclay,159,2
3435 mstainedclay,159,2
3436 magentaterracota,159,2
3437 magentaterra,159,2
3438 magentatcota,159,2
3439 mterracota,159,2
3440 mterra,159,2
3441 mtcota,159,2
3442 lightblueclay,159,3
3443 lightbluesclay,159,3
3444 lightbluestainedclay,159,3
3454 lbclay,159,3
3455 lbsclay,159,3
3456 lbstainedclay,159,3
3457 lightblueterracota,159,3
3458 lightblueterra,159,3
3459 lightbluetcota,159,3
3460 lightbluterracota,159,3
3461 lightbluterra,159,3
3462 lightblutcota,159,3
3463 lblueterracota,159,3
3464 lblueterra,159,3
3465 lbluetcota,159,3
3466 lbluterracota,159,3
3467 lbluterra,159,3
3468 lblutcota,159,3
3469 lbterracota,159,3
3470 lbterra,159,3
3471 lbtcota,159,3
3472 yellowclay,159,4
3473 yellowsclay,159,4
3474 yellowstainedclay,159,4
3475 yclay,159,4
3476 ysclay,159,4
3477 ystainedclay,159,4
3478 yellowterracota,159,4
3479 yellowterra,159,4
3480 yellowtcota,159,4
3481 yterracota,159,4
3482 yterra,159,4
3483 ytcota,159,4
3484 lightgreenclay,159,5
3485 lightgreensclay,159,5
3486 lightgreenstainedclay,159,5
3499 lclay,159,5
3500 lsclay,159,5
3501 lstainedclay,159,5
3502 lightgreenterracota,159,5
3503 lightgreenterra,159,5
3504 lightgreentcota,159,5
3505 lgreenterracota,159,5
3506 lgreenterra,159,5
3507 lgreentcota,159,5
3508 lightgreterracota,159,5
3509 lightgreterra,159,5
3510 lightgretcota,159,5
3511 lgreterracota,159,5
3512 lgreterra,159,5
3513 lgretcota,159,5
3514 limeterracota,159,5
3515 limeterra,159,5
3516 limetcota,159,5
3517 lterracota,159,5
3518 lterra,159,5
3519 ltcota,159,5
3520 pinkclay,159,6
3521 pinksclay,159,6
3522 pinkstainedclay,159,6
3523 piclay,159,6
3524 pisclay,159,6
3525 pistainedclay,159,6
3526 pinkterracota,159,6
3527 pinkterra,159,6
3528 pinktcota,159,6
3529 piterracota,159,6
3530 piterra,159,6
3531 pitcota,159,6
3532 darkgrayclay,159,7
3533 darkgraysclay,159,7
3534 darkgraystainedclay,159,7
3556 graclay,159,7
3557 grasclay,159,7
3558 grastainedclay,159,7
3559 darkgrayterracota,159,7
3560 darkgrayterra,159,7
3561 darkgraytcota,159,7
3562 dgrayterracota,159,7
3563 dgrayterra,159,7
3564 dgraytcota,159,7
3565 darkgreyterracota,159,7
3566 darkgreyterra,159,7
3567 darkgreytcota,159,7
3568 dgreyterracota,159,7
3569 dgreyterra,159,7
3570 dgreytcota,159,7
3571 darkgraterracota,159,7
3572 darkgraterra,159,7
3573 darkgratcota,159,7
3574 dgraterracota,159,7
3575 dgraterra,159,7
3576 dgratcota,159,7
3577 grayterracota,159,7
3578 grayterra,159,7
3579 graytcota,159,7
3580 greyterracota,159,7
3581 greyterra,159,7
3582 greytcota,159,7
3583 graterracota,159,7
3584 graterra,159,7
3585 gratcota,159,7
3586 lgclay,159,8
3587 lightgrayclay,159,8
3588 lightgraysclay,159,8
3608 siclay,159,8
3609 siasclay,159,8
3610 siastainedclay,159,8
3611 lgterracota,159,8
3612 lgterra,159,8
3613 lgtcota,159,8
3614 lightgrayterracota,159,8
3615 lightgrayterra,159,8
3616 lightgraytcota,159,8
3617 lgrayterracota,159,8
3618 lgrayterra,159,8
3619 lgraytcota,159,8
3620 lightgreyterracota,159,8
3621 lightgreyterra,159,8
3622 lightgreytcota,159,8
3623 lgreyterracota,159,8
3624 lgreyterra,159,8
3625 lgreytcota,159,8
3626 lightgraterracota,159,8
3627 lightgraterra,159,8
3628 lightgratcota,159,8
3629 lgraterracota,159,8
3630 lgraterra,159,8
3631 lgratcota,159,8
3632 silverterracota,159,8
3633 silverterra,159,8
3634 silvertcota,159,8
3635 siterracota,159,8
3636 siterra,159,8
3637 sitcota,159,8
3638 cyanclay,159,9
3639 cyansclay,159,9
3640 cyanstainedclay,159,9
3641 cclay,159,9
3642 csclay,159,9
3643 cstainedclay,159,9
3644 cyanterracota,159,9
3645 cyanterra,159,9
3646 cyantcota,159,9
3647 cterracota,159,9
3648 cterra,159,9
3649 ctcota,159,9
3650 purpleclay,159,10
3651 purplesclay,159,10
3652 purplestainedclay,159,10
3653 puclay,159,10
3654 pusclay,159,10
3655 pustainedclay,159,10
3656 purpleterracota,159,10
3657 purpleterra,159,10
3658 purpletcota,159,10
3659 puterracota,159,10
3660 puterra,159,10
3661 putcota,159,10
3662 blueclay,159,11
3663 bluesclay,159,11
3664 bluestainedclay,159,11
3665 bluclay,159,11
3666 blusclay,159,11
3667 blustainedclay,159,11
3668 blueterracota,159,11
3669 blueterra,159,11
3670 bluetcota,159,11
3671 bluterracota,159,11
3672 bluterra,159,11
3673 blutcota,159,11
3674 brownclay,159,12
3675 brownsclay,159,12
3676 brownstainedclay,159,12
3677 broclay,159,12
3678 brosclay,159,12
3679 brostainedclay,159,12
3680 brownterracota,159,12
3681 brownterra,159,12
3682 browntcota,159,12
3683 broterracota,159,12
3684 broterra,159,12
3685 brotcota,159,12
3686 darkgreenclay,159,13
3687 darkgreensclay,159,13
3688 darkgreenstainedclay,159,13
3701 greclay,159,13
3702 gresclay,159,13
3703 grestainedclay,159,13
3704 darkgreenterracota,159,13
3705 darkgreenterra,159,13
3706 darkgreentcota,159,13
3707 dgreenterracota,159,13
3708 dgreenterra,159,13
3709 dgreentcota,159,13
3710 greenterracota,159,13
3711 greenterra,159,13
3712 greentcota,159,13
3713 darkgreterracota,159,13
3714 darkgreterra,159,13
3715 darkgretcota,159,13
3716 dgreterracota,159,13
3717 dgreterra,159,13
3718 dgretcota,159,13
3719 greterracota,159,13
3720 greterra,159,13
3721 gretcota,159,13
3722 redclay,159,14
3723 redsclay,159,14
3724 redstainedclay,159,14
3725 rclay,159,14
3726 rsclay,159,14
3727 rstainedclay,159,14
3728 redterracota,159,14
3729 redterra,159,14
3730 redtcota,159,14
3731 rterracota,159,14
3732 rterra,159,14
3733 rtcota,159,14
3734 blackclay,159,15
3735 blacksclay,159,15
3736 blackstainedclay,159,15
3737 blaclay,159,15
3738 blasclay,159,15
3739 blastainedclay,159,15
3740 blackterracota,159,15
3741 blackterra,159,15
3742 blacktcota,159,15
3743 blaterracota,159,15
3744 blaterra,159,15
3745 blatcota,159,15
3746 wgpane,160,0
3747 whiteglasspane,160,0
3748 whitesglasspane,160,0
4211 hardenedclay,172,0
4212 hardclay,172,0
4213 hclay,172,0
4214 terracota,172,0
4215 terra,172,0
4216 tcota,172,0
4217 coalblock,173,0
4218 blockcoal,173,0
4219 coblock,173,0
4513 blashulkerbox,234,0
4514 blackchest,234,0
4515 blachest,234,0
4516 whiteglazedterracota,235,0
4517 whiteglazedterra,235,0
4518 whiteglazedtcota,235,0
4519 wglazedterracota,235,0
4520 wglazedterra,235,0
4521 wglazedtcota,235,0
4522 orangeglazedterracota,236,0
4523 orangeglazedterra,236,0
4524 orangeglazedtcota,236,0
4525 oglazedterracota,236,0
4526 oglazedterra,236,0
4527 oglazedtcota,236,0
4528 magentaglazedterracota,237,0
4529 magentaglazedterra,237,0
4530 magentaglazedtcota,237,0
4531 mglazedterracota,237,0
4532 mglazedterra,237,0
4533 mglazedtcota,237,0
4534 lightblueglazedterracota,238,0
4535 lightblueglazedterra,238,0
4536 lightblueglazedtcota,238,0
4537 lightbluglazedterracota,238,0
4538 lightbluglazedterra,238,0
4539 lightbluglazedtcota,238,0
4540 lblueglazedterracota,238,0
4541 lblueglazedterra,238,0
4542 lblueglazedtcota,238,0
4543 lbluglazedterracota,238,0
4544 lbluglazedterra,238,0
4545 lbluglazedtcota,238,0
4546 lbglazedterracota,238,0
4547 lbglazedterra,238,0
4548 lbglazedtcota,238,0
4549 yellowglazedterracota,239,0
4550 yellowglazedterra,239,0
4551 yellowglazedtcota,239,0
4552 yglazedterracota,239,0
4553 yglazedterra,239,0
4554 yglazedtcota,239,0
4555 lightgreenglazedterracota,240,0
4556 lightgreenglazedterra,240,0
4557 lightgreenglazedtcota,240,0
4558 lgreenglazedterracota,240,0
4559 lgreenglazedterra,240,0
4560 lgreenglazedtcota,240,0
4561 lightgreglazedterracota,240,0
4562 lightgreglazedterra,240,0
4563 lightgreglazedtcota,240,0
4564 lgreglazedterracota,240,0
4565 lgreglazedterra,240,0
4566 lgreglazedtcota,240,0
4567 limeglazedterracota,240,0
4568 limeglazedterra,240,0
4569 limeglazedtcota,240,0
4570 lglazedterracota,240,0
4571 lglazedterra,240,0
4572 lglazedtcota,240,0
4573 pinkglazedterracota,241,0
4574 pinkglazedterra,241,0
4575 pinkglazedtcota,241,0
4576 piglazedterracota,241,0
4577 piglazedterra,241,0
4578 piglazedtcota,241,0
4579 darkgrayglazedterracota,242,0
4580 darkgrayglazedterra,242,0
4581 darkgrayglazedtcota,242,0
4582 dgrayglazedterracota,242,0
4583 dgrayglazedterra,242,0
4584 dgrayglazedtcota,242,0
4585 darkgreyglazedterracota,242,0
4586 darkgreyglazedterra,242,0
4587 darkgreyglazedtcota,242,0
4588 dgreyglazedterracota,242,0
4589 dgreyglazedterra,242,0
4590 dgreyglazedtcota,242,0
4591 darkgraglazedterracota,242,0
4592 darkgraglazedterra,242,0
4593 darkgraglazedtcota,242,0
4594 dgraglazedterracota,242,0
4595 dgraglazedterra,242,0
4596 dgraglazedtcota,242,0
4597 grayglazedterracota,242,0
4598 grayglazedterra,242,0
4599 grayglazedtcota,242,0
4600 greyglazedterracota,242,0
4601 greyglazedterra,242,0
4602 greyglazedtcota,242,0
4603 graglazedterracota,242,0
4604 graglazedterra,242,0
4605 graglazedtcota,242,0
4606 lgglazedterracota,243,0
4607 lgglazedterra,243,0
4608 lgglazedtcota,243,0
4609 lightgrayglazedterracota,243,0
4610 lightgrayglazedterra,243,0
4611 lightgrayglazedtcota,243,0
4612 lgrayglazedterracota,243,0
4613 lgrayglazedterra,243,0
4614 lgrayglazedtcota,243,0
4615 lightgreyglazedterracota,243,0
4616 lightgreyglazedterra,243,0
4617 lightgreyglazedtcota,243,0
4618 lgreyglazedterracota,243,0
4619 lgreyglazedterra,243,0
4620 lgreyglazedtcota,243,0
4621 lightgraglazedterracota,243,0
4622 lightgraglazedterra,243,0
4623 lightgraglazedtcota,243,0
4624 lgraglazedterracota,243,0
4625 lgraglazedterra,243,0
4626 lgraglazedtcota,243,0
4627 silverglazedterracota,243,0
4628 silverglazedterra,243,0
4629 silverglazedtcota,243,0
4630 siglazedterracota,243,0
4631 siglazedterra,243,0
4632 siglazedtcota,243,0
4633 cyanglazedterracota,244,0
4634 cyanglazedterra,244,0
4635 cyanglazedtcota,244,0
4636 cglazedterracota,244,0
4637 cglazedterra,244,0
4638 cglazedtcota,244,0
4639 purpleglazedterracota,245,0
4640 purpleglazedterra,245,0
4641 purpleglazedtcota,245,0
4642 puglazedterracota,245,0
4643 puglazedterra,245,0
4644 puglazedtcota,245,0
4645 blueglazedterracota,246,0
4646 blueglazedterra,246,0
4647 blueglazedtcota,246,0
4648 bluglazedterracota,246,0
4649 bluglazedterra,246,0
4650 bluglazedtcota,246,0
4651 brownglazedterracota,247,0
4652 brownglazedterra,247,0
4653 brownglazedtcota,247,0
4654 broglazedterracota,247,0
4655 broglazedterra,247,0
4656 broglazedtcota,247,0
4657 darkgreenglazedterracota,248,0
4658 darkgreenglazedterra,248,0
4659 darkgreenglazedtcota,248,0
4660 dgreenglazedterracota,248,0
4661 dgreenglazedterra,248,0
4662 dgreenglazedtcota,248,0
4663 greenglazedterracota,248,0
4664 greenglazedterra,248,0
4665 greenglazedtcota,248,0
4666 darkgreglazedterracota,248,0
4667 darkgreglazedterra,248,0
4668 darkgreglazedtcota,248,0
4669 dgreglazedterracota,248,0
4670 dgreglazedterra,248,0
4671 dgreglazedtcota,248,0
4672 greglazedterracota,248,0
4673 greglazedterra,248,0
4674 greglazedtcota,248,0
4675 redglazedterracota,249,0
4676 redglazedterra,249,0
4677 redglazedtcota,249,0
4678 rglazedterracota,249,0
4679 rglazedterra,249,0
4680 rglazedtcota,249,0
4681 blackglazedterracota,250,0
4682 blackglazedterra,250,0
4683 blackglazedtcota,250,0
4684 blaglazedterracota,250,0
4685 blaglazedterra,250,0
4686 blaglazedtcota,250,0
4687 whiteconcrete,251,0
4688 wconcrete,251,0
4689 orangeconcrete,251,1
4690 oconcrete,251,1
4691 magentaconcrete,251,2
4692 mconcrete,251,2
4693 lightblueconcrete,251,3
4694 lightbluconcrete,251,3
4695 lblueconcrete,251,3
4696 lbluconcrete,251,3
4697 lbconcrete,251,3
4698 yellowconcrete,251,4
4699 yconcrete,251,4
4700 lightgreenconcrete,251,5
4701 lgreenconcrete,251,5
4702 lightgreconcrete,251,5
4703 lgreconcrete,251,5
4704 limeconcrete,251,5
4705 lconcrete,251,5
4706 pinkconcrete,251,6
4707 piconcrete,251,6
4708 darkgrayconcrete,251,7
4709 dgrayconcrete,251,7
4710 darkgreyconcrete,251,7
4711 dgreyconcrete,251,7
4712 darkgraconcrete,251,7
4713 dgraconcrete,251,7
4714 grayconcrete,251,7
4715 greyconcrete,251,7
4716 graconcrete,251,7
4717 lgconcrete,251,8
4718 lightgrayconcrete,251,8
4719 lgrayconcrete,251,8
4720 lightgreyconcrete,251,8
4721 lgreyconcrete,251,8
4722 lightgraconcrete,251,8
4723 lgraconcrete,251,8
4724 silverconcrete,251,8
4725 siconcrete,251,8
4726 cyanconcrete,251,9
4727 cconcrete,251,9
4728 purpleconcrete,251,10
4729 puconcrete,251,10
4730 blueconcrete,251,11
4731 bluconcrete,251,11
4732 brownconcrete,251,12
4733 broconcrete,251,12
4734 darkgreenconcrete,251,13
4735 dgreenconcrete,251,13
4736 greenconcrete,251,13
4737 darkgreconcrete,251,13
4738 dgreconcrete,251,13
4739 greconcrete,251,13
4740 redconcrete,251,14
4741 rconcrete,251,14
4742 blackconcrete,251,15
4743 blaconcrete,251,15
4744 whiteconcretepowder,252,0
4745 whiteconcretesand,252,0
4746 wconcretepowder,252,0
4747 wconcretesand,252,0
4748 orangeconcretepowder,252,1
4749 orangeconcretesand,252,1
4750 oconcretepowder,252,1
4751 oconcretesand,252,1
4752 magentaconcretepowder,252,2
4753 magentaconcretesand,252,2
4754 mconcretepowder,252,2
4755 mconcretesand,252,2
4756 lightblueconcretepowder,252,3
4757 lightblueconcretesand,252,3
4758 lightbluconcretepowder,252,3
4759 lightbluconcretesand,252,3
4760 lblueconcretepowder,252,3
4761 lblueconcretesand,252,3
4762 lbluconcretepowder,252,3
4763 lbluconcretesand,252,3
4764 lbconcretepowder,252,3
4765 lbconcretesand,252,3
4766 yellowconcretepowder,252,4
4767 yellowconcretesand,252,4
4768 yconcretepowder,252,4
4769 yconcretesand,252,4
4770 lightgreenconcretepowder,252,5
4771 lightgreenconcretesand,252,5
4772 lgreenconcretepowder,252,5
4773 lgreenconcretesand,252,5
4774 lightgreconcretepowder,252,5
4775 lightgreconcretesand,252,5
4776 lgreconcretepowder,252,5
4777 lgreconcretesand,252,5
4778 limeconcretepowder,252,5
4779 limeconcretesand,252,5
4780 lconcretepowder,252,5
4781 lconcretesand,252,5
4782 pinkconcretepowder,252,6
4783 pinkconcretesand,252,6
4784 piconcretepowder,252,6
4785 piconcretesand,252,6
4786 darkgrayconcretepowder,252,7
4787 darkgrayconcretesand,252,7
4788 dgrayconcretepowder,252,7
4789 dgrayconcretesand,252,7
4790 darkgreyconcretepowder,252,7
4791 darkgreyconcretesand,252,7
4792 dgreyconcretepowder,252,7
4793 dgreyconcretesand,252,7
4794 darkgraconcretepowder,252,7
4795 darkgraconcretesand,252,7
4796 dgraconcretepowder,252,7
4797 dgraconcretesand,252,7
4798 grayconcretepowder,252,7
4799 grayconcretesand,252,7
4800 greyconcretepowder,252,7
4801 greyconcretesand,252,7
4802 graconcretepowder,252,7
4803 graconcretesand,252,7
4804 lgconcretepowder,252,8
4805 lgconcretesand,252,8
4806 lightgrayconcretepowder,252,8
4807 lightgrayconcretesand,252,8
4808 lgrayconcretepowder,252,8
4809 lgrayconcretesand,252,8
4810 lightgreyconcretepowder,252,8
4811 lightgreyconcretesand,252,8
4812 lgreyconcretepowder,252,8
4813 lgreyconcretesand,252,8
4814 lightgraconcretepowder,252,8
4815 lightgraconcretesand,252,8
4816 lgraconcretepowder,252,8
4817 lgraconcretesand,252,8
4818 silverconcretepowder,252,8
4819 silverconcretesand,252,8
4820 siconcretepowder,252,8
4821 siconcretesand,252,8
4822 cyanconcretepowder,252,9
4823 cyanconcretesand,252,9
4824 cconcretepowder,252,9
4825 cconcretesand,252,9
4826 purpleconcretepowder,252,10
4827 purpleconcretesand,252,10
4828 puconcretepowder,252,10
4829 puconcretesand,252,10
4830 blueconcretepowder,252,11
4831 blueconcretesand,252,11
4832 bluconcretepowder,252,11
4833 bluconcretesand,252,11
4834 brownconcretepowder,252,12
4835 brownconcretesand,252,12
4836 broconcretepowder,252,12
4837 broconcretesand,252,12
4838 darkgreenconcretepowder,252,13
4839 darkgreenconcretesand,252,13
4840 dgreenconcretepowder,252,13
4841 dgreenconcretesand,252,13
4842 greenconcretepowder,252,13
4843 greenconcretesand,252,13
4844 darkgreconcretepowder,252,13
4845 darkgreconcretesand,252,13
4846 dgreconcretepowder,252,13
4847 dgreconcretesand,252,13
4848 greconcretepowder,252,13
4849 greconcretesand,252,13
4850 redconcretepowder,252,14
4851 redconcretesand,252,14
4852 rconcretepowder,252,14
4853 rconcretesand,252,14
4854 blackconcretepowder,252,15
4855 blackconcretesand,252,15
4856 blaconcretepowder,252,15
4857 blaconcretesand,252,15
4858 structureblock,255,0
4859 ironshovel,256,0
4860 ironspade,256,0
5793 sugar,353,0
5794 whitedust,353,0
5795 cake,354,0
5796 bed,355,0 bed,355
5797 whitebed,355,0
5798 wbed,355,0
5799 orangebed,355,1
5800 obed,355,1
5801 magentabed,355,2
5802 mbed,355,2
5803 lightbluebed,355,3
5804 lightblubed,355,3
5805 lbluebed,355,3
5806 lblubed,355,3
5807 lbbed,355,3
5808 yellowbed,355,4
5809 ybed,355,4
5810 lightgreenbed,355,5
5811 lgreenbed,355,5
5812 lightgrebed,355,5
5813 lgrebed,355,5
5814 limebed,355,5
5815 lbed,355,5
5816 pinkbed,355,6
5817 pibed,355,6
5818 darkgraybed,355,7
5819 dgraybed,355,7
5820 darkgreybed,355,7
5821 dgreybed,355,7
5822 darkgrabed,355,7
5823 dgrabed,355,7
5824 graybed,355,7
5825 greybed,355,7
5826 grabed,355,7
5827 lgbed,355,8
5828 lightgraybed,355,8
5829 lgraybed,355,8
5830 lightgreybed,355,8
5831 lgreybed,355,8
5832 lightgrabed,355,8
5833 lgrabed,355,8
5834 silverbed,355,8
5835 sibed,355,8
5836 cyanbed,355,9
5837 cbed,355,9
5838 purplebed,355,10
5839 pubed,355,10
5840 bluebed,355,11
5841 blubed,355,11
5842 brownbed,355,12
5843 brobed,355,12
5844 darkgreenbed,355,13
5845 dgreenbed,355,13
5846 greenbed,355,13
5847 darkgrebed,355,13
5848 dgrebed,355,13
5849 grebed,355,13
5850 redbed,355,14
5851 rbed,355,14
5852 blackbed,355,15
5853 blabed,355,15
5854 redstonerepeater,356,0
5855 redstonerepeat,356,0
5856 redstonedelayer,356,0
7602 polarbearegg,383,102
7603 polaregg,383,102
7604 bearegg,383,102
7605 parrot,383,105
7606 villageregg,383,120
7607 eggvillager,383,120
7608 bottleofenchanting,384,0

View File

@ -1,10 +1,10 @@
package com.earth2me.essentials;
import com.avaje.ebean.config.ServerConfig;
import com.earth2me.essentials.craftbukkit.FakeWorld;
import org.bukkit.*;
import org.bukkit.Warning.WarningState;
import org.bukkit.World.Environment;
import org.bukkit.advancement.Advancement;
import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarFlag;
import org.bukkit.boss.BarStyle;
@ -14,6 +14,7 @@ import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.conversations.Conversation;
import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventPriority;
@ -67,11 +68,6 @@ public class FakeServer implements Server {
return "1.0";
}
@Override
public Player[] _INVALID_getOnlinePlayers() {
return players.toArray(new Player[0]);
}
@Override
public Collection<? extends Player> getOnlinePlayers() {
return players;
@ -364,11 +360,6 @@ public class FakeServer implements Server {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void configureDbConfig(ServerConfig sc) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean addRecipe(Recipe recipe) {
throw new UnsupportedOperationException("Not supported yet.");
@ -511,11 +502,6 @@ public class FakeServer implements Server {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void setBanned(boolean bln) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean isWhitelisted() {
throw new UnsupportedOperationException("Not supported yet.");
@ -963,6 +949,25 @@ public class FakeServer implements Server {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void reloadData() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Entity getEntity(UUID uuid) {
return getPlayer(uuid);
}
@Override
public Advancement getAdvancement(NamespacedKey key) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Iterator<Advancement> advancementIterator() {
throw new UnsupportedOperationException("Not supported yet.");
}
class FakePluginManager implements PluginManager {
ArrayList<RegisteredListener> listeners = new ArrayList<RegisteredListener>();

View File

@ -53,7 +53,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.11-R0.1-SNAPSHOT</version>
<version>1.12-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>