mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-12-23 01:27:40 +01:00
Update to 1.12. :D
To the best of my knowledge ;)
This commit is contained in:
parent
34e3582557
commit
14a02c0602
@ -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");
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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,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>();
|
||||
|
Loading…
Reference in New Issue
Block a user