Merge pull request #73 from ParallelMC/staging

Staging

Author: UnknownSilicon

api/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '4.2.1'
+version = '4.2.2'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {
@@ -471,5 +471,9 @@ bukkit {
             description = 'Gives access to ChestShop debug commands'
             setDefault('FALSE')
         }
+        'parallelutils.resources.unenforced' {
+            description = 'Prevents being kicked from not accepting the resource pack'
+            setDefault('FALSE')
+        }
     }
 }

api/src/main/java/parallelmc/parallelutils/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(4, 2, 1);
+	public static final Version VERSION = new Version(4, 2, 2);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world2";
 }

modules/src/main/java/parallelmc/parallelutils/modules/parallelresources/ParallelResources.java

@@ -362,7 +362,7 @@ private List<File> squashFiles(@NotNull List<File> inFiles, @NotNull File resour
 				out = new File(outDir, f.getName());
 				Files.copy(f.toPath(), out.toPath());
 			}
-			squashed.add(f);
+			squashed.add(out);
 		}
 
 		purgeDirectory(tempDir.toFile());

modules/src/main/java/parallelmc/parallelutils/modules/parallelresources/ResourceServer.java

@@ -71,6 +71,8 @@ public void configure(HttpsParameters params) {
 					}
 				});
 
+				server = httpsServer;
+
 			} else {
 				server = HttpServer.create(new InetSocketAddress(port), 0);
 			}

modules/src/main/java/parallelmc/parallelutils/modules/parallelresources/events/ResourcePackHandle.java

@@ -54,10 +54,12 @@ public void onResourcePackStatus(PlayerResourcePackStatusEvent event) {
 
 		switch (status) {
 			case DECLINED -> {
+				if (event.getPlayer().hasPermission("parallelutils.resources.unenforced")) return;
 				ParallelUtils.log(Level.WARNING, "Event " + status.toString() + " occurred! Declining join");
 				event.getPlayer().kick(warningMessage);
 			}
 			case FAILED_DOWNLOAD -> {
+				if (event.getPlayer().hasPermission("parallelutils.resources.unenforced")) return;
 				ParallelUtils.log(Level.WARNING, "Event " + status.toString() + " occurred! Declining join");
 				event.getPlayer().kick(warningMessage.append(
 						Component.text("If you believe this was an error, please contact staff on Discord.")));
@@ -80,7 +82,7 @@ public boolean applyPack(@NotNull Player player) {
 
 		String resourceUrl = resources.getResourceUrl(worldName);
 
-		player.setResourcePack(resourceUrl, hash, warningMessage, true);
+        player.setResourcePack(resourceUrl, hash, warningMessage, !player.hasPermission("parallelutils.resources.unenforced"));
 
 		return true;
 	}