xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity
5dabc4e42e
KCauldronX/patches/org/bukkit/plugin/java/JavaPluginLoader.java.patch
gamerforEA 16773ead6a Initial commit (Forge 1291).
2015-03-22 20:38:04 +03:00

234 lines
9.6 KiB
Diff
Raw Blame History

--- ../src-base/minecraft/org/bukkit/plugin/java/JavaPluginLoader.java
+++ ../src-work/minecraft/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -1,5 +1,15 @@
package org.bukkit.plugin.java;
+// Cauldron start
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import net.md_5.specialsource.InheritanceMap;
+import net.md_5.specialsource.JarMapping;
+import net.md_5.specialsource.transformer.MavenShade;
+// Cauldron end
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -10,6 +20,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.jar.JarEntry;
@@ -39,8 +50,11 @@
import org.bukkit.plugin.RegisteredListener;
import org.bukkit.plugin.TimedRegisteredListener;
import org.bukkit.plugin.UnknownDependencyException;
+import org.spigotmc.CustomTimingsHandler; // Spigot
import org.yaml.snakeyaml.error.YAMLException;
+import com.google.common.collect.ImmutableList;
+
/**
* Represents a Java plugin loader, allowing plugins in the form of .jar
*/
@@ -49,6 +63,7 @@
private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
private final Map<String, Class<?>> classes = new HashMap<String, Class<?>>();
private final Map<String, PluginClassLoader> loaders = new LinkedHashMap<String, PluginClassLoader>();
+ public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
/**
* This class was not meant to be constructed explicitly
@@ -59,43 +74,41 @@
server = instance;
}
- public Plugin loadPlugin(final File file) throws InvalidPluginException {
+ public Plugin loadPlugin(File file) throws InvalidPluginException {
Validate.notNull(file, "File cannot be null");
if (!file.exists()) {
throw new InvalidPluginException(new FileNotFoundException(file.getPath() + " does not exist"));
}
- final PluginDescriptionFile description;
+ PluginDescriptionFile description;
try {
description = getPluginDescription(file);
} catch (InvalidDescriptionException ex) {
throw new InvalidPluginException(ex);
}
- final File parentFile = file.getParentFile();
- final File dataFolder = new File(parentFile, description.getName());
- @SuppressWarnings("deprecation")
- final File oldDataFolder = new File(parentFile, description.getRawName());
+ File dataFolder = new File(file.getParentFile(), description.getName());
+ File oldDataFolder = getDataFolder(file);
// Found old data folder
if (dataFolder.equals(oldDataFolder)) {
// They are equal -- nothing needs to be done!
} else if (dataFolder.isDirectory() && oldDataFolder.isDirectory()) {
- server.getLogger().warning(String.format(
- "While loading %s (%s) found old-data folder: `%s' next to the new one `%s'",
- description.getFullName(),
+ server.getLogger().log(Level.INFO, String.format(
+ "While loading %s (%s) found old-data folder: %s next to the new one: %s",
+ description.getName(),
file,
oldDataFolder,
dataFolder
));
} else if (oldDataFolder.isDirectory() && !dataFolder.exists()) {
if (!oldDataFolder.renameTo(dataFolder)) {
- throw new InvalidPluginException("Unable to rename old data folder: `" + oldDataFolder + "' to: `" + dataFolder + "'");
+ throw new InvalidPluginException("Unable to rename old data folder: '" + oldDataFolder + "' to: '" + dataFolder + "'");
}
server.getLogger().log(Level.INFO, String.format(
- "While loading %s (%s) renamed data folder: `%s' to `%s'",
- description.getFullName(),
+ "While loading %s (%s) renamed data folder: '%s' to '%s'",
+ description.getName(),
file,
oldDataFolder,
dataFolder
@@ -104,14 +117,19 @@
if (dataFolder.exists() && !dataFolder.isDirectory()) {
throw new InvalidPluginException(String.format(
- "Projected datafolder: `%s' for %s (%s) exists and is not a directory",
+ "Projected datafolder: '%s' for %s (%s) exists and is not a directory",
dataFolder,
- description.getFullName(),
+ description.getName(),
file
));
}
- for (final String pluginName : description.getDepend()) {
+ List<String> depend = description.getDepend();
+ if (depend == null) {
+ depend = ImmutableList.<String>of();
+ }
+
+ for (String pluginName : depend) {
if (loaders == null) {
throw new UnknownDependencyException(pluginName);
}
@@ -122,7 +140,7 @@
}
}
- final PluginClassLoader loader;
+ PluginClassLoader loader;
try {
loader = new PluginClassLoader(this, getClass().getClassLoader(), description, dataFolder, file);
} catch (InvalidPluginException ex) {
@@ -136,6 +154,26 @@
return loader.plugin;
}
+ private File getDataFolder(File file) {
+ File dataFolder = null;
+
+ String filename = file.getName();
+ int index = file.getName().lastIndexOf(".");
+
+ if (index != -1) {
+ String name = filename.substring(0, index);
+
+ dataFolder = new File(file.getParentFile(), name);
+ } else {
+ // This is if there is no extension, which should not happen
+ // Using _ to prevent name collision
+
+ dataFolder = new File(file.getParentFile(), filename + "_");
+ }
+
+ return dataFolder;
+ }
+
public PluginDescriptionFile getPluginDescription(File file) throws InvalidDescriptionException {
Validate.notNull(file, "File cannot be null");
@@ -283,13 +321,19 @@
}
}
+ final CustomTimingsHandler timings = new CustomTimingsHandler("Plugin: " + plugin.getDescription().getFullName() + " Event: " + listener.getClass().getName() + "::" + method.getName()+"("+eventClass.getSimpleName()+")", pluginParentTimer); // Spigot
EventExecutor executor = new EventExecutor() {
public void execute(Listener listener, Event event) throws EventException {
try {
if (!eventClass.isAssignableFrom(event.getClass())) {
return;
}
+ // Spigot start
+ boolean isAsync = event.isAsynchronous();
+ if (!isAsync) timings.startTiming();
method.invoke(listener, event);
+ if (!isAsync) timings.stopTiming();
+ // Spigot end
} catch (InvocationTargetException ex) {
throw new EventException(ex.getCause());
} catch (Throwable t) {
@@ -297,7 +341,7 @@
}
}
};
- if (useTimings) {
+ if (false) { // Spigot - RL handles useTimings check now
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
@@ -362,4 +406,44 @@
}
}
}
+
+ // Cauldron start
+ private InheritanceMap globalInheritanceMap = null;
+
+ /**
+ * Get the inheritance map for remapping all plugins
+ */
+ public InheritanceMap getGlobalInheritanceMap() {
+ if (globalInheritanceMap == null) {
+ Map<String, String> relocationsCurrent = new HashMap<String, String>();
+ relocationsCurrent.put("net.minecraft.server", "net.minecraft.server."+PluginClassLoader.getNativeVersion());
+ JarMapping currentMappings = new JarMapping();
+
+ try {
+ currentMappings.loadMappings(
+ new BufferedReader(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("mappings/"+PluginClassLoader.getNativeVersion()+"/cb2numpkg.srg"))),
+ new MavenShade(relocationsCurrent),
+ null, false);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ throw new RuntimeException(ex);
+ }
+
+ BiMap<String, String> inverseClassMap = HashBiMap.create(currentMappings.classes).inverse();
+ globalInheritanceMap = new InheritanceMap();
+
+ BufferedReader reader = new BufferedReader(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("mappings/"+PluginClassLoader.getNativeVersion()+"/nms.inheritmap")));
+
+ try {
+ globalInheritanceMap.load(reader, inverseClassMap);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ throw new RuntimeException(ex);
+ }
+ System.out.println("Loaded inheritance map of "+globalInheritanceMap.size()+" classes");
+ }
+
+ return globalInheritanceMap;
+ }
+ // Cauldron end
}
View Git Blame Copy Permalink