Merge branch 'dev' of github.com:GlowstoneMC/Glowstone into dev

Author: mastercoms

pom.xml

@@ -6,22 +6,22 @@
   <groupId>net.glowstone</groupId>
   <artifactId>glowstone</artifactId>
   <packaging>jar</packaging>
-  <version>2018.6.0-SNAPSHOT</version>
+  <version>2018.7.0-SNAPSHOT</version>
   <name>Glowstone</name>
   <url>https://www.glowstone.net</url>
   <description>A fast, customizable and compatible open source Minecraft server.</description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <api.version>1.12.2-R4.2-SNAPSHOT</api.version>
+    <api.version>1.12.2-R5.0-SNAPSHOT</api.version>
     <minecraft.version>1.12.2</minecraft.version>
     <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <kotlin.version>1.2.40</kotlin.version>
+    <kotlin.version>1.2.51</kotlin.version>
     <powermock.version>2.0.0-beta.5</powermock.version>
-    <junit.jupiter.version>5.1.1</junit.jupiter.version>
-    <junit.vintage.version>5.1.1</junit.vintage.version>
+    <junit.jupiter.version>5.2.0</junit.jupiter.version>
+    <junit.vintage.version>5.2.0</junit.vintage.version>
   </properties>
 
   <repositories>
@@ -300,14 +300,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <!-- Upgrade to 2.21.0 when junit-platform-surefire-provider 1.2.0 releases
-         See https://github.com/junit-team/junit5/issues/809 -->
-        <version>2.19.1</version>
+        <version>2.22.0</version>
         <dependencies>
           <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>1.1.1</version>
+            <version>1.2.0</version>
           </dependency>
           <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/net/glowstone/GlowWorld.java

@@ -772,6 +772,16 @@ public Collection<Entity> getNearbyEntities(Location location, double x, double
         return entityManager.getEntitiesInside(searchBox, except);
     }
 
+    @Override
+    public Entity getEntity(UUID uuid) {
+        for (Entity entity : getEntities()) {
+            if (entity.getUniqueId().equals(uuid)) {
+                return entity;
+            }
+        }
+        return null;
+    }
+
     @Override
     public List<Entity> getEntities() {
         return new ArrayList<>(entityManager.getAll());
@@ -1703,6 +1713,13 @@ public boolean createExplosion(Location loc, float power, boolean setFire) {
         return createExplosion(loc.getX(), loc.getY(), loc.getZ(), power, setFire, true);
     }
 
+    @Override
+    public boolean createExplosion(Entity source, Location loc, float power, boolean setFire,
+                                   boolean breakBlocks) {
+        return createExplosion(source, loc.getX(), loc.getY(), loc.getZ(), power, setFire,
+                breakBlocks);
+    }
+
     @Override
     public boolean createExplosion(double x, double y, double z, float power) {
         return createExplosion(x, y, z, power, false, true);

src/main/java/net/glowstone/block/itemtype/ItemBow.java

@@ -22,7 +22,7 @@
 import org.bukkit.inventory.meta.PotionMeta;
 
 public class ItemBow extends ItemTimedUsage {
-    private static final long TICKS_TO_FULLY_CHARGE = 20;
+    private static final int TICKS_TO_FULLY_CHARGE = 20;
     private static final double MAX_BASE_DAMAGE = 9;
     private static final double MAX_SPEED = 40;
 
@@ -83,9 +83,9 @@ public void endUse(GlowPlayer player, ItemStack bow) {
                 - Floats.constrainToRange(player.getUsageTime(), 0.0f, TICKS_TO_FULLY_CHARGE))
                 / TICKS_TO_FULLY_CHARGE;
             EntityShootBowEvent event = EventFactory.getInstance().callEvent(
-                    new EntityShootBowEvent(player, bow, launchedProjectile, chargeFraction,
+                    new EntityShootBowEvent(player, bow, arrow, launchedProjectile, chargeFraction,
                             consumeArrow));
-            consumeArrow = event.isConsumeArrow();
+            consumeArrow = event.getConsumeArrow();
             //TODO: Call for Skeleton firing too when implemented
 
             if (event.isCancelled()) {

src/main/java/net/glowstone/constants/ItemIds.java

@@ -502,7 +502,7 @@ private ItemIds() {
     }
 
     /**
-     * Get the string identifier for a specified Material.
+     * Get the full string identifier for a specified Material.
      *
      * @param mat the Material.
      * @return the identifier.
@@ -512,6 +512,17 @@ public static String getName(Material mat) {
         return names.get(mat.getId());
     }
 
+    /**
+     * Get the key segment of the string identifier for a specified Material.
+     *
+     * @param mat the Material.
+     * @return the identifier.
+     */
+    public static String getKeyName(Material mat) {
+        String[] segments = getName(mat).split(":");
+        return segments[segments.length - 1];
+    }
+
     /**
      * Get the Material corresponding to the specified item identifier.
      *