[SPIGOT-946] Begin making use of access transforms to simplify patching.

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-06-06 19:33:48 +10:00
parent ae714e4861
commit 58abe21c5a
47 changed files with 76 additions and 632 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -38,14 +38,27 @@
@@ -38,6 +38,19 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -19,18 +19,7 @@
+
public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics {
- private static final Logger LOGGER = LogManager.getLogger();
+ public static final Logger LOGGER = LogManager.getLogger(); // CraftBukkit - make public
public static final File a = new File("usercache.json");
private static MinecraftServer l;
- private final Convertable convertable;
+ public Convertable convertable; // CraftBukkit - remove final, public
private final MojangStatisticsGenerator n = new MojangStatisticsGenerator("server", this, az());
- private final File universe;
+ public File universe; // CraftBukkit - remove final, public
private final List<IUpdatePlayerListBox> p = Lists.newArrayList();
protected final ICommandHandler b;
public final MethodProfiler methodProfiler = new MethodProfiler();
public static final Logger LOGGER = LogManager.getLogger();
@@ -94,19 +107,61 @@
private Thread serverThread;
private long ab = az();