Remap plugin libraries with namespace set to spigot (#10610)
* Remap plugin libraries with namespace set to spigot * Remap plugin libraries with namespace set to spigot
This commit is contained in:
parent
7f2d5315fd
commit
05308fc299
4 changed files with 401 additions and 279 deletions
|
@ -66,22 +66,24 @@ index 65fb16941fa7e3a9b300696fb6bd2b562bca48cd..5ffd1d7c130e01a4a7516b361e48bfaf
|
|||
+ mainClass.set(null as String?)
|
||||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
|
||||
index 708e5bb9bbf0476fcc2c4b92c6830b094703b43e..bb1cfa8ea8b11fc36ea72c8e382b8554bccd0ce5 100644
|
||||
index 708e5bb9bbf0476fcc2c4b92c6830b094703b43e..6f14cb9a73faa1d0ae2939d08809d9f6c2a99e1d 100644
|
||||
--- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
|
||||
@@ -6,10 +6,10 @@ import io.papermc.paper.plugin.entrypoint.Entrypoint;
|
||||
@@ -6,10 +6,12 @@ import io.papermc.paper.plugin.entrypoint.Entrypoint;
|
||||
import io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler;
|
||||
import io.papermc.paper.plugin.provider.PluginProvider;
|
||||
import io.papermc.paper.plugin.provider.type.paper.PaperPluginParent;
|
||||
+import io.papermc.paper.pluginremap.PluginRemapper;
|
||||
+import java.util.function.Function;
|
||||
import joptsimple.OptionSet;
|
||||
import net.minecraft.server.dedicated.DedicatedServer;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
-import org.bukkit.craftbukkit.CraftServer;
|
||||
+import org.bukkit.plugin.java.LibraryLoader;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.slf4j.Logger;
|
||||
@@ -25,10 +25,14 @@ public class PluginInitializerManager {
|
||||
@@ -25,10 +27,15 @@ public class PluginInitializerManager {
|
||||
private static PluginInitializerManager impl;
|
||||
private final Path pluginDirectory;
|
||||
private final Path updateDirectory;
|
||||
|
@ -93,10 +95,11 @@ index 708e5bb9bbf0476fcc2c4b92c6830b094703b43e..bb1cfa8ea8b11fc36ea72c8e382b8554
|
|||
+ this.pluginRemapper = Boolean.getBoolean("paper.disable-plugin-rewriting")
|
||||
+ ? null
|
||||
+ : PluginRemapper.create(pluginDirectory);
|
||||
+ LibraryLoader.REMAPPER = this.pluginRemapper == null ? Function.identity() : this.pluginRemapper::remapLibraries;
|
||||
}
|
||||
|
||||
private static PluginInitializerManager parse(@NotNull final OptionSet minecraftOptionSet) throws Exception {
|
||||
@@ -96,6 +100,7 @@ public class PluginInitializerManager {
|
||||
@@ -96,6 +103,7 @@ public class PluginInitializerManager {
|
||||
public static void load(OptionSet optionSet) throws Exception {
|
||||
// We have to load the bukkit configuration inorder to get the update folder location.
|
||||
io.papermc.paper.plugin.PluginInitializerManager pluginSystem = io.papermc.paper.plugin.PluginInitializerManager.init(optionSet);
|
||||
|
@ -104,6 +107,31 @@ index 708e5bb9bbf0476fcc2c4b92c6830b094703b43e..bb1cfa8ea8b11fc36ea72c8e382b8554
|
|||
|
||||
// Register the default plugin directory
|
||||
io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.DirectoryProviderSource.INSTANCE, pluginSystem.pluginDirectoryPath());
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java b/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java
|
||||
index f38ecd7f65dc24e4a3f0bc675e3730287ac353f1..f576060c8fe872772bbafe2016fc9b83a3c095f1 100644
|
||||
--- a/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/loader/PaperClasspathBuilder.java
|
||||
@@ -1,5 +1,6 @@
|
||||
package io.papermc.paper.plugin.loader;
|
||||
|
||||
+import io.papermc.paper.plugin.PluginInitializerManager;
|
||||
import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
|
||||
import io.papermc.paper.plugin.loader.library.ClassPathLibrary;
|
||||
import io.papermc.paper.plugin.loader.library.PaperLibraryStore;
|
||||
@@ -45,9 +46,12 @@ public class PaperClasspathBuilder implements PluginClasspathBuilder {
|
||||
}
|
||||
|
||||
List<Path> paths = paperLibraryStore.getPaths();
|
||||
+ if (PluginInitializerManager.instance().pluginRemapper != null) {
|
||||
+ paths = PluginInitializerManager.instance().pluginRemapper.remapLibraries(paths);
|
||||
+ }
|
||||
URL[] urls = new URL[paths.size()];
|
||||
for (int i = 0; i < paths.size(); i++) {
|
||||
- Path path = paperLibraryStore.getPaths().get(i);
|
||||
+ Path path = paths.get(i);
|
||||
try {
|
||||
urls[i] = path.toUri().toURL();
|
||||
} catch (MalformedURLException e) {
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java
|
||||
index 226f457db6c1461c943c157b2b91e7450abc9dc6..0846d3a904e470ae1920c5c8be3df9c5dfc3de27 100644
|
||||
--- a/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java
|
||||
|
@ -347,10 +375,10 @@ index 0000000000000000000000000000000000000000..3a5bb5d2a45654385ca0bc15c81ef953
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f93974d1bd
|
||||
index 0000000000000000000000000000000000000000..a1ce1307b2834f2415bdddbf42d80e2d69a480e1
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java
|
||||
@@ -0,0 +1,371 @@
|
||||
@@ -0,0 +1,433 @@
|
||||
+package io.papermc.paper.pluginremap;
|
||||
+
|
||||
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
|
@ -397,6 +425,7 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ public static final boolean DEBUG_LOGGING = Boolean.getBoolean("Paper.PluginRemapperDebug");
|
||||
+ private static final String PAPER_REMAPPED = ".paper-remapped";
|
||||
+ private static final String UNKNOWN_ORIGIN = "unknown-origin";
|
||||
+ private static final String LIBRARIES = "libraries";
|
||||
+ private static final String EXTRA_PLUGINS = "extra-plugins";
|
||||
+ private static final String REMAP_CLASSPATH = "remap-classpath";
|
||||
+ private static final String REVERSED_MAPPINGS = "mappings/reversed";
|
||||
|
@ -407,6 +436,7 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ private final RemappedPluginIndex remappedPlugins;
|
||||
+ private final RemappedPluginIndex extraPlugins;
|
||||
+ private final UnknownOriginRemappedPluginIndex unknownOrigin;
|
||||
+ private final UnknownOriginRemappedPluginIndex libraries;
|
||||
+ private @Nullable CompletableFuture<IMappingFile> reversedMappings;
|
||||
+
|
||||
+ public PluginRemapper(final Path pluginsDir) {
|
||||
|
@ -418,6 +448,7 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ this.remappedPlugins = new RemappedPluginIndex(remappedPlugins, false);
|
||||
+ this.extraPlugins = new RemappedPluginIndex(this.remappedPlugins.dir().resolve(EXTRA_PLUGINS), true);
|
||||
+ this.unknownOrigin = new UnknownOriginRemappedPluginIndex(this.remappedPlugins.dir().resolve(UNKNOWN_ORIGIN));
|
||||
+ this.libraries = new UnknownOriginRemappedPluginIndex(this.remappedPlugins.dir().resolve(LIBRARIES));
|
||||
+ }
|
||||
+
|
||||
+ public static @Nullable PluginRemapper create(final Path pluginsDir) {
|
||||
|
@ -446,6 +477,7 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ this.remappedPlugins.write();
|
||||
+ this.extraPlugins.write();
|
||||
+ this.unknownOrigin.write(clean);
|
||||
+ this.libraries.write(clean);
|
||||
+ }
|
||||
+
|
||||
+ // Called on startup and reload
|
||||
|
@ -465,6 +497,29 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ this.save(false);
|
||||
+ }
|
||||
+
|
||||
+ public List<Path> remapLibraries(final List<Path> libraries) {
|
||||
+ final List<CompletableFuture<Path>> tasks = new ArrayList<>();
|
||||
+ for (final Path lib : libraries) {
|
||||
+ if (!lib.getFileName().toString().endsWith(".jar")) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Library '{}' is not a jar.", libraries);
|
||||
+ }
|
||||
+ tasks.add(CompletableFuture.completedFuture(lib));
|
||||
+ continue;
|
||||
+ }
|
||||
+ final @Nullable Path cached = this.libraries.getIfPresent(lib);
|
||||
+ if (cached != null) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Library '{}' has not changed since last remap.", libraries);
|
||||
+ }
|
||||
+ tasks.add(CompletableFuture.completedFuture(cached));
|
||||
+ continue;
|
||||
+ }
|
||||
+ tasks.add(this.remapLibrary(this.libraries, lib));
|
||||
+ }
|
||||
+ return waitForAll(tasks);
|
||||
+ }
|
||||
+
|
||||
+ public Path rewritePlugin(final Path plugin) {
|
||||
+ // Already remapped
|
||||
+ if (plugin.getParent().equals(this.remappedPlugins.dir())
|
||||
|
@ -585,6 +640,20 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ }, executor).thenCompose(f -> f);
|
||||
+ }
|
||||
+
|
||||
+ private CompletableFuture<Path> remapPlugin(
|
||||
+ final RemappedPluginIndex index,
|
||||
+ final Path inputFile
|
||||
+ ) {
|
||||
+ return this.remap(index, inputFile, false);
|
||||
+ }
|
||||
+
|
||||
+ private CompletableFuture<Path> remapLibrary(
|
||||
+ final RemappedPluginIndex index,
|
||||
+ final Path inputFile
|
||||
+ ) {
|
||||
+ return this.remap(index, inputFile, true);
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Returns the remapped file if remapping was necessary, otherwise null.
|
||||
+ *
|
||||
|
@ -592,7 +661,11 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ * @param inputFile input file
|
||||
+ * @return remapped file, or inputFile if no remapping was necessary
|
||||
+ */
|
||||
+ private CompletableFuture<Path> remapPlugin(final RemappedPluginIndex index, final Path inputFile) {
|
||||
+ private CompletableFuture<Path> remap(
|
||||
+ final RemappedPluginIndex index,
|
||||
+ final Path inputFile,
|
||||
+ final boolean library
|
||||
+ ) {
|
||||
+ final Path destination = index.input(inputFile);
|
||||
+
|
||||
+ try (final FileSystem fs = FileSystems.newFileSystem(inputFile, new HashMap<>())) {
|
||||
|
@ -608,18 +681,35 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ } else {
|
||||
+ ns = null;
|
||||
+ }
|
||||
+ if (ns != null && (ns.equals(InsertManifestAttribute.MOJANG_NAMESPACE) || ns.equals(InsertManifestAttribute.MOJANG_PLUS_YARN_NAMESPACE))) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Plugin '{}' is already Mojang mapped.", inputFile);
|
||||
+ final boolean mojangMappedManifest = ns != null && (ns.equals(InsertManifestAttribute.MOJANG_NAMESPACE) || ns.equals(InsertManifestAttribute.MOJANG_PLUS_YARN_NAMESPACE));
|
||||
+ if (library) {
|
||||
+ if (mojangMappedManifest) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Library '{}' is already Mojang mapped.", inputFile);
|
||||
+ }
|
||||
+ index.skip(inputFile);
|
||||
+ return CompletableFuture.completedFuture(inputFile);
|
||||
+ } else if (ns == null) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Library '{}' does not specify a mappings namespace (not remapping).", inputFile);
|
||||
+ }
|
||||
+ index.skip(inputFile);
|
||||
+ return CompletableFuture.completedFuture(inputFile);
|
||||
+ }
|
||||
+ index.skip(inputFile);
|
||||
+ return CompletableFuture.completedFuture(inputFile);
|
||||
+ } else if (ns == null && Files.exists(fs.getPath(PluginFileType.PAPER_PLUGIN_YML))) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Plugin '{}' is a Paper plugin with no namespace specified.", inputFile);
|
||||
+ } else {
|
||||
+ if (mojangMappedManifest) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Plugin '{}' is already Mojang mapped.", inputFile);
|
||||
+ }
|
||||
+ index.skip(inputFile);
|
||||
+ return CompletableFuture.completedFuture(inputFile);
|
||||
+ } else if (ns == null && Files.exists(fs.getPath(PluginFileType.PAPER_PLUGIN_YML))) {
|
||||
+ if (DEBUG_LOGGING) {
|
||||
+ LOGGER.info("Plugin '{}' is a Paper plugin with no namespace specified.", inputFile);
|
||||
+ }
|
||||
+ index.skip(inputFile);
|
||||
+ return CompletableFuture.completedFuture(inputFile);
|
||||
+ }
|
||||
+ index.skip(inputFile);
|
||||
+ return CompletableFuture.completedFuture(inputFile);
|
||||
+ }
|
||||
+ } catch (final IOException ex) {
|
||||
+ throw new RuntimeException("Failed to open plugin jar " + inputFile, ex);
|
||||
|
@ -643,7 +733,7 @@ index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f9
|
|||
+ } catch (final Exception ex) {
|
||||
+ throw new RuntimeException("Failed to remap plugin jar '" + inputFile + "'", ex);
|
||||
+ }
|
||||
+ LOGGER.info("Done remapping plugin '{}' in {}ms.", inputFile, System.currentTimeMillis() - start);
|
||||
+ LOGGER.info("Done remapping {} '{}' in {}ms.", library ? "library" : "plugin", inputFile, System.currentTimeMillis() - start);
|
||||
+ return destination;
|
||||
+ }, this.threadPool);
|
||||
+ }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue