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

Made future ECR diff commits even more preview friendly

Browse Source
This commit is contained in:
LAX1DUDE 2022-12-30 03:58:10 -08:00
parent 2f42cc9fb6
commit 7759d27cc2
699 changed files with 3755 additions and 3753 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.

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

@ -96,8 +96,8 @@ public class EaglerContextRedacted {
output.println(); output.println();
} }
lastSourcePos = sourcePos; lastSourcePos = sourcePos + sourceLen;
lastTargetPos = targetPos; lastTargetPos = targetPos + targetLen;
} }
output.println("> EOF"); output.println("> EOF");
@ -159,6 +159,8 @@ public class EaglerContextRedacted {
lastSourcePos += sourceStart; lastSourcePos += sourceStart;
lastTargetPos += targetStart; lastTargetPos += targetStart;
newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines)); newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines));
lastSourcePos += sourceLen;
lastTargetPos += targetLen;
} }
switch(split[0]) { switch(split[0]) {
@ -230,6 +232,8 @@ public class EaglerContextRedacted {
lastSourcePos += sourceStart; lastSourcePos += sourceStart;
lastTargetPos += targetStart; lastTargetPos += targetStart;
newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines)); newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines));
lastSourcePos += sourceLen;
lastTargetPos += targetLen;
} }
return newPatch; return newPatch;

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 11 @ 141 : 143 > DELETE 9 @ 9 : 11
> CHANGE 343 : 344 @ 345 : 346 > CHANGE 343 : 344 @ 343 : 344
~ public void randomTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void randomTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public void updateTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { ~ public void updateTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
> CHANGE 3 : 4 @ 3 : 4 > CHANGE 2 : 3 @ 2 : 3
~ public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { ~ public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) {
> CHANGE 19 : 20 @ 19 : 20 > CHANGE 18 : 19 @ 18 : 19
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> DELETE 16 @ 16 : 18 > DELETE 15 @ 15 : 17
> DELETE 1 @ 3 : 13 > DELETE 1 @ 1 : 11
> CHANGE 3 : 4 @ 13 : 23 > CHANGE 3 : 4 @ 3 : 13
~ ~
> DELETE 4 @ 13 : 21 > DELETE 3 @ 3 : 11
> CHANGE 252 : 253 @ 260 : 261 > CHANGE 252 : 253 @ 252 : 253
~ public int quantityDroppedWithBonus(int fortune, EaglercraftRandom random) { ~ public int quantityDroppedWithBonus(int fortune, EaglercraftRandom random) {
> INSERT 137 : 138 @ 137 > INSERT 136 : 137 @ 136
+ bootstrapStates(); + bootstrapStates();
> INSERT 469 : 509 @ 468 > INSERT 468 : 508 @ 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 52 @ 52 : 61 > DELETE 51 @ 51 : 60
> INSERT 41 : 46 @ 50 > INSERT 41 : 46 @ 41
+ 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 66 : 67 @ 67 : 68 > CHANGE 64 : 65 @ 64 : 65
~ 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 6 @ 7 : 8 > DELETE 4 @ 4 : 5
> CHANGE 73 : 74 @ 74 : 75 > CHANGE 73 : 74 @ 73 : 74
~ public void randomTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom random) { ~ public void randomTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom random) {
> CHANGE 3 : 4 @ 3 : 9 > CHANGE 2 : 3 @ 2 : 8
~ public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { ~ public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) {
> DELETE 2 @ 7 : 8 > DELETE 1 @ 1 : 2
> DELETE 2 @ 3 : 13 > DELETE 2 @ 2 : 12
> 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 6 @ 8 : 9 > DELETE 6 @ 6 : 7
> DELETE 1 @ 2 : 3 > DELETE 1 @ 1 : 2
> DELETE 5 @ 6 : 7 > DELETE 5 @ 5 : 6
> DELETE 1 @ 2 : 4 > DELETE 1 @ 1 : 3
> CHANGE 14 : 15 @ 16 : 27 > CHANGE 14 : 15 @ 14 : 25
~ return true; ~ return true;
> DELETE 40 @ 50 : 79 > DELETE 39 @ 39 : 68
> 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 8 @ 9 : 10 > DELETE 6 @ 6 : 7
> DELETE 4 @ 5 : 6 > DELETE 4 @ 4 : 5
> DELETE 5 @ 6 : 7 > DELETE 5 @ 5 : 6
> CHANGE 2 : 3 @ 3 : 5 > CHANGE 2 : 3 @ 2 : 4
~ public static PropertyEnum<BlockBed.EnumPartType> PART; ~ public static PropertyEnum<BlockBed.EnumPartType> PART;
> INSERT 10 : 14 @ 11 > INSERT 9 : 13 @ 9
+ 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 6 : 7 @ 2 : 54 > CHANGE 2 : 3 @ 2 : 54
~ return true; ~ return true;
> DELETE 3 @ 54 : 64 > DELETE 2 @ 2 : 12
> DELETE 20 @ 30 : 33 > DELETE 20 @ 20 : 23
> CHANGE 4 : 5 @ 7 : 8 > CHANGE 4 : 5 @ 4 : 5
~ 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 14 : 15 @ 14 : 15 > CHANGE 12 : 13 @ 12 : 13
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 15 @ 15 : 16 > DELETE 13 @ 13 : 14
> CHANGE 55 : 56 @ 56 : 67 > CHANGE 55 : 56 @ 55 : 66
~ return true; ~ return true;
> CHANGE 14 : 15 @ 24 : 25 > CHANGE 13 : 14 @ 13 : 14
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
> CHANGE 16 : 17 @ 16 : 17 > CHANGE 15 : 16 @ 15 : 16
~ 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 43 : 44 @ 43 : 44 > CHANGE 41 : 42 @ 41 : 42
~ 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 7 @ 10 : 11 > DELETE 7 @ 7 : 8
> DELETE 2 @ 3 : 4 > DELETE 2 @ 2 : 3
> DELETE 153 @ 154 : 174 > DELETE 153 @ 153 : 173
> DELETE 7 @ 27 : 67 > DELETE 7 @ 7 : 47
> 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 27 : 28 @ 27 : 28 > CHANGE 25 : 26 @ 25 : 26
~ 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 101 : 102 @ 101 : 102 > CHANGE 99 : 100 @ 99 : 100
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 9 @ 9 : 10 > DELETE 7 @ 7 : 8
> DELETE 1 @ 2 : 3 > DELETE 1 @ 1 : 2
> DELETE 2 @ 3 : 8 > DELETE 2 @ 2 : 7
> DELETE 42 @ 47 : 57 > DELETE 42 @ 42 : 52
> CHANGE 2 : 3 @ 12 : 100 > CHANGE 2 : 3 @ 2 : 90
~ return true; ~ return true;
> CHANGE 18 : 19 @ 105 : 106 > CHANGE 17 : 18 @ 17 : 18
~ 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 15 @ 17 : 18 > DELETE 15 @ 15 : 16
> CHANGE 114 : 115 @ 115 : 187 > CHANGE 114 : 115 @ 114 : 186
~ return state; ~ return state;
> CHANGE 118 : 119 @ 189 : 204 > CHANGE 117 : 118 @ 117 : 132
~ 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 14 : 15 @ 14 : 15 > CHANGE 12 : 13 @ 12 : 13
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 30 : 31 @ 33 : 34 > 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 118 : 119 @ 118 : 119 > CHANGE 117 : 118 @ 117 : 118
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { ~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 30 : 31 @ 31 : 46 > CHANGE 28 : 29 @ 28 : 43
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
> DELETE 41 @ 55 : 59 > DELETE 40 @ 40 : 44
> CHANGE 3 : 4 @ 7 : 8 > CHANGE 3 : 4 @ 3 : 4
~ 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 10 @ 13 : 14 > DELETE 8 @ 8 : 9
> CHANGE 22 : 23 @ 23 : 24 > CHANGE 22 : 23 @ 22 : 23
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 82 : 83 @ 82 : 100 > CHANGE 81 : 82 @ 81 : 99
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) {
> CHANGE 12 : 13 @ 29 : 30 > CHANGE 11 : 12 @ 11 : 12
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { ~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 67 : 68 @ 67 : 83 > CHANGE 65 : 66 @ 65 : 81
~ return true; ~ return true;
> CHANGE 6 : 7 @ 21 : 22 > CHANGE 5 : 6 @ 5 : 6
~ 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 5 @ 6 : 7 > DELETE 3 @ 3 : 4
> DELETE 1 @ 2 : 3 > DELETE 1 @ 1 : 2
> DELETE 1 @ 2 : 5 > DELETE 1 @ 1 : 4
> CHANGE 23 : 24 @ 26 : 27 > CHANGE 23 : 24 @ 23 : 24
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> DELETE 4 @ 4 : 15 > DELETE 3 @ 3 : 14
> EOF > EOF

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

@ -9,11 +9,11 @@
~ ~
> CHANGE 18 : 19 @ 18 : 20 > CHANGE 17 : 18 @ 17 : 19
~ public static PropertyEnum<BlockDirt.DirtType> VARIANT; ~ public static PropertyEnum<BlockDirt.DirtType> VARIANT;
> INSERT 10 : 14 @ 11 > INSERT 9 : 13 @ 9
+ 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 20 @ 23 : 24 > DELETE 18 @ 18 : 19
> DELETE 2 @ 3 : 4 > DELETE 2 @ 2 : 3
> CHANGE 10 : 11 @ 11 : 12 > CHANGE 10 : 11 @ 10 : 11
~ protected EaglercraftRandom rand = new EaglercraftRandom(); ~ protected EaglercraftRandom rand = new EaglercraftRandom();
> DELETE 13 @ 13 : 42 > DELETE 12 @ 12 : 41
> CHANGE 2 : 3 @ 31 : 46 > CHANGE 2 : 3 @ 2 : 17
~ return true; ~ return true;
> DELETE 38 @ 52 : 59 > DELETE 37 @ 37 : 44
> 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 27 : 28 @ 27 : 29 > CHANGE 25 : 26 @ 25 : 27
~ public static PropertyEnum<BlockDoor.EnumHingePosition> HINGE; ~ public static PropertyEnum<BlockDoor.EnumHingePosition> HINGE;
> CHANGE 2 : 3 @ 3 : 5 > CHANGE 1 : 2 @ 1 : 3
~ public static PropertyEnum<BlockDoor.EnumDoorHalf> HALF; ~ public static PropertyEnum<BlockDoor.EnumDoorHalf> HALF;
> INSERT 9 : 14 @ 10 > INSERT 8 : 13 @ 8
+ 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 140 : 141 @ 135 : 140 > CHANGE 135 : 136 @ 135 : 140
~ if (!flag1) { ~ if (!flag1) {
> CHANGE 16 : 17 @ 20 : 21 > CHANGE 15 : 16 @ 15 : 16
~ 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 14 @ 18 : 20 > DELETE 12 @ 12 : 14
> CHANGE 8 : 10 @ 10 : 14 > CHANGE 8 : 10 @ 8 : 12
~ 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 15 : 20 @ 17 > INSERT 13 : 18 @ 13
+ 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 65 : 66 @ 60 : 61 > CHANGE 60 : 61 @ 60 : 61
~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int var3) { ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int var3) {
> DELETE 40 @ 40 : 50 > DELETE 39 @ 39 : 49
> DELETE 10 @ 20 : 28 > DELETE 10 @ 10 : 18
> DELETE 14 @ 22 : 38 > DELETE 14 @ 14 : 30
> CHANGE 17 : 18 @ 33 : 34 > CHANGE 17 : 18 @ 17 : 18
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { ~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 28 : 29 @ 29 : 30 > CHANGE 26 : 27 @ 26 : 27
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
> CHANGE 45 : 58 @ 45 : 63 > CHANGE 44 : 57 @ 44 : 62
~ 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 14 @ 19 : 20 > DELETE 1 @ 1 : 2
> 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 2 : 3 @ 2 : 5 > CHANGE 1 : 2 @ 1 : 4
~ ~
> CHANGE 21 : 22 @ 23 : 24 > CHANGE 20 : 21 @ 20 : 21
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 76 : 77 @ 76 : 77 > CHANGE 75 : 76 @ 75 : 76
~ 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 29 : 30 @ 29 : 30 > CHANGE 27 : 28 @ 27 : 28
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 44 : 45 @ 44 : 54 > CHANGE 43 : 44 @ 43 : 53
~ 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 47 : 48 @ 47 : 48 > CHANGE 45 : 46 @ 45 : 46
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 4 : 5 @ 4 : 12 > CHANGE 3 : 4 @ 3 : 11
~ 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 47 : 48 @ 47 : 48 > CHANGE 45 : 46 @ 45 : 46
~ 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 11 @ 11 : 12 > DELETE 9 @ 9 : 10
> DELETE 2 @ 3 : 4 > DELETE 2 @ 2 : 3
> CHANGE 29 : 30 @ 30 : 31 > CHANGE 29 : 30 @ 29 : 30
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 21 : 22 @ 21 : 37 > CHANGE 20 : 21 @ 20 : 36
~ return true; ~ return true;
> CHANGE 7 : 8 @ 22 : 23 > CHANGE 6 : 7 @ 6 : 7
~ 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 28 @ 30 : 64 > DELETE 28 @ 28 : 62
> 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 9 @ 12 : 13 > DELETE 7 @ 7 : 8
> CHANGE 32 : 33 @ 33 : 34 > CHANGE 32 : 33 @ 32 : 33
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
> DELETE 16 @ 16 : 24 > DELETE 15 @ 15 : 23
> CHANGE 43 : 44 @ 51 : 52 > CHANGE 43 : 44 @ 43 : 44
~ 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 11 @ 12 : 13 > DELETE 10 @ 10 : 11
> CHANGE 130 : 131 @ 131 : 132 > CHANGE 130 : 131 @ 130 : 131
~ 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 112 @ 115 : 137 > DELETE 112 @ 112 : 134
> 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 1 : 5 @ 2 : 5 > CHANGE 1 : 5 @ 1 : 4
~ 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 122 : 123 @ 121 : 122 > CHANGE 118 : 119 @ 118 : 119
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 8 : 9 @ 8 : 9 > CHANGE 7 : 8 @ 7 : 8
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 107 : 108 @ 107 : 108 > CHANGE 106 : 107 @ 106 : 107
~ 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 78 : 79 @ 78 : 79 > CHANGE 77 : 78 @ 77 : 78
~ 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 6 : 7 @ 3 : 7 > CHANGE 3 : 4 @ 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 27 : 28 @ 31 : 33 > CHANGE 25 : 26 @ 25 : 27
~ public static PropertyEnum<BlockFlowerPot.EnumFlowerType> CONTENTS; ~ public static PropertyEnum<BlockFlowerPot.EnumFlowerType> CONTENTS;
> INSERT 9 : 13 @ 10 > INSERT 8 : 12 @ 8
+ 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 128 : 129 @ 124 : 125 > CHANGE 124 : 125 @ 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 14 @ 15 : 16 > DELETE 12 @ 12 : 13
> CHANGE 18 : 19 @ 19 : 20 > CHANGE 18 : 19 @ 18 : 19
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 30 > CHANGE 3 : 4 @ 3 : 29
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 31 : 32 @ 56 : 67 > CHANGE 30 : 31 @ 30 : 41
~ 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 12 : 13 @ 12 : 13 > CHANGE 10 : 11 @ 10 : 11
~ 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 16 : 17 @ 16 : 17 > CHANGE 14 : 15 @ 14 : 15
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 44 : 45 @ 48 : 73 > CHANGE 42 : 43 @ 42 : 67
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {
> CHANGE 9 : 10 @ 33 : 34 > CHANGE 8 : 9 @ 8 : 9
~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { ~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 8 : 9 @ 8 : 9 > CHANGE 6 : 7 @ 6 : 7
~ 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 1 : 4 @ 2 : 4 > CHANGE 1 : 4 @ 1 : 3
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> DELETE 17 @ 16 : 17 > DELETE 14 @ 14 : 15
> CHANGE 77 : 78 @ 78 : 89 > CHANGE 77 : 78 @ 77 : 88
~ 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 16 : 17 @ 16 : 18 > CHANGE 14 : 15 @ 14 : 16
~ public static PropertyEnum<BlockHugeMushroom.EnumType> VARIANT; ~ public static PropertyEnum<BlockHugeMushroom.EnumType> VARIANT;
> CHANGE 10 : 15 @ 11 : 12 > CHANGE 9 : 14 @ 9 : 10
~ 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 21 : 22 @ 17 : 18 > CHANGE 16 : 17 @ 16 : 17
~ 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 53 : 54 @ 54 : 55 > CHANGE 51 : 52 @ 51 : 52
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 7 @ 8 : 9 > DELETE 7 @ 7 : 8
> DELETE 22 @ 23 : 24 > DELETE 22 @ 22 : 23
> DELETE 9 @ 10 : 19 > DELETE 9 @ 9 : 18
> DELETE 1 @ 10 : 32 > DELETE 1 @ 1 : 23
> DELETE 2 @ 24 : 35 > DELETE 2 @ 2 : 13
> 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 8 @ 10 : 11 > DELETE 6 @ 6 : 7
> CHANGE 60 : 61 @ 61 : 146 > CHANGE 60 : 61 @ 60 : 145
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
> CHANGE 16 : 17 @ 100 : 101 > CHANGE 15 : 16 @ 15 : 16
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> DELETE 4 @ 4 : 32 > DELETE 3 @ 3 : 31
> 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 17 : 18 @ 19 : 21 > CHANGE 17 : 18 @ 17 : 19
~ public static PropertyEnum<BlockLever.EnumOrientation> FACING; ~ public static PropertyEnum<BlockLever.EnumOrientation> FACING;
> INSERT 10 : 14 @ 11 > INSERT 9 : 13 @ 9
+ 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 125 : 126 @ 121 : 134 > CHANGE 121 : 122 @ 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 106 : 107 @ 108 : 109 > CHANGE 104 : 105 @ 104 : 105
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 65 : 66 @ 65 : 66 > CHANGE 64 : 65 @ 64 : 65
~ 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 11 : 12 @ 13 : 15 > CHANGE 11 : 12 @ 11 : 13
~ public static PropertyEnum<BlockLog.EnumAxis> LOG_AXIS = null; ~ public static PropertyEnum<BlockLog.EnumAxis> LOG_AXIS = null;
> INSERT 9 : 13 @ 10 > INSERT 8 : 12 @ 8
+ 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 15 : 16 @ 15 : 16 > CHANGE 13 : 14 @ 13 : 14
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 20 : 21 @ 20 : 21 > CHANGE 18 : 19 @ 18 : 19
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 6 @ 9 : 10 > DELETE 4 @ 4 : 5
> CHANGE 8 : 9 @ 9 : 10 > CHANGE 8 : 9 @ 8 : 9
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
> DELETE 53 @ 53 : 70 > DELETE 52 @ 52 : 69
> CHANGE 4 : 5 @ 21 : 22 > CHANGE 4 : 5 @ 4 : 5
~ public boolean canUseBonemeal(World var1, EaglercraftRandom random, BlockPos var3, IBlockState var4) { ~ public boolean canUseBonemeal(World var1, EaglercraftRandom random, BlockPos var3, IBlockState var4) {
> DELETE 3 @ 3 : 7 > DELETE 2 @ 2 : 6
> 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 31 : 32 @ 32 : 58 > CHANGE 29 : 30 @ 29 : 55
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 10 : 11 @ 35 : 36 > CHANGE 9 : 10 @ 9 : 10
~ 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 12 @ 13 : 14 > DELETE 10 @ 10 : 11
> CHANGE 23 : 24 @ 24 : 25 > CHANGE 23 : 24 @ 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 10 : 11 @ 10 : 28 > CHANGE 9 : 10 @ 9 : 27
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 21 : 22 > CHANGE 3 : 4 @ 3 : 4
~ 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 1 : 4 @ 2 : 5 > CHANGE 1 : 4 @ 1 : 4
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> DELETE 8 @ 8 : 9 > DELETE 5 @ 5 : 6
> DELETE 3 @ 4 : 6 > DELETE 3 @ 3 : 5
> CHANGE 4 : 5 @ 6 : 12 > CHANGE 4 : 5 @ 4 : 10
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 7 : 15 @ 12 > INSERT 6 : 14 @ 6
+ 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 62 @ 54 : 65 > DELETE 54 @ 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 1 : 4 @ 2 : 4 > CHANGE 1 : 4 @ 1 : 3
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> CHANGE 13 : 14 @ 12 : 18 > CHANGE 10 : 11 @ 10 : 16
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 7 : 15 @ 12 > INSERT 6 : 14 @ 6
+ 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 1 : 4 @ 2 : 4 > CHANGE 1 : 4 @ 1 : 3
~ ~
~ import com.google.common.collect.Lists; ~ import com.google.common.collect.Lists;
~ ~
> DELETE 7 @ 6 : 7 > DELETE 4 @ 4 : 5
> CHANGE 34 : 35 @ 35 : 48 > CHANGE 34 : 35 @ 34 : 47
~ return true; ~ return true;
> DELETE 3 @ 15 : 26 > DELETE 2 @ 2 : 13
> 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 15 : 16 @ 15 : 16 > CHANGE 13 : 14 @ 13 : 14
~ 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 1 : 4 @ 2 : 5 > CHANGE 1 : 4 @ 1 : 4
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> DELETE 8 @ 8 : 9 > DELETE 5 @ 5 : 6
> DELETE 3 @ 4 : 6 > DELETE 3 @ 3 : 5
> CHANGE 6 : 7 @ 8 : 14 > CHANGE 6 : 7 @ 6 : 12
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 7 : 15 @ 12 > INSERT 6 : 14 @ 6
+ 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 91 @ 83 : 94 > DELETE 83 @ 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 1 : 4 @ 2 : 4 > CHANGE 1 : 4 @ 1 : 3
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> CHANGE 13 : 14 @ 12 : 18 > CHANGE 10 : 11 @ 10 : 16
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 7 : 15 @ 12 > INSERT 6 : 14 @ 6
+ 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 24 : 25 @ 24 : 25 > CHANGE 22 : 23 @ 22 : 23
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 8 : 9 @ 8 : 9 > CHANGE 7 : 8 @ 7 : 8
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 12 : 13 @ 12 : 13 > CHANGE 10 : 11 @ 10 : 11
~ 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 49 : 50 @ 49 : 50 > CHANGE 47 : 48 @ 47 : 48
~ 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 45 @ 48 : 52 > DELETE 44 @ 44 : 48
> DELETE 2 @ 6 : 20 > DELETE 2 @ 2 : 16
> DELETE 45 @ 59 : 71 > DELETE 45 @ 45 : 57
> 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 22 : 23 @ 23 : 25 > CHANGE 20 : 21 @ 20 : 22
~ public static PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE; ~ public static PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE;
> INSERT 12 : 17 @ 13 > INSERT 11 : 16 @ 11
+ 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 49 : 50 @ 44 : 45 > CHANGE 44 : 45 @ 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 8 @ 11 : 12 > DELETE 6 @ 6 : 7
> CHANGE 14 : 15 @ 15 : 16 > CHANGE 14 : 15 @ 14 : 15
~ public static PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE; ~ public static PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE;
> INSERT 9 : 13 @ 9 > INSERT 8 : 12 @ 8
+ public static void bootstrapStates() { + public static void bootstrapStates() {
+ TYPE = BlockPistonExtension.TYPE; + TYPE = BlockPistonExtension.TYPE;
+ } + }
+ +
> CHANGE 49 : 50 @ 45 : 56 > CHANGE 45 : 46 @ 45 : 56
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> DELETE 4 @ 14 : 24 > DELETE 3 @ 3 : 13
> DELETE 4 @ 14 : 21 > DELETE 4 @ 4 : 11
> EOF > EOF

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

@ -9,11 +9,11 @@
~ ~
> CHANGE 13 : 14 @ 13 : 15 > CHANGE 12 : 13 @ 12 : 14
~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT; ~ public static PropertyEnum<BlockPlanks.EnumType> VARIANT;
> INSERT 8 : 12 @ 9 > INSERT 7 : 11 @ 7
+ 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 32 : 33 @ 33 : 34 > CHANGE 29 : 30 @ 29 : 30
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 120 : 121 @ 120 : 121 > CHANGE 119 : 120 @ 119 : 120
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 15 : 16 @ 15 : 16 > CHANGE 14 : 15 @ 14 : 15
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
> CHANGE 47 : 48 @ 47 : 48 > CHANGE 46 : 47 @ 46 : 47
~ 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 2 @ 4 : 7 > DELETE 2 @ 2 : 5
> DELETE 10 @ 13 : 22 > DELETE 10 @ 10 : 19
> EOF > EOF

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

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

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

@ -9,11 +9,11 @@
~ ~
> CHANGE 14 : 15 @ 14 : 16 > CHANGE 13 : 14 @ 13 : 15
~ public static PropertyEnum<BlockPrismarine.EnumType> VARIANT; ~ public static PropertyEnum<BlockPrismarine.EnumType> VARIANT;
> INSERT 11 : 15 @ 12 > INSERT 10 : 14 @ 10
+ 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 17 : 18 @ 17 : 19 > CHANGE 16 : 17 @ 16 : 18
~ public static PropertyEnum<BlockQuartz.EnumType> VARIANT; ~ public static PropertyEnum<BlockQuartz.EnumType> VARIANT;
> INSERT 8 : 12 @ 9 > INSERT 7 : 11 @ 7
+ 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 8 : 9 @ 10 : 12 > CHANGE 8 : 9 @ 8 : 10
~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE; ~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE;
> INSERT 8 : 12 @ 9 > INSERT 7 : 11 @ 7
+ 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 1 : 4 @ 2 : 3 > CHANGE 1 : 4 @ 1 : 2
~ ~
~ import com.google.common.collect.Lists; ~ import com.google.common.collect.Lists;
~ ~
> DELETE 72 @ 70 : 113 > DELETE 69 @ 69 : 112
> CHANGE 5 : 6 @ 48 : 51 > CHANGE 5 : 6 @ 5 : 8
~ 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 1 : 4 @ 2 : 4 > CHANGE 1 : 4 @ 1 : 3
~ ~
~ import com.google.common.base.Predicate; ~ import com.google.common.base.Predicate;
~ ~
> CHANGE 21 : 22 @ 20 : 29 > CHANGE 18 : 19 @ 18 : 27
~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE; ~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE;
> INSERT 10 : 22 @ 18 > INSERT 9 : 21 @ 9
+ 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 20 @ 8 : 25 > DELETE 8 @ 8 : 25
> EOF > EOF

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

@ -9,11 +9,11 @@
~ ~
> CHANGE 10 : 11 @ 11 : 20 > CHANGE 9 : 10 @ 9 : 18
~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE; ~ public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE;
> INSERT 10 : 22 @ 18 > INSERT 9 : 21 @ 9
+ 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 12 : 13 @ 13 : 15 > CHANGE 11 : 12 @ 11 : 13
~ public static PropertyEnum<BlockRedSandstone.EnumType> TYPE; ~ public static PropertyEnum<BlockRedSandstone.EnumType> TYPE;
> INSERT 8 : 12 @ 9 > INSERT 7 : 11 @ 7
+ 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 1 : 5 @ 2 : 6 > CHANGE 1 : 5 @ 1 : 5
~ 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 29 : 30 @ 29 : 31 > CHANGE 25 : 26 @ 25 : 27
~ public static PropertyEnum<BlockRedstoneComparator.Mode> MODE; ~ public static PropertyEnum<BlockRedstoneComparator.Mode> MODE;
> INSERT 10 : 14 @ 11 > INSERT 9 : 13 @ 9
+ 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 8 : 9 @ 4 : 5 > CHANGE 4 : 5 @ 4 : 5
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 149 : 150 @ 149 : 150 > CHANGE 148 : 149 @ 148 : 149
~ 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 35 : 36 @ 37 : 38 > CHANGE 33 : 34 @ 33 : 34
~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { ~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
> CHANGE 3 : 4 @ 3 : 4 > CHANGE 2 : 3 @ 2 : 3
~ 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 22 : 23 @ 22 : 54 > CHANGE 20 : 21 @ 20 : 52
~ 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 55 : 56 @ 55 : 56 > CHANGE 53 : 54 @ 53 : 54
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
> CHANGE 7 : 8 @ 7 : 8 > CHANGE 6 : 7 @ 6 : 7
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 13 : 14 @ 13 : 14 > CHANGE 12 : 13 @ 12 : 13
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {
> CHANGE 8 : 9 @ 8 : 9 > CHANGE 7 : 8 @ 7 : 8
~ 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 66 : 67 @ 67 : 68 > CHANGE 64 : 65 @ 64 : 65
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 16 : 17 @ 16 : 17 > CHANGE 15 : 16 @ 15 : 16
~ 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 2 : 7 @ 4 : 7 > CHANGE 2 : 7 @ 2 : 5
~ 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 81 : 82 @ 79 : 80 > CHANGE 76 : 77 @ 76 : 77
~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { ~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) {
> CHANGE 3 : 4 @ 3 : 4 > CHANGE 2 : 3 @ 2 : 3
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> CHANGE 49 : 50 @ 49 : 50 > CHANGE 48 : 49 @ 48 : 49
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 8 : 9 @ 8 : 9 > CHANGE 7 : 8 @ 7 : 8
~ 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 2 : 3 @ 4 : 5 > CHANGE 2 : 3 @ 2 : 3
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
> CHANGE 2 : 6 @ 2 : 5 > CHANGE 1 : 5 @ 1 : 4
~ ~
~ 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 24 : 28 @ 23 : 31 > CHANGE 20 : 24 @ 20 : 28
~ 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 18 : 29 @ 22 > INSERT 14 : 25 @ 14
+ 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 60 : 61 @ 49 : 50 > CHANGE 49 : 50 @ 49 : 50
~ ArrayList<BlockPos> arraylist = Lists.newArrayList(this.blocksNeedingUpdate); ~ ArrayList<BlockPos> arraylist = Lists.newArrayList(this.blocksNeedingUpdate);
> DELETE 81 @ 81 : 130 > DELETE 80 @ 80 : 129
> CHANGE 9 : 10 @ 58 : 71 > CHANGE 9 : 10 @ 9 : 22
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 100 : 101 @ 112 : 113 > CHANGE 99 : 100 @ 99 : 100
~ 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 28 : 29 @ 28 : 29 > CHANGE 26 : 27 @ 26 : 27
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
> CHANGE 63 : 64 @ 63 : 64 > CHANGE 62 : 63 @ 62 : 63
~ 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 12 : 13 @ 12 : 14 > CHANGE 11 : 12 @ 11 : 13
~ public static PropertyEnum<BlockSand.EnumType> VARIANT; ~ public static PropertyEnum<BlockSand.EnumType> VARIANT;
> INSERT 6 : 10 @ 7 > INSERT 5 : 9 @ 5
+ 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 13 : 14 @ 13 : 15 > CHANGE 12 : 13 @ 12 : 14
~ public static PropertyEnum<BlockSandStone.EnumType> TYPE; ~ public static PropertyEnum<BlockSandStone.EnumType> TYPE;
> INSERT 8 : 12 @ 9 > INSERT 7 : 11 @ 7
+ 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 8 @ 13 : 14 > DELETE 6 @ 6 : 7
> DELETE 5 @ 6 : 15 > DELETE 5 @ 5 : 14
> CHANGE 2 : 3 @ 11 : 13 > CHANGE 2 : 3 @ 2 : 4
~ public static PropertyEnum<BlockPlanks.EnumType> TYPE; ~ public static PropertyEnum<BlockPlanks.EnumType> TYPE;
> INSERT 11 : 15 @ 12 > INSERT 10 : 14 @ 10
+ 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 9 : 10 @ 5 : 13 > CHANGE 5 : 6 @ 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 3 @ 10 : 111 > DELETE 2 @ 2 : 103
> CHANGE 28 : 29 @ 129 : 130 > CHANGE 28 : 29 @ 28 : 29
~ public boolean canUseBonemeal(World world, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { ~ public boolean canUseBonemeal(World world, EaglercraftRandom var2, BlockPos var3, IBlockState var4) {
> DELETE 4 @ 4 : 8 > DELETE 3 @ 3 : 7
> 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 16 : 17 @ 16 : 17 > CHANGE 14 : 15 @ 14 : 15
~ public int quantityDropped(EaglercraftRandom random) { ~ public int quantityDropped(EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ 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 52 : 53 @ 52 : 53 > CHANGE 50 : 51 @ 50 : 51
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 10 : 11 @ 10 : 17 > CHANGE 9 : 10 @ 9 : 16
~ 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 8 @ 10 : 11 > DELETE 6 @ 6 : 7
> CHANGE 8 : 9 @ 9 : 11 > CHANGE 8 : 9 @ 8 : 10
~ public static PropertyEnum<BlockSilverfish.EnumType> VARIANT; ~ public static PropertyEnum<BlockSilverfish.EnumType> VARIANT;
> CHANGE 9 : 14 @ 10 : 11 > CHANGE 8 : 13 @ 8 : 9
~ 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 31 @ 27 : 38 > DELETE 26 @ 26 : 37
> 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 3 : 4 @ 1 : 3 > CHANGE 1 : 2 @ 1 : 3
~ ~
> DELETE 12 @ 13 : 14 > DELETE 11 @ 11 : 12
> DELETE 5 @ 6 : 9 > DELETE 5 @ 5 : 8
> DELETE 5 @ 8 : 9 > DELETE 5 @ 5 : 6
> DELETE 1 @ 2 : 3 > DELETE 1 @ 1 : 2
> DELETE 94 @ 95 : 107 > DELETE 94 @ 94 : 106
> DELETE 1 @ 13 : 19 > DELETE 1 @ 1 : 7
> CHANGE 2 : 3 @ 8 : 9 > CHANGE 2 : 3 @ 2 : 3
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 5 : 6 @ 5 : 7 > CHANGE 4 : 5 @ 4 : 6
~ return false; ~ return false;
> DELETE 4 @ 5 : 15 > DELETE 3 @ 3 : 13
> DELETE 1 @ 11 : 52 > DELETE 1 @ 1 : 42
> 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 18 : 19 @ 18 : 20 > CHANGE 16 : 17 @ 16 : 18
~ public static PropertyEnum<BlockSlab.EnumBlockHalf> HALF; ~ public static PropertyEnum<BlockSlab.EnumBlockHalf> HALF;
> INSERT 13 : 17 @ 14 > INSERT 12 : 16 @ 12
+ 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 52 : 53 @ 48 : 49 > CHANGE 48 : 49 @ 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 98 : 99 @ 98 : 99 > CHANGE 96 : 97 @ 96 : 97
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {

6
patches/minecraft/net/minecraft/block/BlockSnowBlock.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 Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> CHANGE 4 : 5 @ 4 : 5 > CHANGE 3 : 4 @ 3 : 4
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) {

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

@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3 > DELETE 2 @ 2 : 3
> CHANGE 3 : 7 @ 4 : 6 > CHANGE 3 : 7 @ 3 : 5
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
~ import com.google.common.collect.Lists; ~ import com.google.common.collect.Lists;
~ ~
> CHANGE 56 : 57 @ 54 : 55 > CHANGE 52 : 53 @ 52 : 53
~ ArrayList<BlockPos> arraylist = Lists.newArrayList(); ~ ArrayList<BlockPos> arraylist = Lists.newArrayList();
> CHANGE 50 : 51 @ 50 : 51 > CHANGE 49 : 50 @ 49 : 50
~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {

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

@ -10,12 +10,12 @@
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
~ ~
> CHANGE 45 : 46 @ 46 : 47 > CHANGE 43 : 44 @ 43 : 44
~ public int quantityDropped(EaglercraftRandom var1) { ~ public int quantityDropped(EaglercraftRandom var1) {
> DELETE 17 @ 17 : 20 > DELETE 16 @ 16 : 19
> DELETE 4 @ 7 : 10 > DELETE 4 @ 4 : 7
> EOF > EOF

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