SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using ForgeFlower for Paper Only mc-dev imports

Browse Source 
ForgeFlower is better than Spigots FernFlower at decompiling the source.

However, in order to maintain the CraftBukkit patches, we must keep
using spigots for the primary.

However, for any file that we import on top of Spigots imported files
there is nothing stopping us from using better decompiled files.

So these changes will use ForgeFlower to maintain a better set of
decomped files, so anything we add on top of Paper can start off
in a better spot.
This commit is contained in:
Aikar
2018-08-31 18:56:57 -04:00
parent bd4da1aea0
commit e82ef9ec05
74 changed files with 987 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/Remove-Debug-checks-from-DataBits.patch
View File

@@ -9,15 +9,15 @@ Before: http://i.imgur.com/nQsMzAE.png
After: http://i.imgur.com/nJ46crB.png
diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
index d24ec3d53c..0fb3162e65 100644
index 0dc948a375..f4de7fcf4b 100644
--- a/src/main/java/net/minecraft/server/DataBits.java
+++ b/src/main/java/net/minecraft/server/DataBits.java
@@ -0,0 +0,0 @@ public class DataBits {
}
public DataBits(int i, int j, long[] along) {
- Validate.inclusiveBetween(1L, 32L, (long) i);
+ //Validate.inclusiveBetween(1L, 32L, (long) i); // Paper
- Validate.inclusiveBetween(1L, 32L, (long)i);
+ //Validate.inclusiveBetween(1L, 32L, (long)i); // Paper
this.d = j;
this.b = i;
this.a = along;
@@ -25,10 +25,10 @@ index d24ec3d53c..0fb3162e65 100644
}
public void a(int i, int j) {
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
- Validate.inclusiveBetween(0L, this.c, (long) j);
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
+ //Validate.inclusiveBetween(0L, this.c, (long) j); // Paper
- Validate.inclusiveBetween(0L, (long)(this.d - 1), (long)i);
- Validate.inclusiveBetween(0L, this.c, (long)j);
+ //Validate.inclusiveBetween(0L, (long)(this.d - 1), (long)i); // Paper
+ //Validate.inclusiveBetween(0L, this.c, (long)j); // Paper
int k = i * this.b;
int l = k / 64;
int i1 = ((i + 1) * this.b - 1) / 64;
@@ -36,7 +36,7 @@ index d24ec3d53c..0fb3162e65 100644
}
public int a(int i) {
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
- Validate.inclusiveBetween(0L, (long)(this.d - 1), (long)i);
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
int j = i * this.b;
int k = j / 64;