Merge branch 'development'

2019-12-28 14:34:01 -05:00 · 2019-12-28 14:34:01 -05:00 · 5f21d27d0d
parent a245a2637b 39be1c2996
commit 5f21d27d0d
11 changed files with 39 additions and 42 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,21 +0,0 @@
-stages:
-  - build
-
-variables:
-  name: "EpicBosses"
-  path: "/builds/$CI_PROJECT_PATH"
-  version: "1.2.4"
-
-build:
-  stage: build
-  image: maven:3.5.3-jdk-8
-  script:
-    - find $path/ -type f -name "*.xml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g
-    - find $path/ -type f -name "*.yml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g
-    - mvn clean package
-    - find $path/ -depth -path '*original*' -delete
-    - mv $path/plugin-modules/Core/target/*.jar $path/
-  artifacts:
-    name: $name-$version
-    paths:
-      - "$path/*.jar"
--- a/api-modules/FactionsM/pom.xml
+++ b/api-modules/FactionsM/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>EpicBosses</artifactId>
        <groupId>com.songoda.epicbosses</groupId>
-        <version>maven-version-number</version>
+        <version>1.2.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -17,7 +17,7 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
--- a/api-modules/FactionsOne/pom.xml
+++ b/api-modules/FactionsOne/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>EpicBosses</artifactId>
        <groupId>com.songoda.epicbosses</groupId>
-        <version>maven-version-number</version>
+        <version>1.2.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -17,7 +17,7 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
--- a/api-modules/FactionsUUID/pom.xml
+++ b/api-modules/FactionsUUID/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>EpicBosses</artifactId>
        <groupId>com.songoda.epicbosses</groupId>
-        <version>maven-version-number</version>
+        <version>1.2.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -17,7 +17,7 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
--- a/api-modules/LegacyFactions/pom.xml
+++ b/api-modules/LegacyFactions/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>EpicBosses</artifactId>
        <groupId>com.songoda.epicbosses</groupId>
-        <version>maven-version-number</version>
+        <version>1.2.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -17,7 +17,7 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
--- a/plugin-modules/Core/pom.xml
+++ b/plugin-modules/Core/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>EpicBosses</artifactId>
        <groupId>com.songoda.epicbosses</groupId>
-        <version>maven-version-number</version>
+        <version>1.2.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -17,7 +17,7 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
--- a/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveBossHolder.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveBossHolder.java
@ -105,7 +105,7 @@ public class ActiveBossHolder implements IActiveHolder {

        // grab list of all valid entities by UUID that can be removed
        Map<Integer, Entity> toRemove = this.livingEntityMap.entrySet().stream()
-                .collect(Collectors.toMap(e -> e.getKey(), e -> ServerUtils.get().getEntity(e.getValue())))
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> ServerUtils.get().getEntity(e.getValue())))
                .entrySet().stream()
                .filter(e -> e.getValue() != null && e.getValue().getWorld().isChunkLoaded(
                                e.getValue().getLocation().getBlockX() >> 4,
--- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/EntityFinder.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/EntityFinder.java
@ -76,6 +76,7 @@ public enum EntityFinder {
    TURTLE("Turtle", new TurtleHandler(), "turtle"),
    PHANTOM("Phantom", new PhantomHandler(), "phantom"),
    CAT("Cat", new CatHandler(), "cat"),
+    BEE("Bee", new BeeHandler(), "bee"),
    FOX("Fox", new FoxHandler(), "fox"),
    PANDA("Panda", new PandaHandler(), "panda"),
    PILLAGER("Pillager", new PillagerHandler(), "pillager"),
--- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/entity/handlers/BeeHandler.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/entity/handlers/BeeHandler.java
@ -0,0 +1,19 @@
+package com.songoda.epicbosses.utils.entity.handlers;
+
+import com.songoda.core.compatibility.ServerVersion;
+import com.songoda.epicbosses.utils.entity.ICustomEntityHandler;
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+
+public class BeeHandler implements ICustomEntityHandler {
+
+    @Override
+    public LivingEntity getBaseEntity(String entityType, Location spawnLocation) {
+        if (ServerVersion.isServerVersionBelow(ServerVersion.V1_15)) {
+            throw new NullPointerException("This feature is only implemented in version 1.15 and above of Minecraft.");
+        }
+
+        return (LivingEntity) spawnLocation.getWorld().spawnEntity(spawnLocation, EntityType.BEE);
+    }
+}
--- a/plugin-modules/FactionHelper/pom.xml
+++ b/plugin-modules/FactionHelper/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>EpicBosses</artifactId>
        <groupId>com.songoda.epicbosses</groupId>
-        <version>maven-version-number</version>
+        <version>1.2.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -16,7 +16,7 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
--- a/pom.xml
+++ b/pom.xml
@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0">
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.songoda.epicbosses</groupId>
    <artifactId>EpicBosses</artifactId>
    <packaging>pom</packaging>
-    <version>maven-version-number</version>
+    <version>1.2.5</version>

    <modules>
        <module>api-modules/FactionsM</module>
@ -19,10 +16,10 @@
    </modules>

    <properties>
-        <plugin.version>maven-version-number</plugin.version>
+        <plugin.version>1.2.5</plugin.version>
        <plugin.name>EpicBosses</plugin.name>
        <plugin.main>com.songoda.epicbosses.EpicBosses</plugin.main>
-        <plugin.author>AMinecraftDev</plugin.author>
+        <plugin.author>Songoda</plugin.author>
    </properties>

    <dependencies>
@ -48,12 +45,13 @@

    <repositories>
        <repository>
-            <id>private-repo</id>
+            <id>private</id>
            <url>http://repo.songoda.com/artifactory/private/</url>
        </repository>
    </repositories>

    <build>
+        <defaultGoal>clean install</defaultGoal>
        <sourceDirectory>src</sourceDirectory>
        <testSourceDirectory>test</testSourceDirectory>
        <plugins>