5.1.1 API: expose CompatibilityProvider methods to third-party plugins

for better access to head information
meiskam · Jul 8, 2019 · 5d3ec75 · 5d3ec75
1 parent ab18e30
commit 5d3ec75
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 326 deletions.
diff --git a/PlayerHeads-api/src/main/java/com/github/crashdemons/playerheads/api/PlayerHeadsAPI.java b/PlayerHeads-api/src/main/java/com/github/crashdemons/playerheads/api/PlayerHeadsAPI.java
@@ -108,7 +108,8 @@ public interface PlayerHeadsAPI {
     /**
      * Gets an instance of a class that provides many useful internal PlayerHeads capabilities that would normally be version-specific.
      * For example: viewing and editing ownership information for skinned playerheads.
-     * @return the CompatibilityProvider instance.
+     * @return the CompatibilityProvider instance or null if PlayerHeads plugin was not initialized yet.
      */
+    @Nullable
     public CompatibilityProvider getCompatibilityProvider();
 }
diff --git a/PlayerHeads-core/pom.xml b/PlayerHeads-core/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>PlayerHeads</artifactId>
         <groupId>org.shininet.bukkit</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.1-SNAPSHOT</version>
     </parent>
 
 
@@ -62,7 +62,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-api</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.1-SNAPSHOT</version>
         </dependency>
   	<dependency>
   		<groupId>junit</groupId>

diff --git a/PlayerHeads-core/src/main/java/com/github/crashdemons/playerheads/api/ApiProvider.java b/PlayerHeads-core/src/main/java/com/github/crashdemons/playerheads/api/ApiProvider.java
@@ -8,6 +8,8 @@
 import com.github.crashdemons.playerheads.SkullConverter;
 import com.github.crashdemons.playerheads.SkullManager;
 import com.github.crashdemons.playerheads.TexturedSkullType;
+import com.github.crashdemons.playerheads.compatibility.Compatibility;
+import com.github.crashdemons.playerheads.compatibility.CompatibilityProvider;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -109,4 +111,12 @@ public ItemStack getHeadDrop(Entity e) {
     private TexturedSkullType headFromApiHead(HeadType h) {
         return TexturedSkullType.get(h.getOwner());
     }
+
+
+    //5.1.1 API
+    @Override
+    public CompatibilityProvider getCompatibilityProvider(){
+        if(!Compatibility.isProviderAvailable()) return null;
+        return Compatibility.getProvider();
+    }
 }
diff --git a/...src/main/java/com/github/crashdemons/playerheads/compatibility/CompatibilityProvider.java b/...src/main/java/com/github/crashdemons/playerheads/compatibility/CompatibilityProvider.java
diff --git a/...rHeads-core/src/main/java/com/github/crashdemons/playerheads/compatibility/SkullType.java b/...rHeads-core/src/main/java/com/github/crashdemons/playerheads/compatibility/SkullType.java
diff --git a/PlayerHeads-craftbukkit-1.13-support/pom.xml b/PlayerHeads-craftbukkit-1.13-support/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>PlayerHeads</artifactId>
         <groupId>org.shininet.bukkit</groupId>
-        <version>5.0.0-SNAPSHOT</version>
+        <version>5.1.1-SNAPSHOT</version>
     </parent>
 
     <organization>
@@ -65,7 +65,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-craftbukkit-support</artifactId>
-            <version>5.0.0-SNAPSHOT</version>
+            <version>5.1.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -77,7 +77,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-core</artifactId>
-            <version>5.0.0-SNAPSHOT</version>
+            <version>5.1.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>