Read WE version from manifest ourselves

(cherry picked from commit 947775b5e54aa9dd89d68ee0b382939796301902)
This commit is contained in:
Octavia Togami 2020-02-10 20:11:08 -05:00 committed by MattBDev
parent 752a2624f8
commit 692caeea8a
7 changed files with 111 additions and 51 deletions

View File

@ -120,7 +120,19 @@ fun Project.applyShadowConfiguration() {
} }
} }
val CLASSPATH = listOf("truezip", "truevfs", "js") private val CLASSPATH = listOf("truezip", "truevfs", "js")
.map { "$it.jar" } .map { "$it.jar" }
.flatMap { listOf(it, "WorldEdit/$it") } .flatMap { listOf(it, "WorldEdit/$it") }
.joinToString(separator = " ") .joinToString(separator = " ")
fun Project.addJarManifest(includeClasspath: Boolean = false) {
tasks.named<Jar>("jar") {
val attributes = mutableMapOf(
"WorldEdit-Version" to project(":worldedit-core").version
)
if (includeClasspath) {
attributes["Class-Path"] = CLASSPATH
}
manifest.attributes(attributes)
}
}

View File

@ -75,12 +75,7 @@ tasks.named<Copy>("processResources") {
exclude("**/worldedit-adapters.jar") exclude("**/worldedit-adapters.jar")
} }
tasks.named<Jar>("jar") { addJarManifest(includeClasspath = true)
manifest {
attributes("Class-Path" to CLASSPATH,
"WorldEdit-Version" to project.version)
}
}
tasks.named<ShadowJar>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
from(zipTree("src/main/resources/worldedit-adapters.jar").matching { from(zipTree("src/main/resources/worldedit-adapters.jar").matching {

View File

@ -750,23 +750,9 @@ public final class WorldEdit {
return version; return version;
} }
Package p = WorldEdit.class.getPackage(); WorldEditManifest manifest = WorldEditManifest.load();
if (p == null) { return version = manifest.getWorldEditVersion();
p = Package.getPackage("com.sk89q.worldedit");
}
if (p == null) {
version = "(unknown)";
} else {
version = p.getImplementationVersion();
if (version == null) {
version = "(unknown)";
}
}
return version;
} }
} }

View File

@ -0,0 +1,81 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit;
import javax.annotation.Nullable;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.JarURLConnection;
import java.net.URL;
import java.util.function.Supplier;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
/**
* Represents WorldEdit info from the MANIFEST.MF file.
*/
public class WorldEditManifest {
public static final String WORLD_EDIT_VERSION = "WorldEdit-Version";
public static WorldEditManifest load() {
Attributes attributes = readAttributes();
return new WorldEditManifest(
readAttribute(attributes, WORLD_EDIT_VERSION, () -> "(unknown)")
);
}
private static @Nullable Attributes readAttributes() {
Class<WorldEditManifest> clazz = WorldEditManifest.class;
String className = clazz.getSimpleName() + ".class";
String classPath = clazz.getResource(className).toString();
if (!classPath.startsWith("jar")) {
return null;
}
try {
URL url = new URL(classPath);
JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
Manifest manifest = jarConnection.getManifest();
return manifest.getMainAttributes();
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
private static String readAttribute(@Nullable Attributes attributes, String name,
Supplier<String> defaultAction) {
if (attributes == null) {
return defaultAction.get();
}
String value = attributes.getValue(name);
return value != null ? value : defaultAction.get();
}
private final String worldEditVersion;
private WorldEditManifest(String worldEditVersion) {
this.worldEditVersion = worldEditVersion;
}
public String getWorldEditVersion() {
return worldEditVersion;
}
}

View File

@ -6,9 +6,9 @@ applyShadowConfiguration()
apply(plugin = "fabric-loom") apply(plugin = "fabric-loom")
val minecraftVersion = "1.14.4" val minecraftVersion = "1.15.2"
val yarnMappings = "1.14.4+build.12" val yarnMappings = "1.15.2+build.8:v2"
val loaderVersion = "0.6.2+build.166" val loaderVersion = "0.7.6+build.180"
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
@ -25,10 +25,10 @@ dependencies {
"modCompile"("net.fabricmc:fabric-loader:$loaderVersion") "modCompile"("net.fabricmc:fabric-loader:$loaderVersion")
listOf( listOf(
"net.fabricmc.fabric-api:fabric-api-base:0.1.0+2983bc0442", "net.fabricmc.fabric-api:fabric-api-base:0.1.2+28f8190f42",
"net.fabricmc.fabric-api:fabric-events-interaction-v0:0.1.1+591e97ae42", "net.fabricmc.fabric-api:fabric-events-interaction-v0:0.2.6+12515ed975",
"net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.1+591e97ae42", "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.2+b7f9825de8",
"net.fabricmc.fabric-api:fabric-networking-v0:0.1.3+591e97ae42" "net.fabricmc.fabric-api:fabric-networking-v0:0.1.7+12515ed975"
).forEach { ).forEach {
"include"(it) "include"(it)
"modImplementation"(it) "modImplementation"(it)
@ -61,12 +61,7 @@ tasks.named<Copy>("processResources") {
} }
} }
tasks.named<Jar>("jar") { addJarManifest(includeClasspath = true)
manifest {
attributes("Class-Path" to "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar",
"WorldEdit-Version" to project.version)
}
}
tasks.named<ShadowJar>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
archiveClassifier.set("dist-dev") archiveClassifier.set("dist-dev")

View File

@ -77,11 +77,7 @@ tasks.named<Copy>("processResources") {
} }
} }
tasks.named<Jar>("jar") { addJarManifest(includeClasspath = false)
manifest {
attributes("WorldEdit-Version" to project.version)
}
}
tasks.named<ShadowJar>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
dependencies { dependencies {

View File

@ -25,12 +25,7 @@ sponge {
} }
} }
tasks.named<Jar>("jar") { addJarManifest(includeClasspath = true)
manifest {
attributes("Class-Path" to "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar",
"WorldEdit-Version" to project.version)
}
}
tasks.named<ShadowJar>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
dependencies { dependencies {