Update to 1.11.

- Support new enchantments.
- Support new mobs.
- Rename MobData WHITHER_SKELETON to WITHER_SKELETON.
- implement NOOP methods of new API methods for fake classes.
- Amend item dictionary.
This commit is contained in:
Ali Moghnieh 2016-11-20 16:03:56 +00:00
parent 35388c3b19
commit 8b0659a2b4
No known key found for this signature in database
GPG Key ID: F09D3A1BAF2E6D70
9 changed files with 218 additions and 9 deletions

View File

@ -173,6 +173,25 @@ public class Enchantments {
ENCHANTMENTS.put("mending", mending);
}
} catch (IllegalArgumentException ignored) {}
// 1.11
try {
Enchantment bindingCurse = Enchantment.getByName("BINDING_CURSE");
if (bindingCurse != null) {
ENCHANTMENTS.put("bindingcurse", bindingCurse);
ALIASENCHANTMENTS.put("bindcurse", bindingCurse);
ALIASENCHANTMENTS.put("binding", bindingCurse);
ALIASENCHANTMENTS.put("bind", bindingCurse);
}
Enchantment vanishingCurse = Enchantment.getByName("VANISHING_CURSE");
if (vanishingCurse != null) {
ENCHANTMENTS.put("vanishingcurse", vanishingCurse);
ALIASENCHANTMENTS.put("vanishcurse", vanishingCurse);
ALIASENCHANTMENTS.put("vanishing", vanishingCurse);
ALIASENCHANTMENTS.put("vanish", vanishingCurse);
}
} catch (IllegalArgumentException ignored) {}
}
public static Enchantment getByName(String name) {

View File

@ -143,7 +143,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
LOGGER.log(Level.INFO, tl("usingTempFolderForTesting"));
LOGGER.log(Level.INFO, dataFolder.toString());
this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
settings = new Settings(this);
userMap = new UserMap(this);
permissionsHandler = new PermissionsHandler(this, false);

View File

@ -57,9 +57,23 @@ public enum Mob {
ARMOR_STAND("ArmorStand", Enemies.NEUTRAL, "ARMOR_STAND"),
ENDERMITE("Endermite", Enemies.ENEMY, "ENDERMITE"),
GUARDIAN("Guardian", Enemies.ENEMY, "GUARDIAN"),
ELDER_GUARDIAN("ElderGuardian", Enemies.ENEMY, "ELDER_GUARDIAN"),
RABBIT("Rabbit", Enemies.FRIENDLY, "RABBIT"),
SHULKER("Shulker", Enemies.ENEMY, "SHULKER"),
POLAR_BEAR("PolarBear", Enemies.NEUTRAL, "POLAR_BEAR");
POLAR_BEAR("PolarBear", Enemies.NEUTRAL, "POLAR_BEAR"),
WITHER_SKELETON("WitherSkeleton", Enemies.ENEMY, "WITHER_SKELETON"),
STRAY_SKELETON("StraySkeleton", Enemies.ENEMY, "STRAY"),
ZOMBIE_VILLAGER("ZombieVillager", Enemies.FRIENDLY, "ZOMBIE_VILLAGER"),
SKELETON_HORSE("SkeletonHorse", Enemies.FRIENDLY, "SKELETON_HORSE"),
ZOMBIE_HORSE("ZombieHorse", Enemies.FRIENDLY, "ZOMBIE_HORSE"),
DONKEY("Donkey", Enemies.FRIENDLY, "DONKEY"),
MULE("Mule", Enemies.FRIENDLY, "MULE"),
EVOKER("Evoker", Enemies.ENEMY, "EVOKER"),
VEX("Vex", Enemies.ENEMY, "VEX"),
VINDICATOR("Vindicator", Enemies.ENEMY, "VINDICATOR"),
LLAMA("Llama", Enemies.NEUTRAL, "LLAMA"),
HUSK("Husk", Enemies.ENEMY, "HUSK"),
;
public static final Logger logger = Logger.getLogger("Essentials");

View File

@ -82,7 +82,7 @@ public enum MobData {
STONE_SWORD_SKELETON("stonesword", EntityType.SKELETON, Material.STONE_SWORD, false),
SWORD_SKELETON("sword", EntityType.SKELETON, Material.STONE_SWORD, true),
BOW_SKELETON("bow", EntityType.SKELETON, Material.BOW, true),
WHITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true),
WITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true),
POWERED_CREEPER("powered", EntityType.CREEPER, Data.ELECTRIFIED, true),
ELECTRIC_CREEPER("electric", EntityType.CREEPER, Data.ELECTRIFIED, false),
CHARGED_CREEPER("charged", EntityType.CREEPER, Data.ELECTRIFIED, false),

View File

@ -769,6 +769,11 @@ public class OfflinePlayer implements Player {
return false;
}
@Override
public PotionEffect getPotionEffect(PotionEffectType potionEffectType) {
return null;
}
@Override
public void removePotionEffect(PotionEffectType pet) {
}
@ -884,6 +889,11 @@ public class OfflinePlayer implements Player {
return false;
}
@Override
public boolean isHandRaised() {
return false;
}
@Override
public void abandonConversation(Conversation arg0, ConversationAbandonedEvent arg1) {
}
@ -1047,6 +1057,31 @@ public class OfflinePlayer implements Player {
public void setGravity(boolean b) {
}
@Override
public int getPortalCooldown() {
return 0;
}
@Override
public void setPortalCooldown(int i) {
}
@Override
public Set<String> getScoreboardTags() {
return null;
}
@Override
public boolean addScoreboardTag(String s) {
return false;
}
@Override
public boolean removeScoreboardTag(String s) {
return false;
}
@Override
public void setPlayerWeather(WeatherType arg0) {
}
@ -1113,6 +1148,16 @@ public class OfflinePlayer implements Player {
public void playSound(Location arg0, String arg1, float arg2, float arg3) {
}
@Override
public void playSound(Location location, Sound sound, SoundCategory soundCategory, float v, float v1) {
}
@Override
public void playSound(Location location, String s, SoundCategory soundCategory, float v, float v1) {
}
@Override
public void stopSound(Sound sound) {
}
@ -1121,6 +1166,16 @@ public class OfflinePlayer implements Player {
public void stopSound(String s) {
}
@Override
public void stopSound(Sound sound, SoundCategory soundCategory) {
}
@Override
public void stopSound(String s, SoundCategory soundCategory) {
}
@Override
public boolean isHealthScaled() {
return false;

View File

@ -587,6 +587,16 @@ public class FakeWorld implements World {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void playSound(Location location, Sound sound, SoundCategory soundCategory, float v, float v1) {
}
@Override
public void playSound(Location location, String s, SoundCategory soundCategory, float v, float v1) {
}
@Override
public int getAmbientSpawnLimit() {
throw new UnsupportedOperationException("Not supported yet.");

View File

@ -4141,6 +4141,121 @@ blockrednb,215,0
boneblock,216,0
skeletonboneblock,216,0
skeletonblock,216,0
observer,218,0
budblock,218,0
bud,218,0
shulkerbox,219,0
whiteshulkerbox,219,0
wshulkerbox,219,0
whitechest,219,0
wchest,219,0
orangeshulkerbox,220,0
oshulkerbox,220,0
orangechest,220,0
ochest,220,0
magentashulkerbox,221,0
magentachest,221,0
mshulkerbox,221,0
mchest,221,0
mashulkerbox,221,0
machest,221,0
lightblueshulkerbox,222,0
lightbluechest,222,0
lblueshulkerbox,222,0
lbluechest,222,0
lbshulkerbox,222,0
lbchest,222,0
lblushulkerbox,222,0
lightbluchest,222,0
lbluchest,222,0
yellowshulkerbox,223,0
yshulkerbox,223,0
yellowchest,223,0
ychest,223,0
limeshulkerbox,224,0
lshulkerbox,224,0
lgreenshulkerbox,224,0
lgreshulkerbox,224,0
limechest,224,0
lgrechest,224,0
lchest,224,0
pinkshulkerbox,225,0
pishulkerbox,225,0
pinkchest,225,0
pichest,225,0
grayshulkerbox,226,0
greyshulkerbox,226,0
darkgrayshulkerbox,226,0
darkgreyshulkerbox,226,0
dgrayshulkerbox,226,0
dgreyshulkerbox,226,0
grashulkerbox,226,0
greshulkerbox,226,0
dgrashulkerbox,226,0
dgreshulkerbox,226,0
graychest,226,0
greychest,226,0
darkgraychest,226,0
darkgreychest,226,0
dgraychest,226,0
dgreychest,226,0
grachest,226,0
darkgrachest,226,0
dgrachest,226,0
silvershulkerbox,227,0
silverchest,227,0
sishulkerbox,227,0
sichest,227,0
lgshulkerbox,227,0
lgchest,227,0
lightgrayshulkerbox,227,0
lightgreyshulkerbox,227,0
lightgraychest,227,0
lightgreychest,227,0
lightgrashulkerbox,227,0
lightgreshulkerbox,227,0
lightgrachest,227,0
lightgrechest,227,0
lgraychest,227,0
lgreychest,227,0
lgrachest,227,0
lgrechest,227,0
cyanshulkerbox,228,0
cyanchest,228,0
cshulkerbox,228,0
cchest,228,0
purpleshulkerbox,229,0
purplechest,229,0
pushulkerbox,229,0
puchest,229,0
blueshulkerbox,230,0
bluechest,230,0
blushulkerbox,230,0
bluchest,230,0
brownshulkerbox,231,0
brownchest,231,0
broshulkerbox,231,0
brochest,231,0
darkgreenshulkerbox,232,0
darkgreenchest,232,0
greenshulkerbox,232,0
greenchest,232,0
greenshulkerbox,232,0
greenchest,232,0
greshulkerbox,232,0
grechest,232,0
dgreshulkerbox,232,0
dgrechest,232,0
darkgreshulkerbox,232,0
darkgrechest,232,0
redshulkerbox,233,0
rshulkerbox,233,0
redchest,233,0
rchest,233,0
blackshulkerbox,234,0
blashulkerbox,234,0
blackchest,234,0
blachest,234,0
structureblock,255,0
ironshovel,256,0
ironspade,256,0
@ -7115,6 +7230,8 @@ acaciadoor,196,0
acaciadooritem,430,0
darkoakdoor,197,0
darkoakdooritem,431,0
totem,449,0
shulkershell,450,0
13disc,2256,0
goldmusicrecord,2256,0
goldmusicdisk,2256,0

1 #version: TeamCity
4141 boneblock,216,0
4142 skeletonboneblock,216,0
4143 skeletonblock,216,0
4144 observer,218,0
4145 budblock,218,0
4146 bud,218,0
4147 shulkerbox,219,0
4148 whiteshulkerbox,219,0
4149 wshulkerbox,219,0
4150 whitechest,219,0
4151 wchest,219,0
4152 orangeshulkerbox,220,0
4153 oshulkerbox,220,0
4154 orangechest,220,0
4155 ochest,220,0
4156 magentashulkerbox,221,0
4157 magentachest,221,0
4158 mshulkerbox,221,0
4159 mchest,221,0
4160 mashulkerbox,221,0
4161 machest,221,0
4162 lightblueshulkerbox,222,0
4163 lightbluechest,222,0
4164 lblueshulkerbox,222,0
4165 lbluechest,222,0
4166 lbshulkerbox,222,0
4167 lbchest,222,0
4168 lblushulkerbox,222,0
4169 lightbluchest,222,0
4170 lbluchest,222,0
4171 yellowshulkerbox,223,0
4172 yshulkerbox,223,0
4173 yellowchest,223,0
4174 ychest,223,0
4175 limeshulkerbox,224,0
4176 lshulkerbox,224,0
4177 lgreenshulkerbox,224,0
4178 lgreshulkerbox,224,0
4179 limechest,224,0
4180 lgrechest,224,0
4181 lchest,224,0
4182 pinkshulkerbox,225,0
4183 pishulkerbox,225,0
4184 pinkchest,225,0
4185 pichest,225,0
4186 grayshulkerbox,226,0
4187 greyshulkerbox,226,0
4188 darkgrayshulkerbox,226,0
4189 darkgreyshulkerbox,226,0
4190 dgrayshulkerbox,226,0
4191 dgreyshulkerbox,226,0
4192 grashulkerbox,226,0
4193 greshulkerbox,226,0
4194 dgrashulkerbox,226,0
4195 dgreshulkerbox,226,0
4196 graychest,226,0
4197 greychest,226,0
4198 darkgraychest,226,0
4199 darkgreychest,226,0
4200 dgraychest,226,0
4201 dgreychest,226,0
4202 grachest,226,0
4203 darkgrachest,226,0
4204 dgrachest,226,0
4205 silvershulkerbox,227,0
4206 silverchest,227,0
4207 sishulkerbox,227,0
4208 sichest,227,0
4209 lgshulkerbox,227,0
4210 lgchest,227,0
4211 lightgrayshulkerbox,227,0
4212 lightgreyshulkerbox,227,0
4213 lightgraychest,227,0
4214 lightgreychest,227,0
4215 lightgrashulkerbox,227,0
4216 lightgreshulkerbox,227,0
4217 lightgrachest,227,0
4218 lightgrechest,227,0
4219 lgraychest,227,0
4220 lgreychest,227,0
4221 lgrachest,227,0
4222 lgrechest,227,0
4223 cyanshulkerbox,228,0
4224 cyanchest,228,0
4225 cshulkerbox,228,0
4226 cchest,228,0
4227 purpleshulkerbox,229,0
4228 purplechest,229,0
4229 pushulkerbox,229,0
4230 puchest,229,0
4231 blueshulkerbox,230,0
4232 bluechest,230,0
4233 blushulkerbox,230,0
4234 bluchest,230,0
4235 brownshulkerbox,231,0
4236 brownchest,231,0
4237 broshulkerbox,231,0
4238 brochest,231,0
4239 darkgreenshulkerbox,232,0
4240 darkgreenchest,232,0
4241 greenshulkerbox,232,0
4242 greenchest,232,0
4243 greenshulkerbox,232,0
4244 greenchest,232,0
4245 greshulkerbox,232,0
4246 grechest,232,0
4247 dgreshulkerbox,232,0
4248 dgrechest,232,0
4249 darkgreshulkerbox,232,0
4250 darkgrechest,232,0
4251 redshulkerbox,233,0
4252 rshulkerbox,233,0
4253 redchest,233,0
4254 rchest,233,0
4255 blackshulkerbox,234,0
4256 blashulkerbox,234,0
4257 blackchest,234,0
4258 blachest,234,0
4259 structureblock,255,0
4260 ironshovel,256,0
4261 ironspade,256,0
7230 acaciadooritem,430,0
7231 darkoakdoor,197,0
7232 darkoakdooritem,431,0
7233 totem,449,0
7234 shulkershell,450,0
7235 13disc,2256,0
7236 goldmusicrecord,2256,0
7237 goldmusicdisk,2256,0

View File

@ -770,11 +770,6 @@ public class FakeServer implements Server {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean useExactLoginLocation() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public int getTicksPerAnimalSpawns() {
throw new UnsupportedOperationException("Not supported yet.");

View File

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