Return null when there is no data to copy, add missing piglin in 1.19…

….4 implementation
RappyLabyAddons · Nov 21, 2023 · 3fc7ed9 · 3fc7ed9
1 parent 4be8395
commit 3fc7ed9
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 11 deletions.
diff --git a/game-runner/src/v1_12_2/java/com/rappytv/headowner/v1_12_2/SkullApiImpl.java b/game-runner/src/v1_12_2/java/com/rappytv/headowner/v1_12_2/SkullApiImpl.java
@@ -25,7 +25,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getTileLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getTileLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_16_5/java/com/rappytv/headowner/v1_16_5/SkullApiImpl.java b/game-runner/src/v1_16_5/java/com/rappytv/headowner/v1_16_5/SkullApiImpl.java
@@ -26,7 +26,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_17_1/java/com/rappytv/headowner/v1_17_1/SkullApiImpl.java b/game-runner/src/v1_17_1/java/com/rappytv/headowner/v1_17_1/SkullApiImpl.java
@@ -27,7 +27,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_18_2/java/com/rappytv/headowner/v1_18_2/SkullApiImpl.java b/game-runner/src/v1_18_2/java/com/rappytv/headowner/v1_18_2/SkullApiImpl.java
@@ -27,7 +27,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_19_2/java/com/rappytv/headowner/v1_19_2/SkullApiImpl.java b/game-runner/src/v1_19_2/java/com/rappytv/headowner/v1_19_2/SkullApiImpl.java
@@ -26,7 +26,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_19_3/java/com/rappytv/headowner/v1_19_3/SkullApiImpl.java b/game-runner/src/v1_19_3/java/com/rappytv/headowner/v1_19_3/SkullApiImpl.java
@@ -26,7 +26,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_19_4/java/com/rappytv/headowner/v1_19_4/SkullApiImpl.java b/game-runner/src/v1_19_4/java/com/rappytv/headowner/v1_19_4/SkullApiImpl.java
@@ -26,7 +26,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {
@@ -99,7 +101,7 @@ private String getSkullTypeName() {
                 case PLAYER -> I18n.translate("headowner.types.player");
                 case CREEPER -> I18n.translate("headowner.types.creeper");
                 case DRAGON -> I18n.translate("headowner.types.dragon");
-                default -> null;
+                case PIGLIN -> I18n.translate("headowner.types.piglin");
             };
         }
     }

diff --git a/game-runner/src/v1_20_1/java/com/rappytv/headowner/v1_20_1/SkullApiImpl.java b/game-runner/src/v1_20_1/java/com/rappytv/headowner/v1_20_1/SkullApiImpl.java
@@ -27,7 +27,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_20_2/java/com/rappytv/headowner/v1_20_2/SkullApiImpl.java b/game-runner/src/v1_20_2/java/com/rappytv/headowner/v1_20_2/SkullApiImpl.java
@@ -26,7 +26,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getBlockLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getBlockLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {

diff --git a/game-runner/src/v1_8_9/java/com/rappytv/headowner/v1_8_9/SkullApiImpl.java b/game-runner/src/v1_8_9/java/com/rappytv/headowner/v1_8_9/SkullApiImpl.java
@@ -25,7 +25,9 @@ public String getDisplay(HeadOwnerConfig config) {
 
     @Override
     public String getCopy(HeadOwnerConfig config) {
-        return new Skull(Skull.getTileLooking(config.distance())).getCopy();
+        Skull skull = new Skull(Skull.getTileLooking(config.distance()));
+        if(skull.getSkullTypeName() == null) return null;
+        return skull.getCopy();
     }
 
     public static class Skull {