SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Move Clipboards to /tmp + Update upstream #3

Zusammengeführt
Lixfel hat 18 Commits von upstream nach main 2022-09-24 19:48:10 +02:00 zusammengeführt
Diskussion 0 Commits 18 Geänderte Dateien 21 +5 -5
2 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit 4f26561cc1 werden angezeigt - Alle Commits anzeigen

4
build.gradle.kts
Datei anzeigen

@ -23,7 +23,7 @@ logger.lifecycle("""
******************************************* *******************************************
""") """)
var rootVersion by extra("2.4.5") var rootVersion by extra("2.4.6")
var snapshot by extra("SNAPSHOT") var snapshot by extra("SNAPSHOT")
var revision: String by extra("") var revision: String by extra("")
var buildNumber by extra("") var buildNumber by extra("")
@ -41,7 +41,7 @@ ext {
} }
} }
version = String.format("%s-%s", rootVersion, buildNumber) version = String.format("%s", rootVersion)
if (!project.hasProperty("gitCommitHash")) { if (!project.hasProperty("gitCommitHash")) {
apply(plugin = "org.ajoberstar.grgit") apply(plugin = "org.ajoberstar.grgit")

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TextureUtil.java
Datei anzeigen

@ -599,7 +599,7 @@ public class TextureUtil implements TextureHolder {
* *
* @return {@link VersionMetadata} containing the id (= version) and url to the client manifest itself * @return {@link VersionMetadata} containing the id (= version) and url to the client manifest itself
* @throws IOException If any http / i/o operation fails. * @throws IOException If any http / i/o operation fails.
* @since TODO * @since 2.4.6
*/ */
private static VersionMetadata getLatestVersion() throws IOException { private static VersionMetadata getLatestVersion() throws IOException {
try (BufferedInputStream in = new BufferedInputStream(new URL(VERSION_MANIFEST).openStream()); try (BufferedInputStream in = new BufferedInputStream(new URL(VERSION_MANIFEST).openStream());
@ -624,7 +624,7 @@ public class TextureUtil implements TextureHolder {
* @param metadata The version metadata containing the url to the client.jar * @param metadata The version metadata containing the url to the client.jar
* @return The full url to the client.jar including the expected file hash for validation purposes * @return The full url to the client.jar including the expected file hash for validation purposes
* @throws IOException If any http / i/o operation fails. * @throws IOException If any http / i/o operation fails.
* @since TODO * @since 2.4.6
*/ */
private static HashedResource getLatestClientJarUrl(VersionMetadata metadata) throws IOException { private static HashedResource getLatestClientJarUrl(VersionMetadata metadata) throws IOException {
try (BufferedInputStream in = new BufferedInputStream(new URL(metadata.url()).openStream()); try (BufferedInputStream in = new BufferedInputStream(new URL(metadata.url()).openStream());
@ -642,7 +642,7 @@ public class TextureUtil implements TextureHolder {
* @return The hash of the file contents * @return The hash of the file contents
* @throws NoSuchAlgorithmException If the SHA-1 algorithm could not be resolved * @throws NoSuchAlgorithmException If the SHA-1 algorithm could not be resolved
* @throws IOException If any I/O operation failed * @throws IOException If any I/O operation failed
* @since TODO * @since 2.4.6
*/ */
private static String calculateSha1(Path path) throws NoSuchAlgorithmException, IOException { private static String calculateSha1(Path path) throws NoSuchAlgorithmException, IOException {
MessageDigest digest = MessageDigest.getInstance("SHA-1"); MessageDigest digest = MessageDigest.getInstance("SHA-1");