diff --git a/buildtools/BuildTools.jar b/buildtools/BuildTools.jar
index 20885f56..9ab1a21c 100644
Binary files a/buildtools/BuildTools.jar and b/buildtools/BuildTools.jar differ
diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java
index 0502d4db..4d8c4d4f 100644
--- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java
+++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java
@@ -45,6 +45,9 @@ import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.awt.event.ActionEvent;
import javax.swing.event.HyperlinkListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
+import javax.swing.text.html.HTMLDocument;
import net.lax1dude.eaglercraft.v1_8.buildtools.gui.TeaVMBinaries.MissingJARsException;
import net.lax1dude.eaglercraft.v1_8.buildtools.task.init.FFMPEG;
@@ -1155,7 +1158,7 @@ public class CompileLatestClientFrame {
txtpnLogOutput.setAutoscrolls(false);
txtpnLogOutput.setMargin(new Insets(10, 10, 10, 10));
txtpnLogOutput.setContentType("text/html");
- txtpnLogOutput.setText("shit");
+ txtpnLogOutput.setText("shit");
txtpnLogOutput.setEditable(false);
scrollPane.setViewportView(txtpnLogOutput);
@@ -1192,18 +1195,30 @@ public class CompileLatestClientFrame {
panel_29.setLayout(null);
}
- private final StringBuilder logAccum = new StringBuilder();
+ private StringBuilder logAccumPrev = new StringBuilder();
+ private StringBuilder logAccum = new StringBuilder();
+ private Element logAccumBody = null;
private volatile boolean logDirty = false;
private volatile boolean isError = false;
public void logInfo(String line) {
line = htmlentities2(line);
synchronized(logAccum) {
- if(isError) {
- isError = false;
- logAccum.append("");
+ if(logAccum.length() > 0) {
+ if(isError) {
+ isError = false;
+ logAccum.append("");
+ }
+ logAccum.append(line);
+ }else {
+ if(isError) {
+ isError = false;
+ logAccum.append("");
+ logAccum.append(line);
+ }else {
+ logAccumPrev.append(line);
+ }
}
- logAccum.append(line);
logDirty = true;
}
}
@@ -1211,11 +1226,21 @@ public class CompileLatestClientFrame {
public void logError(String line) {
line = htmlentities2(line);
synchronized(logAccum) {
- if(!isError) {
- isError = true;
- logAccum.append("");
+ if(logAccum.length() > 0) {
+ if(!isError) {
+ isError = true;
+ logAccum.append("");
+ }
+ logAccum.append(line);
+ }else {
+ if(!isError) {
+ isError = true;
+ logAccum.append("");
+ logAccum.append(line);
+ }else {
+ logAccumPrev.append(line);
+ }
}
- logAccum.append(line);
logDirty = true;
}
}
@@ -1226,12 +1251,31 @@ public class CompileLatestClientFrame {
public void run() {
while(true) {
try {
- Thread.sleep(150l);
+ Thread.sleep(100l);
synchronized(logAccum) {
if(logDirty) {
EventQueue.invokeAndWait(new Runnable() {
public void run() {
- txtpnLogOutput.setText("shit" + logAccum + "
");
+ HTMLDocument ee = ((HTMLDocument)txtpnLogOutput.getDocument());
+ if(logAccumBody == null) {
+ logAccumBody = ee.getElement("logContainer");
+ }
+ if(logAccumPrev.length() > 0) {
+ try {
+ ee.insertString(logAccumBody.getElement(logAccumBody.getElementCount() - 1).getEndOffset() - 1, logAccumPrev.toString(), null);
+ } catch (BadLocationException e) {
+ }
+ logAccumPrev = new StringBuilder();
+ }
+ if(logAccum.length() > 0) {
+ logAccum.append("");
+ try {
+ ee.insertBeforeEnd(logAccumBody, logAccum.toString());
+ } catch (BadLocationException e) {
+ } catch (IOException e) {
+ }
+ logAccum = new StringBuilder();
+ }
}
});
EventQueue.invokeAndWait(new Runnable() {
diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
index 9cf6d39b..dd420c2a 100644
--- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
+++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
@@ -41,7 +41,9 @@ public class EaglerContextRedacted {
output.println("# Version: 1.0");
output.println("# Author: lax1dude");
output.println();
-
+
+ int lastSourcePos = 0;
+ int lastTargetPos = 0;
List> deltas = patch.getDeltas();
delta_itr: for(int i = 0, l = deltas.size(); i < l; ++i) {
AbstractDelta delta = deltas.get(i);
@@ -72,13 +74,17 @@ public class EaglerContextRedacted {
int sourcePos = source.getPosition();
int sourceLen = source.getLines().size();
+ int sourcePosRelative = sourcePos - lastSourcePos;
+
Chunk target = delta.getTarget();
int targetPos = target.getPosition();
List linesToWrite = target.getLines();
int targetLen = linesToWrite.size();
- output.println(blockType + " " + targetPos + (targetLen > 0 ? " : " + (targetPos + targetLen) : "") + " @ "
- + sourcePos + (sourceLen > 0 ? " : " + (sourcePos + sourceLen) : ""));
+ int targetPosRelative = targetPos - lastTargetPos;
+
+ output.println(blockType + " " + targetPosRelative + (targetLen > 0 ? " : " + (targetPosRelative + targetLen) : "") + " @ "
+ + sourcePosRelative + (sourceLen > 0 ? " : " + (sourcePosRelative + sourceLen) : ""));
output.println();
@@ -89,6 +95,9 @@ public class EaglerContextRedacted {
output.println();
}
+
+ lastSourcePos = sourcePos;
+ lastTargetPos = targetPos;
}
output.println("> EOF");
@@ -104,6 +113,8 @@ public class EaglerContextRedacted {
int targetLen = 0;
List targetLines = null;
+ int lastSourcePos = 0;
+ int lastTargetPos = 0;
String line;
readLinesLoop: while((line = reader.readLine()) != null) {
if(line.length() < 2) {
@@ -145,7 +156,9 @@ public class EaglerContextRedacted {
}
if(currentDeltaType != null) {
- newPatch.addDelta(makeDelta(currentDeltaType, sourceStart, sourceLen, targetStart, targetLen, context, targetLines));
+ lastSourcePos += sourceStart;
+ lastTargetPos += targetStart;
+ newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines));
}
switch(split[0]) {
@@ -214,7 +227,9 @@ public class EaglerContextRedacted {
}
if(currentDeltaType != null) {
- newPatch.addDelta(makeDelta(currentDeltaType, sourceStart, sourceLen, targetStart, targetLen, context, targetLines));
+ lastSourcePos += sourceStart;
+ lastTargetPos += targetStart;
+ newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines));
}
return newPatch;
diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java
index f8faaee5..7283bb61 100644
--- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java
+++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java
@@ -209,6 +209,7 @@ public class DecompileMinecraft {
ApplyPatchesToZip.applyPatches(formatOut, null, new File(EaglerBuildTools.repositoryRoot, "patches/minecraft"), patchOut, true, true);
}catch(Throwable t) {
System.err.println("ERROR: Could not apply 'patches' directory to: " + patchOut.getName());
+ t.printStackTrace();
return false;
}
diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java
index ea2b79e0..bc764606 100644
--- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java
+++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java
@@ -5,6 +5,8 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
/**
* Copyright (c) 2022 LAX1DUDE. All Rights Reserved.
@@ -27,6 +29,10 @@ public class JARSubprocess {
classPathSeperator = System.getProperty("os.name").toLowerCase().contains("windows") ? ';' : ':';
}
+ private static final List activeProcesses = new ArrayList();
+
+ private static boolean shutdownThreadStarted = false;
+
public static int runJava(File directory, String[] javaExeArguments, String logPrefix) throws IOException {
if(logPrefix.length() > 0 && !logPrefix.endsWith(" ")) {
logPrefix = logPrefix + " ";
@@ -60,6 +66,28 @@ public class JARSubprocess {
exec.directory(directory);
Process ps = exec.start();
+
+ synchronized(activeProcesses) {
+ if(!shutdownThreadStarted) {
+ Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+ public void run() {
+ synchronized(activeProcesses) {
+ for(Process proc : activeProcesses) {
+ try {
+ if(proc.isAlive()) {
+ proc.destroy();
+ }
+ }catch(Throwable t) {
+ }
+ }
+ }
+ }
+ }, "Subprocess Exit Thread"));
+ shutdownThreadStarted = true;
+ }
+ activeProcesses.add(ps);
+ }
+
InputStream is = ps.getInputStream();
InputStream ise = ps.getErrorStream();
BufferedReader isb = new BufferedReader(new InputStreamReader(is));
diff --git a/patches/minecraft/net/minecraft/block/Block.edit.java b/patches/minecraft/net/minecraft/block/Block.edit.java
index d8076275..6f24d026 100644
--- a/patches/minecraft/net/minecraft/block/Block.edit.java
+++ b/patches/minecraft/net/minecraft/block/Block.edit.java
@@ -10,47 +10,47 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 14 @ 144 : 146
+> DELETE 11 @ 141 : 143
-> CHANGE 357 : 358 @ 489 : 490
+> CHANGE 343 : 344 @ 345 : 346
~ public void randomTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 361 : 362 @ 493 : 494
+> CHANGE 4 : 5 @ 4 : 5
~ public void updateTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
-> CHANGE 364 : 365 @ 496 : 497
+> CHANGE 3 : 4 @ 3 : 4
~ public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) {
-> CHANGE 383 : 384 @ 515 : 516
+> CHANGE 19 : 20 @ 19 : 20
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 387 : 388 @ 519 : 520
+> CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> DELETE 403 @ 535 : 537
+> DELETE 16 @ 16 : 18
-> DELETE 404 @ 538 : 548
+> DELETE 1 @ 3 : 13
-> CHANGE 407 : 408 @ 551 : 561
+> CHANGE 3 : 4 @ 13 : 23
~
-> DELETE 411 @ 564 : 572
+> DELETE 4 @ 13 : 21
-> CHANGE 663 : 664 @ 824 : 825
+> CHANGE 252 : 253 @ 260 : 261
~ public int quantityDroppedWithBonus(int fortune, EaglercraftRandom random) {
-> INSERT 800 : 801 @ 961
+> INSERT 137 : 138 @ 137
+ bootstrapStates();
-> INSERT 1269 : 1309 @ 1429
+> INSERT 469 : 509 @ 468
+ public static void bootstrapStates() {
+ BlockBed.bootstrapStates();
diff --git a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java
index 905467a1..af8af989 100644
--- a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java
@@ -9,9 +9,9 @@
~
-> DELETE 55 @ 55 : 64
+> DELETE 52 @ 52 : 61
-> INSERT 96 : 101 @ 105
+> INSERT 41 : 46 @ 50
+ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
+ EnumFacing side, float hitX, float hitY, float hitZ) {
diff --git a/patches/minecraft/net/minecraft/block/BlockBanner.edit.java b/patches/minecraft/net/minecraft/block/BlockBanner.edit.java
index b19e9a1a..45d1f7f4 100644
--- a/patches/minecraft/net/minecraft/block/BlockBanner.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBanner.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 68 : 69 @ 69 : 70
+> CHANGE 66 : 67 @ 67 : 68
~ public Item getItemDropped(IBlockState state, EaglercraftRandom rand, int fortune) {
diff --git a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java
index a96e28b3..e9058be8 100644
--- a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java
@@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 8 @ 9 : 10
+> DELETE 6 @ 7 : 8
-> CHANGE 81 : 82 @ 83 : 84
+> CHANGE 73 : 74 @ 74 : 75
~ public void randomTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom random) {
-> CHANGE 84 : 85 @ 86 : 92
+> CHANGE 3 : 4 @ 3 : 9
~ public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) {
-> DELETE 86 @ 93 : 94
+> DELETE 2 @ 7 : 8
-> DELETE 88 @ 96 : 106
+> DELETE 2 @ 3 : 13
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java
index 8396096c..2377fdce 100644
--- a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java
@@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 4
-> DELETE 8 @ 10 : 11
+> DELETE 6 @ 8 : 9
-> DELETE 9 @ 12 : 13
+> DELETE 1 @ 2 : 3
-> DELETE 14 @ 18 : 19
+> DELETE 5 @ 6 : 7
-> DELETE 15 @ 20 : 22
+> DELETE 1 @ 2 : 4
-> CHANGE 29 : 30 @ 36 : 47
+> CHANGE 14 : 15 @ 16 : 27
~ return true;
-> DELETE 69 @ 86 : 115
+> DELETE 40 @ 50 : 79
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockBed.edit.java b/patches/minecraft/net/minecraft/block/BlockBed.edit.java
index e84a973f..cf7c12c1 100644
--- a/patches/minecraft/net/minecraft/block/BlockBed.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBed.edit.java
@@ -10,32 +10,32 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 10 @ 11 : 12
+> DELETE 8 @ 9 : 10
-> DELETE 14 @ 16 : 17
+> DELETE 4 @ 5 : 6
-> DELETE 19 @ 22 : 23
+> DELETE 5 @ 6 : 7
-> CHANGE 21 : 22 @ 25 : 27
+> CHANGE 2 : 3 @ 3 : 5
~ public static PropertyEnum PART;
-> INSERT 31 : 35 @ 36
+> INSERT 10 : 14 @ 11
+ public static void bootstrapStates() {
+ PART = PropertyEnum.create("part", BlockBed.EnumPartType.class);
+ }
+
-> CHANGE 37 : 38 @ 38 : 90
+> CHANGE 6 : 7 @ 2 : 54
~ return true;
-> DELETE 40 @ 92 : 102
+> DELETE 3 @ 54 : 64
-> DELETE 60 @ 122 : 125
+> DELETE 20 @ 30 : 33
-> CHANGE 64 : 65 @ 129 : 130
+> CHANGE 4 : 5 @ 7 : 8
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java b/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java
index 186bed9a..a09f2ab8 100644
--- a/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 16 : 17 @ 16 : 17
+> CHANGE 14 : 15 @ 14 : 15
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 20 : 21 @ 20 : 21
+> CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java
index 2051c166..f1aeefac 100644
--- a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java
@@ -10,17 +10,17 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 18 @ 18 : 19
+> DELETE 15 @ 15 : 16
-> CHANGE 73 : 74 @ 74 : 85
+> CHANGE 55 : 56 @ 56 : 67
~ return true;
-> CHANGE 87 : 88 @ 98 : 99
+> CHANGE 14 : 15 @ 24 : 25
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
-> CHANGE 103 : 104 @ 114 : 115
+> CHANGE 16 : 17 @ 16 : 17
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockBush.edit.java b/patches/minecraft/net/minecraft/block/BlockBush.edit.java
index 9ea83c50..6ba0ac3c 100644
--- a/patches/minecraft/net/minecraft/block/BlockBush.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockBush.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 45 : 46 @ 45 : 46
+> CHANGE 43 : 44 @ 43 : 44
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockButton.edit.java b/patches/minecraft/net/minecraft/block/BlockButton.edit.java
index a25eee94..e59f59e2 100644
--- a/patches/minecraft/net/minecraft/block/BlockButton.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockButton.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 5
-> DELETE 9 @ 12 : 13
+> DELETE 7 @ 10 : 11
-> DELETE 11 @ 15 : 16
+> DELETE 2 @ 3 : 4
-> DELETE 164 @ 169 : 189
+> DELETE 153 @ 154 : 174
-> DELETE 171 @ 196 : 236
+> DELETE 7 @ 27 : 67
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockCactus.edit.java b/patches/minecraft/net/minecraft/block/BlockCactus.edit.java
index cd32eb27..276cfad4 100644
--- a/patches/minecraft/net/minecraft/block/BlockCactus.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCactus.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 29 : 30 @ 29 : 30
+> CHANGE 27 : 28 @ 27 : 28
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockCake.edit.java b/patches/minecraft/net/minecraft/block/BlockCake.edit.java
index 6ac5c2be..4387bf30 100644
--- a/patches/minecraft/net/minecraft/block/BlockCake.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCake.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 103 : 104 @ 103 : 104
+> CHANGE 101 : 102 @ 101 : 102
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 107 : 108 @ 107 : 108
+> CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java
index 731d368e..98f9ce66 100644
--- a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java
@@ -10,19 +10,19 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 12 @ 12 : 13
+> DELETE 9 @ 9 : 10
-> DELETE 13 @ 14 : 15
+> DELETE 1 @ 2 : 3
-> DELETE 15 @ 17 : 22
+> DELETE 2 @ 3 : 8
-> DELETE 57 @ 64 : 74
+> DELETE 42 @ 47 : 57
-> CHANGE 59 : 60 @ 76 : 164
+> CHANGE 2 : 3 @ 12 : 100
~ return true;
-> CHANGE 77 : 78 @ 181 : 182
+> CHANGE 18 : 19 @ 105 : 106
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockChest.edit.java b/patches/minecraft/net/minecraft/block/BlockChest.edit.java
index 998bd2ff..cf1b3f26 100644
--- a/patches/minecraft/net/minecraft/block/BlockChest.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockChest.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 4
-> DELETE 17 @ 19 : 20
+> DELETE 15 @ 17 : 18
-> CHANGE 131 : 132 @ 134 : 206
+> CHANGE 114 : 115 @ 115 : 187
~ return state;
-> CHANGE 249 : 250 @ 323 : 338
+> CHANGE 118 : 119 @ 189 : 204
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/BlockClay.edit.java b/patches/minecraft/net/minecraft/block/BlockClay.edit.java
index f2c7ae4d..58f1b5f1 100644
--- a/patches/minecraft/net/minecraft/block/BlockClay.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockClay.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 16 : 17 @ 16 : 17
+> CHANGE 14 : 15 @ 14 : 15
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 20 : 21 @ 20 : 21
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java b/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java
index e850a74b..83ec79eb 100644
--- a/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 32 : 33 @ 35 : 36
+> CHANGE 30 : 31 @ 33 : 34
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
-> CHANGE 150 : 151 @ 153 : 154
+> CHANGE 118 : 119 @ 118 : 119
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
-> CHANGE 154 : 155 @ 157 : 158
+> CHANGE 4 : 5 @ 4 : 5
~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
diff --git a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java
index b68026df..3b76de9e 100644
--- a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java
@@ -10,13 +10,13 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 32 : 33 @ 33 : 48
+> CHANGE 30 : 31 @ 31 : 46
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
-> DELETE 73 @ 88 : 92
+> DELETE 41 @ 55 : 59
-> CHANGE 76 : 77 @ 95 : 96
+> CHANGE 3 : 4 @ 7 : 8
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java
index 56377ea0..039c5d1e 100644
--- a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java
@@ -10,21 +10,21 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 12 @ 15 : 16
+> DELETE 10 @ 13 : 14
-> CHANGE 34 : 35 @ 38 : 39
+> CHANGE 22 : 23 @ 23 : 24
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 116 : 117 @ 120 : 138
+> CHANGE 82 : 83 @ 82 : 100
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
-> CHANGE 128 : 129 @ 149 : 150
+> CHANGE 12 : 13 @ 29 : 30
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
-> CHANGE 132 : 133 @ 153 : 154
+> CHANGE 4 : 5 @ 4 : 5
~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
diff --git a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java
index a65d6c53..b0e99196 100644
--- a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 70 : 71 @ 70 : 86
+> CHANGE 67 : 68 @ 67 : 83
~ return true;
-> CHANGE 76 : 77 @ 91 : 92
+> CHANGE 6 : 7 @ 21 : 22
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java
index cbca6fbe..e16b0854 100644
--- a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java
@@ -10,16 +10,16 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 7 @ 8 : 9
+> DELETE 5 @ 6 : 7
-> DELETE 8 @ 10 : 11
+> DELETE 1 @ 2 : 3
-> DELETE 9 @ 12 : 15
+> DELETE 1 @ 2 : 5
-> CHANGE 32 : 33 @ 38 : 39
+> CHANGE 23 : 24 @ 26 : 27
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> DELETE 36 @ 42 : 53
+> DELETE 4 @ 4 : 15
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockDirt.edit.java b/patches/minecraft/net/minecraft/block/BlockDirt.edit.java
index 4908a9a9..d2920556 100644
--- a/patches/minecraft/net/minecraft/block/BlockDirt.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDirt.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 21 : 22 @ 21 : 23
+> CHANGE 18 : 19 @ 18 : 20
~ public static PropertyEnum VARIANT;
-> INSERT 31 : 35 @ 32
+> INSERT 10 : 14 @ 11
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockDirt.DirtType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java
index 829fb080..5840efb5 100644
--- a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java
@@ -10,20 +10,20 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 22 @ 25 : 26
+> DELETE 20 @ 23 : 24
-> DELETE 24 @ 28 : 29
+> DELETE 2 @ 3 : 4
-> CHANGE 34 : 35 @ 39 : 40
+> CHANGE 10 : 11 @ 11 : 12
~ protected EaglercraftRandom rand = new EaglercraftRandom();
-> DELETE 47 @ 52 : 81
+> DELETE 13 @ 13 : 42
-> CHANGE 49 : 50 @ 83 : 98
+> CHANGE 2 : 3 @ 31 : 46
~ return true;
-> DELETE 87 @ 135 : 142
+> DELETE 38 @ 52 : 59
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java
index 743ee418..542506fd 100644
--- a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 29 : 30 @ 29 : 31
+> CHANGE 27 : 28 @ 27 : 29
~ public static PropertyEnum HINGE;
-> CHANGE 31 : 32 @ 32 : 34
+> CHANGE 2 : 3 @ 3 : 5
~ public static PropertyEnum HALF;
-> INSERT 40 : 45 @ 42
+> INSERT 9 : 14 @ 10
+ public static void bootstrapStates() {
+ HINGE = PropertyEnum.create("hinge", BlockDoor.EnumHingePosition.class);
@@ -26,11 +26,11 @@
+ }
+
-> CHANGE 180 : 181 @ 177 : 182
+> CHANGE 140 : 141 @ 135 : 140
~ if (!flag1) {
-> CHANGE 196 : 197 @ 197 : 198
+> CHANGE 16 : 17 @ 20 : 21
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java
index aacdd19b..e48f59a3 100644
--- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java
@@ -10,14 +10,14 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 17 @ 21 : 23
+> DELETE 14 @ 18 : 20
-> CHANGE 25 : 27 @ 31 : 35
+> CHANGE 8 : 10 @ 10 : 14
~ public static PropertyEnum VARIANT;
~ public static PropertyEnum HALF;
-> INSERT 40 : 45 @ 48
+> INSERT 15 : 20 @ 17
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockDoublePlant.EnumPlantType.class);
@@ -25,21 +25,21 @@
+ }
+
-> CHANGE 105 : 106 @ 108 : 109
+> CHANGE 65 : 66 @ 60 : 61
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int var3) {
-> DELETE 145 @ 148 : 158
+> DELETE 40 @ 40 : 50
-> DELETE 155 @ 168 : 176
+> DELETE 10 @ 20 : 28
-> DELETE 169 @ 190 : 206
+> DELETE 14 @ 22 : 38
-> CHANGE 186 : 187 @ 223 : 224
+> CHANGE 17 : 18 @ 33 : 34
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
-> CHANGE 190 : 191 @ 227 : 228
+> CHANGE 4 : 5 @ 4 : 5
~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java
index 92baa024..132ce57b 100644
--- a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 30 : 31 @ 31 : 32
+> CHANGE 28 : 29 @ 29 : 30
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
-> CHANGE 75 : 88 @ 76 : 94
+> CHANGE 45 : 58 @ 45 : 63
~ for (int j = 0; j < 128; ++j) {
~ double d0 = worldIn.rand.nextDouble();
@@ -30,6 +30,6 @@
~ worldIn.spawnParticle(EnumParticleTypes.PORTAL, d1, d2, d3, (double) f, (double) f1,
~ (double) f2, new int[0]);
-> DELETE 89 @ 95 : 96
+> DELETE 14 @ 19 : 20
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java
index 57319894..87c1a029 100644
--- a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java
@@ -9,15 +9,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
-> CHANGE 5 : 6 @ 5 : 8
+> CHANGE 2 : 3 @ 2 : 5
~
-> CHANGE 26 : 27 @ 28 : 29
+> CHANGE 21 : 22 @ 23 : 24
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 102 : 103 @ 104 : 105
+> CHANGE 76 : 77 @ 76 : 77
~ Set set = this.getPossibleFlowDirections(world, blockpos);
diff --git a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java
index 7e733a74..1368deb8 100644
--- a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 31 : 32 @ 31 : 32
+> CHANGE 29 : 30 @ 29 : 30
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 75 : 76 @ 75 : 85
+> CHANGE 44 : 45 @ 44 : 54
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java
index 223e804f..29754f74 100644
--- a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 50 : 51 @ 50 : 51
+> CHANGE 47 : 48 @ 47 : 48
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 54 : 55 @ 54 : 62
+> CHANGE 4 : 5 @ 4 : 12
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java b/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java
index e3f91dcb..cc8267eb 100644
--- a/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 50 : 51 @ 50 : 51
+> CHANGE 47 : 48 @ 47 : 48
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java
index 952e2606..5592de7c 100644
--- a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java
@@ -10,23 +10,23 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 13 @ 13 : 14
+> DELETE 11 @ 11 : 12
-> DELETE 15 @ 16 : 17
+> DELETE 2 @ 3 : 4
-> CHANGE 44 : 45 @ 46 : 47
+> CHANGE 29 : 30 @ 30 : 31
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 48 : 49 @ 50 : 51
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 69 : 70 @ 71 : 87
+> CHANGE 21 : 22 @ 21 : 37
~ return true;
-> CHANGE 76 : 77 @ 93 : 94
+> CHANGE 7 : 8 @ 22 : 23
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java
index 6bd53a92..8b278d2c 100644
--- a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java
@@ -7,6 +7,6 @@
> DELETE 2 @ 2 : 4
-> DELETE 30 @ 32 : 66
+> DELETE 28 @ 30 : 64
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java
index 3643a315..a216ede3 100644
--- a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 11 @ 14 : 15
+> DELETE 9 @ 12 : 13
-> CHANGE 43 : 44 @ 47 : 48
+> CHANGE 32 : 33 @ 33 : 34
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
-> DELETE 59 @ 63 : 71
+> DELETE 16 @ 16 : 24
-> CHANGE 102 : 103 @ 114 : 115
+> CHANGE 43 : 44 @ 51 : 52
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
diff --git a/patches/minecraft/net/minecraft/block/BlockFence.edit.java b/patches/minecraft/net/minecraft/block/BlockFence.edit.java
index 920665d4..ba399cec 100644
--- a/patches/minecraft/net/minecraft/block/BlockFence.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFence.edit.java
@@ -9,9 +9,9 @@
~
-> DELETE 14 @ 15 : 16
+> DELETE 11 @ 12 : 13
-> CHANGE 144 : 145 @ 146 : 147
+> CHANGE 130 : 131 @ 131 : 132
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java
index b50e7e9b..4f183c2f 100644
--- a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java
@@ -7,6 +7,6 @@
> DELETE 2 @ 2 : 5
-> DELETE 114 @ 117 : 139
+> DELETE 112 @ 115 : 137
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockFire.edit.java b/patches/minecraft/net/minecraft/block/BlockFire.edit.java
index 09525940..64703d9b 100644
--- a/patches/minecraft/net/minecraft/block/BlockFire.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFire.edit.java
@@ -7,26 +7,26 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 7 @ 4 : 7
+> CHANGE 1 : 5 @ 2 : 5
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
~ import com.google.common.collect.Maps;
~
-> CHANGE 125 : 126 @ 125 : 126
+> CHANGE 122 : 123 @ 121 : 122
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 133 : 134 @ 133 : 134
+> CHANGE 8 : 9 @ 8 : 9
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 240 : 241 @ 240 : 241
+> CHANGE 107 : 108 @ 107 : 108
~ private void catchOnFire(World worldIn, BlockPos pos, int chance, EaglercraftRandom random, int age) {
-> CHANGE 318 : 319 @ 318 : 319
+> CHANGE 78 : 79 @ 78 : 79
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockFlower.edit.java b/patches/minecraft/net/minecraft/block/BlockFlower.edit.java
index 3c6e51cf..740a6997 100644
--- a/patches/minecraft/net/minecraft/block/BlockFlower.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFlower.edit.java
@@ -11,7 +11,7 @@
+ import java.util.List;
+
-> CHANGE 8 : 9 @ 5 : 9
+> CHANGE 6 : 7 @ 3 : 7
~
diff --git a/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java b/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java
index ca31383a..d5dc8a7a 100644
--- a/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java
@@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 29 : 30 @ 33 : 35
+> CHANGE 27 : 28 @ 31 : 33
~ public static PropertyEnum CONTENTS;
-> INSERT 38 : 42 @ 43
+> INSERT 9 : 13 @ 10
+ public static void bootstrapStates() {
+ CONTENTS = PropertyEnum.create("contents", BlockFlowerPot.EnumFlowerType.class);
+ }
+
-> CHANGE 166 : 167 @ 167 : 168
+> CHANGE 128 : 129 @ 124 : 125
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java
index 694bbd43..2e7aa168 100644
--- a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java
@@ -10,17 +10,17 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 16 @ 17 : 18
+> DELETE 14 @ 15 : 16
-> CHANGE 34 : 35 @ 36 : 37
+> CHANGE 18 : 19 @ 19 : 20
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 38 : 39 @ 40 : 66
+> CHANGE 4 : 5 @ 4 : 30
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 69 : 70 @ 96 : 107
+> CHANGE 31 : 32 @ 56 : 67
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/BlockGlass.edit.java b/patches/minecraft/net/minecraft/block/BlockGlass.edit.java
index 137bfa98..3adbdd2a 100644
--- a/patches/minecraft/net/minecraft/block/BlockGlass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGlass.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 14 : 15 @ 14 : 15
+> CHANGE 12 : 13 @ 12 : 13
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java b/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java
index 2d571f86..a9be182a 100644
--- a/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 18 : 19 @ 18 : 19
+> CHANGE 16 : 17 @ 16 : 17
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
-> CHANGE 22 : 23 @ 22 : 23
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 26 : 27 @ 26 : 27
+> CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java
index e35e5498..651c0164 100644
--- a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 46 : 47 @ 50 : 75
+> CHANGE 44 : 45 @ 48 : 73
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
-> CHANGE 55 : 56 @ 83 : 84
+> CHANGE 9 : 10 @ 33 : 34
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
-> CHANGE 59 : 60 @ 87 : 88
+> CHANGE 4 : 5 @ 4 : 5
~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockGravel.edit.java b/patches/minecraft/net/minecraft/block/BlockGravel.edit.java
index 2d602401..567af292 100644
--- a/patches/minecraft/net/minecraft/block/BlockGravel.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockGravel.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 10 : 11 @ 10 : 11
+> CHANGE 8 : 9 @ 8 : 9
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
diff --git a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java
index b18abd9c..846620f9 100644
--- a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 6
+> CHANGE 1 : 4 @ 2 : 4
~
~ import com.google.common.base.Predicate;
~
-> DELETE 20 @ 20 : 21
+> DELETE 17 @ 16 : 17
-> CHANGE 97 : 98 @ 98 : 109
+> CHANGE 77 : 78 @ 78 : 89
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java
index c203d836..46960bdb 100644
--- a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 18 : 19 @ 18 : 20
+> CHANGE 16 : 17 @ 16 : 18
~ public static PropertyEnum VARIANT;
-> CHANGE 28 : 33 @ 29 : 30
+> CHANGE 10 : 15 @ 11 : 12
~ public static void bootstrapStates() {
~ VARIANT = PropertyEnum.create("variant", BlockHugeMushroom.EnumType.class);
@@ -22,7 +22,7 @@
~
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 49 : 50 @ 46 : 47
+> CHANGE 21 : 22 @ 17 : 18
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockIce.edit.java b/patches/minecraft/net/minecraft/block/BlockIce.edit.java
index a30fb186..1e462c43 100644
--- a/patches/minecraft/net/minecraft/block/BlockIce.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockIce.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 55 : 56 @ 56 : 57
+> CHANGE 53 : 54 @ 54 : 55
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 59 : 60 @ 60 : 61
+> CHANGE 4 : 5 @ 4 : 5
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java
index a18a5c33..10cdafb6 100644
--- a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 3
-> DELETE 9 @ 10 : 11
+> DELETE 7 @ 8 : 9
-> DELETE 31 @ 33 : 34
+> DELETE 22 @ 23 : 24
-> DELETE 40 @ 43 : 52
+> DELETE 9 @ 10 : 19
-> DELETE 41 @ 53 : 75
+> DELETE 1 @ 10 : 32
-> DELETE 43 @ 77 : 88
+> DELETE 2 @ 24 : 35
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java
index 2e56bae3..fa3a6d50 100644
--- a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java
@@ -10,20 +10,20 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 10 @ 12 : 13
+> DELETE 8 @ 10 : 11
-> CHANGE 70 : 71 @ 73 : 158
+> CHANGE 60 : 61 @ 61 : 146
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
-> CHANGE 86 : 87 @ 173 : 174
+> CHANGE 16 : 17 @ 100 : 101
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 90 : 91 @ 177 : 178
+> CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> DELETE 94 @ 181 : 209
+> DELETE 4 @ 4 : 32
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockLever.edit.java b/patches/minecraft/net/minecraft/block/BlockLever.edit.java
index fcb9667f..beba351a 100644
--- a/patches/minecraft/net/minecraft/block/BlockLever.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLever.edit.java
@@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 4
-> CHANGE 19 : 20 @ 21 : 23
+> CHANGE 17 : 18 @ 19 : 21
~ public static PropertyEnum FACING;
-> INSERT 29 : 33 @ 32
+> INSERT 10 : 14 @ 11
+ public static void bootstrapStates() {
+ FACING = PropertyEnum.create("facing", BlockLever.EnumOrientation.class);
+ }
+
-> CHANGE 154 : 155 @ 153 : 166
+> CHANGE 125 : 126 @ 121 : 134
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java
index 5d557298..25f1514e 100644
--- a/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 108 : 109 @ 110 : 111
+> CHANGE 106 : 107 @ 108 : 109
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 112 : 113 @ 114 : 115
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 177 : 178 @ 179 : 180
+> CHANGE 65 : 66 @ 65 : 66
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockLog.edit.java b/patches/minecraft/net/minecraft/block/BlockLog.edit.java
index 0d793cb3..bef44466 100644
--- a/patches/minecraft/net/minecraft/block/BlockLog.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockLog.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 4
-> CHANGE 13 : 14 @ 15 : 17
+> CHANGE 11 : 12 @ 13 : 15
~ public static PropertyEnum LOG_AXIS = null;
-> INSERT 22 : 26 @ 25
+> INSERT 9 : 13 @ 10
+ public static void bootstrapStates() {
+ LOG_AXIS = PropertyEnum.create("axis", BlockLog.EnumAxis.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockMelon.edit.java b/patches/minecraft/net/minecraft/block/BlockMelon.edit.java
index bb36a535..460dcf45 100644
--- a/patches/minecraft/net/minecraft/block/BlockMelon.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMelon.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 17 : 18 @ 17 : 18
+> CHANGE 15 : 16 @ 15 : 16
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 21 : 22 @ 21 : 22
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 25 : 26 @ 25 : 26
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java b/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java
index 9fecf57e..3d6984e5 100644
--- a/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 22 : 23 @ 22 : 23
+> CHANGE 20 : 21 @ 20 : 21
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 26 : 27 @ 26 : 27
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java
index 776b7259..71c3cdd5 100644
--- a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java
@@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 8 @ 11 : 12
+> DELETE 6 @ 9 : 10
-> CHANGE 16 : 17 @ 20 : 21
+> CHANGE 8 : 9 @ 9 : 10
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
-> DELETE 69 @ 73 : 90
+> DELETE 53 @ 53 : 70
-> CHANGE 73 : 74 @ 94 : 95
+> CHANGE 4 : 5 @ 21 : 22
~ public boolean canUseBonemeal(World var1, EaglercraftRandom random, BlockPos var3, IBlockState var4) {
-> DELETE 76 @ 97 : 101
+> DELETE 3 @ 3 : 7
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java
index 0edf3d67..cde3062e 100644
--- a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 33 : 34 @ 34 : 60
+> CHANGE 31 : 32 @ 32 : 58
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 43 : 44 @ 69 : 70
+> CHANGE 10 : 11 @ 35 : 36
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
diff --git a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java
index 50c070bf..55e42b37 100644
--- a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java
@@ -10,17 +10,17 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 14 @ 15 : 16
+> DELETE 12 @ 13 : 14
-> CHANGE 37 : 38 @ 39 : 40
+> CHANGE 23 : 24 @ 24 : 25
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 47 : 48 @ 49 : 67
+> CHANGE 10 : 11 @ 10 : 28
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 51 : 52 @ 70 : 71
+> CHANGE 4 : 5 @ 21 : 22
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java
index a11428fc..411a63e1 100644
--- a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java
@@ -7,21 +7,21 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 7
+> CHANGE 1 : 4 @ 2 : 5
~
~ import com.google.common.base.Predicate;
~
-> DELETE 11 @ 12 : 13
+> DELETE 8 @ 8 : 9
-> DELETE 14 @ 16 : 18
+> DELETE 3 @ 4 : 6
-> CHANGE 18 : 19 @ 22 : 28
+> CHANGE 4 : 5 @ 6 : 12
~ public static PropertyEnum VARIANT;
-> INSERT 25 : 33 @ 34
+> INSERT 7 : 15 @ 12
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
@@ -32,6 +32,6 @@
+ }
+
-> DELETE 87 @ 88 : 99
+> DELETE 62 @ 54 : 65
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java b/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java
index b2c937fe..f1201ef8 100644
--- a/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java
@@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 6
+> CHANGE 1 : 4 @ 2 : 4
~
~ import com.google.common.base.Predicate;
~
-> CHANGE 16 : 17 @ 16 : 22
+> CHANGE 13 : 14 @ 12 : 18
~ public static PropertyEnum VARIANT;
-> INSERT 23 : 31 @ 28
+> INSERT 7 : 15 @ 12
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
diff --git a/patches/minecraft/net/minecraft/block/BlockNote.edit.java b/patches/minecraft/net/minecraft/block/BlockNote.edit.java
index 5078acad..7bae349d 100644
--- a/patches/minecraft/net/minecraft/block/BlockNote.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockNote.edit.java
@@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 6
+> CHANGE 1 : 4 @ 2 : 4
~
~ import com.google.common.collect.Lists;
~
-> DELETE 10 @ 10 : 11
+> DELETE 7 @ 6 : 7
-> CHANGE 44 : 45 @ 45 : 58
+> CHANGE 34 : 35 @ 35 : 48
~ return true;
-> DELETE 47 @ 60 : 71
+> DELETE 3 @ 15 : 26
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java b/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java
index fa045e02..aeae9c92 100644
--- a/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 17 : 18 @ 17 : 18
+> CHANGE 15 : 16 @ 15 : 16
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java
index 017e4380..c22cbc76 100644
--- a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java
@@ -7,21 +7,21 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 7
+> CHANGE 1 : 4 @ 2 : 5
~
~ import com.google.common.base.Predicate;
~
-> DELETE 11 @ 12 : 13
+> DELETE 8 @ 8 : 9
-> DELETE 14 @ 16 : 18
+> DELETE 3 @ 4 : 6
-> CHANGE 20 : 21 @ 24 : 30
+> CHANGE 6 : 7 @ 8 : 14
~ public static PropertyEnum VARIANT;
-> INSERT 27 : 35 @ 36
+> INSERT 7 : 15 @ 12
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
@@ -32,6 +32,6 @@
+ }
+
-> DELETE 118 @ 119 : 130
+> DELETE 91 @ 83 : 94
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java b/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java
index 273fff36..1cabd014 100644
--- a/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java
@@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 6
+> CHANGE 1 : 4 @ 2 : 4
~
~ import com.google.common.base.Predicate;
~
-> CHANGE 16 : 17 @ 16 : 22
+> CHANGE 13 : 14 @ 12 : 18
~ public static PropertyEnum VARIANT;
-> INSERT 23 : 31 @ 28
+> INSERT 7 : 15 @ 12
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() {
diff --git a/patches/minecraft/net/minecraft/block/BlockOre.edit.java b/patches/minecraft/net/minecraft/block/BlockOre.edit.java
index cdcef537..015a5e0b 100644
--- a/patches/minecraft/net/minecraft/block/BlockOre.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockOre.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 26 : 27 @ 26 : 27
+> CHANGE 24 : 25 @ 24 : 25
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 34 : 35 @ 34 : 35
+> CHANGE 8 : 9 @ 8 : 9
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 38 : 39 @ 38 : 39
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java b/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java
index 137bfa98..3adbdd2a 100644
--- a/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 14 : 15 @ 14 : 15
+> CHANGE 12 : 13 @ 12 : 13
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockPane.edit.java b/patches/minecraft/net/minecraft/block/BlockPane.edit.java
index 68becace..b00159d4 100644
--- a/patches/minecraft/net/minecraft/block/BlockPane.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPane.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 52 : 53 @ 52 : 53
+> CHANGE 49 : 50 @ 49 : 50
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int i) {
diff --git a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java
index e2f61d69..fb148b6a 100644
--- a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java
@@ -9,10 +9,10 @@
~
-> DELETE 48 @ 51 : 55
+> DELETE 45 @ 48 : 52
-> DELETE 50 @ 57 : 71
+> DELETE 2 @ 6 : 20
-> DELETE 95 @ 116 : 128
+> DELETE 45 @ 59 : 71
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java
index 662962c7..7a9f2a3c 100644
--- a/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 25 : 26 @ 26 : 28
+> CHANGE 22 : 23 @ 23 : 25
~ public static PropertyEnum TYPE;
-> INSERT 37 : 42 @ 39
+> INSERT 12 : 17 @ 13
+ public static void bootstrapStates() {
+ TYPE = PropertyEnum.create("type",
@@ -22,7 +22,7 @@
+ }
+
-> CHANGE 86 : 87 @ 83 : 84
+> CHANGE 49 : 50 @ 44 : 45
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java
index e93df637..d2676519 100644
--- a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java
@@ -10,25 +10,25 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 10 @ 13 : 14
+> DELETE 8 @ 11 : 12
-> CHANGE 24 : 25 @ 28 : 29
+> CHANGE 14 : 15 @ 15 : 16
~ public static PropertyEnum TYPE;
-> INSERT 33 : 37 @ 37
+> INSERT 9 : 13 @ 9
+ public static void bootstrapStates() {
+ TYPE = BlockPistonExtension.TYPE;
+ }
+
-> CHANGE 82 : 83 @ 82 : 93
+> CHANGE 49 : 50 @ 45 : 56
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> DELETE 86 @ 96 : 106
+> DELETE 4 @ 14 : 24
-> DELETE 90 @ 110 : 117
+> DELETE 4 @ 14 : 21
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java b/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java
index 6bb70258..8f170146 100644
--- a/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 16 : 17 @ 16 : 18
+> CHANGE 13 : 14 @ 13 : 15
~ public static PropertyEnum VARIANT;
-> INSERT 24 : 28 @ 25
+> INSERT 8 : 12 @ 9
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockPortal.edit.java b/patches/minecraft/net/minecraft/block/BlockPortal.edit.java
index c56e86f2..3526137d 100644
--- a/patches/minecraft/net/minecraft/block/BlockPortal.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPortal.edit.java
@@ -11,19 +11,19 @@
~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache;
~
-> CHANGE 34 : 35 @ 35 : 36
+> CHANGE 32 : 33 @ 33 : 34
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 154 : 155 @ 155 : 156
+> CHANGE 120 : 121 @ 120 : 121
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 169 : 170 @ 170 : 171
+> CHANGE 15 : 16 @ 15 : 16
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
-> CHANGE 216 : 217 @ 217 : 218
+> CHANGE 47 : 48 @ 47 : 48
~ EaglerLoadingCache loadingcache = BlockPattern.func_181627_a(parWorld, true);
diff --git a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java
index 426efca4..6456a174 100644
--- a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java
@@ -7,8 +7,8 @@
> DELETE 2 @ 2 : 4
-> DELETE 4 @ 6 : 9
+> DELETE 2 @ 4 : 7
-> DELETE 14 @ 19 : 28
+> DELETE 10 @ 13 : 22
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java b/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java
index f42f38fb..86cdde9e 100644
--- a/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java
@@ -9,7 +9,7 @@
~
-> CHANGE 35 : 36 @ 35 : 36
+> CHANGE 32 : 33 @ 32 : 33
~ List list;
diff --git a/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java b/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java
index 3c29b6cd..fc062b8b 100644
--- a/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 17 : 18 @ 17 : 19
+> CHANGE 14 : 15 @ 14 : 16
~ public static PropertyEnum VARIANT;
-> INSERT 28 : 32 @ 29
+> INSERT 11 : 15 @ 12
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPrismarine.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java b/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java
index 7c156963..b955e431 100644
--- a/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 20 : 21 @ 20 : 22
+> CHANGE 17 : 18 @ 17 : 19
~ public static PropertyEnum VARIANT;
-> INSERT 28 : 32 @ 29
+> INSERT 8 : 12 @ 9
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockQuartz.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockRail.edit.java b/patches/minecraft/net/minecraft/block/BlockRail.edit.java
index 20e7a489..c23a2ba6 100644
--- a/patches/minecraft/net/minecraft/block/BlockRail.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRail.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 4
-> CHANGE 10 : 11 @ 12 : 14
+> CHANGE 8 : 9 @ 10 : 12
~ public static PropertyEnum SHAPE;
-> INSERT 18 : 22 @ 21
+> INSERT 8 : 12 @ 9
+ public static void bootstrapStates() {
+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java
index d1b1cecd..c4a3de07 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 5
+> CHANGE 1 : 4 @ 2 : 3
~
~ import com.google.common.collect.Lists;
~
-> DELETE 75 @ 74 : 117
+> DELETE 72 @ 70 : 113
-> CHANGE 80 : 81 @ 122 : 125
+> CHANGE 5 : 6 @ 48 : 51
~ return parIBlockState;
diff --git a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java
index df5c1e08..fc0d6af7 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java
@@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 6
+> CHANGE 1 : 4 @ 2 : 4
~
~ import com.google.common.base.Predicate;
~
-> CHANGE 24 : 25 @ 24 : 33
+> CHANGE 21 : 22 @ 20 : 29
~ public static PropertyEnum SHAPE;
-> INSERT 34 : 46 @ 42
+> INSERT 10 : 22 @ 18
+ public static void bootstrapStates() {
+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class,
@@ -32,6 +32,6 @@
+ }
+
-> DELETE 54 @ 50 : 67
+> DELETE 20 @ 8 : 25
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java b/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java
index 8fc3b2c0..adf50864 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 13 : 14 @ 14 : 23
+> CHANGE 10 : 11 @ 11 : 20
~ public static PropertyEnum SHAPE;
-> INSERT 23 : 35 @ 32
+> INSERT 10 : 22 @ 18
+ public static void bootstrapStates() {
+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class,
diff --git a/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java b/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java
index 1d0c8fdb..c3e285aa 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 15 : 16 @ 16 : 18
+> CHANGE 12 : 13 @ 13 : 15
~ public static PropertyEnum TYPE;
-> INSERT 23 : 27 @ 25
+> INSERT 8 : 12 @ 9
+ public static void bootstrapStates() {
+ TYPE = PropertyEnum.create("type", BlockRedSandstone.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java
index e69862e8..e4b4d30b 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java
@@ -7,29 +7,29 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 7 @ 4 : 8
+> CHANGE 1 : 5 @ 2 : 6
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
~ import com.google.common.base.Predicate;
~
-> CHANGE 32 : 33 @ 33 : 35
+> CHANGE 29 : 30 @ 29 : 31
~ public static PropertyEnum MODE;
-> INSERT 42 : 46 @ 44
+> INSERT 10 : 14 @ 11
+ public static void bootstrapStates() {
+ MODE = PropertyEnum.create("mode", BlockRedstoneComparator.Mode.class);
+ }
+
-> CHANGE 50 : 51 @ 48 : 49
+> CHANGE 8 : 9 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 199 : 200 @ 197 : 198
+> CHANGE 149 : 150 @ 149 : 150
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java
index 7f8fb38b..3f95c5e9 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 37 : 38 @ 39 : 40
+> CHANGE 35 : 36 @ 37 : 38
~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
-> CHANGE 40 : 41 @ 42 : 43
+> CHANGE 3 : 4 @ 3 : 4
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java
index 5c78ba05..036d7804 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 24 : 25 @ 24 : 56
+> CHANGE 22 : 23 @ 22 : 54
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java
index e3da69ef..2a631eb5 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java
@@ -10,27 +10,27 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 57 : 58 @ 57 : 58
+> CHANGE 55 : 56 @ 55 : 56
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
-> CHANGE 64 : 65 @ 64 : 65
+> CHANGE 7 : 8 @ 7 : 8
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 68 : 69 @ 68 : 69
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
-> CHANGE 72 : 73 @ 72 : 73
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 85 : 86 @ 85 : 86
+> CHANGE 13 : 14 @ 13 : 14
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
-> CHANGE 93 : 94 @ 93 : 94
+> CHANGE 8 : 9 @ 8 : 9
~ EaglercraftRandom random = worldIn.rand;
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java
index 22f50a68..ec268414 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 68 : 69 @ 69 : 70
+> CHANGE 66 : 67 @ 67 : 68
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 84 : 85 @ 85 : 86
+> CHANGE 16 : 17 @ 16 : 17
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java
index c73497eb..cd8c5756 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 4 : 9 @ 6 : 9
+> CHANGE 2 : 7 @ 4 : 7
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
@@ -15,19 +15,19 @@
~ import com.google.common.collect.Maps;
~
-> CHANGE 85 : 86 @ 85 : 86
+> CHANGE 81 : 82 @ 79 : 80
~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
-> CHANGE 88 : 89 @ 88 : 89
+> CHANGE 3 : 4 @ 3 : 4
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 137 : 138 @ 137 : 138
+> CHANGE 49 : 50 @ 49 : 50
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 145 : 146 @ 145 : 146
+> CHANGE 8 : 9 @ 8 : 9
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java
index c37582d0..fc221c4a 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java
@@ -7,25 +7,25 @@
> DELETE 2 @ 2 : 4
-> CHANGE 4 : 5 @ 6 : 7
+> CHANGE 2 : 3 @ 4 : 5
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
-> CHANGE 6 : 10 @ 8 : 11
+> CHANGE 2 : 6 @ 2 : 5
~
~ import com.google.common.collect.Lists;
~ import com.google.common.collect.Sets;
~
-> CHANGE 30 : 34 @ 31 : 39
+> CHANGE 24 : 28 @ 23 : 31
~ public static PropertyEnum NORTH;
~ public static PropertyEnum EAST;
~ public static PropertyEnum SOUTH;
~ public static PropertyEnum WEST;
-> INSERT 48 : 59 @ 53
+> INSERT 18 : 29 @ 22
+ public static void bootstrapStates() {
+ NORTH = PropertyEnum.create("north",
@@ -39,17 +39,17 @@
+ }
+
-> CHANGE 108 : 109 @ 102 : 103
+> CHANGE 60 : 61 @ 49 : 50
~ ArrayList arraylist = Lists.newArrayList(this.blocksNeedingUpdate);
-> DELETE 189 @ 183 : 232
+> DELETE 81 @ 81 : 130
-> CHANGE 198 : 199 @ 241 : 254
+> CHANGE 9 : 10 @ 58 : 71
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 298 : 299 @ 353 : 354
+> CHANGE 100 : 101 @ 112 : 113
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockReed.edit.java b/patches/minecraft/net/minecraft/block/BlockReed.edit.java
index 81bd73c3..97bcedd8 100644
--- a/patches/minecraft/net/minecraft/block/BlockReed.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockReed.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 30 : 31 @ 30 : 31
+> CHANGE 28 : 29 @ 28 : 29
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
-> CHANGE 93 : 94 @ 93 : 94
+> CHANGE 63 : 64 @ 63 : 64
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockSand.edit.java b/patches/minecraft/net/minecraft/block/BlockSand.edit.java
index 82e623dc..9d6d56c7 100644
--- a/patches/minecraft/net/minecraft/block/BlockSand.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSand.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 15 : 16 @ 15 : 17
+> CHANGE 12 : 13 @ 12 : 14
~ public static PropertyEnum VARIANT;
-> INSERT 21 : 25 @ 22
+> INSERT 6 : 10 @ 7
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockSand.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java b/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java
index 1ff828ab..1ed2c6f4 100644
--- a/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 16 : 17 @ 16 : 18
+> CHANGE 13 : 14 @ 13 : 15
~ public static PropertyEnum TYPE;
-> INSERT 24 : 28 @ 25
+> INSERT 8 : 12 @ 9
+ public static void bootstrapStates() {
+ TYPE = PropertyEnum.create("type", BlockSandStone.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java
index 6f94f41d..e8ef63e8 100644
--- a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java
@@ -10,31 +10,31 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 11 @ 16 : 17
+> DELETE 8 @ 13 : 14
-> DELETE 16 @ 22 : 31
+> DELETE 5 @ 6 : 15
-> CHANGE 18 : 19 @ 33 : 35
+> CHANGE 2 : 3 @ 11 : 13
~ public static PropertyEnum TYPE;
-> INSERT 29 : 33 @ 45
+> INSERT 11 : 15 @ 12
+ public static void bootstrapStates() {
+ TYPE = PropertyEnum.create("type", BlockPlanks.EnumType.class);
+ }
+
-> CHANGE 38 : 39 @ 50 : 58
+> CHANGE 9 : 10 @ 5 : 13
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> DELETE 41 @ 60 : 161
+> DELETE 3 @ 10 : 111
-> CHANGE 69 : 70 @ 189 : 190
+> CHANGE 28 : 29 @ 129 : 130
~ public boolean canUseBonemeal(World world, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
-> DELETE 73 @ 193 : 197
+> DELETE 4 @ 4 : 8
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java b/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java
index d81a3574..b637a753 100644
--- a/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 18 : 19 @ 18 : 19
+> CHANGE 16 : 17 @ 16 : 17
~ public int quantityDropped(EaglercraftRandom random) {
-> CHANGE 22 : 23 @ 22 : 23
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
-> CHANGE 26 : 27 @ 26 : 27
+> CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockSign.edit.java b/patches/minecraft/net/minecraft/block/BlockSign.edit.java
index 0b9e18d2..fd4d52ee 100644
--- a/patches/minecraft/net/minecraft/block/BlockSign.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSign.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 54 : 55 @ 54 : 55
+> CHANGE 52 : 53 @ 52 : 53
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 64 : 65 @ 64 : 71
+> CHANGE 10 : 11 @ 10 : 17
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java
index 3653e544..da3d3d13 100644
--- a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java
@@ -10,13 +10,13 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 11 @ 13 : 14
+> DELETE 8 @ 10 : 11
-> CHANGE 19 : 20 @ 22 : 24
+> CHANGE 8 : 9 @ 9 : 11
~ public static PropertyEnum VARIANT;
-> CHANGE 28 : 33 @ 32 : 33
+> CHANGE 9 : 14 @ 10 : 11
~ public static void bootstrapStates() {
~ VARIANT = PropertyEnum.create("variant", BlockSilverfish.EnumType.class);
@@ -24,6 +24,6 @@
~
~ public int quantityDropped(EaglercraftRandom var1) {
-> DELETE 59 @ 59 : 70
+> DELETE 31 @ 27 : 38
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java
index 48432e11..2a7e08ab 100644
--- a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java
@@ -10,32 +10,32 @@
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+
-> CHANGE 5 : 6 @ 3 : 5
+> CHANGE 3 : 4 @ 1 : 3
~
-> DELETE 17 @ 16 : 17
+> DELETE 12 @ 13 : 14
-> DELETE 22 @ 22 : 25
+> DELETE 5 @ 6 : 9
-> DELETE 27 @ 30 : 31
+> DELETE 5 @ 8 : 9
-> DELETE 28 @ 32 : 33
+> DELETE 1 @ 2 : 3
-> DELETE 122 @ 127 : 139
+> DELETE 94 @ 95 : 107
-> DELETE 123 @ 140 : 146
+> DELETE 1 @ 13 : 19
-> CHANGE 125 : 126 @ 148 : 149
+> CHANGE 2 : 3 @ 8 : 9
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 130 : 131 @ 153 : 155
+> CHANGE 5 : 6 @ 5 : 7
~ return false;
-> DELETE 134 @ 158 : 168
+> DELETE 4 @ 5 : 15
-> DELETE 135 @ 169 : 210
+> DELETE 1 @ 11 : 52
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java
index f89ca53e..18c22f6d 100644
--- a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java
@@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 21 : 22 @ 21 : 23
+> CHANGE 18 : 19 @ 18 : 20
~ public static PropertyEnum HALF;
-> INSERT 34 : 38 @ 35
+> INSERT 13 : 17 @ 14
+ public static void bootstrapStates() {
+ HALF = PropertyEnum.create("half", BlockSlab.EnumBlockHalf.class);
+ }
+
-> CHANGE 86 : 87 @ 83 : 84
+> CHANGE 52 : 53 @ 48 : 49
~ public int quantityDropped(EaglercraftRandom var1) {
diff --git a/patches/minecraft/net/minecraft/block/BlockSnow.edit.java b/patches/minecraft/net/minecraft/block/BlockSnow.edit.java
index 19722256..abf751df 100644
--- a/patches/minecraft/net/minecraft/block/BlockSnow.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSnow.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 100 : 101 @ 100 : 101
+> CHANGE 98 : 99 @ 98 : 99
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 104 : 105 @ 104 : 105
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 108 : 109 @ 108 : 109
+> CHANGE 4 : 5 @ 4 : 5
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java b/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java
index 396e0328..e2c7d755 100644
--- a/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 20 : 21 @ 20 : 21
+> CHANGE 18 : 19 @ 18 : 19
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 24 : 25 @ 24 : 25
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) {
-> CHANGE 28 : 29 @ 28 : 29
+> CHANGE 4 : 5 @ 4 : 5
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockSponge.edit.java b/patches/minecraft/net/minecraft/block/BlockSponge.edit.java
index dfe6d6c2..53c8b6b0 100644
--- a/patches/minecraft/net/minecraft/block/BlockSponge.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockSponge.edit.java
@@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3
-> CHANGE 5 : 9 @ 6 : 8
+> CHANGE 3 : 7 @ 4 : 6
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
~ import com.google.common.collect.Lists;
~
-> CHANGE 61 : 62 @ 60 : 61
+> CHANGE 56 : 57 @ 54 : 55
~ ArrayList arraylist = Lists.newArrayList();
-> CHANGE 111 : 112 @ 110 : 111
+> CHANGE 50 : 51 @ 50 : 51
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java
index 8925d295..1b6df5c2 100644
--- a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java
@@ -10,12 +10,12 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 48 : 49 @ 49 : 50
+> CHANGE 45 : 46 @ 46 : 47
~ public int quantityDropped(EaglercraftRandom var1) {
-> DELETE 65 @ 66 : 69
+> DELETE 17 @ 17 : 20
-> DELETE 69 @ 73 : 76
+> DELETE 4 @ 7 : 10
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java
index 4a6a9cfc..94171ef3 100644
--- a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java
@@ -9,8 +9,8 @@
~
-> DELETE 62 @ 63 : 66
+> DELETE 59 @ 60 : 63
-> DELETE 66 @ 70 : 73
+> DELETE 4 @ 7 : 10
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java
index 5e7f0f0e..5692eedc 100644
--- a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java
@@ -10,12 +10,12 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 30 : 32 @ 30 : 34
+> CHANGE 26 : 28 @ 26 : 30
~ public static PropertyEnum HALF;
~ public static PropertyEnum SHAPE;
-> INSERT 52 : 57 @ 54
+> INSERT 22 : 27 @ 24
+ public static void bootstrapStates() {
+ HALF = PropertyEnum.create("half", BlockStairs.EnumHalf.class);
@@ -23,11 +23,11 @@
+ }
+
-> CHANGE 401 : 402 @ 398 : 399
+> CHANGE 349 : 350 @ 344 : 345
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> CHANGE 462 : 463 @ 459 : 460
+> CHANGE 61 : 62 @ 61 : 62
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java
index ae961cfd..63bcc5a0 100644
--- a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 34 : 35 @ 36 : 37
+> CHANGE 32 : 33 @ 34 : 35
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/block/BlockStem.edit.java b/patches/minecraft/net/minecraft/block/BlockStem.edit.java
index a8217a3b..b7a4a425 100644
--- a/patches/minecraft/net/minecraft/block/BlockStem.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStem.edit.java
@@ -10,27 +10,27 @@
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+
-> CHANGE 5 : 6 @ 3 : 8
+> CHANGE 3 : 4 @ 1 : 6
~
-> DELETE 16 @ 18 : 19
+> DELETE 11 @ 15 : 16
-> CHANGE 58 : 59 @ 61 : 62
+> CHANGE 42 : 43 @ 43 : 44
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
-> DELETE 119 @ 122 : 139
+> DELETE 61 @ 61 : 78
-> CHANGE 124 : 125 @ 144 : 145
+> CHANGE 5 : 6 @ 22 : 23
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 137 : 138 @ 157 : 158
+> CHANGE 13 : 14 @ 13 : 14
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
-> CHANGE 141 : 142 @ 161 : 162
+> CHANGE 4 : 5 @ 4 : 5
~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
diff --git a/patches/minecraft/net/minecraft/block/BlockStone.edit.java b/patches/minecraft/net/minecraft/block/BlockStone.edit.java
index 83b51075..8399c08e 100644
--- a/patches/minecraft/net/minecraft/block/BlockStone.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStone.edit.java
@@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 19 : 20 @ 19 : 21
+> CHANGE 16 : 17 @ 16 : 18
~ public static PropertyEnum VARIANT;
-> INSERT 27 : 31 @ 28
+> INSERT 8 : 12 @ 9
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockStone.EnumType.class);
+ }
+
-> CHANGE 40 : 41 @ 37 : 38
+> CHANGE 13 : 14 @ 9 : 10
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java
index fabad13e..d0aa8ccc 100644
--- a/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 15 : 16 @ 15 : 17
+> CHANGE 12 : 13 @ 12 : 14
~ public static PropertyEnum VARIANT;
-> INSERT 27 : 31 @ 28
+> INSERT 12 : 16 @ 13
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockStoneBrick.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java
index 376382d8..ae447331 100644
--- a/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 22 : 23 @ 22 : 24
+> CHANGE 19 : 20 @ 19 : 21
~ public static PropertyEnum VARIANT;
-> CHANGE 37 : 42 @ 38 : 39
+> CHANGE 15 : 20 @ 16 : 17
~ public static void bootstrapStates() {
~ VARIANT = PropertyEnum.create("variant", BlockStoneSlab.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java
index 9360b675..a8b57bbf 100644
--- a/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java
@@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 23 : 24 @ 24 : 26
+> CHANGE 20 : 21 @ 21 : 23
~ public static PropertyEnum VARIANT;
-> INSERT 38 : 42 @ 40
+> INSERT 15 : 19 @ 16
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockStoneSlabNew.EnumType.class);
+ }
+
-> CHANGE 46 : 47 @ 44 : 45
+> CHANGE 8 : 9 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java
index 8a7ff91f..0bc7f843 100644
--- a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java
@@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3
-> DELETE 8 @ 9 : 10
+> DELETE 6 @ 7 : 8
-> DELETE 9 @ 11 : 12
+> DELETE 1 @ 2 : 3
-> DELETE 10 @ 13 : 14
+> DELETE 1 @ 2 : 3
-> DELETE 43 @ 47 : 57
+> DELETE 33 @ 34 : 44
-> DELETE 48 @ 62 : 69
+> DELETE 5 @ 15 : 22
-> DELETE 49 @ 70 : 71
+> DELETE 1 @ 8 : 9
-> DELETE 71 @ 93 : 108
+> DELETE 22 @ 23 : 38
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java
index e3315681..f4175948 100644
--- a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java
@@ -10,36 +10,36 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 11 @ 14 : 15
+> DELETE 8 @ 11 : 12
-> DELETE 15 @ 19 : 21
+> DELETE 4 @ 5 : 7
-> CHANGE 22 : 23 @ 28 : 30
+> CHANGE 7 : 8 @ 9 : 11
~ public static PropertyEnum TYPE;
-> INSERT 31 : 35 @ 38
+> INSERT 9 : 13 @ 10
+ public static void bootstrapStates() {
+ TYPE = PropertyEnum.create("type", BlockTallGrass.EnumType.class);
+ }
+
-> CHANGE 61 : 62 @ 64 : 65
+> CHANGE 30 : 31 @ 26 : 27
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int var3) {
-> CHANGE 65 : 66 @ 68 : 69
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
-> DELETE 69 @ 72 : 85
+> DELETE 4 @ 4 : 17
-> CHANGE 85 : 86 @ 101 : 102
+> CHANGE 16 : 17 @ 29 : 30
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
-> CHANGE 89 : 90 @ 105 : 106
+> CHANGE 4 : 5 @ 4 : 5
~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {
diff --git a/patches/minecraft/net/minecraft/block/BlockTorch.edit.java b/patches/minecraft/net/minecraft/block/BlockTorch.edit.java
index 56e1cc38..7a0aca1c 100644
--- a/patches/minecraft/net/minecraft/block/BlockTorch.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTorch.edit.java
@@ -10,11 +10,11 @@
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+
-> CHANGE 5 : 6 @ 3 : 6
+> CHANGE 3 : 4 @ 1 : 4
~
-> CHANGE 155 : 156 @ 155 : 156
+> CHANGE 150 : 151 @ 152 : 153
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java
index fcfe3e24..ba5095d6 100644
--- a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java
@@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 5
-> CHANGE 26 : 27 @ 29 : 31
+> CHANGE 24 : 25 @ 27 : 29
~ public static PropertyEnum HALF;
-> INSERT 38 : 42 @ 42
+> INSERT 12 : 16 @ 13
+ public static void bootstrapStates() {
+ HALF = PropertyEnum.create("half", BlockTrapDoor.DoorHalf.class);
+ }
+
-> DELETE 119 @ 119 : 139
+> DELETE 81 @ 77 : 97
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java
index 40b6dbf3..4e9d1dce 100644
--- a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java
@@ -10,14 +10,14 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 9 @ 11 : 13
+> DELETE 7 @ 9 : 11
-> CHANGE 68 : 69 @ 72 : 73
+> CHANGE 59 : 60 @ 61 : 62
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> DELETE 111 @ 115 : 125
+> DELETE 43 @ 43 : 53
-> DELETE 131 @ 145 : 193
+> DELETE 20 @ 30 : 78
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java b/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java
index 5807e628..7a3806aa 100644
--- a/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java
@@ -10,15 +10,15 @@
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+
-> CHANGE 5 : 6 @ 3 : 6
+> CHANGE 3 : 4 @ 1 : 4
~
-> CHANGE 173 : 174 @ 173 : 174
+> CHANGE 168 : 169 @ 170 : 171
~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
-> CHANGE 176 : 177 @ 176 : 177
+> CHANGE 3 : 4 @ 3 : 4
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
diff --git a/patches/minecraft/net/minecraft/block/BlockVine.edit.java b/patches/minecraft/net/minecraft/block/BlockVine.edit.java
index 6e546bf7..7eec21b2 100644
--- a/patches/minecraft/net/minecraft/block/BlockVine.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockVine.edit.java
@@ -10,20 +10,20 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 11 @ 11 : 14
+> DELETE 9 @ 9 : 12
-> DELETE 12 @ 15 : 18
+> DELETE 1 @ 4 : 7
-> DELETE 179 @ 185 : 319
+> DELETE 167 @ 170 : 304
-> CHANGE 189 : 190 @ 329 : 330
+> CHANGE 10 : 11 @ 144 : 145
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
-> CHANGE 193 : 194 @ 333 : 334
+> CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) {
-> DELETE 197 @ 337 : 349
+> DELETE 4 @ 4 : 16
> EOF
diff --git a/patches/minecraft/net/minecraft/block/BlockWall.edit.java b/patches/minecraft/net/minecraft/block/BlockWall.edit.java
index 26d9ba6e..a669a43d 100644
--- a/patches/minecraft/net/minecraft/block/BlockWall.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWall.edit.java
@@ -9,11 +9,11 @@
~
-> CHANGE 28 : 29 @ 29 : 31
+> CHANGE 25 : 26 @ 26 : 28
~ public static PropertyEnum VARIANT;
-> INSERT 42 : 46 @ 44
+> INSERT 14 : 18 @ 15
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockWall.EnumType.class);
diff --git a/patches/minecraft/net/minecraft/block/BlockWeb.edit.java b/patches/minecraft/net/minecraft/block/BlockWeb.edit.java
index 27107837..3f51b28c 100644
--- a/patches/minecraft/net/minecraft/block/BlockWeb.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWeb.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 37 : 38 @ 37 : 38
+> CHANGE 35 : 36 @ 35 : 36
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java
index e9953c1d..be0b23db 100644
--- a/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java
@@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 19 : 20 @ 20 : 22
+> CHANGE 16 : 17 @ 17 : 19
~ public static PropertyEnum VARIANT;
-> INSERT 32 : 36 @ 34
+> INSERT 13 : 17 @ 14
+ public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class);
+ }
+
-> CHANGE 40 : 41 @ 38 : 39
+> CHANGE 8 : 9 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
diff --git a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java
index ccdba35d..193d61a2 100644
--- a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java
+++ b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
-> DELETE 10 @ 11 : 12
+> DELETE 8 @ 9 : 10
-> CHANGE 25 : 26 @ 27 : 34
+> CHANGE 15 : 16 @ 16 : 23
~ return true;
diff --git a/patches/minecraft/net/minecraft/block/IGrowable.edit.java b/patches/minecraft/net/minecraft/block/IGrowable.edit.java
index eb404ec8..783f6896 100644
--- a/patches/minecraft/net/minecraft/block/IGrowable.edit.java
+++ b/patches/minecraft/net/minecraft/block/IGrowable.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 11 : 12 @ 10 : 13
+> CHANGE 9 : 10 @ 8 : 11
~ boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4);
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java
index b75b366d..ed47feb7 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 5
+> DELETE 1 @ 2 : 3
-> INSERT 4 : 6 @ 6
+> INSERT 1 : 3 @ 2
+ import com.google.common.collect.ImmutableSet;
+
-> CHANGE 21 : 23 @ 21 : 23
+> CHANGE 17 : 19 @ 15 : 17
~ public String getName(Object value) {
~ return ((Boolean) value).toString();
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java
index 66a48de9..0816247b 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java
@@ -10,7 +10,7 @@
+ import java.util.Collection;
+
-> CHANGE 8 : 9 @ 6 : 8
+> CHANGE 6 : 7 @ 4 : 6
~
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java
index 02ca5d64..7243d355 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java
@@ -11,15 +11,15 @@
+ import java.util.Map;
+
-> CHANGE 11 : 12 @ 8 : 11
+> CHANGE 9 : 10 @ 6 : 9
~
-> CHANGE 22 : 23 @ 21 : 22
+> CHANGE 11 : 12 @ 13 : 14
~ for (T oenum : allowedValues) {
-> CHANGE 37 : 38 @ 36 : 37
+> CHANGE 15 : 16 @ 15 : 16
~ public String getName(Object oenum) {
diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java
index 7eda9efa..3b801560 100644
--- a/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java
+++ b/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 4
-> DELETE 4 @ 6 : 7
+> DELETE 2 @ 4 : 5
-> INSERT 5 : 8 @ 8
+> INSERT 1 : 4 @ 2
+ import com.google.common.collect.ImmutableSet;
+ import com.google.common.collect.Sets;
+
-> CHANGE 57 : 58 @ 57 : 58
+> CHANGE 52 : 53 @ 49 : 50
~ public String getName(Object integer) {
diff --git a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java
index 87f357f4..ee5b2dc8 100644
--- a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/block/state/BlockState.edit.java b/patches/minecraft/net/minecraft/block/state/BlockState.edit.java
index c4f3e7f0..771423ea 100644
--- a/patches/minecraft/net/minecraft/block/state/BlockState.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/BlockState.edit.java
@@ -18,21 +18,21 @@
+ import java.util.Map;
+
-> CHANGE 22 : 23 @ 12 : 21
+> CHANGE 20 : 21 @ 10 : 19
~
-> DELETE 25 @ 23 : 25
+> DELETE 3 @ 11 : 13
-> CHANGE 48 : 49 @ 48 : 49
+> CHANGE 23 : 24 @ 25 : 26
~ ArrayList arraylist = Lists.newArrayList();
-> CHANGE 156 : 157 @ 156 : 157
+> CHANGE 108 : 109 @ 108 : 109
~ for (Object comparable : iproperty.getAllowedValues()) {
-> CHANGE 159 : 160 @ 159 : 160
+> CHANGE 3 : 4 @ 3 : 4
~ map.get(this.getPropertiesWithValue(iproperty, (Comparable) comparable)));
diff --git a/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java b/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java
index eeb9a2a6..d4b50df4 100644
--- a/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> INSERT 5 : 10 @ 8
+> INSERT 3 : 8 @ 6
+
+ import com.google.common.base.Function;
@@ -15,9 +15,9 @@
+ import com.google.common.collect.Iterables;
+
-> DELETE 12 @ 10 : 11
+> DELETE 7 @ 2 : 3
-> CHANGE 28 : 29 @ 27 : 28
+> CHANGE 16 : 17 @ 17 : 18
~ (T) cyclePropertyValue(property.getAllowedValues(), this.getValue(property)));
diff --git a/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java b/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java
index 58780e91..a4bf6d5a 100644
--- a/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.ImmutableMap;
diff --git a/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java
index aa96d96f..05d20507 100644
--- a/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java
@@ -11,40 +11,40 @@
~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerCacheProvider;
~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache;
-> CHANGE 45 : 46 @ 44 : 45
+> CHANGE 41 : 42 @ 40 : 41
~ EaglerLoadingCache lcache) {
-> CHANGE 49 : 50 @ 48 : 50
+> CHANGE 4 : 5 @ 4 : 6
~ if (!this.blockMatches[k][j][i].apply(lcache.get(translateOffset(pos, finger, thumb, i, j, k)))) {
-> CHANGE 61 : 62 @ 61 : 62
+> CHANGE 12 : 13 @ 13 : 14
~ EaglerLoadingCache loadingcache = func_181627_a(worldIn, false);
-> CHANGE 81 : 83 @ 81 : 83
+> CHANGE 20 : 22 @ 20 : 22
~ public static EaglerLoadingCache func_181627_a(World parWorld, boolean parFlag) {
~ return new EaglerLoadingCache(new BlockPattern.CacheLoader(parWorld, parFlag));
-> CHANGE 99 : 100 @ 99 : 100
+> CHANGE 18 : 19 @ 18 : 19
~ static class CacheLoader implements EaglerCacheProvider {
-> CHANGE 108 : 109 @ 108 : 109
+> CHANGE 9 : 10 @ 9 : 10
~ public BlockWorldState create(BlockPos parBlockPos) {
-> CHANGE 117 : 118 @ 117 : 118
+> CHANGE 9 : 10 @ 9 : 10
~ private final EaglerLoadingCache lcache;
-> CHANGE 123 : 124 @ 123 : 124
+> CHANGE 6 : 7 @ 6 : 7
~ EaglerLoadingCache parLoadingCache, int parInt1, int parInt2, int parInt3) {
-> CHANGE 154 : 155 @ 154 : 155
+> CHANGE 31 : 32 @ 31 : 32
~ return (BlockWorldState) this.lcache.get(BlockPattern.translateOffset(this.pos, this.getFinger(),
diff --git a/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java
index a34c5fee..86cf7af9 100644
--- a/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> INSERT 4 : 8 @ 6
+> INSERT 2 : 6 @ 4
+
+ import com.google.common.base.Predicate;
diff --git a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java
index 44e4735e..7453454c 100644
--- a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java
+++ b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 7
-> CHANGE 7 : 8 @ 12 : 15
+> CHANGE 5 : 6 @ 10 : 13
~
-> INSERT 10 : 18 @ 17
+> INSERT 3 : 11 @ 5
+ import com.google.common.base.Joiner;
+ import com.google.common.base.Predicate;
@@ -22,11 +22,11 @@
+ import net.minecraft.block.state.BlockWorldState;
+
-> CHANGE 30 : 31 @ 29 : 30
+> CHANGE 20 : 21 @ 12 : 13
~ if (aisle.length > 0 && !StringUtils.isEmpty(aisle[0])) {
-> CHANGE 49 : 50 @ 48 : 49
+> CHANGE 19 : 20 @ 19 : 20
~ this.symbolMap.put(Character.valueOf(c0), (Predicate) null);
diff --git a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java
index 07101541..3b661ee7 100644
--- a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java
@@ -10,23 +10,23 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 5 : 7
+> DELETE 4 @ 3 : 5
-> DELETE 7 @ 8 : 9
+> DELETE 1 @ 3 : 4
-> DELETE 8 @ 10 : 11
+> DELETE 1 @ 2 : 3
-> DELETE 18 @ 21 : 22
+> DELETE 10 @ 11 : 12
-> DELETE 22 @ 26 : 28
+> DELETE 4 @ 5 : 7
-> CHANGE 44 : 47 @ 50 : 60
+> CHANGE 22 : 25 @ 24 : 34
~ ScaledResolution scaledresolution = new ScaledResolution(this.mc);
~ GlStateManager.ortho(0.0D, scaledresolution.getScaledWidth_double(),
~ scaledresolution.getScaledHeight_double(), 0.0D, 100.0D, 300.0D);
-> INSERT 66 : 80 @ 79
+> INSERT 22 : 36 @ 29
+ public void eaglerShow(String line1, String line2) {
+ if (!this.mc.running) {
@@ -43,15 +43,15 @@
+ }
+
-> CHANGE 93 : 94 @ 92 : 99
+> CHANGE 27 : 28 @ 13 : 20
~ GlStateManager.clear(256);
-> CHANGE 101 : 103 @ 106 : 109
+> CHANGE 8 : 10 @ 14 : 17
~ GlStateManager.clear(16640);
~ GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
-> DELETE 147 @ 153 : 158
+> DELETE 46 @ 47 : 52
> EOF
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.edit.java b/patches/minecraft/net/minecraft/client/Minecraft.edit.java
index 1aa3418c..478c25cb 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.edit.java
+++ b/patches/minecraft/net/minecraft/client/Minecraft.edit.java
@@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 17
-> DELETE 4 @ 19 : 23
+> DELETE 2 @ 17 : 21
-> DELETE 5 @ 24 : 25
+> DELETE 1 @ 5 : 6
-> CHANGE 7 : 8 @ 27 : 31
+> CHANGE 2 : 3 @ 3 : 7
~ import java.util.LinkedList;
-> DELETE 9 @ 32 : 35
+> DELETE 2 @ 5 : 8
-> CHANGE 10 : 41 @ 36 : 39
+> CHANGE 1 : 32 @ 4 : 7
~
~ import org.apache.commons.lang3.Validate;
@@ -51,94 +51,94 @@
~ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
~ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
-> DELETE 43 @ 41 : 43
+> DELETE 33 @ 5 : 7
-> DELETE 56 @ 56 : 58
+> DELETE 13 @ 15 : 17
-> DELETE 59 @ 61 : 62
+> DELETE 3 @ 5 : 6
-> INSERT 62 : 63 @ 65
+> INSERT 3 : 4 @ 4
+ import net.minecraft.client.multiplayer.ServerAddress;
-> INSERT 64 : 65 @ 66
+> INSERT 2 : 3 @ 1
+ import net.minecraft.client.multiplayer.ServerList;
-> DELETE 66 @ 67 : 68
+> DELETE 2 @ 1 : 2
-> DELETE 70 @ 72 : 73
+> DELETE 4 @ 5 : 6
-> DELETE 71 @ 74 : 75
+> DELETE 1 @ 2 : 3
-> DELETE 73 @ 77 : 78
+> DELETE 2 @ 3 : 4
-> DELETE 88 @ 93 : 94
+> DELETE 15 @ 16 : 17
-> DELETE 90 @ 96 : 97
+> DELETE 2 @ 3 : 4
-> DELETE 104 @ 111 : 112
+> DELETE 14 @ 15 : 16
-> DELETE 105 @ 113 : 115
+> DELETE 1 @ 2 : 4
-> DELETE 126 @ 136 : 140
+> DELETE 21 @ 23 : 27
-> DELETE 127 @ 141 : 143
+> DELETE 1 @ 5 : 7
-> DELETE 128 @ 144 : 146
+> DELETE 1 @ 3 : 5
-> DELETE 133 @ 151 : 152
+> DELETE 5 @ 7 : 8
-> INSERT 144 : 145 @ 163
+> INSERT 11 : 12 @ 12
+ import net.minecraft.util.StringTranslate;
-> DELETE 151 @ 169 : 189
+> DELETE 7 @ 6 : 26
-> CHANGE 152 : 153 @ 190 : 191
+> CHANGE 1 : 2 @ 21 : 22
~ public class Minecraft implements IThreadListener {
-> CHANGE 155 : 156 @ 193 : 200
+> CHANGE 3 : 4 @ 3 : 10
~ public static final boolean isRunningOnMac = false;
-> DELETE 168 @ 212 : 214
+> DELETE 13 @ 19 : 21
-> DELETE 187 @ 233 : 234
+> DELETE 19 @ 21 : 22
-> DELETE 193 @ 240 : 242
+> DELETE 6 @ 7 : 9
-> DELETE 194 @ 243 : 245
+> DELETE 1 @ 3 : 5
-> CHANGE 205 : 206 @ 256 : 257
+> CHANGE 11 : 12 @ 13 : 14
~ private EaglercraftNetworkManager myNetworkManager;
-> DELETE 215 @ 266 : 268
+> DELETE 10 @ 10 : 12
-> CHANGE 219 : 220 @ 272 : 275
+> CHANGE 4 : 5 @ 6 : 9
~ private final List> scheduledTasks = new LinkedList();
-> INSERT 234 : 236 @ 289
+> INSERT 15 : 17 @ 17
+ public int joinWorldTickCounter = 0;
+ private int dontPauseTimer = 0;
-> CHANGE 239 : 240 @ 292 : 295
+> CHANGE 5 : 6 @ 3 : 6
~ StringTranslate.doCLINIT();
-> CHANGE 241 : 242 @ 296 : 304
+> CHANGE 2 : 3 @ 4 : 12
~ this.mcDefaultResourcePack = new DefaultResourcePack();
-> CHANGE 243 : 244 @ 305 : 307
+> CHANGE 2 : 3 @ 9 : 11
~ logger.info("Setting user: " + this.session.getProfile().getName());
-> CHANGE 251 : 256 @ 314 : 318
+> CHANGE 8 : 13 @ 9 : 13
~ String serverToJoin = EagRuntime.getConfiguration().getServerToJoin();
~ if (serverToJoin != null) {
@@ -146,16 +146,16 @@
~ this.serverName = addr.getIP();
~ this.serverPort = addr.getPort();
-> DELETE 258 @ 320 : 321
+> DELETE 7 @ 6 : 7
-> CHANGE 273 : 275 @ 336 : 338
+> CHANGE 15 : 17 @ 16 : 18
~ try {
~ while (true) {
-> DELETE 291 @ 354 : 371
+> DELETE 18 @ 18 : 35
-> CHANGE 292 : 307 @ 372 : 374
+> CHANGE 1 : 16 @ 18 : 20
~ } catch (MinecraftError var12) {
~ // ??
@@ -173,85 +173,85 @@
~ } finally {
~ this.shutdownMinecraftApplet();
-> CHANGE 311 : 313 @ 378 : 380
+> CHANGE 19 : 21 @ 6 : 8
~ private void startGame() throws IOException {
~ this.gameSettings = new GameSettings(this);
-> DELETE 314 @ 381 : 382
+> DELETE 3 @ 3 : 4
-> CHANGE 319 : 320 @ 387 : 390
+> CHANGE 5 : 6 @ 6 : 9
~ logger.info("EagRuntime Version: " + EagRuntime.getVersion());
-> DELETE 321 @ 391 : 394
+> DELETE 2 @ 4 : 7
-> CHANGE 322 : 323 @ 395 : 397
+> CHANGE 1 : 2 @ 4 : 6
~ this.mcResourcePackRepository = new ResourcePackRepository(this.mcDefaultResourcePack, this.metadataSerializer_,
-> DELETE 331 @ 405 : 408
+> DELETE 9 @ 10 : 13
-> CHANGE 334 : 336 @ 411 : 413
+> CHANGE 3 : 5 @ 6 : 8
~ this.fontRendererObj = new EaglerFontRenderer(this.gameSettings,
~ new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
-> CHANGE 341 : 342 @ 418 : 419
+> CHANGE 7 : 8 @ 7 : 8
~ this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings,
-> CHANGE 350 : 351 @ 427 : 428
+> CHANGE 9 : 10 @ 9 : 10
~ return HString.format(parString1, new Object[] { GameSettings
-> CHANGE 361 : 362 @ 438 : 439
+> CHANGE 11 : 12 @ 11 : 12
~ GlStateManager.clearDepth(1.0f);
-> INSERT 392 : 393 @ 469
+> INSERT 31 : 32 @ 31
+ SkinPreviewRenderer.initialize();
-> INSERT 395 : 399 @ 471
+> INSERT 3 : 7 @ 2
+
+ ServerList.initServerList(this);
+ EaglerProfile.read();
+
-> CHANGE 400 : 402 @ 472 : 473
+> CHANGE 5 : 7 @ 1 : 2
~ this.displayGuiScreen(new GuiScreenEditProfile(
~ new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort)));
-> CHANGE 403 : 404 @ 474 : 475
+> CHANGE 3 : 4 @ 2 : 3
~ this.displayGuiScreen(new GuiScreenEditProfile(new GuiMainMenu()));
-> DELETE 409 @ 480 : 492
+> DELETE 6 @ 6 : 18
-> CHANGE 425 : 426 @ 508 : 516
+> CHANGE 16 : 17 @ 28 : 36
~ throw new UnsupportedOperationException("wtf u trying to twitch stream in a browser game?");
-> CHANGE 428 : 431 @ 518 : 540
+> CHANGE 3 : 6 @ 10 : 32
~ private void createDisplay() {
~ Display.create();
~ Display.setTitle("Eaglercraft 1.8.8");
-> DELETE 433 @ 542 : 579
+> DELETE 5 @ 24 : 61
-> CHANGE 434 : 435 @ 580 : 590
+> CHANGE 1 : 2 @ 38 : 48
~ return true;
-> DELETE 437 @ 592 : 596
+> DELETE 3 @ 12 : 16
-> DELETE 441 @ 600 : 617
+> DELETE 4 @ 8 : 25
-> CHANGE 447 : 459 @ 623 : 636
+> CHANGE 6 : 18 @ 23 : 36
~ String report = crashReportIn.getCompleteReport();
~ Bootstrap.printToSYSOUT(report);
@@ -266,76 +266,76 @@
~ System.err.println(
~ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
-> DELETE 460 @ 637 : 638
+> DELETE 13 @ 14 : 15
-> INSERT 467 : 469 @ 645
+> INSERT 7 : 9 @ 8
+ GlStateManager.recompileShaders();
+
-> CHANGE 483 : 485 @ 659 : 660
+> CHANGE 16 : 18 @ 14 : 15
~ logger.info("Caught error stitching, removing all assigned resourcepacks");
~ logger.info(runtimeexception);
-> CHANGE 501 : 504 @ 676 : 688
+> CHANGE 18 : 21 @ 17 : 29
~ private void updateDisplayMode() {
~ this.displayWidth = Display.getWidth();
~ this.displayHeight = Display.getHeight();
-> CHANGE 506 : 510 @ 690 : 734
+> CHANGE 5 : 9 @ 14 : 58
~ private void drawSplashScreen(TextureManager textureManagerInstance) {
~ Display.update();
~ updateDisplayMode();
~ GlStateManager.viewport(0, 0, displayWidth, displayHeight);
-> DELETE 512 @ 736 : 739
+> DELETE 6 @ 46 : 49
-> CHANGE 528 : 529 @ 755 : 756
+> CHANGE 16 : 17 @ 19 : 20
~ new DynamicTexture(ImageData.loadImageFile(inputstream)));
-> DELETE 553 @ 780 : 782
+> DELETE 25 @ 25 : 27
-> DELETE 579 @ 808 : 812
+> DELETE 26 @ 28 : 32
-> CHANGE 610 : 611 @ 843 : 844
+> CHANGE 31 : 32 @ 35 : 36
~ public void checkGLError(String message) {
-> CHANGE 612 : 613 @ 845 : 846
+> CHANGE 2 : 3 @ 2 : 3
~ int i = EaglercraftGPU.glGetError();
-> CHANGE 614 : 615 @ 847 : 848
+> CHANGE 2 : 3 @ 2 : 3
~ String s = EaglercraftGPU.gluErrorString(i);
-> DELETE 625 @ 858 : 859
+> DELETE 11 @ 11 : 12
-> CHANGE 635 : 636 @ 869 : 870
+> CHANGE 10 : 11 @ 11 : 12
~ EagRuntime.destroy();
-> CHANGE 637 : 638 @ 871 : 872
+> CHANGE 2 : 3 @ 2 : 3
~ EagRuntime.exit();
-> DELETE 641 @ 875 : 877
+> DELETE 4 @ 4 : 6
-> CHANGE 646 : 647 @ 882 : 883
+> CHANGE 5 : 6 @ 7 : 8
~ if (Display.isCloseRequested()) {
-> CHANGE 661 : 662 @ 897 : 898
+> CHANGE 15 : 16 @ 15 : 16
~ Util.func_181617_a((FutureTask) this.scheduledTasks.remove(0), logger);
-> DELETE 680 @ 916 : 924
+> DELETE 19 @ 19 : 27
-> CHANGE 681 : 691 @ 925 : 929
+> CHANGE 1 : 11 @ 9 : 13
~ if (!Display.contextLost()) {
~ GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 1.0f);
@@ -348,7 +348,7 @@
~ }
~
-> CHANGE 692 : 697 @ 930 : 931
+> CHANGE 11 : 16 @ 5 : 6
~ if (!this.skipRenderWorld) {
~ this.mcProfiler.endStartSection("gameRenderer");
@@ -356,7 +356,7 @@
~ this.mcProfiler.endSection();
~ }
-> CHANGE 698 : 710 @ 932 : 936
+> CHANGE 6 : 18 @ 2 : 6
~ this.mcProfiler.endSection();
~ if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart
@@ -371,72 +371,72 @@
~ this.mcProfiler.profilingEnabled = false;
~ this.prevFrameTime = System.nanoTime();
-> CHANGE 712 : 714 @ 938 : 943
+> CHANGE 14 : 16 @ 6 : 11
~ this.guiAchievement.updateAchievementWindow();
~ GlStateManager.popMatrix();
-> DELETE 716 @ 945 : 954
+> DELETE 4 @ 7 : 16
-> DELETE 718 @ 956 : 964
+> DELETE 2 @ 11 : 19
-> INSERT 719 : 720 @ 965
+> INSERT 1 : 2 @ 9
+
-> CHANGE 721 : 722 @ 966 : 968
+> CHANGE 2 : 3 @ 1 : 3
~ this.isGamePaused = false;
-> CHANGE 728 : 729 @ 974 : 975
+> CHANGE 7 : 8 @ 8 : 9
~ this.debug = HString.format("%d fps (%d chunk update%s) T: %s%s%s%s",
-> CHANGE 734 : 736 @ 980 : 984
+> CHANGE 6 : 8 @ 6 : 10
~ this.gameSettings.fancyGraphics ? "" : " fast", this.gameSettings.clouds == 0 ? ""
~ : (this.gameSettings.clouds == 1 ? " fast-clouds" : " fancy-clouds") });
-> DELETE 739 @ 987 : 991
+> DELETE 5 @ 7 : 11
-> DELETE 788 @ 1040 : 1047
+> DELETE 49 @ 53 : 60
-> CHANGE 836 : 837 @ 1095 : 1096
+> CHANGE 48 : 49 @ 55 : 56
~ EaglercraftGPU.glLineWidth(1.0F);
-> CHANGE 846 : 847 @ 1105 : 1106
+> CHANGE 10 : 11 @ 10 : 11
~ (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
-> CHANGE 848 : 849 @ 1107 : 1108
+> CHANGE 2 : 3 @ 2 : 3
~ .color(0, 0, 0, 100).endVertex();
-> CHANGE 850 : 851 @ 1109 : 1110
+> CHANGE 2 : 3 @ 2 : 3
~ .color(0, 0, 0, 100).endVertex();
-> CHANGE 852 : 853 @ 1111 : 1112
+> CHANGE 2 : 3 @ 2 : 3
~ (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
-> DELETE 963 @ 1222 : 1226
+> DELETE 111 @ 111 : 115
-> CHANGE 1071 : 1072 @ 1334 : 1374
+> CHANGE 108 : 109 @ 112 : 152
~ logger.error("Use F11 to toggle fullscreen!");
-> DELETE 1083 @ 1385 : 1386
+> DELETE 12 @ 51 : 52
-> DELETE 1085 @ 1388 : 1396
+> DELETE 2 @ 3 : 11
-> INSERT 1094 : 1096 @ 1405
+> INSERT 9 : 11 @ 17
+ RateLimitTracker.tick();
+
-> INSERT 1119 : 1125 @ 1428
+> INSERT 25 : 31 @ 23
+ if (this.currentScreen == null && this.dontPauseTimer <= 0) {
+ if (!Mouse.isMouseGrabbed()) {
@@ -445,7 +445,7 @@
+ }
+ }
-> INSERT 1132 : 1137 @ 1435
+> INSERT 13 : 18 @ 7
+ this.dontPauseTimer = 6;
+ } else {
@@ -453,28 +453,28 @@
+ --this.dontPauseTimer;
+ }
-> CHANGE 1147 : 1148 @ 1445 : 1446
+> CHANGE 15 : 16 @ 10 : 11
~ return Minecraft.this.currentScreen.getClass().getName();
-> CHANGE 1161 : 1162 @ 1459 : 1460
+> CHANGE 14 : 15 @ 14 : 15
~ return Minecraft.this.currentScreen.getClass().getName();
-> CHANGE 1202 : 1204 @ 1500 : 1501
+> CHANGE 41 : 43 @ 41 : 42
~ if ((!this.inGameHasFocus || !Mouse.isActuallyGrabbed()) && Mouse.getEventButtonState()) {
~ this.inGameHasFocus = false;
-> CHANGE 1246 : 1247 @ 1543 : 1544
+> CHANGE 44 : 45 @ 43 : 44
~ if (k == 1 || (k > -1 && k == this.gameSettings.keyBindClose.getKeyCode())) {
-> INSERT 1288 : 1289 @ 1585
+> INSERT 42 : 43 @ 42
+ GlStateManager.recompileShaders();
-> INSERT 1495 : 1501 @ 1791
+> INSERT 207 : 213 @ 206
+ if (this.theWorld != null) {
+ ++joinWorldTickCounter;
@@ -483,95 +483,95 @@
+ }
+
-> CHANGE 1506 : 1507 @ 1796 : 1845
+> CHANGE 11 : 12 @ 5 : 54
~ throw new UnsupportedOperationException("singleplayer has been removed");
-> INSERT 1519 : 1520 @ 1857
+> INSERT 13 : 14 @ 61
+ session.reset();
-> DELETE 1521 @ 1858 : 1864
+> DELETE 2 @ 1 : 7
-> DELETE 1561 @ 1904 : 1905
+> DELETE 40 @ 46 : 47
-> CHANGE 1581 : 1582 @ 1925 : 1927
+> CHANGE 20 : 21 @ 21 : 23
~ this.thePlayer = this.playerController.func_178892_a(this.theWorld, new StatFileWriter());
-> CHANGE 1747 : 1748 @ 2092 : 2093
+> CHANGE 166 : 167 @ 167 : 168
~ return EagRuntime.getVersion();
-> CHANGE 1752 : 1754 @ 2097 : 2098
+> CHANGE 5 : 7 @ 5 : 6
~ return EaglercraftGPU.glGetString(7937) + " GL version " + EaglercraftGPU.glGetString(7938) + ", "
~ + EaglercraftGPU.glGetString(7936);
-> DELETE 1756 @ 2100 : 2110
+> DELETE 4 @ 3 : 13
-> CHANGE 1758 : 1759 @ 2112 : 2116
+> CHANGE 2 : 3 @ 12 : 16
~ return "Definitely Not; You're an eagler";
-> DELETE 1795 @ 2152 : 2157
+> DELETE 37 @ 40 : 45
-> INSERT 1809 : 1811 @ 2171
+> INSERT 14 : 16 @ 19
+ Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
+ I18n.format("resourcePack.load.pleaseWait"));
-> DELETE 1816 @ 2176 : 2203
+> DELETE 7 @ 5 : 32
-> CHANGE 1817 : 1818 @ 2204 : 2209
+> CHANGE 1 : 2 @ 28 : 33
~ return this.currentServerData != null ? "multiplayer" : "out_of_game";
-> DELETE 1820 @ 2211 : 2428
+> DELETE 3 @ 7 : 224
-> CHANGE 1837 : 1838 @ 2445 : 2446
+> CHANGE 17 : 18 @ 234 : 235
~ return false;
-> DELETE 1840 @ 2448 : 2452
+> DELETE 3 @ 3 : 7
-> DELETE 1841 @ 2453 : 2458
+> DELETE 1 @ 5 : 10
-> DELETE 1842 @ 2459 : 2460
+> DELETE 1 @ 6 : 7
-> DELETE 1844 @ 2462 : 2466
+> DELETE 2 @ 3 : 7
-> CHANGE 1845 : 1846 @ 2467 : 2468
+> CHANGE 1 : 2 @ 5 : 6
~ return System.currentTimeMillis();
-> DELETE 1856 @ 2478 : 2495
+> DELETE 11 @ 11 : 28
-> DELETE 1900 @ 2539 : 2543
+> DELETE 44 @ 61 : 65
-> CHANGE 1906 : 1908 @ 2549 : 2589
+> CHANGE 6 : 8 @ 10 : 50
~ if (i == this.gameSettings.keyBindScreenshot.getKeyCode()) {
~ this.ingameGUI.getChatGUI().printChatMessage(ScreenShotHelper.saveScreenshot());
-> DELETE 1909 @ 2590 : 2592
+> DELETE 3 @ 41 : 43
-> DELETE 1910 @ 2593 : 2594
+> DELETE 1 @ 3 : 4
-> DELETE 1914 @ 2598 : 2606
+> DELETE 4 @ 5 : 13
-> CHANGE 1925 : 1929 @ 2617 : 2629
+> CHANGE 11 : 15 @ 19 : 31
~ ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callableToSchedule);
~ synchronized (this.scheduledTasks) {
~ this.scheduledTasks.add(listenablefuturetask);
~ return listenablefuturetask;
-> DELETE 1937 @ 2637 : 2641
+> DELETE 12 @ 20 : 24
-> DELETE 1961 @ 2665 : 2673
+> DELETE 24 @ 28 : 36
-> INSERT 1968 : 1972 @ 2680
+> INSERT 7 : 11 @ 15
+
+ public static int getGLMaximumTextureSize() {
diff --git a/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java b/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java
index eb41a0b7..bb82cd83 100644
--- a/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java
@@ -10,9 +10,9 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 5 @ 4 : 6
+> DELETE 3 @ 2 : 4
-> CHANGE 10 : 11 @ 11 : 12
+> CHANGE 5 : 6 @ 7 : 8
~ private final EaglercraftRandom rand = new EaglercraftRandom();
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java
index e1b658bf..cd625582 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 6 @ 5
+> INSERT 2 : 4 @ 3
+ import com.google.common.collect.Maps;
+
-> CHANGE 8 : 9 @ 7 : 8
+> CHANGE 4 : 5 @ 2 : 3
~ MOBS("hostile", 5), ANIMALS("neutral", 6), PLAYERS("player", 7), AMBIENT("ambient", 8), VOICE("voice", 9);
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java
index bc60f462..190d4c9c 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 7 @ 4 : 9
+> CHANGE 1 : 5 @ 2 : 7
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
~ import com.google.common.collect.Lists;
~
-> CHANGE 11 : 12 @ 13 : 14
+> CHANGE 8 : 9 @ 9 : 10
~ private final EaglercraftRandom rnd = new EaglercraftRandom();
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java
index 83f77217..70e29b81 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 5
-> DELETE 5 @ 8 : 9
+> DELETE 3 @ 6 : 7
-> INSERT 7 : 8 @ 11
+> INSERT 2 : 3 @ 3
+ import java.nio.charset.StandardCharsets;
-> DELETE 10 @ 13 : 14
+> DELETE 3 @ 2 : 3
-> CHANGE 11 : 24 @ 15 : 25
+> CHANGE 1 : 14 @ 2 : 12
~ import java.util.Set;
~
@@ -31,25 +31,25 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 31 @ 32 : 36
+> DELETE 20 @ 17 : 21
-> CHANGE 34 : 35 @ 39 : 41
+> CHANGE 3 : 4 @ 7 : 9
~
-> CHANGE 51 : 52 @ 57 : 58
+> CHANGE 17 : 18 @ 18 : 19
~ private final EaglercraftSoundManager sndManager;
-> CHANGE 56 : 57 @ 62 : 63
+> CHANGE 5 : 6 @ 5 : 6
~ this.sndManager = new EaglercraftSoundManager(gameSettingsIn, this);
-> CHANGE 69 : 70 @ 75 : 76
+> CHANGE 13 : 14 @ 13 : 14
~ for (Entry entry : (Set) map.entrySet()) {
-> INSERT 84 : 94 @ 90
+> INSERT 15 : 25 @ 15
+ public static class SoundMap {
+
@@ -62,25 +62,25 @@
+ }
+
-> CHANGE 95 : 96 @ 91 : 92
+> CHANGE 11 : 12 @ 1 : 2
~ Map map = null;
-> CHANGE 97 : 101 @ 93 : 94
+> CHANGE 2 : 6 @ 2 : 3
~ map = JSONTypeProvider.deserialize(IOUtils.inputStreamToString(stream, StandardCharsets.UTF_8),
~ SoundMap.class).soundMap;
~ } catch (IOException e) {
~ throw new RuntimeException("Exception caught reading JSON", e);
-> INSERT 223 : 227 @ 216
+> INSERT 126 : 130 @ 123
+ if (category == SoundCategory.VOICE) {
+ PlatformAudio.setMicVol(volume);
+ }
+
-> CHANGE 240 : 246 @ 229 : 231
+> CHANGE 17 : 23 @ 13 : 15
~ SoundCategory cat = soundeventaccessorcomposite.getSoundCategory();
~ for (int i = 0; i < categories.length; ++i) {
@@ -89,7 +89,7 @@
~ break;
~ }
-> CHANGE 252 : 253 @ 237 : 238
+> CHANGE 12 : 13 @ 8 : 9
~ return (SoundEventAccessorComposite) arraylist.get((new EaglercraftRandom()).nextInt(arraylist.size()));
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java
index 0e7a6e9e..6e961032 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 5
+> DELETE 1 @ 2 : 3
-> INSERT 4 : 6 @ 6
+> INSERT 1 : 3 @ 2
+ import com.google.common.collect.Lists;
+
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java
index 8da55534..7718d245 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java
@@ -7,37 +7,37 @@
> DELETE 2 @ 2 : 12
-> INSERT 3 : 6 @ 13
+> INSERT 1 : 4 @ 11
+ import org.json.JSONArray;
+ import org.json.JSONException;
+ import org.json.JSONObject;
-> CHANGE 7 : 11 @ 14 : 18
+> CHANGE 4 : 8 @ 1 : 5
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
~
~ public class SoundListSerializer implements JSONTypeDeserializer {
~ public SoundList deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 12 : 13 @ 19 : 20
+> CHANGE 5 : 6 @ 5 : 6
~ soundlist.setReplaceExisting(jsonobject.optBoolean("replace", false));
-> CHANGE 14 : 15 @ 21 : 22
+> CHANGE 2 : 3 @ 2 : 3
~ .getCategory(jsonobject.optString("category", SoundCategory.MASTER.getCategoryName()));
-> CHANGE 18 : 19 @ 25 : 26
+> CHANGE 4 : 5 @ 4 : 5
~ JSONArray jsonarray = jsonobject.getJSONArray("sounds");
-> CHANGE 20 : 22 @ 27 : 29
+> CHANGE 2 : 4 @ 2 : 4
~ for (int i = 0; i < jsonarray.length(); ++i) {
~ Object jsonelement = jsonarray.get(i);
-> CHANGE 23 : 28 @ 30 : 35
+> CHANGE 3 : 8 @ 3 : 8
~ if (jsonelement instanceof String) {
~ soundlist$soundentry.setSoundEntryName((String) jsonelement);
@@ -45,23 +45,23 @@
~ JSONObject jsonobject1 = (JSONObject) jsonelement;
~ soundlist$soundentry.setSoundEntryName(jsonobject1.getString("name"));
-> CHANGE 30 : 31 @ 37 : 38
+> CHANGE 7 : 8 @ 7 : 8
~ .getType(jsonobject1.getString("type"));
-> CHANGE 36 : 37 @ 43 : 44
+> CHANGE 6 : 7 @ 6 : 7
~ float f = jsonobject1.getFloat("volume");
-> CHANGE 42 : 43 @ 49 : 50
+> CHANGE 6 : 7 @ 6 : 7
~ float f1 = jsonobject1.getFloat("pitch");
-> CHANGE 48 : 49 @ 55 : 56
+> CHANGE 6 : 7 @ 6 : 7
~ int j = jsonobject1.getInt("weight");
-> CHANGE 54 : 55 @ 61 : 62
+> CHANGE 6 : 7 @ 6 : 7
~ soundlist$soundentry.setStreaming(jsonobject1.getBoolean("stream"));
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java
index c34ac5ba..2d4d04f7 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java
+++ b/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 5
+> CHANGE 1 : 4 @ 2 : 3
~
~ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java
index 8bdb3e34..41c5168b 100644
--- a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java
@@ -9,10 +9,10 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> DELETE 5 @ 6 : 10
+> DELETE 3 @ 4 : 8
-> DELETE 11 @ 16 : 17
+> DELETE 6 @ 10 : 11
-> DELETE 55 @ 61 : 79
+> DELETE 44 @ 45 : 63
> EOF
diff --git a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java
index 6ca22dd5..6ef7c53e 100644
--- a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java
+++ b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java
@@ -9,6 +9,6 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> DELETE 4 @ 4 : 5
+> DELETE 2 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java
index 4c6308d3..58a16d9e 100644
--- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java
+++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java
@@ -7,19 +7,19 @@
> DELETE 5 @ 5 : 6
-> DELETE 56 @ 57 : 58
+> DELETE 51 @ 52 : 53
-> INSERT 78 : 79 @ 80
+> INSERT 22 : 23 @ 23
+ private StatFileWriter statWriter;
-> CHANGE 80 : 81 @ 81 : 82
+> CHANGE 2 : 3 @ 1 : 2
~ public EntityPlayerSP(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandler, StatFileWriter statWriter) {
-> DELETE 83 @ 84 : 85
+> DELETE 3 @ 3 : 4
-> INSERT 85 : 86 @ 87
+> INSERT 2 : 3 @ 3
+ this.statWriter = statWriter;
diff --git a/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java b/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java
index 7a27e655..5f06a7e6 100644
--- a/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 6
-> CHANGE 6 : 13 @ 10 : 12
+> CHANGE 4 : 11 @ 8 : 10
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
@@ -17,18 +17,18 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 14 @ 13 : 14
+> DELETE 8 @ 3 : 4
-> DELETE 15 @ 15 : 16
+> DELETE 1 @ 2 : 3
-> DELETE 22 @ 23 : 25
+> DELETE 7 @ 8 : 10
-> CHANGE 24 : 26 @ 27 : 29
+> CHANGE 2 : 4 @ 4 : 6
~ protected static final ResourceLocation[] unicodePageLocations = new ResourceLocation[256];
~ protected int[] charWidth = new int[256];
-> CHANGE 27 : 46 @ 30 : 49
+> CHANGE 3 : 22 @ 3 : 22
~ public EaglercraftRandom fontRandom = new EaglercraftRandom();
~ protected byte[] glyphWidth = new byte[65536];
@@ -50,17 +50,17 @@
~ protected boolean underlineStyle;
~ protected boolean strikethroughStyle;
-> CHANGE 89 : 90 @ 92 : 93
+> CHANGE 62 : 63 @ 62 : 63
~ ImageData bufferedimage;
-> CHANGE 97 : 100 @ 100 : 104
+> CHANGE 8 : 11 @ 8 : 12
~ int i = bufferedimage.width;
~ int j = bufferedimage.height;
~ int[] aint = bufferedimage.pixels;
-> CHANGE 168 : 187 @ 172 : 182
+> CHANGE 71 : 90 @ 72 : 82
~ Tessellator tessellator = Tessellator.getInstance();
~ WorldRenderer worldrenderer = tessellator.getWorldRenderer();
@@ -82,11 +82,11 @@
~ tessellator.draw();
~
-> CHANGE 193 : 194 @ 188 : 189
+> CHANGE 25 : 26 @ 16 : 17
~ HString.format("textures/font/unicode_page_%02x.png", new Object[] { Integer.valueOf(parInt1) }));
-> CHANGE 217 : 235 @ 212 : 222
+> CHANGE 24 : 42 @ 24 : 34
~ Tessellator tessellator = Tessellator.getInstance();
~ WorldRenderer worldrenderer = tessellator.getWorldRenderer();
@@ -107,7 +107,7 @@
~ tessellator.draw();
~
-> CHANGE 262 : 270 @ 249 : 256
+> CHANGE 45 : 53 @ 37 : 44
~ // try {
~ // Bidi bidi = new Bidi((new ArabicShaping(8)).shape(parString1), 127);
@@ -118,59 +118,59 @@
~ // }
~ return parString1;
-> CHANGE 272 : 273 @ 258 : 259
+> CHANGE 10 : 11 @ 9 : 10
~ protected void resetStyles() {
-> CHANGE 280 : 281 @ 266 : 267
+> CHANGE 8 : 9 @ 8 : 9
~ protected void renderStringAtPos(String parString1, boolean parFlag) {
-> CHANGE 284 : 285 @ 270 : 271
+> CHANGE 4 : 5 @ 4 : 5
~ int i1 = "0123456789abcdefklmnor".indexOf(Character.toLowerCase(parString1.charAt(i + 1)));
-> CHANGE 418 : 419 @ 404 : 405
+> CHANGE 134 : 135 @ 134 : 135
~ private int renderStringAligned(String text, int x, int y, int wrapWidth, int color, boolean parFlag) {
-> CHANGE 421 : 422 @ 407 : 408
+> CHANGE 3 : 4 @ 3 : 4
~ x = x + wrapWidth - i;
-> CHANGE 424 : 425 @ 410 : 411
+> CHANGE 3 : 4 @ 3 : 4
~ return this.renderString(text, (float) x, (float) y, color, parFlag);
-> CHANGE 429 : 431 @ 415 : 416
+> CHANGE 5 : 7 @ 5 : 6
~ this.posX = x;
~ this.posY = y;
-> DELETE 452 @ 437 : 438
+> DELETE 23 @ 22 : 23
-> INSERT 453 : 454 @ 439
+> INSERT 1 : 2 @ 2
+ return (int) this.posX;
-> INSERT 573 : 576 @ 558
+> INSERT 120 : 123 @ 119
+ if ((textColor & -67108864) == 0) {
+ textColor |= -16777216;
+ }
-> CHANGE 606 : 607 @ 588 : 589
+> CHANGE 33 : 34 @ 30 : 31
~ return Arrays.asList(this.wrapFormattedStringToWidth(str, wrapWidth, 0).split("\n"));
-> CHANGE 609 : 613 @ 591 : 592
+> CHANGE 3 : 7 @ 3 : 4
~ String wrapFormattedStringToWidth(String str, int wrapWidth, int depthCheck) { // TODO: fix recursive
~ if (depthCheck > 20) {
~ return str;
~ }
-> CHANGE 621 : 622 @ 600 : 601
+> CHANGE 12 : 13 @ 9 : 10
~ return s + "\n" + this.wrapFormattedStringToWidth(s1, wrapWidth, ++depthCheck);
diff --git a/patches/minecraft/net/minecraft/client/gui/Gui.edit.java b/patches/minecraft/net/minecraft/client/gui/Gui.edit.java
index 5decd2cc..ff6fc2cd 100644
--- a/patches/minecraft/net/minecraft/client/gui/Gui.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/Gui.edit.java
@@ -11,9 +11,9 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 5 : 7
+> DELETE 4 @ 3 : 5
-> CHANGE 141 : 142 @ 142 : 143
+> CHANGE 135 : 136 @ 137 : 138
~ public void drawTexturedModalRect(int xCoord, int yCoord, EaglerTextureAtlasSprite textureSprite, int widthIn,
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java
index ef0d1726..49ebceb7 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 5 : 8
+> DELETE 4 @ 3 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java
index 23934c63..060e9947 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
index 681dbc81..1535ae03 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 4 : 15 @ 5 : 7
+> CHANGE 2 : 13 @ 3 : 5
~
~ import org.apache.commons.lang3.StringUtils;
@@ -21,32 +21,32 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.minecraft.client.resources.I18n;
-> DELETE 21 @ 13 : 18
+> DELETE 17 @ 8 : 13
-> INSERT 33 : 35 @ 30
+> INSERT 12 : 14 @ 17
+ private GuiButton exitButton;
+
-> INSERT 44 : 47 @ 39
+> INSERT 11 : 14 @ 9
+ if (!(this instanceof GuiSleepMP)) {
+ this.buttonList.add(exitButton = new GuiButton(69, this.width - 100, 3, 97, 20, I18n.format("chat.exit")));
+ }
-> CHANGE 65 : 66 @ 57 : 58
+> CHANGE 21 : 22 @ 18 : 19
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 73 : 74 @ 65 : 68
+> CHANGE 8 : 9 @ 8 : 11
~ if (parInt1 != 28 && parInt1 != 156) {
-> CHANGE 117 : 118 @ 111 : 112
+> CHANGE 44 : 45 @ 46 : 47
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> INSERT 129 : 135 @ 123
+> INSERT 12 : 18 @ 12
+ protected void actionPerformed(GuiButton par1GuiButton) {
+ if (par1GuiButton.id == 69) {
@@ -55,11 +55,11 @@
+ }
+
-> INSERT 220 : 221 @ 208
+> INSERT 91 : 92 @ 85
+ GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
-> INSERT 226 : 230 @ 213
+> INSERT 6 : 10 @ 5
+ if (exitButton != null) {
+ exitButton.yPosition = 3 + mc.guiAchievement.getHeight();
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java
index 9a3fce14..3cc4f3a0 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java
@@ -12,17 +12,17 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 11 @ 12 : 15
+> DELETE 9 @ 10 : 13
-> CHANGE 55 : 56 @ 59 : 60
+> CHANGE 44 : 45 @ 47 : 48
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 80 : 81 @ 84 : 85
+> CHANGE 25 : 26 @ 25 : 26
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 94 : 95 @ 98 : 99
+> CHANGE 14 : 15 @ 14 : 15
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java
index c4888002..045df059 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 6
-> CHANGE 32 : 33 @ 36 : 37
+> CHANGE 30 : 31 @ 34 : 35
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java
index 944386f6..d25efad0 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java
@@ -9,17 +9,17 @@
+
-> DELETE 5 @ 4 : 9
+> DELETE 2 @ 1 : 6
-> CHANGE 54 : 55 @ 58 : 59
+> CHANGE 49 : 50 @ 54 : 55
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 71 : 72 @ 75 : 76
+> CHANGE 17 : 18 @ 17 : 18
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> CHANGE 89 : 90 @ 93 : 94
+> CHANGE 18 : 19 @ 18 : 19
~ protected void keyTyped(char parChar1, int parInt1) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java
index dfa0f97c..20607a82 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> CHANGE 32 : 33 @ 35 : 36
+> CHANGE 30 : 31 @ 33 : 34
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java
index 1dbc9aeb..c529321a 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java
@@ -7,23 +7,23 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 4 @ 4 : 6
+> CHANGE 1 : 2 @ 2 : 4
~
-> INSERT 5 : 6 @ 7
+> INSERT 2 : 3 @ 3
+ import net.minecraft.util.ChatComponentTranslation;
-> CHANGE 21 : 22 @ 22 : 23
+> CHANGE 16 : 17 @ 15 : 16
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 34 : 35 @ 35 : 36
+> CHANGE 13 : 14 @ 13 : 14
~ protected void actionPerformed(GuiButton parGuiButton) {
-> INSERT 55 : 59 @ 56
+> INSERT 21 : 25 @ 21
+
+ public static GuiScreen createRateLimitKick(GuiScreen prev) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java
index 00e33e56..9ddd0c1f 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 14 : 15 @ 16 : 17
+> CHANGE 12 : 13 @ 14 : 15
~ protected void keyTyped(char parChar1, int parInt1) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java
index 4fc81a5d..286e8725 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 3 : 8 @ 5 : 8
+> CHANGE 1 : 6 @ 3 : 6
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
@@ -15,33 +15,33 @@
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 10 @ 10 : 11
+> DELETE 7 @ 5 : 6
-> DELETE 23 @ 24 : 25
+> DELETE 13 @ 14 : 15
-> CHANGE 31 : 32 @ 33 : 34
+> CHANGE 8 : 9 @ 9 : 10
~ private EaglercraftRandom random = new EaglercraftRandom();
-> CHANGE 61 : 62 @ 63 : 64
+> CHANGE 30 : 31 @ 30 : 31
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> CHANGE 87 : 90 @ 89 : 92
+> CHANGE 26 : 29 @ 26 : 29
~ GlStateManager.viewport((scaledresolution.getScaledWidth() - 290 - 110) / 2 * scaledresolution.getScaleFactor(),
~ (scaledresolution.getScaledHeight() - 220 + 60) / 2 * scaledresolution.getScaleFactor(),
~ 290 * scaledresolution.getScaleFactor(), 220 * scaledresolution.getScaleFactor());
-> CHANGE 91 : 92 @ 93 : 94
+> CHANGE 4 : 5 @ 4 : 5
~ GlStateManager.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
-> INSERT 128 : 129 @ 130
+> INSERT 37 : 38 @ 37
+ GlStateManager.enableDepth();
-> INSERT 130 : 131 @ 131
+> INSERT 2 : 3 @ 1
+ GlStateManager.disableDepth();
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java
index eef24ee9..95a913b6 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 5
-> CHANGE 25 : 26 @ 28 : 29
+> CHANGE 23 : 24 @ 26 : 27
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 28 : 29 @ 31 : 32
+> CHANGE 3 : 4 @ 3 : 4
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java
index 7a6c8eb5..e4412cb5 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java
@@ -9,17 +9,17 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 9 : 10
+> DELETE 2 @ 7 : 8
-> CHANGE 37 : 38 @ 43 : 44
+> CHANGE 33 : 34 @ 34 : 35
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 40 : 41 @ 46 : 47
+> CHANGE 3 : 4 @ 3 : 4
~ protected void actionPerformed(GuiButton parGuiButton) {
-> INSERT 48 : 50 @ 54
+> INSERT 8 : 10 @ 8
+ this.mc.theWorld.sendQuittingDisconnectingPacket();
+ this.mc.loadWorld((WorldClient) null);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java
index f84fcd93..7f1ddeda 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 5 @ 4 : 5
+> DELETE 3 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java
index bfb24ee2..6a3408b7 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java
@@ -14,50 +14,50 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
+
-> CHANGE 11 : 14 @ 5 : 8
+> CHANGE 9 : 12 @ 3 : 6
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 16 @ 10 : 19
+> DELETE 5 @ 5 : 14
-> DELETE 18 @ 21 : 22
+> DELETE 2 @ 11 : 12
-> DELETE 19 @ 23 : 24
+> DELETE 1 @ 2 : 3
-> CHANGE 51 : 52 @ 56 : 57
+> CHANGE 32 : 33 @ 33 : 34
~ private final EaglercraftRandom rand = new EaglercraftRandom();
-> DELETE 55 @ 60 : 61
+> DELETE 4 @ 4 : 5
-> DELETE 82 @ 88 : 89
+> DELETE 27 @ 28 : 29
-> CHANGE 177 : 178 @ 184 : 187
+> CHANGE 95 : 96 @ 96 : 99
~ this.overlayDebug.renderDebugInfo(scaledresolution, partialTicks);
-> INSERT 265 : 268 @ 274
+> INSERT 88 : 91 @ 90
+ if (this.mc.gameSettings.hudWorld && (mc.currentScreen == null || !(mc.currentScreen instanceof GuiChat))) {
+ j -= 10;
+ }
-> DELETE 434 @ 440 : 444
+> DELETE 169 @ 166 : 170
-> CHANGE 451 : 452 @ 461 : 462
+> CHANGE 17 : 18 @ 21 : 22
~ for (Score score : (List) arraylist1) {
-> CHANGE 464 : 465 @ 474 : 475
+> CHANGE 13 : 14 @ 13 : 14
~ for (Score score1 : (List) arraylist1) {
-> CHANGE 808 : 809 @ 818 : 819
+> CHANGE 344 : 345 @ 344 : 345
~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getBlockRendererDispatcher().getBlockModelShapes()
-> DELETE 866 @ 876 : 877
+> DELETE 58 @ 58 : 59
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java
index f672bc9f..7c2486fe 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java
@@ -9,29 +9,29 @@
~ import net.lax1dude.eaglercraft.v1_8.Mouse;
-> DELETE 7 @ 13 : 14
+> DELETE 5 @ 11 : 12
-> DELETE 9 @ 16 : 18
+> DELETE 2 @ 3 : 5
-> DELETE 11 @ 20 : 21
+> DELETE 2 @ 4 : 5
-> CHANGE 31 : 32 @ 41 : 42
+> CHANGE 20 : 21 @ 21 : 22
~ guibutton.enabled = false;
-> CHANGE 34 : 35 @ 44 : 45
+> CHANGE 3 : 4 @ 3 : 4
~ protected void actionPerformed(GuiButton parGuiButton) {
-> DELETE 41 @ 51 : 52
+> DELETE 7 @ 7 : 8
-> DELETE 46 @ 57 : 60
+> DELETE 5 @ 6 : 9
-> CHANGE 64 : 65 @ 78 : 79
+> CHANGE 18 : 19 @ 21 : 22
~ break;
-> CHANGE 71 : 74 @ 85 : 86
+> CHANGE 7 : 10 @ 7 : 8
~ if (Mouse.isActuallyGrabbed()) {
~ Mouse.setGrabbed(false);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java
index 97c966be..cd6e0d30 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java
@@ -10,8 +10,8 @@
+
+ import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
-> DELETE 6 @ 4 : 7
+> DELETE 3 @ 1 : 4
-> DELETE 10 @ 11 : 12
+> DELETE 4 @ 7 : 8
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java
index 3260063f..2293683c 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 7 @ 4
+> INSERT 1 : 5 @ 2
+
+ import com.google.common.collect.Lists;
+
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 8 @ 5 : 8
+> DELETE 5 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java
index 55c89602..e0c6c8d5 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java
@@ -7,25 +7,25 @@
> DELETE 2 @ 2 : 4
-> INSERT 4 : 8 @ 6
+> INSERT 2 : 6 @ 4
+
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+
-> DELETE 9 @ 7 : 12
+> DELETE 5 @ 1 : 6
-> CHANGE 43 : 44 @ 46 : 47
+> CHANGE 34 : 35 @ 39 : 40
~ protected void actionPerformed(GuiButton parGuiButton) {
-> INSERT 100 : 102 @ 103
+> INSERT 57 : 59 @ 57
+ this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
+ I18n.format("resourcePack.load.pleaseWait"));
-> INSERT 111 : 112 @ 112
+> INSERT 11 : 12 @ 9
+ GuiLanguage.this.mc.displayGuiScreen(GuiLanguage.this);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java
index 23934c63..060e9947 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
index 8006c8a2..23040910 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 3
-> DELETE 5 @ 6 : 7
+> DELETE 3 @ 4 : 5
-> INSERT 6 : 7 @ 8
+> INSERT 1 : 2 @ 2
+ import java.util.Arrays;
-> CHANGE 9 : 26 @ 10 : 12
+> CHANGE 3 : 20 @ 2 : 4
~
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
@@ -33,23 +33,23 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
~ import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile;
-> CHANGE 27 : 28 @ 13 : 25
+> CHANGE 18 : 19 @ 3 : 15
~ import net.minecraft.client.audio.PositionedSoundRecord;
-> DELETE 29 @ 26 : 27
+> DELETE 2 @ 13 : 14
-> DELETE 32 @ 30 : 32
+> DELETE 3 @ 4 : 6
-> DELETE 34 @ 34 : 43
+> DELETE 2 @ 4 : 13
-> DELETE 36 @ 45 : 46
+> DELETE 2 @ 11 : 12
-> CHANGE 37 : 38 @ 47 : 48
+> CHANGE 1 : 2 @ 2 : 3
~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
-> INSERT 39 : 45 @ 49
+> INSERT 2 : 8 @ 2
+ private boolean isDefault;
+ private static final int lendef = 5987;
@@ -58,25 +58,25 @@
+ private static final byte[] sha1def = new byte[] { -107, 77, 108, 49, 11, -100, -8, -119, -1, -100, -85, -55, 18,
+ -69, -107, 113, -93, -101, -79, 32 };
-> CHANGE 48 : 49 @ 52 : 53
+> CHANGE 9 : 10 @ 3 : 4
~ private static DynamicTexture viewportTexture = null;
-> DELETE 50 @ 54 : 55
+> DELETE 2 @ 2 : 3
-> DELETE 52 @ 57 : 58
+> DELETE 2 @ 3 : 4
-> DELETE 62 @ 68 : 70
+> DELETE 10 @ 11 : 13
-> CHANGE 68 : 69 @ 76 : 78
+> CHANGE 6 : 7 @ 8 : 10
~ private static ResourceLocation backgroundTexture = null;
-> DELETE 71 @ 80 : 81
+> DELETE 3 @ 4 : 5
-> DELETE 110 @ 120 : 126
+> DELETE 39 @ 40 : 46
-> INSERT 111 : 131 @ 127
+> INSERT 1 : 21 @ 7
+ MD5Digest md5 = new MD5Digest();
+ SHA1Digest sha1 = new SHA1Digest();
@@ -99,20 +99,20 @@
+ this.isDefault = false;
+ }
-> CHANGE 141 : 142 @ 137 : 138
+> CHANGE 30 : 31 @ 10 : 11
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 145 : 149 @ 141 : 144
+> CHANGE 4 : 8 @ 4 : 7
~ if (viewportTexture == null) {
~ viewportTexture = new DynamicTexture(256, 256);
~ backgroundTexture = this.mc.getTextureManager().getDynamicTextureLocation("background", viewportTexture);
~ }
-> DELETE 159 @ 154 : 155
+> DELETE 14 @ 13 : 14
-> CHANGE 160 : 165 @ 156 : 160
+> CHANGE 1 : 6 @ 2 : 6
~
~ boolean isFork = !EaglercraftVersion.projectOriginAuthor.equalsIgnoreCase(EaglercraftVersion.projectForkVendor);
@@ -120,18 +120,18 @@
~ if (isFork && EaglercraftVersion.mainMenuStringF != null && EaglercraftVersion.mainMenuStringF.length() > 0) {
~ i += 11;
-> INSERT 167 : 169 @ 162
+> INSERT 7 : 9 @ 6
+ this.addSingleplayerMultiplayerButtons(i, 24);
+
-> CHANGE 171 : 174 @ 164 : 166
+> CHANGE 4 : 7 @ 2 : 4
~ this.buttonList.add(new GuiButton(4, this.width / 2 + 2, i + 72 + 12, 98, 20,
~ I18n.format("menu.editProfile", new Object[0])));
~
-> CHANGE 175 : 180 @ 167 : 168
+> CHANGE 4 : 9 @ 3 : 4
~
~ if (isFork) {
@@ -139,73 +139,73 @@
~ this.openGLWarning2 = EaglercraftVersion.mainMenuStringF;
~ boolean line2 = this.openGLWarning2 != null && this.openGLWarning2.length() > 0;
-> CHANGE 184 : 185 @ 172 : 173
+> CHANGE 9 : 10 @ 5 : 6
~ this.field_92021_u = ((GuiButton) this.buttonList.get(0)).yPosition - (line2 ? 32 : 21);
-> CHANGE 186 : 187 @ 174 : 175
+> CHANGE 2 : 3 @ 2 : 3
~ this.field_92019_w = this.field_92021_u + (line2 ? 24 : 11);
-> CHANGE 193 : 197 @ 181 : 184
+> CHANGE 7 : 11 @ 7 : 10
~ // this.buttonList
~ // .add(new GuiButton(1, this.width / 2 - 100, parInt1,
~ // I18n.format("menu.singleplayer", new Object[0])));
~ this.buttonList.add(new GuiButton(2, this.width / 2 - 100, parInt1 + parInt2 * 0,
-> CHANGE 198 : 202 @ 185 : 187
+> CHANGE 5 : 9 @ 4 : 6
~ GuiButton btn;
~ this.buttonList.add(btn = new GuiButton(14, this.width / 2 - 100, parInt1 + parInt2 * 1,
~ I18n.format("menu.forkOnGitlab", new Object[0])));
~ btn.enabled = EaglercraftVersion.mainMenuEnableGithubButton;
-> CHANGE 204 : 205 @ 189 : 203
+> CHANGE 6 : 7 @ 4 : 18
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 214 : 215 @ 212 : 213
+> CHANGE 10 : 11 @ 23 : 24
~ logger.error("Singleplayer was removed dumbass");
-> DELETE 221 @ 219 : 223
+> DELETE 7 @ 7 : 11
-> CHANGE 222 : 223 @ 224 : 225
+> CHANGE 1 : 2 @ 5 : 6
~ this.mc.displayGuiScreen(new GuiScreenEditProfile(this));
-> CHANGE 225 : 227 @ 227 : 229
+> CHANGE 3 : 5 @ 3 : 5
~ if (parGuiButton.id == 14) {
~ EagRuntime.openLink(EaglercraftVersion.projectForkURL);
-> DELETE 229 @ 231 : 240
+> DELETE 4 @ 4 : 13
-> DELETE 231 @ 242 : 270
+> DELETE 2 @ 11 : 39
-> CHANGE 237 : 238 @ 276 : 277
+> CHANGE 6 : 7 @ 34 : 35
~ GlStateManager.gluPerspective(120.0F, 1.0F, 0.05F, 10.0F);
-> CHANGE 311 : 315 @ 350 : 354
+> CHANGE 74 : 78 @ 74 : 78
~ this.mc.getTextureManager().bindTexture(backgroundTexture);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
~ EaglercraftGPU.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 256, 256);
-> DELETE 345 @ 384 : 385
+> DELETE 34 @ 34 : 35
-> DELETE 354 @ 394 : 395
+> DELETE 9 @ 10 : 11
-> DELETE 378 @ 419 : 421
+> DELETE 24 @ 25 : 27
-> CHANGE 385 : 386 @ 428 : 429
+> CHANGE 7 : 8 @ 9 : 10
~ if (this.isDefault || (double) this.updateCounter < 1.0E-4D) {
-> INSERT 396 : 409 @ 439
+> INSERT 11 : 24 @ 11
+ boolean isForkLabel = ((this.openGLWarning1 != null && this.openGLWarning1.length() > 0)
+ || (this.openGLWarning2 != null && this.openGLWarning2.length() > 0));
@@ -221,36 +221,36 @@
+ }
+
-> CHANGE 411 : 412 @ 441 : 442
+> CHANGE 15 : 16 @ 2 : 3
~ GlStateManager.rotate(isForkLabel ? -12.0F : -20.0F, 0.0F, 0.0F, 1.0F);
-> INSERT 415 : 418 @ 445
+> INSERT 4 : 7 @ 4
+ if (isForkLabel) {
+ f1 *= 0.8f;
+ }
-> DELETE 421 @ 448 : 452
+> DELETE 6 @ 3 : 7
-> INSERT 422 : 425 @ 453
+> INSERT 1 : 4 @ 5
+ String s = EaglercraftVersion.mainMenuStringA;
+ this.drawString(this.fontRendererObj, s, 2, this.height - 20, -1);
+ s = EaglercraftVersion.mainMenuStringB;
-> CHANGE 426 : 428 @ 454 : 455
+> CHANGE 4 : 6 @ 1 : 2
~
~ String s1 = EaglercraftVersion.mainMenuStringC;
-> INSERT 429 : 432 @ 456
+> INSERT 3 : 6 @ 2
+ this.height - 20, -1);
+ s1 = EaglercraftVersion.mainMenuStringD;
+ this.drawString(this.fontRendererObj, s1, this.width - this.fontRendererObj.getStringWidth(s1) - 2,
-> CHANGE 433 : 441 @ 457 : 463
+> CHANGE 4 : 12 @ 1 : 7
~
~ String lbl = "CREDITS.txt";
@@ -261,7 +261,7 @@
~ } else {
~ drawRect((this.width - w - 4), 0, this.width, 10, 0x55200000);
-> INSERT 443 : 449 @ 465
+> INSERT 10 : 16 @ 8
+ GlStateManager.pushMatrix();
+ GlStateManager.translate((this.width - w - 2), 2.0f, 0.0f);
@@ -270,7 +270,7 @@
+ GlStateManager.popMatrix();
+
-> CHANGE 452 : 464 @ 468 : 476
+> CHANGE 9 : 21 @ 3 : 11
~ protected void mouseClicked(int par1, int par2, int par3) {
~ if (par3 == 0) {
@@ -285,9 +285,9 @@
~ .playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
~ return;
-> DELETE 465 @ 477 : 478
+> DELETE 13 @ 9 : 10
-> INSERT 466 : 467 @ 479
+> INSERT 1 : 2 @ 2
+ super.mouseClicked(par1, par2, par3);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java
index 0f2981cd..982f7d2f 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 7
-> CHANGE 13 : 14 @ 18 : 19
+> CHANGE 11 : 12 @ 16 : 17
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 22 : 23 @ 27 : 28
+> CHANGE 9 : 10 @ 9 : 10
~ protected void keyTyped(char parChar1, int parInt1) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java
index a18e3615..889892c9 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java
@@ -12,13 +12,13 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 5 : 6
+> DELETE 5 @ 3 : 4
-> DELETE 8 @ 7 : 8
+> DELETE 1 @ 2 : 3
-> DELETE 21 @ 21 : 23
+> DELETE 13 @ 14 : 16
-> CHANGE 65 : 66 @ 67 : 68
+> CHANGE 44 : 45 @ 46 : 47
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java
index df574bc5..7c31458a 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java
@@ -10,42 +10,42 @@
+ import java.io.IOException;
+
-> CHANGE 6 : 10 @ 4 : 17
+> CHANGE 4 : 8 @ 2 : 15
~
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 13 @ 20 : 22
+> DELETE 7 @ 16 : 18
-> DELETE 14 @ 23 : 26
+> DELETE 1 @ 3 : 6
-> DELETE 17 @ 29 : 30
+> DELETE 3 @ 6 : 7
-> DELETE 29 @ 42 : 44
+> DELETE 12 @ 13 : 15
-> INSERT 30 : 31 @ 45
+> INSERT 1 : 2 @ 3
+ private static long lastRefreshCommit = 0l;
-> CHANGE 41 : 42 @ 55 : 56
+> CHANGE 11 : 12 @ 10 : 11
~ this.savedServerList = ServerList.getServerList();
-> DELETE 43 @ 57 : 66
+> DELETE 2 @ 2 : 11
-> CHANGE 78 : 79 @ 101 : 108
+> CHANGE 35 : 36 @ 44 : 51
~ this.savedServerList.updateServerPing();
-> DELETE 83 @ 112 : 118
+> DELETE 5 @ 11 : 17
-> CHANGE 85 : 86 @ 120 : 121
+> CHANGE 2 : 3 @ 8 : 9
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 122 : 127 @ 157 : 158
+> CHANGE 37 : 42 @ 37 : 38
~ long millis = System.currentTimeMillis();
~ if (millis - lastRefreshCommit > 700l) {
@@ -53,11 +53,11 @@
~ this.refreshServerList();
~ }
-> CHANGE 132 : 133 @ 163 : 164
+> CHANGE 10 : 11 @ 6 : 7
~ public void refreshServerList() {
-> CHANGE 147 : 152 @ 178 : 180
+> CHANGE 15 : 20 @ 15 : 17
~ long millis = System.currentTimeMillis();
~ if (millis - lastRefreshCommit > 700l) {
@@ -65,7 +65,7 @@
~ this.refreshServerList();
~ }
-> CHANGE 167 : 172 @ 195 : 197
+> CHANGE 20 : 25 @ 17 : 19
~ long millis = System.currentTimeMillis();
~ if (millis - lastRefreshCommit > 700l) {
@@ -73,7 +73,7 @@
~ this.refreshServerList();
~ }
-> CHANGE 182 : 187 @ 207 : 209
+> CHANGE 15 : 20 @ 12 : 14
~ long millis = System.currentTimeMillis();
~ if (millis - lastRefreshCommit > 700l) {
@@ -81,33 +81,33 @@
~ this.refreshServerList();
~ }
-> DELETE 188 @ 210 : 211
+> DELETE 6 @ 3 : 4
-> CHANGE 190 : 191 @ 213 : 214
+> CHANGE 2 : 3 @ 3 : 4
~ protected void keyTyped(char parChar1, int parInt1) {
-> DELETE 209 @ 232 : 241
+> DELETE 19 @ 19 : 28
-> CHANGE 220 : 221 @ 252 : 253
+> CHANGE 11 : 12 @ 20 : 21
~ } else if (i < this.serverListSelector.getSize() - 1) {
-> DELETE 223 @ 255 : 264
+> DELETE 3 @ 3 : 12
-> DELETE 256 @ 297 : 302
+> DELETE 33 @ 42 : 47
-> DELETE 257 @ 303 : 304
+> DELETE 1 @ 6 : 7
-> CHANGE 270 : 271 @ 317 : 319
+> CHANGE 13 : 14 @ 14 : 16
~ if (guilistextended$iguilistentry != null) {
-> DELETE 277 @ 325 : 326
+> DELETE 7 @ 8 : 9
-> DELETE 279 @ 328 : 332
+> DELETE 2 @ 3 : 7
-> CHANGE 283 : 284 @ 336 : 337
+> CHANGE 4 : 5 @ 8 : 9
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java
index 07ec3b90..163ee0e5 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 10 @ 5
+> INSERT 2 : 8 @ 3
+
+ import com.google.common.collect.Lists;
@@ -16,11 +16,11 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 11 @ 6 : 12
+> DELETE 7 @ 1 : 7
-> DELETE 15 @ 16 : 18
+> DELETE 4 @ 10 : 12
-> CHANGE 123 : 124 @ 126 : 127
+> CHANGE 108 : 109 @ 110 : 111
~ for (IChatComponent ichatcomponent : (List) list) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java
index 23934c63..060e9947 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java
index 620f1fb2..9c30a106 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java
@@ -10,60 +10,60 @@
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
~ import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
-> DELETE 8 @ 7 : 24
+> DELETE 6 @ 5 : 22
-> DELETE 10 @ 26 : 27
+> DELETE 2 @ 19 : 20
-> INSERT 22 : 24 @ 39
+> INSERT 12 : 14 @ 13
+ private GuiButton notSoSuperSecret;
+ private GuiButton broadcastSettings;
-> CHANGE 70 : 72 @ 85 : 87
+> CHANGE 48 : 50 @ 46 : 48
~ this.buttonList.add(notSoSuperSecret = new GuiButton(8675309, this.width / 2 + 5, this.height / 6 + 48 - 6, 150,
~ 20, "Super Secret Settings...") {
-> CHANGE 85 : 88 @ 100 : 102
+> CHANGE 15 : 18 @ 15 : 17
~ this.buttonList.add(broadcastSettings = new GuiButton(107, this.width / 2 + 5, this.height / 6 + 72 - 6, 150,
~ 20, I18n.format(EagRuntime.getRecText(), new Object[0])));
~ broadcastSettings.enabled = EagRuntime.recSupported();
-> CHANGE 96 : 98 @ 110 : 111
+> CHANGE 11 : 13 @ 10 : 11
~ GuiButton rp;
~ this.buttonList.add(rp = new GuiButton(105, this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20,
-> CHANGE 99 : 101 @ 112 : 113
+> CHANGE 3 : 5 @ 2 : 3
~ GuiButton b;
~ this.buttonList.add(b = new GuiButton(104, this.width / 2 + 5, this.height / 6 + 144 - 6, 150, 20,
-> INSERT 102 : 103 @ 114
+> INSERT 3 : 4 @ 2
+ b.enabled = false;
-> INSERT 105 : 107 @ 116
+> INSERT 3 : 5 @ 2
+
+ rp.enabled = SYS.VFS != null;
-> CHANGE 129 : 130 @ 138 : 139
+> CHANGE 24 : 25 @ 22 : 23
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 162 : 163 @ 171 : 172
+> CHANGE 33 : 34 @ 33 : 34
~ notSoSuperSecret.displayString = "Nope!";
-> DELETE 185 @ 194 : 199
+> DELETE 23 @ 23 : 28
-> CHANGE 201 : 203 @ 215 : 222
+> CHANGE 16 : 18 @ 21 : 28
~ EagRuntime.toggleRec();
~ broadcastSettings.displayString = I18n.format(EagRuntime.getRecText(), new Object[0]);
-> DELETE 204 @ 223 : 224
+> DELETE 3 @ 8 : 9
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java
index d9325ac8..c18911f7 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
+
-> DELETE 7 @ 5 : 9
+> DELETE 4 @ 1 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java
index 0d32d828..22e9981c 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java
@@ -9,16 +9,16 @@
~ import java.text.SimpleDateFormat;
-> INSERT 4 : 6 @ 5
+> INSERT 2 : 4 @ 3
+ import java.util.Calendar;
+ import java.util.Iterator;
-> INSERT 7 : 8 @ 6
+> INSERT 3 : 4 @ 1
+ import java.util.Locale;
-> INSERT 9 : 21 @ 7
+> INSERT 2 : 14 @ 1
+ import java.util.TimeZone;
+
@@ -33,30 +33,30 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> CHANGE 26 : 29 @ 12 : 17
+> CHANGE 17 : 20 @ 5 : 10
~ import net.minecraft.client.renderer.RenderHelper;
~ import net.minecraft.client.renderer.entity.RenderManager;
~ import net.minecraft.client.resources.I18n;
-> CHANGE 30 : 32 @ 18 : 19
+> CHANGE 4 : 6 @ 6 : 7
~ import net.minecraft.entity.EntityLivingBase;
~ import net.minecraft.potion.PotionEffect;
-> CHANGE 40 : 41 @ 27 : 28
+> CHANGE 10 : 11 @ 9 : 10
~ import net.minecraft.world.biome.BiomeGenBase;
-> DELETE 42 @ 29 : 31
+> DELETE 2 @ 2 : 4
-> CHANGE 52 : 55 @ 41 : 42
+> CHANGE 10 : 13 @ 12 : 13
~ public void renderDebugInfo(ScaledResolution scaledResolutionIn, float partialTicks) {
~ int ww = scaledResolutionIn.getScaledWidth();
~ int hh = scaledResolutionIn.getScaledHeight();
-> CHANGE 56 : 79 @ 43 : 49
+> CHANGE 4 : 27 @ 2 : 8
~ if (this.mc.gameSettings.showDebugInfo) {
~ GlStateManager.pushMatrix();
@@ -82,7 +82,7 @@
~ drawPlayer(ww - 3, 3, partialTicks);
~ }
-> INSERT 81 : 105 @ 51
+> INSERT 25 : 49 @ 8
+ if (this.mc.currentScreen == null || !(this.mc.currentScreen instanceof GuiChat)) {
+ if (this.mc.gameSettings.hudStats) {
@@ -109,7 +109,7 @@
+ }
+
-> INSERT 108 : 300 @ 54
+> INSERT 27 : 219 @ 3
+ private void drawFPS(int x, int y) {
+ this.fontRenderer.drawStringWithShadow(this.mc.renderGlobal.getDebugInfoShort(), x, y, 0xFFFFFF);
@@ -304,7 +304,7 @@
+ }
+
-> INSERT 339 : 346 @ 93
+> INSERT 231 : 238 @ 39
+ if (!this.mc.gameSettings.showDebugInfo) {
+ BlockPos blockpos = new BlockPos(this.mc.getRenderViewEntity().posX,
@@ -314,41 +314,41 @@
+ }
+
-> CHANGE 356 : 357 @ 103 : 104
+> CHANGE 17 : 18 @ 10 : 11
~ HString.format("Chunk-relative: %d %d %d", new Object[] { Integer.valueOf(blockpos.getX() & 15),
-> CHANGE 382 : 383 @ 129 : 130
+> CHANGE 26 : 27 @ 26 : 27
~ HString.format("XYZ: %.3f / %.5f / %.3f",
-> CHANGE 386 : 387 @ 133 : 134
+> CHANGE 4 : 5 @ 4 : 5
~ HString.format("Block: %d %d %d",
-> CHANGE 389 : 390 @ 136 : 137
+> CHANGE 3 : 4 @ 3 : 4
~ HString.format("Chunk: %d %d %d in %d %d %d",
-> CHANGE 393 : 394 @ 140 : 141
+> CHANGE 4 : 5 @ 4 : 5
~ HString.format("Facing: %s (%s) (%.1f / %.1f)",
-> CHANGE 399 : 400 @ 146 : 147
+> CHANGE 6 : 7 @ 6 : 7
~ arraylist.add("Biome: " + chunk.getBiome(blockpos).biomeName);
-> CHANGE 404 : 405 @ 151 : 161
+> CHANGE 5 : 6 @ 5 : 15
~ arraylist.add(HString.format("Local Difficulty: %.2f (Day %d)",
-> DELETE 409 @ 165 : 169
+> DELETE 5 @ 14 : 18
-> CHANGE 413 : 414 @ 173 : 174
+> CHANGE 4 : 5 @ 8 : 9
~ arraylist.add(HString.format("Looking at: %d %d %d", new Object[] { Integer.valueOf(blockpos1.getX()),
-> CHANGE 422 : 450 @ 182 : 199
+> CHANGE 9 : 37 @ 9 : 26
~ ArrayList arraylist;
~ if (EagRuntime.getPlatformType() != EnumPlatformType.JAVASCRIPT) {
@@ -379,6 +379,6 @@
~ EaglercraftGPU.glGetString(7937), EaglercraftGPU.glGetString(7938) });
~ }
-> DELETE 458 @ 207 : 211
+> DELETE 36 @ 25 : 29
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java
index 45ec92e7..f1dc16ff 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java
@@ -10,10 +10,10 @@
+ import java.util.List;
+
-> CHANGE 8 : 9 @ 6 : 7
+> CHANGE 6 : 7 @ 4 : 5
~
-> DELETE 10 @ 8 : 16
+> DELETE 2 @ 2 : 10
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java
index c3e3ab1a..183949d8 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> INSERT 4 : 10 @ 7
+> INSERT 2 : 8 @ 5
+
+ import com.google.common.collect.ComparisonChain;
@@ -16,35 +16,35 @@
+ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 11 @ 8 : 10
+> DELETE 7 @ 1 : 3
-> DELETE 13 @ 12 : 13
+> DELETE 2 @ 4 : 5
-> CHANGE 59 : 60 @ 59 : 60
+> CHANGE 46 : 47 @ 47 : 48
~ for (NetworkPlayerInfo networkplayerinfo : (List) list) {
-> CHANGE 80 : 81 @ 80 : 82
+> CHANGE 21 : 22 @ 21 : 23
~ boolean flag = true;
-> CHANGE 101 : 102 @ 102 : 103
+> CHANGE 21 : 22 @ 22 : 23
~ for (String s : (List) list1) {
-> CHANGE 109 : 110 @ 110 : 111
+> CHANGE 8 : 9 @ 8 : 9
~ for (String s2 : (List) list2) {
-> CHANGE 118 : 119 @ 119 : 120
+> CHANGE 9 : 10 @ 9 : 10
~ for (String s3 : (List) list1) {
-> CHANGE 151 : 152 @ 152 : 153
+> CHANGE 33 : 34 @ 33 : 34
~ if (entityplayer == null || entityplayer.isWearing(EnumPlayerModelParts.HAT)) {
-> CHANGE 185 : 186 @ 186 : 187
+> CHANGE 34 : 35 @ 34 : 35
~ for (String s4 : (List) list2) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java
index 6e36ea3e..2d39dfb5 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java
@@ -7,24 +7,24 @@
> DELETE 2 @ 2 : 4
-> INSERT 3 : 7 @ 5
+> INSERT 1 : 5 @ 3
+
+ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+ import net.lax1dude.eaglercraft.v1_8.Keyboard;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 8 @ 6 : 7
+> DELETE 5 @ 1 : 2
-> DELETE 9 @ 8 : 9
+> DELETE 1 @ 2 : 3
-> DELETE 21 @ 21 : 22
+> DELETE 12 @ 13 : 14
-> CHANGE 91 : 92 @ 92 : 93
+> CHANGE 70 : 71 @ 71 : 72
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 113 : 114 @ 114 : 115
+> CHANGE 22 : 23 @ 22 : 23
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java
index 681a62af..c0406de9 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 5
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java
index 681a62af..c0406de9 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 5
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java
index 681a62af..c0406de9 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 5
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
index e23cddc5..fe02855d 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 11
-> DELETE 3 @ 12 : 14
+> DELETE 1 @ 10 : 12
-> INSERT 7 : 22 @ 18
+> INSERT 4 : 19 @ 6
+
+ import org.apache.commons.lang3.StringUtils;
@@ -27,24 +27,24 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> CHANGE 23 : 24 @ 19 : 27
+> CHANGE 16 : 17 @ 1 : 9
~ import net.minecraft.client.gui.inventory.GuiContainer;
-> DELETE 26 @ 29 : 30
+> DELETE 3 @ 10 : 11
-> INSERT 28 : 29 @ 32
+> INSERT 2 : 3 @ 3
+ import net.minecraft.client.resources.I18n;
-> DELETE 42 @ 45 : 51
+> DELETE 14 @ 13 : 19
-> CHANGE 59 : 61 @ 68 : 69
+> CHANGE 17 : 19 @ 23 : 24
~ private String clickedLinkURI;
~ protected long showingCloseKey = 0;
-> INSERT 71 : 101 @ 79
+> INSERT 12 : 42 @ 11
+ long millis = System.currentTimeMillis();
+ long closeKeyTimeout = millis - showingCloseKey;
@@ -77,7 +77,7 @@
+ }
+
-> CHANGE 103 : 115 @ 81 : 83
+> CHANGE 32 : 44 @ 2 : 4
~ protected int getCloseKey() {
~ if (this instanceof GuiContainer) {
@@ -92,26 +92,26 @@
~ || parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
~ || (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) {
-> INSERT 119 : 121 @ 87
+> INSERT 16 : 18 @ 6
+ } else if (parInt1 == 1) {
+ showingCloseKey = System.currentTimeMillis();
-> DELETE 122 @ 88 : 89
+> DELETE 3 @ 1 : 2
-> CHANGE 125 : 126 @ 92 : 102
+> CHANGE 3 : 4 @ 4 : 14
~ return EagRuntime.getClipboard();
-> CHANGE 130 : 131 @ 106 : 113
+> CHANGE 5 : 6 @ 14 : 21
~ EagRuntime.setClipboard(copyText);
-> INSERT 307 : 308 @ 289
+> INSERT 177 : 178 @ 183
+ String uri = clickevent.getValue();
-> CHANGE 309 : 314 @ 290 : 311
+> CHANGE 2 : 7 @ 1 : 22
~ if (this.mc.gameSettings.chatLinksPrompt) {
~ this.clickedLinkURI = uri;
@@ -119,11 +119,11 @@
~ } else {
~ this.openWebLink(uri);
-> CHANGE 316 : 317 @ 313 : 315
+> CHANGE 7 : 8 @ 23 : 25
~ // rip
-> CHANGE 322 : 329 @ 320 : 326
+> CHANGE 6 : 13 @ 7 : 13
~ /*
~ * ChatUserInfo chatuserinfo =
@@ -133,15 +133,15 @@
~ */
~ LOGGER.error("Tried to handle twitch user but couldn\'t find them!");
-> CHANGE 352 : 353 @ 349 : 350
+> CHANGE 30 : 31 @ 29 : 30
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> CHANGE 377 : 378 @ 374 : 375
+> CHANGE 25 : 26 @ 25 : 26
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 497 : 499 @ 494 : 503
+> CHANGE 120 : 122 @ 120 : 129
~ private void openWebLink(String parURI) {
~ EagRuntime.openLink(parURI);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java
index 26d1a585..2820fb6d 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java
@@ -10,27 +10,27 @@
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
-> DELETE 6 @ 10 : 11
+> DELETE 4 @ 8 : 9
-> CHANGE 13 : 14 @ 18 : 37
+> CHANGE 7 : 8 @ 8 : 27
~ private GuiButton hideAddress;
-> INSERT 27 : 28 @ 50
+> INSERT 14 : 15 @ 32
+ int i = 80;
-> CHANGE 29 : 32 @ 51 : 52
+> CHANGE 2 : 5 @ 1 : 2
~ GuiButton done;
~ GuiButton cancel;
~ this.buttonList.add(done = new GuiButton(0, this.width / 2 - 100, i + 96 + 12,
-> CHANGE 33 : 34 @ 53 : 54
+> CHANGE 4 : 5 @ 2 : 3
~ this.buttonList.add(cancel = new GuiButton(1, this.width / 2 - 100, i + 120 + 12,
-> CHANGE 35 : 42 @ 55 : 56
+> CHANGE 2 : 9 @ 2 : 3
~ if (EagRuntime.requireSSL()) {
~ done.yPosition = cancel.yPosition;
@@ -40,21 +40,21 @@
~ }
~ this.buttonList.add(this.serverResourcePacks = new GuiButton(2, this.width / 2 - 100, i + 54,
-> INSERT 44 : 47 @ 58
+> INSERT 9 : 12 @ 3
+ this.buttonList.add(this.hideAddress = new GuiButton(3, this.width / 2 - 100, i + 78,
+ I18n.format("addServer.hideAddress", new Object[0]) + ": "
+ + I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0])));
-> CHANGE 53 : 54 @ 64 : 67
+> CHANGE 9 : 10 @ 6 : 9
~ ((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0;
-> CHANGE 60 : 61 @ 73 : 74
+> CHANGE 7 : 8 @ 9 : 10
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 62 : 67 @ 75 : 76
+> CHANGE 2 : 7 @ 2 : 3
~ if (parGuiButton.id == 3) {
~ this.serverData.hideAddress = !this.serverData.hideAddress;
@@ -62,24 +62,24 @@
~ + I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]);
~ } else if (parGuiButton.id == 2) {
-> CHANGE 75 : 77 @ 84 : 86
+> CHANGE 13 : 15 @ 9 : 11
~ this.serverData.serverName = this.serverNameField.getText().trim();
~ this.serverData.serverIP = this.serverIPField.getText().trim();
-> CHANGE 83 : 84 @ 92 : 93
+> CHANGE 8 : 9 @ 8 : 9
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 95 : 96 @ 104 : 106
+> CHANGE 12 : 13 @ 12 : 14
~ ((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0;
-> CHANGE 98 : 99 @ 108 : 109
+> CHANGE 3 : 4 @ 4 : 5
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> INSERT 112 : 118 @ 122
+> INSERT 14 : 20 @ 14
+ if (EagRuntime.requireSSL()) {
+ this.drawCenteredString(this.fontRendererObj, I18n.format("addServer.SSLWarn1"), this.width / 2, 184,
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java
index d4e8314f..c48dfd89 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 6
-> INSERT 3 : 13 @ 7
+> INSERT 1 : 11 @ 5
+
+ import org.json.JSONException;
@@ -20,25 +20,25 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 14 @ 8 : 12
+> DELETE 11 @ 1 : 5
-> DELETE 30 @ 28 : 31
+> DELETE 16 @ 20 : 23
-> CHANGE 169 : 170 @ 170 : 171
+> CHANGE 139 : 140 @ 142 : 143
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 208 : 209 @ 209 : 211
+> CHANGE 39 : 40 @ 39 : 41
~ protected void keyTyped(char parChar1, int parInt1) {
-> DELETE 215 @ 217 : 218
+> DELETE 7 @ 8 : 9
-> CHANGE 344 : 345 @ 347 : 348
+> CHANGE 129 : 130 @ 130 : 131
~ } catch (JSONException var13) {
-> CHANGE 379 : 380 @ 382 : 383
+> CHANGE 35 : 36 @ 35 : 36
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java
index a1262065..ca0d2615 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java
@@ -9,9 +9,9 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 7 : 10
+> DELETE 5 @ 5 : 8
-> CHANGE 44 : 45 @ 47 : 48
+> CHANGE 37 : 38 @ 40 : 41
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java
index 599ec22b..a9c92674 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java
@@ -9,9 +9,9 @@
~ import java.io.ByteArrayInputStream;
-> DELETE 4 @ 5 : 6
+> DELETE 2 @ 3 : 4
-> CHANGE 7 : 15 @ 9 : 14
+> CHANGE 3 : 11 @ 4 : 9
~
~ import com.google.common.collect.Lists;
@@ -22,43 +22,43 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 20 @ 19 : 23
+> DELETE 13 @ 10 : 14
-> CHANGE 35 : 37 @ 38 : 39
+> CHANGE 15 : 17 @ 19 : 20
~ GuiButton btn;
~ this.buttonList.add(btn = new GuiOptionButton(2, this.width / 2 - 154, this.height - 48,
-> INSERT 38 : 39 @ 40
+> INSERT 3 : 4 @ 2
+ btn.enabled = SYS.VFS != null;
-> CHANGE 49 : 50 @ 50 : 51
+> CHANGE 11 : 12 @ 10 : 11
~ for (ResourcePackRepository.Entry resourcepackrepository$entry : (List) arraylist) {
-> CHANGE 94 : 95 @ 95 : 96
+> CHANGE 45 : 46 @ 45 : 46
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 97 : 100 @ 98 : 135
+> CHANGE 3 : 6 @ 3 : 40
~ if (SYS.VFS == null)
~ return;
~ EagRuntime.displayFileChooser("application/zip", "zip");
-> CHANGE 115 : 116 @ 150 : 151
+> CHANGE 18 : 19 @ 52 : 53
~ for (ResourcePackRepository.Entry resourcepackrepository$entry : (List) arraylist) {
-> INSERT 122 : 124 @ 157
+> INSERT 7 : 9 @ 7
+ this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
+ I18n.format("resourcePack.load.pleaseWait"));
-> DELETE 127 @ 160 : 161
+> DELETE 5 @ 3 : 4
-> CHANGE 133 : 173 @ 167 : 168
+> CHANGE 6 : 46 @ 7 : 8
~ public void updateScreen() {
~ FileChooserResult packFile = null;
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java
index c0cc544d..89970bbd 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java
@@ -10,9 +10,9 @@
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
-> DELETE 6 @ 8 : 9
+> DELETE 4 @ 6 : 7
-> CHANGE 28 : 34 @ 31 : 32
+> CHANGE 22 : 28 @ 23 : 24
~ if (EagRuntime.requireSSL()) {
~ this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, this.height / 4 + 35,
@@ -21,31 +21,31 @@
~ this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, 116, 200, 20);
~ }
-> CHANGE 37 : 38 @ 35 : 37
+> CHANGE 9 : 10 @ 4 : 6
~ ((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0;
-> CHANGE 46 : 47 @ 45 : 46
+> CHANGE 9 : 10 @ 10 : 11
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 51 : 52 @ 50 : 51
+> CHANGE 5 : 6 @ 5 : 6
~ this.field_146301_f.serverIP = this.field_146302_g.getText().trim();
-> CHANGE 58 : 59 @ 57 : 58
+> CHANGE 7 : 8 @ 7 : 8
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 60 : 61 @ 59 : 61
+> CHANGE 2 : 3 @ 2 : 4
~ ((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0;
-> CHANGE 67 : 68 @ 67 : 68
+> CHANGE 7 : 8 @ 8 : 9
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> CHANGE 76 : 87 @ 76 : 78
+> CHANGE 9 : 20 @ 9 : 11
~ if (EagRuntime.requireSSL()) {
~ this.drawString(this.fontRendererObj, I18n.format("addServer.enterIp", new Object[0]), this.width / 2 - 100,
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java
index b76dcef3..bc6bfa4e 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 5
-> CHANGE 13 : 14 @ 16 : 17
+> CHANGE 11 : 12 @ 14 : 15
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 30 : 31 @ 33 : 34
+> CHANGE 17 : 18 @ 17 : 18
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
index 757e8ffb..9766009d 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
@@ -13,19 +13,19 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 8 @ 3 : 6
+> DELETE 6 @ 1 : 4
-> DELETE 9 @ 7 : 8
+> DELETE 1 @ 4 : 5
-> DELETE 11 @ 10 : 11
+> DELETE 2 @ 3 : 4
-> INSERT 13 : 16 @ 13
+> INSERT 2 : 5 @ 3
+
+ private static final Logger excLogger = LogManager.getLogger("GuiSlotRenderer");
+
-> CHANGE 397 : 404 @ 394 : 395
+> CHANGE 384 : 391 @ 381 : 382
~ try {
~ this.drawSlot(j, mouseXIn, k, l, parInt3, parInt4);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java
index 0b0539a4..e360253b 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
-> DELETE 8 @ 9 : 10
+> DELETE 4 @ 6 : 7
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java
index cc97fc86..e0da413b 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java
@@ -11,13 +11,13 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 8 @ 10 : 11
+> DELETE 4 @ 6 : 7
-> CHANGE 19 : 20 @ 22 : 23
+> CHANGE 11 : 12 @ 12 : 13
~ protected String text = "";
-> INSERT 64 : 76 @ 67
+> INSERT 45 : 57 @ 45
+ public void updateText(String parString1) {
+ if (this.field_175209_y.apply(parString1)) {
@@ -32,15 +32,15 @@
+ }
+
-> CHANGE 429 : 432 @ 420 : 421
+> CHANGE 365 : 368 @ 353 : 354
~ GlStateManager.color(0.2F, 0.2F, 1.0F, 1.0F);
~ GlStateManager.enableBlend();
~ GlStateManager.blendFunc(775, 770);
-> DELETE 433 @ 422 : 424
+> DELETE 4 @ 2 : 4
-> CHANGE 439 : 440 @ 430 : 431
+> CHANGE 6 : 7 @ 8 : 9
~ GlStateManager.disableBlend();
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java
index 6ed2506a..409f927d 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Lists;
+
-> DELETE 8 @ 6 : 7
+> DELETE 4 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java
index 653748a6..97211646 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java
@@ -9,7 +9,7 @@
~
-> CHANGE 16 : 21 @ 21 : 24
+> CHANGE 13 : 18 @ 18 : 21
~ GameSettings.Options.PARTICLES, GameSettings.Options.FXAA, GameSettings.Options.MIPMAP_LEVELS,
~ GameSettings.Options.BLOCK_ALTERNATIVES, GameSettings.Options.ENTITY_SHADOWS, GameSettings.Options.FOG,
@@ -17,28 +17,28 @@
~ GameSettings.Options.HUD_STATS, GameSettings.Options.HUD_WORLD, GameSettings.Options.HUD_24H,
~ GameSettings.Options.CHUNK_FIX };
-> CHANGE 32 : 34 @ 35 : 38
+> CHANGE 16 : 18 @ 14 : 17
~ GameSettings.Options[] agamesettings$options = new GameSettings.Options[videoOptions.length];
~ int i = 0;
-> CHANGE 35 : 38 @ 39 : 53
+> CHANGE 3 : 6 @ 4 : 18
~ for (GameSettings.Options gamesettings$options : videoOptions) {
~ agamesettings$options[i] = gamesettings$options;
~ ++i;
-> INSERT 40 : 43 @ 55
+> INSERT 5 : 8 @ 16
+ this.optionsRowList = new GuiOptionsRowList(this.mc, this.width, this.height, 32, this.height - 32, 25,
+ agamesettings$options);
+
-> CHANGE 50 : 51 @ 62 : 63
+> CHANGE 10 : 11 @ 7 : 8
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 60 : 61 @ 72 : 73
+> CHANGE 10 : 11 @ 10 : 11
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java
index b1648cd5..c36695ed 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 5
+> DELETE 1 @ 2 : 3
-> CHANGE 6 : 16 @ 8 : 9
+> CHANGE 3 : 13 @ 4 : 5
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
@@ -22,25 +22,25 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
-> DELETE 18 @ 11 : 14
+> DELETE 12 @ 3 : 6
-> DELETE 19 @ 15 : 16
+> DELETE 1 @ 4 : 5
-> DELETE 23 @ 20 : 23
+> DELETE 4 @ 5 : 8
-> CHANGE 51 : 52 @ 51 : 52
+> CHANGE 28 : 29 @ 31 : 32
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 80 : 81 @ 80 : 81
+> CHANGE 29 : 30 @ 29 : 30
~ EaglercraftRandom random = new EaglercraftRandom(8124371L);
-> CHANGE 85 : 86 @ 85 : 86
+> CHANGE 5 : 6 @ 5 : 6
~ for (s = s.replaceAll("PLAYERNAME", EaglerProfile.getName()); s
-> CHANGE 108 : 109 @ 108 : 109
+> CHANGE 23 : 24 @ 23 : 24
~ s = s.replaceAll("PLAYERNAME", EaglerProfile.getName());
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java
index f4c43e1e..8f882f7e 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java
@@ -7,21 +7,21 @@
> DELETE 2 @ 2 : 4
-> CHANGE 3 : 6 @ 5 : 9
+> CHANGE 1 : 4 @ 3 : 7
~
~ import com.google.common.collect.Lists;
~
-> INSERT 17 : 18 @ 20
+> INSERT 14 : 15 @ 15
+ private boolean opaqueBackground = false;
-> CHANGE 46 : 47 @ 48 : 49
+> CHANGE 29 : 30 @ 28 : 29
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 51 : 56 @ 53 : 54
+> CHANGE 5 : 10 @ 5 : 6
~ if (opaqueBackground) {
~ this.drawBackground(0);
@@ -29,7 +29,7 @@
~ this.drawDefaultBackground();
~ }
-> INSERT 85 : 90 @ 83
+> INSERT 34 : 39 @ 30
+
+ public GuiYesNo withOpaqueBackground() {
diff --git a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java
index 0fe1c8c3..58171ce4 100644
--- a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 8 @ 4
+> INSERT 1 : 6 @ 2
+
+ import com.google.common.collect.Maps;
@@ -15,23 +15,23 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 9 @ 5 : 6
+> DELETE 6 @ 1 : 2
-> DELETE 10 @ 7 : 8
+> DELETE 1 @ 2 : 3
-> INSERT 75 : 76 @ 73
+> INSERT 65 : 66 @ 66
+ int c;
-> CHANGE 77 : 78 @ 74 : 75
+> CHANGE 2 : 3 @ 1 : 2
~ c = (i + i / 128 & 1) * 8 + 16 << 24;
-> CHANGE 79 : 80 @ 76 : 77
+> CHANGE 2 : 3 @ 2 : 3
~ c = MapColor.mapColorArray[j / 4].func_151643_b(j & 3);
-> INSERT 81 : 82 @ 78
+> INSERT 2 : 3 @ 2
+ this.mapTextureData[i] = (c & 0xFF00FF00) | ((c & 0x00FF0000) >> 16) | ((c & 0x000000FF) << 16);
diff --git a/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java b/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java
index bea096f5..4432ef38 100644
--- a/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 7
-> CHANGE 41 : 42 @ 46 : 47
+> CHANGE 39 : 40 @ 44 : 45
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java
index 3b027ac8..6933734e 100644
--- a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java
@@ -7,32 +7,32 @@
> DELETE 2 @ 2 : 10
-> CHANGE 3 : 7 @ 11 : 13
+> CHANGE 1 : 5 @ 9 : 11
~
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 8 @ 14 : 18
+> DELETE 5 @ 3 : 7
-> CHANGE 9 : 10 @ 19 : 22
+> CHANGE 1 : 2 @ 5 : 8
~ import net.minecraft.client.resources.I18n;
-> DELETE 12 @ 24 : 27
+> DELETE 3 @ 5 : 8
-> DELETE 15 @ 30 : 32
+> DELETE 3 @ 6 : 8
-> DELETE 21 @ 38 : 39
+> DELETE 6 @ 8 : 9
-> DELETE 22 @ 40 : 41
+> DELETE 1 @ 2 : 3
-> DELETE 28 @ 47 : 49
+> DELETE 6 @ 7 : 9
-> DELETE 36 @ 57 : 74
+> DELETE 8 @ 10 : 27
-> CHANGE 44 : 54 @ 82 : 85
+> CHANGE 8 : 18 @ 25 : 28
~ for (int k1 = 0; k1 < 2; ++k1) {
~ if (k1 < list.size()) {
@@ -45,32 +45,32 @@
~ j + 32 + 3, k + 12 + this.mc.fontRendererObj.FONT_HEIGHT * k1 + k1, 0x444444);
~ }
-> CHANGE 103 : 107 @ 134 : 139
+> CHANGE 59 : 63 @ 52 : 57
~ if (this.mc.gameSettings.touchscreen || flag) {
~ GlStateManager.enableShaderBlendAdd();
~ GlStateManager.setShaderBlendSrc(0.6f, 0.6f, 0.6f, 1.0f);
~ GlStateManager.setShaderBlendAdd(0.3f, 0.3f, 0.3f, 0.0f);
-> CHANGE 108 : 110 @ 140 : 143
+> CHANGE 5 : 7 @ 6 : 9
~ if (field_148301_e.iconTextureObject != null) {
~ this.func_178012_a(j, k, field_148301_e.iconResourceLocation);
-> INSERT 113 : 116 @ 146
+> INSERT 5 : 8 @ 6
+ if (this.mc.gameSettings.touchscreen || flag) {
+ GlStateManager.disableShaderBlendAdd();
+ }
-> CHANGE 127 : 128 @ 157 : 158
+> CHANGE 14 : 15 @ 11 : 12
~ // Gui.drawRect(j, k, j + 32, k + 32, -1601138544);
-> INSERT 161 : 162 @ 191
+> INSERT 34 : 35 @ 34
+ GlStateManager.blendFunc(770, 771);
-> DELETE 170 @ 199 : 238
+> DELETE 9 @ 8 : 47
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java b/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java
index 71fadd98..b7f017a0 100644
--- a/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java
@@ -7,26 +7,26 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
+
-> DELETE 7 @ 5 : 10
+> DELETE 4 @ 1 : 6
-> DELETE 8 @ 11 : 12
+> DELETE 1 @ 6 : 7
-> DELETE 12 @ 16 : 18
+> DELETE 4 @ 5 : 7
-> CHANGE 21 : 22 @ 27 : 38
+> CHANGE 9 : 10 @ 11 : 22
~ return (GuiListExtended.IGuiListEntry) this.field_148198_l.get(i);
-> CHANGE 25 : 26 @ 41 : 42
+> CHANGE 4 : 5 @ 14 : 15
~ return this.field_148198_l.size();
-> DELETE 49 @ 65 : 74
+> DELETE 24 @ 24 : 33
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java
index 31c62b44..9641888d 100644
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java
@@ -9,9 +9,9 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 5 : 6
+> DELETE 4 @ 3 : 4
-> INSERT 120 : 152 @ 120
+> INSERT 114 : 146 @ 115
+ public int getHeight() {
+ if (this.theAchievement != null && this.notificationTime != 0L && Minecraft.getMinecraft().thePlayer != null) {
diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java
index 6d54191a..af7374f6 100644
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java
@@ -13,52 +13,52 @@
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 13 @ 10 : 11
+> DELETE 11 @ 8 : 9
-> DELETE 14 @ 12 : 13
+> DELETE 1 @ 2 : 3
-> DELETE 24 @ 23 : 24
+> DELETE 10 @ 11 : 12
-> CHANGE 67 : 68 @ 67 : 68
+> CHANGE 43 : 44 @ 44 : 45
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 76 : 78 @ 76 : 84
+> CHANGE 9 : 11 @ 9 : 17
~ protected int getCloseKey() {
~ return this.mc.gameSettings.keyBindInventory.getKeyCode();
-> CHANGE 154 : 155 @ 160 : 161
+> CHANGE 78 : 79 @ 84 : 85
~ GlStateManager.disableLighting();
-> INSERT 216 : 220 @ 222
+> INSERT 62 : 66 @ 62
+ GlStateManager.enableDepth();
+ GlStateManager.clearDepth(0.0f);
+ GlStateManager.clear(256);
+ GlStateManager.clearDepth(1.0f);
-> CHANGE 237 : 238 @ 239 : 240
+> CHANGE 21 : 22 @ 17 : 18
~ EaglercraftRandom random = new EaglercraftRandom();
-> CHANGE 246 : 248 @ 248 : 249
+> CHANGE 9 : 11 @ 9 : 10
~ random.setSeed(
~ (long) (this.mc.getSession().getProfile().getId().hashCode() + k1 + l2 + (l1 + k2) * 16));
-> CHANGE 249 : 250 @ 250 : 251
+> CHANGE 3 : 4 @ 2 : 3
~ EaglerTextureAtlasSprite textureatlassprite = this.func_175371_a(Blocks.sand);
-> DELETE 276 @ 277 : 278
+> DELETE 27 @ 27 : 28
-> CHANGE 434 : 435 @ 436 : 437
+> CHANGE 158 : 159 @ 159 : 160
~ GlStateManager.disableBlend();
-> CHANGE 438 : 439 @ 440 : 441
+> CHANGE 4 : 5 @ 4 : 5
~ private EaglerTextureAtlasSprite func_175371_a(Block parBlock) {
diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java
index 8037666f..d32d9a5b 100644
--- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 6 : 12 @ 7
+> INSERT 4 : 10 @ 5
+
+ import com.google.common.collect.Lists;
@@ -16,13 +16,13 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 18 @ 13 : 14
+> DELETE 12 @ 6 : 7
-> DELETE 20 @ 16 : 17
+> DELETE 2 @ 3 : 4
-> DELETE 31 @ 28 : 29
+> DELETE 11 @ 12 : 13
-> CHANGE 102 : 103 @ 100 : 101
+> CHANGE 71 : 72 @ 72 : 73
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java
index 9f63b8bd..4dfe5c00 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java
@@ -12,11 +12,11 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 9 @ 7 : 9
+> DELETE 7 @ 5 : 7
-> DELETE 21 @ 21 : 23
+> DELETE 12 @ 14 : 16
-> CHANGE 101 : 102 @ 103 : 104
+> CHANGE 80 : 81 @ 82 : 83
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java
index 23934c63..060e9947 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java
index 3ea91daa..9c29f367 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> INSERT 3 : 11 @ 5
+> INSERT 1 : 9 @ 3
+
+ import com.google.common.collect.Sets;
@@ -18,37 +18,37 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 13 @ 7 : 9
+> DELETE 10 @ 2 : 4
-> DELETE 14 @ 10 : 11
+> DELETE 1 @ 3 : 4
-> DELETE 22 @ 19 : 20
+> DELETE 8 @ 9 : 10
-> INSERT 103 : 104 @ 101
+> INSERT 81 : 82 @ 82
+ GlStateManager.enableAlpha();
-> CHANGE 211 : 212 @ 208 : 209
+> CHANGE 108 : 109 @ 107 : 108
~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks().getAtlasSprite(s1);
-> CHANGE 268 : 269 @ 265 : 266
+> CHANGE 57 : 58 @ 57 : 58
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> CHANGE 504 : 508 @ 501 : 503
+> CHANGE 236 : 240 @ 236 : 238
~ protected void keyTyped(char parChar1, int parInt1) {
~ if (parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
~ || parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode()
~ || (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) {
-> CHANGE 509 : 511 @ 504 : 512
+> CHANGE 5 : 7 @ 3 : 11
~ if (this.mc.currentScreen == null) {
~ this.mc.setIngameFocus();
-> INSERT 512 : 523 @ 513
+> INSERT 3 : 14 @ 9
+ } else if (parInt1 == 1) {
+ showingCloseKey = System.currentTimeMillis();
@@ -62,6 +62,6 @@
+ }
+ }
-> DELETE 524 @ 514 : 515
+> DELETE 12 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java
index ad8bfd34..752b751f 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 6 : 12 @ 7
+> INSERT 4 : 10 @ 5
+
+ import com.google.common.collect.Lists;
@@ -16,21 +16,21 @@
+ import net.lax1dude.eaglercraft.v1_8.Mouse;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 16 @ 11 : 14
+> DELETE 10 @ 4 : 7
-> DELETE 35 @ 33 : 35
+> DELETE 19 @ 22 : 24
-> CHANGE 221 : 222 @ 221 : 222
+> CHANGE 186 : 187 @ 188 : 189
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 235 : 238 @ 235 : 236
+> CHANGE 14 : 17 @ 14 : 15
~ if (parInt1 == getCloseKey()) {
~ mc.displayGuiScreen(null);
~ } else if (!this.checkHotbarKeys(parInt1)) {
-> INSERT 248 : 253 @ 246
+> INSERT 13 : 18 @ 11
+ protected int getCloseKey() {
+ return selectedTabIndex != CreativeTabs.tabAllSearch.getTabIndex() ? super.getCloseKey()
@@ -38,11 +38,11 @@
+ }
+
-> CHANGE 302 : 303 @ 295 : 296
+> CHANGE 54 : 55 @ 49 : 50
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
-> CHANGE 625 : 626 @ 618 : 619
+> CHANGE 323 : 324 @ 323 : 324
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java
index f6532b6f..759c7181 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 8 @ 7 : 8
+> DELETE 6 @ 5 : 6
-> DELETE 15 @ 15 : 16
+> DELETE 7 @ 8 : 9
-> CHANGE 49 : 50 @ 50 : 51
+> CHANGE 34 : 35 @ 35 : 36
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 59 : 60 @ 60 : 61
+> CHANGE 10 : 11 @ 10 : 11
~ protected void keyTyped(char parChar1, int parInt1) {
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java
index 0d9d03e9..a6114a41 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java
@@ -10,19 +10,19 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 8 @ 7 : 9
+> DELETE 6 @ 5 : 7
-> DELETE 9 @ 10 : 11
+> DELETE 1 @ 3 : 4
-> INSERT 58 : 59 @ 60
+> INSERT 49 : 50 @ 50
+ GlStateManager.enableDepth();
-> INSERT 61 : 62 @ 62
+> INSERT 3 : 4 @ 2
+ GlStateManager.disableDepth();
-> CHANGE 104 : 105 @ 104 : 105
+> CHANGE 43 : 44 @ 42 : 43
~ protected void actionPerformed(GuiButton parGuiButton) {
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java
index 89ce3a05..cf673805 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 6
+> CHANGE 1 : 4 @ 2 : 4
~
~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java
index 1742fa43..1d215bf1 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java
@@ -10,13 +10,13 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 6 : 9
+> DELETE 5 @ 4 : 7
-> DELETE 14 @ 16 : 17
+> DELETE 7 @ 10 : 11
-> DELETE 17 @ 20 : 22
+> DELETE 3 @ 4 : 6
-> CHANGE 28 : 30 @ 33 : 34
+> CHANGE 11 : 13 @ 13 : 14
~ Minecraft.getMinecraft().getTextureManager().bindTexture(
~ Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(profile).getResourceLocation());
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java
index 4cc7924b..7306f238 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 4
-> INSERT 4 : 8 @ 6
+> INSERT 2 : 6 @ 4
+
+ import com.google.common.base.Objects;
+ import com.google.common.collect.Lists;
+
-> DELETE 11 @ 9 : 13
+> DELETE 7 @ 3 : 7
> EOF
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java
index ffa8afe6..73ff2d67 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.base.Objects;
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java
index f31a944c..ee5bb33e 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> INSERT 5 : 10 @ 8
+> INSERT 3 : 8 @ 6
+
+ import com.google.common.collect.ComparisonChain;
diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java
index 086f2768..f869793c 100644
--- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java
+++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 8 @ 4 : 5
+> CHANGE 1 : 6 @ 2 : 3
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
@@ -15,18 +15,18 @@
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 16 @ 13 : 14
+> DELETE 13 @ 9 : 10
-> DELETE 17 @ 15 : 16
+> DELETE 1 @ 2 : 3
-> INSERT 83 : 87 @ 82
+> INSERT 66 : 70 @ 67
+ this.field_178677_c = DefaultPlayerSkin.getDefaultSkinLegacy();
+
+ // TODO: program team skins
+
-> CHANGE 88 : 93 @ 83 : 87
+> CHANGE 5 : 10 @ 1 : 5
~ // String s1 = ((NetworkPlayerInfo) this.field_178675_d
~ // .get((new
@@ -34,7 +34,7 @@
~ // this.field_178677_c = AbstractClientPlayer.getLocationSkin(s1);
~ // AbstractClientPlayer.getDownloadImageSkin(this.field_178677_c, s1);
-> CHANGE 94 : 95 @ 88 : 89
+> CHANGE 6 : 7 @ 5 : 6
~ // this.field_178677_c = DefaultPlayerSkin.getDefaultSkinLegacy();
diff --git a/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java b/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java
index ac5fed07..ce4bfa70 100644
--- a/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java
+++ b/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java
@@ -7,28 +7,28 @@
> DELETE 2 @ 2 : 5
-> DELETE 7 @ 10 : 11
+> DELETE 5 @ 8 : 9
-> DELETE 8 @ 12 : 13
+> DELETE 1 @ 2 : 3
-> CHANGE 10 : 11 @ 15 : 17
+> CHANGE 2 : 3 @ 3 : 5
~ GameConfiguration.DisplayInformation displayInfoIn, GameConfiguration.GameInformation gameInfoIn) {
-> DELETE 13 @ 19 : 20
+> DELETE 3 @ 4 : 5
-> DELETE 14 @ 21 : 22
+> DELETE 1 @ 2 : 3
-> DELETE 30 @ 38 : 52
+> DELETE 16 @ 17 : 31
-> DELETE 40 @ 62 : 72
+> DELETE 10 @ 24 : 34
-> DELETE 42 @ 74 : 77
+> DELETE 2 @ 12 : 15
-> CHANGE 43 : 44 @ 78 : 80
+> CHANGE 1 : 2 @ 4 : 6
~ public UserInformation(Session parSession) {
-> DELETE 45 @ 81 : 84
+> DELETE 2 @ 3 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/main/Main.edit.java b/patches/minecraft/net/minecraft/client/main/Main.edit.java
index 88042d4e..09755ea5 100644
--- a/patches/minecraft/net/minecraft/client/main/Main.edit.java
+++ b/patches/minecraft/net/minecraft/client/main/Main.edit.java
@@ -9,23 +9,23 @@
~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
-> DELETE 4 @ 18 : 19
+> DELETE 2 @ 16 : 17
-> CHANGE 7 : 8 @ 22 : 23
+> CHANGE 3 : 4 @ 4 : 5
~ public static void appMain(String[] astring) {
-> DELETE 9 @ 24 : 68
+> DELETE 2 @ 2 : 46
-> DELETE 10 @ 69 : 119
+> DELETE 1 @ 45 : 95
-> CHANGE 11 : 15 @ 120 : 131
+> CHANGE 1 : 5 @ 51 : 62
~ new GameConfiguration.UserInformation(new Session()),
~ new GameConfiguration.DisplayInformation(854, 480, false, true),
~ new GameConfiguration.GameInformation(false, "1.8.8"));
~ PlatformRuntime.setThreadName("Client thread");
-> DELETE 17 @ 133 : 137
+> DELETE 6 @ 13 : 17
> EOF
diff --git a/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java b/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java
index e4e66ef1..c112a540 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 4 : 9 @ 6 : 9
+> CHANGE 2 : 7 @ 4 : 7
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
@@ -15,7 +15,7 @@
~ import com.google.common.collect.Maps;
~
-> CHANGE 30 : 31 @ 30 : 31
+> CHANGE 26 : 27 @ 24 : 25
~ public ModelRenderer getRandomModelBox(EaglercraftRandom rand) {
diff --git a/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java b/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java
index 7437e1f8..a4d0f357 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java
@@ -9,7 +9,7 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> CHANGE 74 : 75 @ 76 : 77
+> CHANGE 72 : 73 @ 74 : 75
~ if (entity != null && entity.isSneaking()) {
diff --git a/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java b/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java
index f89cd31c..d6ae1899 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 4
-> CHANGE 39 : 40 @ 41 : 42
+> CHANGE 37 : 38 @ 39 : 40
~ this.bipedBody.rotationPointZ = 0.0F;
-> CHANGE 92 : 93 @ 94 : 95
+> CHANGE 53 : 54 @ 53 : 54
~ this.bipedHead.rotationPointZ = 0.0F;
diff --git a/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java b/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java
index c947a6b3..f3296ee1 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java
@@ -11,7 +11,7 @@
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> CHANGE 17 : 18 @ 18 : 19
+> CHANGE 15 : 16 @ 16 : 17
~ EaglercraftRandom random = new EaglercraftRandom(1660L);
diff --git a/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java b/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java
index 3049a84a..251d3aa2 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java
@@ -9,11 +9,11 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> CHANGE 75 : 76 @ 77 : 78
+> CHANGE 73 : 74 @ 75 : 76
~ if (entity != null && entity.isSneaking()) {
-> CHANGE 107 : 108 @ 109 : 110
+> CHANGE 32 : 33 @ 32 : 33
~ if (entity != null && entity.isSneaking()) {
diff --git a/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java b/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java
index 67d60201..9bef5df6 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java
@@ -10,7 +10,7 @@
~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
~
-> CHANGE 5 : 11 @ 4 : 7
+> CHANGE 3 : 9 @ 2 : 5
~
~ import com.google.common.collect.Lists;
@@ -19,16 +19,16 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 12 @ 8 : 9
+> DELETE 7 @ 4 : 5
-> DELETE 13 @ 10 : 12
+> DELETE 1 @ 2 : 4
-> CHANGE 227 : 229 @ 226 : 228
+> CHANGE 214 : 216 @ 216 : 218
~ this.displayList = GLAllocation.generateDisplayLists();
~ EaglercraftGPU.glNewList(this.displayList, GL_COMPILE);
-> CHANGE 235 : 236 @ 234 : 235
+> CHANGE 8 : 9 @ 8 : 9
~ EaglercraftGPU.glEndList();
diff --git a/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java b/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java
index d92f45e1..4eb1bf4a 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 83 : 84 @ 85 : 86
+> CHANGE 81 : 82 @ 83 : 84
~ float f5 = 0.0F;
diff --git a/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java b/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java
index d6cd15d3..2a65403f 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 3
-> CHANGE 7 : 8 @ 8 : 9
+> CHANGE 5 : 6 @ 6 : 7
~ this(0.0F, true);
-> CHANGE 15 : 16 @ 16 : 17
+> CHANGE 8 : 9 @ 8 : 9
~ super(modelSize, 0.0F, 64, parFlag ? 64 : 32);
diff --git a/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java b/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java
index fa21f3d0..b07e1dab 100644
--- a/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java
+++ b/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java
@@ -9,6 +9,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 4 @ 4 : 5
+> DELETE 2 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java
index bf2e6e8e..4e5da611 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 8 @ 4
+> INSERT 1 : 6 @ 2
+
+ import com.google.common.collect.Lists;
@@ -15,6 +15,6 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 18 @ 14 : 16
+> DELETE 15 @ 10 : 12
> EOF
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java
index be5df638..6331eb75 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java
@@ -18,32 +18,32 @@
~ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
~ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
-> CHANGE 17 : 18 @ 10 : 14
+> CHANGE 14 : 15 @ 7 : 11
~ import net.minecraft.client.network.NetHandlerPlayClient;
-> DELETE 20 @ 16 : 19
+> DELETE 3 @ 6 : 9
-> DELETE 21 @ 20 : 23
+> DELETE 1 @ 4 : 7
-> DELETE 23 @ 25 : 26
+> DELETE 2 @ 5 : 6
-> CHANGE 24 : 28 @ 27 : 28
+> CHANGE 1 : 5 @ 2 : 3
~ private EaglercraftNetworkManager networkManager;
~ private String currentAddress;
~ private String currentPassword;
~ private boolean allowPlaintext;
-> INSERT 29 : 30 @ 29
+> INSERT 5 : 6 @ 2
+ private boolean hasOpened;
-> INSERT 31 : 32 @ 30
+> INSERT 2 : 3 @ 1
+ private int timer = 0;
-> INSERT 34 : 47 @ 32
+> INSERT 3 : 16 @ 2
+ this(parGuiScreen, mcIn, parServerData, false);
+ }
@@ -59,11 +59,11 @@
+ public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, ServerData parServerData, String password,
+ boolean allowPlaintext) {
-> CHANGE 49 : 50 @ 34 : 35
+> CHANGE 15 : 16 @ 2 : 3
~ String serveraddress = AddressResolver.resolveURI(parServerData);
-> CHANGE 52 : 57 @ 37 : 38
+> CHANGE 3 : 8 @ 3 : 4
~ if (RateLimitTracker.isLockedOut(serveraddress)) {
~ logger.error("Server locked this client out on a previous connection, will not attempt to reconnect");
@@ -71,7 +71,7 @@
~ this.connect(serveraddress, password, allowPlaintext);
~ }
-> INSERT 60 : 73 @ 41
+> INSERT 8 : 21 @ 4
+ this(parGuiScreen, mcIn, hostName, port, false);
+ }
@@ -87,17 +87,17 @@
+ public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, String password,
+ boolean allowPlaintext) {
-> CHANGE 76 : 77 @ 44 : 45
+> CHANGE 16 : 17 @ 3 : 4
~ this.connect(hostName, password, allowPlaintext);
-> CHANGE 79 : 82 @ 47 : 52
+> CHANGE 3 : 6 @ 3 : 8
~ public GuiConnecting(GuiConnecting previous, String password) {
~ this(previous, password, false);
~ }
-> CHANGE 83 : 88 @ 53 : 57
+> CHANGE 4 : 9 @ 6 : 10
~ public GuiConnecting(GuiConnecting previous, String password, boolean allowPlaintext) {
~ this.mc = previous.mc;
@@ -105,7 +105,7 @@
~ this.connect(previous.currentAddress, password, allowPlaintext);
~ }
-> CHANGE 89 : 94 @ 58 : 72
+> CHANGE 6 : 11 @ 5 : 19
~ private void connect(String ip, String password, boolean allowPlaintext) {
~ this.currentAddress = ip;
@@ -113,7 +113,7 @@
~ this.allowPlaintext = allowPlaintext;
~ }
-> CHANGE 95 : 131 @ 73 : 80
+> CHANGE 6 : 42 @ 15 : 22
~ public void updateScreen() {
~ ++timer;
@@ -152,13 +152,13 @@
~ return;
~ }
-> CHANGE 132 : 135 @ 81 : 87
+> CHANGE 37 : 40 @ 8 : 14
~ try {
~ this.networkManager.processReceivedPackets();
~ } catch (IOException ex) {
-> CHANGE 136 : 164 @ 88 : 92
+> CHANGE 4 : 32 @ 7 : 11
~ } else {
~ if (PlatformNetworking.playConnectionState() == EnumEaglerConnectionState.FAILED) {
@@ -189,28 +189,28 @@
~ }
~ }
-> DELETE 165 @ 93 : 94
+> DELETE 29 @ 5 : 6
-> DELETE 166 @ 95 : 105
+> DELETE 1 @ 2 : 12
-> CHANGE 170 : 171 @ 109 : 110
+> CHANGE 4 : 5 @ 14 : 15
~ protected void keyTyped(char parChar1, int parInt1) {
-> CHANGE 175 : 177 @ 114 : 116
+> CHANGE 5 : 7 @ 5 : 7
~ this.buttonList.add(
~ new GuiButton(0, this.width / 2 - 100, this.height / 2 - 10, I18n.format("gui.cancel", new Object[0])));
-> CHANGE 179 : 180 @ 118 : 119
+> CHANGE 4 : 5 @ 4 : 5
~ protected void actionPerformed(GuiButton parGuiButton) {
-> CHANGE 193 : 194 @ 132 : 133
+> CHANGE 14 : 15 @ 14 : 15
~ if (this.networkManager == null || !this.networkManager.isChannelOpen()) {
-> INSERT 203 : 217 @ 142
+> INSERT 10 : 24 @ 10
+
+ private void checkLowLevelRatelimit() {
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java
index f5325528..e9197f80 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java
@@ -11,13 +11,13 @@
+
+ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
-> DELETE 11 @ 8 : 9
+> DELETE 9 @ 6 : 7
-> INSERT 27 : 28 @ 25
+> INSERT 16 : 17 @ 17
+ import net.minecraft.util.ChatComponentText;
-> CHANGE 256 : 267 @ 253 : 254
+> CHANGE 229 : 240 @ 228 : 229
~ try {
~ this.netClientHandler.getNetworkManager().processReceivedPackets();
@@ -31,7 +31,7 @@
~ }
~ this.netClientHandler.getSkinCache().flush();
-> CHANGE 363 : 365 @ 350 : 352
+> CHANGE 107 : 109 @ 97 : 99
~ public EntityPlayerSP func_178892_a(World worldIn, StatFileWriter statWriter) {
~ return new EntityPlayerSP(this.mc, worldIn, this.netClientHandler, statWriter);
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java
index 6b937628..92600037 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 7
-> CHANGE 6 : 7 @ 11 : 12
+> CHANGE 4 : 5 @ 9 : 10
~ public ServerAddress(String parString1, int parInt1) {
-> CHANGE 12 : 13 @ 17 : 18
+> CHANGE 6 : 7 @ 6 : 7
~ return this.ipAddress;
-> DELETE 19 @ 24 : 84
+> DELETE 7 @ 7 : 67
> EOF
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java
index 71513208..e3edb6ca 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java
@@ -19,21 +19,21 @@
+ import net.lax1dude.eaglercraft.v1_8.profile.EaglerSkinTexture;
+ import net.minecraft.client.Minecraft;
-> INSERT 16 : 17 @ 5
+> INSERT 14 : 15 @ 3
+ import net.minecraft.util.ResourceLocation;
-> CHANGE 21 : 24 @ 9 : 12
+> CHANGE 5 : 8 @ 4 : 7
~ public String populationInfo = "";
~ public String serverMOTD = "";
~ public long pingToServer = -1l;
-> CHANGE 29 : 30 @ 17 : 18
+> CHANGE 8 : 9 @ 8 : 9
~ public boolean hideAddress = false;
-> INSERT 31 : 39 @ 19
+> INSERT 2 : 10 @ 2
+ public IServerQuery currentQuery = null;
+ public final ResourceLocation iconResourceLocation;
@@ -44,27 +44,27 @@
+ public boolean serverIconEnabled = false;
+ public boolean isDefault = false;
-> INSERT 40 : 44 @ 20
+> INSERT 9 : 13 @ 1
+ private static final Logger logger = LogManager.getLogger("MOTDQuery");
+
+ private static int serverTextureId = 0;
+
-> INSERT 48 : 49 @ 24
+> INSERT 8 : 9 @ 4
+ this.iconResourceLocation = new ResourceLocation("eagler:servers/icons/tex_" + serverTextureId++);
-> DELETE 55 @ 30 : 33
+> DELETE 7 @ 6 : 9
-> INSERT 62 : 64 @ 40
+> INSERT 7 : 9 @ 10
+ nbttagcompound.setBoolean("hideAddress", this.hideAddress);
+
-> DELETE 77 @ 53 : 56
+> DELETE 15 @ 13 : 16
-> INSERT 88 : 94 @ 67
+> INSERT 11 : 17 @ 14
+ if (nbtCompound.hasKey("hideAddress", 1)) {
+ serverdata.hideAddress = nbtCompound.getBoolean("hideAddress");
@@ -73,13 +73,13 @@
+ }
+
-> DELETE 97 @ 70 : 78
+> DELETE 9 @ 3 : 11
-> CHANGE 105 : 106 @ 86 : 87
+> CHANGE 8 : 9 @ 16 : 17
~ this.hideAddress = serverDataIn.hideAddress;
-> INSERT 122 : 188 @ 103
+> INSERT 17 : 83 @ 17
+
+ public void setMOTDFromQuery(QueryResponse pkt) {
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java
index bf25e8a5..617a51ef 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java
@@ -10,7 +10,7 @@
~ import java.io.ByteArrayOutputStream;
~ import java.util.Iterator;
-> INSERT 5 : 18 @ 5
+> INSERT 3 : 16 @ 3
+
+ import com.google.common.collect.Lists;
@@ -26,25 +26,25 @@
+ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
+ import net.lax1dude.eaglercraft.v1_8.socket.ServerQueryDispatch;
-> CHANGE 19 : 20 @ 6 : 7
+> CHANGE 14 : 15 @ 1 : 2
~ import net.minecraft.client.renderer.texture.TextureManager;
-> CHANGE 23 : 24 @ 10 : 12
+> CHANGE 4 : 5 @ 4 : 6
~ import net.minecraft.util.EnumChatFormatting;
-> INSERT 28 : 29 @ 16
+> INSERT 5 : 6 @ 6
+ private final List allServers = Lists.newArrayList();
-> CHANGE 31 : 34 @ 18 : 19
+> CHANGE 3 : 6 @ 2 : 3
~ private static ServerList instance = null;
~
~ private ServerList(Minecraft mcIn) {
-> INSERT 38 : 46 @ 23
+> INSERT 7 : 15 @ 5
+ public static void initServerList(Minecraft mc) {
+ instance = new ServerList(mc);
@@ -55,7 +55,7 @@
+ }
+
-> CHANGE 48 : 55 @ 25 : 29
+> CHANGE 10 : 17 @ 2 : 6
~ freeServerIcons();
~
@@ -65,11 +65,11 @@
~ dat.isDefault = true;
~ this.allServers.add(dat);
-> CHANGE 57 : 58 @ 31 : 32
+> CHANGE 9 : 10 @ 6 : 7
~ byte[] localStorage = EagRuntime.getStorage("s");
-> CHANGE 59 : 72 @ 33 : 35
+> CHANGE 2 : 15 @ 2 : 4
~ if (localStorage != null) {
~ NBTTagCompound nbttagcompound = CompressedStreamTools
@@ -85,22 +85,22 @@
~ this.allServers.add(srv);
~ }
-> INSERT 73 : 74 @ 36
+> INSERT 14 : 15 @ 3
+
-> INSERT 76 : 78 @ 38
+> INSERT 3 : 5 @ 2
+ } finally {
+ refreshServerPing();
-> CHANGE 87 : 90 @ 47 : 48
+> CHANGE 11 : 14 @ 9 : 10
~ if (!serverdata.isDefault) {
~ nbttaglist.appendTag(serverdata.getNBTCompound());
~ }
-> CHANGE 94 : 99 @ 52 : 53
+> CHANGE 7 : 12 @ 5 : 6
~
~ ByteArrayOutputStream bao = new ByteArrayOutputStream();
@@ -108,7 +108,7 @@
~ EagRuntime.setStorage("s", bao.toByteArray());
~
-> CHANGE 110 : 115 @ 64 : 65
+> CHANGE 16 : 21 @ 12 : 13
~ ServerData data = this.servers.remove(parInt1);
~ if (data != null && data.iconTextureObject != null) {
@@ -116,7 +116,7 @@
~ data.iconTextureObject = null;
~ }
-> INSERT 151 : 259 @ 101
+> INSERT 41 : 149 @ 37
+
+ public void freeServerIcons() {
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java
index e8ad9527..2ada9828 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java
+++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java
@@ -9,19 +9,19 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
-> INSERT 5 : 8 @ 6
+> INSERT 3 : 6 @ 4
+
+ import com.google.common.collect.Sets;
+
-> DELETE 13 @ 11 : 12
+> DELETE 8 @ 5 : 6
-> CHANGE 224 : 225 @ 223 : 224
+> CHANGE 211 : 212 @ 212 : 213
~ EaglercraftRandom random = new EaglercraftRandom();
-> CHANGE 308 : 309 @ 307 : 309
+> CHANGE 84 : 85 @ 84 : 86
~ return "Non-integrated multiplayer server";
diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java
index 453adce6..00ef84ac 100644
--- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java
+++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 8
-> DELETE 6 @ 12 : 14
+> DELETE 4 @ 10 : 12
-> INSERT 7 : 19 @ 15
+> INSERT 1 : 13 @ 3
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
@@ -24,203 +24,203 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> DELETE 33 @ 29 : 31
+> DELETE 26 @ 14 : 16
-> DELETE 42 @ 40 : 41
+> DELETE 9 @ 11 : 12
-> DELETE 47 @ 46 : 49
+> DELETE 5 @ 6 : 9
-> DELETE 94 @ 96 : 97
+> DELETE 47 @ 50 : 51
-> DELETE 96 @ 99 : 100
+> DELETE 2 @ 3 : 4
-> DELETE 174 @ 178 : 179
+> DELETE 78 @ 79 : 80
-> DELETE 206 @ 211 : 213
+> DELETE 32 @ 33 : 35
-> CHANGE 209 : 210 @ 216 : 217
+> CHANGE 3 : 4 @ 5 : 6
~ private final EaglercraftNetworkManager netManager;
-> CHANGE 215 : 216 @ 222 : 223
+> CHANGE 6 : 7 @ 6 : 7
~ private final Map playerInfoMap = Maps.newHashMap();
-> CHANGE 218 : 220 @ 225 : 226
+> CHANGE 3 : 5 @ 3 : 4
~ private final EaglercraftRandom avRandomizer = new EaglercraftRandom();
~ private final ServerSkinCache skinCache;
-> CHANGE 221 : 222 @ 227 : 228
+> CHANGE 3 : 4 @ 2 : 3
~ public NetHandlerPlayClient(Minecraft mcIn, GuiScreen parGuiScreen, EaglercraftNetworkManager parNetworkManager,
-> INSERT 227 : 228 @ 233
+> INSERT 6 : 7 @ 6
+ this.skinCache = new ServerSkinCache(parNetworkManager, mcIn.getTextureManager());
-> INSERT 232 : 233 @ 237
+> INSERT 5 : 6 @ 4
+ this.skinCache.destroy();
-> INSERT 235 : 239 @ 239
+> INSERT 3 : 7 @ 2
+ public ServerSkinCache getSkinCache() {
+ return this.skinCache;
+ }
+
-> DELETE 240 @ 240 : 241
+> DELETE 5 @ 1 : 2
-> DELETE 259 @ 260 : 261
+> DELETE 19 @ 20 : 21
-> DELETE 364 @ 366 : 367
+> DELETE 105 @ 106 : 107
-> DELETE 376 @ 379 : 380
+> DELETE 12 @ 13 : 14
-> DELETE 397 @ 401 : 402
+> DELETE 21 @ 22 : 23
-> DELETE 403 @ 408 : 409
+> DELETE 6 @ 7 : 8
-> DELETE 411 @ 417 : 418
+> DELETE 8 @ 9 : 10
-> DELETE 419 @ 426 : 427
+> DELETE 8 @ 9 : 10
-> DELETE 450 @ 458 : 459
+> DELETE 31 @ 32 : 33
-> DELETE 472 @ 481 : 482
+> DELETE 22 @ 23 : 24
-> DELETE 480 @ 490 : 491
+> DELETE 8 @ 9 : 10
-> DELETE 497 @ 508 : 509
+> DELETE 17 @ 18 : 19
-> DELETE 505 @ 517 : 519
+> DELETE 8 @ 9 : 11
-> DELETE 512 @ 526 : 527
+> DELETE 7 @ 9 : 10
-> DELETE 559 @ 574 : 576
+> DELETE 47 @ 48 : 50
-> DELETE 568 @ 585 : 586
+> DELETE 9 @ 11 : 12
-> DELETE 590 @ 608 : 609
+> DELETE 22 @ 23 : 24
-> CHANGE 598 : 601 @ 617 : 618
+> CHANGE 8 : 11 @ 9 : 10
~ if (this.gameController.theWorld != null) {
~ this.gameController.loadWorld((WorldClient) null);
~ }
-> CHANGE 602 : 604 @ 619 : 627
+> CHANGE 4 : 6 @ 2 : 10
~ this.gameController
~ .displayGuiScreen(new GuiDisconnected(this.guiScreenServer, "disconnect.lost", ichatcomponent));
-> DELETE 608 @ 631 : 632
+> DELETE 6 @ 12 : 13
-> DELETE 615 @ 639 : 640
+> DELETE 7 @ 8 : 9
-> DELETE 638 @ 663 : 664
+> DELETE 23 @ 24 : 25
-> DELETE 647 @ 673 : 674
+> DELETE 9 @ 10 : 11
-> DELETE 667 @ 694 : 695
+> DELETE 20 @ 21 : 22
-> DELETE 671 @ 699 : 700
+> DELETE 4 @ 5 : 6
-> DELETE 706 @ 735 : 736
+> DELETE 35 @ 36 : 37
-> DELETE 711 @ 741 : 742
+> DELETE 5 @ 6 : 7
-> DELETE 716 @ 747 : 748
+> DELETE 5 @ 6 : 7
-> DELETE 755 @ 787 : 788
+> DELETE 39 @ 40 : 41
-> DELETE 767 @ 800 : 801
+> DELETE 12 @ 13 : 14
-> DELETE 773 @ 807 : 808
+> DELETE 6 @ 7 : 8
-> DELETE 778 @ 813 : 814
+> DELETE 5 @ 6 : 7
-> DELETE 795 @ 831 : 832
+> DELETE 17 @ 18 : 19
-> DELETE 804 @ 841 : 842
+> DELETE 9 @ 10 : 11
-> DELETE 831 @ 869 : 870
+> DELETE 27 @ 28 : 29
-> DELETE 858 @ 897 : 898
+> DELETE 27 @ 28 : 29
-> DELETE 874 @ 914 : 915
+> DELETE 16 @ 17 : 18
-> DELETE 884 @ 925 : 926
+> DELETE 10 @ 11 : 12
-> DELETE 895 @ 937 : 938
+> DELETE 11 @ 12 : 13
-> DELETE 917 @ 960 : 961
+> DELETE 22 @ 23 : 24
-> DELETE 933 @ 977 : 978
+> DELETE 16 @ 17 : 18
-> DELETE 941 @ 986 : 987
+> DELETE 8 @ 9 : 10
-> DELETE 949 @ 995 : 996
+> DELETE 8 @ 9 : 10
-> DELETE 953 @ 1000 : 1001
+> DELETE 4 @ 5 : 6
-> DELETE 958 @ 1006 : 1007
+> DELETE 5 @ 6 : 7
-> DELETE 963 @ 1012 : 1014
+> DELETE 5 @ 6 : 8
-> DELETE 981 @ 1032 : 1033
+> DELETE 18 @ 20 : 21
-> CHANGE 1002 : 1005 @ 1054 : 1073
+> CHANGE 21 : 24 @ 22 : 41
~
~ // minecraft demo screen
~
-> DELETE 1023 @ 1091 : 1092
+> DELETE 21 @ 37 : 38
-> DELETE 1029 @ 1098 : 1099
+> DELETE 6 @ 7 : 8
-> DELETE 1040 @ 1110 : 1111
+> DELETE 11 @ 12 : 13
-> DELETE 1049 @ 1120 : 1121
+> DELETE 9 @ 10 : 11
-> DELETE 1074 @ 1146 : 1147
+> DELETE 25 @ 26 : 27
-> DELETE 1084 @ 1157 : 1173
+> DELETE 10 @ 11 : 27
-> INSERT 1085 : 1087 @ 1174
+> INSERT 1 : 3 @ 17
+ // used by twitch stream
+
-> DELETE 1090 @ 1177 : 1178
+> DELETE 5 @ 3 : 4
-> CHANGE 1095 : 1096 @ 1183 : 1184
+> CHANGE 5 : 6 @ 6 : 7
~
-> DELETE 1104 @ 1192 : 1193
+> DELETE 9 @ 9 : 10
-> DELETE 1108 @ 1197 : 1198
+> DELETE 4 @ 5 : 6
-> DELETE 1144 @ 1234 : 1235
+> DELETE 36 @ 37 : 38
-> DELETE 1152 @ 1243 : 1245
+> DELETE 8 @ 9 : 11
-> CHANGE 1154 : 1157 @ 1247 : 1248
+> CHANGE 2 : 5 @ 4 : 5
~ EaglercraftUUID uuid = s38packetplayerlistitem$addplayerdata.getProfile().getId();
~ this.playerInfoMap.remove(uuid);
~ this.skinCache.evictSkin(uuid);
-> DELETE 1191 @ 1282 : 1283
+> DELETE 37 @ 35 : 36
-> DELETE 1201 @ 1293 : 1294
+> DELETE 10 @ 11 : 12
-> DELETE 1210 @ 1303 : 1304
+> DELETE 9 @ 10 : 11
-> CHANGE 1218 : 1240 @ 1312 : 1335
+> CHANGE 8 : 30 @ 9 : 32
~ this.netManager
~ .sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
@@ -245,7 +245,7 @@
~ this.netManager
~ .sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
-> CHANGE 1241 : 1249 @ 1336 : 1346
+> CHANGE 23 : 31 @ 24 : 34
~ NetHandlerPlayClient.this.gameController.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() {
~ public void confirmClicked(boolean flag, int var2) {
@@ -256,7 +256,7 @@
~ .setResourceMode(ServerData.ServerResourceMode.ENABLED);
~ }
-> CHANGE 1250 : 1260 @ 1347 : 1366
+> CHANGE 9 : 19 @ 11 : 30
~ NetHandlerPlayClient.this.netManager.sendPacket(
~ new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.ACCEPTED));
@@ -269,7 +269,7 @@
~ NetHandlerPlayClient.this.netManager.sendPacket(new C19PacketResourcePackStatus(
~ s1, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
-> INSERT 1261 : 1267 @ 1367
+> INSERT 11 : 17 @ 20
+ });
+ } else {
@@ -278,14 +278,14 @@
+ .setResourceMode(ServerData.ServerResourceMode.DISABLED);
+ }
-> CHANGE 1268 : 1270 @ 1368 : 1401
+> CHANGE 7 : 9 @ 1 : 34
~ NetHandlerPlayClient.this.netManager.sendPacket(
~ new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
-> DELETE 1271 @ 1402 : 1404
+> DELETE 3 @ 34 : 36
-> INSERT 1272 : 1277 @ 1405
+> INSERT 1 : 6 @ 3
+ ServerList.func_147414_b(NetHandlerPlayClient.this.gameController.getCurrentServerData());
+ NetHandlerPlayClient.this.gameController.displayGuiScreen((GuiScreen) null);
@@ -293,15 +293,15 @@
+ }, I18n.format("multiplayer.texturePrompt.line1", new Object[0]),
+ I18n.format("multiplayer.texturePrompt.line2", new Object[0]), 0));
-> DELETE 1281 @ 1409 : 1410
+> DELETE 9 @ 4 : 5
-> DELETE 1289 @ 1418 : 1419
+> DELETE 8 @ 9 : 10
-> DELETE 1291 @ 1421 : 1422
+> DELETE 2 @ 3 : 4
-> DELETE 1302 @ 1433 : 1435
+> DELETE 11 @ 12 : 14
-> INSERT 1311 : 1318 @ 1444
+> INSERT 9 : 16 @ 11
+ } else if ("EAG|Skins-1.8".equals(packetIn.getChannelName())) {
+ try {
@@ -311,23 +311,23 @@
+ logger.error(e);
+ }
-> DELETE 1323 @ 1449 : 1450
+> DELETE 12 @ 5 : 6
-> DELETE 1342 @ 1469 : 1470
+> DELETE 19 @ 20 : 21
-> DELETE 1358 @ 1486 : 1487
+> DELETE 16 @ 17 : 18
-> DELETE 1369 @ 1498 : 1499
+> DELETE 11 @ 12 : 13
-> DELETE 1408 @ 1538 : 1539
+> DELETE 39 @ 40 : 41
-> DELETE 1443 @ 1574 : 1575
+> DELETE 35 @ 36 : 37
-> CHANGE 1472 : 1473 @ 1604 : 1605
+> CHANGE 29 : 30 @ 30 : 31
~ public EaglercraftNetworkManager getNetworkManager() {
-> CHANGE 1480 : 1481 @ 1612 : 1613
+> CHANGE 8 : 9 @ 8 : 9
~ public NetworkPlayerInfo getPlayerInfo(EaglercraftUUID parUUID) {
diff --git a/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java b/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java
index a29be2e3..3a9f3052 100644
--- a/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java
+++ b/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java
@@ -11,27 +11,27 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
-> DELETE 8 @ 8 : 9
+> DELETE 5 @ 5 : 6
-> DELETE 18 @ 19 : 22
+> DELETE 10 @ 11 : 14
-> CHANGE 58 : 59 @ 62 : 63
+> CHANGE 40 : 41 @ 43 : 44
~ return true;
-> CHANGE 62 : 64 @ 66 : 67
+> CHANGE 4 : 6 @ 4 : 5
~ return Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(this.gameProfile)
~ .getSkinModel().profileSkinType;
-> CHANGE 67 : 68 @ 70 : 76
+> CHANGE 5 : 6 @ 4 : 10
~ return Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(this.gameProfile).getResourceLocation();
-> CHANGE 71 : 72 @ 79 : 84
+> CHANGE 4 : 5 @ 9 : 14
~ return null;
-> DELETE 78 @ 90 : 117
+> DELETE 7 @ 11 : 38
> EOF
diff --git a/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java b/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java
index 054c5923..d879b7ac 100644
--- a/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java
@@ -10,9 +10,9 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 5 @ 3 : 6
+> DELETE 3 @ 1 : 4
-> INSERT 59 : 67 @ 60
+> INSERT 54 : 62 @ 57
+ public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
+ float f3, float f4, float f5) {
diff --git a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java
index e14a9412..6b045b94 100644
--- a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 4
-> CHANGE 5 : 8 @ 7 : 8
+> CHANGE 3 : 6 @ 5 : 6
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ import net.lax1dude.eaglercraft.v1_8.minecraft.AcceleratedEffectRenderer;
~
-> INSERT 9 : 15 @ 9
+> INSERT 4 : 10 @ 2
+
+ import com.google.common.collect.Lists;
@@ -22,27 +22,27 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 18 @ 12 : 45
+> DELETE 9 @ 3 : 36
-> DELETE 19 @ 46 : 47
+> DELETE 1 @ 34 : 35
-> DELETE 20 @ 48 : 49
+> DELETE 1 @ 2 : 3
-> CHANGE 40 : 41 @ 69 : 70
+> CHANGE 20 : 21 @ 21 : 22
~ private EaglercraftRandom rand = new EaglercraftRandom();
-> INSERT 43 : 45 @ 72
+> INSERT 3 : 5 @ 3
+ private AcceleratedEffectRenderer acceleratedParticleRenderer = new AcceleratedEffectRenderer();
+
-> CHANGE 215 : 217 @ 242 : 244
+> CHANGE 172 : 174 @ 170 : 172
~ for (int i = 0; i < 3; ++i) {
~ for (int j = 1; j >= 0; --j) {
-> CHANGE 218 : 225 @ 245 : 252
+> CHANGE 3 : 10 @ 3 : 10
~ // switch (j) {
~ // case 0:
@@ -52,29 +52,29 @@
~ // GlStateManager.depthMask(true);
~ // }
-> INSERT 226 : 228 @ 253
+> INSERT 8 : 10 @ 8
+ float texCoordWidth = 0.001f;
+ float texCoordHeight = 0.001f;
-> INSERT 232 : 233 @ 257
+> INSERT 6 : 7 @ 4
+ texCoordWidth = texCoordHeight = 1.0f / 256.0f;
-> INSERT 236 : 239 @ 260
+> INSERT 4 : 7 @ 3
+ TextureMap blockMap = (TextureMap) this.renderer.getTexture(TextureMap.locationBlocksTexture);
+ texCoordWidth = 1.0f / blockMap.getWidth();
+ texCoordHeight = 1.0f / blockMap.getHeight();
-> INSERT 246 : 250 @ 267
+> INSERT 10 : 14 @ 7
+ boolean legacyRenderingHasOccured = false;
+
+ acceleratedParticleRenderer.begin(partialTicks);
+
-> CHANGE 254 : 259 @ 271 : 272
+> CHANGE 8 : 13 @ 4 : 5
~ if (!entityfx.renderAccelerated(acceleratedParticleRenderer, entityIn, partialTicks, f, f4,
~ f1, f2, f3)) {
@@ -82,17 +82,17 @@
~ legacyRenderingHasOccured = true;
~ }
-> INSERT 268 : 269 @ 281
+> INSERT 14 : 15 @ 10
+ final int l = i;
-> CHANGE 271 : 274 @ 283 : 286
+> CHANGE 3 : 6 @ 2 : 5
~ return l == 0 ? "MISC_TEXTURE"
~ : (l == 1 ? "TERRAIN_TEXTURE"
~ : (l == 3 ? "ENTITY_PARTICLE_TEXTURE" : "Unknown - " + l));
-> CHANGE 280 : 287 @ 292 : 293
+> CHANGE 9 : 16 @ 9 : 10
~ if (legacyRenderingHasOccured) {
~ tessellator.draw();
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java
index e220fe4f..c7dc1153 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java
@@ -10,13 +10,13 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 5 @ 3 : 6
+> DELETE 3 @ 1 : 4
-> INSERT 9 : 10 @ 10
+> INSERT 4 : 5 @ 7
+ import net.minecraft.util.MathHelper;
-> INSERT 83 : 96 @ 83
+> INSERT 74 : 87 @ 73
+ public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
+ float f3, float f4, float f5) {
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java
index 40b696d8..337982f8 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java
@@ -10,13 +10,13 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 7 @ 5 : 8
+> DELETE 5 @ 3 : 6
-> INSERT 10 : 11 @ 11
+> INSERT 3 : 4 @ 6
+ import net.minecraft.util.MathHelper;
-> INSERT 101 : 114 @ 101
+> INSERT 91 : 104 @ 90
+ public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
+ float f3, float f4, float f5) {
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java
index df86d759..607d83ca 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java
@@ -11,13 +11,13 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 3 : 5
+> DELETE 4 @ 1 : 3
-> CHANGE 24 : 25 @ 23 : 24
+> CHANGE 18 : 19 @ 20 : 21
~ protected EaglerTextureAtlasSprite particleIcon;
-> INSERT 177 : 189 @ 176
+> INSERT 153 : 165 @ 153
+ public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2,
+ float f3, float f4, float f5) {
@@ -32,7 +32,7 @@
+ }
+
-> CHANGE 199 : 200 @ 186 : 187
+> CHANGE 22 : 23 @ 10 : 11
~ public void setParticleIcon(EaglerTextureAtlasSprite icon) {
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java
index 602bef89..eb0bcc35 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java
@@ -10,9 +10,9 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 5 @ 3 : 7
+> DELETE 3 @ 1 : 5
-> INSERT 69 : 78 @ 71
+> INSERT 64 : 73 @ 68
+
+ public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1,
@@ -24,7 +24,7 @@
+ return true;
+ }
-> INSERT 300 : 301 @ 293
+> INSERT 231 : 232 @ 222
+ entityfirework$overlayfx.particleAlpha = 0.99f;
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java
index d7a97322..8aca2bdb 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java
@@ -10,8 +10,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 5 @ 3 : 6
+> DELETE 3 @ 1 : 4
-> DELETE 6 @ 7 : 8
+> DELETE 1 @ 4 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java
index f7e2aa7a..764eb852 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java
@@ -10,15 +10,15 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 5 @ 3 : 6
+> DELETE 3 @ 1 : 4
-> DELETE 7 @ 8 : 9
+> DELETE 2 @ 5 : 6
-> DELETE 9 @ 11 : 12
+> DELETE 2 @ 3 : 4
-> DELETE 15 @ 18 : 22
+> DELETE 6 @ 7 : 11
-> CHANGE 45 : 46 @ 52 : 53
+> CHANGE 30 : 31 @ 34 : 35
~ worldrenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP);
diff --git a/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java
index 346006e8..a93a3164 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java
@@ -11,6 +11,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 3 : 7
+> DELETE 4 @ 1 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java
index b985883e..1f225b25 100644
--- a/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> CHANGE 9 : 10 @ 11 : 12
+> CHANGE 7 : 8 @ 9 : 10
~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
diff --git a/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java b/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java
index 1f88b640..62c88bc6 100644
--- a/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java
+++ b/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java
@@ -11,6 +11,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 3 : 8
+> DELETE 4 @ 1 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java b/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java
index 3827cac9..54ebf0a1 100644
--- a/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java
+++ b/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java
index 287c86ba..ceb60e6f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java
@@ -14,18 +14,18 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 11 @ 7 : 9
+> DELETE 9 @ 5 : 7
-> DELETE 17 @ 15 : 17
+> DELETE 6 @ 8 : 10
-> CHANGE 19 : 23 @ 19 : 23
+> CHANGE 2 : 6 @ 4 : 8
~ private static final int[] VIEWPORT = new int[4];
~ private static final float[] MODELVIEW = new float[16];
~ private static final float[] PROJECTION = new float[16];
~ private static final float[] OBJECTCOORDS = new float[3];
-> CHANGE 33 : 38 @ 33 : 38
+> CHANGE 14 : 19 @ 14 : 19
~ EaglercraftGPU.glGetInteger(GL_VIEWPORT, VIEWPORT);
~ float f = (float) ((VIEWPORT[0] + VIEWPORT[2]) / 2);
@@ -33,7 +33,7 @@
~ GlStateManager.gluUnProject(f, f1, 0.0F, MODELVIEW, PROJECTION, VIEWPORT, OBJECTCOORDS);
~ position = new Vec3((double) OBJECTCOORDS[0], (double) OBJECTCOORDS[1], (double) OBJECTCOORDS[2]);
-> CHANGE 50 : 51 @ 50 : 51
+> CHANGE 17 : 18 @ 17 : 18
~ double d1 = parEntity.prevPosY + (parEntity.posY - parEntity.prevPosY) * parDouble1 + parEntity.getEyeHeight();
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java
index cf47ae23..fe9be80e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java
@@ -10,23 +10,23 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 8 @ 6 : 8
+> DELETE 6 @ 4 : 6
-> CHANGE 15 : 17 @ 15 : 17
+> CHANGE 7 : 9 @ 9 : 11
~ private EaglerTextureAtlasSprite[] atlasSpritesLava = new EaglerTextureAtlasSprite[2];
~ private EaglerTextureAtlasSprite[] atlasSpritesWater = new EaglerTextureAtlasSprite[2];
-> CHANGE 34 : 36 @ 34 : 35
+> CHANGE 19 : 21 @ 19 : 20
~ EaglerTextureAtlasSprite[] atextureatlassprite = blockliquid.getMaterial() == Material.lava
~ ? this.atlasSpritesLava
-> CHANGE 67 : 68 @ 66 : 67
+> CHANGE 33 : 34 @ 32 : 33
~ EaglerTextureAtlasSprite textureatlassprite = atextureatlassprite[0];
-> CHANGE 173 : 174 @ 172 : 173
+> CHANGE 106 : 107 @ 106 : 107
~ EaglerTextureAtlasSprite textureatlassprite1 = atextureatlassprite[1];
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java
index 775b5676..ef43f672 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java
@@ -11,13 +11,13 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 10 @ 7 : 11
+> DELETE 6 @ 3 : 7
-> INSERT 85 : 86 @ 86
+> INSERT 75 : 76 @ 79
+ BlockPos.MutableBlockPos pointer = new BlockPos.MutableBlockPos();
-> CHANGE 89 : 90 @ 89 : 90
+> CHANGE 4 : 5 @ 3 : 4
~ BlockPos blockpos = blockPosIn.offsetEvenFaster(enumfacing, pointer);
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java
index ac8e7349..e7ef6b7c 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java
@@ -7,33 +7,33 @@
> DELETE 2 @ 2 : 3
-> INSERT 5 : 9 @ 6
+> INSERT 3 : 7 @ 4
+
+ import com.google.common.collect.Maps;
+
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 54 @ 51 : 52
+> DELETE 49 @ 45 : 46
-> CHANGE 75 : 76 @ 73 : 74
+> CHANGE 21 : 22 @ 22 : 23
~ public EaglerTextureAtlasSprite getTexture(IBlockState state) {
-> CHANGE 130 : 131 @ 128 : 129
+> CHANGE 55 : 56 @ 55 : 56
~ this.bakedModelStore.put((IBlockState) entry.getKey(),
-> CHANGE 306 : 307 @ 304 : 305
+> CHANGE 176 : 177 @ 176 : 177
~ String s = BlockDirt.VARIANT.getName((BlockDirt.DirtType) linkedhashmap.remove(BlockDirt.VARIANT));
-> CHANGE 317 : 319 @ 315 : 316
+> CHANGE 11 : 13 @ 11 : 12
~ String s = BlockStoneSlab.VARIANT
~ .getName((BlockStoneSlab.EnumType) linkedhashmap.remove(BlockStoneSlab.VARIANT));
-> CHANGE 328 : 329 @ 325 : 326
+> CHANGE 11 : 12 @ 10 : 11
~ .getName((BlockStoneSlabNew.EnumType) linkedhashmap.remove(BlockStoneSlabNew.VARIANT));
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java
index 2d6bf149..0c62eb7e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java
@@ -10,15 +10,15 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 4 : 11
+> DELETE 4 @ 2 : 9
-> DELETE 18 @ 23 : 24
+> DELETE 12 @ 19 : 20
-> CHANGE 35 : 36 @ 41 : 42
+> CHANGE 17 : 18 @ 18 : 19
~ public void renderBlockDamage(IBlockState state, BlockPos pos, EaglerTextureAtlasSprite texture,
-> CHANGE 91 : 95 @ 97 : 103
+> CHANGE 56 : 60 @ 56 : 62
~
~ try {
diff --git a/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java
index 35c39b89..8d67b35f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 4
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java
index 6c8fb64e..68e70073 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 7 @ 4 : 5
+> CHANGE 1 : 5 @ 2 : 3
~
~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java
index ab8f06a1..832fc53b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java
@@ -9,12 +9,12 @@
~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
-> CHANGE 4 : 6 @ 8 : 9
+> CHANGE 2 : 4 @ 6 : 7
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ import net.lax1dude.eaglercraft.v1_8.HString;
-> INSERT 7 : 20 @ 10
+> INSERT 3 : 16 @ 2
+
+ import com.google.common.base.Predicate;
@@ -30,23 +30,23 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 30 @ 20 : 29
+> DELETE 23 @ 10 : 19
-> DELETE 37 @ 36 : 38
+> DELETE 7 @ 16 : 18
-> DELETE 44 @ 45 : 48
+> DELETE 7 @ 9 : 12
-> DELETE 64 @ 68 : 75
+> DELETE 20 @ 23 : 30
-> CHANGE 73 : 74 @ 84 : 85
+> CHANGE 9 : 10 @ 16 : 17
~ private EaglercraftRandom random = new EaglercraftRandom();
-> DELETE 117 @ 128 : 129
+> DELETE 44 @ 44 : 45
-> DELETE 147 @ 159 : 160
+> DELETE 30 @ 31 : 32
-> INSERT 148 : 157 @ 161
+> INSERT 1 : 10 @ 2
+ GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+ GlStateManager.matrixMode(5890);
@@ -58,51 +58,51 @@
+ GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+
-> CHANGE 170 : 171 @ 174 : 175
+> CHANGE 22 : 23 @ 13 : 14
~ return false;
-> DELETE 174 @ 178 : 184
+> DELETE 4 @ 4 : 10
-> DELETE 181 @ 191 : 206
+> DELETE 7 @ 13 : 28
-> DELETE 184 @ 209 : 224
+> DELETE 3 @ 18 : 33
-> CHANGE 187 : 188 @ 227 : 242
+> CHANGE 3 : 4 @ 18 : 33
~ this.useShader = false;
-> DELETE 191 @ 245 : 256
+> DELETE 4 @ 18 : 29
-> DELETE 194 @ 259 : 263
+> DELETE 3 @ 14 : 18
-> DELETE 238 @ 307 : 311
+> DELETE 44 @ 48 : 52
-> DELETE 239 @ 312 : 319
+> DELETE 1 @ 5 : 12
-> CHANGE 357 : 358 @ 437 : 438
+> CHANGE 118 : 119 @ 125 : 126
~ f = this.mc.gameSettings.keyBindZoomCamera.isKeyDown() ? 17.0f : this.mc.gameSettings.fovSetting;
-> CHANGE 527 : 528 @ 607 : 608
+> CHANGE 170 : 171 @ 170 : 171
~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
-> CHANGE 529 : 530 @ 609 : 610
+> CHANGE 2 : 3 @ 2 : 3
~ this.farPlaneDistance * 2.0f * MathHelper.SQRT_2);
-> CHANGE 587 : 588 @ 667 : 668
+> CHANGE 58 : 59 @ 58 : 59
~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, false),
-> DELETE 631 @ 711 : 723
+> DELETE 44 @ 44 : 56
-> CHANGE 752 : 753 @ 844 : 845
+> CHANGE 121 : 122 @ 133 : 134
~ this.lightmapColors[i] = short1 << 24 | j | k << 8 | l << 16;
-> INSERT 756 : 770 @ 848
+> INSERT 4 : 18 @ 4
+
+ GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
@@ -119,35 +119,35 @@
+ GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+
-> DELETE 793 @ 871 : 876
+> DELETE 37 @ 23 : 28
-> INSERT 797 : 800 @ 880
+> INSERT 4 : 7 @ 9
+ if (this.mc.gameSettings.keyBindZoomCamera.isKeyDown()) {
+ f *= 0.7f;
+ }
-> DELETE 839 @ 919 : 932
+> DELETE 42 @ 39 : 52
-> CHANGE 867 : 868 @ 960 : 961
+> CHANGE 28 : 29 @ 41 : 42
~ return EntityRenderer.this.mc.currentScreen.getClass().getName();
-> CHANGE 872 : 873 @ 965 : 966
+> CHANGE 5 : 6 @ 5 : 6
~ return HString.format("Scaled: (%d, %d). Absolute: (%d, %d)",
-> CHANGE 879 : 880 @ 972 : 973
+> CHANGE 7 : 8 @ 7 : 8
~ return HString.format("Scaled: (%d, %d). Absolute: (%d, %d). Scale factor of %d",
-> DELETE 895 @ 988 : 990
+> DELETE 16 @ 16 : 18
-> CHANGE 927 : 928 @ 1022 : 1023
+> CHANGE 32 : 33 @ 34 : 35
~ EaglercraftGPU.glLineWidth(1.0F);
-> INSERT 953 : 958 @ 1048
+> INSERT 26 : 31 @ 26
+
+ if (this.mc.gameSettings.fxaa) {
@@ -155,76 +155,76 @@
+ }
+
-> INSERT 974 : 978 @ 1064
+> INSERT 21 : 25 @ 16
+ if (this.mc.gameSettings.fxaa) {
+ EffectPipelineFXAA.end();
+ }
+
-> CHANGE 1007 : 1009 @ 1093 : 1095
+> CHANGE 33 : 35 @ 29 : 31
~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
~ (float) this.mc.displayWidth / (float) this.mc.displayHeight, 0.05F, this.farPlaneDistance * 4.0F);
-> CHANGE 1013 : 1014 @ 1099 : 1100
+> CHANGE 6 : 7 @ 6 : 7
~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
-> INSERT 1041 : 1042 @ 1127
+> INSERT 28 : 29 @ 28
+ GlStateManager.disableBlend();
-> DELETE 1048 @ 1133 : 1134
+> DELETE 7 @ 6 : 7
-> INSERT 1049 : 1050 @ 1135
+> INSERT 1 : 2 @ 2
+ GlStateManager.shadeModel(7424);
-> CHANGE 1141 : 1142 @ 1226 : 1227
+> CHANGE 92 : 93 @ 91 : 92
~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
-> CHANGE 1151 : 1152 @ 1236 : 1237
+> CHANGE 10 : 11 @ 10 : 11
~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true),
-> CHANGE 1239 : 1240 @ 1324 : 1325
+> CHANGE 88 : 89 @ 88 : 89
~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
-> CHANGE 1287 : 1288 @ 1372 : 1373
+> CHANGE 48 : 49 @ 48 : 49
~ if (f2 >= 0.15F) {
-> CHANGE 1524 : 1525 @ 1609 : 1610
+> CHANGE 237 : 238 @ 237 : 238
~ GlStateManager.clearColor(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F);
-> CHANGE 1534 : 1537 @ 1619 : 1621
+> CHANGE 10 : 13 @ 10 : 12
~ EaglercraftGPU.glFog(GL_FOG_COLOR,
~ this.setFogColorBuffer(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F));
~ EaglercraftGPU.glNormal3f(0.0F, -1.0F, 0.0F);
-> CHANGE 1554 : 1555 @ 1638 : 1642
+> CHANGE 20 : 21 @ 19 : 23
~ EaglercraftGPU.glFogi('\u855a', '\u855b');
-> INSERT 1569 : 1572 @ 1656
+> INSERT 15 : 18 @ 18
+ } else if (!this.mc.gameSettings.fog) {
+ GlStateManager.setFog(2048);
+ GlStateManager.setFogDensity(0.0F);
-> INSERT 1573 : 1574 @ 1657
+> INSERT 4 : 5 @ 1
+ GlStateManager.setFogDensity(0.001F);
-> CHANGE 1584 : 1585 @ 1667 : 1670
+> CHANGE 11 : 12 @ 10 : 13
~ EaglercraftGPU.glFogi('\u855a', '\u855b');
-> DELETE 1594 @ 1679 : 1680
+> DELETE 10 @ 12 : 13
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java
index b3064b2f..51c4946f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java
@@ -11,34 +11,34 @@
~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
-> CHANGE 6 : 8 @ 9 : 18
+> CHANGE 4 : 6 @ 7 : 16
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
-> CHANGE 9 : 12 @ 19 : 24
+> CHANGE 3 : 6 @ 10 : 15
~ public class GLAllocation {
~ public static int generateDisplayLists() {
~ return EaglercraftGPU.glGenLists();
-> CHANGE 14 : 16 @ 26 : 28
+> CHANGE 5 : 7 @ 7 : 9
~ public static void deleteDisplayLists(int list) {
~ EaglercraftGPU.glDeleteLists(list);
-> CHANGE 18 : 20 @ 30 : 32
+> CHANGE 4 : 6 @ 4 : 6
~ public static ByteBuffer createDirectByteBuffer(int capacity) {
~ return EagRuntime.allocateByteBuffer(capacity);
-> DELETE 22 @ 34 : 38
+> DELETE 4 @ 4 : 8
-> CHANGE 23 : 24 @ 39 : 40
+> CHANGE 1 : 2 @ 5 : 6
~ return EagRuntime.allocateIntBuffer(capacity);
-> CHANGE 27 : 28 @ 43 : 44
+> CHANGE 4 : 5 @ 4 : 5
~ return EagRuntime.allocateFloatBuffer(capacity);
diff --git a/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java b/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java
index 3f0947a0..cebb853c 100644
--- a/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java
@@ -9,7 +9,7 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> CHANGE 5 : 6 @ 5 : 6
+> CHANGE 3 : 4 @ 3 : 4
~ ImageData parseUserSkin(ImageData var1);
diff --git a/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java b/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java
index cba4fa69..7138bf89 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java
@@ -9,11 +9,11 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> CHANGE 9 : 10 @ 13 : 14
+> CHANGE 7 : 8 @ 11 : 12
~ public ImageData parseUserSkin(ImageData bufferedimage) {
-> CHANGE 15 : 31 @ 19 : 35
+> CHANGE 6 : 22 @ 6 : 22
~ ImageData bufferedimage1 = new ImageData(this.imageWidth, this.imageHeight, true);
~ bufferedimage1.copyPixelsFrom(bufferedimage, 0, 0, bufferedimage.width, bufferedimage.height, 0, 0,
@@ -32,7 +32,7 @@
~ bufferedimage1.drawLayer(bufferedimage, 44, 52, 40, 64, 40, 20, 44, 32);
~ bufferedimage1.drawLayer(bufferedimage, 48, 52, 44, 64, 52, 20, 56, 32);
-> CHANGE 33 : 34 @ 37 : 39
+> CHANGE 18 : 19 @ 18 : 20
~ this.imageData = bufferedimage1.pixels;
diff --git a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java
index 890f3b26..b0111271 100644
--- a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java
@@ -10,9 +10,9 @@
+
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 4 : 5
+> DELETE 3 @ 1 : 2
-> INSERT 50 : 51 @ 49
+> INSERT 44 : 45 @ 45
+ GlStateManager.enableAlpha();
diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java b/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java
index 3439419e..1ffabc94 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java
@@ -7,22 +7,22 @@
> DELETE 2 @ 2 : 3
-> CHANGE 4 : 8 @ 5 : 7
+> CHANGE 2 : 6 @ 3 : 5
~
~ import com.google.common.collect.Maps;
~
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> CHANGE 24 : 25 @ 23 : 24
+> CHANGE 20 : 21 @ 18 : 19
~ public EaglerTextureAtlasSprite getParticleIcon(Item item) {
-> CHANGE 28 : 29 @ 27 : 28
+> CHANGE 4 : 5 @ 4 : 5
~ public EaglerTextureAtlasSprite getParticleIcon(Item item, int meta) {
-> CHANGE 78 : 79 @ 77 : 78
+> CHANGE 50 : 51 @ 50 : 51
~ this.simpleShapesCache.put((Integer) entry.getKey(),
diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java
index 0973bed5..31499127 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java
@@ -13,33 +13,33 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 13 @ 8 : 13
+> DELETE 11 @ 6 : 11
-> DELETE 18 @ 18 : 19
+> DELETE 5 @ 10 : 11
-> DELETE 30 @ 31 : 32
+> DELETE 12 @ 13 : 14
-> CHANGE 56 : 59 @ 58 : 61
+> CHANGE 26 : 29 @ 27 : 30
~ // if (this.isBlockTranslucent(block)) { //TODO: figure out why this code exists, it breaks slime blocks
~ // GlStateManager.depthMask(false);
~ // }
-> CHANGE 62 : 65 @ 64 : 67
+> CHANGE 6 : 9 @ 6 : 9
~ // if (this.isBlockTranslucent(block)) {
~ // GlStateManager.depthMask(true);
~ // }
-> CHANGE 166 : 167 @ 168 : 169
+> CHANGE 104 : 105 @ 104 : 105
~ EaglercraftGPU.glNormal3f(0.0F, 0.0F, -1.0F);
-> CHANGE 361 : 362 @ 363 : 364
+> CHANGE 195 : 196 @ 195 : 196
~ private void func_178108_a(float parFloat1, EaglerTextureAtlasSprite parTextureAtlasSprite) {
-> CHANGE 427 : 428 @ 429 : 430
+> CHANGE 66 : 67 @ 66 : 67
~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks()
diff --git a/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java b/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java
index cdca76e0..33a471f0 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java
@@ -9,11 +9,11 @@
+
-> CHANGE 14 : 15 @ 13 : 14
+> CHANGE 11 : 12 @ 10 : 11
~ private final IBlockState DEFAULT_STATE = Blocks.air.getDefaultState();
-> INSERT 56 : 70 @ 55
+> INSERT 42 : 56 @ 42
+ /**
+ * only use with a regular "net.minecraft.util.BlockPos"!
@@ -30,7 +30,7 @@
+ }
+
-> INSERT 80 : 93 @ 65
+> INSERT 24 : 37 @ 10
+ /**
+ * only use with a regular "net.minecraft.util.BlockPos"!
@@ -46,7 +46,7 @@
+ }
+
-> INSERT 99 : 109 @ 71
+> INSERT 19 : 29 @ 6
+
+ /**
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java
index 889e39b2..c468d592 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 7
-> CHANGE 8 : 10 @ 13 : 14
+> CHANGE 6 : 8 @ 11 : 12
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ import net.lax1dude.eaglercraft.v1_8.HString;
-> INSERT 12 : 26 @ 16
+> INSERT 4 : 18 @ 3
+
+ import com.google.common.collect.Lists;
@@ -29,52 +29,52 @@
+ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
+ import net.lax1dude.eaglercraft.v1_8.vector.Vector4f;
-> DELETE 38 @ 28 : 41
+> DELETE 26 @ 12 : 25
-> DELETE 42 @ 45 : 46
+> DELETE 4 @ 17 : 18
-> DELETE 48 @ 52 : 53
+> DELETE 6 @ 7 : 8
-> DELETE 52 @ 57 : 60
+> DELETE 4 @ 5 : 8
-> DELETE 54 @ 62 : 65
+> DELETE 2 @ 5 : 8
-> DELETE 83 @ 94 : 99
+> DELETE 29 @ 32 : 37
-> DELETE 103 @ 119 : 123
+> DELETE 20 @ 25 : 29
-> CHANGE 106 : 107 @ 126 : 129
+> CHANGE 3 : 4 @ 7 : 10
~ private final EaglerTextureAtlasSprite[] destroyBlockIcons = new EaglerTextureAtlasSprite[10];
-> CHANGE 118 : 119 @ 140 : 141
+> CHANGE 12 : 13 @ 14 : 15
~ private final ChunkUpdateManager renderDispatcher = new ChunkUpdateManager();
-> CHANGE 141 : 143 @ 163 : 165
+> CHANGE 23 : 25 @ 23 : 25
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-> CHANGE 145 : 148 @ 167 : 179
+> CHANGE 4 : 7 @ 4 : 16
~ this.vboEnabled = false;
~ this.renderContainer = new RenderList();
~ this.renderChunkFactory = new ListChunkFactory();
-> DELETE 167 @ 198 : 202
+> DELETE 22 @ 31 : 35
-> DELETE 168 @ 203 : 224
+> DELETE 1 @ 5 : 26
-> DELETE 171 @ 227 : 233
+> DELETE 3 @ 24 : 30
-> CHANGE 175 : 176 @ 237 : 239
+> CHANGE 4 : 5 @ 10 : 12
~ return false;
-> DELETE 181 @ 244 : 247
+> DELETE 6 @ 7 : 10
-> CHANGE 187 : 192 @ 253 : 266
+> CHANGE 6 : 11 @ 9 : 22
~ this.glSkyList2 = GLAllocation.generateDisplayLists();
~ EaglercraftGPU.glNewList(this.glSkyList2, GL_COMPILE);
@@ -82,9 +82,9 @@
~ tessellator.draw();
~ EaglercraftGPU.glEndList();
-> DELETE 198 @ 272 : 275
+> DELETE 11 @ 19 : 22
-> CHANGE 204 : 209 @ 281 : 294
+> CHANGE 6 : 11 @ 9 : 22
~ this.glSkyList = GLAllocation.generateDisplayLists();
~ EaglercraftGPU.glNewList(this.glSkyList, GL_COMPILE);
@@ -92,9 +92,9 @@
~ tessellator.draw();
~ EaglercraftGPU.glEndList();
-> DELETE 238 @ 323 : 326
+> DELETE 34 @ 42 : 45
-> CHANGE 244 : 251 @ 332 : 347
+> CHANGE 6 : 13 @ 9 : 24
~ this.starGLCallList = GLAllocation.generateDisplayLists();
~ GlStateManager.pushMatrix();
@@ -104,42 +104,42 @@
~ EaglercraftGPU.glEndList();
~ GlStateManager.popMatrix();
-> CHANGE 255 : 256 @ 351 : 352
+> CHANGE 11 : 12 @ 19 : 20
~ EaglercraftRandom random = new EaglercraftRandom(10842L);
-> DELETE 326 @ 422 : 431
+> DELETE 71 @ 71 : 80
-> DELETE 327 @ 432 : 438
+> DELETE 1 @ 10 : 16
-> DELETE 355 @ 466 : 470
+> DELETE 28 @ 34 : 38
-> DELETE 356 @ 471 : 472
+> DELETE 1 @ 5 : 6
-> DELETE 397 @ 513 : 550
+> DELETE 41 @ 42 : 79
-> CHANGE 450 : 451 @ 603 : 604
+> CHANGE 53 : 54 @ 90 : 91
~ for (TileEntity tileentity2 : (List) list1) {
-> CHANGE 503 : 504 @ 656 : 657
+> CHANGE 53 : 54 @ 53 : 54
~ return HString.format("C: %d/%d %sD: %d, %s",
-> DELETE 619 @ 772 : 773
+> DELETE 116 @ 116 : 117
-> CHANGE 621 : 622 @ 775 : 776
+> CHANGE 2 : 3 @ 3 : 4
~ if ((!flag1 || !renderglobal$containerlocalrenderinformation1.setFacing // TODO:
-> DELETE 644 @ 798 : 799
+> DELETE 23 @ 23 : 24
-> CHANGE 651 : 653 @ 806 : 807
+> CHANGE 7 : 9 @ 8 : 9
~ if (this.mc.gameSettings.chunkFix ? this.isPositionInRenderChunkHack(blockpos1, renderchunk4)
~ : this.isPositionInRenderChunk(blockpos, renderchunk4)) {
-> INSERT 674 : 684 @ 828
+> INSERT 23 : 33 @ 22
+ /**
+ * WARNING: use only in the above "build near" logic
@@ -152,49 +152,49 @@
+ }
+
-> INSERT 713 : 714 @ 857
+> INSERT 39 : 40 @ 29
+ ((ClippingHelperImpl) this.debugFixedClippingHelper).destroy();
-> DELETE 808 @ 951 : 961
+> DELETE 95 @ 94 : 104
-> DELETE 809 @ 962 : 982
+> DELETE 1 @ 11 : 31
-> CHANGE 902 : 903 @ 1075 : 1085
+> CHANGE 93 : 94 @ 113 : 123
~ GlStateManager.callList(this.glSkyList);
-> CHANGE 941 : 942 @ 1123 : 1124
+> CHANGE 39 : 40 @ 48 : 49
~ .pos((double) (f12 * 120.0F), (double) (f13 * 120.0F), (double) (f13 * 40.0F * afloat[3]))
-> CHANGE 984 : 985 @ 1166 : 1176
+> CHANGE 43 : 44 @ 43 : 53
~ GlStateManager.callList(this.starGLCallList);
-> CHANGE 998 : 999 @ 1189 : 1199
+> CHANGE 14 : 15 @ 23 : 33
~ GlStateManager.callList(this.glSkyList2);
-> CHANGE 1371 : 1372 @ 1571 : 1572
+> CHANGE 373 : 374 @ 382 : 383
~ this.displayListEntitiesDirty |= this.renderDispatcher.updateChunks(finishTimeNano);
-> DELETE 1389 @ 1589 : 1590
+> DELETE 18 @ 18 : 19
-> CHANGE 1564 : 1565 @ 1765 : 1766
+> CHANGE 175 : 176 @ 176 : 177
~ EaglerTextureAtlasSprite textureatlassprite = this.destroyBlockIcons[i];
-> CHANGE 1586 : 1587 @ 1787 : 1788
+> CHANGE 22 : 23 @ 22 : 23
~ EaglercraftGPU.glLineWidth(2.0F);
-> CHANGE 1827 : 1828 @ 2028 : 2029
+> CHANGE 241 : 242 @ 241 : 242
~ EaglercraftRandom random = this.theWorld.rand;
-> INSERT 2057 : 2074 @ 2258
+> INSERT 230 : 247 @ 230
+
+ public String getDebugInfoShort() {
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java
index 9b65b605..8ea9f0b7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java
@@ -11,19 +11,19 @@
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 6 : 7
+> DELETE 4 @ 4 : 5
-> CHANGE 14 : 16 @ 15 : 17
+> CHANGE 8 : 10 @ 9 : 11
~ GlStateManager.disableMCLight(0);
~ GlStateManager.disableMCLight(1);
-> CHANGE 21 : 24 @ 22 : 24
+> CHANGE 7 : 10 @ 7 : 9
~ GlStateManager.enableMCLight(0, 0.6f, LIGHT0_POS.xCoord, LIGHT0_POS.yCoord, LIGHT0_POS.zCoord, 0.0D);
~ GlStateManager.enableMCLight(1, 0.6f, LIGHT1_POS.xCoord, LIGHT1_POS.yCoord, LIGHT1_POS.zCoord, 0.0D);
~ GlStateManager.setMCLightAmbient(0.4f, 0.4f, 0.4f);
-> DELETE 25 @ 25 : 39
+> DELETE 4 @ 3 : 17
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java
index 0880281a..1fa7d642 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java
@@ -10,9 +10,9 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 7 : 8
+> DELETE 5 @ 5 : 6
-> CHANGE 15 : 16 @ 16 : 17
+> CHANGE 8 : 9 @ 9 : 10
~ EaglercraftGPU.glCallList(
diff --git a/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java b/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java
index 58f32658..9adbfa17 100644
--- a/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java
@@ -11,7 +11,7 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldVertexBufferUploader;
-> INSERT 9 : 18 @ 8
+> INSERT 7 : 16 @ 6
+
+ public static final int GL_TRIANGLES = RealOpenGLEnums.GL_TRIANGLES;
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java
index 918d3916..30e46c43 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java
@@ -11,36 +11,36 @@
~ import org.json.JSONException;
~ import org.json.JSONObject;
-> INSERT 6 : 8 @ 11
+> INSERT 4 : 6 @ 9
+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
+
-> CHANGE 50 : 52 @ 53 : 57
+> CHANGE 44 : 46 @ 42 : 46
~ public static class Deserializer implements JSONTypeDeserializer {
~ public BlockFaceUV deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 57 : 59 @ 62 : 64
+> CHANGE 7 : 9 @ 9 : 11
~ protected int parseRotation(JSONObject parJsonObject) {
~ int i = parJsonObject.optInt("rotation", 0);
-> CHANGE 62 : 63 @ 67 : 68
+> CHANGE 5 : 6 @ 5 : 6
~ throw new JSONException("Invalid rotation " + i + " found, only 0/90/180/270 allowed");
-> CHANGE 66 : 67 @ 71 : 72
+> CHANGE 4 : 5 @ 4 : 5
~ private float[] parseUV(JSONObject parJsonObject) {
-> CHANGE 70 : 73 @ 75 : 78
+> CHANGE 4 : 7 @ 4 : 7
~ JSONArray jsonarray = parJsonObject.getJSONArray("uv");
~ if (jsonarray.length() != 4) {
~ throw new JSONException("Expected 4 uv values, found: " + jsonarray.length());
-> CHANGE 77 : 78 @ 82 : 83
+> CHANGE 7 : 8 @ 7 : 8
~ afloat[i] = jsonarray.getFloat(i);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java
index 57e3fd54..8e2f3934 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 10
-> CHANGE 5 : 15 @ 13 : 15
+> CHANGE 3 : 13 @ 11 : 13
~
~ import org.json.JSONArray;
@@ -20,107 +20,107 @@
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
-> DELETE 16 @ 16 : 17
+> DELETE 11 @ 3 : 4
-> DELETE 17 @ 18 : 19
+> DELETE 1 @ 2 : 3
-> CHANGE 67 : 69 @ 69 : 73
+> CHANGE 50 : 52 @ 51 : 55
~ public static class Deserializer implements JSONTypeDeserializer {
~ public BlockPart deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 72 : 75 @ 76 : 79
+> CHANGE 5 : 8 @ 7 : 10
~ Map map = this.parseFacesCheck(jsonobject);
~ if (jsonobject.has("shade") && !(jsonobject.get("shade") instanceof Boolean)) {
~ throw new JSONException("Expected shade to be a Boolean");
-> CHANGE 76 : 77 @ 80 : 81
+> CHANGE 4 : 5 @ 4 : 5
~ boolean flag = jsonobject.optBoolean("shade", true);
-> CHANGE 81 : 82 @ 85 : 86
+> CHANGE 5 : 6 @ 5 : 6
~ private BlockPartRotation parseRotation(JSONObject parJsonObject) {
-> CHANGE 84 : 85 @ 88 : 89
+> CHANGE 3 : 4 @ 3 : 4
~ JSONObject jsonobject = parJsonObject.getJSONObject("rotation");
-> CHANGE 89 : 90 @ 93 : 94
+> CHANGE 5 : 6 @ 5 : 6
~ boolean flag = jsonobject.optBoolean("rescale", false);
-> CHANGE 96 : 98 @ 100 : 102
+> CHANGE 7 : 9 @ 7 : 9
~ private float parseAngle(JSONObject parJsonObject) {
~ float f = parJsonObject.getFloat("angle");
-> CHANGE 99 : 100 @ 103 : 104
+> CHANGE 3 : 4 @ 3 : 4
~ throw new JSONException("Invalid rotation " + f + " found, only -45/-22.5/0/22.5/45 allowed");
-> CHANGE 105 : 107 @ 109 : 111
+> CHANGE 6 : 8 @ 6 : 8
~ private EnumFacing.Axis parseAxis(JSONObject parJsonObject) {
~ String s = parJsonObject.getString("axis");
-> CHANGE 109 : 110 @ 113 : 114
+> CHANGE 4 : 5 @ 4 : 5
~ throw new JSONException("Invalid rotation axis: " + s);
-> CHANGE 115 : 117 @ 119 : 122
+> CHANGE 6 : 8 @ 6 : 9
~ private Map parseFacesCheck(JSONObject parJsonObject) {
~ Map map = this.parseFaces(parJsonObject);
-> CHANGE 118 : 119 @ 123 : 124
+> CHANGE 3 : 4 @ 4 : 5
~ throw new JSONException("Expected between 1 and 6 unique faces, got 0");
-> CHANGE 124 : 125 @ 129 : 131
+> CHANGE 6 : 7 @ 6 : 8
~ private Map parseFaces(JSONObject parJsonObject) {
-> CHANGE 126 : 127 @ 132 : 133
+> CHANGE 2 : 3 @ 3 : 4
~ JSONObject jsonobject = parJsonObject.getJSONObject("faces");
-> CHANGE 128 : 132 @ 134 : 138
+> CHANGE 2 : 6 @ 2 : 6
~ for (String entry : jsonobject.keySet()) {
~ EnumFacing enumfacing = this.parseEnumFacing(entry);
~ enummap.put(enumfacing,
~ JSONTypeProvider.deserialize(jsonobject.getJSONObject(entry), BlockPartFace.class));
-> CHANGE 140 : 141 @ 146 : 147
+> CHANGE 12 : 13 @ 12 : 13
~ throw new JSONException("Unknown facing: " + name);
-> CHANGE 146 : 147 @ 152 : 153
+> CHANGE 6 : 7 @ 6 : 7
~ private Vector3f parsePositionTo(JSONObject parJsonObject) {
-> CHANGE 152 : 153 @ 158 : 159
+> CHANGE 6 : 7 @ 6 : 7
~ throw new JSONException("\'to\' specifier exceeds the allowed boundaries: " + vector3f);
-> CHANGE 156 : 157 @ 162 : 163
+> CHANGE 4 : 5 @ 4 : 5
~ private Vector3f parsePositionFrom(JSONObject parJsonObject) {
-> CHANGE 162 : 163 @ 168 : 169
+> CHANGE 6 : 7 @ 6 : 7
~ throw new JSONException("\'from\' specifier exceeds the allowed boundaries: " + vector3f);
-> CHANGE 166 : 170 @ 172 : 176
+> CHANGE 4 : 8 @ 4 : 8
~ private Vector3f parsePosition(JSONObject parJsonObject, String parString1) {
~ JSONArray jsonarray = parJsonObject.getJSONArray(parString1);
~ if (jsonarray.length() != 3) {
~ throw new JSONException("Expected 3 " + parString1 + " values, found: " + jsonarray.length());
-> CHANGE 174 : 175 @ 180 : 181
+> CHANGE 8 : 9 @ 8 : 9
~ afloat[i] = jsonarray.getFloat(i);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java
index 31c47264..d66f0256 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java
@@ -13,28 +13,28 @@
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
-> DELETE 8 @ 10 : 11
+> DELETE 6 @ 8 : 9
-> CHANGE 23 : 25 @ 26 : 30
+> CHANGE 15 : 17 @ 16 : 20
~ public static class Deserializer implements JSONTypeDeserializer {
~ public BlockPartFace deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 28 : 29 @ 33 : 35
+> CHANGE 5 : 6 @ 7 : 9
~ BlockFaceUV blockfaceuv = JSONTypeProvider.deserialize(jsonobject, BlockFaceUV.class);
-> CHANGE 32 : 34 @ 38 : 40
+> CHANGE 4 : 6 @ 5 : 7
~ protected int parseTintIndex(JSONObject parJsonObject) {
~ return parJsonObject.optInt("tintindex", -1);
-> CHANGE 36 : 38 @ 42 : 44
+> CHANGE 4 : 6 @ 4 : 6
~ private String parseTexture(JSONObject parJsonObject) {
~ return parJsonObject.getString("texture");
-> CHANGE 40 : 42 @ 46 : 48
+> CHANGE 4 : 6 @ 4 : 6
~ private EnumFacing parseCullFace(JSONObject parJsonObject) {
~ String s = parJsonObject.optString("cullface", "");
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java
index 989fffa9..1ae6df66 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
-> DELETE 4 @ 3 : 4
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java
index a5efcf6f..e5e83e7f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java
@@ -7,16 +7,16 @@
> DELETE 3 @ 3 : 6
-> INSERT 4 : 6 @ 7
+> INSERT 1 : 3 @ 4
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
+
-> CHANGE 7 : 8 @ 8 : 9
+> CHANGE 3 : 4 @ 1 : 2
~ private final EaglerTextureAtlasSprite texture;
-> CHANGE 9 : 10 @ 10 : 11
+> CHANGE 2 : 3 @ 2 : 3
~ public BreakingFour(BakedQuad parBakedQuad, EaglerTextureAtlasSprite textureIn) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java
index 8d85f9a3..bab815f9 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java
@@ -12,34 +12,34 @@
+ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
+ import net.lax1dude.eaglercraft.v1_8.vector.Vector4f;
-> DELETE 7 @ 3 : 8
+> DELETE 5 @ 1 : 6
-> DELETE 11 @ 12 : 15
+> DELETE 4 @ 9 : 12
-> CHANGE 16 : 19 @ 20 : 23
+> CHANGE 5 : 8 @ 8 : 11
~ public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face,
~ EaglerTextureAtlasSprite sprite, EnumFacing facing, ModelRotation modelRotationIn,
~ BlockPartRotation partRotation, boolean uvLocked, boolean shade) {
-> CHANGE 33 : 34 @ 37 : 38
+> CHANGE 17 : 18 @ 17 : 18
~ private int[] makeQuadVertexData(BlockPartFace partFace, EaglerTextureAtlasSprite sprite, EnumFacing facing,
-> CHANGE 81 : 83 @ 85 : 87
+> CHANGE 48 : 50 @ 48 : 50
~ float[] sprite, EaglerTextureAtlasSprite modelRotationIn, ModelRotation partRotation,
~ BlockPartRotation uvLocked, boolean shade, boolean parFlag2) {
-> CHANGE 96 : 97 @ 100 : 101
+> CHANGE 15 : 16 @ 15 : 16
~ EaglerTextureAtlasSprite sprite, BlockFaceUV faceUV) {
-> CHANGE 210 : 211 @ 214 : 215
+> CHANGE 114 : 115 @ 114 : 115
~ EaglerTextureAtlasSprite parTextureAtlasSprite) {
-> CHANGE 287 : 288 @ 291 : 292
+> CHANGE 77 : 78 @ 77 : 78
~ EaglerTextureAtlasSprite parTextureAtlasSprite) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java
index e5c420c9..1eb2e73c 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java
@@ -10,14 +10,14 @@
~ import org.json.JSONException;
~ import org.json.JSONObject;
-> INSERT 5 : 9 @ 11
+> INSERT 3 : 7 @ 9
+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+
-> CHANGE 90 : 98 @ 92 : 108
+> CHANGE 85 : 93 @ 81 : 97
~ public static class Deserializer implements JSONTypeDeserializer {
~ public ItemCameraTransforms deserialize(JSONObject jsonobject) throws JSONException {
@@ -28,11 +28,11 @@
~ ItemTransformVec3f itemtransformvec3f4 = this.func_181683_a(jsonobject, "ground");
~ ItemTransformVec3f itemtransformvec3f5 = this.func_181683_a(jsonobject, "fixed");
-> CHANGE 102 : 103 @ 112 : 114
+> CHANGE 12 : 13 @ 20 : 22
~ private ItemTransformVec3f func_181683_a(JSONObject parJsonObject, String parString1) {
-> CHANGE 104 : 105 @ 115 : 117
+> CHANGE 2 : 3 @ 3 : 5
~ ? JSONTypeProvider.deserialize(parJsonObject.get(parString1), ItemTransformVec3f.class)
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java
index bf40412c..f40be89c 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 5 : 11 @ 7 : 13
+> CHANGE 3 : 9 @ 5 : 11
~
~ import com.google.common.collect.Lists;
@@ -16,24 +16,24 @@
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
-> DELETE 14 @ 16 : 17
+> DELETE 9 @ 9 : 10
-> CHANGE 31 : 33 @ 34 : 35
+> CHANGE 17 : 19 @ 18 : 19
~ EaglerTextureAtlasSprite textureatlassprite = textureMapIn
~ .getAtlasSprite((new ResourceLocation(s1)).toString());
-> CHANGE 45 : 47 @ 47 : 48
+> CHANGE 14 : 16 @ 13 : 14
~ private List func_178394_a(int parInt1, String parString1,
~ EaglerTextureAtlasSprite parTextureAtlasSprite) {
-> CHANGE 59 : 61 @ 60 : 61
+> CHANGE 14 : 16 @ 13 : 14
~ private List func_178397_a(EaglerTextureAtlasSprite parTextureAtlasSprite, String parString1,
~ int parInt1) {
-> CHANGE 163 : 164 @ 163 : 164
+> CHANGE 104 : 105 @ 103 : 104
~ private List func_178393_a(EaglerTextureAtlasSprite parTextureAtlasSprite) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java
index bb4ffc27..c20dd025 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java
@@ -14,27 +14,27 @@
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
-> DELETE 9 @ 11 : 12
+> DELETE 7 @ 9 : 10
-> CHANGE 43 : 44 @ 46 : 47
+> CHANGE 34 : 35 @ 35 : 36
~ public static class Deserializer implements JSONTypeDeserializer {
-> CHANGE 48 : 49 @ 51 : 54
+> CHANGE 5 : 6 @ 5 : 8
~ public ItemTransformVec3f deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 62 : 63 @ 67 : 68
+> CHANGE 14 : 15 @ 16 : 17
~ private Vector3f parseVector3f(JSONObject jsonObject, String key, Vector3f defaultValue) {
-> CHANGE 66 : 69 @ 71 : 74
+> CHANGE 4 : 7 @ 4 : 7
~ JSONArray jsonarray = jsonObject.getJSONArray(key);
~ if (jsonarray.length() != 3) {
~ throw new JSONException("Expected 3 " + key + " values, found: " + jsonarray.length());
-> CHANGE 73 : 74 @ 78 : 79
+> CHANGE 7 : 8 @ 7 : 8
~ afloat[i] = jsonarray.getFloat(i);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java
index 3525963d..f850efcc 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java
@@ -7,16 +7,16 @@
> DELETE 2 @ 2 : 11
-> CHANGE 11 : 12 @ 20 : 27
+> CHANGE 9 : 10 @ 18 : 25
~
-> CHANGE 13 : 15 @ 28 : 30
+> CHANGE 2 : 4 @ 8 : 10
~ import org.json.JSONException;
~ import org.json.JSONObject;
-> INSERT 16 : 25 @ 31
+> INSERT 3 : 12 @ 3
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
@@ -28,69 +28,69 @@
+ import net.minecraft.util.ResourceLocation;
+
-> CHANGE 27 : 28 @ 33 : 40
+> CHANGE 11 : 12 @ 2 : 9
~
-> DELETE 37 @ 49 : 53
+> DELETE 10 @ 16 : 20
-> CHANGE 38 : 39 @ 54 : 55
+> CHANGE 1 : 2 @ 5 : 6
~ return (ModelBlock) JSONTypeProvider.deserialize(new JSONObject(parString1), ModelBlock.class);
-> CHANGE 163 : 166 @ 179 : 180
+> CHANGE 125 : 128 @ 125 : 126
~ } catch (ModelBlock.LoopException var5) {
~ throw var5;
~ } catch (Throwable var6) {
-> CHANGE 181 : 184 @ 195 : 200
+> CHANGE 18 : 21 @ 16 : 21
~ public static class Deserializer implements JSONTypeDeserializer {
~ public ModelBlock deserialize(JSONObject jsonobject) throws JSONException {
~ List list = this.getModelElements(jsonobject);
-> CHANGE 188 : 189 @ 204 : 205
+> CHANGE 7 : 8 @ 9 : 10
~ throw new JSONException("BlockModel requires either elements or parent, found neither");
-> CHANGE 190 : 191 @ 206 : 207
+> CHANGE 2 : 3 @ 2 : 3
~ throw new JSONException("BlockModel requires either elements or parent, found both");
-> CHANGE 196 : 198 @ 212 : 215
+> CHANGE 6 : 8 @ 6 : 9
~ JSONObject jsonobject1 = jsonobject.getJSONObject("display");
~ itemcameratransforms = JSONTypeProvider.deserialize(jsonobject1, ItemCameraTransforms.class);
-> CHANGE 205 : 206 @ 222 : 223
+> CHANGE 9 : 10 @ 10 : 11
~ private Map getTextures(JSONObject parJsonObject) {
-> CHANGE 208 : 209 @ 225 : 226
+> CHANGE 3 : 4 @ 3 : 4
~ JSONObject jsonobject = parJsonObject.getJSONObject("textures");
-> CHANGE 210 : 212 @ 227 : 229
+> CHANGE 2 : 4 @ 2 : 4
~ for (String entry : jsonobject.keySet()) {
~ hashmap.put(entry, jsonobject.getString(entry));
-> CHANGE 218 : 220 @ 235 : 237
+> CHANGE 8 : 10 @ 8 : 10
~ private String getParent(JSONObject parJsonObject) {
~ return parJsonObject.optString("parent", "");
-> CHANGE 222 : 224 @ 239 : 241
+> CHANGE 4 : 6 @ 4 : 6
~ protected boolean getAmbientOcclusionEnabled(JSONObject parJsonObject) {
~ return parJsonObject.optBoolean("ambientocclusion", true);
-> CHANGE 226 : 227 @ 243 : 245
+> CHANGE 4 : 5 @ 4 : 6
~ protected List getModelElements(JSONObject parJsonObject) {
-> CHANGE 229 : 231 @ 247 : 249
+> CHANGE 3 : 5 @ 4 : 6
~ for (Object jsonelement : parJsonObject.getJSONArray("elements")) {
~ arraylist.add((BlockPart) JSONTypeProvider.deserialize(jsonelement, BlockPart.class));
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java
index e77b0cb5..6c06e673 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 11
-> INSERT 9 : 19 @ 18
+> INSERT 7 : 17 @ 16
+
+ import org.json.JSONArray;
@@ -20,73 +20,73 @@
+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
-> DELETE 20 @ 19 : 20
+> DELETE 11 @ 1 : 2
-> CHANGE 23 : 24 @ 23 : 27
+> CHANGE 3 : 4 @ 4 : 8
~
-> CHANGE 27 : 28 @ 30 : 31
+> CHANGE 4 : 5 @ 7 : 8
~ return (ModelBlockDefinition) JSONTypeProvider.deserialize(parReader, ModelBlockDefinition.class);
-> CHANGE 69 : 73 @ 72 : 78
+> CHANGE 42 : 46 @ 42 : 48
~ public static class Deserializer implements JSONTypeDeserializer {
~ public ModelBlockDefinition deserialize(JSONObject jsonobject) throws JSONException {
~ List list = this.parseVariantsList(jsonobject);
~ return new ModelBlockDefinition((Collection) list);
-> CHANGE 75 : 77 @ 80 : 83
+> CHANGE 6 : 8 @ 8 : 11
~ protected List parseVariantsList(JSONObject parJsonObject) {
~ JSONObject jsonobject = parJsonObject.getJSONObject("variants");
-> CHANGE 79 : 81 @ 85 : 87
+> CHANGE 4 : 6 @ 5 : 7
~ for (String entry : jsonobject.keySet()) {
~ arraylist.add(this.parseVariants(entry, jsonobject.get(entry)));
-> CHANGE 86 : 87 @ 92 : 95
+> CHANGE 7 : 8 @ 7 : 10
~ protected ModelBlockDefinition.Variants parseVariants(String s, Object jsonelement) {
-> CHANGE 88 : 91 @ 96 : 101
+> CHANGE 2 : 5 @ 4 : 9
~ if (jsonelement instanceof JSONArray) {
~ for (Object jsonelement1 : (JSONArray) jsonelement) {
~ arraylist.add(JSONTypeProvider.deserialize(jsonelement1, ModelBlockDefinition.Variant.class));
-> CHANGE 93 : 94 @ 103 : 105
+> CHANGE 5 : 6 @ 7 : 9
~ arraylist.add(JSONTypeProvider.deserialize(jsonelement, ModelBlockDefinition.Variant.class));
-> CHANGE 153 : 155 @ 164 : 168
+> CHANGE 60 : 62 @ 61 : 65
~ public static class Deserializer implements JSONTypeDeserializer {
~ public ModelBlockDefinition.Variant deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 169 : 171 @ 182 : 184
+> CHANGE 16 : 18 @ 18 : 20
~ private boolean parseUvLock(JSONObject parJsonObject) {
~ return parJsonObject.optBoolean("uvlock", false);
-> CHANGE 173 : 176 @ 186 : 189
+> CHANGE 4 : 7 @ 4 : 7
~ protected ModelRotation parseRotation(JSONObject parJsonObject) {
~ int i = parJsonObject.optInt("x", 0);
~ int j = parJsonObject.optInt("y", 0);
-> CHANGE 178 : 179 @ 191 : 192
+> CHANGE 5 : 6 @ 5 : 6
~ throw new JSONException("Invalid BlockModelRotation x: " + i + ", y: " + j);
-> CHANGE 184 : 186 @ 197 : 199
+> CHANGE 6 : 8 @ 6 : 8
~ protected String parseModel(JSONObject parJsonObject) {
~ return parJsonObject.getString("model");
-> CHANGE 188 : 190 @ 201 : 203
+> CHANGE 4 : 6 @ 4 : 6
~ protected int parseWeight(JSONObject parJsonObject) {
~ return parJsonObject.optInt("weight", 1);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java
index a2a73c28..1a3fb7fe 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> INSERT 6 : 11 @ 9
+> INSERT 4 : 9 @ 7
+
+ import com.google.common.base.Objects;
@@ -15,6 +15,6 @@
+ import com.google.common.collect.Sets;
+
-> DELETE 13 @ 11 : 13
+> DELETE 7 @ 2 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java
index e7bb3293..3c921b95 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java
@@ -7,20 +7,20 @@
> DELETE 2 @ 2 : 4
-> INSERT 5 : 9 @ 7
+> INSERT 3 : 7 @ 5
+
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+
-> DELETE 12 @ 10 : 11
+> DELETE 7 @ 3 : 4
-> CHANGE 27 : 28 @ 26 : 27
+> CHANGE 15 : 16 @ 16 : 17
~ LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(iblockstate.getProperties());
-> CHANGE 32 : 33 @ 31 : 32
+> CHANGE 5 : 6 @ 5 : 6
~ s = this.name.getName(linkedhashmap.remove(this.name));
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java
index b774dd41..1ded474c 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Maps;
+
-> DELETE 10 @ 8 : 9
+> DELETE 6 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java
index 66f8e687..93ae5237 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java
@@ -7,57 +7,57 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 5
+> CHANGE 1 : 4 @ 2 : 3
~
~ import com.google.common.collect.Lists;
~
-> CHANGE 7 : 8 @ 6 : 8
+> CHANGE 4 : 5 @ 2 : 4
~ import net.minecraft.util.EnumWorldBlockLayer;
-> DELETE 11 @ 11 : 12
+> DELETE 4 @ 5 : 6
-> INSERT 17 : 19 @ 18
+> INSERT 6 : 8 @ 7
+ public long goddamnFuckingTimeout = 0l;
+ public long time = 0;
-> CHANGE 50 : 51 @ 49 : 57
+> CHANGE 33 : 34 @ 31 : 39
~ this.status = statusIn;
-> CHANGE 54 : 58 @ 60 : 61
+> CHANGE 4 : 8 @ 11 : 12
~ if (this.type == ChunkCompileTaskGenerator.Type.REBUILD_CHUNK
~ && this.status != ChunkCompileTaskGenerator.Status.DONE) {
~ this.renderChunk.setNeedsUpdate(true);
~ }
-> CHANGE 59 : 61 @ 62 : 67
+> CHANGE 5 : 7 @ 2 : 7
~ this.finished = true;
~ this.status = ChunkCompileTaskGenerator.Status.DONE;
-> CHANGE 62 : 64 @ 68 : 76
+> CHANGE 3 : 5 @ 6 : 14
~ for (Runnable runnable : this.listFinishRunnables) {
~ runnable.run();
-> DELETE 65 @ 77 : 78
+> DELETE 3 @ 9 : 10
-> CHANGE 68 : 71 @ 81 : 90
+> CHANGE 3 : 6 @ 4 : 13
~ this.listFinishRunnables.add(parRunnable);
~ if (this.finished) {
~ parRunnable.run();
-> DELETE 72 @ 91 : 92
+> DELETE 4 @ 10 : 11
-> DELETE 74 @ 94 : 98
+> DELETE 2 @ 3 : 7
-> INSERT 82 : 90 @ 106
+> INSERT 8 : 16 @ 12
+ public boolean canExecuteYet() {
+ if (this.type == ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java
index a67da618..7f3daa6f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java
@@ -11,94 +11,94 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.minecraft.ChunkUpdateManager;
-> DELETE 7 @ 11 : 15
+> DELETE 5 @ 9 : 13
-> DELETE 9 @ 17 : 19
+> DELETE 2 @ 6 : 8
-> CHANGE 10 : 11 @ 20 : 21
+> CHANGE 1 : 2 @ 3 : 4
~ public class ChunkRenderWorker {
-> CHANGE 12 : 13 @ 22 : 23
+> CHANGE 2 : 3 @ 2 : 3
~ private final ChunkUpdateManager chunkRenderDispatcher;
-> CHANGE 15 : 16 @ 25 : 26
+> CHANGE 3 : 4 @ 3 : 4
~ public ChunkRenderWorker(ChunkUpdateManager parChunkRenderDispatcher) {
-> CHANGE 19 : 20 @ 29 : 30
+> CHANGE 4 : 5 @ 4 : 5
~ public ChunkRenderWorker(ChunkUpdateManager chunkRenderDispatcherIn,
-> DELETE 25 @ 35 : 51
+> DELETE 6 @ 6 : 22
-> CHANGE 26 : 30 @ 52 : 62
+> CHANGE 1 : 5 @ 17 : 27
~ if (generator.getStatus() != ChunkCompileTaskGenerator.Status.PENDING) {
~ if (!generator.isFinished()) {
~ LOGGER.warn("Chunk render task was " + generator.getStatus()
~ + " when I expected it to be pending; ignoring task");
-> CHANGE 32 : 33 @ 64 : 67
+> CHANGE 6 : 7 @ 12 : 15
~ return;
-> INSERT 35 : 37 @ 69
+> INSERT 3 : 5 @ 5
+ generator.setStatus(ChunkCompileTaskGenerator.Status.COMPILING);
+
-> CHANGE 52 : 56 @ 84 : 95
+> CHANGE 17 : 21 @ 15 : 26
~ if (generator.getStatus() != ChunkCompileTaskGenerator.Status.COMPILING) {
~ if (!generator.isFinished()) {
~ LOGGER.warn("Chunk render task was " + generator.getStatus()
~ + " when I expected it to be compiling; aborting task");
-> CHANGE 58 : 60 @ 97 : 100
+> CHANGE 6 : 8 @ 13 : 16
~ this.freeRenderBuilder(generator);
~ return;
-> INSERT 62 : 64 @ 102
+> INSERT 4 : 6 @ 5
+ generator.setStatus(ChunkCompileTaskGenerator.Status.UPLOADING);
+
-> CHANGE 65 : 68 @ 103 : 104
+> CHANGE 3 : 6 @ 1 : 2
~ if (compiledchunk == null) {
~ System.out.println(chunkcompiletaskgenerator$type);
~ }
-> CHANGE 70 : 72 @ 106 : 108
+> CHANGE 5 : 7 @ 3 : 5
~ if (!compiledchunk.isLayerEmpty(enumworldblocklayer)) {
~ this.chunkRenderDispatcher.uploadChunk(enumworldblocklayer,
-> CHANGE 73 : 76 @ 109 : 110
+> CHANGE 3 : 6 @ 3 : 4
~ generator.getRenderChunk(), compiledchunk);
~ generator.getRenderChunk().setCompiledChunk(compiledchunk);
~ generator.setStatus(ChunkCompileTaskGenerator.Status.DONE);
-> CHANGE 79 : 80 @ 113 : 114
+> CHANGE 6 : 7 @ 4 : 5
~ this.chunkRenderDispatcher.uploadChunk(
-> CHANGE 82 : 85 @ 116 : 117
+> CHANGE 3 : 6 @ 3 : 4
~ generator.getRenderChunk(), compiledchunk);
~ generator.getRenderChunk().setCompiledChunk(compiledchunk);
~ generator.setStatus(ChunkCompileTaskGenerator.Status.DONE);
-> DELETE 87 @ 119 : 159
+> DELETE 5 @ 3 : 43
-> CHANGE 91 : 92 @ 163 : 165
+> CHANGE 4 : 5 @ 44 : 46
~ return this.regionRenderCacheBuilder;
-> DELETE 95 @ 168 : 171
+> DELETE 4 @ 5 : 8
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java
index 0733b1da..1ef107a8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 7 @ 4 : 6
+> CHANGE 1 : 5 @ 2 : 4
~
~ import com.google.common.collect.Lists;
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> CHANGE 22 : 23 @ 21 : 22
+> CHANGE 19 : 20 @ 17 : 18
~ return true;
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java
index bcfb39e0..81a39542 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java
@@ -9,30 +9,30 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
-> DELETE 5 @ 4 : 6
+> DELETE 3 @ 2 : 4
-> CHANGE 10 : 11 @ 11 : 12
+> CHANGE 5 : 6 @ 7 : 8
~ private final int[] baseDisplayList;
-> INSERT 14 : 18 @ 15
+> INSERT 4 : 8 @ 4
+ this.baseDisplayList = new int[EnumWorldBlockLayer.values().length];
+ for (int i = 0; i < this.baseDisplayList.length; ++i) {
+ this.baseDisplayList[i] = GLAllocation.generateDisplayLists();
+ }
-> CHANGE 21 : 22 @ 18 : 19
+> CHANGE 7 : 8 @ 3 : 4
~ return !parCompiledChunk.isLayerEmpty(layer) ? this.baseDisplayList[layer.ordinal()] : -1;
-> CHANGE 26 : 29 @ 23 : 24
+> CHANGE 5 : 8 @ 5 : 6
~ for (int i = 0; i < this.baseDisplayList.length; ++i) {
~ GLAllocation.deleteDisplayLists(this.baseDisplayList[i]);
~ }
-> INSERT 30 : 40 @ 25
+> INSERT 4 : 14 @ 2
+
+ public void rebuildChunk(float x, float y, float z, ChunkCompileTaskGenerator generator) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java
index 42970473..f22b5358 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java
@@ -9,7 +9,7 @@
~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
-> CHANGE 6 : 12 @ 8 : 9
+> CHANGE 4 : 10 @ 6 : 7
~
~ import com.google.common.collect.Maps;
@@ -18,47 +18,47 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 16 @ 13 : 16
+> DELETE 10 @ 5 : 8
-> DELETE 18 @ 18 : 22
+> DELETE 2 @ 5 : 9
-> DELETE 21 @ 25 : 26
+> DELETE 3 @ 7 : 8
-> DELETE 34 @ 39 : 41
+> DELETE 13 @ 14 : 16
-> CHANGE 37 : 38 @ 44 : 46
+> CHANGE 3 : 4 @ 5 : 7
~ private final float[] modelviewMatrix = new float[16];
-> DELETE 51 @ 59 : 65
+> DELETE 14 @ 15 : 21
-> DELETE 62 @ 76 : 80
+> DELETE 11 @ 17 : 21
-> DELETE 93 @ 111 : 112
+> DELETE 31 @ 35 : 36
-> CHANGE 95 : 97 @ 114 : 123
+> CHANGE 2 : 4 @ 3 : 12
~ if (generator.getStatus() != ChunkCompileTaskGenerator.Status.COMPILING) {
~ return;
-> INSERT 99 : 102 @ 125
+> INSERT 4 : 7 @ 11
+ regionrendercache = new RegionRenderCache(this.world, blockpos.add(-1, -1, -1), blockpos1.add(1, 1, 1), 1);
+ generator.setCompiledChunk(compiledchunk);
+
-> CHANGE 109 : 111 @ 132 : 134
+> CHANGE 10 : 12 @ 7 : 9
~ for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBox(blockpos, blockpos1)) {
~ IBlockState iblockstate = regionrendercache.getBlockStateFaster(blockpos$mutableblockpos);
-> CHANGE 117 : 118 @ 140 : 141
+> CHANGE 8 : 9 @ 8 : 9
~ TileEntity tileentity = regionrendercache.getTileEntity(blockpos$mutableblockpos);
-> DELETE 156 @ 179 : 180
+> DELETE 39 @ 39 : 40
-> CHANGE 157 : 164 @ 181 : 192
+> CHANGE 1 : 8 @ 2 : 13
~ HashSet hashset1 = Sets.newHashSet(hashset);
~ HashSet hashset2 = Sets.newHashSet(this.field_181056_j);
@@ -68,34 +68,34 @@
~ this.field_181056_j.addAll(hashset);
~ this.renderGlobal.func_181023_a(hashset2, hashset1);
-> CHANGE 168 : 171 @ 196 : 205
+> CHANGE 11 : 14 @ 15 : 24
~ if (this.compileTask != null && this.compileTask.getStatus() != ChunkCompileTaskGenerator.Status.DONE) {
~ this.compileTask.finish();
~ this.compileTask = null;
-> DELETE 172 @ 206 : 207
+> DELETE 4 @ 10 : 11
-> DELETE 174 @ 209 : 213
+> DELETE 2 @ 3 : 7
-> DELETE 175 @ 214 : 216
+> DELETE 1 @ 5 : 7
-> CHANGE 176 : 179 @ 217 : 225
+> CHANGE 1 : 4 @ 3 : 11
~ this.finishCompileTask();
~ this.compileTask = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.REBUILD_CHUNK);
~ chunkcompiletaskgenerator = this.compileTask;
-> CHANGE 183 : 186 @ 229 : 252
+> CHANGE 7 : 10 @ 12 : 35
~ this.compileTask = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY);
~ this.compileTask.setCompiledChunk(this.compiledChunk);
~ return this.compileTask;
-> CHANGE 223 : 224 @ 289 : 297
+> CHANGE 40 : 41 @ 60 : 68
~ this.compiledChunk = compiledChunkIn;
-> DELETE 234 @ 307 : 314
+> DELETE 11 @ 18 : 25
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java
index 7c7a500d..97c8b7d6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 6 : 9 @ 7 : 8
+> CHANGE 4 : 7 @ 5 : 6
~
~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java b/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java
index 96734450..434181a2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java
@@ -12,22 +12,22 @@
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 4 : 6
+> DELETE 5 @ 2 : 4
-> DELETE 11 @ 10 : 13
+> DELETE 4 @ 6 : 9
-> INSERT 14 : 15 @ 16
+> INSERT 3 : 4 @ 6
+ instance.destroy();
-> DELETE 28 @ 29 : 34
+> DELETE 14 @ 13 : 18
-> CHANGE 30 : 32 @ 36 : 40
+> CHANGE 2 : 4 @ 7 : 11
~ GlStateManager.getFloat(2983, afloat);
~ GlStateManager.getFloat(2982, afloat1);
-> INSERT 101 : 105 @ 109
+> INSERT 71 : 75 @ 73
+
+ public void destroy() {
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java
index f3b8c089..0fec1a62 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 5 @ 4 : 7
+> DELETE 3 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java
index 45a8acab..72039fe8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java
@@ -12,24 +12,24 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 9 @ 5 : 6
+> DELETE 7 @ 3 : 4
-> DELETE 10 @ 7 : 8
+> DELETE 1 @ 2 : 3
-> DELETE 11 @ 9 : 11
+> DELETE 1 @ 2 : 4
-> DELETE 21 @ 21 : 22
+> DELETE 10 @ 12 : 13
-> CHANGE 82 : 84 @ 83 : 85
+> CHANGE 61 : 63 @ 62 : 64
~ EaglerTextureAtlasSprite textureatlassprite = texturemap.getAtlasSprite("minecraft:blocks/fire_layer_0");
~ EaglerTextureAtlasSprite textureatlassprite1 = texturemap.getAtlasSprite("minecraft:blocks/fire_layer_1");
-> CHANGE 102 : 103 @ 103 : 104
+> CHANGE 20 : 21 @ 20 : 21
~ EaglerTextureAtlasSprite textureatlassprite2 = i % 2 == 0 ? textureatlassprite : textureatlassprite1;
-> CHANGE 282 : 283 @ 283 : 284
+> CHANGE 180 : 181 @ 180 : 181
~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java
index 3072a843..7962639d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java
@@ -11,19 +11,19 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 4 : 7
+> DELETE 4 @ 2 : 5
-> DELETE 10 @ 11 : 12
+> DELETE 4 @ 7 : 8
-> CHANGE 51 : 52 @ 53 : 54
+> CHANGE 41 : 42 @ 42 : 43
~ EaglercraftGPU.glNormal3f(f10, 0.0F, 0.0F);
-> CHANGE 58 : 59 @ 60 : 61
+> CHANGE 7 : 8 @ 7 : 8
~ EaglercraftGPU.glNormal3f(-f10, 0.0F, 0.0F);
-> CHANGE 68 : 69 @ 70 : 71
+> CHANGE 10 : 11 @ 10 : 11
~ EaglercraftGPU.glNormal3f(0.0F, 0.0F, f10);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java
index f3b8c089..0fec1a62 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 5 @ 4 : 7
+> DELETE 3 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java
index df0d3cab..3505ff16 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java
@@ -10,8 +10,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 5 @ 3 : 4
+> DELETE 3 @ 1 : 2
-> DELETE 7 @ 6 : 9
+> DELETE 2 @ 3 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java
index 5857c317..96c68eae 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java
@@ -10,9 +10,9 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 6 @ 5 : 7
+> DELETE 4 @ 3 : 5
-> CHANGE 15 : 16 @ 16 : 17
+> CHANGE 9 : 10 @ 11 : 12
~ private EaglercraftRandom rnd = new EaglercraftRandom();
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java
index 64bf1ce0..ea98d307 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java
@@ -11,13 +11,13 @@
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 5 : 8
+> DELETE 4 @ 3 : 6
-> CHANGE 16 : 17 @ 18 : 19
+> CHANGE 10 : 11 @ 13 : 14
~ private EaglercraftRandom field_177079_e = new EaglercraftRandom();
-> CHANGE 45 : 47 @ 47 : 49
+> CHANGE 29 : 31 @ 29 : 31
~ float f6 = 0.0F * (float) (i - 1) * 0.5F;
~ float f4 = 0.0F * (float) (i - 1) * 0.5F;
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java
index 650f9643..56e761d8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java
@@ -10,8 +10,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 8 @ 6 : 7
+> DELETE 6 @ 4 : 5
-> DELETE 9 @ 8 : 11
+> DELETE 1 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java
index 851f8074..d751c100 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java
@@ -11,11 +11,11 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 3 : 4
+> DELETE 4 @ 1 : 2
-> DELETE 7 @ 5 : 9
+> DELETE 1 @ 2 : 6
-> CHANGE 27 : 28 @ 29 : 30
+> CHANGE 20 : 21 @ 24 : 25
~ EaglerTextureAtlasSprite textureatlassprite = Minecraft.getMinecraft().getRenderItem().getItemModelMesher()
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java
index 16b90d83..6aa91452 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java
@@ -10,8 +10,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 5 @ 3 : 4
+> DELETE 3 @ 1 : 2
-> DELETE 6 @ 5 : 8
+> DELETE 1 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java
index 28662034..5aa72792 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java
@@ -9,9 +9,9 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 5 @ 4 : 7
+> DELETE 3 @ 2 : 5
-> CHANGE 20 : 22 @ 22 : 24
+> CHANGE 15 : 17 @ 18 : 20
~ this.field_177189_c = new ModelZombie(0.5F, false);
~ this.field_177186_d = new ModelZombie(1.0F, false);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java
index b137cc46..2c83355a 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java
@@ -12,15 +12,15 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 7 @ 3 : 5
+> DELETE 5 @ 1 : 3
-> DELETE 8 @ 6 : 7
+> DELETE 1 @ 3 : 4
-> DELETE 9 @ 8 : 10
+> DELETE 1 @ 2 : 4
-> DELETE 15 @ 16 : 17
+> DELETE 6 @ 8 : 9
-> CHANGE 72 : 74 @ 74 : 76
+> CHANGE 57 : 59 @ 58 : 60
~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 10497.0F);
~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 10497.0F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java
index ec230e5d..45804cfd 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 7 @ 4
+> INSERT 1 : 5 @ 2
+
+ import com.google.common.collect.Maps;
+
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 9 @ 6 : 9
+> DELETE 6 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java
index d52eb72b..b38a3597 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java
@@ -11,8 +11,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 28 @ 25 : 26
+> DELETE 24 @ 21 : 22
-> DELETE 31 @ 29 : 30
+> DELETE 3 @ 4 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java
index 38ecafd7..bca66bae 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java
@@ -12,13 +12,13 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 7 @ 5 : 8
+> DELETE 5 @ 3 : 6
-> CHANGE 28 : 29 @ 29 : 30
+> CHANGE 21 : 22 @ 24 : 25
~ EaglercraftRandom random = new EaglercraftRandom(entitylightningbolt.boltVertex);
-> CHANGE 38 : 39 @ 39 : 40
+> CHANGE 10 : 11 @ 10 : 11
~ EaglercraftRandom random1 = new EaglercraftRandom(entitylightningbolt.boltVertex);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java
index 7d896662..7bb4f240 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java
@@ -11,10 +11,10 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 3 : 5
+> DELETE 4 @ 1 : 3
-> DELETE 7 @ 6 : 7
+> DELETE 1 @ 3 : 4
-> DELETE 8 @ 8 : 10
+> DELETE 1 @ 2 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java
index f0859ed3..1cc4a6c2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 9 @ 4
+> INSERT 1 : 7 @ 2
+
+ import com.google.common.collect.Maps;
@@ -16,22 +16,22 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 25 @ 20 : 22
+> DELETE 22 @ 16 : 18
-> DELETE 27 @ 24 : 25
+> DELETE 2 @ 4 : 5
-> DELETE 28 @ 26 : 80
+> DELETE 1 @ 2 : 56
-> CHANGE 191 : 193 @ 243 : 244
+> CHANGE 163 : 165 @ 217 : 218
~ this.skinMap.put("slim", new RenderPlayer(this, true, false));
~ this.skinMap.put("zombie", new RenderPlayer(this, false, true));
-> CHANGE 204 : 205 @ 255 : 256
+> CHANGE 13 : 14 @ 12 : 13
~ render = this.getEntityClassRenderObject((Class) parClass1.getSuperclass());
-> CHANGE 211 : 212 @ 262 : 263
+> CHANGE 7 : 8 @ 7 : 8
~ public Render getEntityRenderObject(Entity entityIn) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java
index e086ddcb..f3b8c089 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 6 : 9
+> DELETE 5 @ 4 : 7
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java
index e3c80b1b..72b3314d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java
@@ -11,6 +11,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 5 : 8
+> DELETE 4 @ 3 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java
index 7ce3c0d3..b653f27e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java
@@ -7,7 +7,7 @@
> DELETE 3 @ 3 : 5
-> CHANGE 17 : 19 @ 19 : 21
+> CHANGE 14 : 16 @ 16 : 18
~ this.field_177189_c = new ModelZombie(0.5F, false);
~ this.field_177186_d = new ModelZombie(1.0F, false);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java
index f5814ec5..93758545 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java
@@ -9,41 +9,41 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> INSERT 5 : 6 @ 4
+> INSERT 3 : 4 @ 2
+ import net.minecraft.client.model.ModelBiped;
-> CHANGE 7 : 8 @ 5 : 8
+> CHANGE 2 : 3 @ 1 : 4
~ import net.minecraft.client.model.ModelZombie;
-> INSERT 24 : 25 @ 24
+> INSERT 17 : 18 @ 19
+ private boolean zombieModel;
-> CHANGE 27 : 28 @ 26 : 27
+> CHANGE 3 : 4 @ 2 : 3
~ this(renderManager, false, false);
-> CHANGE 30 : 32 @ 29 : 31
+> CHANGE 3 : 5 @ 3 : 5
~ public RenderPlayer(RenderManager renderManager, boolean useSmallArms, boolean zombieModel) {
~ super(renderManager, zombieModel ? new ModelZombie(0.0F, true) : new ModelPlayer(0.0F, useSmallArms), 0.5F);
-> INSERT 33 : 34 @ 32
+> INSERT 3 : 4 @ 3
+ this.zombieModel = zombieModel;
-> CHANGE 42 : 44 @ 40 : 42
+> CHANGE 9 : 11 @ 8 : 10
~ public ModelBiped getMainModel() {
~ return (ModelBiped) super.getMainModel();
-> CHANGE 60 : 61 @ 58 : 59
+> CHANGE 18 : 19 @ 18 : 19
~ ModelBiped modelplayer = this.getMainModel();
-> CHANGE 69 : 77 @ 67 : 72
+> CHANGE 9 : 17 @ 9 : 14
~ if (!zombieModel) {
~ ModelPlayer modelplayer_ = (ModelPlayer) modelplayer;
@@ -54,7 +54,7 @@
~ modelplayer_.bipedRightArmwear.showModel = clientPlayer.isWearing(EnumPlayerModelParts.RIGHT_SLEEVE);
~ }
-> CHANGE 127 : 137 @ 122 : 130
+> CHANGE 58 : 68 @ 55 : 63
~ if (!zombieModel) {
~ float f = 1.0F;
@@ -67,7 +67,7 @@
~ ((ModelPlayer) modelplayer).renderRightArm();
~ }
-> CHANGE 140 : 150 @ 133 : 141
+> CHANGE 13 : 23 @ 11 : 19
~ if (!zombieModel) {
~ float f = 1.0F;
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java
index 58aaaa00..0e94dd36 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java
@@ -9,6 +9,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 4 : 7
+> DELETE 2 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java
index f3b8c089..0fec1a62 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 5 @ 4 : 7
+> DELETE 3 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java
index ef0d1726..49ebceb7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 5 : 8
+> DELETE 4 @ 3 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java
index 49ebceb7..42e703d2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 6
+> DELETE 2 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java
index e3c80b1b..72b3314d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java
@@ -11,6 +11,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 6 @ 5 : 8
+> DELETE 4 @ 3 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java
index a8c8300c..f49c6f29 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
+
-> DELETE 9 @ 7 : 9
+> DELETE 6 @ 3 : 5
-> CHANGE 34 : 36 @ 34 : 36
+> CHANGE 25 : 27 @ 27 : 29
~ this.field_177189_c = new ModelZombie(0.5F, false);
~ this.field_177186_d = new ModelZombie(1.0F, false);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java
index 5720a265..d11d76e8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java
@@ -9,7 +9,7 @@
~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
-> INSERT 4 : 13 @ 5
+> INSERT 2 : 11 @ 3
+
+ import com.google.common.collect.Lists;
@@ -21,17 +21,17 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 18 @ 10 : 12
+> DELETE 14 @ 5 : 7
-> DELETE 19 @ 13 : 16
+> DELETE 1 @ 3 : 6
-> DELETE 29 @ 26 : 29
+> DELETE 10 @ 13 : 16
-> CHANGE 45 : 46 @ 45 : 46
+> CHANGE 16 : 17 @ 19 : 20
~ return this.layerRenderers.add((LayerRenderer) layer);
-> CHANGE 240 : 247 @ 240 : 296
+> CHANGE 195 : 202 @ 195 : 251
~ GlStateManager.enableShaderBlendAdd();
~ float f1 = 1.0F - (float) (i >> 24 & 255) / 255.0F;
@@ -41,11 +41,11 @@
~ GlStateManager.setShaderBlendSrc(f1, f1, f1, 1.0F);
~ GlStateManager.setShaderBlendAdd(f2 * f1 + 0.4F, f3 * f1, f4 * f1, 0.0f);
-> CHANGE 252 : 253 @ 301 : 338
+> CHANGE 12 : 13 @ 61 : 98
~ GlStateManager.disableShaderBlendAdd();
-> CHANGE 326 : 327 @ 411 : 412
+> CHANGE 74 : 75 @ 110 : 111
~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java
index c2936a6f..34ea3105 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 8 @ 4
+> INSERT 1 : 6 @ 2
+
+ import com.google.common.collect.Maps;
@@ -15,23 +15,23 @@
+ import net.lax1dude.eaglercraft.v1_8.HString;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 9 @ 5 : 6
+> DELETE 6 @ 1 : 2
-> DELETE 10 @ 7 : 8
+> DELETE 1 @ 2 : 3
-> CHANGE 57 : 58 @ 55 : 56
+> CHANGE 47 : 48 @ 48 : 49
~ this.func_177179_a((T) modelbase, parInt1);
-> CHANGE 77 : 78 @ 75 : 76
+> CHANGE 20 : 21 @ 20 : 21
~ this.func_177183_a(entitylivingbaseIn, (T) modelbase, armorSlot, parFloat2, parFloat3, parFloat4,
-> CHANGE 136 : 137 @ 134 : 135
+> CHANGE 59 : 60 @ 59 : 60
~ String s = HString.format("textures/models/armor/%s_layer_%d%s.png",
-> CHANGE 138 : 139 @ 136 : 137
+> CHANGE 2 : 3 @ 2 : 3
~ parString1 == null ? "" : HString.format("_%s", new Object[] { parString1 }) });
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java
index af91309e..5f98a424 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java
@@ -11,11 +11,11 @@
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 5 : 6
+> DELETE 5 @ 3 : 4
-> DELETE 9 @ 8 : 9
+> DELETE 2 @ 3 : 4
-> CHANGE 26 : 27 @ 26 : 27
+> CHANGE 17 : 18 @ 18 : 19
~ EaglercraftRandom random = new EaglercraftRandom((long) entitylivingbase.getEntityId());
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java
index aa90635e..8d8f336e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java
@@ -9,18 +9,18 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> CHANGE 4 : 5 @ 3 : 4
+> CHANGE 2 : 3 @ 1 : 2
~ import net.minecraft.client.model.ModelPlayer;
-> DELETE 6 @ 5 : 6
+> DELETE 2 @ 2 : 3
-> CHANGE 20 : 22 @ 20 : 21
+> CHANGE 14 : 16 @ 15 : 16
~ && abstractclientplayer.getLocationCape() != null
~ && this.playerRenderer.getMainModel() instanceof ModelPlayer) {
-> CHANGE 64 : 65 @ 63 : 64
+> CHANGE 44 : 45 @ 43 : 44
~ ((ModelPlayer) this.playerRenderer.getMainModel()).renderCape(0.0625F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java
index 27cd1621..3f8fbda1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 4
+> DELETE 2 @ 1 : 2
-> DELETE 5 @ 5 : 6
+> DELETE 1 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java
index 7020e6df..efa94acd 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java
@@ -12,11 +12,11 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 8 @ 6 : 7
+> DELETE 6 @ 4 : 5
-> DELETE 9 @ 8 : 9
+> DELETE 1 @ 2 : 3
-> CHANGE 78 : 79 @ 78 : 79
+> CHANGE 69 : 70 @ 70 : 71
~ gameprofile = TileEntitySkull.updateGameprofile(new GameProfile((EaglercraftUUID) null, s));
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java
index 628614e2..e885110a 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java
@@ -9,17 +9,17 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> CHANGE 4 : 5 @ 3 : 4
+> CHANGE 2 : 3 @ 1 : 2
~ import net.minecraft.client.model.ModelPlayer;
-> DELETE 6 @ 5 : 6
+> DELETE 2 @ 2 : 3
-> CHANGE 17 : 18 @ 17 : 18
+> CHANGE 11 : 12 @ 12 : 13
~ && !abstractclientplayer.isInvisible() && this.playerRenderer.getMainModel() instanceof ModelPlayer) {
-> CHANGE 37 : 38 @ 37 : 38
+> CHANGE 20 : 21 @ 20 : 21
~ ((ModelPlayer) this.playerRenderer.getMainModel()).renderDeadmau5Head(0.0625F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java
index 26e1b4de..7d0d3c81 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java
@@ -12,9 +12,9 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 8 @ 6 : 8
+> DELETE 6 @ 4 : 6
-> CHANGE 24 : 25 @ 24 : 25
+> CHANGE 16 : 17 @ 18 : 19
~ EaglercraftRandom random = new EaglercraftRandom(432L);
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java
index 7f6db676..f7f5eb71 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java
@@ -10,6 +10,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 5 @ 5 : 6
+> DELETE 3 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java
index 7f6db676..f7f5eb71 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java
@@ -10,6 +10,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 5 @ 5 : 6
+> DELETE 3 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java
index 94c615e6..2abc02a4 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java
@@ -10,8 +10,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 8 @ 6 : 8
+> DELETE 6 @ 4 : 6
-> DELETE 9 @ 9 : 10
+> DELETE 1 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java
index 323913cc..43b007df 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 5 : 6
+> DELETE 4 @ 3 : 4
-> DELETE 8 @ 8 : 9
+> DELETE 2 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java
index 323913cc..43b007df 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 5 : 6
+> DELETE 4 @ 3 : 4
-> DELETE 8 @ 8 : 9
+> DELETE 2 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java
index c0b443d6..155464db 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java
@@ -10,8 +10,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 7 @ 5 : 7
+> DELETE 5 @ 3 : 5
-> DELETE 8 @ 8 : 9
+> DELETE 1 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java
index 51a6afb8..50f3e4ed 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 6 @ 5 : 6
+> DELETE 4 @ 3 : 4
-> DELETE 7 @ 7 : 8
+> DELETE 1 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java
index 27cd1621..3f8fbda1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 4
+> DELETE 2 @ 1 : 2
-> DELETE 5 @ 5 : 6
+> DELETE 1 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java
index 3f0c81e7..95e548e3 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java
@@ -9,12 +9,12 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 5 @ 4 : 5
+> DELETE 3 @ 2 : 3
-> DELETE 6 @ 6 : 7
+> DELETE 1 @ 2 : 3
-> DELETE 20 @ 21 : 22
+> DELETE 14 @ 15 : 16
-> DELETE 25 @ 27 : 28
+> DELETE 5 @ 6 : 7
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java
index c5a9a60a..426ef1b8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 4
+> DELETE 2 @ 1 : 2
-> DELETE 6 @ 6 : 7
+> DELETE 2 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java
index 7f6db676..f7f5eb71 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java
@@ -10,6 +10,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 5 @ 5 : 6
+> DELETE 3 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java
index 27cd1621..3f8fbda1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java
@@ -9,8 +9,8 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 4
+> DELETE 2 @ 1 : 2
-> DELETE 5 @ 5 : 6
+> DELETE 1 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java
index 599647ff..e6966352 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java
@@ -9,6 +9,6 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 4 : 5
+> DELETE 2 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java
index f68beb40..5804d755 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java
@@ -9,12 +9,12 @@
~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
-> INSERT 4 : 6 @ 6
+> INSERT 2 : 4 @ 4
+ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+
-> CHANGE 14 : 26 @ 14 : 25
+> CHANGE 10 : 22 @ 8 : 19
~ if (blur != parFlag || mipmap != parFlag2) {
~ this.blur = parFlag;
@@ -29,7 +29,7 @@
~ short1 = 9728;
~ }
-> CHANGE 27 : 30 @ 26 : 28
+> CHANGE 13 : 16 @ 12 : 14
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, i);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, short1);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java
index 98abd079..2c672edc 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 5 @ 4 : 6
+> CHANGE 1 : 3 @ 2 : 4
~
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> CHANGE 12 : 15 @ 13 : 17
+> CHANGE 9 : 12 @ 9 : 13
~ public DynamicTexture(ImageData bufferedImage) {
~ this(bufferedImage.width, bufferedImage.height);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java
index 495f6feb..630665bc 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java
@@ -7,34 +7,34 @@
> DELETE 2 @ 2 : 5
-> INSERT 5 : 9 @ 8
+> INSERT 3 : 7 @ 6
+
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 10 @ 9 : 11
+> DELETE 5 @ 1 : 3
-> DELETE 14 @ 15 : 17
+> DELETE 4 @ 6 : 8
-> CHANGE 31 : 32 @ 34 : 35
+> CHANGE 17 : 18 @ 19 : 20
~ ImageData bufferedimage;
-> CHANGE 33 : 34 @ 36 : 37
+> CHANGE 2 : 3 @ 2 : 3
~ ImageData bufferedimage1 = TextureUtil
-> DELETE 35 @ 38 : 42
+> DELETE 2 @ 2 : 6
-> CHANGE 36 : 39 @ 43 : 46
+> CHANGE 1 : 4 @ 5 : 8
~ bufferedimage = new ImageData(bufferedimage1.width, bufferedimage1.height, false);
~ bufferedimage.drawLayer(bufferedimage1, 0, 0, bufferedimage1.width, bufferedimage1.height, 0, 0,
~ bufferedimage1.width, bufferedimage1.height);
-> CHANGE 45 : 50 @ 52 : 59
+> CHANGE 9 : 14 @ 9 : 16
~ ImageData bufferedimage2 = TextureUtil.readBufferedImage(inputstream);
~ if (bufferedimage2.width == bufferedimage.width && bufferedimage2.height == bufferedimage.height) {
@@ -42,14 +42,14 @@
~ for (int l = 0; l < bufferedimage2.width; ++l) {
~ int i1 = bufferedimage2.pixels[k * bufferedimage2.width + l];
-> CHANGE 52 : 56 @ 61 : 64
+> CHANGE 7 : 11 @ 9 : 12
~ int k1 = bufferedimage1.pixels[k * bufferedimage1.width + l];
~ int l1 = MathHelper.func_180188_d(k1, ImageData.swapRB(mapcolor.colorValue))
~ & 16777215;
~ bufferedimage2.pixels[k * bufferedimage2.width + l] = j1 | l1;
-> CHANGE 60 : 62 @ 68 : 69
+> CHANGE 8 : 10 @ 7 : 8
~ bufferedimage.drawLayer(bufferedimage2, 0, 0, bufferedimage2.width, bufferedimage2.height, 0, 0,
~ bufferedimage2.width, bufferedimage2.height);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java
index f16b77af..ccc78630 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> CHANGE 5 : 11 @ 8 : 10
+> CHANGE 3 : 9 @ 6 : 8
~
~ import com.google.common.collect.Lists;
@@ -16,21 +16,21 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 13 @ 12 : 14
+> DELETE 8 @ 4 : 6
-> CHANGE 24 : 25 @ 25 : 26
+> CHANGE 11 : 12 @ 13 : 14
~ ImageData bufferedimage = null;
-> CHANGE 30 : 31 @ 31 : 32
+> CHANGE 6 : 7 @ 6 : 7
~ ImageData bufferedimage1 = TextureUtil.readBufferedImage(inputstream);
-> CHANGE 32 : 33 @ 33 : 34
+> CHANGE 2 : 3 @ 2 : 3
~ bufferedimage = new ImageData(bufferedimage1.width, bufferedimage1.height, true);
-> CHANGE 35 : 37 @ 36 : 37
+> CHANGE 3 : 5 @ 3 : 4
~ bufferedimage.drawLayer(bufferedimage1, 0, 0, bufferedimage1.width, bufferedimage1.height, 0, 0,
~ bufferedimage1.width, bufferedimage1.height);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java
index c3ae8161..511ed472 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java
@@ -7,16 +7,16 @@
> DELETE 2 @ 2 : 3
-> CHANGE 4 : 8 @ 5 : 7
+> CHANGE 2 : 6 @ 3 : 5
~
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 12 @ 11 : 13
+> DELETE 8 @ 6 : 8
-> CHANGE 28 : 29 @ 29 : 30
+> CHANGE 16 : 17 @ 18 : 19
~ ImageData bufferedimage = TextureUtil.readBufferedImage(inputstream);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java
index ab1b84c1..c1433524 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> INSERT 6 : 13 @ 8
+> INSERT 4 : 11 @ 6
+
+ import net.lax1dude.eaglercraft.v1_8.HString;
@@ -17,37 +17,37 @@
+ import com.google.common.collect.Sets;
+
-> DELETE 14 @ 9 : 10
+> DELETE 8 @ 1 : 2
-> CHANGE 43 : 44 @ 39 : 40
+> CHANGE 29 : 30 @ 30 : 31
~ public void addSprite(EaglerTextureAtlasSprite parTextureAtlasSprite) {
-> CHANGE 59 : 60 @ 55 : 56
+> CHANGE 16 : 17 @ 16 : 17
~ String s = HString.format("Unable to fit: %s - size: %dx%d - Maybe try a lowerresolution resourcepack?",
-> CHANGE 74 : 75 @ 70 : 71
+> CHANGE 15 : 16 @ 15 : 16
~ public List getStichSlots() {
-> CHANGE 83 : 84 @ 79 : 80
+> CHANGE 9 : 10 @ 9 : 10
~ for (Stitcher.Slot stitcher$slot1 : (List) arraylist) {
-> CHANGE 85 : 86 @ 81 : 82
+> CHANGE 2 : 3 @ 2 : 3
~ EaglerTextureAtlasSprite textureatlassprite = stitcher$holder.getAtlasSprite();
-> CHANGE 176 : 177 @ 172 : 173
+> CHANGE 91 : 92 @ 91 : 92
~ private final EaglerTextureAtlasSprite theTexture;
-> CHANGE 183 : 184 @ 179 : 180
+> CHANGE 7 : 8 @ 7 : 8
~ public Holder(EaglerTextureAtlasSprite parTextureAtlasSprite, int parInt1) {
-> CHANGE 192 : 193 @ 188 : 189
+> CHANGE 9 : 10 @ 9 : 10
~ public EaglerTextureAtlasSprite getAtlasSprite() {
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java
index 5aaf9ab6..980df9bb 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java
@@ -9,18 +9,18 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
-> CHANGE 6 : 7 @ 7 : 8
+> CHANGE 2 : 3 @ 4 : 5
~ public class TextureClock extends EaglerTextureAtlasSprite {
-> CHANGE 48 : 50 @ 49 : 51
+> CHANGE 42 : 44 @ 42 : 44
~ animationCache.copyFrameLevelsToTex2D(this.frameCounter, this.originX, this.originY, this.width,
~ this.height);
-> INSERT 54 : 55 @ 55
+> INSERT 6 : 7 @ 6
+
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java
index 3d859eb5..38d7f364 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java
@@ -9,18 +9,18 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
-> CHANGE 8 : 9 @ 9 : 10
+> CHANGE 4 : 5 @ 6 : 7
~ public class TextureCompass extends EaglerTextureAtlasSprite {
-> CHANGE 71 : 73 @ 72 : 74
+> CHANGE 63 : 65 @ 63 : 65
~ animationCache.copyFrameLevelsToTex2D(this.frameCounter, this.originX, this.originY, this.width,
~ this.height);
-> INSERT 77 : 78 @ 78
+> INSERT 6 : 7 @ 6
+
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java
index dc09b146..93958a1e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 7 : 14 @ 9 : 15
+> CHANGE 5 : 12 @ 7 : 13
~
~ import com.google.common.collect.Lists;
@@ -17,9 +17,9 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 20 @ 21 : 23
+> DELETE 13 @ 12 : 14
-> CHANGE 33 : 41 @ 36 : 41
+> CHANGE 13 : 21 @ 15 : 20
~ if (resource.cachedPointer != null) {
~ TextureUtil.bindTexture(((ITextureObject) resource.cachedPointer).getGlTextureId()); // unsafe, lol
@@ -30,29 +30,29 @@
~ this.loadTexture(resource, (ITextureObject) object);
~ }
-> CHANGE 42 : 45 @ 42 : 43
+> CHANGE 9 : 12 @ 6 : 7
~ resource.cachedPointer = object;
~ TextureUtil.bindTexture(((ITextureObject) object).getGlTextureId());
~ }
-> CHANGE 56 : 57 @ 54 : 55
+> CHANGE 14 : 15 @ 12 : 13
~ public boolean loadTexture(ResourceLocation textureLocation, ITextureObject textureObj) {
-> INSERT 70 : 71 @ 68
+> INSERT 14 : 15 @ 14
+ final ITextureObject textureObj2 = textureObj;
-> CHANGE 73 : 74 @ 70 : 71
+> CHANGE 3 : 4 @ 2 : 3
~ return textureObj2.getClass().getName();
-> INSERT 79 : 80 @ 76
+> INSERT 6 : 7 @ 6
+ textureLocation.cachedPointer = textureObj;
-> CHANGE 85 : 90 @ 81 : 82
+> CHANGE 6 : 11 @ 5 : 6
~ if (textureLocation.cachedPointer != null) {
~ return (ITextureObject) textureLocation.cachedPointer;
@@ -60,14 +60,14 @@
~ return (ITextureObject) (textureLocation.cachedPointer = this.mapTextureObjects.get(textureLocation));
~ }
-> CHANGE 102 : 103 @ 94 : 95
+> CHANGE 17 : 18 @ 13 : 14
~ HString.format("dynamic/%s_%d", new Object[] { name, integer }));
-> CHANGE 115 : 116 @ 107 : 108
+> CHANGE 13 : 14 @ 13 : 14
~ ITextureObject itextureobject = this.mapTextureObjects.remove(textureLocation);
-> DELETE 119 @ 111 : 112
+> DELETE 4 @ 4 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java
index cd6a1ba3..15dbc21f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 5
-> INSERT 3 : 4 @ 6
+> INSERT 1 : 2 @ 4
+ import java.util.Collection;
-> INSERT 10 : 19 @ 12
+> INSERT 7 : 16 @ 6
+
+ import com.google.common.collect.Lists;
@@ -23,90 +23,90 @@
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 21 @ 14 : 20
+> DELETE 11 @ 2 : 8
-> DELETE 30 @ 29 : 31
+> DELETE 9 @ 15 : 17
-> CHANGE 35 : 38 @ 36 : 39
+> CHANGE 5 : 8 @ 7 : 10
~ private final List listAnimatedSprites;
~ private final Map mapRegisteredSprites;
~ private final Map mapUploadedSprites;
-> CHANGE 41 : 44 @ 42 : 43
+> CHANGE 6 : 9 @ 6 : 7
~ private final EaglerTextureAtlasSprite missingImage;
~ private int width;
~ private int height;
-> CHANGE 53 : 54 @ 52 : 53
+> CHANGE 12 : 13 @ 10 : 11
~ this.missingImage = new EaglerTextureAtlasSprite("missingno");
-> DELETE 71 @ 70 : 71
+> DELETE 18 @ 18 : 19
-> INSERT 74 : 75 @ 74
+> INSERT 3 : 4 @ 4
+ destroyAnimationCaches();
-> CHANGE 91 : 92 @ 90 : 91
+> CHANGE 17 : 18 @ 16 : 17
~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) entry.getValue();
-> CHANGE 97 : 98 @ 96 : 97
+> CHANGE 6 : 7 @ 6 : 7
~ ImageData[] abufferedimage = new ImageData[1 + this.mipmapLevels];
-> CHANGE 104 : 106 @ 103 : 105
+> CHANGE 7 : 9 @ 7 : 9
~ int l = abufferedimage[0].width;
~ int i1 = abufferedimage[0].height;
-> CHANGE 124 : 126 @ 123 : 124
+> CHANGE 20 : 22 @ 20 : 21
~ new Object[] { Integer.valueOf(i2), resourcelocation2 });
~ logger.error(ioexception);
-> CHANGE 135 : 137 @ 133 : 134
+> CHANGE 11 : 13 @ 10 : 11
~ logger.error("Unable to parse metadata from " + resourcelocation1);
~ logger.error(runtimeexception);
-> CHANGE 139 : 141 @ 136 : 137
+> CHANGE 4 : 6 @ 3 : 4
~ logger.error("Using missing texture, unable to load " + resourcelocation1);
~ logger.error(ioexception1);
-> CHANGE 167 : 168 @ 163 : 164
+> CHANGE 28 : 29 @ 27 : 28
~ for (final EaglerTextureAtlasSprite textureatlassprite1 : this.mapRegisteredSprites.values()) {
-> CHANGE 208 : 212 @ 204 : 205
+> CHANGE 41 : 45 @ 41 : 42
~ width = stitcher.getCurrentWidth();
~ height = stitcher.getCurrentHeight();
~
~ for (EaglerTextureAtlasSprite textureatlassprite2 : stitcher.getStichSlots()) {
-> CHANGE 233 : 234 @ 226 : 227
+> CHANGE 25 : 26 @ 22 : 23
~ for (EaglerTextureAtlasSprite textureatlassprite3 : (Collection) hashmap.values()) {
-> CHANGE 242 : 244 @ 235 : 237
+> CHANGE 9 : 11 @ 9 : 11
~ HString.format("%s/%s%s", new Object[] { this.basePath, location.getResourcePath(), ".png" }))
~ : new ResourceLocation(location.getResourceDomain(), HString.format("%s/mipmaps/%s.%d%s",
-> CHANGE 247 : 249 @ 240 : 242
+> CHANGE 5 : 7 @ 5 : 7
~ public EaglerTextureAtlasSprite getAtlasSprite(String iconName) {
~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.mapUploadedSprites.get(iconName);
-> CHANGE 259 : 260 @ 252 : 253
+> CHANGE 12 : 13 @ 12 : 13
~ for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) {
-> CHANGE 265 : 272 @ 258 : 259
+> CHANGE 6 : 13 @ 6 : 7
~ private void destroyAnimationCaches() {
~ for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) {
@@ -116,20 +116,20 @@
~
~ public EaglerTextureAtlasSprite registerSprite(ResourceLocation location) {
-> CHANGE 275 : 277 @ 262 : 263
+> CHANGE 10 : 12 @ 4 : 5
~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.mapRegisteredSprites
~ .get(location);
-> CHANGE 278 : 279 @ 264 : 265
+> CHANGE 3 : 4 @ 2 : 3
~ textureatlassprite = EaglerTextureAtlasSprite.makeAtlasSprite(location);
-> CHANGE 294 : 295 @ 280 : 281
+> CHANGE 16 : 17 @ 16 : 17
~ public EaglerTextureAtlasSprite getMissingSprite() {
-> INSERT 297 : 306 @ 283
+> INSERT 3 : 12 @ 3
+
+ public int getWidth() {
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java
index 5dbf57e5..88cd34c2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java
@@ -10,7 +10,7 @@
~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
~
-> CHANGE 6 : 14 @ 5 : 7
+> CHANGE 4 : 12 @ 3 : 5
~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
~
@@ -21,93 +21,93 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 16 @ 9 : 11
+> DELETE 10 @ 4 : 6
-> DELETE 18 @ 13 : 17
+> DELETE 2 @ 4 : 8
-> CHANGE 34 : 35 @ 33 : 34
+> CHANGE 16 : 17 @ 20 : 21
~ public static int uploadTextureImage(int parInt1, ImageData parBufferedImage) {
-> CHANGE 155 : 157 @ 154 : 155
+> CHANGE 121 : 123 @ 121 : 122
~ EaglercraftGPU.glTexSubImage2D(GL_TEXTURE_2D, parInt1, parInt4, parInt5 + k, parInt2, l, GL_RGBA,
~ GL_UNSIGNED_BYTE, dataBuffer);
-> CHANGE 161 : 162 @ 159 : 160
+> CHANGE 6 : 7 @ 5 : 6
~ public static int uploadTextureImageAllocate(int parInt1, ImageData parBufferedImage, boolean parFlag,
-> CHANGE 163 : 164 @ 161 : 162
+> CHANGE 2 : 3 @ 2 : 3
~ allocateTexture(parInt1, parBufferedImage.width, parBufferedImage.height);
-> CHANGE 172 : 173 @ 170 : 171
+> CHANGE 9 : 10 @ 9 : 10
~ // deleteTexture(parInt1); //TODO: why
-> CHANGE 175 : 179 @ 173 : 177
+> CHANGE 3 : 7 @ 3 : 7
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, '\u813d', parInt2);
~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813a', 0.0F);
~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813b', (float) parInt2);
~ // EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u8501', 0.0F);
-> CHANGE 182 : 184 @ 180 : 181
+> CHANGE 7 : 9 @ 7 : 8
~ EaglercraftGPU.glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA, parInt3 >> i, parInt4 >> i, 0, GL_RGBA,
~ GL_UNSIGNED_BYTE, (IntBuffer) null);
-> CHANGE 188 : 189 @ 185 : 186
+> CHANGE 6 : 7 @ 5 : 6
~ public static int uploadTextureImageSub(int textureId, ImageData parBufferedImage, int parInt2, int parInt3,
-> CHANGE 195 : 199 @ 192 : 196
+> CHANGE 7 : 11 @ 7 : 11
~ private static void uploadTextureImageSubImpl(ImageData parBufferedImage, int parInt1, int parInt2, boolean parFlag,
~ boolean parFlag2) {
~ int i = parBufferedImage.width;
~ int j = parBufferedImage.height;
-> CHANGE 210 : 212 @ 207 : 208
+> CHANGE 15 : 17 @ 15 : 16
~ EaglercraftGPU.glTexSubImage2D(GL_TEXTURE_2D, 0, parInt1, parInt2 + i1, i, j1, GL_RGBA, GL_UNSIGNED_BYTE,
~ dataBuffer);
-> CHANGE 218 : 220 @ 214 : 216
+> CHANGE 8 : 10 @ 7 : 9
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-> CHANGE 221 : 223 @ 217 : 219
+> CHANGE 3 : 5 @ 3 : 5
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-> CHANGE 233 : 235 @ 229 : 231
+> CHANGE 12 : 14 @ 12 : 14
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, parFlag2 ? 9987 : 9729);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-> CHANGE 236 : 238 @ 232 : 234
+> CHANGE 3 : 5 @ 3 : 5
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, parFlag2 ? 9986 : 9728);
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-> CHANGE 263 : 264 @ 259 : 265
+> CHANGE 27 : 28 @ 27 : 33
~ return readBufferedImage(resourceManager.getResource(imageLocation).getInputStream()).pixels;
-> CHANGE 266 : 268 @ 267 : 269
+> CHANGE 3 : 5 @ 8 : 10
~ public static ImageData readBufferedImage(InputStream imageStream) throws IOException {
~ ImageData bufferedimage;
-> CHANGE 269 : 270 @ 270 : 271
+> CHANGE 3 : 4 @ 3 : 4
~ bufferedimage = ImageData.loadImageFile(imageStream);
-> INSERT 310 : 318 @ 311
+> INSERT 41 : 49 @ 41
+ public static int[] convertComponentOrder(int[] arr) {
+ for (int i = 0; i < arr.length; ++i) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java
index f84fcd93..7f1ddeda 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 5 @ 4 : 5
+> DELETE 3 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java
index 69a4b854..ecc2e81b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java
@@ -12,35 +12,35 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 9 @ 5 : 6
+> DELETE 7 @ 3 : 4
-> DELETE 11 @ 8 : 9
+> DELETE 2 @ 3 : 4
-> DELETE 15 @ 13 : 14
+> DELETE 4 @ 5 : 6
-> DELETE 31 @ 30 : 31
+> DELETE 16 @ 17 : 18
-> INSERT 67 : 69 @ 67
+> INSERT 36 : 38 @ 37
+ GlStateManager.enableLighting();
+ GlStateManager.enableColorMaterial();
-> INSERT 76 : 78 @ 74
+> INSERT 9 : 11 @ 7
+ GlStateManager.enableLighting();
+ GlStateManager.enableColorMaterial();
-> DELETE 111 @ 107 : 128
+> DELETE 35 @ 33 : 54
-> CHANGE 116 : 117 @ 133 : 134
+> CHANGE 5 : 6 @ 26 : 27
~ GlStateManager.pushLightCoords();
-> CHANGE 120 : 121 @ 137 : 141
+> CHANGE 4 : 5 @ 4 : 8
~ GlStateManager.popLightCoords();
-> CHANGE 142 : 143 @ 162 : 163
+> CHANGE 22 : 23 @ 25 : 26
~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java
index 35c39b89..8d67b35f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 4
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java
index a15be462..60b03aa8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> INSERT 6 : 11 @ 8
+> INSERT 4 : 9 @ 6
+
+ import com.google.common.collect.Lists;
@@ -15,11 +15,11 @@
+
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 13 @ 10 : 11
+> DELETE 7 @ 2 : 3
-> DELETE 14 @ 12 : 13
+> DELETE 1 @ 2 : 3
-> CHANGE 109 : 110 @ 108 : 109
+> CHANGE 95 : 96 @ 96 : 97
~ for (TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern : (List) list1) {
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java
index 4007436e..57d16f7e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java
@@ -12,11 +12,11 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 8 @ 5 : 7
+> DELETE 5 @ 2 : 4
-> DELETE 12 @ 11 : 12
+> DELETE 4 @ 6 : 7
-> CHANGE 31 : 33 @ 31 : 33
+> CHANGE 19 : 21 @ 20 : 22
~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 10497.0F);
~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 10497.0F);
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java
index a9e36da0..ab8fabc8 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java
@@ -10,22 +10,22 @@
+
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 9 @ 7 : 9
+> DELETE 6 @ 4 : 6
-> INSERT 58 : 59 @ 58
+> INSERT 49 : 50 @ 51
+ isChristams = true;
-> DELETE 66 @ 65 : 67
+> DELETE 8 @ 7 : 9
-> INSERT 68 : 70 @ 69
+> INSERT 2 : 4 @ 4
+ } else if (tileentitychest.getChestType() == 1) {
+ this.bindTexture(textureTrapped);
-> DELETE 82 @ 81 : 83
+> DELETE 14 @ 12 : 14
-> INSERT 84 : 86 @ 85
+> INSERT 2 : 4 @ 4
+ } else if (tileentitychest.getChestType() == 1) {
+ this.bindTexture(textureTrappedDouble);
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java
index 23934c63..060e9947 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java
index 91586318..69897e45 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java
@@ -13,23 +13,23 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 10 @ 7 : 8
+> DELETE 8 @ 5 : 6
-> DELETE 11 @ 9 : 11
+> DELETE 1 @ 2 : 4
-> CHANGE 18 : 19 @ 18 : 19
+> CHANGE 7 : 8 @ 9 : 10
~ private static final EaglercraftRandom field_147527_e = new EaglercraftRandom(31100L);
-> CHANGE 53 : 54 @ 53 : 54
+> CHANGE 35 : 36 @ 35 : 36
~ float f7 = (float) (-(d1 + (double) f3 - 1.25));
-> CHANGE 67 : 68 @ 67 : 71
+> CHANGE 14 : 15 @ 14 : 18
~ GlStateManager.enableTexGen();
-> CHANGE 102 : 103 @ 105 : 109
+> CHANGE 35 : 36 @ 38 : 42
~ GlStateManager.disableTexGen();
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java
index 23934c63..060e9947 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java
index 2c6ffdb0..526f4247 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java
@@ -12,9 +12,9 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 7 @ 5 : 8
+> DELETE 5 @ 3 : 6
-> CHANGE 38 : 39 @ 39 : 40
+> CHANGE 31 : 32 @ 34 : 35
~ gameprofile = new GameProfile((EaglercraftUUID) null, nbttagcompound.getString("SkullOwner"));
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java
index 23934c63..060e9947 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java
@@ -9,6 +9,6 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 4 @ 3 : 5
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java
index 8e763215..c7169a29 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java
@@ -10,10 +10,10 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-> DELETE 11 @ 9 : 10
+> DELETE 9 @ 7 : 8
-> DELETE 13 @ 12 : 13
+> DELETE 2 @ 3 : 4
-> DELETE 14 @ 14 : 15
+> DELETE 1 @ 2 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java
index 845a257b..d0fe3c49 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 8 @ 4
+> INSERT 1 : 6 @ 2
+
+ import com.google.common.collect.Maps;
@@ -15,11 +15,11 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
-> DELETE 9 @ 5 : 7
+> DELETE 6 @ 1 : 3
-> DELETE 10 @ 8 : 19
+> DELETE 1 @ 3 : 14
-> CHANGE 68 : 70 @ 77 : 78
+> CHANGE 58 : 60 @ 69 : 70
~ tileentityspecialrenderer = this
~ .getSpecialRendererByClass((Class) teClass.getSuperclass());
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java
index 46a316a2..8b9acae1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java
@@ -11,11 +11,11 @@
+ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 10 @ 7 : 9
+> DELETE 7 @ 4 : 6
-> DELETE 14 @ 13 : 14
+> DELETE 4 @ 6 : 7
-> CHANGE 69 : 70 @ 69 : 70
+> CHANGE 55 : 56 @ 56 : 57
~ EaglercraftGPU.glNormal3f(0.0F, 0.0F, -1.0F * f3);
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java
index ccc70532..070d55e0 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java
@@ -10,19 +10,19 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> CHANGE 7 : 8 @ 10 : 13
+> CHANGE 5 : 6 @ 8 : 11
~ import net.minecraft.client.network.NetHandlerPlayClient;
-> DELETE 10 @ 15 : 16
+> DELETE 3 @ 5 : 6
-> CHANGE 65 : 69 @ 71 : 80
+> CHANGE 55 : 59 @ 56 : 65
~ if (parGameProfile != null && parGameProfile.getId() != null) {
~ NetHandlerPlayClient netHandler = Minecraft.getMinecraft().getNetHandler();
~ if (netHandler != null) {
~ resourcelocation = netHandler.getSkinCache().getSkin(parGameProfile).getResourceLocation();
-> DELETE 71 @ 82 : 83
+> DELETE 6 @ 11 : 12
> EOF
diff --git a/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java b/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java
index f7b34636..7cbfbee1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java
+++ b/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java
@@ -9,7 +9,7 @@
~ import net.lax1dude.eaglercraft.v1_8.opengl.VertexFormat;
-> CHANGE 5 : 17 @ 6 : 74
+> CHANGE 3 : 15 @ 4 : 72
~ public static final VertexFormat BLOCK = VertexFormat.BLOCK;
~ public static final VertexFormat ITEM = VertexFormat.ITEM;
diff --git a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java
index 1930df7c..83e0d65a 100644
--- a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 9
-> CHANGE 4 : 15 @ 11 : 12
+> CHANGE 2 : 13 @ 9 : 10
~ import java.nio.charset.StandardCharsets;
~
@@ -21,25 +21,25 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 16 @ 13 : 14
+> DELETE 12 @ 2 : 3
-> DELETE 19 @ 17 : 20
+> DELETE 3 @ 4 : 7
-> CHANGE 22 : 23 @ 23 : 24
+> CHANGE 3 : 4 @ 6 : 7
~ protected final String resourcePackFile;
-> CHANGE 24 : 25 @ 25 : 26
+> CHANGE 2 : 3 @ 2 : 3
~ public AbstractResourcePack(String resourcePackFileIn) {
-> CHANGE 29 : 30 @ 30 : 31
+> CHANGE 5 : 6 @ 5 : 6
~ return HString.format("%s/%s/%s",
-> DELETE 33 @ 34 : 38
+> DELETE 4 @ 4 : 8
-> CHANGE 52 : 60 @ 57 : 58
+> CHANGE 19 : 27 @ 23 : 24
~ try {
~ return readMetadata(parIMetadataSerializer, this.getInputStreamByName("pack.mcmeta"), parString1);
@@ -50,25 +50,25 @@
~ throw e;
~ }
-> CHANGE 64 : 65 @ 62 : 64
+> CHANGE 12 : 13 @ 5 : 7
~ JSONObject jsonobject = null;
-> CHANGE 67 : 70 @ 66 : 70
+> CHANGE 3 : 6 @ 4 : 8
~ jsonobject = new JSONObject(IOUtils.inputStreamToString(parInputStream, StandardCharsets.UTF_8));
~ } catch (RuntimeException | IOException runtimeexception) {
~ throw new JSONException(runtimeexception);
-> CHANGE 71 : 72 @ 71 : 72
+> CHANGE 4 : 5 @ 5 : 6
~ IOUtils.closeQuietly(parInputStream);
-> CHANGE 77 : 78 @ 77 : 78
+> CHANGE 6 : 7 @ 6 : 7
~ public ImageData getPackImage() throws IOException {
-> CHANGE 82 : 83 @ 82 : 83
+> CHANGE 5 : 6 @ 5 : 6
~ return this.resourcePackFile;
diff --git a/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java b/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java
index bbf4ff68..49d3d8bb 100644
--- a/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> CHANGE 14 : 15 @ 13 : 14
+> CHANGE 12 : 13 @ 11 : 12
~ public static ResourceLocation getDefaultSkin(EaglercraftUUID playerUUID) {
-> CHANGE 18 : 19 @ 17 : 18
+> CHANGE 4 : 5 @ 4 : 5
~ public static String getSkinType(EaglercraftUUID playerUUID) {
-> CHANGE 22 : 23 @ 21 : 22
+> CHANGE 4 : 5 @ 4 : 5
~ private static boolean isSlimSkin(EaglercraftUUID playerUUID) {
diff --git a/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java
index 11a8ce3f..9c12a9a2 100644
--- a/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 6
-> DELETE 5 @ 9 : 10
+> DELETE 3 @ 7 : 8
-> INSERT 6 : 11 @ 11
+> INSERT 1 : 6 @ 2
+
+ import com.google.common.collect.ImmutableSet;
@@ -17,35 +17,35 @@
+ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 12 @ 12 : 14
+> DELETE 6 @ 1 : 3
-> CHANGE 17 : 18 @ 19 : 21
+> CHANGE 5 : 6 @ 7 : 9
~ public static final Set defaultResourceDomains = ImmutableSet.of("minecraft", "eagler");
-> DELETE 19 @ 22 : 26
+> DELETE 2 @ 3 : 7
-> CHANGE 34 : 35 @ 41 : 43
+> CHANGE 15 : 16 @ 19 : 21
~ return null;
-> CHANGE 38 : 40 @ 46 : 48
+> CHANGE 4 : 6 @ 5 : 7
~ return EagRuntime
~ .getResourceStream("/assets/" + location.getResourceDomain() + "/" + location.getResourcePath());
-> CHANGE 43 : 44 @ 51 : 53
+> CHANGE 5 : 6 @ 5 : 7
~ return this.getResourceStream(resourcelocation) != null;
-> CHANGE 53 : 55 @ 62 : 64
+> CHANGE 10 : 12 @ 11 : 13
~ return AbstractResourcePack.readMetadata(parIMetadataSerializer,
~ EagRuntime.getResourceStream("pack.mcmeta"), parString1);
-> DELETE 57 @ 66 : 68
+> DELETE 4 @ 4 : 6
-> CHANGE 60 : 62 @ 71 : 74
+> CHANGE 3 : 5 @ 5 : 8
~ public ImageData getPackImage() throws IOException {
~ return TextureUtil.readBufferedImage(EagRuntime.getResourceStream("pack.png"));
diff --git a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java
index 9cba5ccd..09ff0172 100644
--- a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 4
-> DELETE 5 @ 7 : 8
+> DELETE 3 @ 5 : 6
-> CHANGE 8 : 13 @ 11 : 15
+> CHANGE 3 : 8 @ 4 : 8
~
~ import com.google.common.collect.Lists;
@@ -17,12 +17,12 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 15 @ 17 : 19
+> DELETE 7 @ 6 : 8
-> CHANGE 58 : 59 @ 62 : 67
+> CHANGE 43 : 44 @ 45 : 50
~ return resourcePack.getInputStream(location);
-> DELETE 86 @ 94 : 125
+> DELETE 28 @ 32 : 63
> EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java b/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java
index 246f0c45..aaa99f5f 100644
--- a/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java
@@ -9,9 +9,9 @@
+
-> DELETE 5 @ 4 : 6
+> DELETE 2 @ 1 : 3
-> CHANGE 13 : 15 @ 14 : 15
+> CHANGE 8 : 10 @ 10 : 11
~ ColorizerFoliage.setFoliageBiomeColorizer(
~ TextureUtil.convertComponentOrder(TextureUtil.readImageData(iresourcemanager, LOC_FOLIAGE_PNG)));
diff --git a/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java b/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java
index ea58d29a..7e448774 100644
--- a/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java
@@ -9,9 +9,9 @@
+
-> DELETE 5 @ 4 : 6
+> DELETE 2 @ 1 : 3
-> CHANGE 13 : 15 @ 14 : 15
+> CHANGE 8 : 10 @ 10 : 11
~ ColorizerGrass.setGrassBiomeColorizer(
~ TextureUtil.convertComponentOrder(TextureUtil.readImageData(iresourcemanager, LOC_GRASS_PNG)));
diff --git a/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java
index d1ac688c..3b653ae6 100644
--- a/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 5 : 7 @ 6
+> INSERT 3 : 5 @ 4
+
+ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> CHANGE 20 : 21 @ 19 : 20
+> CHANGE 15 : 16 @ 13 : 14
~ ImageData getPackImage() throws IOException;
diff --git a/patches/minecraft/net/minecraft/client/resources/Language.edit.java b/patches/minecraft/net/minecraft/client/resources/Language.edit.java
index 3d1f7700..cc1c99dc 100644
--- a/patches/minecraft/net/minecraft/client/resources/Language.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/Language.edit.java
@@ -10,7 +10,7 @@
+ import net.lax1dude.eaglercraft.v1_8.HString;
+
-> CHANGE 26 : 27 @ 24 : 25
+> CHANGE 24 : 25 @ 22 : 23
~ return HString.format("%s (%s)", new Object[] { this.name, this.region });
diff --git a/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java b/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java
index 9a137a68..c0c3e1cc 100644
--- a/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> CHANGE 7 : 14 @ 10 : 16
+> CHANGE 5 : 12 @ 8 : 14
~
~ import com.google.common.collect.Lists;
@@ -17,6 +17,6 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 17 @ 19 : 21
+> DELETE 10 @ 9 : 11
> EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/Locale.edit.java b/patches/minecraft/net/minecraft/client/resources/Locale.edit.java
index 555588bc..8df9f529 100644
--- a/patches/minecraft/net/minecraft/client/resources/Locale.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/Locale.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 5
-> INSERT 4 : 5 @ 7
+> INSERT 2 : 3 @ 5
+ import java.util.HashSet;
-> INSERT 8 : 9 @ 10
+> INSERT 4 : 5 @ 3
+ import java.util.Set;
-> CHANGE 10 : 19 @ 11 : 13
+> CHANGE 2 : 11 @ 1 : 3
~
~ import com.google.common.base.Charsets;
@@ -27,18 +27,18 @@
~ import net.lax1dude.eaglercraft.v1_8.HString;
~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
-> DELETE 20 @ 14 : 16
+> DELETE 10 @ 3 : 5
-> INSERT 27 : 29 @ 23
+> INSERT 7 : 9 @ 9
+ private static final Set hasShownMissing = new HashSet();
+
-> CHANGE 33 : 34 @ 27 : 28
+> CHANGE 6 : 7 @ 4 : 5
~ String s1 = HString.format("lang/%s.lang", new Object[] { s });
-> CHANGE 37 : 45 @ 31 : 32
+> CHANGE 4 : 12 @ 4 : 5
~ List res = resourceManager.getAllResources(new ResourceLocation(s2, s1));
~ if (res.size() > 0) {
@@ -49,24 +49,24 @@
~ }
~ }
-> CHANGE 46 : 49 @ 33 : 34
+> CHANGE 9 : 12 @ 2 : 3
~ if (s2.equalsIgnoreCase("minecraft") && hasShownMissing.add(s)) {
~ EagRuntime.showPopup("ERROR: language \"" + s + "\" is not available on this site!");
~ }
-> CHANGE 99 : 101 @ 84 : 85
+> CHANGE 53 : 55 @ 51 : 52
~ String s2 = pattern.matcher(astring[1]).replaceAll("%s"); // TODO: originally "%$1s" but must be
~ // "%s" to work with TeaVM (why?)
-> INSERT 102 : 105 @ 86
+> INSERT 3 : 6 @ 2
+ if (s1.startsWith("eaglercraft.")) {
+ this.properties.put(s1.substring(12), s2);
+ }
-> CHANGE 120 : 121 @ 101 : 102
+> CHANGE 18 : 19 @ 15 : 16
~ return HString.format(s, parameters);
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java
index c358698e..2fb614a5 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 18
-> CHANGE 3 : 5 @ 19 : 21
+> CHANGE 1 : 3 @ 17 : 19
~ // private static final Logger logger = LogManager.getLogger();
~ // private final Map resourceMap = Maps.newHashMap();
-> CHANGE 6 : 30 @ 22 : 27
+> CHANGE 3 : 27 @ 3 : 8
~ // public ResourceIndex(File parFile, String parString1) {
~ /*
@@ -39,7 +39,7 @@
~ */
~ // }
-> CHANGE 31 : 34 @ 28 : 57
+> CHANGE 25 : 28 @ 6 : 35
~ // public Map getResourceMap() {
~ // return this.resourceMap;
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java
index f8baeb4d..5fbba6ac 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java
@@ -10,7 +10,7 @@
+ import net.lax1dude.eaglercraft.v1_8.HString;
+
-> CHANGE 9 : 10 @ 7 : 8
+> CHANGE 4 : 5 @ 2 : 3
~ super(HString.format("\'%s\' in ResourcePack \'%s\'", new Object[] { parString1, parFile }));
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java
index 83dc8ad0..51fb3e24 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java
@@ -13,9 +13,9 @@
+ import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-> DELETE 14 @ 9 : 11
+> DELETE 11 @ 6 : 8
-> INSERT 142 : 171 @ 139
+> INSERT 128 : 157 @ 130
+ private void proceedWithBs(int l, boolean deleteInstead) {
+ if (!deleteInstead && l != 1) {
@@ -47,24 +47,24 @@
+ }
+
-> CHANGE 176 : 180 @ 144 : 148
+> CHANGE 34 : 38 @ 5 : 9
~ if (Keyboard.isKeyDown(KeyboardConstants.KEY_LSHIFT)
~ || Keyboard.isKeyDown(KeyboardConstants.KEY_RSHIFT)) {
~ proceedWithBs(l, false);
~ } else {
-> CHANGE 182 : 183 @ 150 : 158
+> CHANGE 6 : 7 @ 6 : 14
~ proceedWithBs(l, flag);
-> CHANGE 185 : 189 @ 160 : 164
+> CHANGE 3 : 7 @ 10 : 14
~ }, I18n.format("resourcePack.prompt.title", this.func_148312_b()),
~ I18n.format("resourcePack.prompt.text", new Object[0]),
~ I18n.format("resourcePack.prompt.delete", new Object[0]),
~ I18n.format("resourcePack.prompt.add", new Object[0]), 0).withOpaqueBackground());
-> DELETE 190 @ 165 : 166
+> DELETE 5 @ 5 : 6
> EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java
index 25850108..6c6b0476 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 8 @ 4
+> INSERT 1 : 6 @ 2
+
+ import org.json.JSONException;
@@ -15,11 +15,11 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 11 @ 7 : 9
+> DELETE 8 @ 3 : 5
-> DELETE 14 @ 12 : 14
+> DELETE 3 @ 5 : 7
-> CHANGE 46 : 47 @ 46 : 47
+> CHANGE 32 : 33 @ 34 : 35
~ } catch (JSONException jsonparseexception) {
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java
index 8c48f495..af04e9bd 100644
--- a/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 11
-> DELETE 3 @ 12 : 14
+> DELETE 1 @ 10 : 12
-> DELETE 4 @ 15 : 18
+> DELETE 1 @ 3 : 6
-> CHANGE 6 : 18 @ 20 : 22
+> CHANGE 2 : 14 @ 5 : 7
~ import java.util.function.Consumer;
~
@@ -26,73 +26,73 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
-> DELETE 19 @ 23 : 24
+> DELETE 13 @ 3 : 4
-> DELETE 21 @ 26 : 29
+> DELETE 2 @ 3 : 6
-> DELETE 25 @ 33 : 34
+> DELETE 4 @ 7 : 8
-> DELETE 26 @ 35 : 42
+> DELETE 1 @ 2 : 9
-> DELETE 29 @ 45 : 53
+> DELETE 3 @ 10 : 18
-> DELETE 30 @ 54 : 55
+> DELETE 1 @ 9 : 10
-> DELETE 32 @ 57 : 58
+> DELETE 2 @ 3 : 4
-> CHANGE 36 : 37 @ 62 : 64
+> CHANGE 4 : 5 @ 5 : 7
~ public ResourcePackRepository(IResourcePack rprDefaultResourcePackIn, IMetadataSerializer rprMetadataSerializerIn,
-> DELETE 38 @ 65 : 67
+> DELETE 2 @ 3 : 5
-> DELETE 40 @ 69 : 70
+> DELETE 2 @ 4 : 5
-> DELETE 63 @ 93 : 111
+> DELETE 23 @ 24 : 42
-> CHANGE 64 : 66 @ 112 : 113
+> CHANGE 1 : 3 @ 19 : 20
~ if (SYS.VFS == null)
~ return;
-> CHANGE 67 : 70 @ 114 : 115
+> CHANGE 3 : 6 @ 2 : 3
~ List list = Lists.newArrayList();
~
~ for (String file1 : SYS.getResourcePackNames()) {
-> INSERT 71 : 72 @ 116
+> INSERT 4 : 5 @ 2
+
-> CHANGE 75 : 76 @ 119 : 120
+> CHANGE 4 : 5 @ 3 : 4
~ list.add(resourcepackrepository$entry);
-> CHANGE 77 : 81 @ 121 : 122
+> CHANGE 2 : 6 @ 2 : 3
~ logger.error("Failed to call \"updateResourcePack\" for resource pack \"{}\"",
~ resourcepackrepository$entry.resourcePackFile);
~ logger.error(var6);
~ list.remove(resourcepackrepository$entry);
-> INSERT 84 : 85 @ 125
+> INSERT 7 : 8 @ 4
+
-> CHANGE 86 : 87 @ 126 : 127
+> CHANGE 2 : 3 @ 1 : 2
~ list.add(this.repositoryEntriesAll.get(i));
-> CHANGE 91 : 92 @ 131 : 132
+> CHANGE 5 : 6 @ 5 : 6
~ this.repositoryEntriesAll.removeAll(list);
-> CHANGE 97 : 98 @ 137 : 138
+> CHANGE 6 : 7 @ 6 : 7
~ this.repositoryEntriesAll = list;
-> CHANGE 113 : 120 @ 153 : 185
+> CHANGE 16 : 23 @ 16 : 48
~ public void downloadResourcePack(String s1, String s2, Consumer cb) {
~ SYS.loadRemoteResourcePack(s1, s2, res -> {
@@ -102,7 +102,7 @@
~ cb.accept(true);
~ return;
-> CHANGE 121 : 128 @ 186 : 214
+> CHANGE 8 : 15 @ 33 : 61
~ cb.accept(false);
~ }, runnable -> {
@@ -112,55 +112,55 @@
~ "Server resource pack");
~ });
-> DELETE 130 @ 216 : 236
+> DELETE 9 @ 30 : 50
-> CHANGE 135 : 138 @ 241 : 255
+> CHANGE 5 : 8 @ 25 : 39
~ if (this.resourcePackInstance != null) {
~ this.resourcePackInstance = null;
~ Minecraft.getMinecraft().scheduleResourcesRefresh();
-> DELETE 139 @ 256 : 257
+> DELETE 4 @ 15 : 16
-> CHANGE 142 : 143 @ 260 : 261
+> CHANGE 3 : 4 @ 4 : 5
~ private final String resourcePackFile;
-> CHANGE 145 : 146 @ 263 : 264
+> CHANGE 3 : 4 @ 3 : 4
~ private ImageData texturePackIcon;
-> INSERT 147 : 148 @ 265
+> INSERT 2 : 3 @ 2
+ private TextureManager iconTextureManager;
-> CHANGE 149 : 150 @ 266 : 267
+> CHANGE 2 : 3 @ 1 : 2
~ private Entry(String resourcePackFileIn) {
-> CHANGE 154 : 157 @ 271 : 274
+> CHANGE 5 : 8 @ 5 : 8
~ if (SYS.VFS == null)
~ return;
~ this.reResourcePack = (IResourcePack) new FolderResourcePack(this.resourcePackFile, "resourcepacks/");
-> CHANGE 163 : 165 @ 280 : 281
+> CHANGE 9 : 11 @ 9 : 10
~ logger.error("Failed to load resource pack icon for \"{}\"!", resourcePackFile);
~ logger.error(var2);
-> INSERT 176 : 177 @ 292
+> INSERT 13 : 14 @ 12
+ this.iconTextureManager = textureManagerIn;
-> INSERT 185 : 189 @ 300
+> INSERT 9 : 13 @ 8
+ if (this.locationTexturePackIcon != null) {
+ this.iconTextureManager.deleteTexture(this.locationTexturePackIcon);
+ this.locationTexturePackIcon = null;
+ }
-> CHANGE 224 : 225 @ 335 : 339
+> CHANGE 39 : 40 @ 35 : 39
~ return this.resourcePackFile;
diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java
index d47c309f..696856be 100644
--- a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java
@@ -14,12 +14,12 @@
+ import java.util.Set;
+
-> CHANGE 14 : 17 @ 8 : 19
+> CHANGE 12 : 15 @ 6 : 17
~
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 19 @ 21 : 23
+> DELETE 5 @ 13 : 15
> EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java b/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java
index ae15f9a6..0da7f3fc 100644
--- a/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java
@@ -9,11 +9,11 @@
~ import java.io.IOException;
-> CHANGE 4 : 5 @ 7 : 8
+> CHANGE 2 : 3 @ 5 : 6
~ import java.nio.charset.StandardCharsets;
-> CHANGE 6 : 13 @ 9 : 10
+> CHANGE 2 : 9 @ 2 : 3
~
~ import org.json.JSONException;
@@ -23,22 +23,22 @@
~
~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
-> DELETE 16 @ 13 : 14
+> DELETE 10 @ 4 : 5
-> CHANGE 25 : 26 @ 23 : 24
+> CHANGE 9 : 10 @ 10 : 11
~ private JSONObject mcmetaJson;
-> DELETE 55 @ 53 : 54
+> DELETE 30 @ 30 : 31
-> CHANGE 57 : 61 @ 56 : 58
+> CHANGE 2 : 6 @ 3 : 5
~ this.mcmetaJson = new JSONObject(
~ IOUtils.inputStreamToString(this.mcmetaInputStream, StandardCharsets.UTF_8));
~ } catch (IOException e) {
~ throw new JSONException(e);
-> CHANGE 62 : 63 @ 59 : 60
+> CHANGE 5 : 6 @ 3 : 4
~ IOUtils.closeQuietly(this.mcmetaInputStream);
diff --git a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java
index 73e05ad8..19d88e12 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
-> DELETE 5 @ 6 : 8
+> DELETE 3 @ 4 : 6
-> INSERT 6 : 8 @ 9
+> INSERT 1 : 3 @ 3
+ import com.google.common.collect.Sets;
+
diff --git a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java
index 85d604ff..3c3223ba 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java
@@ -7,55 +7,55 @@
> DELETE 2 @ 2 : 12
-> CHANGE 3 : 4 @ 13 : 17
+> CHANGE 1 : 2 @ 11 : 15
~
-> INSERT 5 : 8 @ 18
+> INSERT 2 : 5 @ 5
+ import org.json.JSONArray;
+ import org.json.JSONException;
+ import org.json.JSONObject;
-> INSERT 9 : 13 @ 19
+> INSERT 4 : 8 @ 1
+ import com.google.common.collect.Lists;
+
+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeSerializer;
+
-> CHANGE 14 : 16 @ 20 : 23
+> CHANGE 5 : 7 @ 1 : 4
~ implements JSONTypeSerializer {
~ public AnimationMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 17 : 18 @ 24 : 26
+> CHANGE 3 : 4 @ 4 : 6
~ int i = jsonobject.optInt("frametime", 1);
-> CHANGE 24 : 25 @ 32 : 33
+> CHANGE 7 : 8 @ 8 : 9
~ JSONArray jsonarray = jsonobject.getJSONArray("frames");
-> CHANGE 26 : 28 @ 34 : 37
+> CHANGE 2 : 4 @ 2 : 5
~ for (int j = 0; j < jsonarray.length(); ++j) {
~ AnimationFrame animationframe = this.parseAnimationFrame(j, jsonarray.get(j));
-> CHANGE 33 : 34 @ 42 : 44
+> CHANGE 7 : 8 @ 8 : 10
~ throw new JSONException("Invalid animation->frames: expected array, was " + jsonobject.get("frames"),
-> CHANGE 38 : 40 @ 48 : 50
+> CHANGE 5 : 7 @ 6 : 8
~ int k = jsonobject.optInt("width", -1);
~ int l = jsonobject.optInt("height", -1);
-> CHANGE 48 : 49 @ 58 : 59
+> CHANGE 10 : 11 @ 10 : 11
~ boolean flag = jsonobject.optBoolean("interpolate", false);
-> CHANGE 52 : 58 @ 62 : 68
+> CHANGE 4 : 10 @ 4 : 10
~ private AnimationFrame parseAnimationFrame(int parInt1, Object parJsonElement) {
~ if (parJsonElement instanceof Number) {
@@ -64,40 +64,40 @@
~ JSONObject jsonobject = (JSONObject) parJsonElement;
~ int i = jsonobject.optInt("time", -1);
-> CHANGE 62 : 63 @ 72 : 73
+> CHANGE 10 : 11 @ 10 : 11
~ int j = jsonobject.getInt(getSectionName());
-> CHANGE 70 : 73 @ 80 : 84
+> CHANGE 8 : 11 @ 8 : 12
~ public JSONObject serialize(AnimationMetadataSection animationmetadatasection) {
~ JSONObject jsonobject = new JSONObject();
~ jsonobject.put("frametime", Integer.valueOf(animationmetadatasection.getFrameTime()));
-> CHANGE 74 : 75 @ 85 : 86
+> CHANGE 4 : 5 @ 5 : 6
~ jsonobject.put("width", Integer.valueOf(animationmetadatasection.getFrameWidth()));
-> CHANGE 78 : 79 @ 89 : 90
+> CHANGE 4 : 5 @ 4 : 5
~ jsonobject.put("height", Integer.valueOf(animationmetadatasection.getFrameHeight()));
-> CHANGE 82 : 83 @ 93 : 94
+> CHANGE 4 : 5 @ 4 : 5
~ JSONArray jsonarray = new JSONArray();
-> CHANGE 86 : 90 @ 97 : 101
+> CHANGE 4 : 8 @ 4 : 8
~ JSONObject jsonobject1 = new JSONObject();
~ jsonobject1.put("index", Integer.valueOf(animationmetadatasection.getFrameIndex(i)));
~ jsonobject1.put("time", Integer.valueOf(animationmetadatasection.getFrameTimeSingle(i)));
~ jsonarray.put(jsonobject1);
-> CHANGE 91 : 92 @ 102 : 103
+> CHANGE 5 : 6 @ 5 : 6
~ jsonarray.put(Integer.valueOf(animationmetadatasection.getFrameIndex(i)));
-> CHANGE 95 : 96 @ 106 : 107
+> CHANGE 4 : 5 @ 4 : 5
~ jsonobject.put("frames", jsonarray);
diff --git a/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java
index ce9d82dd..7a0be768 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java
@@ -7,56 +7,56 @@
> DELETE 2 @ 2 : 10
-> INSERT 3 : 5 @ 11
+> INSERT 1 : 3 @ 9
+ import org.json.JSONException;
+ import org.json.JSONObject;
-> CHANGE 7 : 8 @ 13 : 16
+> CHANGE 4 : 5 @ 2 : 5
~ public FontMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 15 : 17 @ 23 : 25
+> CHANGE 8 : 10 @ 10 : 12
~ if (!(jsonobject.get("characters") instanceof JSONObject)) {
~ throw new JSONException(
-> CHANGE 20 : 21 @ 28 : 29
+> CHANGE 5 : 6 @ 5 : 6
~ JSONObject jsonobject1 = jsonobject.getJSONObject("characters");
-> CHANGE 22 : 24 @ 30 : 32
+> CHANGE 2 : 4 @ 2 : 4
~ if (!(jsonobject1.get("default") instanceof JSONObject)) {
~ throw new JSONException(
-> CHANGE 27 : 29 @ 35 : 37
+> CHANGE 5 : 7 @ 5 : 7
~ JSONObject jsonobject2 = jsonobject1.getJSONObject("default");
~ f = jsonobject2.optFloat("width", f);
-> CHANGE 30 : 31 @ 38 : 39
+> CHANGE 3 : 4 @ 3 : 4
~ f1 = jsonobject2.optFloat("spacing", f1);
-> CHANGE 32 : 33 @ 40 : 41
+> CHANGE 2 : 3 @ 2 : 3
~ f2 = jsonobject2.optFloat("left", f1);
-> CHANGE 37 : 38 @ 45 : 46
+> CHANGE 5 : 6 @ 5 : 6
~ JSONObject jsonobject3 = jsonobject1.optJSONObject(Integer.toString(i));
-> CHANGE 41 : 43 @ 49 : 52
+> CHANGE 4 : 6 @ 4 : 7
~ if (jsonobject3 != null) {
~ f3 = jsonobject3.optFloat("width", f);
-> CHANGE 44 : 45 @ 53 : 54
+> CHANGE 3 : 4 @ 4 : 5
~ f4 = jsonobject3.optFloat("spacing", f1);
-> CHANGE 46 : 47 @ 55 : 56
+> CHANGE 2 : 3 @ 2 : 3
~ f5 = jsonobject3.optFloat("left", f2);
diff --git a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java
index 4645fb94..7c3b43ba 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java
@@ -9,7 +9,7 @@
~ import org.json.JSONObject;
-> CHANGE 4 : 7 @ 5 : 6
+> CHANGE 2 : 5 @ 3 : 4
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
~
diff --git a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java
index 58987784..c7932e07 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java
@@ -11,24 +11,24 @@
~
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
-> DELETE 10 @ 15 : 17
+> DELETE 8 @ 13 : 15
-> DELETE 11 @ 18 : 24
+> DELETE 1 @ 3 : 9
-> DELETE 15 @ 28 : 30
+> DELETE 4 @ 10 : 12
-> CHANGE 17 : 18 @ 32 : 33
+> CHANGE 2 : 3 @ 4 : 5
~ public T parseMetadataSection(String parString1, JSONObject parJsonObject) {
-> CHANGE 22 : 23 @ 37 : 38
+> CHANGE 5 : 6 @ 5 : 6
~ } else if (parJsonObject.optJSONObject(parString1) == null) {
-> CHANGE 31 : 32 @ 46 : 47
+> CHANGE 9 : 10 @ 9 : 10
~ return (T) ((IMetadataSection) JSONTypeProvider.deserialize(parJsonObject.getJSONObject(parString1),
-> DELETE 37 @ 52 : 60
+> DELETE 6 @ 6 : 14
> EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java
index 681a62af..c0406de9 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 5
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java
index ff69f157..587c5c0e 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 8
-> CHANGE 3 : 9 @ 9 : 10
+> CHANGE 1 : 7 @ 7 : 8
~
~ import org.json.JSONException;
@@ -16,13 +16,13 @@
~ import com.google.common.collect.Sets;
~
-> DELETE 10 @ 11 : 14
+> DELETE 7 @ 2 : 5
-> CHANGE 12 : 13 @ 16 : 19
+> CHANGE 2 : 3 @ 5 : 8
~ public LanguageMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 15 : 20 @ 21 : 27
+> CHANGE 3 : 8 @ 5 : 11
~ for (String s : jsonobject.keySet()) {
~ JSONObject jsonobject1 = jsonobject.getJSONObject(s);
@@ -30,15 +30,15 @@
~ String s2 = jsonobject1.getString("name");
~ boolean flag = jsonobject1.optBoolean("bidirectional", false);
-> CHANGE 21 : 22 @ 28 : 29
+> CHANGE 6 : 7 @ 7 : 8
~ throw new JSONException("Invalid language->\'" + s + "\'->region: empty value");
-> CHANGE 25 : 26 @ 32 : 33
+> CHANGE 4 : 5 @ 4 : 5
~ throw new JSONException("Invalid language->\'" + s + "\'->name: empty value");
-> CHANGE 29 : 30 @ 36 : 37
+> CHANGE 4 : 5 @ 4 : 5
~ throw new JSONException("Duplicate language->\'" + s + "\' defined");
diff --git a/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java
index 79ee4097..67708116 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java
@@ -13,24 +13,24 @@
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeSerializer;
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
-> DELETE 8 @ 12 : 13
+> DELETE 6 @ 10 : 11
-> CHANGE 10 : 14 @ 15 : 21
+> CHANGE 2 : 6 @ 3 : 9
~ implements JSONTypeSerializer {
~ public PackMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
~ IChatComponent ichatcomponent = JSONTypeProvider.deserialize(jsonobject.get("description"),
~ IChatComponent.class);
-> CHANGE 15 : 16 @ 22 : 23
+> CHANGE 5 : 6 @ 7 : 8
~ throw new JSONException("Invalid/missing description!");
-> CHANGE 17 : 18 @ 24 : 25
+> CHANGE 2 : 3 @ 2 : 3
~ int i = jsonobject.getInt("pack_format");
-> CHANGE 22 : 27 @ 29 : 34
+> CHANGE 5 : 10 @ 5 : 10
~ public JSONObject serialize(PackMetadataSection packmetadatasection) {
~ JSONObject jsonobject = new JSONObject();
diff --git a/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java
index 0d54ab8b..a5c37e8a 100644
--- a/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 9
-> DELETE 3 @ 10 : 13
+> DELETE 1 @ 8 : 11
-> INSERT 4 : 10 @ 14
+> INSERT 1 : 7 @ 4
+ import org.json.JSONArray;
+ import org.json.JSONException;
@@ -18,36 +18,36 @@
+ import com.google.common.collect.Lists;
+
-> CHANGE 11 : 14 @ 15 : 20
+> CHANGE 7 : 10 @ 1 : 6
~ public TextureMetadataSection deserialize(JSONObject jsonobject) throws JSONException {
~ boolean flag = jsonobject.optBoolean("blur", false);
~ boolean flag1 = jsonobject.optBoolean("clamp", false);
-> CHANGE 17 : 18 @ 23 : 24
+> CHANGE 6 : 7 @ 8 : 9
~ JSONArray jsonarray = jsonobject.getJSONArray("mipmaps");
-> CHANGE 19 : 22 @ 25 : 28
+> CHANGE 2 : 5 @ 2 : 5
~ for (int i = 0; i < jsonarray.length(); ++i) {
~ Object jsonelement = jsonarray.get(i);
~ if (jsonelement instanceof Number) {
-> CHANGE 23 : 24 @ 29 : 30
+> CHANGE 4 : 5 @ 4 : 5
~ arraylist.add(((Number) jsonelement).intValue());
-> CHANGE 25 : 26 @ 31 : 32
+> CHANGE 2 : 3 @ 2 : 3
~ throw new JSONException(
-> CHANGE 29 : 31 @ 35 : 37
+> CHANGE 4 : 6 @ 4 : 6
~ } else if (jsonelement instanceof JSONObject) {
~ throw new JSONException(
-> CHANGE 35 : 36 @ 41 : 43
+> CHANGE 6 : 7 @ 6 : 8
~ throw new JSONException("Invalid texture->mipmaps: expected array, was " + jsonobject.get("mipmaps"),
diff --git a/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java
index 3cf97e0b..d81f3f2c 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java
@@ -10,9 +10,9 @@
+
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 7 @ 5 : 7
+> DELETE 4 @ 2 : 4
-> CHANGE 36 : 37 @ 36 : 37
+> CHANGE 29 : 30 @ 31 : 32
~ public EaglerTextureAtlasSprite getParticleTexture() {
diff --git a/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java
index b1798c1d..c1641b89 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java
@@ -10,9 +10,9 @@
+
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 7 @ 5 : 6
+> DELETE 4 @ 2 : 3
-> CHANGE 20 : 21 @ 19 : 20
+> CHANGE 13 : 14 @ 14 : 15
~ EaglerTextureAtlasSprite getParticleTexture();
diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java
index 4da85d81..7f7e3e89 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 8
-> INSERT 8 : 9 @ 14
+> INSERT 6 : 7 @ 12
+ import java.nio.charset.StandardCharsets;
-> DELETE 17 @ 22 : 23
+> DELETE 9 @ 8 : 9
-> INSERT 18 : 30 @ 24
+> INSERT 1 : 13 @ 2
+ import java.util.Set;
+
@@ -28,108 +28,108 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 39 @ 33 : 34
+> DELETE 21 @ 9 : 10
-> DELETE 42 @ 37 : 43
+> DELETE 3 @ 4 : 10
-> DELETE 49 @ 50 : 53
+> DELETE 7 @ 13 : 16
-> CHANGE 69 : 70 @ 73 : 74
+> CHANGE 20 : 21 @ 23 : 24
~ private final Map sprites = Maps.newHashMap();
-> INSERT 130 : 131 @ 134
+> INSERT 61 : 62 @ 61
+ LOGGER.warn(var6);
-> CHANGE 133 : 135 @ 136 : 137
+> CHANGE 3 : 5 @ 2 : 3
~ LOGGER.warn("Unable to load definition " + modelresourcelocation);
~ LOGGER.warn(exception);
-> CHANGE 174 : 175 @ 176 : 177
+> CHANGE 41 : 42 @ 40 : 41
~ modelblockdefinition = new ModelBlockDefinition((ArrayList) arraylist);
-> CHANGE 197 : 199 @ 199 : 200
+> CHANGE 23 : 25 @ 23 : 24
~ + modelresourcelocation + "\'");
~ LOGGER.warn(exception);
-> CHANGE 217 : 218 @ 218 : 219
+> CHANGE 20 : 21 @ 19 : 20
~ String str;
-> CHANGE 220 : 222 @ 221 : 223
+> CHANGE 3 : 5 @ 3 : 5
~ str = (String) BUILT_IN_MODELS.get(s1);
~ if (str == null) {
-> DELETE 224 @ 225 : 227
+> DELETE 4 @ 4 : 6
-> CHANGE 226 : 229 @ 229 : 230
+> CHANGE 2 : 5 @ 4 : 5
~ try (InputStream is = iresource.getInputStream()) {
~ str = IOUtils.inputStreamToString(is, StandardCharsets.UTF_8);
~ }
-> CHANGE 231 : 233 @ 232 : 240
+> CHANGE 5 : 7 @ 3 : 11
~ ModelBlock modelblock = ModelBlock.deserialize(str);
~ modelblock.name = parResourceLocation.toString();
-> CHANGE 234 : 235 @ 241 : 242
+> CHANGE 3 : 4 @ 9 : 10
~ return modelblock;
-> CHANGE 256 : 258 @ 263 : 264
+> CHANGE 22 : 24 @ 22 : 23
~ + Item.itemRegistry.getNameForObject(item) + "\'");
~ LOGGER.warn(exception);
-> CHANGE 446 : 447 @ 452 : 453
+> CHANGE 190 : 191 @ 189 : 190
~ for (ModelResourceLocation modelresourcelocation : (List) arraylist) {
-> CHANGE 466 : 467 @ 472 : 473
+> CHANGE 20 : 21 @ 20 : 21
~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.sprites
-> CHANGE 474 : 475 @ 480 : 481
+> CHANGE 8 : 9 @ 8 : 9
~ EaglerTextureAtlasSprite textureatlassprite1 = (EaglerTextureAtlasSprite) this.sprites
-> CHANGE 491 : 492 @ 497 : 498
+> CHANGE 17 : 18 @ 17 : 18
~ EaglerTextureAtlasSprite parTextureAtlasSprite, EnumFacing parEnumFacing, ModelRotation parModelRotation,
-> CHANGE 509 : 510 @ 515 : 516
+> CHANGE 18 : 19 @ 18 : 19
~ List arraydeque = Lists.newLinkedList();
-> CHANGE 521 : 522 @ 527 : 528
+> CHANGE 12 : 13 @ 12 : 13
~ ResourceLocation resourcelocation2 = (ResourceLocation) arraydeque.remove(0);
-> CHANGE 536 : 538 @ 542 : 543
+> CHANGE 15 : 17 @ 15 : 16
~ + "; unable to load model: \'" + resourcelocation2 + "\'");
~ LOGGER.warn(exception);
-> CHANGE 588 : 590 @ 593 : 595
+> CHANGE 52 : 54 @ 51 : 53
~ for (ResourceLocation resourcelocation : (Set) set) {
~ EaglerTextureAtlasSprite textureatlassprite = texturemap.registerSprite(resourcelocation);
-> CHANGE 611 : 612 @ 616 : 617
+> CHANGE 23 : 24 @ 23 : 24
~ EaglerTextureAtlasSprite.setLocationNameCompass(resourcelocation2.toString());
-> CHANGE 614 : 615 @ 619 : 620
+> CHANGE 3 : 4 @ 3 : 4
~ EaglerTextureAtlasSprite.setLocationNameClock(resourcelocation2.toString());
-> CHANGE 667 : 668 @ 672 : 673
+> CHANGE 53 : 54 @ 53 : 54
~ for (EaglerTextureAtlasSprite textureatlassprite : this.sprites.values()) {
diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java
index b8cfb7d8..3fc7b5fb 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 6 @ 5
+> INSERT 2 : 4 @ 3
+ import net.minecraft.util.ResourceLocation;
+
diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java
index 3e350abb..98e8b153 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 8 @ 4
+> INSERT 1 : 6 @ 2
+
+ import com.google.common.collect.Maps;
@@ -15,6 +15,6 @@
+ import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
+ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f;
-> DELETE 10 @ 6 : 8
+> DELETE 7 @ 2 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java
index dc34805a..692b8674 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java
@@ -7,45 +7,45 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 7 @ 4
+> INSERT 1 : 5 @ 2
+
+ import com.google.common.collect.Lists;
+
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 11 @ 8 : 10
+> DELETE 8 @ 4 : 6
-> CHANGE 18 : 19 @ 17 : 18
+> CHANGE 7 : 8 @ 9 : 10
~ protected final EaglerTextureAtlasSprite texture;
-> CHANGE 22 : 23 @ 21 : 22
+> CHANGE 4 : 5 @ 4 : 5
~ EaglerTextureAtlasSprite parTextureAtlasSprite, ItemCameraTransforms parItemCameraTransforms) {
-> CHANGE 51 : 52 @ 50 : 51
+> CHANGE 29 : 30 @ 29 : 30
~ public EaglerTextureAtlasSprite getParticleTexture() {
-> CHANGE 63 : 64 @ 62 : 63
+> CHANGE 12 : 13 @ 12 : 13
~ private EaglerTextureAtlasSprite builderTexture;
-> CHANGE 71 : 72 @ 70 : 71
+> CHANGE 8 : 9 @ 8 : 9
~ public Builder(IBakedModel parIBakedModel, EaglerTextureAtlasSprite parTextureAtlasSprite) {
-> CHANGE 83 : 84 @ 82 : 83
+> CHANGE 12 : 13 @ 12 : 13
~ private void addFaceBreakingFours(IBakedModel parIBakedModel, EaglerTextureAtlasSprite parTextureAtlasSprite,
-> CHANGE 91 : 93 @ 90 : 91
+> CHANGE 8 : 10 @ 8 : 9
~ private void addGeneralBreakingFours(IBakedModel parIBakedModel,
~ EaglerTextureAtlasSprite parTextureAtlasSprite) {
-> CHANGE 122 : 123 @ 120 : 121
+> CHANGE 31 : 32 @ 30 : 31
~ public SimpleBakedModel.Builder setTexture(EaglerTextureAtlasSprite parTextureAtlasSprite) {
diff --git a/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java
index e74ddb67..db2058f0 100644
--- a/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java
+++ b/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> INSERT 4 : 9 @ 6
+> INSERT 2 : 7 @ 4
+
+ import com.google.common.collect.ComparisonChain;
@@ -15,9 +15,9 @@
+
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-> DELETE 11 @ 8 : 10
+> DELETE 7 @ 2 : 4
-> CHANGE 45 : 46 @ 44 : 45
+> CHANGE 34 : 35 @ 36 : 37
~ public EaglerTextureAtlasSprite getParticleTexture() {
diff --git a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java
index 1180ffbf..5eb29d36 100644
--- a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java
+++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 7
-> CHANGE 3 : 6 @ 8 : 11
+> CHANGE 1 : 4 @ 6 : 9
~ import java.io.ByteArrayOutputStream;
~ import java.io.InputStreamReader;
~ import java.io.OutputStreamWriter;
-> DELETE 7 @ 12 : 14
+> DELETE 4 @ 4 : 6
-> INSERT 10 : 28 @ 17
+> INSERT 3 : 21 @ 5
+
+ import org.json.JSONArray;
@@ -36,29 +36,29 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 33 @ 22 : 24
+> DELETE 23 @ 5 : 7
-> DELETE 38 @ 29 : 35
+> DELETE 5 @ 7 : 13
-> DELETE 41 @ 38 : 43
+> DELETE 3 @ 9 : 14
-> DELETE 42 @ 44 : 52
+> DELETE 1 @ 6 : 14
-> CHANGE 65 : 68 @ 75 : 78
+> CHANGE 23 : 26 @ 31 : 34
~ public int clouds = 1;
~ public boolean fancyGraphics = false;
~ public int ambientOcclusion = 0;
-> DELETE 76 @ 86 : 87
+> DELETE 11 @ 11 : 12
-> DELETE 77 @ 88 : 89
+> DELETE 1 @ 2 : 3
-> CHANGE 113 : 114 @ 125 : 126
+> CHANGE 36 : 37 @ 37 : 38
~ public KeyBinding keyBindSprint = new KeyBinding("key.sprint", KeyboardConstants.KEY_R, "key.categories.movement");
-> CHANGE 124 : 130 @ 136 : 143
+> CHANGE 11 : 17 @ 11 : 18
~ public KeyBinding keyBindSmoothCamera = new KeyBinding("key.smoothCamera", KeyboardConstants.KEY_M,
~ "key.categories.misc");
@@ -67,13 +67,13 @@
~ public KeyBinding keyBindFunction = new KeyBinding("key.function", KeyboardConstants.KEY_F, "key.categories.misc");
~ public KeyBinding keyBindClose = new KeyBinding("key.close", KeyboardConstants.KEY_GRAVE, "key.categories.misc");
-> DELETE 142 @ 155 : 156
+> DELETE 18 @ 19 : 20
-> CHANGE 154 : 155 @ 168 : 169
+> CHANGE 12 : 13 @ 13 : 14
~ public int guiScale = 3;
-> INSERT 158 : 167 @ 172
+> INSERT 4 : 13 @ 4
+ public boolean hudFps = true;
+ public boolean hudCoords = true;
@@ -85,46 +85,46 @@
+ public boolean fog = true;
+ public boolean fxaa = true;
-> CHANGE 168 : 169 @ 173 : 174
+> CHANGE 10 : 11 @ 1 : 2
~ public GameSettings(Minecraft mcIn) {
-> CHANGE 173 : 175 @ 178 : 181
+> CHANGE 5 : 7 @ 5 : 8
~ this.keyBindTogglePerspective, this.keyBindSmoothCamera, this.keyBindZoomCamera, this.keyBindFunction,
~ this.keyBindClose }, this.keyBindsHotbar);
-> CHANGE 178 : 180 @ 184 : 185
+> CHANGE 5 : 7 @ 6 : 7
~ this.gammaSetting = 1.0F;
~ this.language = EagRuntime.getConfiguration().getDefaultLocale();
-> CHANGE 182 : 183 @ 187 : 193
+> CHANGE 4 : 5 @ 3 : 9
~ GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);
-> CHANGE 184 : 185 @ 194 : 195
+> CHANGE 2 : 3 @ 7 : 8
~ this.renderDistanceChunks = 4;
-> DELETE 188 @ 198 : 213
+> DELETE 4 @ 4 : 19
-> CHANGE 191 : 192 @ 216 : 217
+> CHANGE 3 : 4 @ 18 : 19
~ : HString.format("%c", new Object[] { Character.valueOf((char) (parInt1 - 256)) })
-> DELETE 275 @ 300 : 301
+> DELETE 84 @ 84 : 85
-> DELETE 279 @ 305 : 306
+> DELETE 4 @ 5 : 6
-> INSERT 324 : 326 @ 351
+> INSERT 45 : 47 @ 46
+ this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
+ I18n.format("resourcePack.load.pleaseWait"));
-> DELETE 384 @ 409 : 426
+> DELETE 60 @ 58 : 75
-> INSERT 397 : 433 @ 439
+> INSERT 13 : 49 @ 30
+ if (parOptions == GameSettings.Options.HUD_FPS) {
+ this.hudFps = !this.hudFps;
@@ -163,9 +163,9 @@
+ }
+
-> DELETE 487 @ 493 : 499
+> DELETE 90 @ 54 : 60
-> INSERT 499 : 517 @ 511
+> INSERT 12 : 30 @ 18
+ case HUD_COORDS:
+ return this.hudCoords;
@@ -186,21 +186,21 @@
+ case FXAA:
+ return this.fxaa;
-> CHANGE 560 : 563 @ 554 : 558
+> CHANGE 61 : 64 @ 43 : 47
~ : (parOptions == GameSettings.Options.CHAT_SCALE
~ ? s + (int) (f * 90.0F + 10.0F) + "%"
~ : (parOptions == GameSettings.Options.CHAT_HEIGHT_UNFOCUSED
-> CHANGE 566 : 567 @ 561 : 562
+> CHANGE 6 : 7 @ 7 : 8
~ : (parOptions == GameSettings.Options.CHAT_HEIGHT_FOCUSED
-> CHANGE 568 : 569 @ 563 : 564
+> CHANGE 2 : 3 @ 2 : 3
~ .calculateChatboxHeight(
-> CHANGE 571 : 590 @ 566 : 600
+> CHANGE 3 : 22 @ 3 : 37
~ : (parOptions == GameSettings.Options.CHAT_WIDTH
~ ? s + GuiNewChat
@@ -222,17 +222,17 @@
~ + "%")
~ : "yee"))))))))))));
-> CHANGE 625 : 627 @ 635 : 636
+> CHANGE 54 : 56 @ 69 : 70
~ byte[] options = EagRuntime.getStorage("g");
~ if (options == null) {
-> CHANGE 630 : 632 @ 639 : 640
+> CHANGE 5 : 7 @ 4 : 5
~ BufferedReader bufferedreader = new BufferedReader(
~ new InputStreamReader(EaglerZLIB.newGZIPInputStream(new EaglerInputStream(options))));
-> CHANGE 715 : 721 @ 723 : 724
+> CHANGE 85 : 91 @ 84 : 85
~ this.resourcePacks.clear();
~ for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) {
@@ -241,7 +241,7 @@
~ }
~ }
-> CHANGE 727 : 733 @ 730 : 731
+> CHANGE 12 : 18 @ 7 : 8
~ this.field_183018_l.clear();
~ for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) {
@@ -250,11 +250,11 @@
~ }
~ }
-> DELETE 771 @ 769 : 773
+> DELETE 44 @ 39 : 43
-> DELETE 775 @ 777 : 781
+> DELETE 4 @ 8 : 12
-> INSERT 891 : 927 @ 897
+> INSERT 116 : 152 @ 120
+ if (astring[0].equals("hudFps")) {
+ this.hudFps = astring[1].equals("true");
@@ -293,28 +293,28 @@
+ }
+
-> INSERT 933 : 935 @ 903
+> INSERT 42 : 44 @ 6
+ Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
+
-> DELETE 952 @ 920 : 921
+> DELETE 19 @ 17 : 18
-> CHANGE 964 : 966 @ 933 : 934
+> CHANGE 12 : 14 @ 13 : 14
~ ByteArrayOutputStream bao = new ByteArrayOutputStream();
~ PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(EaglerZLIB.newGZIPOutputStream(bao)));
-> CHANGE 992 : 994 @ 960 : 962
+> CHANGE 28 : 30 @ 27 : 29
~ printwriter.println("resourcePacks:" + toJSONArray(this.resourcePacks));
~ printwriter.println("incompatibleResourcePacks:" + toJSONArray(this.field_183018_l));
-> DELETE 1002 @ 970 : 971
+> DELETE 10 @ 10 : 11
-> DELETE 1003 @ 972 : 973
+> DELETE 1 @ 2 : 3
-> INSERT 1032 : 1041 @ 1002
+> INSERT 29 : 38 @ 30
+ printwriter.println("hudFps:" + this.hudFps);
+ printwriter.println("hudWorld:" + this.hudWorld);
@@ -326,21 +326,21 @@
+ printwriter.println("fog:" + this.fog);
+ printwriter.println("fxaa:" + this.fxaa);
-> INSERT 1046 : 1048 @ 1007
+> INSERT 14 : 16 @ 5
+ Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
+
-> INSERT 1059 : 1061 @ 1018
+> INSERT 13 : 15 @ 11
+
+ EagRuntime.setStorage("g", bao.toByteArray());
-> CHANGE 1071 : 1072 @ 1028 : 1029
+> CHANGE 12 : 13 @ 10 : 11
~ : (parSoundCategory == SoundCategory.VOICE ? 0.0F : 1.0F);
-> INSERT 1125 : 1133 @ 1082
+> INSERT 54 : 62 @ 54
+ private String toJSONArray(List e) {
+ JSONArray arr = new JSONArray();
@@ -351,16 +351,16 @@
+ }
+
-> CHANGE 1137 : 1138 @ 1086 : 1087
+> CHANGE 12 : 13 @ 4 : 5
~ RENDER_DISTANCE("options.renderDistance", true, false, 1.0F, 16.0F, 1.0F),
-> CHANGE 1146 : 1148 @ 1095 : 1099
+> CHANGE 9 : 11 @ 9 : 13
~ TOUCHSCREEN("options.touchscreen", false, true), CHAT_SCALE("options.chat.scale", true, false),
~ CHAT_WIDTH("options.chat.width", true, false), CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false),
-> CHANGE 1162 : 1167 @ 1113 : 1114
+> CHANGE 16 : 21 @ 18 : 19
~ ENTITY_SHADOWS("options.entityShadows", false, true), HUD_FPS("options.hud.fps", false, true),
~ HUD_COORDS("options.hud.coords", false, true), HUD_STATS("options.hud.stats", false, true),
diff --git a/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java b/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java
index d182d084..76297ced 100644
--- a/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java
+++ b/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> INSERT 4 : 8 @ 6
+> INSERT 2 : 6 @ 4
+
+ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/client/stream/IStream.edit.java b/patches/minecraft/net/minecraft/client/stream/IStream.edit.java
index 8083f55e..fe182f3d 100644
--- a/patches/minecraft/net/minecraft/client/stream/IStream.edit.java
+++ b/patches/minecraft/net/minecraft/client/stream/IStream.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 8
-> DELETE 15 @ 21 : 25
+> DELETE 13 @ 19 : 23
-> DELETE 29 @ 39 : 41
+> DELETE 14 @ 18 : 20
-> DELETE 31 @ 43 : 45
+> DELETE 2 @ 4 : 6
-> DELETE 39 @ 53 : 55
+> DELETE 8 @ 10 : 12
-> DELETE 43 @ 59 : 61
+> DELETE 4 @ 6 : 8
> EOF
diff --git a/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java b/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java
index 8ba60e30..192f46dd 100644
--- a/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java
+++ b/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java
@@ -9,41 +9,41 @@
~ import org.json.JSONObject;
-> INSERT 4 : 7 @ 7
+> INSERT 2 : 5 @ 5
+ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+
-> CHANGE 52 : 53 @ 52 : 53
+> CHANGE 48 : 49 @ 45 : 46
~ EaglercraftGPU.glBlendEquation(this.field_148112_f);
-> CHANGE 95 : 96 @ 95 : 96
+> CHANGE 43 : 44 @ 43 : 44
~ public static JsonBlendingMode func_148110_a(JSONObject parJsonObject) {
-> CHANGE 106 : 108 @ 106 : 108
+> CHANGE 11 : 13 @ 11 : 13
~ if (parJsonObject.get("func") instanceof String) {
~ i = func_148108_a(parJsonObject.getString("func"));
-> CHANGE 113 : 115 @ 113 : 115
+> CHANGE 7 : 9 @ 7 : 9
~ if (parJsonObject.get("srcrgb") instanceof String) {
~ j = func_148107_b(parJsonObject.getString("srcrgb"));
-> CHANGE 120 : 122 @ 120 : 122
+> CHANGE 7 : 9 @ 7 : 9
~ if (parJsonObject.get("dstrgb") instanceof String) {
~ k = func_148107_b(parJsonObject.getString("dstrgb"));
-> CHANGE 127 : 129 @ 127 : 129
+> CHANGE 7 : 9 @ 7 : 9
~ if (parJsonObject.get("srcalpha") instanceof String) {
~ l = func_148107_b(parJsonObject.getString("srcalpha"));
-> CHANGE 136 : 138 @ 136 : 138
+> CHANGE 9 : 11 @ 9 : 11
~ if (parJsonObject.get("dstalpha") instanceof String) {
~ i1 = func_148107_b(parJsonObject.getString("dstalpha"));
diff --git a/patches/minecraft/net/minecraft/client/util/JsonException.edit.java b/patches/minecraft/net/minecraft/client/util/JsonException.edit.java
index f1fb7214..5d78d709 100644
--- a/patches/minecraft/net/minecraft/client/util/JsonException.edit.java
+++ b/patches/minecraft/net/minecraft/client/util/JsonException.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 3
-> INSERT 5 : 6 @ 6
+> INSERT 3 : 4 @ 4
+
-> INSERT 8 : 10 @ 8
+> INSERT 3 : 5 @ 2
+ import com.google.common.collect.Lists;
+
diff --git a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java
index 641b33f4..2c4c9018 100644
--- a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java
+++ b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java
@@ -7,6 +7,6 @@
> DELETE 2 @ 2 : 3
-> DELETE 27 @ 28 : 29
+> DELETE 25 @ 26 : 27
> EOF
diff --git a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java
index b5eaa591..a7acbff7 100644
--- a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java
+++ b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 8
-> DELETE 8 @ 14 : 15
+> DELETE 6 @ 12 : 13
-> INSERT 9 : 10 @ 16
+> INSERT 1 : 2 @ 2
+ import java.util.Set;
-> CHANGE 12 : 21 @ 18 : 20
+> CHANGE 3 : 12 @ 2 : 4
~
~ import com.google.common.base.Predicate;
@@ -25,95 +25,95 @@
~
~ import net.minecraft.client.Minecraft;
-> DELETE 25 @ 24 : 25
+> DELETE 13 @ 6 : 7
-> DELETE 29 @ 29 : 30
+> DELETE 4 @ 5 : 6
-> DELETE 46 @ 47 : 51
+> DELETE 17 @ 18 : 22
-> CHANGE 59 : 60 @ 64 : 65
+> CHANGE 13 : 14 @ 17 : 18
~ for (Entity entity : (List) list) {
-> CHANGE 63 : 64 @ 68 : 69
+> CHANGE 4 : 5 @ 4 : 5
~ return IChatComponent.join(arraylist);
-> CHANGE 80 : 81 @ 85 : 86
+> CHANGE 17 : 18 @ 17 : 18
~ for (World world : (List) list) {
-> CHANGE 107 : 111 @ 112 : 113
+> CHANGE 27 : 31 @ 27 : 28
~ Minecraft mc = Minecraft.getMinecraft();
~ if (mc.theWorld != null) {
~ arraylist.add(mc.thePlayer);
~ }
-> CHANGE 133 : 135 @ 135 : 137
+> CHANGE 26 : 28 @ 23 : 25
~ String ss = func_179651_b(parMap, "type");
~ final boolean flag = ss != null && ss.startsWith("!");
-> CHANGE 136 : 137 @ 138 : 139
+> CHANGE 3 : 4 @ 3 : 4
~ ss = ss.substring(1);
-> INSERT 138 : 139 @ 140
+> INSERT 2 : 3 @ 2
+ final String s = ss;
-> CHANGE 168 : 169 @ 169 : 176
+> CHANGE 30 : 31 @ 29 : 36
~ return false;
-> CHANGE 182 : 183 @ 189 : 195
+> CHANGE 14 : 15 @ 20 : 26
~ return false;
-> CHANGE 192 : 194 @ 204 : 206
+> CHANGE 10 : 12 @ 15 : 17
~ String ss = func_179651_b(parMap, "team");
~ final boolean flag = ss != null && ss.startsWith("!");
-> CHANGE 195 : 196 @ 207 : 208
+> CHANGE 3 : 4 @ 3 : 4
~ ss = ss.substring(1);
-> INSERT 197 : 198 @ 209
+> INSERT 2 : 3 @ 2
+ final String s = ss;
-> CHANGE 219 : 220 @ 230 : 231
+> CHANGE 22 : 23 @ 21 : 22
~ final Map map = func_96560_a(parMap);
-> CHANGE 223 : 224 @ 234 : 235
+> CHANGE 4 : 5 @ 4 : 5
~ Scoreboard scoreboard = Minecraft.getMinecraft().theWorld.getScoreboard();
-> CHANGE 238 : 239 @ 249 : 251
+> CHANGE 15 : 16 @ 15 : 17
~ String s1 = entity instanceof EntityPlayer ? entity.getName() : entity.getUniqueID().toString();
-> CHANGE 264 : 266 @ 276 : 278
+> CHANGE 26 : 28 @ 27 : 29
~ String ss = func_179651_b(parMap, "name");
~ final boolean flag = ss != null && ss.startsWith("!");
-> CHANGE 267 : 268 @ 279 : 280
+> CHANGE 3 : 4 @ 3 : 4
~ ss = ss.substring(1);
-> INSERT 269 : 270 @ 281
+> INSERT 2 : 3 @ 2
+ final String s = ss;
-> CHANGE 410 : 411 @ 421 : 422
+> CHANGE 141 : 142 @ 140 : 141
~ parList = (List) Lists.newArrayList(new Entity[] { entity });
-> INSERT 544 : 545 @ 555
+> INSERT 134 : 135 @ 134
+
diff --git a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java
index 2a8ff94d..a9ce1479 100644
--- a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java
+++ b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java
@@ -7,41 +7,41 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 5 @ 4 : 11
+> CHANGE 1 : 3 @ 2 : 9
~
~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
-> DELETE 7 @ 13 : 14
+> DELETE 4 @ 9 : 10
-> DELETE 9 @ 16 : 17
+> DELETE 2 @ 3 : 4
-> CHANGE 11 : 12 @ 19 : 20
+> CHANGE 2 : 3 @ 3 : 4
~ public abstract class CommandBlockLogic {
-> DELETE 18 @ 26 : 27
+> DELETE 7 @ 7 : 8
-> DELETE 35 @ 44 : 46
+> DELETE 17 @ 18 : 20
-> DELETE 51 @ 62 : 64
+> DELETE 16 @ 18 : 20
-> DELETE 67 @ 80 : 83
+> DELETE 16 @ 18 : 21
-> DELETE 68 @ 84 : 110
+> DELETE 1 @ 4 : 30
-> DELETE 83 @ 125 : 130
+> DELETE 15 @ 41 : 46
-> CHANGE 87 : 88 @ 134 : 137
+> CHANGE 4 : 5 @ 9 : 12
~ return true;
-> DELETE 90 @ 139 : 143
+> DELETE 3 @ 5 : 9
-> CHANGE 112 : 113 @ 165 : 169
+> CHANGE 22 : 23 @ 26 : 30
~ playerIn.openEditCommandBlock(this);
-> DELETE 116 @ 172 : 176
+> DELETE 4 @ 7 : 11
> EOF
diff --git a/patches/minecraft/net/minecraft/crash/CrashReport.edit.java b/patches/minecraft/net/minecraft/crash/CrashReport.edit.java
index e37dece4..4a9252bf 100644
--- a/patches/minecraft/net/minecraft/crash/CrashReport.edit.java
+++ b/patches/minecraft/net/minecraft/crash/CrashReport.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 5
-> DELETE 4 @ 7 : 9
+> DELETE 2 @ 5 : 7
-> CHANGE 8 : 17 @ 13 : 14
+> CHANGE 4 : 13 @ 6 : 7
~
~ import com.google.common.collect.Lists;
@@ -21,19 +21,19 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 18 @ 15 : 20
+> DELETE 10 @ 2 : 7
-> DELETE 25 @ 27 : 28
+> DELETE 7 @ 12 : 13
-> CHANGE 26 : 27 @ 29 : 30
+> CHANGE 1 : 2 @ 2 : 3
~ private String[] stacktrace;
-> INSERT 31 : 32 @ 34
+> INSERT 5 : 6 @ 5
+ this.stacktrace = EagRuntime.getStackTraceElements(causeThrowable);
-> CHANGE 58 : 69 @ 60 : 88
+> CHANGE 27 : 38 @ 26 : 54
~ if (EagRuntime.getPlatformType() != EnumPlatformType.JAVASCRIPT) {
~ this.theReportCategory.addCrashSectionCallable("Memory", new Callable() {
@@ -47,24 +47,24 @@
~ return k + " bytes (" + j1 + " MB) / " + j + " bytes (" + i1 + " MB) up to " + i + " bytes (" + l
~ + " MB)";
-> CHANGE 70 : 72 @ 89 : 98
+> CHANGE 12 : 14 @ 29 : 38
~ });
~ }
-> CHANGE 84 : 85 @ 110 : 111
+> CHANGE 14 : 15 @ 21 : 22
~ this.stacktrace = (String[]) ArrayUtils
-> CHANGE 92 : 93 @ 118 : 119
+> CHANGE 8 : 9 @ 8 : 9
~ for (String stacktraceelement : this.stacktrace) {
-> CHANGE 109 : 110 @ 135 : 146
+> CHANGE 17 : 18 @ 17 : 28
~ StringBuilder stackTrace = new StringBuilder();
-> CHANGE 111 : 118 @ 147 : 148
+> CHANGE 2 : 9 @ 12 : 13
~ if ((this.cause.getMessage() == null || this.cause.getMessage().length() == 0)
~ && ((this.cause instanceof NullPointerException) || (this.cause instanceof StackOverflowError)
@@ -74,29 +74,29 @@
~ } else {
~ stackTrace.append(this.cause.toString()).append('\n');
-> CHANGE 120 : 123 @ 150 : 151
+> CHANGE 9 : 12 @ 3 : 4
~ EagRuntime.getStackTrace(this.cause, (s) -> {
~ stackTrace.append("\tat ").append(s).append('\n');
~ });
-> CHANGE 124 : 125 @ 152 : 163
+> CHANGE 4 : 5 @ 2 : 13
~ return stackTrace.toString();
-> DELETE 152 @ 190 : 215
+> DELETE 28 @ 38 : 63
-> CHANGE 164 : 167 @ 227 : 230
+> CHANGE 12 : 15 @ 37 : 40
~ String[] astacktraceelement = EagRuntime.getStackTraceElements(cause);
~ String stacktraceelement = null;
~ String stacktraceelement1 = null;
-> CHANGE 188 : 189 @ 251 : 252
+> CHANGE 24 : 25 @ 24 : 25
~ this.stacktrace = new String[j];
-> CHANGE 200 : 201 @ 263 : 282
+> CHANGE 12 : 13 @ 12 : 31
~ return "eagler";
diff --git a/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java b/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java
index 61a23b51..6b99ecc5 100644
--- a/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java
+++ b/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 9 @ 5
+> INSERT 2 : 7 @ 3
+
+ import com.google.common.collect.Lists;
@@ -15,76 +15,76 @@
+ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+ import net.lax1dude.eaglercraft.v1_8.HString;
-> DELETE 11 @ 7 : 8
+> DELETE 7 @ 2 : 3
-> CHANGE 17 : 18 @ 14 : 15
+> CHANGE 6 : 7 @ 7 : 8
~ private String[] stackTrace = new String[0];
-> CHANGE 25 : 26 @ 22 : 23
+> CHANGE 8 : 9 @ 8 : 9
~ return HString.format("%.2f,%.2f,%.2f - %s", new Object[] { Double.valueOf(x), Double.valueOf(y),
-> CHANGE 36 : 37 @ 33 : 34
+> CHANGE 11 : 12 @ 11 : 12
~ stringbuilder.append(HString.format("World: (%d,%d,%d)",
-> CHANGE 54 : 55 @ 51 : 52
+> CHANGE 18 : 19 @ 18 : 19
~ stringbuilder.append(HString.format("Chunk: (at %d,%d,%d in %d,%d; contains blocks %d,0,%d to %d,255,%d)",
-> CHANGE 76 : 77 @ 73 : 74
+> CHANGE 22 : 23 @ 22 : 23
~ HString.format("Region: (%d,%d; contains chunks %d,%d to %d,%d, blocks %d,0,%d to %d,255,%d)",
-> CHANGE 105 : 107 @ 102 : 104
+> CHANGE 29 : 31 @ 29 : 31
~ String[] astacktraceelement = EagRuntime.getStackTraceElements(new Exception());
~ if (astacktraceelement.length - 3 - size <= 0) {
-> CHANGE 109 : 110 @ 106 : 107
+> CHANGE 4 : 5 @ 4 : 5
~ this.stackTrace = new String[astacktraceelement.length - 3 - size];
-> CHANGE 115 : 116 @ 112 : 113
+> CHANGE 6 : 7 @ 6 : 7
~ public boolean firstTwoElementsOfStackTraceMatch(String s1, String s2) {
-> CHANGE 117 : 119 @ 114 : 119
+> CHANGE 2 : 4 @ 2 : 7
~ String stacktraceelement = this.stackTrace[0];
~ if (s1.equals(stacktraceelement)) {
-> CHANGE 136 : 137 @ 136 : 137
+> CHANGE 19 : 20 @ 22 : 23
~ String[] astacktraceelement = new String[this.stackTrace.length - amount];
-> CHANGE 155 : 156 @ 155 : 156
+> CHANGE 19 : 20 @ 19 : 20
~ for (String stacktraceelement : this.stackTrace) {
-> CHANGE 157 : 158 @ 157 : 158
+> CHANGE 2 : 3 @ 2 : 3
~ builder.append(stacktraceelement);
-> CHANGE 163 : 164 @ 163 : 164
+> CHANGE 6 : 7 @ 6 : 7
~ public String[] getStackTrace() {
-> CHANGE 173 : 175 @ 173 : 175
+> CHANGE 10 : 12 @ 10 : 12
~ return HString.format("ID #%d (%s // %s)", new Object[] { Integer.valueOf(i),
~ blockIn.getUnlocalizedName(), blockIn.getClass().getName() });
-> CHANGE 185 : 186 @ 185 : 186
+> CHANGE 12 : 13 @ 12 : 13
~ String s = HString.format("%4s", new Object[] { Integer.toBinaryString(blockData) }).replace(" ",
-> CHANGE 187 : 188 @ 187 : 188
+> CHANGE 2 : 3 @ 2 : 3
~ return HString.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(blockData), s });
-> CHANGE 221 : 222 @ 221 : 222
+> CHANGE 34 : 35 @ 34 : 35
~ this.value = "~~ERROR~~ " + throwable.getClass().getName() + ": " + throwable.getMessage();
diff --git a/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java b/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java
index 4e014124..440760c4 100644
--- a/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 5 : 9 @ 7 : 25
+> CHANGE 3 : 7 @ 5 : 23
~
~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java
index 3e3e443d..9ba3984e 100644
--- a/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java
@@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 30 : 31 @ 31 : 32
+> CHANGE 28 : 29 @ 29 : 30
~ public static boolean negateDamage(ItemStack parItemStack, int parInt1, EaglercraftRandom parRandom) {
diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java
index 74b1e384..a6e8fa89 100644
--- a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 8 : 13 @ 10 : 13
+> CHANGE 6 : 11 @ 8 : 11
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
@@ -15,29 +15,29 @@
~ import com.google.common.collect.Maps;
~
-> CHANGE 26 : 27 @ 26 : 27
+> CHANGE 18 : 19 @ 16 : 17
~ private static final EaglercraftRandom enchantmentRand = new EaglercraftRandom();
-> CHANGE 238 : 240 @ 238 : 239
+> CHANGE 212 : 214 @ 212 : 213
~ public static int calcItemStackEnchantability(EaglercraftRandom parRandom, int parInt1, int parInt2,
~ ItemStack parItemStack) {
-> CHANGE 254 : 255 @ 253 : 254
+> CHANGE 16 : 17 @ 15 : 16
~ public static ItemStack addRandomEnchantment(EaglercraftRandom parRandom, ItemStack parItemStack, int parInt1) {
-> CHANGE 262 : 263 @ 261 : 262
+> CHANGE 8 : 9 @ 8 : 9
~ for (EnchantmentData enchantmentdata : (List) list) {
-> CHANGE 274 : 276 @ 273 : 274
+> CHANGE 12 : 14 @ 12 : 13
~ public static List buildEnchantmentList(EaglercraftRandom randomIn, ItemStack itemStackIn,
~ int parInt1) {
-> CHANGE 306 : 307 @ 304 : 305
+> CHANGE 32 : 33 @ 31 : 32
~ for (EnchantmentData enchantmentdata1 : (List) arraylist) {
diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java
index 19bb7723..e5ddfd8c 100644
--- a/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java
+++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java
@@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> CHANGE 34 : 35 @ 36 : 37
+> CHANGE 32 : 33 @ 34 : 35
~ EaglercraftRandom random = entitylivingbase.getRNG();
-> CHANGE 52 : 53 @ 54 : 55
+> CHANGE 18 : 19 @ 18 : 19
~ public static boolean func_92094_a(int parInt1, EaglercraftRandom parRandom) {
-> CHANGE 56 : 57 @ 58 : 59
+> CHANGE 4 : 5 @ 4 : 5
~ public static int func_92095_b(int parInt1, EaglercraftRandom parRandom) {
diff --git a/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java b/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java
index 0e94b6e1..8c6587a7 100644
--- a/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java
+++ b/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 6 : 12 @ 8 : 10
+> CHANGE 4 : 10 @ 6 : 8
~
~ import org.apache.commons.lang3.ObjectUtils;
@@ -16,38 +16,38 @@
~ import com.google.common.collect.Maps;
~
-> DELETE 14 @ 12 : 13
+> DELETE 8 @ 4 : 5
-> DELETE 19 @ 18 : 19
+> DELETE 5 @ 6 : 7
-> DELETE 26 @ 26 : 27
+> DELETE 7 @ 8 : 9
-> DELETE 42 @ 43 : 44
+> DELETE 16 @ 17 : 18
-> DELETE 43 @ 45 : 46
+> DELETE 1 @ 2 : 3
-> DELETE 50 @ 53 : 54
+> DELETE 7 @ 8 : 9
-> DELETE 51 @ 55 : 56
+> DELETE 1 @ 2 : 3
-> DELETE 79 @ 84 : 86
+> DELETE 28 @ 29 : 31
-> DELETE 88 @ 95 : 97
+> DELETE 9 @ 11 : 13
-> DELETE 129 @ 138 : 140
+> DELETE 41 @ 43 : 45
-> DELETE 139 @ 150 : 152
+> DELETE 10 @ 12 : 14
-> DELETE 146 @ 159 : 161
+> DELETE 7 @ 9 : 11
-> DELETE 149 @ 164 : 166
+> DELETE 3 @ 5 : 7
-> DELETE 154 @ 171 : 172
+> DELETE 5 @ 7 : 8
-> DELETE 163 @ 181 : 182
+> DELETE 9 @ 10 : 11
-> DELETE 256 @ 275 : 276
+> DELETE 93 @ 94 : 95
-> DELETE 266 @ 286 : 287
+> DELETE 10 @ 11 : 12
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/Entity.edit.java b/patches/minecraft/net/minecraft/entity/Entity.edit.java
index f72515e6..d91872a6 100644
--- a/patches/minecraft/net/minecraft/entity/Entity.edit.java
+++ b/patches/minecraft/net/minecraft/entity/Entity.edit.java
@@ -11,139 +11,139 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~ import net.lax1dude.eaglercraft.v1_8.HString;
-> INSERT 7 : 8 @ 6
+> INSERT 4 : 5 @ 3
+
-> DELETE 15 @ 13 : 16
+> DELETE 8 @ 7 : 10
-> DELETE 19 @ 20 : 23
+> DELETE 4 @ 7 : 10
-> DELETE 22 @ 26 : 27
+> DELETE 3 @ 6 : 7
-> DELETE 30 @ 35 : 36
+> DELETE 8 @ 9 : 10
-> DELETE 44 @ 50 : 51
+> DELETE 14 @ 15 : 16
-> CHANGE 45 : 46 @ 52 : 53
+> CHANGE 1 : 2 @ 2 : 3
~ public abstract class Entity {
-> CHANGE 90 : 91 @ 97 : 98
+> CHANGE 45 : 46 @ 45 : 46
~ protected EaglercraftRandom rand;
-> CHANGE 118 : 119 @ 125 : 127
+> CHANGE 28 : 29 @ 28 : 30
~ protected EaglercraftUUID entityUniqueID;
-> CHANGE 139 : 140 @ 147 : 148
+> CHANGE 21 : 22 @ 22 : 23
~ this.rand = new EaglercraftRandom();
-> DELETE 143 @ 151 : 152
+> DELETE 4 @ 4 : 5
-> DELETE 202 @ 211 : 214
+> DELETE 59 @ 60 : 63
-> DELETE 247 @ 259 : 274
+> DELETE 45 @ 48 : 63
-> DELETE 248 @ 275 : 297
+> DELETE 1 @ 16 : 38
-> CHANGE 250 : 251 @ 299 : 311
+> CHANGE 2 : 3 @ 24 : 36
~ this.fire = 0;
-> DELETE 252 @ 312 : 316
+> DELETE 2 @ 13 : 17
-> DELETE 261 @ 325 : 329
+> DELETE 9 @ 13 : 17
-> CHANGE 377 : 378 @ 445 : 446
+> CHANGE 116 : 117 @ 120 : 121
~ for (AxisAlignedBB axisalignedbb1 : (List) list1) {
-> CHANGE 384 : 385 @ 452 : 453
+> CHANGE 7 : 8 @ 7 : 8
~ for (AxisAlignedBB axisalignedbb2 : (List) list1) {
-> CHANGE 390 : 391 @ 458 : 459
+> CHANGE 6 : 7 @ 6 : 7
~ for (AxisAlignedBB axisalignedbb13 : (List) list1) {
-> CHANGE 408 : 409 @ 476 : 477
+> CHANGE 18 : 19 @ 18 : 19
~ for (AxisAlignedBB axisalignedbb6 : (List) list) {
-> CHANGE 415 : 416 @ 483 : 484
+> CHANGE 7 : 8 @ 7 : 8
~ for (AxisAlignedBB axisalignedbb7 : (List) list) {
-> CHANGE 422 : 423 @ 490 : 491
+> CHANGE 7 : 8 @ 7 : 8
~ for (AxisAlignedBB axisalignedbb8 : (List) list) {
-> CHANGE 430 : 431 @ 498 : 499
+> CHANGE 8 : 9 @ 8 : 9
~ for (AxisAlignedBB axisalignedbb9 : (List) list) {
-> CHANGE 437 : 438 @ 505 : 506
+> CHANGE 7 : 8 @ 7 : 8
~ for (AxisAlignedBB axisalignedbb10 : (List) list) {
-> CHANGE 444 : 445 @ 512 : 513
+> CHANGE 7 : 8 @ 7 : 8
~ for (AxisAlignedBB axisalignedbb11 : (List) list) {
-> CHANGE 463 : 464 @ 531 : 532
+> CHANGE 19 : 20 @ 19 : 20
~ for (AxisAlignedBB axisalignedbb12 : (List) list) {
-> DELETE 1059 @ 1127 : 1128
+> DELETE 596 @ 596 : 597
-> CHANGE 1114 : 1116 @ 1183 : 1184
+> CHANGE 55 : 57 @ 56 : 57
~ this.entityUniqueID = new EaglercraftUUID(tagCompund.getLong("UUIDMost"),
~ tagCompund.getLong("UUIDLeast"));
-> CHANGE 1117 : 1118 @ 1185 : 1186
+> CHANGE 3 : 4 @ 2 : 3
~ this.entityUniqueID = EaglercraftUUID.fromString(tagCompund.getString("UUID"));
-> DELETE 1127 @ 1195 : 1196
+> DELETE 10 @ 10 : 11
-> CHANGE 1343 : 1344 @ 1412 : 1413
+> CHANGE 216 : 217 @ 217 : 218
~ for (AxisAlignedBB axisalignedbb : (List) list) {
-> DELETE 1367 @ 1436 : 1457
+> DELETE 24 @ 24 : 45
-> CHANGE 1395 : 1396 @ 1485 : 1486
+> CHANGE 28 : 29 @ 49 : 50
~ boolean flag = this.worldObj != null;
-> CHANGE 1579 : 1580 @ 1669 : 1670
+> CHANGE 184 : 185 @ 184 : 185
~ return HString.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]",
-> DELETE 1605 @ 1695 : 1729
+> DELETE 26 @ 26 : 60
-> CHANGE 1635 : 1636 @ 1759 : 1760
+> CHANGE 30 : 31 @ 64 : 65
~ return EntityList.getEntityString(Entity.this) + " (" + Entity.this.getClass().getName() + ")";
-> CHANGE 1644 : 1645 @ 1768 : 1769
+> CHANGE 9 : 10 @ 9 : 10
~ category.addCrashSection("Entity\'s Exact location", HString.format("%.2f, %.2f, %.2f",
-> CHANGE 1649 : 1650 @ 1773 : 1774
+> CHANGE 5 : 6 @ 5 : 6
~ category.addCrashSection("Entity\'s Momentum", HString.format("%.2f, %.2f, %.2f", new Object[] {
-> CHANGE 1667 : 1668 @ 1791 : 1792
+> CHANGE 18 : 19 @ 18 : 19
~ public EaglercraftUUID getUniqueID() {
-> DELETE 1730 @ 1854 : 1858
+> DELETE 63 @ 63 : 67
-> DELETE 1781 @ 1909 : 1921
+> DELETE 51 @ 55 : 67
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java
index 223ffa25..ccfff423 100644
--- a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 4
-> DELETE 26 @ 28 : 51
+> DELETE 24 @ 26 : 49
-> CHANGE 38 : 39 @ 63 : 64
+> CHANGE 12 : 13 @ 35 : 36
~ return this.dataWatcher.getWatchableObjectByte(12);
-> CHANGE 91 : 98 @ 116 : 127
+> CHANGE 53 : 60 @ 53 : 64
~ if (this.field_175503_c > 0) {
~ if (this.field_175503_c % 4 == 0) {
@@ -23,11 +23,11 @@
~ this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 0.0D,
~ 0.0D, 0.0D, new int[0]);
-> CHANGE 100 : 101 @ 129 : 142
+> CHANGE 9 : 10 @ 13 : 26
~ --this.field_175503_c;
-> INSERT 103 : 104 @ 144
+> INSERT 3 : 4 @ 15
+ this.setScaleForAge(this.isChild());
diff --git a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java
index 4509d059..c1a33956 100644
--- a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java
@@ -10,23 +10,23 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> DELETE 6 @ 9 : 10
+> DELETE 4 @ 7 : 8
-> CHANGE 10 : 12 @ 14 : 15
+> CHANGE 4 : 6 @ 5 : 6
~ public static final EaglercraftUUID FLEEING_SPEED_MODIFIER_UUID = EaglercraftUUID
~ .fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A");
-> DELETE 16 @ 19 : 20
+> DELETE 6 @ 5 : 6
-> CHANGE 32 : 33 @ 36 : 37
+> CHANGE 16 : 17 @ 17 : 18
~ return false;
-> DELETE 81 @ 85 : 90
+> DELETE 49 @ 49 : 54
-> DELETE 85 @ 94 : 98
+> DELETE 4 @ 9 : 13
-> DELETE 99 @ 112 : 117
+> DELETE 14 @ 18 : 23
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java
index 018dc4a8..a99fa038 100644
--- a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java
@@ -10,18 +10,18 @@
+ import org.apache.commons.lang3.Validate;
+
-> DELETE 6 @ 4 : 5
+> DELETE 4 @ 2 : 3
-> DELETE 13 @ 12 : 13
+> DELETE 7 @ 8 : 9
-> CHANGE 81 : 82 @ 81 : 89
+> CHANGE 68 : 69 @ 69 : 77
~ this.tickCounter1++;
-> DELETE 128 @ 135 : 149
+> DELETE 47 @ 54 : 68
-> DELETE 129 @ 150 : 154
+> DELETE 1 @ 15 : 19
-> DELETE 133 @ 158 : 162
+> DELETE 4 @ 8 : 12
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java
index 750ccbc7..60e1a9f3 100644
--- a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java
@@ -7,8 +7,8 @@
> DELETE 3 @ 3 : 6
-> DELETE 4 @ 7 : 9
+> DELETE 1 @ 4 : 6
-> DELETE 63 @ 68 : 97
+> DELETE 59 @ 61 : 90
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntityList.edit.java b/patches/minecraft/net/minecraft/entity/EntityList.edit.java
index c02170d0..0b803225 100644
--- a/patches/minecraft/net/minecraft/entity/EntityList.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityList.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 6 : 12 @ 8 : 12
+> CHANGE 4 : 10 @ 6 : 10
~
~ import com.google.common.collect.Lists;
@@ -16,81 +16,81 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 78 @ 78 : 80
+> DELETE 72 @ 70 : 72
-> INSERT 82 : 84 @ 84
+> INSERT 4 : 6 @ 6
+ private static final Map> stringToConstructorMapping = Maps
+ .newHashMap();
-> INSERT 86 : 87 @ 86
+> INSERT 4 : 5 @ 2
+ private static final Map> idToConstructorMapping = Maps.newHashMap();
-> CHANGE 91 : 93 @ 90 : 91
+> CHANGE 5 : 7 @ 4 : 5
~ private static void addMapping(Class entityClass,
~ EntityConstructor entityConstructor, String entityName, int id) {
-> INSERT 103 : 104 @ 101
+> INSERT 12 : 13 @ 11
+ stringToConstructorMapping.put(entityName, entityConstructor);
-> INSERT 106 : 107 @ 103
+> INSERT 3 : 4 @ 2
+ idToConstructorMapping.put(Integer.valueOf(id), entityConstructor);
-> CHANGE 112 : 114 @ 108 : 109
+> CHANGE 6 : 8 @ 5 : 6
~ private static void addMapping(Class entityClass,
~ EntityConstructor entityConstructor, String entityName, int entityID, int baseColor,
-> CHANGE 115 : 116 @ 110 : 111
+> CHANGE 3 : 4 @ 2 : 3
~ addMapping(entityClass, entityConstructor, entityName, entityID);
-> CHANGE 123 : 126 @ 118 : 122
+> CHANGE 8 : 11 @ 8 : 12
~ EntityConstructor constructor = stringToConstructorMapping.get(entityName);
~ if (constructor != null) {
~ entity = constructor.createEntity(worldIn);
-> CHANGE 128 : 129 @ 124 : 125
+> CHANGE 5 : 6 @ 6 : 7
~ logger.error("Could not create entity", exception);
-> CHANGE 142 : 145 @ 138 : 142
+> CHANGE 14 : 17 @ 14 : 18
~ EntityConstructor constructor = stringToConstructorMapping.get(nbt.getString("id"));
~ if (constructor != null) {
~ entity = constructor.createEntity(worldIn);
-> CHANGE 147 : 148 @ 144 : 145
+> CHANGE 5 : 6 @ 6 : 7
~ logger.error("Could not create entity", exception);
-> CHANGE 163 : 166 @ 160 : 164
+> CHANGE 16 : 19 @ 16 : 20
~ EntityConstructor constructor = getConstructorFromID(entityID);
~ if (constructor != null) {
~ entity = constructor.createEntity(worldIn);
-> CHANGE 168 : 169 @ 166 : 167
+> CHANGE 5 : 6 @ 6 : 7
~ logger.error("Could not create entity", exception);
-> INSERT 187 : 191 @ 185
+> INSERT 19 : 23 @ 19
+ public static EntityConstructor getConstructorFromID(int entityID) {
+ return idToConstructorMapping.get(Integer.valueOf(entityID));
+ }
+
-> CHANGE 208 : 209 @ 202 : 203
+> CHANGE 21 : 22 @ 17 : 18
~ Set set = stringToClassMapping.keySet();
-> CHANGE 238 : 307 @ 232 : 294
+> CHANGE 30 : 99 @ 30 : 92
~ addMapping(EntityItem.class, (w) -> new EntityItem(w), "Item", 1);
~ addMapping(EntityXPOrb.class, (w) -> new EntityXPOrb(w), "XPOrb", 2);
diff --git a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java
index 9a9375d6..10ebb130 100644
--- a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java
@@ -10,25 +10,25 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> DELETE 5 @ 4 : 16
+> DELETE 3 @ 2 : 14
-> DELETE 22 @ 33 : 36
+> DELETE 17 @ 29 : 32
-> DELETE 29 @ 43 : 44
+> DELETE 7 @ 10 : 11
-> DELETE 33 @ 48 : 51
+> DELETE 4 @ 5 : 8
-> DELETE 34 @ 52 : 55
+> DELETE 1 @ 4 : 7
-> DELETE 35 @ 56 : 57
+> DELETE 1 @ 4 : 5
-> DELETE 45 @ 67 : 73
+> DELETE 10 @ 11 : 17
-> DELETE 46 @ 74 : 81
+> DELETE 1 @ 7 : 14
-> DELETE 53 @ 88 : 112
+> DELETE 7 @ 14 : 38
-> CHANGE 114 : 124 @ 173 : 188
+> CHANGE 61 : 71 @ 85 : 100
~ for (int i = 0; i < 20; ++i) {
~ double d0 = this.rand.nextGaussian() * 0.02D;
@@ -41,19 +41,19 @@
~ this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width - d2 * d3,
~ d0, d1, d2, new int[0]);
-> DELETE 125 @ 189 : 190
+> DELETE 11 @ 16 : 17
-> DELETE 136 @ 201 : 209
+> DELETE 11 @ 12 : 20
-> DELETE 249 @ 322 : 338
+> DELETE 113 @ 121 : 137
-> DELETE 344 @ 433 : 461
+> DELETE 95 @ 111 : 139
-> DELETE 672 @ 789 : 797
+> DELETE 328 @ 356 : 364
-> DELETE 691 @ 816 : 821
+> DELETE 19 @ 27 : 32
-> CHANGE 696 : 698 @ 826 : 827
+> CHANGE 5 : 7 @ 10 : 11
~ EaglercraftUUID uuid = new EaglercraftUUID(this.leashNBTTag.getLong("UUIDMost"),
~ this.leashNBTTag.getLong("UUIDLeast"));
diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java
index 7f44b2a2..00aaeba3 100644
--- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> CHANGE 6 : 13 @ 9 : 11
+> CHANGE 4 : 11 @ 7 : 9
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
@@ -17,94 +17,94 @@
~ import com.google.common.collect.Maps;
~
-> DELETE 15 @ 13 : 14
+> DELETE 9 @ 4 : 5
-> DELETE 16 @ 15 : 19
+> DELETE 1 @ 2 : 6
-> DELETE 21 @ 24 : 27
+> DELETE 5 @ 9 : 12
-> DELETE 22 @ 28 : 30
+> DELETE 1 @ 4 : 6
-> DELETE 31 @ 39 : 42
+> DELETE 9 @ 11 : 14
-> DELETE 44 @ 55 : 56
+> DELETE 13 @ 16 : 17
-> CHANGE 46 : 48 @ 58 : 59
+> CHANGE 2 : 4 @ 3 : 4
~ private static final EaglercraftUUID sprintingSpeedBoostModifierUUID = EaglercraftUUID
~ .fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
-> DELETE 141 @ 152 : 169
+> DELETE 95 @ 94 : 111
-> CHANGE 166 : 167 @ 194 : 197
+> CHANGE 25 : 26 @ 42 : 45
~ this.extinguish();
-> DELETE 189 @ 219 : 222
+> DELETE 23 @ 25 : 28
-> CHANGE 203 : 204 @ 236 : 237
+> CHANGE 14 : 15 @ 17 : 18
~ if (this.hurtResistantTime > 0) {
-> DELETE 245 @ 278 : 281
+> DELETE 42 @ 42 : 45
-> DELETE 246 @ 282 : 290
+> DELETE 1 @ 4 : 12
-> CHANGE 279 : 280 @ 323 : 324
+> CHANGE 33 : 34 @ 41 : 42
~ public EaglercraftRandom getRNG() {
-> DELETE 354 @ 398 : 401
+> DELETE 75 @ 75 : 78
-> CHANGE 391 : 392 @ 438 : 444
+> CHANGE 37 : 38 @ 40 : 46
~ if (potioneffect.onUpdate(this) && potioneffect.getDuration() % 600 == 0) {
-> CHANGE 396 : 397 @ 448 : 452
+> CHANGE 5 : 6 @ 10 : 14
~ this.potionsNeedUpdate = false;
-> DELETE 398 @ 453 : 456
+> DELETE 2 @ 5 : 8
-> DELETE 445 @ 503 : 504
+> DELETE 47 @ 50 : 51
-> DELETE 446 @ 505 : 514
+> DELETE 1 @ 2 : 11
-> DELETE 508 @ 576 : 581
+> DELETE 62 @ 71 : 76
-> DELETE 512 @ 585 : 592
+> DELETE 4 @ 9 : 16
-> DELETE 516 @ 596 : 601
+> DELETE 4 @ 11 : 16
-> CHANGE 535 : 536 @ 620 : 713
+> CHANGE 19 : 20 @ 24 : 117
~ return false;
-> DELETE 569 @ 746 : 751
+> DELETE 34 @ 126 : 131
-> DELETE 570 @ 752 : 761
+> DELETE 1 @ 6 : 15
-> DELETE 760 @ 951 : 955
+> DELETE 190 @ 199 : 203
-> DELETE 819 @ 1014 : 1015
+> DELETE 59 @ 63 : 64
-> CHANGE 973 : 976 @ 1169 : 1174
+> CHANGE 154 : 157 @ 155 : 160
~ if (!this.worldObj.isBlockLoaded(new BlockPos((int) this.posX, 0, (int) this.posZ))
~ || !this.worldObj.getChunkFromBlockCoords(new BlockPos((int) this.posX, 0, (int) this.posZ))
~ .isLoaded()) {
-> DELETE 1063 @ 1261 : 1297
+> DELETE 90 @ 92 : 128
-> DELETE 1221 @ 1455 : 1459
+> DELETE 158 @ 194 : 198
-> DELETE 1250 @ 1488 : 1492
+> DELETE 29 @ 33 : 37
-> DELETE 1281 @ 1523 : 1529
+> DELETE 31 @ 35 : 41
-> DELETE 1282 @ 1530 : 1541
+> DELETE 1 @ 7 : 18
-> CHANGE 1313 : 1314 @ 1572 : 1573
+> CHANGE 31 : 32 @ 42 : 43
~ return false;
diff --git a/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java b/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java
index 9d1c0385..76fd2578 100644
--- a/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java
@@ -9,6 +9,6 @@
~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
-> DELETE 5 @ 5 : 6
+> DELETE 3 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java
index c34ac5ba..2d4d04f7 100644
--- a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java
+++ b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 5
+> CHANGE 1 : 4 @ 2 : 3
~
~ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java b/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java
index bbf5a6d1..21d029cc 100644
--- a/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java
+++ b/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java
@@ -12,13 +12,13 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 14 @ 11 : 13
+> DELETE 11 @ 8 : 10
-> CHANGE 47 : 48 @ 46 : 47
+> CHANGE 33 : 34 @ 35 : 36
~ for (AttributeModifier attributemodifier : (Collection) collection) {
-> CHANGE 105 : 107 @ 104 : 105
+> CHANGE 58 : 60 @ 58 : 59
~ EaglercraftUUID uuid = new EaglercraftUUID(parNBTTagCompound.getLong("UUIDMost"),
~ parNBTTagCompound.getLong("UUIDLeast"));
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java
index 382b1d0f..314be989 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java
@@ -10,21 +10,21 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> INSERT 6 : 9 @ 7
+> INSERT 4 : 7 @ 5
+ import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
+ import net.minecraft.util.MathHelper;
+
-> CHANGE 13 : 14 @ 11 : 12
+> CHANGE 7 : 8 @ 4 : 5
~ private final EaglercraftUUID id;
-> CHANGE 20 : 21 @ 18 : 19
+> CHANGE 7 : 8 @ 7 : 8
~ public AttributeModifier(EaglercraftUUID idIn, String nameIn, double amountIn, int operationIn) {
-> CHANGE 30 : 31 @ 28 : 29
+> CHANGE 10 : 11 @ 10 : 11
~ public EaglercraftUUID getID() {
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java
index ae743c74..f48bce27 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> CHANGE 5 : 10 @ 8 : 11
+> CHANGE 3 : 8 @ 6 : 9
~
~ import com.google.common.collect.HashMultimap;
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java
index a2764ec0..d45888b1 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java
@@ -9,7 +9,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
-> CHANGE 18 : 19 @ 20 : 21
+> CHANGE 15 : 16 @ 17 : 18
~ AttributeModifier getModifier(EaglercraftUUID var1);
diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java
index c043dcbd..87d424ec 100644
--- a/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java
+++ b/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java
@@ -7,34 +7,34 @@
> DELETE 2 @ 2 : 5
-> INSERT 4 : 5 @ 7
+> INSERT 2 : 3 @ 5
+ import java.util.List;
-> CHANGE 7 : 8 @ 9 : 14
+> CHANGE 3 : 4 @ 2 : 7
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
-> INSERT 9 : 13 @ 15
+> INSERT 2 : 6 @ 6
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+ import com.google.common.collect.Sets;
+
-> CHANGE 18 : 19 @ 20 : 21
+> CHANGE 9 : 10 @ 5 : 6
~ private final Map mapByUUID = Maps.newHashMap();
-> CHANGE 63 : 64 @ 65 : 66
+> CHANGE 45 : 46 @ 45 : 46
~ public AttributeModifier getModifier(EaglercraftUUID uuid) {
-> CHANGE 75 : 76 @ 77 : 78
+> CHANGE 12 : 13 @ 12 : 13
~ Set object = (Set) this.mapByName.get(attributemodifier.getName());
-> CHANGE 114 : 115 @ 116 : 117
+> CHANGE 39 : 40 @ 39 : 40
~ for (AttributeModifier attributemodifier : (List) Lists.newArrayList(collection)) {
diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java
index 4d70747e..ef03c0f3 100644
--- a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java
+++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java
@@ -7,23 +7,23 @@
> DELETE 2 @ 2 : 5
-> CHANGE 3 : 4 @ 6 : 9
+> CHANGE 1 : 2 @ 4 : 7
~
-> DELETE 6 @ 11 : 12
+> DELETE 3 @ 5 : 6
-> DELETE 8 @ 14 : 16
+> DELETE 2 @ 3 : 5
-> DELETE 9 @ 17 : 18
+> DELETE 1 @ 3 : 4
-> DELETE 11 @ 20 : 23
+> DELETE 2 @ 3 : 6
-> DELETE 13 @ 25 : 26
+> DELETE 2 @ 5 : 6
-> DELETE 15 @ 28 : 30
+> DELETE 2 @ 3 : 5
-> CHANGE 86 : 91 @ 101 : 108
+> CHANGE 71 : 76 @ 73 : 80
~ float f = MathHelper.cos(this.animTime * 3.1415927F * 2.0F);
~ float f1 = MathHelper.cos(this.prevAnimTime * 3.1415927F * 2.0F);
@@ -31,7 +31,7 @@
~ this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.enderdragon.wings", 5.0F,
~ 0.8F + this.rand.nextFloat() * 0.3F, false);
-> CHANGE 129 : 142 @ 146 : 240
+> CHANGE 43 : 56 @ 45 : 139
~ if (this.newPosRotationIncrements > 0) {
~ double d10 = this.posX + (this.newPosX - this.posX) / (double) this.newPosRotationIncrements;
@@ -47,26 +47,26 @@
~ this.setPosition(d10, d0, d1);
~ this.setRotation(this.rotationYaw, this.rotationPitch);
-> DELETE 171 @ 269 : 279
+> DELETE 42 @ 123 : 133
-> DELETE 208 @ 316 : 321
+> DELETE 37 @ 47 : 52
-> DELETE 215 @ 328 : 333
+> DELETE 7 @ 12 : 17
-> CHANGE 228 : 229 @ 346 : 347
+> CHANGE 13 : 14 @ 18 : 19
~ for (EntityEnderCrystal entityendercrystal1 : (List) list) {
-> DELETE 241 @ 359 : 421
+> DELETE 13 @ 13 : 75
-> DELETE 245 @ 425 : 466
+> DELETE 4 @ 66 : 107
-> DELETE 290 @ 511 : 529
+> DELETE 45 @ 86 : 104
-> DELETE 292 @ 531 : 534
+> DELETE 2 @ 20 : 23
-> DELETE 293 @ 535 : 547
+> DELETE 1 @ 4 : 16
-> DELETE 295 @ 549 : 592
+> DELETE 2 @ 14 : 57
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java
index 47be141b..8f3cfa34 100644
--- a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java
+++ b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java
@@ -10,24 +10,24 @@
+ import java.util.List;
+
-> CHANGE 6 : 7 @ 4 : 5
+> CHANGE 4 : 5 @ 2 : 3
~
-> DELETE 10 @ 8 : 9
+> DELETE 4 @ 4 : 5
-> DELETE 14 @ 13 : 21
+> DELETE 4 @ 5 : 13
-> DELETE 22 @ 29 : 30
+> DELETE 8 @ 16 : 17
-> DELETE 23 @ 31 : 32
+> DELETE 1 @ 2 : 3
-> DELETE 51 @ 60 : 69
+> DELETE 28 @ 29 : 38
-> DELETE 86 @ 104 : 111
+> DELETE 35 @ 44 : 51
-> DELETE 87 @ 112 : 126
+> DELETE 1 @ 8 : 22
-> DELETE 398 @ 437 : 444
+> DELETE 311 @ 325 : 332
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java
index 1d018e25..f24b247c 100644
--- a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java
+++ b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 7
-> DELETE 3 @ 8 : 11
+> DELETE 1 @ 6 : 9
-> DELETE 16 @ 24 : 43
+> DELETE 13 @ 16 : 35
-> DELETE 35 @ 62 : 69
+> DELETE 19 @ 38 : 45
-> CHANGE 39 : 40 @ 73 : 85
+> CHANGE 4 : 5 @ 11 : 23
~ this.worldObj.setLastLightningBolt(2);
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java
index 352401e9..b11ddf5f 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java
@@ -9,24 +9,24 @@
~
-> DELETE 7 @ 7 : 8
+> DELETE 4 @ 4 : 5
-> DELETE 8 @ 9 : 14
+> DELETE 1 @ 2 : 7
-> DELETE 12 @ 18 : 19
+> DELETE 4 @ 9 : 10
-> DELETE 13 @ 20 : 21
+> DELETE 1 @ 2 : 3
-> DELETE 16 @ 24 : 25
+> DELETE 3 @ 4 : 5
-> DELETE 264 @ 273 : 336
+> DELETE 248 @ 249 : 312
-> DELETE 269 @ 341 : 368
+> DELETE 5 @ 68 : 95
-> CHANGE 270 : 271 @ 369 : 424
+> CHANGE 1 : 2 @ 28 : 83
~ return false;
-> DELETE 283 @ 436 : 476
+> DELETE 13 @ 67 : 107
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java
index 57611e45..2e14f187 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java
@@ -7,26 +7,26 @@
> DELETE 2 @ 2 : 3
-> DELETE 8 @ 9 : 11
+> DELETE 6 @ 7 : 9
-> DELETE 11 @ 14 : 16
+> DELETE 3 @ 5 : 7
-> DELETE 73 @ 78 : 111
+> DELETE 62 @ 64 : 97
-> CHANGE 182 : 183 @ 220 : 221
+> CHANGE 109 : 110 @ 142 : 143
~ if (this.isBoatEmpty) {
-> CHANGE 276 : 277 @ 314 : 328
+> CHANGE 94 : 95 @ 94 : 108
~ if (!(this.isCollidedHorizontally && d9 > 0.2975D)) {
-> DELETE 301 @ 352 : 369
+> DELETE 25 @ 38 : 55
-> CHANGE 320 : 321 @ 388 : 398
+> CHANGE 19 : 20 @ 36 : 46
~ return true;
-> DELETE 327 @ 404 : 417
+> DELETE 7 @ 16 : 29
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java
index 7af5040c..74c46c65 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java
@@ -7,6 +7,6 @@
> DELETE 6 @ 6 : 7
-> DELETE 61 @ 62 : 79
+> DELETE 55 @ 56 : 73
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java
index bebc520b..220a4981 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java
@@ -7,10 +7,10 @@
> DELETE 3 @ 3 : 6
-> DELETE 108 @ 111 : 121
+> DELETE 105 @ 108 : 118
-> DELETE 109 @ 122 : 131
+> DELETE 1 @ 11 : 20
-> DELETE 124 @ 146 : 160
+> DELETE 15 @ 24 : 38
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java
index 7964db99..28523168 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java
@@ -7,10 +7,10 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 5
+> DELETE 1 @ 2 : 3
-> DELETE 4 @ 6 : 7
+> DELETE 1 @ 2 : 3
-> DELETE 42 @ 45 : 74
+> DELETE 38 @ 39 : 68
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java
index f4b55b3e..ec70b0d0 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java
@@ -7,10 +7,10 @@
> DELETE 3 @ 3 : 4
-> DELETE 4 @ 5 : 6
+> DELETE 1 @ 2 : 3
-> DELETE 33 @ 35 : 38
+> DELETE 29 @ 30 : 33
-> DELETE 34 @ 39 : 48
+> DELETE 1 @ 4 : 13
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java
index a2905057..4dcca6b3 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java
@@ -7,28 +7,28 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 7 @ 4
+> INSERT 1 : 5 @ 2
+ import java.util.List;
+
+ import com.google.common.collect.Lists;
+
-> DELETE 9 @ 6 : 8
+> DELETE 6 @ 2 : 4
-> DELETE 14 @ 13 : 15
+> DELETE 5 @ 7 : 9
-> DELETE 15 @ 16 : 17
+> DELETE 1 @ 3 : 4
-> DELETE 17 @ 19 : 20
+> DELETE 2 @ 3 : 4
-> DELETE 72 @ 75 : 78
+> DELETE 55 @ 56 : 59
-> DELETE 80 @ 86 : 101
+> DELETE 8 @ 11 : 26
-> DELETE 81 @ 102 : 135
+> DELETE 1 @ 16 : 49
-> CHANGE 94 : 95 @ 148 : 149
+> CHANGE 13 : 14 @ 46 : 47
~ for (Entity entity : (List) arraylist) {
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java
index 26d65fad..760f5fb1 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java
@@ -9,9 +9,9 @@
~ if (this.fireworkAge % 2 < 2) {
-> DELETE 105 @ 105 : 110
+> DELETE 6 @ 6 : 11
-> CHANGE 108 : 109 @ 113 : 114
+> CHANGE 3 : 4 @ 8 : 9
~ if (b0 == 17) {
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java
index 6bd3d952..64df19a7 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java
@@ -10,20 +10,20 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 9 @ 7 : 8
+> DELETE 7 @ 5 : 6
-> DELETE 11 @ 10 : 11
+> DELETE 2 @ 3 : 4
-> DELETE 16 @ 16 : 18
+> DELETE 5 @ 6 : 8
-> DELETE 84 @ 86 : 90
+> DELETE 68 @ 70 : 74
-> DELETE 105 @ 111 : 114
+> DELETE 21 @ 25 : 28
-> DELETE 241 @ 250 : 259
+> DELETE 136 @ 139 : 148
-> DELETE 242 @ 260 : 295
+> DELETE 1 @ 10 : 45
-> DELETE 253 @ 306 : 314
+> DELETE 11 @ 46 : 54
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java
index eda1ae5c..9a5336d8 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java
@@ -7,6 +7,6 @@
> DELETE 41 @ 41 : 46
-> DELETE 167 @ 172 : 185
+> DELETE 126 @ 131 : 144
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java
index 8604f5cc..4a71f851 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java
@@ -7,23 +7,23 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Maps;
+
-> DELETE 14 @ 12 : 19
+> DELETE 11 @ 8 : 15
-> DELETE 18 @ 23 : 24
+> DELETE 4 @ 11 : 12
-> DELETE 29 @ 35 : 36
+> DELETE 11 @ 12 : 13
-> CHANGE 114 : 115 @ 121 : 148
+> CHANGE 85 : 86 @ 86 : 113
~ return true;
-> CHANGE 157 : 168 @ 190 : 245
+> CHANGE 43 : 54 @ 69 : 124
~ if (this.turnProgress > 0) {
~ double d4 = this.posX + (this.minecartX - this.posX) / (double) this.turnProgress;
@@ -37,14 +37,14 @@
~ this.setPosition(d4, d5, d6);
~ this.setRotation(this.rotationYaw, this.rotationPitch);
-> CHANGE 169 : 170 @ 246 : 286
+> CHANGE 12 : 13 @ 56 : 96
~ this.setPosition(this.posX, this.posY, this.posZ);
-> DELETE 171 @ 287 : 304
+> DELETE 2 @ 41 : 58
-> DELETE 522 @ 655 : 665
+> DELETE 351 @ 368 : 378
-> DELETE 523 @ 666 : 733
+> DELETE 1 @ 11 : 78
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java
index 4b31f10c..17045d7f 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java
@@ -7,6 +7,6 @@
> DELETE 2 @ 2 : 3
-> DELETE 144 @ 145 : 149
+> DELETE 142 @ 143 : 147
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java
index 3f565a45..6a6277f1 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java
@@ -7,6 +7,6 @@
> DELETE 3 @ 3 : 4
-> DELETE 22 @ 23 : 27
+> DELETE 19 @ 20 : 24
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java
index 008836ca..97f97741 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java
@@ -9,10 +9,10 @@
+
-> DELETE 5 @ 4 : 7
+> DELETE 2 @ 1 : 4
-> DELETE 49 @ 51 : 55
+> DELETE 44 @ 47 : 51
-> DELETE 84 @ 90 : 111
+> DELETE 35 @ 39 : 60
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java
index 5f3124ba..bd799547 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java
@@ -7,10 +7,10 @@
> DELETE 5 @ 5 : 6
-> DELETE 80 @ 81 : 86
+> DELETE 75 @ 76 : 81
-> DELETE 81 @ 87 : 92
+> DELETE 1 @ 6 : 11
-> DELETE 110 @ 121 : 128
+> DELETE 29 @ 34 : 41
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java
index a620c082..6e6896b8 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java
index 3a572e2c..8f3adcab 100644
--- a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java
+++ b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java
@@ -7,6 +7,6 @@
> DELETE 61 @ 61 : 64
-> DELETE 69 @ 72 : 77
+> DELETE 8 @ 11 : 16
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java
index e5ca3985..684ed895 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java
@@ -7,20 +7,20 @@
> DELETE 4 @ 4 : 14
-> DELETE 6 @ 16 : 17
+> DELETE 2 @ 12 : 13
-> DELETE 8 @ 19 : 20
+> DELETE 2 @ 3 : 4
-> DELETE 18 @ 30 : 37
+> DELETE 10 @ 11 : 18
-> CHANGE 57 : 61 @ 76 : 81
+> CHANGE 39 : 43 @ 46 : 51
~ if (this.rand.nextInt(24) == 0 && !this.isSilent()) {
~ this.worldObj.playSound(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire",
~ 1.0F + this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F, false);
~ }
-> CHANGE 62 : 67 @ 82 : 89
+> CHANGE 5 : 10 @ 6 : 13
~ for (int i = 0; i < 2; ++i) {
~ this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE,
@@ -28,6 +28,6 @@
~ this.posY + this.rand.nextDouble() * (double) this.height,
~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, 0.0D, 0.0D, 0.0D, new int[0]);
-> DELETE 134 @ 156 : 234
+> DELETE 72 @ 74 : 152
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java
index 0a084001..63a15164 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java
@@ -7,14 +7,14 @@
> DELETE 4 @ 4 : 13
-> DELETE 5 @ 14 : 17
+> DELETE 1 @ 10 : 13
-> DELETE 22 @ 34 : 43
+> DELETE 17 @ 20 : 29
-> DELETE 96 @ 117 : 118
+> DELETE 74 @ 83 : 84
-> DELETE 162 @ 184 : 189
+> DELETE 66 @ 67 : 72
-> DELETE 167 @ 194 : 205
+> DELETE 5 @ 10 : 21
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java
index 80763c4a..a91d474d 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java
@@ -7,35 +7,35 @@
> DELETE 2 @ 2 : 7
-> CHANGE 3 : 7 @ 8 : 9
+> CHANGE 1 : 5 @ 6 : 7
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
~ import com.google.common.collect.Sets;
~
-> DELETE 8 @ 10 : 11
+> DELETE 5 @ 2 : 3
-> DELETE 12 @ 15 : 23
+> DELETE 4 @ 5 : 13
-> DELETE 13 @ 24 : 27
+> DELETE 1 @ 9 : 12
-> DELETE 14 @ 28 : 29
+> DELETE 1 @ 4 : 5
-> DELETE 17 @ 32 : 33
+> DELETE 3 @ 4 : 5
-> DELETE 23 @ 39 : 40
+> DELETE 6 @ 7 : 8
-> CHANGE 27 : 29 @ 44 : 45
+> CHANGE 4 : 6 @ 5 : 6
~ private static final EaglercraftUUID attackingSpeedBoostModifierUUID = EaglercraftUUID
~ .fromString("020E0DFB-87AE-4653-9556-831010E291A0");
-> DELETE 38 @ 54 : 69
+> DELETE 11 @ 10 : 25
-> DELETE 76 @ 107 : 123
+> DELETE 38 @ 53 : 69
-> CHANGE 81 : 88 @ 128 : 137
+> CHANGE 5 : 12 @ 21 : 30
~ for (int i = 0; i < 2; ++i) {
~ this.worldObj.spawnParticle(EnumParticleTypes.PORTAL,
@@ -45,18 +45,18 @@
~ (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(),
~ (this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]);
-> DELETE 89 @ 138 : 139
+> DELETE 8 @ 10 : 11
-> DELETE 232 @ 282 : 285
+> DELETE 143 @ 144 : 147
-> CHANGE 234 : 235 @ 287 : 293
+> CHANGE 2 : 3 @ 5 : 11
~ this.isAggressive = true;
-> CHANGE 267 : 268 @ 325 : 326
+> CHANGE 33 : 34 @ 38 : 39
~ public static void bootstrap() {
-> DELETE 284 @ 342 : 493
+> DELETE 17 @ 17 : 168
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java
index 164676b3..3d96b90a 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java
@@ -7,9 +7,9 @@
> DELETE 5 @ 5 : 13
-> DELETE 20 @ 28 : 35
+> DELETE 15 @ 23 : 30
-> CHANGE 84 : 91 @ 99 : 116
+> CHANGE 64 : 71 @ 71 : 88
~ for (int i = 0; i < 2; ++i) {
~ this.worldObj.spawnParticle(EnumParticleTypes.PORTAL,
@@ -19,6 +19,6 @@
~ (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(),
~ (this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]);
-> DELETE 92 @ 117 : 118
+> DELETE 8 @ 18 : 19
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java
index 25ba236f..e37ce750 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java
@@ -7,20 +7,20 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 5
+> DELETE 1 @ 2 : 3
-> DELETE 4 @ 6 : 10
+> DELETE 1 @ 2 : 6
-> DELETE 5 @ 11 : 12
+> DELETE 1 @ 5 : 6
-> DELETE 9 @ 16 : 18
+> DELETE 4 @ 5 : 7
-> DELETE 10 @ 19 : 21
+> DELETE 1 @ 3 : 5
-> DELETE 21 @ 32 : 37
+> DELETE 11 @ 13 : 18
-> DELETE 35 @ 51 : 59
+> DELETE 14 @ 19 : 27
-> DELETE 120 @ 144 : 311
+> DELETE 85 @ 93 : 260
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java
index 77195d43..c7978da5 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java
@@ -7,33 +7,33 @@
> DELETE 2 @ 2 : 3
-> DELETE 6 @ 7 : 19
+> DELETE 4 @ 5 : 17
-> DELETE 12 @ 25 : 30
+> DELETE 6 @ 18 : 23
-> DELETE 15 @ 33 : 34
+> DELETE 3 @ 8 : 9
-> DELETE 18 @ 37 : 38
+> DELETE 3 @ 4 : 5
-> DELETE 29 @ 49 : 50
+> DELETE 11 @ 12 : 13
-> DELETE 34 @ 55 : 67
+> DELETE 5 @ 6 : 18
-> DELETE 55 @ 88 : 92
+> DELETE 21 @ 33 : 37
-> DELETE 79 @ 116 : 120
+> DELETE 24 @ 28 : 32
-> DELETE 95 @ 136 : 137
+> DELETE 16 @ 20 : 21
-> DELETE 104 @ 146 : 150
+> DELETE 9 @ 10 : 14
-> CHANGE 111 : 112 @ 157 : 158
+> CHANGE 7 : 8 @ 11 : 12
~ } else {
-> DELETE 123 @ 169 : 171
+> DELETE 12 @ 12 : 14
-> CHANGE 173 : 178 @ 221 : 239
+> CHANGE 50 : 55 @ 52 : 70
~ this.field_175484_c = this.field_175482_b;
~ if (!this.isInWater()) {
@@ -41,7 +41,7 @@
~ if (this.motionY > 0.0D && this.field_175480_bp && !this.isSilent()) {
~ this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.guardian.flop", 1.0F, 1.0F, false);
-> CHANGE 180 : 185 @ 241 : 247
+> CHANGE 7 : 12 @ 20 : 26
~ this.field_175480_bp = this.motionY < 0.0D
~ && this.worldObj.isBlockNormalCube((new BlockPos(this)).down(), false);
@@ -49,17 +49,17 @@
~ if (this.field_175483_bk < 0.5F) {
~ this.field_175483_bk = 4.0F;
-> CHANGE 186 : 187 @ 248 : 249
+> CHANGE 6 : 7 @ 7 : 8
~ this.field_175483_bk += (0.5F - this.field_175483_bk) * 0.1F;
-> INSERT 188 : 191 @ 250
+> INSERT 2 : 5 @ 2
+ } else {
+ this.field_175483_bk += (0.125F - this.field_175483_bk) * 0.2F;
+ }
-> CHANGE 192 : 201 @ 251 : 253
+> CHANGE 4 : 13 @ 1 : 3
~ this.field_175482_b += this.field_175483_bk;
~ this.field_175486_bm = this.field_175485_bl;
@@ -71,7 +71,7 @@
~ this.field_175485_bl += (1.0F - this.field_175485_bl) * 0.06F;
~ }
-> CHANGE 202 : 211 @ 254 : 261
+> CHANGE 10 : 19 @ 3 : 10
~ if (this.func_175472_n() && this.isInWater()) {
~ Vec3 vec3 = this.getLook(0.0F);
@@ -83,18 +83,18 @@
~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width - vec3.zCoord * 1.5D, 0.0D,
~ 0.0D, 0.0D, new int[0]);
-> INSERT 212 : 213 @ 262
+> INSERT 10 : 11 @ 8
+ }
-> CHANGE 214 : 218 @ 263 : 267
+> CHANGE 2 : 6 @ 1 : 5
~ if (this.hasTargetedEntity()) {
~ if (this.field_175479_bo < this.func_175464_ck()) {
~ ++this.field_175479_bo;
~ }
-> CHANGE 219 : 231 @ 268 : 282
+> CHANGE 5 : 17 @ 5 : 19
~ EntityLivingBase entitylivingbase = this.getTargetedEntity();
~ if (entitylivingbase != null) {
@@ -109,7 +109,7 @@
~ d2 = d2 / d3;
~ double d4 = this.rand.nextDouble();
-> CHANGE 232 : 237 @ 283 : 289
+> CHANGE 13 : 18 @ 15 : 21
~ while (d4 < d3) {
~ d4 += 1.8D - d5 + this.rand.nextDouble() * (1.7D - d5);
@@ -117,10 +117,10 @@
~ this.posY + d1 * d4 + (double) this.getEyeHeight(), this.posZ + d2 * d4, 0.0D, 0.0D, 0.0D,
~ new int[0]);
-> DELETE 271 @ 323 : 356
+> DELETE 39 @ 40 : 73
-> DELETE 319 @ 404 : 405
+> DELETE 48 @ 81 : 82
-> DELETE 346 @ 432 : 568
+> DELETE 27 @ 28 : 164
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java
index 2e9d84c7..ef26d3fb 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java
@@ -7,22 +7,22 @@
> DELETE 2 @ 2 : 3
-> DELETE 7 @ 8 : 10
+> DELETE 5 @ 6 : 8
-> DELETE 9 @ 12 : 26
+> DELETE 2 @ 4 : 18
-> DELETE 14 @ 31 : 32
+> DELETE 5 @ 19 : 20
-> DELETE 18 @ 36 : 37
+> DELETE 4 @ 5 : 6
-> DELETE 22 @ 41 : 42
+> DELETE 4 @ 5 : 6
-> DELETE 28 @ 48 : 61
+> DELETE 6 @ 7 : 20
-> DELETE 35 @ 68 : 83
+> DELETE 7 @ 20 : 35
-> DELETE 122 @ 170 : 174
+> DELETE 87 @ 102 : 106
-> DELETE 176 @ 228 : 275
+> DELETE 54 @ 58 : 105
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java
index 9d1fcec8..31da3d8b 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java
@@ -7,6 +7,6 @@
> DELETE 7 @ 7 : 8
-> DELETE 30 @ 31 : 39
+> DELETE 23 @ 24 : 32
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java
index cd663130..e22a8490 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java
@@ -10,26 +10,26 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> DELETE 5 @ 4 : 5
+> DELETE 3 @ 2 : 3
-> DELETE 8 @ 8 : 10
+> DELETE 3 @ 4 : 6
-> DELETE 10 @ 12 : 13
+> DELETE 2 @ 4 : 5
-> CHANGE 20 : 21 @ 23 : 24
+> CHANGE 10 : 11 @ 11 : 12
~ private static final EaglercraftUUID ATTACK_SPEED_BOOST_MODIFIER_UUID = EaglercraftUUID
-> CHANGE 26 : 27 @ 29 : 30
+> CHANGE 6 : 7 @ 6 : 7
~ private EaglercraftUUID angerTargetUUID;
-> DELETE 41 @ 44 : 49
+> DELETE 15 @ 15 : 20
-> CHANGE 105 : 106 @ 113 : 114
+> CHANGE 64 : 65 @ 69 : 70
~ this.angerTargetUUID = EaglercraftUUID.fromString(s);
-> DELETE 188 @ 196 : 219
+> DELETE 83 @ 83 : 106
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java
index 26f4bf6b..1bd155bc 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java
@@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 6
+> DELETE 1 @ 2 : 4
-> DELETE 5 @ 8 : 15
+> DELETE 2 @ 4 : 11
-> DELETE 9 @ 19 : 22
+> DELETE 4 @ 11 : 14
-> DELETE 12 @ 25 : 26
+> DELETE 3 @ 6 : 7
-> DELETE 16 @ 30 : 36
+> DELETE 4 @ 5 : 11
-> DELETE 49 @ 69 : 81
+> DELETE 33 @ 39 : 51
-> DELETE 84 @ 116 : 225
+> DELETE 35 @ 47 : 156
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java
index e9218ae2..0eff0364 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java
@@ -9,24 +9,24 @@
+
-> DELETE 14 @ 13 : 28
+> DELETE 11 @ 10 : 25
-> DELETE 28 @ 42 : 43
+> DELETE 14 @ 29 : 30
-> DELETE 30 @ 45 : 48
+> DELETE 2 @ 3 : 6
-> DELETE 33 @ 51 : 65
+> DELETE 3 @ 6 : 20
-> DELETE 78 @ 110 : 124
+> DELETE 45 @ 59 : 73
-> CHANGE 79 : 80 @ 125 : 135
+> CHANGE 1 : 2 @ 15 : 25
~ if (this.getSkeletonType() == 1) {
-> DELETE 156 @ 211 : 221
+> DELETE 77 @ 86 : 96
-> DELETE 171 @ 236 : 245
+> DELETE 15 @ 25 : 34
-> DELETE 227 @ 301 : 309
+> DELETE 56 @ 65 : 73
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java
index 7f89bd0b..bea441ac 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java
@@ -7,14 +7,14 @@
> DELETE 7 @ 7 : 13
-> DELETE 11 @ 17 : 18
+> DELETE 4 @ 10 : 11
-> DELETE 30 @ 37 : 44
+> DELETE 19 @ 20 : 27
-> DELETE 78 @ 92 : 97
+> DELETE 48 @ 55 : 60
-> DELETE 137 @ 156 : 183
+> DELETE 59 @ 64 : 91
-> DELETE 246 @ 292 : 450
+> DELETE 109 @ 136 : 294
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java
index 21ef55d5..210bd86a 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 4
-> DELETE 5 @ 7 : 15
+> DELETE 3 @ 5 : 13
-> DELETE 6 @ 16 : 17
+> DELETE 1 @ 9 : 10
-> DELETE 8 @ 19 : 22
+> DELETE 2 @ 3 : 6
-> DELETE 15 @ 29 : 36
+> DELETE 7 @ 10 : 17
-> DELETE 23 @ 44 : 75
+> DELETE 8 @ 15 : 46
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java
index 3d66f4c1..4db7a4b2 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java
@@ -10,21 +10,21 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 5 @ 4 : 6
+> DELETE 3 @ 2 : 4
-> DELETE 8 @ 9 : 21
+> DELETE 3 @ 5 : 17
-> DELETE 10 @ 23 : 25
+> DELETE 2 @ 14 : 16
-> DELETE 21 @ 36 : 46
+> DELETE 11 @ 13 : 23
-> DELETE 27 @ 52 : 56
+> DELETE 6 @ 16 : 20
-> DELETE 32 @ 61 : 69
+> DELETE 5 @ 9 : 17
-> DELETE 129 @ 166 : 197
+> DELETE 97 @ 105 : 136
-> CHANGE 132 : 133 @ 200 : 201
+> CHANGE 3 : 4 @ 34 : 35
~ public void func_111104_a(EaglercraftRandom rand) {
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java
index 6102d0f2..f60a2389 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java
@@ -10,21 +10,21 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> DELETE 7 @ 8 : 15
+> DELETE 5 @ 6 : 13
-> DELETE 8 @ 16 : 19
+> DELETE 1 @ 8 : 11
-> DELETE 11 @ 22 : 23
+> DELETE 3 @ 6 : 7
-> DELETE 12 @ 24 : 25
+> DELETE 1 @ 2 : 3
-> CHANGE 18 : 20 @ 31 : 32
+> CHANGE 6 : 8 @ 7 : 8
~ private static final EaglercraftUUID MODIFIER_UUID = EaglercraftUUID
~ .fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E");
-> DELETE 29 @ 41 : 48
+> DELETE 11 @ 10 : 17
-> DELETE 62 @ 81 : 138
+> DELETE 33 @ 40 : 97
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java
index df8a0c15..1e1751bd 100644
--- a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java
+++ b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java
@@ -10,39 +10,39 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> DELETE 13 @ 12 : 22
+> DELETE 9 @ 8 : 18
-> DELETE 15 @ 24 : 25
+> DELETE 2 @ 12 : 13
-> DELETE 16 @ 26 : 30
+> DELETE 1 @ 2 : 6
-> DELETE 24 @ 38 : 39
+> DELETE 8 @ 12 : 13
-> CHANGE 37 : 39 @ 52 : 53
+> CHANGE 13 : 15 @ 14 : 15
~ private static final EaglercraftUUID babySpeedBoostUUID = EaglercraftUUID
~ .fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
-> DELETE 41 @ 55 : 56
+> DELETE 4 @ 3 : 4
-> DELETE 48 @ 63 : 71
+> DELETE 7 @ 8 : 16
-> DELETE 51 @ 74 : 84
+> DELETE 3 @ 11 : 21
-> DELETE 80 @ 113 : 125
+> DELETE 29 @ 39 : 51
-> DELETE 94 @ 139 : 147
+> DELETE 14 @ 26 : 34
-> DELETE 105 @ 158 : 190
+> DELETE 11 @ 19 : 51
-> DELETE 158 @ 243 : 255
+> DELETE 53 @ 85 : 97
-> DELETE 248 @ 345 : 347
+> DELETE 90 @ 102 : 104
-> DELETE 334 @ 433 : 434
+> DELETE 86 @ 88 : 89
-> DELETE 358 @ 458 : 459
+> DELETE 24 @ 25 : 26
-> DELETE 375 @ 476 : 480
+> DELETE 17 @ 18 : 22
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java
index 75f2f1f2..aaa84d28 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java
@@ -9,10 +9,10 @@
+
-> DELETE 7 @ 6 : 7
+> DELETE 4 @ 3 : 4
-> DELETE 10 @ 10 : 11
+> DELETE 3 @ 4 : 5
-> DELETE 151 @ 152 : 164
+> DELETE 141 @ 142 : 154
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java
index 4eef49b6..ce57a219 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java
@@ -7,8 +7,8 @@
> DELETE 6 @ 6 : 15
-> DELETE 28 @ 37 : 45
+> DELETE 22 @ 31 : 39
-> DELETE 56 @ 73 : 79
+> DELETE 28 @ 36 : 42
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java
index 16ac9ede..68d2b34a 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java
@@ -7,8 +7,8 @@
> DELETE 5 @ 5 : 14
-> DELETE 9 @ 18 : 19
+> DELETE 4 @ 13 : 14
-> DELETE 16 @ 26 : 35
+> DELETE 7 @ 8 : 17
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java
index 1880ec5d..e66e08c1 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java
@@ -9,47 +9,47 @@
+
-> DELETE 11 @ 10 : 18
+> DELETE 8 @ 7 : 15
-> DELETE 14 @ 21 : 22
+> DELETE 3 @ 11 : 12
-> DELETE 24 @ 32 : 33
+> DELETE 10 @ 11 : 12
-> DELETE 25 @ 34 : 35
+> DELETE 1 @ 2 : 3
-> DELETE 84 @ 94 : 103
+> DELETE 59 @ 60 : 69
-> CHANGE 296 : 297 @ 315 : 319
+> CHANGE 212 : 213 @ 221 : 225
~
-> DELETE 358 @ 380 : 386
+> DELETE 62 @ 65 : 71
-> DELETE 573 @ 601 : 606
+> DELETE 215 @ 221 : 226
-> DELETE 719 @ 752 : 755
+> DELETE 146 @ 151 : 154
-> DELETE 753 @ 789 : 797
+> DELETE 34 @ 37 : 45
-> DELETE 759 @ 803 : 829
+> DELETE 6 @ 14 : 40
-> CHANGE 763 : 764 @ 833 : 834
+> CHANGE 4 : 5 @ 30 : 31
~ if (this.dataWatcher.hasObjectChanged()) {
-> DELETE 773 @ 843 : 848
+> DELETE 10 @ 10 : 15
-> DELETE 829 @ 904 : 908
+> DELETE 56 @ 61 : 65
-> DELETE 854 @ 933 : 937
+> DELETE 25 @ 29 : 33
-> DELETE 872 @ 955 : 962
+> DELETE 18 @ 22 : 29
-> DELETE 873 @ 963 : 964
+> DELETE 1 @ 8 : 9
-> DELETE 921 @ 1012 : 1017
+> DELETE 48 @ 49 : 54
-> CHANGE 991 : 992 @ 1087 : 1095
+> CHANGE 70 : 71 @ 75 : 83
~ String s = nbttagcompound.getString("OwnerUUID");
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java
index 1825dd46..5d0a8017 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java
@@ -7,8 +7,8 @@
> DELETE 3 @ 3 : 5
-> DELETE 37 @ 39 : 47
+> DELETE 34 @ 36 : 44
-> DELETE 38 @ 48 : 59
+> DELETE 1 @ 9 : 20
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java
index a77d90f7..497639df 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java
@@ -7,20 +7,20 @@
> DELETE 2 @ 2 : 3
-> DELETE 8 @ 9 : 24
+> DELETE 6 @ 7 : 22
-> DELETE 13 @ 29 : 30
+> DELETE 5 @ 20 : 21
-> DELETE 20 @ 37 : 39
+> DELETE 7 @ 8 : 10
-> DELETE 24 @ 43 : 55
+> DELETE 4 @ 6 : 18
-> DELETE 31 @ 62 : 82
+> DELETE 7 @ 19 : 39
-> DELETE 84 @ 135 : 136
+> DELETE 53 @ 73 : 74
-> DELETE 91 @ 143 : 179
+> DELETE 7 @ 8 : 44
-> DELETE 158 @ 246 : 258
+> DELETE 67 @ 103 : 115
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java
index cd47428f..c937c989 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java
@@ -7,20 +7,20 @@
> DELETE 5 @ 5 : 14
-> DELETE 6 @ 15 : 17
+> DELETE 1 @ 10 : 12
-> DELETE 11 @ 22 : 23
+> DELETE 5 @ 7 : 8
-> DELETE 16 @ 28 : 29
+> DELETE 5 @ 6 : 7
-> DELETE 20 @ 33 : 44
+> DELETE 4 @ 5 : 16
-> DELETE 64 @ 88 : 100
+> DELETE 44 @ 55 : 67
-> DELETE 99 @ 135 : 144
+> DELETE 35 @ 47 : 56
-> DELETE 100 @ 145 : 148
+> DELETE 1 @ 10 : 13
-> DELETE 117 @ 165 : 169
+> DELETE 17 @ 20 : 24
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java
index ee559149..4633ef7f 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java
@@ -7,36 +7,36 @@
> DELETE 3 @ 3 : 5
-> DELETE 5 @ 7 : 8
+> DELETE 2 @ 4 : 5
-> DELETE 7 @ 10 : 25
+> DELETE 2 @ 3 : 18
-> DELETE 13 @ 31 : 34
+> DELETE 6 @ 21 : 24
-> DELETE 15 @ 36 : 39
+> DELETE 2 @ 5 : 8
-> DELETE 19 @ 43 : 44
+> DELETE 4 @ 7 : 8
-> DELETE 31 @ 56 : 72
+> DELETE 12 @ 13 : 29
-> DELETE 33 @ 74 : 79
+> DELETE 2 @ 18 : 23
-> DELETE 42 @ 88 : 93
+> DELETE 9 @ 14 : 19
-> DELETE 49 @ 100 : 101
+> DELETE 7 @ 12 : 13
-> DELETE 71 @ 123 : 178
+> DELETE 22 @ 23 : 78
-> DELETE 74 @ 181 : 203
+> DELETE 3 @ 58 : 80
-> DELETE 77 @ 206 : 210
+> DELETE 3 @ 25 : 29
-> DELETE 183 @ 316 : 327
+> DELETE 106 @ 110 : 121
-> DELETE 206 @ 350 : 354
+> DELETE 23 @ 34 : 38
-> DELETE 230 @ 378 : 491
+> DELETE 24 @ 28 : 141
-> DELETE 263 @ 524 : 571
+> DELETE 33 @ 146 : 193
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java
index 56fab264..367525ac 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java
@@ -7,30 +7,30 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 7 @ 4 : 5
+> CHANGE 1 : 5 @ 2 : 3
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
~ import com.google.common.collect.Maps;
~
-> DELETE 11 @ 9 : 20
+> DELETE 8 @ 5 : 16
-> DELETE 21 @ 30 : 31
+> DELETE 10 @ 21 : 22
-> DELETE 34 @ 44 : 45
+> DELETE 13 @ 14 : 15
-> DELETE 42 @ 53 : 63
+> DELETE 8 @ 9 : 19
-> DELETE 46 @ 67 : 72
+> DELETE 4 @ 14 : 19
-> CHANGE 47 : 48 @ 73 : 77
+> CHANGE 1 : 2 @ 6 : 10
~ this.sheepTimer = Math.max(0, this.sheepTimer - 1);
-> DELETE 112 @ 141 : 155
+> DELETE 65 @ 68 : 82
-> CHANGE 170 : 171 @ 213 : 214
+> CHANGE 58 : 59 @ 72 : 73
~ public static EnumDyeColor getRandomSheepColor(EaglercraftRandom random) {
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java
index 1028cd79..143271ee 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java
@@ -7,16 +7,16 @@
> DELETE 4 @ 4 : 6
-> DELETE 32 @ 34 : 35
+> DELETE 28 @ 30 : 31
-> CHANGE 89 : 90 @ 92 : 102
+> CHANGE 57 : 58 @ 58 : 68
~ this.squidRotation = 6.2831855F;
-> DELETE 108 @ 120 : 126
+> DELETE 19 @ 28 : 34
-> DELETE 117 @ 135 : 142
+> DELETE 9 @ 15 : 22
-> DELETE 149 @ 174 : 199
+> DELETE 32 @ 39 : 64
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java
index a5fdcd59..4ca1582a 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java
@@ -10,24 +10,24 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> DELETE 6 @ 5 : 8
+> DELETE 4 @ 3 : 6
-> DELETE 8 @ 10 : 12
+> DELETE 2 @ 5 : 7
-> DELETE 12 @ 16 : 17
+> DELETE 4 @ 6 : 7
-> CHANGE 37 : 38 @ 42 : 50
+> CHANGE 25 : 26 @ 26 : 34
~ String s = nbttagcompound.getString("OwnerUUID");
-> DELETE 42 @ 54 : 56
+> DELETE 5 @ 12 : 14
-> CHANGE 117 : 118 @ 131 : 132
+> CHANGE 75 : 76 @ 77 : 78
~ EaglercraftUUID uuid = EaglercraftUUID.fromString(this.getOwnerId());
-> DELETE 128 @ 142 : 146
+> DELETE 11 @ 11 : 15
-> DELETE 157 @ 175 : 184
+> DELETE 29 @ 33 : 42
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java
index 4e10f317..a2eec1b2 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java
@@ -10,27 +10,27 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 7 @ 6 : 7
+> DELETE 5 @ 4 : 5
-> DELETE 8 @ 8 : 10
+> DELETE 1 @ 2 : 4
-> DELETE 12 @ 14 : 30
+> DELETE 4 @ 6 : 22
-> DELETE 15 @ 33 : 36
+> DELETE 3 @ 19 : 22
-> DELETE 24 @ 45 : 48
+> DELETE 9 @ 12 : 15
-> DELETE 28 @ 52 : 53
+> DELETE 4 @ 7 : 8
-> DELETE 34 @ 59 : 60
+> DELETE 6 @ 7 : 8
-> DELETE 41 @ 67 : 68
+> DELETE 7 @ 8 : 9
-> CHANGE 53 : 54 @ 80 : 232
+> CHANGE 12 : 13 @ 13 : 165
~ private static EntityVillager.ITradeList[][][][] DEFAULT_TRADE_LIST_MAP = null;
-> INSERT 55 : 220 @ 233
+> INSERT 2 : 167 @ 153
+ public static void bootstrap() {
+ DEFAULT_TRADE_LIST_MAP = new EntityVillager.ITradeList[][][][] {
@@ -198,51 +198,51 @@
+ }
+
-> DELETE 229 @ 242 : 258
+> DELETE 174 @ 9 : 25
-> DELETE 232 @ 261 : 281
+> DELETE 3 @ 19 : 39
-> DELETE 237 @ 286 : 329
+> DELETE 5 @ 25 : 68
-> DELETE 241 @ 333 : 338
+> DELETE 4 @ 47 : 52
-> DELETE 298 @ 395 : 396
+> DELETE 57 @ 62 : 63
-> DELETE 340 @ 438 : 477
+> DELETE 42 @ 43 : 82
-> DELETE 413 @ 550 : 558
+> DELETE 73 @ 112 : 120
-> DELETE 553 @ 698 : 699
+> DELETE 140 @ 148 : 149
-> DELETE 572 @ 718 : 728
+> DELETE 19 @ 20 : 30
-> DELETE 573 @ 729 : 732
+> DELETE 1 @ 11 : 14
-> CHANGE 667 : 668 @ 826 : 827
+> CHANGE 94 : 95 @ 97 : 98
~ public void modifyMerchantRecipeList(MerchantRecipeList recipeList, EaglercraftRandom random) {
-> CHANGE 678 : 679 @ 837 : 838
+> CHANGE 11 : 12 @ 11 : 12
~ void modifyMerchantRecipeList(MerchantRecipeList var1, EaglercraftRandom var2);
-> CHANGE 695 : 696 @ 854 : 855
+> CHANGE 17 : 18 @ 17 : 18
~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
-> CHANGE 714 : 715 @ 873 : 874
+> CHANGE 19 : 20 @ 19 : 20
~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
-> CHANGE 738 : 739 @ 897 : 898
+> CHANGE 24 : 25 @ 24 : 25
~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
-> CHANGE 765 : 766 @ 924 : 925
+> CHANGE 27 : 28 @ 27 : 28
~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) {
-> CHANGE 790 : 791 @ 949 : 950
+> CHANGE 25 : 26 @ 25 : 26
~ public int getPrice(EaglercraftRandom rand) {
diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java
index 2527ba21..53898d3b 100644
--- a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java
+++ b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java
@@ -7,20 +7,20 @@
> DELETE 2 @ 2 : 3
-> DELETE 7 @ 8 : 22
+> DELETE 5 @ 6 : 20
-> DELETE 9 @ 24 : 30
+> DELETE 2 @ 16 : 22
-> DELETE 17 @ 38 : 39
+> DELETE 8 @ 14 : 15
-> DELETE 34 @ 56 : 77
+> DELETE 17 @ 18 : 39
-> DELETE 114 @ 157 : 172
+> DELETE 80 @ 101 : 116
-> DELETE 198 @ 256 : 257
+> DELETE 84 @ 99 : 100
-> DELETE 259 @ 318 : 325
+> DELETE 61 @ 62 : 69
-> DELETE 268 @ 334 : 350
+> DELETE 9 @ 16 : 32
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java
index 924f4718..8741dfa6 100644
--- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> CHANGE 4 : 10 @ 7 : 8
+> CHANGE 2 : 8 @ 5 : 6
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
@@ -16,39 +16,39 @@
~
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> INSERT 15 : 16 @ 13
+> INSERT 11 : 12 @ 6
+ import net.minecraft.command.ICommandSender;
-> DELETE 31 @ 28 : 29
+> DELETE 16 @ 15 : 16
-> DELETE 34 @ 32 : 36
+> DELETE 3 @ 4 : 8
-> DELETE 50 @ 52 : 53
+> DELETE 16 @ 20 : 21
-> DELETE 57 @ 60 : 61
+> DELETE 7 @ 8 : 9
-> CHANGE 77 : 78 @ 81 : 82
+> CHANGE 20 : 21 @ 21 : 22
~ public abstract class EntityPlayer extends EntityLivingBase implements ICommandSender {
-> CHANGE 120 : 121 @ 124 : 125
+> CHANGE 43 : 44 @ 43 : 44
~ this.inventoryContainer = new ContainerPlayer(this.inventory, false, this);
-> DELETE 170 @ 174 : 178
+> DELETE 50 @ 50 : 54
-> CHANGE 189 : 190 @ 197 : 200
+> CHANGE 19 : 20 @ 23 : 26
~ --this.itemInUseCount;
-> DELETE 204 @ 214 : 222
+> DELETE 15 @ 17 : 25
-> DELETE 212 @ 230 : 234
+> DELETE 8 @ 16 : 20
-> DELETE 255 @ 277 : 285
+> DELETE 43 @ 47 : 55
-> CHANGE 355 : 368 @ 385 : 404
+> CHANGE 100 : 113 @ 108 : 127
~ double d0 = this.posX;
~ double d1 = this.posY;
@@ -64,41 +64,41 @@
~ this.rotationYaw = f;
~ this.renderYawOffset = ((EntityPig) this.ridingEntity).renderYawOffset;
-> DELETE 404 @ 440 : 443
+> DELETE 49 @ 55 : 58
-> CHANGE 512 : 513 @ 551 : 552
+> CHANGE 108 : 109 @ 111 : 112
~ for (ScoreObjective scoreobjective : (Collection) collection) {
-> DELETE 724 @ 763 : 767
+> DELETE 212 @ 212 : 216
-> DELETE 925 @ 968 : 977
+> DELETE 201 @ 205 : 214
-> DELETE 1007 @ 1059 : 1063
+> DELETE 82 @ 91 : 95
-> DELETE 1008 @ 1064 : 1089
+> DELETE 1 @ 5 : 30
-> DELETE 1044 @ 1125 : 1128
+> DELETE 36 @ 61 : 64
-> DELETE 1083 @ 1167 : 1170
+> DELETE 39 @ 42 : 45
-> DELETE 1375 @ 1462 : 1466
+> DELETE 292 @ 295 : 299
-> DELETE 1376 @ 1467 : 1468
+> DELETE 1 @ 5 : 6
-> DELETE 1394 @ 1486 : 1490
+> DELETE 18 @ 19 : 23
-> CHANGE 1550 : 1552 @ 1646 : 1648
+> CHANGE 156 : 158 @ 160 : 162
~ public static EaglercraftUUID getUUID(GameProfile profile) {
~ EaglercraftUUID uuid = profile.getId();
-> CHANGE 1559 : 1561 @ 1655 : 1657
+> CHANGE 9 : 11 @ 9 : 11
~ public static EaglercraftUUID getOfflineUUID(String username) {
~ return EaglercraftUUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(Charsets.UTF_8));
-> CHANGE 1579 : 1580 @ 1675 : 1676
+> CHANGE 20 : 21 @ 20 : 21
~ return true;
diff --git a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java
index 3b271054..63c41b95 100644
--- a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 7 @ 6 : 7
+> DELETE 4 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java
index 5db4a8a1..2df3b19b 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java
@@ -9,14 +9,14 @@
+
-> DELETE 13 @ 12 : 15
+> DELETE 10 @ 9 : 12
-> DELETE 14 @ 16 : 17
+> DELETE 1 @ 4 : 5
-> DELETE 264 @ 267 : 271
+> DELETE 250 @ 251 : 255
-> DELETE 281 @ 288 : 295
+> DELETE 17 @ 21 : 28
-> DELETE 422 @ 436 : 455
+> DELETE 141 @ 148 : 167
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java
index 891090c6..2e5a9187 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java
@@ -7,8 +7,8 @@
> DELETE 3 @ 3 : 5
-> DELETE 29 @ 31 : 45
+> DELETE 26 @ 28 : 42
-> DELETE 37 @ 53 : 57
+> DELETE 8 @ 22 : 26
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java
index c1101e7c..0681a50e 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java
@@ -9,7 +9,7 @@
+
-> CHANGE 78 : 79 @ 77 : 79
+> CHANGE 75 : 76 @ 74 : 76
~ if (this.worldObj.isBlockLoaded(new BlockPos(this))) {
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java
index 02cbc51d..6dd69f65 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java
@@ -9,28 +9,28 @@
+
-> DELETE 7 @ 6 : 7
+> DELETE 3 @ 2 : 3
-> DELETE 8 @ 8 : 10
+> DELETE 1 @ 2 : 4
-> DELETE 15 @ 17 : 18
+> DELETE 7 @ 9 : 10
-> DELETE 18 @ 21 : 22
+> DELETE 3 @ 4 : 5
-> DELETE 22 @ 26 : 27
+> DELETE 4 @ 5 : 6
-> DELETE 24 @ 29 : 30
+> DELETE 2 @ 3 : 4
-> DELETE 189 @ 195 : 204
+> DELETE 165 @ 166 : 175
-> DELETE 190 @ 205 : 218
+> DELETE 1 @ 10 : 23
-> DELETE 308 @ 336 : 437
+> DELETE 118 @ 131 : 232
-> CHANGE 348 : 349 @ 477 : 516
+> CHANGE 40 : 41 @ 141 : 180
~ return 0;
-> DELETE 351 @ 518 : 543
+> DELETE 3 @ 41 : 66
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java
index a4ec278e..19b298b3 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java
@@ -7,10 +7,10 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 5
+> DELETE 1 @ 2 : 3
-> DELETE 4 @ 6 : 7
+> DELETE 1 @ 2 : 3
-> DELETE 24 @ 27 : 40
+> DELETE 20 @ 21 : 34
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java
index 4f7edf5c..5bab53ad 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 5
+> DELETE 1 @ 2 : 3
-> DELETE 6 @ 8 : 12
+> DELETE 3 @ 4 : 8
-> DELETE 63 @ 69 : 82
+> DELETE 57 @ 61 : 74
-> DELETE 64 @ 83 : 105
+> DELETE 1 @ 14 : 36
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java
index d5863664..cdf41930 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java
@@ -7,10 +7,10 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 7
+> DELETE 1 @ 2 : 5
-> DELETE 25 @ 29 : 44
+> DELETE 22 @ 25 : 40
-> DELETE 26 @ 45 : 56
+> DELETE 1 @ 16 : 27
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java
index ee3d4de6..3d26f13f 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java
@@ -7,6 +7,6 @@
> DELETE 4 @ 4 : 5
-> DELETE 38 @ 39 : 43
+> DELETE 34 @ 35 : 39
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java
index a848c743..29df262c 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 4
-> DELETE 9 @ 11 : 12
+> DELETE 7 @ 9 : 10
-> DELETE 16 @ 19 : 20
+> DELETE 7 @ 8 : 9
-> DELETE 158 @ 162 : 191
+> DELETE 142 @ 143 : 172
-> DELETE 259 @ 292 : 302
+> DELETE 101 @ 130 : 140
> EOF
diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java
index 45540d00..cebbe5a7 100644
--- a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java
+++ b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java
@@ -7,10 +7,10 @@
> DELETE 6 @ 6 : 9
-> DELETE 9 @ 12 : 13
+> DELETE 3 @ 6 : 7
-> DELETE 47 @ 51 : 65
+> DELETE 38 @ 39 : 53
-> DELETE 48 @ 66 : 86
+> DELETE 1 @ 15 : 35
> EOF
diff --git a/patches/minecraft/net/minecraft/event/ClickEvent.edit.java b/patches/minecraft/net/minecraft/event/ClickEvent.edit.java
index 68d98848..c694cb2a 100644
--- a/patches/minecraft/net/minecraft/event/ClickEvent.edit.java
+++ b/patches/minecraft/net/minecraft/event/ClickEvent.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 6 @ 5
+> INSERT 2 : 4 @ 3
+ import com.google.common.collect.Maps;
+
diff --git a/patches/minecraft/net/minecraft/event/HoverEvent.edit.java b/patches/minecraft/net/minecraft/event/HoverEvent.edit.java
index 3827cac9..54ebf0a1 100644
--- a/patches/minecraft/net/minecraft/event/HoverEvent.edit.java
+++ b/patches/minecraft/net/minecraft/event/HoverEvent.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/init/Blocks.edit.java b/patches/minecraft/net/minecraft/init/Blocks.edit.java
index 1c3a5a39..c52fb298 100644
--- a/patches/minecraft/net/minecraft/init/Blocks.edit.java
+++ b/patches/minecraft/net/minecraft/init/Blocks.edit.java
@@ -7,7 +7,7 @@
> DELETE 34 @ 34 : 35
-> CHANGE 37 : 235 @ 38 : 236
+> CHANGE 3 : 201 @ 4 : 202
~ public static Block air;
~ public static Block stone;
@@ -208,7 +208,7 @@
~ public static BlockSlab double_stone_slab2;
~ public static BlockSlab stone_slab2;
-> CHANGE 240 : 241 @ 241 : 242
+> CHANGE 203 : 204 @ 203 : 204
~ static void doBootstrap() {
diff --git a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java
index 384107b1..007176b0 100644
--- a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java
+++ b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java
@@ -7,76 +7,76 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 7 @ 4 : 6
+> CHANGE 1 : 5 @ 2 : 4
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> INSERT 29 : 31 @ 28
+> INSERT 26 : 28 @ 24
+ import net.minecraft.entity.monster.EntityEnderman;
+ import net.minecraft.entity.passive.EntityVillager;
-> DELETE 36 @ 33 : 35
+> DELETE 7 @ 5 : 7
-> INSERT 38 : 39 @ 37
+> INSERT 2 : 3 @ 4
+ import net.minecraft.item.ItemAxe;
-> INSERT 42 : 43 @ 40
+> INSERT 4 : 5 @ 3
+ import net.minecraft.item.ItemPickaxe;
-> INSERT 44 : 45 @ 41
+> INSERT 2 : 3 @ 1
+ import net.minecraft.item.ItemSpade;
-> DELETE 46 @ 42 : 44
+> DELETE 2 @ 1 : 3
-> DELETE 47 @ 45 : 46
+> DELETE 1 @ 3 : 4
-> DELETE 48 @ 47 : 48
+> DELETE 1 @ 2 : 3
-> DELETE 51 @ 51 : 52
+> DELETE 3 @ 4 : 5
-> CHANGE 52 : 53 @ 53 : 55
+> CHANGE 1 : 2 @ 2 : 4
~ import net.minecraft.world.biome.BiomeGenBase;
-> CHANGE 155 : 156 @ 157 : 158
+> CHANGE 103 : 104 @ 104 : 105
~ EaglercraftRandom random = world.rand;
-> CHANGE 294 : 295 @ 296 : 301
+> CHANGE 139 : 140 @ 139 : 144
~ if (!ItemDye.applyBonemeal(itemstack, world, blockpos)) {
-> CHANGE 335 : 336 @ 341 : 375
+> CHANGE 41 : 42 @ 45 : 79
~ if (!(world.isAirBlock(blockpos) && blockskull.canDispenserPlace(world, blockpos, itemstack))) {
-> DELETE 361 @ 400 : 404
+> DELETE 26 @ 59 : 63
-> INSERT 388 : 390 @ 431
+> INSERT 27 : 29 @ 31
+ Blocks.doBootstrap();
+ BiomeGenBase.bootstrap();
-> INSERT 391 : 395 @ 432
+> INSERT 3 : 7 @ 1
+ EntityEnderman.bootstrap();
+ ItemAxe.bootstrap();
+ ItemPickaxe.bootstrap();
+ ItemSpade.bootstrap();
-> INSERT 396 : 398 @ 433
+> INSERT 5 : 7 @ 1
+ Items.doBootstrap();
+ EntityVillager.bootstrap();
-> CHANGE 404 : 406 @ 439 : 441
+> CHANGE 8 : 10 @ 6 : 8
~ System.setErr(new LoggingPrintStream("STDERR", true, System.err));
~ System.setOut(new LoggingPrintStream("STDOUT", false, SYSOUT));
diff --git a/patches/minecraft/net/minecraft/init/Items.edit.java b/patches/minecraft/net/minecraft/init/Items.edit.java
index b579438a..eb43f056 100644
--- a/patches/minecraft/net/minecraft/init/Items.edit.java
+++ b/patches/minecraft/net/minecraft/init/Items.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 15 : 202 @ 16 : 203
+> CHANGE 13 : 200 @ 14 : 201
~ public static Item iron_shovel;
~ public static Item iron_pickaxe;
@@ -197,7 +197,7 @@
~ public static Item prismarine_crystals;
~ public static Item banner;
-> CHANGE 207 : 208 @ 208 : 209
+> CHANGE 192 : 193 @ 192 : 193
~ static void doBootstrap() {
diff --git a/patches/minecraft/net/minecraft/inventory/Container.edit.java b/patches/minecraft/net/minecraft/inventory/Container.edit.java
index d55f20a6..b56fa4ec 100644
--- a/patches/minecraft/net/minecraft/inventory/Container.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/Container.edit.java
@@ -7,16 +7,16 @@
> DELETE 2 @ 2 : 4
-> INSERT 5 : 9 @ 7
+> INSERT 3 : 7 @ 5
+
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Sets;
+
-> DELETE 11 @ 9 : 12
+> DELETE 6 @ 2 : 5
-> CHANGE 30 : 31 @ 31 : 32
+> CHANGE 19 : 20 @ 22 : 23
~ this.inventoryItemStacks.add((ItemStack) null);
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java
index 535c289f..0579462b 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java
@@ -7,6 +7,6 @@
> DELETE 4 @ 4 : 8
-> DELETE 41 @ 45 : 56
+> DELETE 37 @ 41 : 52
> EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java
index efb23cae..c5dd9216 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java
@@ -10,24 +10,24 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 11 @ 10 : 15
+> DELETE 8 @ 7 : 12
-> DELETE 13 @ 17 : 18
+> DELETE 2 @ 7 : 8
-> CHANGE 20 : 21 @ 25 : 26
+> CHANGE 7 : 8 @ 8 : 9
~ private EaglercraftRandom rand;
-> CHANGE 40 : 41 @ 45 : 46
+> CHANGE 20 : 21 @ 20 : 21
~ this.rand = new EaglercraftRandom();
-> CHANGE 117 : 118 @ 122 : 191
+> CHANGE 77 : 78 @ 77 : 146
~ if (!(itemstack != null && itemstack.isItemEnchantable())) {
-> DELETE 136 @ 209 : 241
+> DELETE 19 @ 87 : 119
-> DELETE 157 @ 262 : 275
+> DELETE 21 @ 53 : 66
> EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java
index 29f6c118..f0c66958 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java
@@ -7,6 +7,6 @@
> DELETE 5 @ 5 : 11
-> DELETE 106 @ 112 : 124
+> DELETE 101 @ 107 : 119
> EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java
index af0f665b..1bcdb9c0 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java
@@ -7,20 +7,20 @@
> DELETE 6 @ 6 : 12
-> CHANGE 29 : 31 @ 35 : 36
+> CHANGE 23 : 25 @ 29 : 30
~ for (int k = 0; k < 4; ++k) {
~ final int k2 = k;
-> CHANGE 40 : 41 @ 45 : 46
+> CHANGE 11 : 12 @ 10 : 11
~ ? ((ItemArmor) itemstack.getItem()).armorType == k2
-> CHANGE 42 : 43 @ 47 : 48
+> CHANGE 2 : 3 @ 2 : 3
~ && itemstack.getItem() != Items.skull ? false : k2 == 0));
-> CHANGE 46 : 47 @ 51 : 52
+> CHANGE 4 : 5 @ 4 : 5
~ return ItemArmor.EMPTY_SLOT_NAMES[k2];
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java
index 6860acea..cddcd817 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java
@@ -13,12 +13,12 @@
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 15 @ 12 : 18
+> DELETE 11 @ 8 : 14
-> DELETE 18 @ 21 : 24
+> DELETE 3 @ 9 : 12
-> DELETE 78 @ 84 : 100
+> DELETE 60 @ 63 : 79
-> DELETE 297 @ 319 : 332
+> DELETE 219 @ 235 : 248
> EOF
diff --git a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java
index 321d5d8d..1e4a4f74 100644
--- a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java
@@ -7,6 +7,6 @@
> DELETE 5 @ 5 : 11
-> DELETE 46 @ 52 : 65
+> DELETE 41 @ 47 : 60
> EOF
diff --git a/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java b/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java
index 8a96b84a..aeefed62 100644
--- a/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
+
-> DELETE 7 @ 5 : 7
+> DELETE 4 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java b/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java
index 10b87293..8441c6b7 100644
--- a/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java
@@ -10,9 +10,9 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 6 @ 5 : 6
+> DELETE 4 @ 3 : 4
-> CHANGE 12 : 13 @ 12 : 13
+> CHANGE 6 : 7 @ 7 : 8
~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
diff --git a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java
index e087e7e4..84271095 100644
--- a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java
+++ b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 3
-> DELETE 4 @ 5 : 7
+> DELETE 2 @ 3 : 5
-> DELETE 5 @ 8 : 9
+> DELETE 1 @ 3 : 4
-> DELETE 6 @ 10 : 11
+> DELETE 1 @ 2 : 3
-> DELETE 40 @ 45 : 56
+> DELETE 34 @ 35 : 46
-> DELETE 41 @ 57 : 68
+> DELETE 1 @ 12 : 23
> EOF
diff --git a/patches/minecraft/net/minecraft/item/Item.edit.java b/patches/minecraft/net/minecraft/item/Item.edit.java
index f2f61831..40850341 100644
--- a/patches/minecraft/net/minecraft/item/Item.edit.java
+++ b/patches/minecraft/net/minecraft/item/Item.edit.java
@@ -13,18 +13,18 @@
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
-> CHANGE 11 : 12 @ 6 : 10
+> CHANGE 9 : 10 @ 4 : 8
~
-> DELETE 35 @ 33 : 101
+> DELETE 24 @ 27 : 95
-> CHANGE 51 : 53 @ 117 : 118
+> CHANGE 16 : 18 @ 84 : 85
~ protected static final EaglercraftUUID itemModifierUUID = EaglercraftUUID
~ .fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
-> CHANGE 54 : 55 @ 119 : 120
+> CHANGE 3 : 4 @ 2 : 3
~ protected static EaglercraftRandom itemRand = new EaglercraftRandom();
diff --git a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java
index 8b23bd08..bf7c5963 100644
--- a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java
@@ -9,12 +9,12 @@
+
-> DELETE 6 @ 5 : 11
+> DELETE 3 @ 2 : 8
-> CHANGE 23 : 24 @ 28 : 39
+> CHANGE 17 : 18 @ 23 : 34
~ if (itemstack.getMetadata() == 0) {
-> DELETE 26 @ 41 : 42
+> DELETE 3 @ 13 : 14
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemArmor.edit.java b/patches/minecraft/net/minecraft/item/ItemArmor.edit.java
index 75669ca9..d37e68f6 100644
--- a/patches/minecraft/net/minecraft/item/ItemArmor.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemArmor.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.base.Predicates;
+
-> DELETE 15 @ 13 : 15
+> DELETE 12 @ 9 : 11
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java
index 954a411b..4cb59f8e 100644
--- a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java
@@ -9,14 +9,14 @@
~
-> DELETE 6 @ 6 : 7
+> DELETE 3 @ 3 : 4
-> DELETE 7 @ 8 : 11
+> DELETE 1 @ 2 : 5
-> DELETE 10 @ 14 : 16
+> DELETE 3 @ 6 : 8
-> DELETE 43 @ 49 : 70
+> DELETE 33 @ 35 : 56
-> DELETE 50 @ 77 : 89
+> DELETE 7 @ 28 : 40
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemAxe.edit.java b/patches/minecraft/net/minecraft/item/ItemAxe.edit.java
index 6b6767cf..68cc7754 100644
--- a/patches/minecraft/net/minecraft/item/ItemAxe.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemAxe.edit.java
@@ -7,19 +7,19 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Sets;
+
-> DELETE 9 @ 7 : 10
+> DELETE 6 @ 3 : 6
-> CHANGE 11 : 12 @ 12 : 15
+> CHANGE 2 : 3 @ 5 : 8
~ private static Set EFFECTIVE_ON;
-> INSERT 13 : 18 @ 16
+> INSERT 2 : 7 @ 4
+ public static void bootstrap() {
+ EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2,
diff --git a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java
index 5eb0a2ef..6e415cf7 100644
--- a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java
@@ -9,14 +9,14 @@
~
-> DELETE 7 @ 8 : 12
+> DELETE 4 @ 5 : 9
-> DELETE 9 @ 14 : 15
+> DELETE 2 @ 6 : 7
-> DELETE 12 @ 18 : 19
+> DELETE 3 @ 4 : 5
-> DELETE 36 @ 43 : 45
+> DELETE 24 @ 25 : 27
-> DELETE 37 @ 46 : 62
+> DELETE 1 @ 3 : 19
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBed.edit.java b/patches/minecraft/net/minecraft/item/ItemBed.edit.java
index c85a6066..adcb4871 100644
--- a/patches/minecraft/net/minecraft/item/ItemBed.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBed.edit.java
@@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 5
-> DELETE 4 @ 7 : 10
+> DELETE 2 @ 5 : 8
-> DELETE 6 @ 12 : 13
+> DELETE 2 @ 5 : 6
-> CHANGE 15 : 16 @ 22 : 62
+> CHANGE 9 : 10 @ 10 : 50
~ return true;
diff --git a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java
index cee888cf..98e71d90 100644
--- a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java
@@ -9,9 +9,9 @@
+
-> DELETE 10 @ 9 : 14
+> DELETE 7 @ 6 : 11
-> CHANGE 63 : 64 @ 67 : 98
+> CHANGE 53 : 54 @ 58 : 89
~ return false;
diff --git a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java
index 61ce5301..8cf09905 100644
--- a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java
@@ -9,8 +9,8 @@
+
-> DELETE 9 @ 8 : 10
+> DELETE 6 @ 5 : 7
-> DELETE 82 @ 83 : 87
+> DELETE 73 @ 75 : 79
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBow.edit.java b/patches/minecraft/net/minecraft/item/ItemBow.edit.java
index ce85984e..fe76d215 100644
--- a/patches/minecraft/net/minecraft/item/ItemBow.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBow.edit.java
@@ -7,6 +7,6 @@
> DELETE 8 @ 8 : 11
-> DELETE 64 @ 67 : 70
+> DELETE 56 @ 59 : 62
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java
index ed1bae49..e75a6a06 100644
--- a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java
@@ -7,6 +7,6 @@
> DELETE 10 @ 10 : 12
-> DELETE 115 @ 117 : 121
+> DELETE 105 @ 107 : 111
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java
index e478b027..6ec6b36e 100644
--- a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java
@@ -7,6 +7,6 @@
> DELETE 5 @ 5 : 8
-> DELETE 18 @ 21 : 26
+> DELETE 13 @ 16 : 21
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java
index caa38d23..6a52ff64 100644
--- a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java
@@ -7,8 +7,8 @@
> DELETE 3 @ 3 : 4
-> DELETE 4 @ 5 : 9
+> DELETE 1 @ 2 : 6
-> DELETE 22 @ 27 : 42
+> DELETE 18 @ 22 : 37
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemCoal.edit.java b/patches/minecraft/net/minecraft/item/ItemCoal.edit.java
index 3efecf12..e888843e 100644
--- a/patches/minecraft/net/minecraft/item/ItemCoal.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemCoal.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 6
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java b/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java
index 66c85a1a..a3ed4c9a 100644
--- a/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 6 @ 5 : 7
+> DELETE 3 @ 2 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemDye.edit.java b/patches/minecraft/net/minecraft/item/ItemDye.edit.java
index fb91e05b..d2526cd7 100644
--- a/patches/minecraft/net/minecraft/item/ItemDye.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemDye.edit.java
@@ -9,11 +9,11 @@
+
-> DELETE 14 @ 13 : 16
+> DELETE 11 @ 10 : 13
-> DELETE 42 @ 44 : 48
+> DELETE 28 @ 31 : 35
-> CHANGE 78 : 79 @ 84 : 93
+> CHANGE 36 : 37 @ 40 : 49
~ if (igrowable.canGrow(worldIn, target, iblockstate, true)) {
diff --git a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java
index eb2154b0..3b9eec35 100644
--- a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java
@@ -9,12 +9,12 @@
+
-> DELETE 5 @ 4 : 9
+> DELETE 2 @ 1 : 6
-> DELETE 8 @ 12 : 13
+> DELETE 3 @ 8 : 9
-> DELETE 65 @ 70 : 74
+> DELETE 57 @ 58 : 62
-> DELETE 93 @ 102 : 109
+> DELETE 28 @ 32 : 39
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java
index b5d7155e..cca4131f 100644
--- a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java
@@ -7,6 +7,6 @@
> DELETE 4 @ 4 : 7
-> DELETE 19 @ 22 : 25
+> DELETE 15 @ 18 : 21
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java b/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java
index 3d63f069..2bd9de17 100644
--- a/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java
@@ -10,13 +10,13 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~
-> DELETE 10 @ 9 : 12
+> DELETE 7 @ 6 : 9
-> CHANGE 92 : 93 @ 94 : 95
+> CHANGE 82 : 83 @ 85 : 86
~ public WeightedRandomChestContent getRandom(EaglercraftRandom rand) {
-> CHANGE 96 : 97 @ 98 : 99
+> CHANGE 4 : 5 @ 4 : 5
~ public WeightedRandomChestContent getRandom(EaglercraftRandom rand, int minChance, int maxChance, int weight) {
diff --git a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java
index 081feb5f..6c257ef2 100644
--- a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java
@@ -7,14 +7,14 @@
> DELETE 5 @ 5 : 6
-> DELETE 7 @ 8 : 11
+> DELETE 2 @ 3 : 6
-> DELETE 9 @ 13 : 15
+> DELETE 2 @ 5 : 7
-> CHANGE 22 : 23 @ 28 : 111
+> CHANGE 13 : 14 @ 15 : 98
~ return true;
-> DELETE 28 @ 116 : 144
+> DELETE 6 @ 88 : 116
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java
index 51b81c1a..3e82668e 100644
--- a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java
@@ -7,8 +7,8 @@
> DELETE 3 @ 3 : 4
-> DELETE 4 @ 5 : 7
+> DELETE 1 @ 2 : 4
-> DELETE 19 @ 22 : 25
+> DELETE 15 @ 17 : 20
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java
index 079eab87..ac45663b 100644
--- a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java
@@ -7,8 +7,8 @@
> DELETE 3 @ 3 : 4
-> DELETE 4 @ 5 : 7
+> DELETE 1 @ 2 : 4
-> DELETE 22 @ 25 : 28
+> DELETE 18 @ 20 : 23
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java
index 2aba31d9..c6daf603 100644
--- a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
-> DELETE 4 @ 5 : 8
+> DELETE 2 @ 3 : 6
-> CHANGE 15 : 16 @ 19 : 40
+> CHANGE 11 : 12 @ 14 : 35
~ return true;
diff --git a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java
index 880bac67..748f826f 100644
--- a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java
@@ -7,20 +7,20 @@
> DELETE 2 @ 2 : 3
-> CHANGE 4 : 7 @ 5 : 6
+> CHANGE 2 : 5 @ 3 : 4
~
~ import com.google.common.collect.Lists;
~
-> DELETE 8 @ 7 : 10
+> DELETE 4 @ 2 : 5
-> DELETE 10 @ 12 : 14
+> DELETE 2 @ 5 : 7
-> DELETE 11 @ 15 : 16
+> DELETE 1 @ 3 : 4
-> DELETE 13 @ 18 : 28
+> DELETE 2 @ 3 : 13
-> DELETE 14 @ 29 : 35
+> DELETE 1 @ 11 : 17
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java b/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java
index d87ed205..107d5a71 100644
--- a/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 8
+> DELETE 2 @ 1 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java b/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java
index 6a7724d0..69859d57 100644
--- a/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Maps;
+
-> DELETE 9 @ 7 : 10
+> DELETE 5 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java
index 679079d8..c8ed442f 100644
--- a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java
@@ -7,6 +7,6 @@
> DELETE 4 @ 4 : 7
-> DELETE 29 @ 32 : 36
+> DELETE 25 @ 28 : 32
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemFood.edit.java b/patches/minecraft/net/minecraft/item/ItemFood.edit.java
index 15f86267..e78a5fea 100644
--- a/patches/minecraft/net/minecraft/item/ItemFood.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemFood.edit.java
@@ -7,6 +7,6 @@
> DELETE 4 @ 4 : 8
-> DELETE 40 @ 44 : 49
+> DELETE 36 @ 40 : 45
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java
index 68096adf..e8c7aba5 100644
--- a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java
@@ -7,6 +7,6 @@
> DELETE 7 @ 7 : 9
-> DELETE 32 @ 34 : 38
+> DELETE 25 @ 27 : 31
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java
index eda18e3b..3b8c269f 100644
--- a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java
@@ -7,7 +7,7 @@
> DELETE 9 @ 9 : 11
-> CHANGE 57 : 58 @ 59 : 66
+> CHANGE 48 : 49 @ 50 : 57
~ return true;
diff --git a/patches/minecraft/net/minecraft/item/ItemLead.edit.java b/patches/minecraft/net/minecraft/item/ItemLead.edit.java
index e21b058f..1274b99a 100644
--- a/patches/minecraft/net/minecraft/item/ItemLead.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemLead.edit.java
@@ -7,7 +7,7 @@
> DELETE 8 @ 8 : 10
-> CHANGE 22 : 23 @ 24 : 30
+> CHANGE 14 : 15 @ 16 : 22
~ return true;
diff --git a/patches/minecraft/net/minecraft/item/ItemMap.edit.java b/patches/minecraft/net/minecraft/item/ItemMap.edit.java
index 28fb95b2..f7b0ed81 100644
--- a/patches/minecraft/net/minecraft/item/ItemMap.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMap.edit.java
@@ -10,14 +10,14 @@
+ import java.util.List;
+
-> CHANGE 7 : 8 @ 5 : 6
+> CHANGE 5 : 6 @ 3 : 4
~
-> DELETE 17 @ 15 : 17
+> DELETE 10 @ 10 : 12
-> DELETE 43 @ 43 : 55
+> DELETE 26 @ 28 : 40
-> DELETE 180 @ 192 : 207
+> DELETE 137 @ 149 : 164
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java
index 00de5040..a4976b08 100644
--- a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java
@@ -7,6 +7,6 @@
> DELETE 12 @ 12 : 14
-> DELETE 87 @ 89 : 109
+> DELETE 75 @ 77 : 97
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java
index 64923041..83fa8cf5 100644
--- a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java
@@ -9,14 +9,14 @@
~
-> DELETE 11 @ 13 : 20
+> DELETE 8 @ 10 : 17
-> DELETE 14 @ 23 : 24
+> DELETE 3 @ 10 : 11
-> CHANGE 43 : 44 @ 53 : 94
+> CHANGE 29 : 30 @ 30 : 71
~ return true;
-> DELETE 46 @ 96 : 137
+> DELETE 3 @ 43 : 84
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java b/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java
index 3efecf12..e888843e 100644
--- a/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 6
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java b/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java
index cc7c7aeb..1e587165 100644
--- a/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java
@@ -7,19 +7,19 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Sets;
+
-> DELETE 9 @ 7 : 10
+> DELETE 6 @ 3 : 6
-> CHANGE 11 : 12 @ 12 : 18
+> CHANGE 2 : 3 @ 5 : 11
~ private static Set EFFECTIVE_ON;
-> INSERT 13 : 22 @ 19
+> INSERT 2 : 11 @ 7
+ public static void bootstrap() {
+ EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone,
diff --git a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java
index cb8ef1ca..81b7f269 100644
--- a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 5
-> INSERT 7 : 13 @ 10
+> INSERT 5 : 11 @ 8
+ import java.util.Set;
+
@@ -16,27 +16,27 @@
+ import com.google.common.collect.Maps;
+
-> DELETE 17 @ 14 : 15
+> DELETE 10 @ 4 : 5
-> DELETE 18 @ 16 : 19
+> DELETE 1 @ 2 : 5
-> DELETE 79 @ 80 : 89
+> DELETE 61 @ 64 : 73
-> DELETE 106 @ 116 : 119
+> DELETE 27 @ 36 : 39
-> CHANGE 130 : 131 @ 143 : 144
+> CHANGE 24 : 25 @ 27 : 28
~ for (PotionEffect potioneffect : (List) list) {
-> CHANGE 168 : 169 @ 181 : 182
+> CHANGE 38 : 39 @ 38 : 39
~ for (PotionEffect potioneffect : (List) list1) {
-> CHANGE 173 : 174 @ 186 : 187
+> CHANGE 5 : 6 @ 5 : 6
~ for (Entry entry : (Set) map.entrySet()) {
-> CHANGE 207 : 208 @ 220 : 221
+> CHANGE 34 : 35 @ 34 : 35
~ for (Entry entry1 : (Set) hashmultimap.entries()) {
diff --git a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java
index 007d1e3b..f6c1d3d9 100644
--- a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Maps;
+
-> DELETE 12 @ 10 : 14
+> DELETE 8 @ 5 : 9
-> CHANGE 33 : 34 @ 35 : 44
+> CHANGE 21 : 22 @ 25 : 34
~ return true;
diff --git a/patches/minecraft/net/minecraft/item/ItemSign.edit.java b/patches/minecraft/net/minecraft/item/ItemSign.edit.java
index 7fdb9fb4..1917d81a 100644
--- a/patches/minecraft/net/minecraft/item/ItemSign.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSign.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 4
-> DELETE 5 @ 7 : 12
+> DELETE 3 @ 5 : 10
-> DELETE 7 @ 14 : 15
+> DELETE 2 @ 7 : 8
-> DELETE 27 @ 35 : 37
+> DELETE 20 @ 21 : 23
-> DELETE 28 @ 38 : 55
+> DELETE 1 @ 3 : 20
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java
index 75608e9a..4ebc8fd6 100644
--- a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java
@@ -7,23 +7,23 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 5
+> CHANGE 1 : 4 @ 2 : 3
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> DELETE 7 @ 6 : 7
+> DELETE 4 @ 2 : 3
-> DELETE 11 @ 11 : 13
+> DELETE 4 @ 5 : 7
-> DELETE 13 @ 15 : 16
+> DELETE 2 @ 4 : 5
-> DELETE 16 @ 19 : 20
+> DELETE 3 @ 4 : 5
-> DELETE 49 @ 53 : 89
+> DELETE 33 @ 34 : 70
-> CHANGE 96 : 97 @ 136 : 137
+> CHANGE 47 : 48 @ 83 : 84
~ GameProfile gameprofile = new GameProfile((EaglercraftUUID) null, nbt.getString("SkullOwner"));
diff --git a/patches/minecraft/net/minecraft/item/ItemSlab.edit.java b/patches/minecraft/net/minecraft/item/ItemSlab.edit.java
index 5e03c1f3..4f39eb2a 100644
--- a/patches/minecraft/net/minecraft/item/ItemSlab.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSlab.edit.java
@@ -7,7 +7,7 @@
> DELETE 7 @ 7 : 9
-> CHANGE 95 : 96 @ 97 : 98
+> CHANGE 88 : 89 @ 90 : 91
~ .withProperty((IProperty) this.singleSlab.getVariantProperty(), comparable);
diff --git a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java
index b5d7155e..cca4131f 100644
--- a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java
@@ -7,6 +7,6 @@
> DELETE 4 @ 4 : 7
-> DELETE 19 @ 22 : 25
+> DELETE 15 @ 18 : 21
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemSpade.edit.java b/patches/minecraft/net/minecraft/item/ItemSpade.edit.java
index d2f08688..b958d336 100644
--- a/patches/minecraft/net/minecraft/item/ItemSpade.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSpade.edit.java
@@ -7,19 +7,19 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Sets;
+
-> DELETE 8 @ 6 : 8
+> DELETE 5 @ 2 : 4
-> CHANGE 10 : 11 @ 10 : 13
+> CHANGE 2 : 3 @ 4 : 7
~ private static Set EFFECTIVE_ON;
-> INSERT 12 : 17 @ 14
+> INSERT 2 : 7 @ 4
+ public static void bootstrap() {
+ EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass,
diff --git a/patches/minecraft/net/minecraft/item/ItemStack.edit.java b/patches/minecraft/net/minecraft/item/ItemStack.edit.java
index 128dc405..77282d51 100644
--- a/patches/minecraft/net/minecraft/item/ItemStack.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemStack.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 5
-> DELETE 5 @ 8 : 9
+> DELETE 3 @ 6 : 7
-> INSERT 6 : 14 @ 10
+> INSERT 1 : 9 @ 2
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+ import net.lax1dude.eaglercraft.v1_8.HString;
@@ -20,21 +20,21 @@
+ import com.google.common.collect.Multimap;
+
-> DELETE 27 @ 23 : 27
+> DELETE 21 @ 13 : 17
-> CHANGE 212 : 213 @ 212 : 213
+> CHANGE 185 : 186 @ 189 : 190
~ public boolean attemptDamageItem(int amount, EaglercraftRandom rand) {
-> CHANGE 462 : 463 @ 462 : 463
+> CHANGE 250 : 251 @ 250 : 251
~ s = s + HString.format("#%04d/%d%s",
-> CHANGE 465 : 466 @ 465 : 466
+> CHANGE 3 : 4 @ 3 : 4
~ s = s + HString.format("#%04d%s", new Object[] { Integer.valueOf(i), s1 });
-> CHANGE 522 : 523 @ 522 : 523
+> CHANGE 57 : 58 @ 57 : 58
~ for (Entry entry : (Set) multimap.entries()) {
diff --git a/patches/minecraft/net/minecraft/item/ItemSword.edit.java b/patches/minecraft/net/minecraft/item/ItemSword.edit.java
index a7a99d09..bab7d9a5 100644
--- a/patches/minecraft/net/minecraft/item/ItemSword.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemSword.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 12 @ 11 : 14
+> DELETE 9 @ 8 : 11
> EOF
diff --git a/patches/minecraft/net/minecraft/item/ItemTool.edit.java b/patches/minecraft/net/minecraft/item/ItemTool.edit.java
index 8f8780a9..6f6d809b 100644
--- a/patches/minecraft/net/minecraft/item/ItemTool.edit.java
+++ b/patches/minecraft/net/minecraft/item/ItemTool.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Multimap;
+
-> DELETE 11 @ 9 : 11
+> DELETE 8 @ 5 : 7
> EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java
index 0c016d3f..22b52f4c 100644
--- a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java
@@ -7,20 +7,20 @@
> DELETE 2 @ 2 : 4
-> INSERT 7 : 11 @ 9
+> INSERT 5 : 9 @ 7
+
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+
-> DELETE 23 @ 21 : 38
+> DELETE 16 @ 12 : 29
-> CHANGE 26 : 27 @ 41 : 42
+> CHANGE 3 : 4 @ 20 : 21
~ private static CraftingManager instance;
-> INSERT 30 : 33 @ 45
+> INSERT 4 : 7 @ 4
+ if (instance == null) {
+ instance = new CraftingManager();
diff --git a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java
index 748bdf01..874a3cef 100644
--- a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java
@@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Maps;
+
-> CHANGE 17 : 18 @ 15 : 16
+> CHANGE 13 : 14 @ 10 : 11
~ private static FurnaceRecipes smeltingBase;
-> INSERT 22 : 25 @ 20
+> INSERT 5 : 8 @ 5
+ if (smeltingBase == null) {
+ smeltingBase = new FurnaceRecipes();
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java
index 9de9c4fd..5752feb2 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
+
-> DELETE 10 @ 8 : 9
+> DELETE 7 @ 4 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java
index a2eaaa69..54b1248a 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
+
-> DELETE 9 @ 7 : 8
+> DELETE 6 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java
index b55299db..39ee64ca 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 6 @ 4
+> INSERT 1 : 4 @ 2
+
+ import com.google.common.collect.Lists;
+
-> DELETE 12 @ 10 : 11
+> DELETE 9 @ 6 : 7
> EOF
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java
index e92233fd..7e8d3e8d 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java
@@ -7,11 +7,11 @@
> DELETE 7 @ 7 : 8
-> CHANGE 9 : 10 @ 10 : 18
+> CHANGE 2 : 3 @ 3 : 11
~ private Object[][] recipeItems;
-> INSERT 12 : 21 @ 20
+> INSERT 3 : 12 @ 10
+ recipeItems = new Object[][] { { Blocks.gold_block, new ItemStack(Items.gold_ingot, 9) },
+ { Blocks.iron_block, new ItemStack(Items.iron_ingot, 9) },
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java
index a5cbccb8..d813a242 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java
@@ -7,11 +7,11 @@
> DELETE 6 @ 6 : 7
-> CHANGE 10 : 11 @ 11 : 18
+> CHANGE 4 : 5 @ 5 : 12
~ private Object[][] recipeItems;
-> INSERT 13 : 21 @ 20
+> INSERT 3 : 11 @ 9
+ recipeItems = new Object[][] {
+ { Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot },
diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java
index a267371e..2d56ae8e 100644
--- a/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java
@@ -7,11 +7,11 @@
> DELETE 6 @ 6 : 7
-> CHANGE 9 : 10 @ 10 : 13
+> CHANGE 3 : 4 @ 4 : 7
~ private Object[][] recipeItems;
-> INSERT 12 : 15 @ 15
+> INSERT 3 : 6 @ 5
+ recipeItems = new Object[][] {
+ { Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot },
diff --git a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java
index 5d19591a..5d71fece 100644
--- a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java
+++ b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java
@@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Lists;
+
-> DELETE 9 @ 7 : 8
+> DELETE 5 @ 2 : 3
-> CHANGE 46 : 47 @ 45 : 46
+> CHANGE 37 : 38 @ 38 : 39
~ for (ItemStack itemstack1 : (List) arraylist) {
diff --git a/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java
index 02fe817e..5434aae7 100644
--- a/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java
@@ -7,22 +7,22 @@
> DELETE 8 @ 8 : 11
-> CHANGE 11 : 13 @ 14 : 16
+> CHANGE 3 : 5 @ 6 : 8
~
~ import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
-> DELETE 15 @ 18 : 22
+> DELETE 4 @ 4 : 8
-> CHANGE 19 : 21 @ 26 : 27
+> CHANGE 4 : 6 @ 8 : 9
~ DataInputStream datainputstream = new DataInputStream(
~ new BufferedInputStream(EaglerZLIB.newGZIPInputStream(is)));
-> CHANGE 34 : 35 @ 40 : 41
+> CHANGE 15 : 16 @ 14 : 15
~ new BufferedOutputStream(EaglerZLIB.newGZIPOutputStream(parOutputStream)));
-> DELETE 44 @ 50 : 96
+> DELETE 10 @ 10 : 56
> EOF
diff --git a/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java b/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java
index 580766c1..e6716869 100644
--- a/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java
@@ -11,9 +11,9 @@
+ import java.util.regex.Pattern;
+
-> DELETE 8 @ 5 : 21
+> DELETE 6 @ 3 : 19
-> INSERT 9 : 12 @ 22
+> INSERT 1 : 4 @ 17
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java
index f19faf7b..6ae1dbdd 100644
--- a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java
@@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3
-> DELETE 6 @ 7 : 8
+> DELETE 4 @ 5 : 6
-> INSERT 7 : 8 @ 9
+> INSERT 1 : 2 @ 2
+ import java.util.Set;
-> INSERT 9 : 12 @ 10
+> INSERT 2 : 5 @ 1
+
+ import com.google.common.collect.Maps;
+
-> DELETE 14 @ 12 : 24
+> DELETE 5 @ 2 : 14
> EOF
diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java b/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java
index b2287eed..3d765696 100644
--- a/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
-> DELETE 6 @ 7 : 16
+> DELETE 4 @ 5 : 14
-> INSERT 7 : 12 @ 17
+> INSERT 1 : 6 @ 10
+ import com.google.common.collect.Lists;
+
diff --git a/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java b/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java
index 6f406af5..e756cf53 100644
--- a/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java
+++ b/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java
@@ -15,25 +15,25 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property;
-> CHANGE 26 : 27 @ 25 : 26
+> CHANGE 24 : 25 @ 23 : 24
~ EaglercraftUUID uuid;
-> CHANGE 28 : 29 @ 27 : 28
+> CHANGE 2 : 3 @ 2 : 3
~ uuid = EaglercraftUUID.fromString(s1);
-> CHANGE 33 : 34 @ 32 : 33
+> CHANGE 5 : 6 @ 5 : 6
~ Multimap propertiesMap = MultimapBuilder.hashKeys().arrayListValues().build();
-> DELETE 36 @ 35 : 36
+> DELETE 3 @ 3 : 4
-> CHANGE 38 : 39 @ 38 : 40
+> CHANGE 2 : 3 @ 3 : 5
~ for (int i = 0, l = nbttaglist.tagCount(); i < l; ++i) {
-> CHANGE 40 : 48 @ 41 : 47
+> CHANGE 2 : 10 @ 3 : 9
~ String value = nbttagcompound1.getString("Value");
~ if (!StringUtils.isNullOrEmpty(value)) {
@@ -44,17 +44,17 @@
~ propertiesMap.put(s2, new Property(s2, value));
~ }
-> CHANGE 53 : 54 @ 52 : 53
+> CHANGE 13 : 14 @ 11 : 12
~ return new GameProfile(uuid, s, propertiesMap);
-> CHANGE 66 : 68 @ 65 : 66
+> CHANGE 13 : 15 @ 13 : 14
~ Multimap propertiesMap = profile.getProperties();
~ if (!propertiesMap.isEmpty()) {
-> DELETE 69 @ 67 : 68
+> DELETE 3 @ 2 : 3
-> DELETE 84 @ 83 : 85
+> DELETE 15 @ 16 : 18
> EOF
diff --git a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java
index 774384f9..db70db51 100644
--- a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java
+++ b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java
@@ -11,18 +11,18 @@
+ import java.util.Map;
+
-> CHANGE 8 : 10 @ 5 : 8
+> CHANGE 6 : 8 @ 3 : 6
~
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
-> DELETE 115 @ 113 : 114
+> DELETE 107 @ 108 : 109
-> CHANGE 262 : 263 @ 261 : 262
+> CHANGE 147 : 148 @ 148 : 149
~ this.directionMaps.put(direction, (BiMap>) object);
-> CHANGE 308 : 310 @ 307 : 308
+> CHANGE 46 : 48 @ 46 : 47
~ for (Class oclass : (Collection) ((BiMap) enumconnectionstate.directionMaps
~ .get(enumpacketdirection)).values()) {
diff --git a/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java b/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java
index e1f7bb6c..b9c5aec9 100644
--- a/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java
+++ b/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 10
-> DELETE 8 @ 16 : 18
+> DELETE 6 @ 14 : 16
-> CHANGE 9 : 18 @ 19 : 20
+> CHANGE 1 : 10 @ 3 : 4
~ import java.nio.charset.StandardCharsets;
~
@@ -21,26 +21,26 @@
~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBufInputStream;
~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBufOutputStream;
-> CHANGE 116 : 117 @ 118 : 119
+> CHANGE 107 : 108 @ 99 : 100
~ public void writeUuid(EaglercraftUUID uuid) {
-> CHANGE 121 : 123 @ 123 : 125
+> CHANGE 5 : 7 @ 5 : 7
~ public EaglercraftUUID readUuid() {
~ return new EaglercraftUUID(this.readLong(), this.readLong());
-> CHANGE 205 : 206 @ 207 : 208
+> CHANGE 84 : 85 @ 84 : 85
~ String s = new String(this.readBytes(i).array(), StandardCharsets.UTF_8);
-> CHANGE 216 : 217 @ 218 : 219
+> CHANGE 11 : 12 @ 11 : 12
~ byte[] abyte = string.getBytes(StandardCharsets.UTF_8);
-> DELETE 238 @ 240 : 244
+> DELETE 22 @ 22 : 26
-> CHANGE 391 : 396 @ 397 : 398
+> CHANGE 153 : 158 @ 157 : 158
~ if (parByteBuf instanceof PacketBuffer) {
~ return this.buf.getBytes(parInt1, ((PacketBuffer) parByteBuf).buf);
@@ -48,7 +48,7 @@
~ return this.buf.getBytes(parInt1, parByteBuf);
~ }
-> CHANGE 399 : 404 @ 401 : 402
+> CHANGE 8 : 13 @ 4 : 5
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.getBytes(i, ((PacketBuffer) bytebuf).buf, j);
@@ -56,7 +56,7 @@
~ return this.buf.getBytes(i, bytebuf, j);
~ }
-> CHANGE 407 : 412 @ 405 : 406
+> CHANGE 8 : 13 @ 4 : 5
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.getBytes(i, ((PacketBuffer) bytebuf).buf, j, k);
@@ -64,9 +64,9 @@
~ return this.buf.getBytes(i, bytebuf, j, k);
~ }
-> DELETE 430 @ 424 : 428
+> DELETE 23 @ 19 : 23
-> CHANGE 471 : 476 @ 469 : 470
+> CHANGE 41 : 46 @ 45 : 46
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.setBytes(i, ((PacketBuffer) bytebuf).buf, j);
@@ -74,7 +74,7 @@
~ return this.buf.setBytes(i, bytebuf, j);
~ }
-> CHANGE 479 : 484 @ 473 : 474
+> CHANGE 8 : 13 @ 4 : 5
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.setBytes(i, ((PacketBuffer) bytebuf).buf, j, k);
@@ -82,9 +82,9 @@
~ return this.buf.setBytes(i, bytebuf, j, k);
~ }
-> DELETE 502 @ 492 : 496
+> DELETE 23 @ 19 : 23
-> CHANGE 567 : 572 @ 561 : 562
+> CHANGE 65 : 70 @ 69 : 70
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.readBytes(((PacketBuffer) bytebuf).buf);
@@ -92,7 +92,7 @@
~ return this.buf.readBytes(bytebuf);
~ }
-> CHANGE 575 : 580 @ 565 : 566
+> CHANGE 8 : 13 @ 4 : 5
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.readBytes(((PacketBuffer) bytebuf).buf, i);
@@ -100,7 +100,7 @@
~ return this.buf.readBytes(bytebuf, i);
~ }
-> CHANGE 583 : 588 @ 569 : 570
+> CHANGE 8 : 13 @ 4 : 5
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.readBytes(((PacketBuffer) bytebuf).buf, i, j);
@@ -108,9 +108,9 @@
~ return this.buf.readBytes(bytebuf, i, j);
~ }
-> DELETE 606 @ 588 : 592
+> DELETE 23 @ 19 : 23
-> CHANGE 647 : 652 @ 633 : 634
+> CHANGE 41 : 46 @ 45 : 46
~ if (parByteBuf instanceof PacketBuffer) {
~ return this.buf.writeBytes(((PacketBuffer) parByteBuf).buf);
@@ -118,7 +118,7 @@
~ return this.buf.writeBytes(parByteBuf);
~ }
-> CHANGE 655 : 660 @ 637 : 638
+> CHANGE 8 : 13 @ 4 : 5
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.writeBytes(((PacketBuffer) bytebuf).buf, i);
@@ -126,7 +126,7 @@
~ return this.buf.writeBytes(bytebuf, i);
~ }
-> CHANGE 663 : 668 @ 641 : 642
+> CHANGE 8 : 13 @ 4 : 5
~ if (bytebuf instanceof PacketBuffer) {
~ return this.buf.writeBytes(((PacketBuffer) bytebuf).buf, i, j);
@@ -134,10 +134,10 @@
~ return this.buf.writeBytes(bytebuf, i, j);
~ }
-> DELETE 686 @ 660 : 664
+> DELETE 23 @ 19 : 23
-> DELETE 706 @ 684 : 700
+> DELETE 20 @ 24 : 40
-> DELETE 794 @ 788 : 807
+> DELETE 88 @ 104 : 123
> EOF
diff --git a/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java b/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java
index 81e0fa7c..88f0976a 100644
--- a/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java
+++ b/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java
@@ -16,9 +16,9 @@
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> DELETE 11 @ 14 : 15
+> DELETE 9 @ 12 : 13
-> CHANGE 68 : 73 @ 72 : 79
+> CHANGE 57 : 62 @ 58 : 65
~ implements JSONTypeCodec {
~ public ServerStatusResponse.MinecraftProtocolVersionIdentifier deserialize(JSONObject jsonobject)
@@ -26,7 +26,7 @@
~ return new ServerStatusResponse.MinecraftProtocolVersionIdentifier(jsonobject.getString("name"),
~ jsonobject.getInt("protocol"));
-> CHANGE 75 : 80 @ 81 : 87
+> CHANGE 7 : 12 @ 9 : 15
~ public JSONObject serialize(
~ ServerStatusResponse.MinecraftProtocolVersionIdentifier serverstatusresponse$minecraftprotocolversionidentifier) {
@@ -34,12 +34,12 @@
~ jsonobject.put("name", serverstatusresponse$minecraftprotocolversionidentifier.getName());
~ jsonobject.put("protocol",
-> CHANGE 112 : 114 @ 119 : 124
+> CHANGE 37 : 39 @ 38 : 43
~ public static class Serializer implements JSONTypeCodec {
~ public ServerStatusResponse.PlayerCountData deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 115 : 120 @ 125 : 130
+> CHANGE 3 : 8 @ 6 : 11
~ jsonobject.getInt("max"), jsonobject.getInt("online"));
~ JSONArray jsonarray = jsonobject.optJSONArray("sample");
@@ -47,14 +47,14 @@
~ if (jsonarray.length() > 0) {
~ GameProfile[] agameprofile = new GameProfile[jsonarray.length()];
-> CHANGE 122 : 126 @ 132 : 136
+> CHANGE 7 : 11 @ 7 : 11
~ JSONObject jsonobject1 = jsonarray.getJSONObject(i);
~ String s = jsonobject1.getString("id");
~ agameprofile[i] = new GameProfile(EaglercraftUUID.fromString(s),
~ jsonobject1.getString("name"));
-> CHANGE 135 : 140 @ 145 : 151
+> CHANGE 13 : 18 @ 13 : 19
~ public JSONObject serialize(ServerStatusResponse.PlayerCountData serverstatusresponse$playercountdata)
~ throws JSONException {
@@ -62,11 +62,11 @@
~ jsonobject.put("max", Integer.valueOf(serverstatusresponse$playercountdata.getMaxPlayers()));
~ jsonobject.put("online", Integer.valueOf(serverstatusresponse$playercountdata.getOnlinePlayerCount()));
-> CHANGE 142 : 143 @ 153 : 154
+> CHANGE 7 : 8 @ 8 : 9
~ JSONArray jsonarray = new JSONArray();
-> CHANGE 145 : 150 @ 156 : 161
+> CHANGE 3 : 8 @ 3 : 8
~ JSONObject jsonobject1 = new JSONObject();
~ EaglercraftUUID uuid = serverstatusresponse$playercountdata.getPlayers()[i].getId();
@@ -74,55 +74,55 @@
~ jsonobject1.put("name", serverstatusresponse$playercountdata.getPlayers()[i].getName());
~ jsonarray.put(jsonobject1);
-> CHANGE 152 : 153 @ 163 : 164
+> CHANGE 7 : 8 @ 7 : 8
~ jsonobject.put("sample", jsonarray);
-> CHANGE 160 : 162 @ 171 : 176
+> CHANGE 8 : 10 @ 8 : 13
~ public static class Serializer implements JSONTypeCodec {
~ public ServerStatusResponse deserialize(JSONObject jsonobject) throws JSONException {
-> CHANGE 164 : 165 @ 178 : 179
+> CHANGE 4 : 5 @ 7 : 8
~ serverstatusresponse.setServerDescription((IChatComponent) JSONTypeProvider
-> CHANGE 169 : 171 @ 183 : 186
+> CHANGE 5 : 7 @ 5 : 8
~ serverstatusresponse.setPlayerCountData((ServerStatusResponse.PlayerCountData) JSONTypeProvider
~ .deserialize(jsonobject.get("players"), ServerStatusResponse.PlayerCountData.class));
-> CHANGE 175 : 178 @ 190 : 193
+> CHANGE 6 : 9 @ 7 : 10
~ (ServerStatusResponse.MinecraftProtocolVersionIdentifier) JSONTypeProvider.deserialize(
~ jsonobject.get("version"),
~ ServerStatusResponse.MinecraftProtocolVersionIdentifier.class));
-> CHANGE 181 : 182 @ 196 : 197
+> CHANGE 6 : 7 @ 6 : 7
~ serverstatusresponse.setFavicon(jsonobject.getString("favicon"));
-> CHANGE 187 : 189 @ 202 : 205
+> CHANGE 6 : 8 @ 6 : 9
~ public JSONObject serialize(ServerStatusResponse serverstatusresponse) {
~ JSONObject jsonobject = new JSONObject();
-> CHANGE 190 : 192 @ 206 : 208
+> CHANGE 3 : 5 @ 4 : 6
~ jsonobject.put("description",
~ (Object) JSONTypeProvider.serialize(serverstatusresponse.getServerDescription()));
-> CHANGE 195 : 197 @ 211 : 213
+> CHANGE 5 : 7 @ 5 : 7
~ jsonobject.put("players",
~ (Object) JSONTypeProvider.serialize(serverstatusresponse.getPlayerCountData()));
-> CHANGE 200 : 202 @ 216 : 218
+> CHANGE 5 : 7 @ 5 : 7
~ jsonobject.put("version",
~ (Object) JSONTypeProvider.serialize(serverstatusresponse.getProtocolVersionInfo()));
-> CHANGE 205 : 206 @ 221 : 222
+> CHANGE 5 : 6 @ 5 : 6
~ jsonobject.put("favicon", serverstatusresponse.getFavicon());
diff --git a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java
index 70353de3..4f0c46f3 100644
--- a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java
@@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 5
+> CHANGE 1 : 4 @ 2 : 3
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> CHANGE 21 : 22 @ 20 : 21
+> CHANGE 18 : 19 @ 16 : 17
~ this.profile = new GameProfile((EaglercraftUUID) null, parPacketBuffer.readStringFromBuffer(16));
diff --git a/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java b/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java
index 28978568..28e45f2c 100644
--- a/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java
@@ -9,22 +9,22 @@
~
-> DELETE 7 @ 9 : 10
+> DELETE 4 @ 6 : 7
-> CHANGE 15 : 19 @ 18 : 22
+> CHANGE 8 : 12 @ 9 : 13
~ // public C01PacketEncryptionResponse(SecretKey secretKey, PublicKey publicKey, byte[] verifyToken) {
~ // this.secretKeyEncrypted = CryptManager.encryptData(publicKey, secretKey.getEncoded());
~ // this.verifyTokenEncrypted = CryptManager.encryptData(publicKey, verifyToken);
~ // }
-> CHANGE 34 : 37 @ 37 : 40
+> CHANGE 19 : 22 @ 19 : 22
~ // public SecretKey getSecretKey(PrivateKey key) {
~ // return CryptManager.decryptSharedKey(key, this.secretKeyEncrypted);
~ // }
-> CHANGE 38 : 41 @ 41 : 44
+> CHANGE 4 : 7 @ 4 : 7
~ // public byte[] getVerifyToken(PrivateKey key) {
~ // return key == null ? this.verifyTokenEncrypted : CryptManager.decryptData(key, this.verifyTokenEncrypted);
diff --git a/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java b/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java
index 1e27e248..9145e0f9 100644
--- a/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java
@@ -9,13 +9,13 @@
~
-> DELETE 7 @ 7 : 8
+> DELETE 4 @ 4 : 5
-> CHANGE 10 : 11 @ 11 : 12
+> CHANGE 3 : 4 @ 4 : 5
~ // private PublicKey publicKey;
-> CHANGE 16 : 21 @ 17 : 22
+> CHANGE 6 : 11 @ 6 : 11
~ // public S01PacketEncryptionRequest(String serverId, PublicKey key, byte[] verifyToken) {
~ // this.hashedServerId = serverId;
@@ -23,19 +23,19 @@
~ // this.verifyToken = verifyToken;
~ // }
-> CHANGE 24 : 27 @ 25 : 26
+> CHANGE 8 : 11 @ 8 : 9
~ // this.publicKey =
~ // CryptManager.decodePublicKey(parPacketBuffer.readByteArray());
~ parPacketBuffer.readByteArray(); // skip
-> CHANGE 31 : 34 @ 30 : 33
+> CHANGE 7 : 10 @ 5 : 8
~ // parPacketBuffer.writeString(this.hashedServerId);
~ // parPacketBuffer.writeByteArray(this.publicKey.getEncoded());
~ // parPacketBuffer.writeByteArray(this.verifyToken);
-> CHANGE 44 : 47 @ 43 : 46
+> CHANGE 13 : 16 @ 13 : 16
~ // public PublicKey getPublicKey() {
~ // return this.publicKey;
diff --git a/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java b/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java
index 3843f530..4d2148cc 100644
--- a/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java
+++ b/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java
@@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3
-> CHANGE 3 : 6 @ 4 : 5
+> CHANGE 1 : 4 @ 2 : 3
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-> CHANGE 23 : 24 @ 22 : 23
+> CHANGE 20 : 21 @ 18 : 19
~ EaglercraftUUID uuid = EaglercraftUUID.fromString(s);
-> CHANGE 28 : 29 @ 27 : 28
+> CHANGE 5 : 6 @ 5 : 6
~ EaglercraftUUID uuid = this.profile.getId();
diff --git a/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java b/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java
index f31ed4b0..e7b6e6d5 100644
--- a/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java
@@ -11,6 +11,6 @@
+ import org.apache.commons.lang3.StringUtils;
+
-> DELETE 10 @ 7 : 8
+> DELETE 7 @ 4 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java b/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java
index c93b66df..6335ae13 100644
--- a/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 5 @ 4
+> INSERT 1 : 3 @ 2
+
+ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
diff --git a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java
index 126e355c..8e5589ff 100644
--- a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java
@@ -10,16 +10,16 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> DELETE 8 @ 8 : 9
+> DELETE 5 @ 5 : 6
-> CHANGE 10 : 11 @ 11 : 12
+> CHANGE 2 : 3 @ 3 : 4
~ private EaglercraftUUID id;
-> CHANGE 15 : 16 @ 16 : 17
+> CHANGE 5 : 6 @ 5 : 6
~ public C18PacketSpectate(EaglercraftUUID id) {
-> DELETE 31 @ 32 : 35
+> DELETE 16 @ 16 : 19
> EOF
diff --git a/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java b/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java
index 3dce0c27..f1dfe501 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java
@@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
-> CHANGE 17 : 18 @ 16 : 17
+> CHANGE 13 : 14 @ 12 : 13
~ private EaglercraftUUID playerId;
-> CHANGE 83 : 84 @ 82 : 83
+> CHANGE 66 : 67 @ 66 : 67
~ public EaglercraftUUID getPlayer() {
diff --git a/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java b/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java
index ddc72068..048cd4a5 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java
@@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 3
-> CHANGE 6 : 10 @ 7 : 8
+> CHANGE 4 : 8 @ 5 : 6
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
~
~ import com.google.common.collect.Lists;
~
-> CHANGE 45 : 46 @ 43 : 44
+> CHANGE 39 : 40 @ 36 : 37
~ EaglercraftUUID uuid = parPacketBuffer.readUuid();
diff --git a/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java b/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java
index 141bb2e6..863cb5cb 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java
@@ -7,21 +7,21 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Lists;
+
-> CHANGE 81 : 82 @ 79 : 80
+> CHANGE 77 : 78 @ 74 : 75
~ for (ExtendedBlockStorage extendedblockstorage1 : (ArrayList) arraylist) {
-> CHANGE 90 : 91 @ 88 : 89
+> CHANGE 9 : 10 @ 9 : 10
~ for (ExtendedBlockStorage extendedblockstorage2 : (ArrayList) arraylist) {
-> CHANGE 96 : 97 @ 94 : 95
+> CHANGE 6 : 7 @ 6 : 7
~ for (ExtendedBlockStorage extendedblockstorage3 : (ArrayList) arraylist) {
diff --git a/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java b/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java
index 5370dcf8..b6410995 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 8 @ 7 : 8
+> DELETE 4 @ 3 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java b/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java
index 87f357f4..ee5b2dc8 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java b/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java
index fdf5b51e..6bc3b959 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java
@@ -11,6 +11,6 @@
+ import org.apache.commons.lang3.Validate;
+
-> DELETE 10 @ 7 : 8
+> DELETE 7 @ 4 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java b/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java
index bb99c360..3827cac9 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 5 : 8 @ 6
+> INSERT 3 : 6 @ 4
+
+ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java
index 41be344f..b9ac5e22 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 6
-> CHANGE 4 : 10 @ 8 : 9
+> CHANGE 2 : 8 @ 6 : 7
~
~ import com.google.common.base.Objects;
@@ -16,9 +16,9 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property;
-> DELETE 23 @ 22 : 44
+> DELETE 19 @ 14 : 36
-> CHANGE 81 : 82 @ 102 : 155
+> CHANGE 58 : 59 @ 80 : 133
~ // server only
diff --git a/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java b/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java
index 87f357f4..ee5b2dc8 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java b/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java
index c93b66df..6335ae13 100644
--- a/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java
+++ b/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> INSERT 3 : 5 @ 4
+> INSERT 1 : 3 @ 2
+
+ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
diff --git a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java b/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java
index 52c61be6..3ccd40a1 100644
--- a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java
+++ b/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> INSERT 3 : 8 @ 5
+> INSERT 1 : 6 @ 3
+
+ import org.json.JSONException;
@@ -15,13 +15,13 @@
+
+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
-> DELETE 13 @ 10 : 11
+> DELETE 10 @ 5 : 6
-> CHANGE 16 : 17 @ 14 : 23
+> CHANGE 3 : 4 @ 4 : 13
~
-> CHANGE 27 : 33 @ 33 : 35
+> CHANGE 11 : 17 @ 19 : 21
~ try {
~ this.response = (ServerStatusResponse) JSONTypeProvider.deserialize(
@@ -30,7 +30,7 @@
~ throw new IOException("Invalid ServerStatusResponse JSON payload", exc);
~ }
-> CHANGE 36 : 41 @ 38 : 39
+> CHANGE 9 : 14 @ 5 : 6
~ try {
~ parPacketBuffer.writeString(((JSONObject) JSONTypeProvider.serialize(this.response)).toString());
diff --git a/patches/minecraft/net/minecraft/potion/Potion.edit.java b/patches/minecraft/net/minecraft/potion/Potion.edit.java
index d3ffb813..c02590df 100644
--- a/patches/minecraft/net/minecraft/potion/Potion.edit.java
+++ b/patches/minecraft/net/minecraft/potion/Potion.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
-> DELETE 3 @ 4 : 6
+> DELETE 1 @ 2 : 4
-> INSERT 4 : 9 @ 7
+> INSERT 1 : 6 @ 3
+ import java.util.Set;
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
@@ -17,13 +17,13 @@
+ import com.google.common.collect.Maps;
+
-> DELETE 17 @ 15 : 20
+> DELETE 13 @ 8 : 13
-> CHANGE 140 : 141 @ 143 : 146
+> CHANGE 123 : 124 @ 128 : 131
~ // multiplayer only
-> CHANGE 242 : 244 @ 247 : 249
+> CHANGE 102 : 104 @ 104 : 106
~ AttributeModifier attributemodifier = new AttributeModifier(EaglercraftUUID.fromString(parString1),
~ this.getName(), parDouble1, parInt1);
diff --git a/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java b/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java
index 8fc49178..238f84f8 100644
--- a/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java
+++ b/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java
@@ -10,6 +10,6 @@
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-> DELETE 6 @ 4 : 7
+> DELETE 4 @ 2 : 5
> EOF
diff --git a/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java b/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java
index 01df8f1c..48a11e1f 100644
--- a/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java
+++ b/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4
-> CHANGE 6 : 10 @ 8 : 10
+> CHANGE 4 : 8 @ 6 : 8
~
~ import com.google.common.collect.Lists;
diff --git a/patches/minecraft/net/minecraft/profiler/Profiler.edit.java b/patches/minecraft/net/minecraft/profiler/Profiler.edit.java
index 6c6665fa..bc35fbf1 100644
--- a/patches/minecraft/net/minecraft/profiler/Profiler.edit.java
+++ b/patches/minecraft/net/minecraft/profiler/Profiler.edit.java
@@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 4
-> DELETE 6 @ 8 : 10
+> DELETE 4 @ 6 : 8
-> INSERT 7 : 13 @ 11
+> INSERT 1 : 7 @ 3
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
diff --git a/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java b/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java
index 681a62af..c0406de9 100644
--- a/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 5
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java
index 4efef00e..f8171f15 100644
--- a/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java
@@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 3
-> INSERT 4 : 7 @ 5
+> INSERT 2 : 5 @ 3
+
+ import com.google.common.collect.Maps;
+
-> DELETE 8 @ 6 : 9
+> DELETE 4 @ 1 : 4
> EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/Score.edit.java b/patches/minecraft/net/minecraft/scoreboard/Score.edit.java
index bc4b50ea..4d6a6660 100644
--- a/patches/minecraft/net/minecraft/scoreboard/Score.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/Score.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 6 @ 5 : 7
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java
index 681a62af..c0406de9 100644
--- a/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 5
+> DELETE 2 @ 1 : 2
> EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java
index 3efecf12..e888843e 100644
--- a/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java
@@ -9,6 +9,6 @@
+
-> DELETE 5 @ 4 : 6
+> DELETE 2 @ 1 : 3
> EOF
diff --git a/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java
index 0de3756b..31246713 100644
--- a/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java
@@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 3
-> CHANGE 4 : 7 @ 5 : 7
+> CHANGE 2 : 5 @ 3 : 5
~
~ import com.google.common.collect.Sets;
diff --git a/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java b/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java
index 9ce5ef5d..ede87914 100644
--- a/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java
+++ b/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java
@@ -7,24 +7,24 @@
> DELETE 2 @ 2 : 4
-> INSERT 7 : 11 @ 9
+> INSERT 5 : 9 @ 7
+
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+
-> DELETE 13 @ 11 : 15
+> DELETE 6 @ 2 : 6
-> CHANGE 40 : 41 @ 42 : 43
+> CHANGE 27 : 28 @ 31 : 32
~ this.scoreObjectiveCriterias.put(criteria, (List) object);
-> CHANGE 73 : 74 @ 75 : 76
+> CHANGE 33 : 34 @ 33 : 34
~ this.entitiesScoreObjectives.put(name, (Map) object);
-> CHANGE 135 : 136 @ 137 : 138
+> CHANGE 62 : 63 @ 62 : 63
~ for (Map map : (Collection