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

@@ -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.

pom.xml

@@ -120,12 +120,8 @@
     </build>
     <repositories>
         <repository>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>md_5-releases</id>
-            <url>http://repo.md-5.net/content/repositories/releases/</url>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
         <repository>
             <id>Plugin MetricsExtension</id>
@@ -136,7 +132,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.7.10-R0.1-SNAPSHOT</version>
+            <version>1.8-R0.1-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -163,16 +159,12 @@
             <id>md_5-releases</id>
             <url>http://repo.md-5.net/content/repositories/releases/</url>
         </repository>
-        <snapshotRepository>
-            <id>md_5-snapshots</id>
-            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
-        </snapshotRepository>
     </distributionManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <ciManagement>
         <system>Jenkins</system>
-        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
+        <url>https://ci.drtshock.net/job/mcmmo/</url>
     </ciManagement>
 </project>

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); }
+
 }

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:

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);
         }

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:

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