fzorb/eaglercraft-1.8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made ECR diffs more preview-friendly in future commits

Browse Source
This commit is contained in:
LAX1DUDE 2022-12-29 22:10:05 -08:00
parent 3d6bbb672c
commit 67a922d528
701 changed files with 3835 additions and 3747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
buildtools/BuildTools.jar
View File

Binary file not shown.

52
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/gui/CompileLatestClientFrame.java
View File

@ -45,6 +45,9 @@ import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import javax.swing.event.HyperlinkListener; 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.gui.TeaVMBinaries.MissingJARsException;
import net.lax1dude.eaglercraft.v1_8.buildtools.task.init.FFMPEG; import net.lax1dude.eaglercraft.v1_8.buildtools.task.init.FFMPEG;
@ -1155,7 +1158,7 @@ public class CompileLatestClientFrame {
txtpnLogOutput.setAutoscrolls(false); txtpnLogOutput.setAutoscrolls(false);
txtpnLogOutput.setMargin(new Insets(10, 10, 10, 10)); txtpnLogOutput.setMargin(new Insets(10, 10, 10, 10));
txtpnLogOutput.setContentType("text/html"); txtpnLogOutput.setContentType("text/html");
txtpnLogOutput.setText("<html><head><title>shit</title></head><body></body></html>"); txtpnLogOutput.setText("<html><head><title>shit</title><style type=\"text/css\">pre{font-family:\"Consolas\",\"Andale Mono\",monospace;}</style></head><body id=\"logContainer\" style=\"margin:0px;\"><pre></pre></body></html>");
txtpnLogOutput.setEditable(false); txtpnLogOutput.setEditable(false);
scrollPane.setViewportView(txtpnLogOutput); scrollPane.setViewportView(txtpnLogOutput);
@ -1192,18 +1195,30 @@ public class CompileLatestClientFrame {
panel_29.setLayout(null); 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 logDirty = false;
private volatile boolean isError = false; private volatile boolean isError = false;
public void logInfo(String line) { public void logInfo(String line) {
line = htmlentities2(line); line = htmlentities2(line);
synchronized(logAccum) { synchronized(logAccum) {
if(logAccum.length() > 0) {
if(isError) { if(isError) {
isError = false; isError = false;
logAccum.append("</pre><pre>"); logAccum.append("</pre><pre>");
} }
logAccum.append(line); logAccum.append(line);
}else {
if(isError) {
isError = false;
logAccum.append("<pre>");
logAccum.append(line);
}else {
logAccumPrev.append(line);
}
}
logDirty = true; logDirty = true;
} }
} }
@ -1211,11 +1226,21 @@ public class CompileLatestClientFrame {
public void logError(String line) { public void logError(String line) {
line = htmlentities2(line); line = htmlentities2(line);
synchronized(logAccum) { synchronized(logAccum) {
if(logAccum.length() > 0) {
if(!isError) { if(!isError) {
isError = true; isError = true;
logAccum.append("</pre><pre style=\"color:#BB0000;\">"); logAccum.append("</pre><pre style=\"color:#BB0000;\">");
} }
logAccum.append(line); logAccum.append(line);
}else {
if(!isError) {
isError = true;
logAccum.append("<pre style=\"color:#BB0000;\">");
logAccum.append(line);
}else {
logAccumPrev.append(line);
}
}
logDirty = true; logDirty = true;
} }
} }
@ -1226,12 +1251,31 @@ public class CompileLatestClientFrame {
public void run() { public void run() {
while(true) { while(true) {
try { try {
Thread.sleep(150l); Thread.sleep(100l);
synchronized(logAccum) { synchronized(logAccum) {
if(logDirty) { if(logDirty) {
EventQueue.invokeAndWait(new Runnable() { EventQueue.invokeAndWait(new Runnable() {
public void run() { public void run() {
txtpnLogOutput.setText("<html><head><title>shit</title><style type=\"text/css\">pre{font-family:\"Consolas\",\"Andale Mono\",monospace;}</style></head><body><p style=\"margin:0px;\"><pre>" + logAccum + "</pre></p></body></html>"); 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("</pre>");
try {
ee.insertBeforeEnd(logAccumBody, logAccum.toString());
} catch (BadLocationException e) {
} catch (IOException e) {
}
logAccum = new StringBuilder();
}
} }
}); });
EventQueue.invokeAndWait(new Runnable() { EventQueue.invokeAndWait(new Runnable() {

23
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java
View File

@ -42,6 +42,8 @@ public class EaglerContextRedacted {
output.println("# Author: lax1dude"); output.println("# Author: lax1dude");
output.println(); output.println();
int lastSourcePos = 0;
int lastTargetPos = 0;
List<AbstractDelta<String>> deltas = patch.getDeltas(); List<AbstractDelta<String>> deltas = patch.getDeltas();
delta_itr: for(int i = 0, l = deltas.size(); i < l; ++i) { delta_itr: for(int i = 0, l = deltas.size(); i < l; ++i) {
AbstractDelta<String> delta = deltas.get(i); AbstractDelta<String> delta = deltas.get(i);
@ -72,13 +74,17 @@ public class EaglerContextRedacted {
int sourcePos = source.getPosition(); int sourcePos = source.getPosition();
int sourceLen = source.getLines().size(); int sourceLen = source.getLines().size();
int sourcePosRelative = sourcePos - lastSourcePos;
Chunk<String> target = delta.getTarget(); Chunk<String> target = delta.getTarget();
int targetPos = target.getPosition(); int targetPos = target.getPosition();
List<String> linesToWrite = target.getLines(); List<String> linesToWrite = target.getLines();
int targetLen = linesToWrite.size(); int targetLen = linesToWrite.size();
output.println(blockType + " " + targetPos + (targetLen > 0 ? " : " + (targetPos + targetLen) : "") + " @ " int targetPosRelative = targetPos - lastTargetPos;
+ sourcePos + (sourceLen > 0 ? " : " + (sourcePos + sourceLen) : ""));
output.println(blockType + " " + targetPosRelative + (targetLen > 0 ? " : " + (targetPosRelative + targetLen) : "") + " @ "
+ sourcePosRelative + (sourceLen > 0 ? " : " + (sourcePosRelative + sourceLen) : ""));
output.println(); output.println();
@ -89,6 +95,9 @@ public class EaglerContextRedacted {
output.println(); output.println();
} }
lastSourcePos = sourcePos;
lastTargetPos = targetPos;
} }
output.println("> EOF"); output.println("> EOF");
@ -104,6 +113,8 @@ public class EaglerContextRedacted {
int targetLen = 0; int targetLen = 0;
List<String> targetLines = null; List<String> targetLines = null;
int lastSourcePos = 0;
int lastTargetPos = 0;
String line; String line;
readLinesLoop: while((line = reader.readLine()) != null) { readLinesLoop: while((line = reader.readLine()) != null) {
if(line.length() < 2) { if(line.length() < 2) {
@ -145,7 +156,9 @@ public class EaglerContextRedacted {
} }
if(currentDeltaType != null) { 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]) { switch(split[0]) {
@ -214,7 +227,9 @@ public class EaglerContextRedacted {
} }
if(currentDeltaType != null) { 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; return newPatch;

1
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java
View File

@ -209,6 +209,7 @@ public class DecompileMinecraft {
ApplyPatchesToZip.applyPatches(formatOut, null, new File(EaglerBuildTools.repositoryRoot, "patches/minecraft"), patchOut, true, true); ApplyPatchesToZip.applyPatches(formatOut, null, new File(EaglerBuildTools.repositoryRoot, "patches/minecraft"), patchOut, true, true);
}catch(Throwable t) { }catch(Throwable t) {
System.err.println("ERROR: Could not apply 'patches' directory to: " + patchOut.getName()); System.err.println("ERROR: Could not apply 'patches' directory to: " + patchOut.getName());
t.printStackTrace();
return false; return false;
} }

28
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/util/JARSubprocess.java
View File

@ -5,6 +5,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
/** /**
* Copyright (c) 2022 LAX1DUDE. All Rights Reserved. * Copyright (c) 2022 LAX1DUDE. All Rights Reserved.
@ -27,6 +29,10 @@ public class JARSubprocess {
classPathSeperator = System.getProperty("os.name").toLowerCase().contains("windows") ? ';' : ':'; classPathSeperator = System.getProperty("os.name").toLowerCase().contains("windows") ? ';' : ':';
} }
private static final List<Process> activeProcesses = new ArrayList();
private static boolean shutdownThreadStarted = false;
public static int runJava(File directory, String[] javaExeArguments, String logPrefix) throws IOException { public static int runJava(File directory, String[] javaExeArguments, String logPrefix) throws IOException {
if(logPrefix.length() > 0 && !logPrefix.endsWith(" ")) { if(logPrefix.length() > 0 && !logPrefix.endsWith(" ")) {
logPrefix = logPrefix + " "; logPrefix = logPrefix + " ";
@ -60,6 +66,28 @@ public class JARSubprocess {
exec.directory(directory); exec.directory(directory);
Process ps = exec.start(); 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 is = ps.getInputStream();
InputStream ise = ps.getErrorStream(); InputStream ise = ps.getErrorStream();
BufferedReader isb = new BufferedReader(new InputStreamReader(is)); BufferedReader isb = new BufferedReader(new InputStreamReader(is));

26
patches/minecraft/net/minecraft/block/Block.edit.java
View File

@ -10,47 +10,47 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ 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) { ~ 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) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 387 : 388 @ 519 : 520 > CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ 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) { ~ public int quantityDroppedWithBonus(int fortune, EaglercraftRandom random) {
> INSERT 800 : 801 @ 961 > INSERT 137 : 138 @ 137
+ bootstrapStates(); + bootstrapStates();
> INSERT 1269 : 1309 @ 1429 > INSERT 469 : 509 @ 468
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ BlockBed.bootstrapStates(); + BlockBed.bootstrapStates();

4
patches/minecraft/net/minecraft/block/BlockAnvil.edit.java
View File

@ -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, + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
+ EnumFacing side, float hitX, float hitY, float hitZ) { + EnumFacing side, float hitX, float hitY, float hitZ) {

2
patches/minecraft/net/minecraft/block/BlockBanner.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState state, EaglercraftRandom rand, int fortune) {

10
patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java
View File

@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ 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 > EOF

12
patches/minecraft/net/minecraft/block/BlockBeacon.edit.java
View File

@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 4 > 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; ~ return true;
> DELETE 69 @ 86 : 115 > DELETE 40 @ 50 : 79
> EOF > EOF

18
patches/minecraft/net/minecraft/block/BlockBed.edit.java
View File

@ -10,32 +10,32 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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<BlockBed.EnumPartType> PART; ~ public static PropertyEnum<BlockBed.EnumPartType> PART;
> INSERT 31 : 35 @ 36 > INSERT 10 : 14 @ 11
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ PART = PropertyEnum.<BlockBed.EnumPartType>create("part", BlockBed.EnumPartType.class); + PART = PropertyEnum.<BlockBed.EnumPartType>create("part", BlockBed.EnumPartType.class);
+ } + }
+ +
> CHANGE 37 : 38 @ 38 : 90 > CHANGE 6 : 7 @ 2 : 54
~ return true; ~ 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) { ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {

4
patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 16 : 17 @ 16 : 17 > CHANGE 14 : 15 @ 14 : 15
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 20 : 21 @ 20 : 21 > CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

8
patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java
View File

@ -10,17 +10,17 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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; ~ return true;
> CHANGE 87 : 88 @ 98 : 99 > CHANGE 14 : 15 @ 24 : 25
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

2
patches/minecraft/net/minecraft/block/BlockBush.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {

8
patches/minecraft/net/minecraft/block/BlockButton.edit.java
View File

@ -7,12 +7,12 @@
> DELETE 2 @ 2 : 5 > 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 > EOF

2
patches/minecraft/net/minecraft/block/BlockCactus.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {

4
patches/minecraft/net/minecraft/block/BlockCake.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 103 : 104 @ 103 : 104 > CHANGE 101 : 102 @ 101 : 102
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 107 : 108 @ 107 : 108 > CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

12
patches/minecraft/net/minecraft/block/BlockCauldron.edit.java
View File

@ -10,19 +10,19 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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; ~ return true;
> CHANGE 77 : 78 @ 181 : 182 > CHANGE 18 : 19 @ 105 : 106
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

6
patches/minecraft/net/minecraft/block/BlockChest.edit.java
View File

@ -7,13 +7,13 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> DELETE 17 @ 19 : 20 > DELETE 15 @ 17 : 18
> CHANGE 131 : 132 @ 134 : 206 > CHANGE 114 : 115 @ 115 : 187
~ return state; ~ return state;
> CHANGE 249 : 250 @ 323 : 338 > CHANGE 118 : 119 @ 189 : 204
~ return true; ~ return true;

4
patches/minecraft/net/minecraft/block/BlockClay.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 20 : 21 @ 20 : 21 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {

6
patches/minecraft/net/minecraft/block/BlockCocoa.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ 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) { ~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {

6
patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java
View File

@ -10,13 +10,13 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public int quantityDropped(EaglercraftRandom var1) {

10
patches/minecraft/net/minecraft/block/BlockCrops.edit.java
View File

@ -10,21 +10,21 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ 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) { ~ 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) { ~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) {

4
patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 70 : 71 @ 70 : 86 > CHANGE 67 : 68 @ 67 : 83
~ return true; ~ return true;
> CHANGE 76 : 77 @ 91 : 92 > CHANGE 6 : 7 @ 21 : 22
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

10
patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java
View File

@ -10,16 +10,16 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> DELETE 36 @ 42 : 53 > DELETE 4 @ 4 : 15
> EOF > EOF

4
patches/minecraft/net/minecraft/block/BlockDirt.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 21 : 22 @ 21 : 23 > CHANGE 18 : 19 @ 18 : 20
~ public static PropertyEnum<BlockDirt.DirtType> VARIANT; ~ public static PropertyEnum<BlockDirt.DirtType> VARIANT;
> INSERT 31 : 35 @ 32 > INSERT 10 : 14 @ 11
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.<BlockDirt.DirtType>create("variant", BlockDirt.DirtType.class); + VARIANT = PropertyEnum.<BlockDirt.DirtType>create("variant", BlockDirt.DirtType.class);

12
patches/minecraft/net/minecraft/block/BlockDispenser.edit.java
View File

@ -10,20 +10,20 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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(); ~ 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; ~ return true;
> DELETE 87 @ 135 : 142 > DELETE 38 @ 52 : 59
> EOF > EOF

10
patches/minecraft/net/minecraft/block/BlockDoor.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 29 : 30 @ 29 : 31 > CHANGE 27 : 28 @ 27 : 29
~ public static PropertyEnum<BlockDoor.EnumHingePosition> HINGE; ~ public static PropertyEnum<BlockDoor.EnumHingePosition> HINGE;
> CHANGE 31 : 32 @ 32 : 34 > CHANGE 2 : 3 @ 3 : 5
~ public static PropertyEnum<BlockDoor.EnumDoorHalf> HALF; ~ public static PropertyEnum<BlockDoor.EnumDoorHalf> HALF;
> INSERT 40 : 45 @ 42 > INSERT 9 : 14 @ 10
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ HINGE = PropertyEnum.<BlockDoor.EnumHingePosition>create("hinge", BlockDoor.EnumHingePosition.class); + HINGE = PropertyEnum.<BlockDoor.EnumHingePosition>create("hinge", BlockDoor.EnumHingePosition.class);
@ -26,11 +26,11 @@
+ } + }
+ +
> CHANGE 180 : 181 @ 177 : 182 > CHANGE 140 : 141 @ 135 : 140
~ if (!flag1) { ~ if (!flag1) {
> CHANGE 196 : 197 @ 197 : 198 > CHANGE 16 : 17 @ 20 : 21
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {

18
patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java
View File

@ -10,14 +10,14 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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<BlockDoublePlant.EnumPlantType> VARIANT; ~ public static PropertyEnum<BlockDoublePlant.EnumPlantType> VARIANT;
~ public static PropertyEnum<BlockDoublePlant.EnumBlockHalf> HALF; ~ public static PropertyEnum<BlockDoublePlant.EnumBlockHalf> HALF;
> INSERT 40 : 45 @ 48 > INSERT 15 : 20 @ 17
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.<BlockDoublePlant.EnumPlantType>create("variant", BlockDoublePlant.EnumPlantType.class); + VARIANT = PropertyEnum.<BlockDoublePlant.EnumPlantType>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) { ~ 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) { ~ 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) { ~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState var4) {

6
patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ for (int j = 0; j < 128; ++j) {
~ double d0 = worldIn.rand.nextDouble(); ~ double d0 = worldIn.rand.nextDouble();
@ -30,6 +30,6 @@
~ worldIn.spawnParticle(EnumParticleTypes.PORTAL, d1, d2, d3, (double) f, (double) f1, ~ worldIn.spawnParticle(EnumParticleTypes.PORTAL, d1, d2, d3, (double) f, (double) f1,
~ (double) f2, new int[0]); ~ (double) f2, new int[0]);
> DELETE 89 @ 95 : 96 > DELETE 14 @ 19 : 20
> EOF > EOF

6
patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java
View File

@ -9,15 +9,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 102 : 103 @ 104 : 105 > CHANGE 76 : 77 @ 76 : 77
~ Set<EnumFacing> set = this.getPossibleFlowDirections(world, blockpos); ~ Set<EnumFacing> set = this.getPossibleFlowDirections(world, blockpos);

4
patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 75 : 76 @ 75 : 85 > CHANGE 44 : 45 @ 44 : 54
~ return true; ~ return true;

4
patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 50 : 51 @ 50 : 51 > CHANGE 47 : 48 @ 47 : 48
~ public int quantityDropped(EaglercraftRandom var1) { ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {

2
patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

12
patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java
View File

@ -10,23 +10,23 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 48 : 49 @ 50 : 51 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 69 : 70 @ 71 : 87 > CHANGE 21 : 22 @ 21 : 37
~ return true; ~ return true;
> CHANGE 76 : 77 @ 93 : 94 > CHANGE 7 : 8 @ 22 : 23
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {

2
patches/minecraft/net/minecraft/block/BlockFalling.edit.java
View File

@ -7,6 +7,6 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> DELETE 30 @ 32 : 66 > DELETE 28 @ 30 : 64
> EOF > EOF

8
patches/minecraft/net/minecraft/block/BlockFarmland.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {

4
patches/minecraft/net/minecraft/block/BlockFence.edit.java
View File

@ -9,9 +9,9 @@
~ ~
> DELETE 14 @ 15 : 16 > DELETE 11 @ 12 : 13
> CHANGE 144 : 145 @ 146 : 147 > CHANGE 130 : 131 @ 131 : 132
~ return true; ~ return true;

2
patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java
View File

@ -7,6 +7,6 @@
> DELETE 2 @ 2 : 5 > DELETE 2 @ 2 : 5
> DELETE 114 @ 117 : 139 > DELETE 112 @ 115 : 137
> EOF > EOF

10
patches/minecraft/net/minecraft/block/BlockFire.edit.java
View File

@ -7,26 +7,26 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 7 @ 4 : 7 > CHANGE 1 : 5 @ 2 : 5
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
~ import com.google.common.collect.Maps; ~ import com.google.common.collect.Maps;
~ ~
> CHANGE 125 : 126 @ 125 : 126 > CHANGE 122 : 123 @ 121 : 122
~ public int quantityDropped(EaglercraftRandom var1) { ~ 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) { ~ 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) { ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {

2
patches/minecraft/net/minecraft/block/BlockFlower.edit.java
View File

@ -11,7 +11,7 @@
+ import java.util.List; + import java.util.List;
+ +
> CHANGE 8 : 9 @ 5 : 9 > CHANGE 6 : 7 @ 3 : 7
~ ~

6
patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java
View File

@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 29 : 30 @ 33 : 35 > CHANGE 27 : 28 @ 31 : 33
~ public static PropertyEnum<BlockFlowerPot.EnumFlowerType> CONTENTS; ~ public static PropertyEnum<BlockFlowerPot.EnumFlowerType> CONTENTS;
> INSERT 38 : 42 @ 43 > INSERT 9 : 13 @ 10
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ CONTENTS = PropertyEnum.<BlockFlowerPot.EnumFlowerType>create("contents", BlockFlowerPot.EnumFlowerType.class); + CONTENTS = PropertyEnum.<BlockFlowerPot.EnumFlowerType>create("contents", BlockFlowerPot.EnumFlowerType.class);
+ } + }
+ +
> CHANGE 166 : 167 @ 167 : 168 > CHANGE 128 : 129 @ 124 : 125
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

8
patches/minecraft/net/minecraft/block/BlockFurnace.edit.java
View File

@ -10,17 +10,17 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 69 : 70 @ 96 : 107 > CHANGE 31 : 32 @ 56 : 67
~ return true; ~ return true;

2
patches/minecraft/net/minecraft/block/BlockGlass.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 14 : 15 @ 14 : 15 > CHANGE 12 : 13 @ 12 : 13
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {

6
patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 18 : 19 @ 18 : 19 > CHANGE 16 : 17 @ 16 : 17
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
> CHANGE 22 : 23 @ 22 : 23 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 26 : 27 @ 26 : 27 > CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

6
patches/minecraft/net/minecraft/block/BlockGrass.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ 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) { ~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState var4) {

2
patches/minecraft/net/minecraft/block/BlockGravel.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {

6
patches/minecraft/net/minecraft/block/BlockHopper.edit.java
View File

@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 6 > CHANGE 1 : 4 @ 2 : 4
~ ~
~ import com.google.common.base.Predicate; ~ 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; ~ return true;

6
patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 18 : 19 @ 18 : 20 > CHANGE 16 : 17 @ 16 : 18
~ public static PropertyEnum<BlockHugeMushroom.EnumType> VARIANT; ~ public static PropertyEnum<BlockHugeMushroom.EnumType> VARIANT;
> CHANGE 28 : 33 @ 29 : 30 > CHANGE 10 : 15 @ 11 : 12
~ public static void bootstrapStates() { ~ public static void bootstrapStates() {
~ VARIANT = PropertyEnum.<BlockHugeMushroom.EnumType>create("variant", BlockHugeMushroom.EnumType.class); ~ VARIANT = PropertyEnum.<BlockHugeMushroom.EnumType>create("variant", BlockHugeMushroom.EnumType.class);
@ -22,7 +22,7 @@
~ ~
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 49 : 50 @ 46 : 47 > CHANGE 21 : 22 @ 17 : 18
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

4
patches/minecraft/net/minecraft/block/BlockIce.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 55 : 56 @ 56 : 57 > CHANGE 53 : 54 @ 54 : 55
~ public int quantityDropped(EaglercraftRandom var1) { ~ 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) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {

10
patches/minecraft/net/minecraft/block/BlockJukebox.edit.java
View File

@ -7,14 +7,14 @@
> DELETE 2 @ 2 : 3 > 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 > EOF

10
patches/minecraft/net/minecraft/block/BlockLeaves.edit.java
View File

@ -10,20 +10,20 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 90 : 91 @ 177 : 178 > CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> DELETE 94 @ 181 : 209 > DELETE 4 @ 4 : 32
> EOF > EOF

6
patches/minecraft/net/minecraft/block/BlockLever.edit.java
View File

@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> CHANGE 19 : 20 @ 21 : 23 > CHANGE 17 : 18 @ 19 : 21
~ public static PropertyEnum<BlockLever.EnumOrientation> FACING; ~ public static PropertyEnum<BlockLever.EnumOrientation> FACING;
> INSERT 29 : 33 @ 32 > INSERT 10 : 14 @ 11
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ FACING = PropertyEnum.<BlockLever.EnumOrientation>create("facing", BlockLever.EnumOrientation.class); + FACING = PropertyEnum.<BlockLever.EnumOrientation>create("facing", BlockLever.EnumOrientation.class);
+ } + }
+ +
> CHANGE 154 : 155 @ 153 : 166 > CHANGE 125 : 126 @ 121 : 134
~ return true; ~ return true;

6
patches/minecraft/net/minecraft/block/BlockLiquid.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 112 : 113 @ 114 : 115 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) { ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {

4
patches/minecraft/net/minecraft/block/BlockLog.edit.java
View File

@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> CHANGE 13 : 14 @ 15 : 17 > CHANGE 11 : 12 @ 13 : 15
~ public static PropertyEnum<BlockLog.EnumAxis> LOG_AXIS = null; ~ public static PropertyEnum<BlockLog.EnumAxis> LOG_AXIS = null;
> INSERT 22 : 26 @ 25 > INSERT 9 : 13 @ 10
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ LOG_AXIS = PropertyEnum.<BlockLog.EnumAxis>create("axis", BlockLog.EnumAxis.class); + LOG_AXIS = PropertyEnum.<BlockLog.EnumAxis>create("axis", BlockLog.EnumAxis.class);

6
patches/minecraft/net/minecraft/block/BlockMelon.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 21 : 22 @ 21 : 22 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 25 : 26 @ 25 : 26 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {

4
patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 26 : 27 @ 26 : 27 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {

10
patches/minecraft/net/minecraft/block/BlockMushroom.edit.java
View File

@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public boolean canUseBonemeal(World var1, EaglercraftRandom random, BlockPos var3, IBlockState var4) {
> DELETE 76 @ 97 : 101 > DELETE 3 @ 3 : 7
> EOF > EOF

4
patches/minecraft/net/minecraft/block/BlockMycelium.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {

8
patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java
View File

@ -10,17 +10,17 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 51 : 52 @ 70 : 71 > CHANGE 4 : 5 @ 21 : 22
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {

12
patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java
View File

@ -7,21 +7,21 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 7 > CHANGE 1 : 4 @ 2 : 5
~ ~
~ import com.google.common.base.Predicate; ~ 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<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 25 : 33 @ 34 > INSERT 7 : 15 @ 12
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() {
@ -32,6 +32,6 @@
+ } + }
+ +
> DELETE 87 @ 88 : 99 > DELETE 62 @ 54 : 65
> EOF > EOF

6
patches/minecraft/net/minecraft/block/BlockNewLog.edit.java
View File

@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 6 > CHANGE 1 : 4 @ 2 : 4
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> CHANGE 16 : 17 @ 16 : 22 > CHANGE 13 : 14 @ 12 : 18
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 23 : 31 @ 28 > INSERT 7 : 15 @ 12
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() {

8
patches/minecraft/net/minecraft/block/BlockNote.edit.java
View File

@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 6 > CHANGE 1 : 4 @ 2 : 4
~ ~
~ import com.google.common.collect.Lists; ~ 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; ~ return true;
> DELETE 47 @ 60 : 71 > DELETE 3 @ 15 : 26
> EOF > EOF

2
patches/minecraft/net/minecraft/block/BlockObsidian.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

12
patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java
View File

@ -7,21 +7,21 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 7 > CHANGE 1 : 4 @ 2 : 5
~ ~
~ import com.google.common.base.Predicate; ~ 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<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 27 : 35 @ 36 > INSERT 7 : 15 @ 12
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() {
@ -32,6 +32,6 @@
+ } + }
+ +
> DELETE 118 @ 119 : 130 > DELETE 91 @ 83 : 94
> EOF > EOF

6
patches/minecraft/net/minecraft/block/BlockOldLog.edit.java
View File

@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 6 > CHANGE 1 : 4 @ 2 : 4
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> CHANGE 16 : 17 @ 16 : 22 > CHANGE 13 : 14 @ 12 : 18
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 23 : 31 @ 28 > INSERT 7 : 15 @ 12
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate<BlockPlanks.EnumType>() {

6
patches/minecraft/net/minecraft/block/BlockOre.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 34 : 35 @ 34 : 35 > CHANGE 8 : 9 @ 8 : 9
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 38 : 39 @ 38 : 39 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {

2
patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 14 : 15 @ 14 : 15 > CHANGE 12 : 13 @ 12 : 13
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {

2
patches/minecraft/net/minecraft/block/BlockPane.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int i) {

6
patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java
View File

@ -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 > EOF

6
patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 25 : 26 @ 26 : 28 > CHANGE 22 : 23 @ 23 : 25
~ public static PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE; ~ public static PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE;
> INSERT 37 : 42 @ 39 > INSERT 12 : 17 @ 13
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ TYPE = PropertyEnum.<BlockPistonExtension.EnumPistonType>create("type", + TYPE = PropertyEnum.<BlockPistonExtension.EnumPistonType>create("type",
@ -22,7 +22,7 @@
+ } + }
+ +
> CHANGE 86 : 87 @ 83 : 84 > CHANGE 49 : 50 @ 44 : 45
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {

12
patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java
View File

@ -10,25 +10,25 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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<BlockPistonExtension.EnumPistonType> TYPE; ~ public static PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE;
> INSERT 33 : 37 @ 37 > INSERT 9 : 13 @ 9
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ TYPE = BlockPistonExtension.TYPE; + TYPE = BlockPistonExtension.TYPE;
+ } + }
+ +
> CHANGE 82 : 83 @ 82 : 93 > CHANGE 49 : 50 @ 45 : 56
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ 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 > EOF

4
patches/minecraft/net/minecraft/block/BlockPlanks.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 16 : 17 @ 16 : 18 > CHANGE 13 : 14 @ 13 : 15
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 24 : 28 @ 25 > INSERT 8 : 12 @ 9
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.<BlockPlanks.EnumType>create("variant", BlockPlanks.EnumType.class); + VARIANT = PropertyEnum.<BlockPlanks.EnumType>create("variant", BlockPlanks.EnumType.class);

8
patches/minecraft/net/minecraft/block/BlockPortal.edit.java
View File

@ -11,19 +11,19 @@
~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache; ~ 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) { ~ 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) { ~ 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) { ~ 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); ~ EaglerLoadingCache loadingcache = BlockPattern.func_181627_a(parWorld, true);

4
patches/minecraft/net/minecraft/block/BlockPotato.edit.java
View File

@ -7,8 +7,8 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> DELETE 4 @ 6 : 9 > DELETE 2 @ 4 : 7
> DELETE 14 @ 19 : 28 > DELETE 10 @ 13 : 22
> EOF > EOF

2
patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java
View File

@ -9,7 +9,7 @@
~ ~
> CHANGE 35 : 36 @ 35 : 36 > CHANGE 32 : 33 @ 32 : 33
~ List<Entity> list; ~ List<Entity> list;

4
patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 17 : 18 @ 17 : 19 > CHANGE 14 : 15 @ 14 : 16
~ public static PropertyEnum<BlockPrismarine.EnumType> VARIANT; ~ public static PropertyEnum<BlockPrismarine.EnumType> VARIANT;
> INSERT 28 : 32 @ 29 > INSERT 11 : 15 @ 12
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.<BlockPrismarine.EnumType>create("variant", BlockPrismarine.EnumType.class); + VARIANT = PropertyEnum.<BlockPrismarine.EnumType>create("variant", BlockPrismarine.EnumType.class);

4
patches/minecraft/net/minecraft/block/BlockQuartz.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 20 : 21 @ 20 : 22 > CHANGE 17 : 18 @ 17 : 19
~ public static PropertyEnum<BlockQuartz.EnumType> VARIANT; ~ public static PropertyEnum<BlockQuartz.EnumType> VARIANT;
> INSERT 28 : 32 @ 29 > INSERT 8 : 12 @ 9
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.<BlockQuartz.EnumType>create("variant", BlockQuartz.EnumType.class); + VARIANT = PropertyEnum.<BlockQuartz.EnumType>create("variant", BlockQuartz.EnumType.class);

4
patches/minecraft/net/minecraft/block/BlockRail.edit.java
View File

@ -7,11 +7,11 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> CHANGE 10 : 11 @ 12 : 14 > CHANGE 8 : 9 @ 10 : 12
~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE; ~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE;
> INSERT 18 : 22 @ 21 > INSERT 8 : 12 @ 9
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ SHAPE = PropertyEnum.<BlockRailBase.EnumRailDirection>create("shape", BlockRailBase.EnumRailDirection.class); + SHAPE = PropertyEnum.<BlockRailBase.EnumRailDirection>create("shape", BlockRailBase.EnumRailDirection.class);

6
patches/minecraft/net/minecraft/block/BlockRailBase.edit.java
View File

@ -7,15 +7,15 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 5 > CHANGE 1 : 4 @ 2 : 3
~ ~
~ import com.google.common.collect.Lists; ~ 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; ~ return parIBlockState;

8
patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java
View File

@ -7,17 +7,17 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 6 @ 4 : 6 > CHANGE 1 : 4 @ 2 : 4
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> CHANGE 24 : 25 @ 24 : 33 > CHANGE 21 : 22 @ 20 : 29
~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE; ~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE;
> INSERT 34 : 46 @ 42 > INSERT 10 : 22 @ 18
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, + SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class,
@ -32,6 +32,6 @@
+ } + }
+ +
> DELETE 54 @ 50 : 67 > DELETE 20 @ 8 : 25
> EOF > EOF

4
patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 13 : 14 @ 14 : 23 > CHANGE 10 : 11 @ 11 : 20
~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE; ~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE;
> INSERT 23 : 35 @ 32 > INSERT 10 : 22 @ 18
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, + SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class,

4
patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 15 : 16 @ 16 : 18 > CHANGE 12 : 13 @ 13 : 15
~ public static PropertyEnum<BlockRedSandstone.EnumType> TYPE; ~ public static PropertyEnum<BlockRedSandstone.EnumType> TYPE;
> INSERT 23 : 27 @ 25 > INSERT 8 : 12 @ 9
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ TYPE = PropertyEnum.<BlockRedSandstone.EnumType>create("type", BlockRedSandstone.EnumType.class); + TYPE = PropertyEnum.<BlockRedSandstone.EnumType>create("type", BlockRedSandstone.EnumType.class);

10
patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java
View File

@ -7,29 +7,29 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 7 @ 4 : 8 > CHANGE 1 : 5 @ 2 : 6
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> CHANGE 32 : 33 @ 33 : 35 > CHANGE 29 : 30 @ 29 : 31
~ public static PropertyEnum<BlockRedstoneComparator.Mode> MODE; ~ public static PropertyEnum<BlockRedstoneComparator.Mode> MODE;
> INSERT 42 : 46 @ 44 > INSERT 10 : 14 @ 11
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ MODE = PropertyEnum.<BlockRedstoneComparator.Mode>create("mode", BlockRedstoneComparator.Mode.class); + MODE = PropertyEnum.<BlockRedstoneComparator.Mode>create("mode", BlockRedstoneComparator.Mode.class);
+ } + }
+ +
> CHANGE 50 : 51 @ 48 : 49 > CHANGE 8 : 9 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ 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) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {

4
patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {

2
patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java
View File

@ -10,7 +10,7 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

12
patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java
View File

@ -10,27 +10,27 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ 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) { ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
> CHANGE 72 : 73 @ 72 : 73 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom random) { ~ 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) { ~ 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; ~ EaglercraftRandom random = worldIn.rand;

4
patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {

10
patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java
View File

@ -7,7 +7,7 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> CHANGE 4 : 9 @ 6 : 9 > CHANGE 2 : 7 @ 4 : 7
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
@ -15,19 +15,19 @@
~ import com.google.common.collect.Maps; ~ 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) { ~ 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) { ~ 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) { ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {

16
patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java
View File

@ -7,25 +7,25 @@
> DELETE 2 @ 2 : 4 > DELETE 2 @ 2 : 4
> CHANGE 4 : 5 @ 6 : 7 > CHANGE 2 : 3 @ 4 : 5
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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.Lists;
~ import com.google.common.collect.Sets; ~ import com.google.common.collect.Sets;
~ ~
> CHANGE 30 : 34 @ 31 : 39 > CHANGE 24 : 28 @ 23 : 31
~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> NORTH; ~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> NORTH;
~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> EAST; ~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> EAST;
~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> SOUTH; ~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> SOUTH;
~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> WEST; ~ public static PropertyEnum<BlockRedstoneWire.EnumAttachPosition> WEST;
> INSERT 48 : 59 @ 53 > INSERT 18 : 29 @ 22
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ NORTH = PropertyEnum.<BlockRedstoneWire.EnumAttachPosition>create("north", + NORTH = PropertyEnum.<BlockRedstoneWire.EnumAttachPosition>create("north",
@ -39,17 +39,17 @@
+ } + }
+ +
> CHANGE 108 : 109 @ 102 : 103 > CHANGE 60 : 61 @ 49 : 50
~ ArrayList<BlockPos> arraylist = Lists.newArrayList(this.blocksNeedingUpdate); ~ ArrayList<BlockPos> 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) { ~ 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) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {

4
patches/minecraft/net/minecraft/block/BlockReed.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

4
patches/minecraft/net/minecraft/block/BlockSand.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 15 : 16 @ 15 : 17 > CHANGE 12 : 13 @ 12 : 14
~ public static PropertyEnum<BlockSand.EnumType> VARIANT; ~ public static PropertyEnum<BlockSand.EnumType> VARIANT;
> INSERT 21 : 25 @ 22 > INSERT 6 : 10 @ 7
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ VARIANT = PropertyEnum.<BlockSand.EnumType>create("variant", BlockSand.EnumType.class); + VARIANT = PropertyEnum.<BlockSand.EnumType>create("variant", BlockSand.EnumType.class);

4
patches/minecraft/net/minecraft/block/BlockSandStone.edit.java
View File

@ -9,11 +9,11 @@
~ ~
> CHANGE 16 : 17 @ 16 : 18 > CHANGE 13 : 14 @ 13 : 15
~ public static PropertyEnum<BlockSandStone.EnumType> TYPE; ~ public static PropertyEnum<BlockSandStone.EnumType> TYPE;
> INSERT 24 : 28 @ 25 > INSERT 8 : 12 @ 9
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ TYPE = PropertyEnum.<BlockSandStone.EnumType>create("type", BlockSandStone.EnumType.class); + TYPE = PropertyEnum.<BlockSandStone.EnumType>create("type", BlockSandStone.EnumType.class);

16
patches/minecraft/net/minecraft/block/BlockSapling.edit.java
View File

@ -10,31 +10,31 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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<BlockPlanks.EnumType> TYPE; ~ public static PropertyEnum<BlockPlanks.EnumType> TYPE;
> INSERT 29 : 33 @ 45 > INSERT 11 : 15 @ 12
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ TYPE = PropertyEnum.<BlockPlanks.EnumType>create("type", BlockPlanks.EnumType.class); + TYPE = PropertyEnum.<BlockPlanks.EnumType>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) { ~ 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) { ~ public boolean canUseBonemeal(World world, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
> DELETE 73 @ 193 : 197 > DELETE 4 @ 4 : 8
> EOF > EOF

6
patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 18 : 19 @ 18 : 19 > CHANGE 16 : 17 @ 16 : 17
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 22 : 23 @ 22 : 23 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {

4
patches/minecraft/net/minecraft/block/BlockSign.edit.java
View File

@ -10,11 +10,11 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 64 : 65 @ 64 : 71 > CHANGE 10 : 11 @ 10 : 17
~ return true; ~ return true;

8
patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java
View File

@ -10,13 +10,13 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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<BlockSilverfish.EnumType> VARIANT; ~ public static PropertyEnum<BlockSilverfish.EnumType> VARIANT;
> CHANGE 28 : 33 @ 32 : 33 > CHANGE 9 : 14 @ 10 : 11
~ public static void bootstrapStates() { ~ public static void bootstrapStates() {
~ VARIANT = PropertyEnum.<BlockSilverfish.EnumType>create("variant", BlockSilverfish.EnumType.class); ~ VARIANT = PropertyEnum.<BlockSilverfish.EnumType>create("variant", BlockSilverfish.EnumType.class);
@ -24,6 +24,6 @@
~ ~
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> DELETE 59 @ 59 : 70 > DELETE 31 @ 27 : 38
> EOF > EOF

22
patches/minecraft/net/minecraft/block/BlockSkull.edit.java
View File

@ -10,32 +10,32 @@
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 130 : 131 @ 153 : 155 > CHANGE 5 : 6 @ 5 : 7
~ return false; ~ return false;
> DELETE 134 @ 158 : 168 > DELETE 4 @ 5 : 15
> DELETE 135 @ 169 : 210 > DELETE 1 @ 11 : 52
> EOF > EOF

6
patches/minecraft/net/minecraft/block/BlockSlab.edit.java
View File

@ -10,18 +10,18 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 21 : 22 @ 21 : 23 > CHANGE 18 : 19 @ 18 : 20
~ public static PropertyEnum<BlockSlab.EnumBlockHalf> HALF; ~ public static PropertyEnum<BlockSlab.EnumBlockHalf> HALF;
> INSERT 34 : 38 @ 35 > INSERT 13 : 17 @ 14
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ HALF = PropertyEnum.<BlockSlab.EnumBlockHalf>create("half", BlockSlab.EnumBlockHalf.class); + HALF = PropertyEnum.<BlockSlab.EnumBlockHalf>create("half", BlockSlab.EnumBlockHalf.class);
+ } + }
+ +
> CHANGE 86 : 87 @ 83 : 84 > CHANGE 52 : 53 @ 48 : 49
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {

6
patches/minecraft/net/minecraft/block/BlockSnow.edit.java
View File

@ -10,15 +10,15 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ 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) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 104 : 105 @ 104 : 105 > CHANGE 4 : 5 @ 4 : 5
~ public int quantityDropped(EaglercraftRandom var1) { ~ 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) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {

Some files were not shown because too many files have changed in this diff Show More