From 32336b712b16c249b02c8773d853dc78ada53004 Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Thu, 18 Dec 2014 01:36:02 -0500 Subject: [PATCH] Quick initial update for 1.8 Adds default configuration for new blocks and entities. Updates a few hardcoded utilities to account for new blocks and entities. --- README.md | 7 +++---- pom.xml | 16 ++++------------ .../config/experience/ExperienceConfig.java | 2 ++ .../java/com/gmail/nossr50/util/BlockUtils.java | 13 +++++++++++++ .../com/gmail/nossr50/util/MaterialUtils.java | 2 +- .../gmail/nossr50/util/skills/CombatUtils.java | 12 +++++++++++- src/main/resources/experience.yml | 5 +++++ 7 files changed, 39 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b1c7223a1..1fb301c97 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,10 @@ The goal of mcMMO is to take core Minecraft game mechanics and expand them into ## About the Team mcMMO is currently developed by a team of individuals from all over the world. -### Glorious Leader -[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)] -(https://github.com/gmcferrin) ### Developers +[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)] +(https://github.com/gmcferrin) [![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)] (https://github.com/bm01) [![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)] @@ -48,4 +47,4 @@ Required Libraries: * EMetrics * Bukkit -http://dev.bukkit.org/server-mods/mcmmo for more up to date information. +http://www.spigotmc.org/resources/mcmmo.2445/ for more up to date information. diff --git a/pom.xml b/pom.xml index de4aa4b0a..baef053df 100755 --- a/pom.xml +++ b/pom.xml @@ -120,12 +120,8 @@ - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - - - md_5-releases - http://repo.md-5.net/content/repositories/releases/ + spigot-repo + https://hub.spigotmc.org/nexus/content/groups/public/ Plugin MetricsExtension @@ -136,7 +132,7 @@ org.bukkit bukkit - 1.7.10-R0.1-SNAPSHOT + 1.8-R0.1-SNAPSHOT jar provided @@ -163,16 +159,12 @@ md_5-releases http://repo.md-5.net/content/repositories/releases/ - - md_5-snapshots - http://repo.md-5.net/content/repositories/snapshots/ - UTF-8 Jenkins - http://ci.ecocitycraft.com/job/mcMMO + https://ci.drtshock.net/job/mcmmo/ diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java index d4542679e..9f593b6e6 100644 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java @@ -198,6 +198,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { public double getCombatXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); } public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); } public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); } + public double getElderGuardianXP() { return config.getDouble("Experience.Combat.Multiplier.Elder_Guardian", 4.0); } /* Materials */ public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); } @@ -368,4 +369,5 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { public int getWoodcuttingTreeXP(TreeSpecies species) { return config.getInt("Experience.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_")); } public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); } public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); } + } diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index 52fe156da..766f441cc 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -63,6 +63,18 @@ public final class BlockUtils { case DROPPER: case HOPPER: case TRAPPED_CHEST: + case IRON_TRAPDOOR: + case ACACIA_DOOR: + case SPRUCE_DOOR: + case BIRCH_DOOR: + case JUNGLE_DOOR: + case DARK_OAK_DOOR: + case IRON_DOOR: + case ACACIA_FENCE: + case DARK_OAK_FENCE: + case BIRCH_FENCE: + case JUNGLE_FENCE: + case ARMOR_STAND: return false; default: @@ -161,6 +173,7 @@ public final class BlockUtils { case SANDSTONE: case STAINED_CLAY: case STONE: + case RED_SANDSTONE: return true; default: diff --git a/src/main/java/com/gmail/nossr50/util/MaterialUtils.java b/src/main/java/com/gmail/nossr50/util/MaterialUtils.java index d95925bab..9ee8aac82 100644 --- a/src/main/java/com/gmail/nossr50/util/MaterialUtils.java +++ b/src/main/java/com/gmail/nossr50/util/MaterialUtils.java @@ -18,8 +18,8 @@ public final class MaterialUtils { case QUARTZ_ORE: case REDSTONE_ORE: case EMERALD_ORE: + case PRISMARINE: return true; - default: return mcMMO.getModManager().isCustomOre(data); } diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index cba0ef139..cc6a906ad 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Animals; import org.bukkit.entity.Arrow; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; +import org.bukkit.entity.Guardian; import org.bukkit.entity.IronGolem; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -47,7 +48,6 @@ import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.MobHealthbarUtils; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableMap; public final class CombatUtils { @@ -466,6 +466,7 @@ public final class CombatUtils { switch (type) { case BAT: case SQUID: + case RABBIT: baseXP = ExperienceConfig.getInstance().getAnimalsXP(); break; @@ -484,9 +485,18 @@ public final class CombatUtils { case WITCH: case WITHER: case ZOMBIE: + case ENDERMITE: baseXP = ExperienceConfig.getInstance().getCombatXP(type); break; + case GUARDIAN: + if (((Guardian) target).isElder()) { + baseXP = ExperienceConfig.getInstance().getElderGuardianXP(); + } else { + baseXP = ExperienceConfig.getInstance().getCombatXP(type); + } + break; + case SKELETON: switch (((Skeleton) target).getSkeletonType()) { case WITHER: diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index c62f72c7a..cdb5eed8b 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -196,6 +196,8 @@ Experience: Sandstone: 30 Stained_Clay: 50 Stone: 30 + Red_Sandstone: 100 + Prismarine: 70 Repair: Base: 1000.0 Wood: 0.6 @@ -241,3 +243,6 @@ Experience: Witch: 0.0 Iron_Golem: 2.0 Wither_Skeleton: 4.0 + Endermite: 2.0 + Guardian: 3.0 + Elder_Guardian: 4.0