Merge branch 'EngineHub:master' into master

Folia-Inquisitors · May 6, 2024 · 6da1b06 · 6da1b06
2 parents 693e04d + e2e9163
commit 6da1b06
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -75,7 +75,7 @@ fabric-minecraft = "com.mojang:minecraft:1.20.6"
 fabric-loader = "net.fabricmc:fabric-loader:0.15.10"
 fabric-permissions-api = "me.lucko:fabric-permissions-api:0.1-SNAPSHOT"
 
-neoforge = "net.neoforged:neoforge:20.6.11-beta"
+neoforge = "net.neoforged:neoforge:20.6.42-beta"
 
 # Mojang-provided libraries, CHECK AGAINST MINECRAFT for versions
 guava = "com.google.guava:guava:32.1.3-jre!!"

diff --git a/worldedit-bukkit/adapters/adapter-1.20.5/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1.20.5/build.gradle.kts
@@ -6,5 +6,5 @@ plugins {
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.5-R0.1-20240426.233703-2")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.6-R0.1-20240505.200405-27")
 }
diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java
@@ -27,6 +27,7 @@
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
@@ -55,7 +56,7 @@ public void loadDataFiles() {
             Files.createDirectories(outputFolder);
 
             if (!Files.exists(checkPath)) {
-                URL url = new URL(DATA_FILE_DOWNLOAD_URL + app.getPlatform().getDataVersion() + "/" + CLI_DATA_VERSION);
+                URL url = URI.create(DATA_FILE_DOWNLOAD_URL + app.getPlatform().getDataVersion() + "/" + CLI_DATA_VERSION).toURL();
 
                 try (var stream = url.openStream()) {
                     Files.copy(stream, checkPath);