fix: Fixed Folia support. You will need the reobf jar in order to use…

… skin overlay
GeorgeV220 · Sep 25, 2023 · 6f43846 · 6f43846
1 parent 5553272
commit 6f43846
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 325 deletions.
diff --git a/build.gradle b/build.gradle
@@ -143,8 +143,6 @@ dependencies {
     implementation project(path: ':multiver:mc-1-19-3', configuration: 'reobf')
     implementation project(path: ':multiver:mc-1-19-4', configuration: 'reobf')
     implementation project(path: ':multiver:mc-1-20', configuration: 'reobf')
-    implementation project(path: ':folia:folia-1-19-4')
-    implementation project(path: ':folia:folia-1-20')
 }
 
 shadowJar {

diff --git a/bukkit/build.gradle b/bukkit/build.gradle
@@ -13,8 +13,6 @@ dependencies {
     compileOnly project(path: ':multiver:mc-1-19-3', configuration: 'reobf')
     compileOnly project(path: ':multiver:mc-1-19-4', configuration: 'reobf')
     compileOnly project(path: ':multiver:mc-1-20', configuration: 'reobf')
-    compileOnly project(path: ':folia:folia-1-19-4')
-    compileOnly project(path: ':folia:folia-1-20')
 
     implementation "net.kyori:adventure-platform-bukkit:4.3.0"
 }

diff --git a/bukkit/src/main/java/com/georgev22/skinoverlay/SkinOverlayBukkit.java b/bukkit/src/main/java/com/georgev22/skinoverlay/SkinOverlayBukkit.java
@@ -89,20 +89,8 @@ public void onEnable() {
             case V1_18_R2 -> skinOverlay.setSkinHandler(new SkinHandler_1_18_R2());
             case V1_19_R1 -> skinOverlay.setSkinHandler(new SkinHandler_1_19());
             case V1_19_R2 -> skinOverlay.setSkinHandler(new SkinHandler_1_19_R2());
-            case V1_19_R3 -> {
-                if (isFolia()) {
-                    skinOverlay.setSkinHandler(new SkinHandler_Folia_1_19_R3());
-                } else {
-                    skinOverlay.setSkinHandler(new SkinHandler_1_19_R3());
-                }
-            }
-            case V1_20_R1 -> {
-                if (isFolia()) {
-                    skinOverlay.setSkinHandler(new SkinHandler_Folia_1_20_R1());
-                } else {
-                    skinOverlay.setSkinHandler(new SkinHandler_1_20());
-                }
-            }
+            case V1_19_R3 -> skinOverlay.setSkinHandler(new SkinHandler_1_19_R3());
+            case V1_20_R1 -> skinOverlay.setSkinHandler(new SkinHandler_1_20());
             case UNKNOWN -> skinOverlay.setSkinHandler(new SkinHandler_Unsupported());
             default -> skinOverlay.setSkinHandler(new SkinHandler_Legacy());
         }

diff --git a/folia/build.gradle b/folia/build.gradle
diff --git a/folia/folia-1-19-4/build.gradle b/folia/folia-1-19-4/build.gradle
diff --git a/...4/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_Folia_1_19_R3.java b/...4/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_Folia_1_19_R3.java
diff --git a/folia/folia-1-20/build.gradle b/folia/folia-1-20/build.gradle
diff --git a/...0/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_Folia_1_20_R1.java b/...0/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_Folia_1_20_R1.java
diff --git a/...er/mc-1-20/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_1_20.java b/...er/mc-1-20/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_1_20.java
@@ -38,7 +38,6 @@ public CompletableFuture<Boolean> updateSkin(@NotNull PlayerObject playerObject,
                 final CraftPlayer craftPlayer = (CraftPlayer) player;
                 final ServerPlayer entityPlayer = craftPlayer.getHandle();
 
-
                 ClientboundPlayerInfoRemovePacket removePlayer = new ClientboundPlayerInfoRemovePacket(List.of(entityPlayer.getUUID()));
                 ClientboundPlayerInfoUpdatePacket addPlayer = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityPlayer));
                 ServerLevel world = entityPlayer.serverLevel();

diff --git a/settings.gradle b/settings.gradle
@@ -21,16 +21,11 @@ include ':multiver:mc-1-19'
 include ':multiver:mc-1-19-3'
 include ':multiver:mc-1-19-4'
 include 'multiver:mc-1-20'
-include 'folia'
-include 'folia:folia-1-19-4'
-include 'folia:folia-1-20'
 findProject(':multiver:mc-1-17')?.name = 'mc-1-17'
 findProject(':multiver:mc-1-18')?.name = 'mc-1-18'
 findProject(':multiver:mc-1-18-2')?.name = 'mc-1-18-2'
 findProject(':multiver:mc-1-19')?.name = 'mc-1-19'
 findProject(':multiver:mc-1-19-3')?.name = 'mc-1-19-3'
 findProject(':multiver:mc-1-19-4')?.name = 'mc-1-19-4'
 findProject(':multiver:mc-1-20')?.name = 'mc-1-20'
-findProject(':folia:folia-1-19-4')?.name = 'folia-1-19-4'
-findProject(':folia:folia-1-20')?.name = 'folia-1-20'