diff --git a/buildtools/BuildTools.jar b/buildtools/BuildTools.jar index b035cc9..ed0d9d2 100644 Binary files a/buildtools/BuildTools.jar and b/buildtools/BuildTools.jar differ diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java index dd420c2..9975b04 100644 --- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java +++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/EaglerContextRedacted.java @@ -96,8 +96,8 @@ public class EaglerContextRedacted { output.println(); } - lastSourcePos = sourcePos; - lastTargetPos = targetPos; + lastSourcePos = sourcePos + sourceLen; + lastTargetPos = targetPos + targetLen; } output.println("> EOF"); @@ -159,6 +159,8 @@ public class EaglerContextRedacted { lastSourcePos += sourceStart; lastTargetPos += targetStart; newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines)); + lastSourcePos += sourceLen; + lastTargetPos += targetLen; } switch(split[0]) { @@ -230,6 +232,8 @@ public class EaglerContextRedacted { lastSourcePos += sourceStart; lastTargetPos += targetStart; newPatch.addDelta(makeDelta(currentDeltaType, lastSourcePos, sourceLen, lastTargetPos, targetLen, context, targetLines)); + lastSourcePos += sourceLen; + lastTargetPos += targetLen; } return newPatch; diff --git a/patches/minecraft/net/minecraft/block/Block.edit.java b/patches/minecraft/net/minecraft/block/Block.edit.java index 6f24d02..3499201 100644 --- a/patches/minecraft/net/minecraft/block/Block.edit.java +++ b/patches/minecraft/net/minecraft/block/Block.edit.java @@ -10,47 +10,47 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ 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) { -> CHANGE 19 : 20 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 ~ public int quantityDropped(EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ 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) { -> INSERT 137 : 138 @ 137 +> INSERT 136 : 137 @ 136 + bootstrapStates(); -> INSERT 469 : 509 @ 468 +> INSERT 468 : 508 @ 468 + public static void bootstrapStates() { + BlockBed.bootstrapStates(); diff --git a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java index af8af98..7e44457 100644 --- a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java @@ -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, + EnumFacing side, float hitX, float hitY, float hitZ) { diff --git a/patches/minecraft/net/minecraft/block/BlockBanner.edit.java b/patches/minecraft/net/minecraft/block/BlockBanner.edit.java index 45d1f7f..c41831b 100644 --- a/patches/minecraft/net/minecraft/block/BlockBanner.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBanner.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 66 : 67 @ 67 : 68 +> CHANGE 64 : 65 @ 64 : 65 ~ public Item getItemDropped(IBlockState state, EaglercraftRandom rand, int fortune) { diff --git a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java index e9058be..66dda42 100644 --- a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java @@ -10,18 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> CHANGE 3 : 4 @ 3 : 9 +> CHANGE 2 : 3 @ 2 : 8 ~ 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 diff --git a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java index 2377fdc..4b2198c 100644 --- a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 4 -> DELETE 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; -> DELETE 40 @ 50 : 79 +> DELETE 39 @ 39 : 68 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockBed.edit.java b/patches/minecraft/net/minecraft/block/BlockBed.edit.java index cf7c12c..e8eeb1b 100644 --- a/patches/minecraft/net/minecraft/block/BlockBed.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBed.edit.java @@ -10,32 +10,32 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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 PART; -> INSERT 10 : 14 @ 11 +> INSERT 9 : 13 @ 9 + public static void bootstrapStates() { + PART = PropertyEnum.create("part", BlockBed.EnumPartType.class); + } + -> CHANGE 6 : 7 @ 2 : 54 +> CHANGE 2 : 3 @ 2 : 54 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java b/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java index a09f2ab..1556f55 100644 --- a/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBookshelf.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 12 : 13 @ 12 : 13 ~ public int quantityDropped(EaglercraftRandom var1) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java index f1aeefa..d3853fe 100644 --- a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java @@ -10,17 +10,17 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 15 @ 15 : 16 +> DELETE 13 @ 13 : 14 -> CHANGE 55 : 56 @ 56 : 67 +> CHANGE 55 : 56 @ 55 : 66 ~ return true; -> CHANGE 14 : 15 @ 24 : 25 +> CHANGE 13 : 14 @ 13 : 14 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockBush.edit.java b/patches/minecraft/net/minecraft/block/BlockBush.edit.java index 6ba0ac3..7ce020a 100644 --- a/patches/minecraft/net/minecraft/block/BlockBush.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBush.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 43 : 44 @ 43 : 44 +> CHANGE 41 : 42 @ 41 : 42 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { diff --git a/patches/minecraft/net/minecraft/block/BlockButton.edit.java b/patches/minecraft/net/minecraft/block/BlockButton.edit.java index e59f59e..e7b44a5 100644 --- a/patches/minecraft/net/minecraft/block/BlockButton.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockButton.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 5 -> DELETE 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 diff --git a/patches/minecraft/net/minecraft/block/BlockCactus.edit.java b/patches/minecraft/net/minecraft/block/BlockCactus.edit.java index 276cfad..0c0d8a8 100644 --- a/patches/minecraft/net/minecraft/block/BlockCactus.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCactus.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 27 : 28 @ 27 : 28 +> CHANGE 25 : 26 @ 25 : 26 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { diff --git a/patches/minecraft/net/minecraft/block/BlockCake.edit.java b/patches/minecraft/net/minecraft/block/BlockCake.edit.java index 4387bf3..f18f697 100644 --- a/patches/minecraft/net/minecraft/block/BlockCake.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCake.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 101 : 102 @ 101 : 102 +> CHANGE 99 : 100 @ 99 : 100 ~ public int quantityDropped(EaglercraftRandom var1) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java index 98f9ce6..a7db9e1 100644 --- a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java @@ -10,19 +10,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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; -> CHANGE 18 : 19 @ 105 : 106 +> CHANGE 17 : 18 @ 17 : 18 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockChest.edit.java b/patches/minecraft/net/minecraft/block/BlockChest.edit.java index cf1b3f2..4e29b0e 100644 --- a/patches/minecraft/net/minecraft/block/BlockChest.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockChest.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 4 -> DELETE 15 @ 17 : 18 +> DELETE 15 @ 15 : 16 -> CHANGE 114 : 115 @ 115 : 187 +> CHANGE 114 : 115 @ 114 : 186 ~ return state; -> CHANGE 118 : 119 @ 189 : 204 +> CHANGE 117 : 118 @ 117 : 132 ~ return true; diff --git a/patches/minecraft/net/minecraft/block/BlockClay.edit.java b/patches/minecraft/net/minecraft/block/BlockClay.edit.java index 58f1b5f..5b334b8 100644 --- a/patches/minecraft/net/minecraft/block/BlockClay.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockClay.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 12 : 13 @ 12 : 13 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDropped(EaglercraftRandom var1) { diff --git a/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java b/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java index 83ec79e..8e7b25a 100644 --- a/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCocoa.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 30 : 31 @ 33 : 34 +> CHANGE 28 : 29 @ 28 : 29 ~ 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) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) { diff --git a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java index 3b76de9..4e19d26 100644 --- a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java @@ -10,13 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 30 : 31 @ 31 : 46 +> CHANGE 28 : 29 @ 28 : 43 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java index 039c5d1..cb1b05d 100644 --- a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java @@ -10,21 +10,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> CHANGE 82 : 83 @ 82 : 100 +> CHANGE 81 : 82 @ 81 : 99 ~ 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) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) { diff --git a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java index b0e9919..0a0d1fe 100644 --- a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 67 : 68 @ 67 : 83 +> CHANGE 65 : 66 @ 65 : 81 ~ return true; -> CHANGE 6 : 7 @ 21 : 22 +> CHANGE 5 : 6 @ 5 : 6 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java index e16b085..c06e663 100644 --- a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java @@ -10,16 +10,16 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> DELETE 4 @ 4 : 15 +> DELETE 3 @ 3 : 14 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockDirt.edit.java b/patches/minecraft/net/minecraft/block/BlockDirt.edit.java index d292055..cd1b537 100644 --- a/patches/minecraft/net/minecraft/block/BlockDirt.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDirt.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 18 : 19 @ 18 : 20 +> CHANGE 17 : 18 @ 17 : 19 ~ public static PropertyEnum VARIANT; -> INSERT 10 : 14 @ 11 +> INSERT 9 : 13 @ 9 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockDirt.DirtType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java index 5840efb..8850a04 100644 --- a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java @@ -10,20 +10,20 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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(); -> DELETE 13 @ 13 : 42 +> DELETE 12 @ 12 : 41 -> CHANGE 2 : 3 @ 31 : 46 +> CHANGE 2 : 3 @ 2 : 17 ~ return true; -> DELETE 38 @ 52 : 59 +> DELETE 37 @ 37 : 44 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java index 542506f..e0bae9b 100644 --- a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 27 : 28 @ 27 : 29 +> CHANGE 25 : 26 @ 25 : 27 ~ public static PropertyEnum HINGE; -> CHANGE 2 : 3 @ 3 : 5 +> CHANGE 1 : 2 @ 1 : 3 ~ public static PropertyEnum HALF; -> INSERT 9 : 14 @ 10 +> INSERT 8 : 13 @ 8 + public static void bootstrapStates() { + HINGE = PropertyEnum.create("hinge", BlockDoor.EnumHingePosition.class); @@ -26,11 +26,11 @@ + } + -> CHANGE 140 : 141 @ 135 : 140 +> CHANGE 135 : 136 @ 135 : 140 ~ if (!flag1) { -> CHANGE 16 : 17 @ 20 : 21 +> CHANGE 15 : 16 @ 15 : 16 ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java index e48f59a..b578e43 100644 --- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java @@ -10,14 +10,14 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 14 @ 18 : 20 +> DELETE 12 @ 12 : 14 -> CHANGE 8 : 10 @ 10 : 14 +> CHANGE 8 : 10 @ 8 : 12 ~ public static PropertyEnum VARIANT; ~ public static PropertyEnum HALF; -> INSERT 15 : 20 @ 17 +> INSERT 13 : 18 @ 13 + public static void bootstrapStates() { + VARIANT = PropertyEnum.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) { -> 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) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState var4) { diff --git a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java index 132ce57..7a37ea8 100644 --- a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 28 : 29 @ 29 : 30 +> CHANGE 26 : 27 @ 26 : 27 ~ 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) { ~ double d0 = worldIn.rand.nextDouble(); @@ -30,6 +30,6 @@ ~ worldIn.spawnParticle(EnumParticleTypes.PORTAL, d1, d2, d3, (double) f, (double) f1, ~ (double) f2, new int[0]); -> DELETE 14 @ 19 : 20 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java index 87c1a02..1930ebe 100644 --- a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.edit.java @@ -9,15 +9,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 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) { -> CHANGE 76 : 77 @ 76 : 77 +> CHANGE 75 : 76 @ 75 : 76 ~ Set set = this.getPossibleFlowDirections(world, blockpos); diff --git a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java index 1368deb..3dcac11 100644 --- a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 29 : 30 @ 29 : 30 +> CHANGE 27 : 28 @ 27 : 28 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> CHANGE 44 : 45 @ 44 : 54 +> CHANGE 43 : 44 @ 43 : 53 ~ return true; diff --git a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java index 29754f7..8c4967e 100644 --- a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 47 : 48 @ 47 : 48 +> CHANGE 45 : 46 @ 45 : 46 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java b/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java index cc8267e..5ab73d8 100644 --- a/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockEndPortalFrame.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 47 : 48 @ 47 : 48 +> CHANGE 45 : 46 @ 45 : 46 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java index 5592de7..6f13531 100644 --- a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java @@ -10,23 +10,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDropped(EaglercraftRandom var1) { -> CHANGE 21 : 22 @ 21 : 37 +> CHANGE 20 : 21 @ 20 : 36 ~ return true; -> CHANGE 7 : 8 @ 22 : 23 +> CHANGE 6 : 7 @ 6 : 7 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java index 8b278d2..47e4d55 100644 --- a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java @@ -7,6 +7,6 @@ > DELETE 2 @ 2 : 4 -> DELETE 28 @ 30 : 64 +> DELETE 28 @ 28 : 62 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java index a216ede..df41457 100644 --- a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockFence.edit.java b/patches/minecraft/net/minecraft/block/BlockFence.edit.java index ba399ce..d980dde 100644 --- a/patches/minecraft/net/minecraft/block/BlockFence.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFence.edit.java @@ -9,9 +9,9 @@ ~ -> DELETE 11 @ 12 : 13 +> DELETE 10 @ 10 : 11 -> CHANGE 130 : 131 @ 131 : 132 +> CHANGE 130 : 131 @ 130 : 131 ~ return true; diff --git a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java index 4f183c2..1dd1717 100644 --- a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java @@ -7,6 +7,6 @@ > DELETE 2 @ 2 : 5 -> DELETE 112 @ 115 : 137 +> DELETE 112 @ 112 : 134 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockFire.edit.java b/patches/minecraft/net/minecraft/block/BlockFire.edit.java index 64703d9..50e0307 100644 --- a/patches/minecraft/net/minecraft/block/BlockFire.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFire.edit.java @@ -7,26 +7,26 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 5 +> CHANGE 1 : 5 @ 1 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import com.google.common.collect.Maps; ~ -> CHANGE 122 : 123 @ 121 : 122 +> CHANGE 118 : 119 @ 118 : 119 ~ 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) { -> CHANGE 107 : 108 @ 107 : 108 +> CHANGE 106 : 107 @ 106 : 107 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockFlower.edit.java b/patches/minecraft/net/minecraft/block/BlockFlower.edit.java index 740a699..f15bf1d 100644 --- a/patches/minecraft/net/minecraft/block/BlockFlower.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFlower.edit.java @@ -11,7 +11,7 @@ + import java.util.List; + -> CHANGE 6 : 7 @ 3 : 7 +> CHANGE 3 : 4 @ 3 : 7 ~ diff --git a/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java b/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java index d5dc8a7..83d002a 100644 --- a/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFlowerPot.edit.java @@ -10,18 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 27 : 28 @ 31 : 33 +> CHANGE 25 : 26 @ 25 : 27 ~ public static PropertyEnum CONTENTS; -> INSERT 9 : 13 @ 10 +> INSERT 8 : 12 @ 8 + public static void bootstrapStates() { + CONTENTS = PropertyEnum.create("contents", BlockFlowerPot.EnumFlowerType.class); + } + -> CHANGE 128 : 129 @ 124 : 125 +> CHANGE 124 : 125 @ 124 : 125 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java index 2e7aa16..a475616 100644 --- a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java @@ -10,17 +10,17 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> CHANGE 4 : 5 @ 4 : 30 +> CHANGE 3 : 4 @ 3 : 29 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> CHANGE 31 : 32 @ 56 : 67 +> CHANGE 30 : 31 @ 30 : 41 ~ return true; diff --git a/patches/minecraft/net/minecraft/block/BlockGlass.edit.java b/patches/minecraft/net/minecraft/block/BlockGlass.edit.java index 3adbdd2..867d069 100644 --- a/patches/minecraft/net/minecraft/block/BlockGlass.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockGlass.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 10 : 11 @ 10 : 11 ~ public int quantityDropped(EaglercraftRandom var1) { diff --git a/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java b/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java index a9be182..01b087e 100644 --- a/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockGlowstone.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 16 : 17 @ 16 : 17 +> CHANGE 14 : 15 @ 14 : 15 ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDropped(EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java index 651c016..03c4374 100644 --- a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 44 : 45 @ 48 : 73 +> CHANGE 42 : 43 @ 42 : 67 ~ 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) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState var4) { diff --git a/patches/minecraft/net/minecraft/block/BlockGravel.edit.java b/patches/minecraft/net/minecraft/block/BlockGravel.edit.java index 567af29..dc85525 100644 --- a/patches/minecraft/net/minecraft/block/BlockGravel.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockGravel.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { diff --git a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java index 846620f..d2582df 100644 --- a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 4 +> CHANGE 1 : 4 @ 1 : 3 ~ ~ 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; diff --git a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java index 46960bd..5f12b49 100644 --- a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 16 : 17 @ 16 : 18 +> CHANGE 14 : 15 @ 14 : 16 ~ public static PropertyEnum VARIANT; -> CHANGE 10 : 15 @ 11 : 12 +> CHANGE 9 : 14 @ 9 : 10 ~ public static void bootstrapStates() { ~ VARIANT = PropertyEnum.create("variant", BlockHugeMushroom.EnumType.class); @@ -22,7 +22,7 @@ ~ ~ public int quantityDropped(EaglercraftRandom random) { -> CHANGE 21 : 22 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockIce.edit.java b/patches/minecraft/net/minecraft/block/BlockIce.edit.java index 1e462c4..2ac39a6 100644 --- a/patches/minecraft/net/minecraft/block/BlockIce.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockIce.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 53 : 54 @ 54 : 55 +> CHANGE 51 : 52 @ 51 : 52 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java index 10cdafb..455295d 100644 --- a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 3 -> DELETE 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 diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java index fa3a6d5..eb704e1 100644 --- a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java @@ -10,20 +10,20 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> CHANGE 16 : 17 @ 100 : 101 +> CHANGE 15 : 16 @ 15 : 16 ~ public int quantityDropped(EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> DELETE 4 @ 4 : 32 +> DELETE 3 @ 3 : 31 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockLever.edit.java b/patches/minecraft/net/minecraft/block/BlockLever.edit.java index beba351..d3d107f 100644 --- a/patches/minecraft/net/minecraft/block/BlockLever.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockLever.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 4 -> CHANGE 17 : 18 @ 19 : 21 +> CHANGE 17 : 18 @ 17 : 19 ~ public static PropertyEnum FACING; -> INSERT 10 : 14 @ 11 +> INSERT 9 : 13 @ 9 + public static void bootstrapStates() { + FACING = PropertyEnum.create("facing", BlockLever.EnumOrientation.class); + } + -> CHANGE 125 : 126 @ 121 : 134 +> CHANGE 121 : 122 @ 121 : 134 ~ return true; diff --git a/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java index 25f1514..ec3a2a7 100644 --- a/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockLiquid.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 106 : 107 @ 108 : 109 +> CHANGE 104 : 105 @ 104 : 105 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockLog.edit.java b/patches/minecraft/net/minecraft/block/BlockLog.edit.java index bef4446..3f9cc5b 100644 --- a/patches/minecraft/net/minecraft/block/BlockLog.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockLog.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 4 -> CHANGE 11 : 12 @ 13 : 15 +> CHANGE 11 : 12 @ 11 : 13 ~ public static PropertyEnum LOG_AXIS = null; -> INSERT 9 : 13 @ 10 +> INSERT 8 : 12 @ 8 + public static void bootstrapStates() { + LOG_AXIS = PropertyEnum.create("axis", BlockLog.EnumAxis.class); diff --git a/patches/minecraft/net/minecraft/block/BlockMelon.edit.java b/patches/minecraft/net/minecraft/block/BlockMelon.edit.java index 460dcf4..c0d798e 100644 --- a/patches/minecraft/net/minecraft/block/BlockMelon.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockMelon.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 13 : 14 @ 13 : 14 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDropped(EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java b/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java index 3d6984e..0d24c4a 100644 --- a/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockMobSpawner.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 18 : 19 @ 18 : 19 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDropped(EaglercraftRandom var1) { diff --git a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java index 71c3cdd..0fdc6c4 100644 --- a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java @@ -10,18 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> 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) { -> DELETE 3 @ 3 : 7 +> DELETE 2 @ 2 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java index cde3062..7622f10 100644 --- a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 31 : 32 @ 32 : 58 +> CHANGE 29 : 30 @ 29 : 55 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java index 55e42b3..f7c17fd 100644 --- a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java @@ -10,17 +10,17 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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) { -> CHANGE 10 : 11 @ 10 : 28 +> CHANGE 9 : 10 @ 9 : 27 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 21 : 22 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDropped(EaglercraftRandom var1) { diff --git a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java index 411a63e..f373f4d 100644 --- a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java @@ -7,21 +7,21 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 5 +> CHANGE 1 : 4 @ 1 : 4 ~ ~ 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 VARIANT; -> INSERT 7 : 15 @ 12 +> INSERT 6 : 14 @ 6 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { @@ -32,6 +32,6 @@ + } + -> DELETE 62 @ 54 : 65 +> DELETE 54 @ 54 : 65 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java b/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java index f1201ef..0945033 100644 --- a/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockNewLog.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 4 +> CHANGE 1 : 4 @ 1 : 3 ~ ~ import com.google.common.base.Predicate; ~ -> CHANGE 13 : 14 @ 12 : 18 +> CHANGE 10 : 11 @ 10 : 16 ~ public static PropertyEnum VARIANT; -> INSERT 7 : 15 @ 12 +> INSERT 6 : 14 @ 6 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { diff --git a/patches/minecraft/net/minecraft/block/BlockNote.edit.java b/patches/minecraft/net/minecraft/block/BlockNote.edit.java index 7bae349..7f86bd2 100644 --- a/patches/minecraft/net/minecraft/block/BlockNote.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockNote.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 4 +> CHANGE 1 : 4 @ 1 : 3 ~ ~ 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; -> DELETE 3 @ 15 : 26 +> DELETE 2 @ 2 : 13 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java b/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java index aeae9c9..1d6c3be 100644 --- a/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockObsidian.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 13 : 14 @ 13 : 14 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java index c22cbc7..e3153ff 100644 --- a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java @@ -7,21 +7,21 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 5 +> CHANGE 1 : 4 @ 1 : 4 ~ ~ 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 VARIANT; -> INSERT 7 : 15 @ 12 +> INSERT 6 : 14 @ 6 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { @@ -32,6 +32,6 @@ + } + -> DELETE 91 @ 83 : 94 +> DELETE 83 @ 83 : 94 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java b/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java index 1cabd01..c8c2e6d 100644 --- a/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockOldLog.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 4 +> CHANGE 1 : 4 @ 1 : 3 ~ ~ import com.google.common.base.Predicate; ~ -> CHANGE 13 : 14 @ 12 : 18 +> CHANGE 10 : 11 @ 10 : 16 ~ public static PropertyEnum VARIANT; -> INSERT 7 : 15 @ 12 +> INSERT 6 : 14 @ 6 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { diff --git a/patches/minecraft/net/minecraft/block/BlockOre.edit.java b/patches/minecraft/net/minecraft/block/BlockOre.edit.java index 015a5e0..e438350 100644 --- a/patches/minecraft/net/minecraft/block/BlockOre.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockOre.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 24 : 25 @ 24 : 25 +> CHANGE 22 : 23 @ 22 : 23 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ public int quantityDropped(EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java b/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java index 3adbdd2..867d069 100644 --- a/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPackedIce.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 10 : 11 @ 10 : 11 ~ public int quantityDropped(EaglercraftRandom var1) { diff --git a/patches/minecraft/net/minecraft/block/BlockPane.edit.java b/patches/minecraft/net/minecraft/block/BlockPane.edit.java index b00159d..eb13d7d 100644 --- a/patches/minecraft/net/minecraft/block/BlockPane.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPane.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 49 : 50 @ 49 : 50 +> CHANGE 47 : 48 @ 47 : 48 ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int i) { diff --git a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java index fb148b6..29da72d 100644 --- a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java @@ -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 diff --git a/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java index 7a9f2a3..58301a5 100644 --- a/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPistonExtension.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 22 : 23 @ 23 : 25 +> CHANGE 20 : 21 @ 20 : 22 ~ public static PropertyEnum TYPE; -> INSERT 12 : 17 @ 13 +> INSERT 11 : 16 @ 11 + public static void bootstrapStates() { + TYPE = PropertyEnum.create("type", @@ -22,7 +22,7 @@ + } + -> CHANGE 49 : 50 @ 44 : 45 +> CHANGE 44 : 45 @ 44 : 45 ~ public int quantityDropped(EaglercraftRandom var1) { diff --git a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java index d267651..d6cef02 100644 --- a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java @@ -10,25 +10,25 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 8 @ 11 : 12 +> DELETE 6 @ 6 : 7 -> CHANGE 14 : 15 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ public static PropertyEnum TYPE; -> INSERT 9 : 13 @ 9 +> INSERT 8 : 12 @ 8 + public static void bootstrapStates() { + TYPE = BlockPistonExtension.TYPE; + } + -> CHANGE 49 : 50 @ 45 : 56 +> CHANGE 45 : 46 @ 45 : 56 ~ 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 diff --git a/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java b/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java index 8f17014..ee0608f 100644 --- a/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPlanks.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 13 : 14 @ 13 : 15 +> CHANGE 12 : 13 @ 12 : 14 ~ public static PropertyEnum VARIANT; -> INSERT 8 : 12 @ 9 +> INSERT 7 : 11 @ 7 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockPortal.edit.java b/patches/minecraft/net/minecraft/block/BlockPortal.edit.java index 3526137..519672f 100644 --- a/patches/minecraft/net/minecraft/block/BlockPortal.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPortal.edit.java @@ -11,19 +11,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache; ~ -> CHANGE 32 : 33 @ 33 : 34 +> CHANGE 29 : 30 @ 29 : 30 ~ 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) { -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ 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); diff --git a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java index 6456a17..809cd6d 100644 --- a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java @@ -7,8 +7,8 @@ > DELETE 2 @ 2 : 4 -> DELETE 2 @ 4 : 7 +> DELETE 2 @ 2 : 5 -> DELETE 10 @ 13 : 22 +> DELETE 10 @ 10 : 19 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java b/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java index 86cdde9..750bf7f 100644 --- a/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPressurePlate.edit.java @@ -9,7 +9,7 @@ ~ -> CHANGE 32 : 33 @ 32 : 33 +> CHANGE 31 : 32 @ 31 : 32 ~ List list; diff --git a/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java b/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java index fc062b8..13b9662 100644 --- a/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPrismarine.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 14 : 15 @ 14 : 16 +> CHANGE 13 : 14 @ 13 : 15 ~ public static PropertyEnum VARIANT; -> INSERT 11 : 15 @ 12 +> INSERT 10 : 14 @ 10 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockPrismarine.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java b/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java index b955e43..9e1e040 100644 --- a/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockQuartz.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 17 : 18 @ 17 : 19 +> CHANGE 16 : 17 @ 16 : 18 ~ public static PropertyEnum VARIANT; -> INSERT 8 : 12 @ 9 +> INSERT 7 : 11 @ 7 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockQuartz.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockRail.edit.java b/patches/minecraft/net/minecraft/block/BlockRail.edit.java index c23a2ba..31ba3ab 100644 --- a/patches/minecraft/net/minecraft/block/BlockRail.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRail.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 4 -> CHANGE 8 : 9 @ 10 : 12 +> CHANGE 8 : 9 @ 8 : 10 ~ public static PropertyEnum SHAPE; -> INSERT 8 : 12 @ 9 +> INSERT 7 : 11 @ 7 + public static void bootstrapStates() { + SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class); diff --git a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java index c4a3de0..d0944ce 100644 --- a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ ~ 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; diff --git a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java index fc0d6af..9e7fa4b 100644 --- a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 4 +> CHANGE 1 : 4 @ 1 : 3 ~ ~ import com.google.common.base.Predicate; ~ -> CHANGE 21 : 22 @ 20 : 29 +> CHANGE 18 : 19 @ 18 : 27 ~ public static PropertyEnum SHAPE; -> INSERT 10 : 22 @ 18 +> INSERT 9 : 21 @ 9 + public static void bootstrapStates() { + SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, @@ -32,6 +32,6 @@ + } + -> DELETE 20 @ 8 : 25 +> DELETE 8 @ 8 : 25 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java b/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java index adf5086..8d13280 100644 --- a/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRailPowered.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 10 : 11 @ 11 : 20 +> CHANGE 9 : 10 @ 9 : 18 ~ public static PropertyEnum SHAPE; -> INSERT 10 : 22 @ 18 +> INSERT 9 : 21 @ 9 + public static void bootstrapStates() { + SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, diff --git a/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java b/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java index c3e285a..b06c5e1 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedSandstone.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 12 : 13 @ 13 : 15 +> CHANGE 11 : 12 @ 11 : 13 ~ public static PropertyEnum TYPE; -> INSERT 8 : 12 @ 9 +> INSERT 7 : 11 @ 7 + public static void bootstrapStates() { + TYPE = PropertyEnum.create("type", BlockRedSandstone.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java index e4b4d30..725f0b8 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.edit.java @@ -7,29 +7,29 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 6 +> CHANGE 1 : 5 @ 1 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import com.google.common.base.Predicate; ~ -> CHANGE 29 : 30 @ 29 : 31 +> CHANGE 25 : 26 @ 25 : 27 ~ public static PropertyEnum MODE; -> INSERT 10 : 14 @ 11 +> INSERT 9 : 13 @ 9 + public static void bootstrapStates() { + MODE = PropertyEnum.create("mode", BlockRedstoneComparator.Mode.class); + } + -> CHANGE 8 : 9 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java index 3f95c5e..af7e41c 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 35 : 36 @ 37 : 38 +> CHANGE 33 : 34 @ 33 : 34 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java index 036d780..61df8a3 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 22 : 23 @ 22 : 54 +> CHANGE 20 : 21 @ 20 : 52 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java index 2a631eb..89f1bdb 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.edit.java @@ -10,27 +10,27 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 55 : 56 @ 55 : 56 +> CHANGE 53 : 54 @ 53 : 54 ~ 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) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ 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) { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ EaglercraftRandom random = worldIn.rand; diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java index ec26841..7f6921f 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneRepeater.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 66 : 67 @ 67 : 68 +> CHANGE 64 : 65 @ 64 : 65 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java index cd8c575..02867a3 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 2 : 7 @ 4 : 7 +> CHANGE 2 : 7 @ 2 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -15,19 +15,19 @@ ~ 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) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ 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) { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java index fc221c4..c7b2d9e 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java @@ -7,25 +7,25 @@ > DELETE 2 @ 2 : 4 -> CHANGE 2 : 3 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ 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.Sets; ~ -> CHANGE 24 : 28 @ 23 : 31 +> CHANGE 20 : 24 @ 20 : 28 ~ public static PropertyEnum NORTH; ~ public static PropertyEnum EAST; ~ public static PropertyEnum SOUTH; ~ public static PropertyEnum WEST; -> INSERT 18 : 29 @ 22 +> INSERT 14 : 25 @ 14 + public static void bootstrapStates() { + NORTH = PropertyEnum.create("north", @@ -39,17 +39,17 @@ + } + -> CHANGE 60 : 61 @ 49 : 50 +> CHANGE 49 : 50 @ 49 : 50 ~ ArrayList 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) { -> CHANGE 100 : 101 @ 112 : 113 +> CHANGE 99 : 100 @ 99 : 100 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockReed.edit.java b/patches/minecraft/net/minecraft/block/BlockReed.edit.java index 97bcedd..b04aeaa 100644 --- a/patches/minecraft/net/minecraft/block/BlockReed.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockReed.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 28 : 29 @ 28 : 29 +> CHANGE 26 : 27 @ 26 : 27 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockSand.edit.java b/patches/minecraft/net/minecraft/block/BlockSand.edit.java index 9d6d56c..87dcd72 100644 --- a/patches/minecraft/net/minecraft/block/BlockSand.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSand.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 12 : 13 @ 12 : 14 +> CHANGE 11 : 12 @ 11 : 13 ~ public static PropertyEnum VARIANT; -> INSERT 6 : 10 @ 7 +> INSERT 5 : 9 @ 5 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockSand.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java b/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java index 1ed2c6f..dfd18f0 100644 --- a/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSandStone.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 13 : 14 @ 13 : 15 +> CHANGE 12 : 13 @ 12 : 14 ~ public static PropertyEnum TYPE; -> INSERT 8 : 12 @ 9 +> INSERT 7 : 11 @ 7 + public static void bootstrapStates() { + TYPE = PropertyEnum.create("type", BlockSandStone.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java index e8ef63e..30c8edf 100644 --- a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java @@ -10,31 +10,31 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 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 TYPE; -> INSERT 11 : 15 @ 12 +> INSERT 10 : 14 @ 10 + public static void bootstrapStates() { + TYPE = PropertyEnum.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) { -> 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) { -> DELETE 4 @ 4 : 8 +> DELETE 3 @ 3 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java b/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java index b637a75..ebb859a 100644 --- a/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSeaLantern.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 16 : 17 @ 16 : 17 +> CHANGE 14 : 15 @ 14 : 15 ~ public int quantityDropped(EaglercraftRandom random) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockSign.edit.java b/patches/minecraft/net/minecraft/block/BlockSign.edit.java index fd4d52e..6a85dd5 100644 --- a/patches/minecraft/net/minecraft/block/BlockSign.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSign.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 52 : 53 @ 52 : 53 +> CHANGE 50 : 51 @ 50 : 51 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 10 : 11 @ 10 : 17 +> CHANGE 9 : 10 @ 9 : 16 ~ return true; diff --git a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java index da3d3d1..52c4271 100644 --- a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java @@ -10,13 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 8 @ 10 : 11 +> DELETE 6 @ 6 : 7 -> CHANGE 8 : 9 @ 9 : 11 +> CHANGE 8 : 9 @ 8 : 10 ~ public static PropertyEnum VARIANT; -> CHANGE 9 : 14 @ 10 : 11 +> CHANGE 8 : 13 @ 8 : 9 ~ public static void bootstrapStates() { ~ VARIANT = PropertyEnum.create("variant", BlockSilverfish.EnumType.class); @@ -24,6 +24,6 @@ ~ ~ public int quantityDropped(EaglercraftRandom var1) { -> DELETE 31 @ 27 : 38 +> DELETE 26 @ 26 : 37 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java index 2a7e08a..e7184a9 100644 --- a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java @@ -10,32 +10,32 @@ + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + -> CHANGE 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) { -> CHANGE 5 : 6 @ 5 : 7 +> CHANGE 4 : 5 @ 4 : 6 ~ return false; -> DELETE 4 @ 5 : 15 +> DELETE 3 @ 3 : 13 -> DELETE 1 @ 11 : 52 +> DELETE 1 @ 1 : 42 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java index 18c22f6..26931c0 100644 --- a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java @@ -10,18 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 18 : 19 @ 18 : 20 +> CHANGE 16 : 17 @ 16 : 18 ~ public static PropertyEnum HALF; -> INSERT 13 : 17 @ 14 +> INSERT 12 : 16 @ 12 + public static void bootstrapStates() { + HALF = PropertyEnum.create("half", BlockSlab.EnumBlockHalf.class); + } + -> CHANGE 52 : 53 @ 48 : 49 +> CHANGE 48 : 49 @ 48 : 49 ~ public int quantityDropped(EaglercraftRandom var1) { diff --git a/patches/minecraft/net/minecraft/block/BlockSnow.edit.java b/patches/minecraft/net/minecraft/block/BlockSnow.edit.java index abf751d..6223cf3 100644 --- a/patches/minecraft/net/minecraft/block/BlockSnow.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSnow.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 98 : 99 @ 98 : 99 +> CHANGE 96 : 97 @ 96 : 97 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java b/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java index e2c7d75..961cc1d 100644 --- a/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSnowBlock.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 16 : 17 @ 16 : 17 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockSponge.edit.java b/patches/minecraft/net/minecraft/block/BlockSponge.edit.java index 53c8b6b..e5f65e7 100644 --- a/patches/minecraft/net/minecraft/block/BlockSponge.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSponge.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 3 -> CHANGE 3 : 7 @ 4 : 6 +> CHANGE 3 : 7 @ 3 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import com.google.common.collect.Lists; ~ -> CHANGE 56 : 57 @ 54 : 55 +> CHANGE 52 : 53 @ 52 : 53 ~ ArrayList arraylist = Lists.newArrayList(); -> CHANGE 50 : 51 @ 50 : 51 +> CHANGE 49 : 50 @ 49 : 50 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java index 1b6df5c..2815136 100644 --- a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java @@ -10,12 +10,12 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 45 : 46 @ 46 : 47 +> CHANGE 43 : 44 @ 43 : 44 ~ public int quantityDropped(EaglercraftRandom var1) { -> DELETE 17 @ 17 : 20 +> DELETE 16 @ 16 : 19 -> DELETE 4 @ 7 : 10 +> DELETE 4 @ 4 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java index 94171ef..dfbfb28 100644 --- a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java @@ -9,8 +9,8 @@ ~ -> DELETE 59 @ 60 : 63 +> DELETE 58 @ 58 : 61 -> DELETE 4 @ 7 : 10 +> DELETE 4 @ 4 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java index 5692eed..a1c32d6 100644 --- a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java @@ -10,12 +10,12 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 26 : 28 @ 26 : 30 +> CHANGE 24 : 26 @ 24 : 28 ~ public static PropertyEnum HALF; ~ public static PropertyEnum SHAPE; -> INSERT 22 : 27 @ 24 +> INSERT 20 : 25 @ 20 + public static void bootstrapStates() { + HALF = PropertyEnum.create("half", BlockStairs.EnumHalf.class); @@ -23,11 +23,11 @@ + } + -> CHANGE 349 : 350 @ 344 : 345 +> CHANGE 344 : 345 @ 344 : 345 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> CHANGE 61 : 62 @ 61 : 62 +> CHANGE 60 : 61 @ 60 : 61 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java index 63bcc5a..83ef2f9 100644 --- a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 32 : 33 @ 34 : 35 +> CHANGE 30 : 31 @ 30 : 31 ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockStem.edit.java b/patches/minecraft/net/minecraft/block/BlockStem.edit.java index b7a4a42..8b784cb 100644 --- a/patches/minecraft/net/minecraft/block/BlockStem.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStem.edit.java @@ -10,27 +10,27 @@ + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + -> CHANGE 3 : 4 @ 1 : 6 +> CHANGE 1 : 2 @ 1 : 6 ~ -> DELETE 11 @ 15 : 16 +> DELETE 10 @ 10 : 11 -> CHANGE 42 : 43 @ 43 : 44 +> CHANGE 42 : 43 @ 42 : 43 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> DELETE 61 @ 61 : 78 +> DELETE 60 @ 60 : 77 -> CHANGE 5 : 6 @ 22 : 23 +> CHANGE 5 : 6 @ 5 : 6 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockStone.edit.java b/patches/minecraft/net/minecraft/block/BlockStone.edit.java index 8399c08..cb7b833 100644 --- a/patches/minecraft/net/minecraft/block/BlockStone.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStone.edit.java @@ -10,18 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 16 : 17 @ 16 : 18 +> CHANGE 14 : 15 @ 14 : 16 ~ public static PropertyEnum VARIANT; -> INSERT 8 : 12 @ 9 +> INSERT 7 : 11 @ 7 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockStone.EnumType.class); + } + -> CHANGE 13 : 14 @ 9 : 10 +> CHANGE 9 : 10 @ 9 : 10 ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java index d0aa8cc..97f567d 100644 --- a/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStoneBrick.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 12 : 13 @ 12 : 14 +> CHANGE 11 : 12 @ 11 : 13 ~ public static PropertyEnum VARIANT; -> INSERT 12 : 16 @ 13 +> INSERT 11 : 15 @ 11 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockStoneBrick.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java index ae44733..dabd14b 100644 --- a/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStoneSlab.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 19 : 20 @ 19 : 21 +> CHANGE 17 : 18 @ 17 : 19 ~ public static PropertyEnum VARIANT; -> CHANGE 15 : 20 @ 16 : 17 +> CHANGE 14 : 19 @ 14 : 15 ~ public static void bootstrapStates() { ~ VARIANT = PropertyEnum.create("variant", BlockStoneSlab.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java b/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java index a8b57bb..704d196 100644 --- a/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStoneSlabNew.edit.java @@ -10,18 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 20 : 21 @ 21 : 23 +> CHANGE 18 : 19 @ 18 : 20 ~ public static PropertyEnum VARIANT; -> INSERT 15 : 19 @ 16 +> INSERT 14 : 18 @ 14 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockStoneSlabNew.EnumType.class); + } + -> CHANGE 8 : 9 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java index 0bc7f84..0dc1f00 100644 --- a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 3 -> DELETE 6 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 33 @ 34 : 44 +> DELETE 33 @ 33 : 43 -> DELETE 5 @ 15 : 22 +> DELETE 5 @ 5 : 12 -> DELETE 1 @ 8 : 9 +> DELETE 1 @ 1 : 2 -> DELETE 22 @ 23 : 38 +> DELETE 22 @ 22 : 37 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java index f417594..e4030da 100644 --- a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java @@ -10,36 +10,36 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 8 @ 11 : 12 +> DELETE 6 @ 6 : 7 -> DELETE 4 @ 5 : 7 +> DELETE 4 @ 4 : 6 -> CHANGE 7 : 8 @ 9 : 11 +> CHANGE 7 : 8 @ 7 : 9 ~ public static PropertyEnum TYPE; -> INSERT 9 : 13 @ 10 +> INSERT 8 : 12 @ 8 + public static void bootstrapStates() { + TYPE = PropertyEnum.create("type", BlockTallGrass.EnumType.class); + } + -> CHANGE 30 : 31 @ 26 : 27 +> CHANGE 26 : 27 @ 26 : 27 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { -> DELETE 4 @ 4 : 17 +> DELETE 3 @ 3 : 16 -> CHANGE 16 : 17 @ 29 : 30 +> CHANGE 16 : 17 @ 16 : 17 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockTorch.edit.java b/patches/minecraft/net/minecraft/block/BlockTorch.edit.java index 7a0aca1..727c73a 100644 --- a/patches/minecraft/net/minecraft/block/BlockTorch.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTorch.edit.java @@ -10,11 +10,11 @@ + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + -> CHANGE 3 : 4 @ 1 : 4 +> CHANGE 1 : 2 @ 1 : 4 ~ -> CHANGE 150 : 151 @ 152 : 153 +> CHANGE 149 : 150 @ 149 : 150 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { diff --git a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java index ba5095d..cca1e24 100644 --- a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 5 -> CHANGE 24 : 25 @ 27 : 29 +> CHANGE 24 : 25 @ 24 : 26 ~ public static PropertyEnum HALF; -> INSERT 12 : 16 @ 13 +> INSERT 11 : 15 @ 11 + public static void bootstrapStates() { + HALF = PropertyEnum.create("half", BlockTrapDoor.DoorHalf.class); + } + -> DELETE 81 @ 77 : 97 +> DELETE 77 @ 77 : 97 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java index 4e9d1dc..ad96ea9 100644 --- a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java @@ -10,14 +10,14 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 7 @ 9 : 11 +> DELETE 5 @ 5 : 7 -> CHANGE 59 : 60 @ 61 : 62 +> CHANGE 59 : 60 @ 59 : 60 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> DELETE 43 @ 43 : 53 +> DELETE 42 @ 42 : 52 -> DELETE 20 @ 30 : 78 +> DELETE 20 @ 20 : 68 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java b/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java index 7a3806a..79a8d7b 100644 --- a/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTripWireHook.edit.java @@ -10,15 +10,15 @@ + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + -> CHANGE 3 : 4 @ 1 : 4 +> CHANGE 1 : 2 @ 1 : 4 ~ -> CHANGE 168 : 169 @ 170 : 171 +> CHANGE 167 : 168 @ 167 : 168 ~ 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) { diff --git a/patches/minecraft/net/minecraft/block/BlockVine.edit.java b/patches/minecraft/net/minecraft/block/BlockVine.edit.java index 7eec21b..968a50e 100644 --- a/patches/minecraft/net/minecraft/block/BlockVine.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockVine.edit.java @@ -10,20 +10,20 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 9 @ 9 : 12 +> DELETE 7 @ 7 : 10 -> DELETE 1 @ 4 : 7 +> DELETE 1 @ 1 : 4 -> DELETE 167 @ 170 : 304 +> DELETE 167 @ 167 : 301 -> CHANGE 10 : 11 @ 144 : 145 +> CHANGE 10 : 11 @ 10 : 11 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public int quantityDropped(EaglercraftRandom var1) { -> DELETE 4 @ 4 : 16 +> DELETE 3 @ 3 : 15 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockWall.edit.java b/patches/minecraft/net/minecraft/block/BlockWall.edit.java index a669a43..07d16bf 100644 --- a/patches/minecraft/net/minecraft/block/BlockWall.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockWall.edit.java @@ -9,11 +9,11 @@ ~ -> CHANGE 25 : 26 @ 26 : 28 +> CHANGE 24 : 25 @ 24 : 26 ~ public static PropertyEnum VARIANT; -> INSERT 14 : 18 @ 15 +> INSERT 13 : 17 @ 13 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockWall.EnumType.class); diff --git a/patches/minecraft/net/minecraft/block/BlockWeb.edit.java b/patches/minecraft/net/minecraft/block/BlockWeb.edit.java index 3f51b28..e358cc0 100644 --- a/patches/minecraft/net/minecraft/block/BlockWeb.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockWeb.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 35 : 36 @ 35 : 36 +> CHANGE 33 : 34 @ 33 : 34 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java index be0b23d..5117b97 100644 --- a/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockWoodSlab.edit.java @@ -10,18 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 16 : 17 @ 17 : 19 +> CHANGE 14 : 15 @ 14 : 16 ~ public static PropertyEnum VARIANT; -> INSERT 13 : 17 @ 14 +> INSERT 12 : 16 @ 12 + public static void bootstrapStates() { + VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class); + } + -> CHANGE 8 : 9 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java index 193d61a..dbc586a 100644 --- a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 3 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> CHANGE 15 : 16 @ 16 : 23 +> CHANGE 15 : 16 @ 15 : 22 ~ return true; diff --git a/patches/minecraft/net/minecraft/block/IGrowable.edit.java b/patches/minecraft/net/minecraft/block/IGrowable.edit.java index 783f689..f39cd45 100644 --- a/patches/minecraft/net/minecraft/block/IGrowable.edit.java +++ b/patches/minecraft/net/minecraft/block/IGrowable.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 9 : 10 @ 8 : 11 +> CHANGE 7 : 8 @ 7 : 10 ~ boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4); diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java index ed47feb..c296a09 100644 --- a/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java +++ b/patches/minecraft/net/minecraft/block/properties/PropertyBool.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> INSERT 1 : 3 @ 2 +> INSERT 1 : 3 @ 1 + import com.google.common.collect.ImmutableSet; + -> CHANGE 17 : 19 @ 15 : 17 +> CHANGE 15 : 17 @ 15 : 17 ~ public String getName(Object value) { ~ return ((Boolean) value).toString(); diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java index 0816247..e217c63 100644 --- a/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java +++ b/patches/minecraft/net/minecraft/block/properties/PropertyDirection.edit.java @@ -10,7 +10,7 @@ + import java.util.Collection; + -> CHANGE 6 : 7 @ 4 : 6 +> CHANGE 4 : 5 @ 4 : 6 ~ diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java index 7243d35..725bbc0 100644 --- a/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java +++ b/patches/minecraft/net/minecraft/block/properties/PropertyEnum.edit.java @@ -11,15 +11,15 @@ + import java.util.Map; + -> CHANGE 9 : 10 @ 6 : 9 +> CHANGE 6 : 7 @ 6 : 9 ~ -> CHANGE 11 : 12 @ 13 : 14 +> CHANGE 10 : 11 @ 10 : 11 ~ for (T oenum : allowedValues) { -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ public String getName(Object oenum) { diff --git a/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java b/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java index 3b80156..eaa44e8 100644 --- a/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java +++ b/patches/minecraft/net/minecraft/block/properties/PropertyInteger.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 4 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + import com.google.common.collect.ImmutableSet; + import com.google.common.collect.Sets; + -> CHANGE 52 : 53 @ 49 : 50 +> CHANGE 49 : 50 @ 49 : 50 ~ public String getName(Object integer) { diff --git a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java index ee5b2dc..aaea441 100644 --- a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java +++ b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/block/state/BlockState.edit.java b/patches/minecraft/net/minecraft/block/state/BlockState.edit.java index 771423e..db30512 100644 --- a/patches/minecraft/net/minecraft/block/state/BlockState.edit.java +++ b/patches/minecraft/net/minecraft/block/state/BlockState.edit.java @@ -18,21 +18,21 @@ + import java.util.Map; + -> CHANGE 20 : 21 @ 10 : 19 +> CHANGE 10 : 11 @ 10 : 19 ~ -> DELETE 3 @ 11 : 13 +> DELETE 2 @ 2 : 4 -> CHANGE 23 : 24 @ 25 : 26 +> CHANGE 23 : 24 @ 23 : 24 ~ ArrayList arraylist = Lists.newArrayList(); -> CHANGE 108 : 109 @ 108 : 109 +> CHANGE 107 : 108 @ 107 : 108 ~ for (Object comparable : iproperty.getAllowedValues()) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ map.get(this.getPropertiesWithValue(iproperty, (Comparable) comparable))); diff --git a/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java b/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java index d4b50df..eede911 100644 --- a/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java +++ b/patches/minecraft/net/minecraft/block/state/BlockStateBase.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> INSERT 3 : 8 @ 6 +> INSERT 3 : 8 @ 3 + + import com.google.common.base.Function; @@ -15,9 +15,9 @@ + import com.google.common.collect.Iterables; + -> DELETE 7 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> CHANGE 16 : 17 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ (T) cyclePropertyValue(property.getAllowedValues(), this.getValue(property))); diff --git a/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java b/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java index a4bf6d5..b255795 100644 --- a/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java +++ b/patches/minecraft/net/minecraft/block/state/IBlockState.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.ImmutableMap; diff --git a/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java index 05d2050..69a4bba 100644 --- a/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java +++ b/patches/minecraft/net/minecraft/block/state/pattern/BlockPattern.edit.java @@ -11,40 +11,40 @@ ~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerCacheProvider; ~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache; -> CHANGE 41 : 42 @ 40 : 41 +> CHANGE 38 : 39 @ 38 : 39 ~ EaglerLoadingCache lcache) { -> CHANGE 4 : 5 @ 4 : 6 +> CHANGE 3 : 4 @ 3 : 5 ~ if (!this.blockMatches[k][j][i].apply(lcache.get(translateOffset(pos, finger, thumb, i, j, k)))) { -> CHANGE 12 : 13 @ 13 : 14 +> CHANGE 11 : 12 @ 11 : 12 ~ EaglerLoadingCache loadingcache = func_181627_a(worldIn, false); -> CHANGE 20 : 22 @ 20 : 22 +> CHANGE 19 : 21 @ 19 : 21 ~ public static EaglerLoadingCache func_181627_a(World parWorld, boolean parFlag) { ~ return new EaglerLoadingCache(new BlockPattern.CacheLoader(parWorld, parFlag)); -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 16 : 17 @ 16 : 17 ~ static class CacheLoader implements EaglerCacheProvider { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ public BlockWorldState create(BlockPos parBlockPos) { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ private final EaglerLoadingCache lcache; -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ EaglerLoadingCache parLoadingCache, int parInt1, int parInt2, int parInt3) { -> CHANGE 31 : 32 @ 31 : 32 +> CHANGE 30 : 31 @ 30 : 31 ~ return (BlockWorldState) this.lcache.get(BlockPattern.translateOffset(this.pos, this.getFinger(), diff --git a/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java index 86cf7af..3b9da22 100644 --- a/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java +++ b/patches/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 2 : 6 @ 4 +> INSERT 2 : 6 @ 2 + + import com.google.common.base.Predicate; diff --git a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java index 7453454..b7fdadc 100644 --- a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java +++ b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 7 -> CHANGE 5 : 6 @ 10 : 13 +> CHANGE 5 : 6 @ 5 : 8 ~ -> INSERT 3 : 11 @ 5 +> INSERT 2 : 10 @ 2 + import com.google.common.base.Joiner; + import com.google.common.base.Predicate; @@ -22,11 +22,11 @@ + import net.minecraft.block.state.BlockWorldState; + -> CHANGE 20 : 21 @ 12 : 13 +> CHANGE 12 : 13 @ 12 : 13 ~ if (aisle.length > 0 && !StringUtils.isEmpty(aisle[0])) { -> CHANGE 19 : 20 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 ~ this.symbolMap.put(Character.valueOf(c0), (Predicate) null); diff --git a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java index 3b661ee..e9c6f20 100644 --- a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.edit.java @@ -10,23 +10,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 3 : 5 +> DELETE 2 @ 2 : 4 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 10 @ 11 : 12 +> DELETE 10 @ 10 : 11 -> DELETE 4 @ 5 : 7 +> DELETE 4 @ 4 : 6 -> CHANGE 22 : 25 @ 24 : 34 +> CHANGE 22 : 25 @ 22 : 32 ~ ScaledResolution scaledresolution = new ScaledResolution(this.mc); ~ GlStateManager.ortho(0.0D, scaledresolution.getScaledWidth_double(), ~ scaledresolution.getScaledHeight_double(), 0.0D, 100.0D, 300.0D); -> INSERT 22 : 36 @ 29 +> INSERT 19 : 33 @ 19 + public void eaglerShow(String line1, String line2) { + if (!this.mc.running) { @@ -43,15 +43,15 @@ + } + -> CHANGE 27 : 28 @ 13 : 20 +> CHANGE 13 : 14 @ 13 : 20 ~ GlStateManager.clear(256); -> CHANGE 8 : 10 @ 14 : 17 +> CHANGE 7 : 9 @ 7 : 10 ~ GlStateManager.clear(16640); ~ GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); -> DELETE 46 @ 47 : 52 +> DELETE 44 @ 44 : 49 > EOF diff --git a/patches/minecraft/net/minecraft/client/Minecraft.edit.java b/patches/minecraft/net/minecraft/client/Minecraft.edit.java index 478c25c..2f6258d 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.edit.java +++ b/patches/minecraft/net/minecraft/client/Minecraft.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 17 -> DELETE 2 @ 17 : 21 +> DELETE 2 @ 2 : 6 -> DELETE 1 @ 5 : 6 +> DELETE 1 @ 1 : 2 -> CHANGE 2 : 3 @ 3 : 7 +> CHANGE 2 : 3 @ 2 : 6 ~ import java.util.LinkedList; -> DELETE 2 @ 5 : 8 +> DELETE 1 @ 1 : 4 -> CHANGE 1 : 32 @ 4 : 7 +> CHANGE 1 : 32 @ 1 : 4 ~ ~ import org.apache.commons.lang3.Validate; @@ -51,94 +51,94 @@ ~ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager; ~ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker; -> DELETE 33 @ 5 : 7 +> DELETE 2 @ 2 : 4 -> DELETE 13 @ 15 : 17 +> DELETE 13 @ 13 : 15 -> DELETE 3 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> INSERT 3 : 4 @ 4 +> INSERT 3 : 4 @ 3 + import net.minecraft.client.multiplayer.ServerAddress; -> INSERT 2 : 3 @ 1 +> INSERT 1 : 2 @ 1 + import net.minecraft.client.multiplayer.ServerList; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 15 @ 16 : 17 +> DELETE 15 @ 15 : 16 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 14 @ 15 : 16 +> DELETE 14 @ 14 : 15 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 21 @ 23 : 27 +> DELETE 21 @ 21 : 25 -> DELETE 1 @ 5 : 7 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 5 +> DELETE 1 @ 1 : 3 -> DELETE 5 @ 7 : 8 +> DELETE 5 @ 5 : 6 -> INSERT 11 : 12 @ 12 +> INSERT 11 : 12 @ 11 + import net.minecraft.util.StringTranslate; -> DELETE 7 @ 6 : 26 +> DELETE 6 @ 6 : 26 -> CHANGE 1 : 2 @ 21 : 22 +> CHANGE 1 : 2 @ 1 : 2 ~ public class Minecraft implements IThreadListener { -> CHANGE 3 : 4 @ 3 : 10 +> CHANGE 2 : 3 @ 2 : 9 ~ public static final boolean isRunningOnMac = false; -> DELETE 13 @ 19 : 21 +> DELETE 12 @ 12 : 14 -> DELETE 19 @ 21 : 22 +> DELETE 19 @ 19 : 20 -> DELETE 6 @ 7 : 9 +> DELETE 6 @ 6 : 8 -> DELETE 1 @ 3 : 5 +> DELETE 1 @ 1 : 3 -> CHANGE 11 : 12 @ 13 : 14 +> CHANGE 11 : 12 @ 11 : 12 ~ private EaglercraftNetworkManager myNetworkManager; -> DELETE 10 @ 10 : 12 +> DELETE 9 @ 9 : 11 -> CHANGE 4 : 5 @ 6 : 9 +> CHANGE 4 : 5 @ 4 : 7 ~ private final List> scheduledTasks = new LinkedList(); -> INSERT 15 : 17 @ 17 +> INSERT 14 : 16 @ 14 + public int joinWorldTickCounter = 0; + private int dontPauseTimer = 0; -> CHANGE 5 : 6 @ 3 : 6 +> CHANGE 3 : 4 @ 3 : 6 ~ StringTranslate.doCLINIT(); -> CHANGE 2 : 3 @ 4 : 12 +> CHANGE 1 : 2 @ 1 : 9 ~ this.mcDefaultResourcePack = new DefaultResourcePack(); -> CHANGE 2 : 3 @ 9 : 11 +> CHANGE 1 : 2 @ 1 : 3 ~ logger.info("Setting user: " + this.session.getProfile().getName()); -> CHANGE 8 : 13 @ 9 : 13 +> CHANGE 7 : 12 @ 7 : 11 ~ String serverToJoin = EagRuntime.getConfiguration().getServerToJoin(); ~ if (serverToJoin != null) { @@ -146,16 +146,16 @@ ~ this.serverName = addr.getIP(); ~ this.serverPort = addr.getPort(); -> DELETE 7 @ 6 : 7 +> DELETE 2 @ 2 : 3 -> CHANGE 15 : 17 @ 16 : 18 +> CHANGE 15 : 17 @ 15 : 17 ~ try { ~ while (true) { -> DELETE 18 @ 18 : 35 +> DELETE 16 @ 16 : 33 -> CHANGE 1 : 16 @ 18 : 20 +> CHANGE 1 : 16 @ 1 : 3 ~ } catch (MinecraftError var12) { ~ // ?? @@ -173,85 +173,85 @@ ~ } finally { ~ this.shutdownMinecraftApplet(); -> CHANGE 19 : 21 @ 6 : 8 +> CHANGE 4 : 6 @ 4 : 6 ~ private void startGame() throws IOException { ~ this.gameSettings = new GameSettings(this); -> DELETE 3 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> CHANGE 5 : 6 @ 6 : 9 +> CHANGE 5 : 6 @ 5 : 8 ~ logger.info("EagRuntime Version: " + EagRuntime.getVersion()); -> DELETE 2 @ 4 : 7 +> DELETE 1 @ 1 : 4 -> CHANGE 1 : 2 @ 4 : 6 +> CHANGE 1 : 2 @ 1 : 3 ~ this.mcResourcePackRepository = new ResourcePackRepository(this.mcDefaultResourcePack, this.metadataSerializer_, -> DELETE 9 @ 10 : 13 +> DELETE 8 @ 8 : 11 -> CHANGE 3 : 5 @ 6 : 8 +> CHANGE 3 : 5 @ 3 : 5 ~ this.fontRendererObj = new EaglerFontRenderer(this.gameSettings, ~ new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 5 : 6 @ 5 : 6 ~ this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings, -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ return HString.format(parString1, new Object[] { GameSettings -> CHANGE 11 : 12 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ GlStateManager.clearDepth(1.0f); -> INSERT 31 : 32 @ 31 +> INSERT 30 : 31 @ 30 + SkinPreviewRenderer.initialize(); -> INSERT 3 : 7 @ 2 +> INSERT 2 : 6 @ 2 + + ServerList.initServerList(this); + EaglerProfile.read(); + -> CHANGE 5 : 7 @ 1 : 2 +> CHANGE 1 : 3 @ 1 : 2 ~ this.displayGuiScreen(new GuiScreenEditProfile( ~ new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort))); -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ this.displayGuiScreen(new GuiScreenEditProfile(new GuiMainMenu())); -> DELETE 6 @ 6 : 18 +> DELETE 5 @ 5 : 17 -> CHANGE 16 : 17 @ 28 : 36 +> CHANGE 16 : 17 @ 16 : 24 ~ throw new UnsupportedOperationException("wtf u trying to twitch stream in a browser game?"); -> CHANGE 3 : 6 @ 10 : 32 +> CHANGE 2 : 5 @ 2 : 24 ~ private void createDisplay() { ~ Display.create(); ~ Display.setTitle("Eaglercraft 1.8.8"); -> DELETE 5 @ 24 : 61 +> DELETE 2 @ 2 : 39 -> CHANGE 1 : 2 @ 38 : 48 +> CHANGE 1 : 2 @ 1 : 11 ~ return true; -> DELETE 3 @ 12 : 16 +> DELETE 2 @ 2 : 6 -> DELETE 4 @ 8 : 25 +> DELETE 4 @ 4 : 21 -> CHANGE 6 : 18 @ 23 : 36 +> CHANGE 6 : 18 @ 6 : 19 ~ String report = crashReportIn.getCompleteReport(); ~ Bootstrap.printToSYSOUT(report); @@ -266,76 +266,76 @@ ~ System.err.println( ~ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"); -> DELETE 13 @ 14 : 15 +> DELETE 1 @ 1 : 2 -> INSERT 7 : 9 @ 8 +> INSERT 7 : 9 @ 7 + GlStateManager.recompileShaders(); + -> CHANGE 16 : 18 @ 14 : 15 +> CHANGE 14 : 16 @ 14 : 15 ~ logger.info("Caught error stitching, removing all assigned resourcepacks"); ~ logger.info(runtimeexception); -> CHANGE 18 : 21 @ 17 : 29 +> CHANGE 16 : 19 @ 16 : 28 ~ private void updateDisplayMode() { ~ this.displayWidth = Display.getWidth(); ~ this.displayHeight = Display.getHeight(); -> CHANGE 5 : 9 @ 14 : 58 +> CHANGE 2 : 6 @ 2 : 46 ~ private void drawSplashScreen(TextureManager textureManagerInstance) { ~ Display.update(); ~ updateDisplayMode(); ~ GlStateManager.viewport(0, 0, displayWidth, displayHeight); -> DELETE 6 @ 46 : 49 +> DELETE 2 @ 2 : 5 -> CHANGE 16 : 17 @ 19 : 20 +> CHANGE 16 : 17 @ 16 : 17 ~ new DynamicTexture(ImageData.loadImageFile(inputstream))); -> DELETE 25 @ 25 : 27 +> DELETE 24 @ 24 : 26 -> DELETE 26 @ 28 : 32 +> DELETE 26 @ 26 : 30 -> CHANGE 31 : 32 @ 35 : 36 +> CHANGE 31 : 32 @ 31 : 32 ~ public void checkGLError(String message) { -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ int i = EaglercraftGPU.glGetError(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ String s = EaglercraftGPU.gluErrorString(i); -> DELETE 11 @ 11 : 12 +> DELETE 10 @ 10 : 11 -> CHANGE 10 : 11 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ EagRuntime.destroy(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ EagRuntime.exit(); -> DELETE 4 @ 4 : 6 +> DELETE 3 @ 3 : 5 -> CHANGE 5 : 6 @ 7 : 8 +> CHANGE 5 : 6 @ 5 : 6 ~ if (Display.isCloseRequested()) { -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ Util.func_181617_a((FutureTask) this.scheduledTasks.remove(0), logger); -> DELETE 19 @ 19 : 27 +> DELETE 18 @ 18 : 26 -> CHANGE 1 : 11 @ 9 : 13 +> CHANGE 1 : 11 @ 1 : 5 ~ if (!Display.contextLost()) { ~ GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 1.0f); @@ -348,7 +348,7 @@ ~ } ~ -> CHANGE 11 : 16 @ 5 : 6 +> CHANGE 1 : 6 @ 1 : 2 ~ if (!this.skipRenderWorld) { ~ this.mcProfiler.endStartSection("gameRenderer"); @@ -356,7 +356,7 @@ ~ this.mcProfiler.endSection(); ~ } -> CHANGE 6 : 18 @ 2 : 6 +> CHANGE 1 : 13 @ 1 : 5 ~ this.mcProfiler.endSection(); ~ if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart @@ -371,72 +371,72 @@ ~ this.mcProfiler.profilingEnabled = false; ~ this.prevFrameTime = System.nanoTime(); -> CHANGE 14 : 16 @ 6 : 11 +> CHANGE 2 : 4 @ 2 : 7 ~ this.guiAchievement.updateAchievementWindow(); ~ GlStateManager.popMatrix(); -> DELETE 4 @ 7 : 16 +> DELETE 2 @ 2 : 11 -> DELETE 2 @ 11 : 19 +> DELETE 2 @ 2 : 10 -> INSERT 1 : 2 @ 9 +> INSERT 1 : 2 @ 1 + -> CHANGE 2 : 3 @ 1 : 3 +> CHANGE 1 : 2 @ 1 : 3 ~ this.isGamePaused = false; -> CHANGE 7 : 8 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ this.debug = HString.format("%d fps (%d chunk update%s) T: %s%s%s%s", -> CHANGE 6 : 8 @ 6 : 10 +> CHANGE 5 : 7 @ 5 : 9 ~ this.gameSettings.fancyGraphics ? "" : " fast", this.gameSettings.clouds == 0 ? "" ~ : (this.gameSettings.clouds == 1 ? " fast-clouds" : " fancy-clouds") }); -> DELETE 5 @ 7 : 11 +> DELETE 3 @ 3 : 7 -> DELETE 49 @ 53 : 60 +> DELETE 49 @ 49 : 56 -> CHANGE 48 : 49 @ 55 : 56 +> CHANGE 48 : 49 @ 48 : 49 ~ EaglercraftGPU.glLineWidth(1.0F); -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ .color(0, 0, 0, 100).endVertex(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ .color(0, 0, 0, 100).endVertex(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex(); -> DELETE 111 @ 111 : 115 +> DELETE 110 @ 110 : 114 -> CHANGE 108 : 109 @ 112 : 152 +> CHANGE 108 : 109 @ 108 : 148 ~ logger.error("Use F11 to toggle fullscreen!"); -> DELETE 12 @ 51 : 52 +> DELETE 11 @ 11 : 12 -> DELETE 2 @ 3 : 11 +> DELETE 2 @ 2 : 10 -> INSERT 9 : 11 @ 17 +> INSERT 9 : 11 @ 9 + RateLimitTracker.tick(); + -> INSERT 25 : 31 @ 23 +> INSERT 23 : 29 @ 23 + if (this.currentScreen == null && this.dontPauseTimer <= 0) { + if (!Mouse.isMouseGrabbed()) { @@ -445,7 +445,7 @@ + } + } -> INSERT 13 : 18 @ 7 +> INSERT 7 : 12 @ 7 + this.dontPauseTimer = 6; + } else { @@ -453,28 +453,28 @@ + --this.dontPauseTimer; + } -> CHANGE 15 : 16 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ return Minecraft.this.currentScreen.getClass().getName(); -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 13 : 14 @ 13 : 14 ~ return Minecraft.this.currentScreen.getClass().getName(); -> CHANGE 41 : 43 @ 41 : 42 +> CHANGE 40 : 42 @ 40 : 41 ~ if ((!this.inGameHasFocus || !Mouse.isActuallyGrabbed()) && Mouse.getEventButtonState()) { ~ this.inGameHasFocus = false; -> CHANGE 44 : 45 @ 43 : 44 +> CHANGE 42 : 43 @ 42 : 43 ~ if (k == 1 || (k > -1 && k == this.gameSettings.keyBindClose.getKeyCode())) { -> INSERT 42 : 43 @ 42 +> INSERT 41 : 42 @ 41 + GlStateManager.recompileShaders(); -> INSERT 207 : 213 @ 206 +> INSERT 206 : 212 @ 206 + if (this.theWorld != null) { + ++joinWorldTickCounter; @@ -483,95 +483,95 @@ + } + -> CHANGE 11 : 12 @ 5 : 54 +> CHANGE 5 : 6 @ 5 : 54 ~ throw new UnsupportedOperationException("singleplayer has been removed"); -> INSERT 13 : 14 @ 61 +> INSERT 12 : 13 @ 12 + session.reset(); -> DELETE 2 @ 1 : 7 +> DELETE 1 @ 1 : 7 -> DELETE 40 @ 46 : 47 +> DELETE 40 @ 40 : 41 -> CHANGE 20 : 21 @ 21 : 23 +> CHANGE 20 : 21 @ 20 : 22 ~ this.thePlayer = this.playerController.func_178892_a(this.theWorld, new StatFileWriter()); -> CHANGE 166 : 167 @ 167 : 168 +> CHANGE 165 : 166 @ 165 : 166 ~ return EagRuntime.getVersion(); -> CHANGE 5 : 7 @ 5 : 6 +> CHANGE 4 : 6 @ 4 : 5 ~ return EaglercraftGPU.glGetString(7937) + " GL version " + EaglercraftGPU.glGetString(7938) + ", " ~ + EaglercraftGPU.glGetString(7936); -> DELETE 4 @ 3 : 13 +> DELETE 2 @ 2 : 12 -> CHANGE 2 : 3 @ 12 : 16 +> CHANGE 2 : 3 @ 2 : 6 ~ return "Definitely Not; You're an eagler"; -> DELETE 37 @ 40 : 45 +> DELETE 36 @ 36 : 41 -> INSERT 14 : 16 @ 19 +> INSERT 14 : 16 @ 14 + Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"), + I18n.format("resourcePack.load.pleaseWait")); -> DELETE 7 @ 5 : 32 +> DELETE 5 @ 5 : 32 -> CHANGE 1 : 2 @ 28 : 33 +> CHANGE 1 : 2 @ 1 : 6 ~ return this.currentServerData != null ? "multiplayer" : "out_of_game"; -> DELETE 3 @ 7 : 224 +> DELETE 2 @ 2 : 219 -> CHANGE 17 : 18 @ 234 : 235 +> CHANGE 17 : 18 @ 17 : 18 ~ return false; -> DELETE 3 @ 3 : 7 +> DELETE 2 @ 2 : 6 -> DELETE 1 @ 5 : 10 +> DELETE 1 @ 1 : 6 -> DELETE 1 @ 6 : 7 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 7 +> DELETE 2 @ 2 : 6 -> CHANGE 1 : 2 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ return System.currentTimeMillis(); -> DELETE 11 @ 11 : 28 +> DELETE 10 @ 10 : 27 -> DELETE 44 @ 61 : 65 +> DELETE 44 @ 44 : 48 -> CHANGE 6 : 8 @ 10 : 50 +> CHANGE 6 : 8 @ 6 : 46 ~ if (i == this.gameSettings.keyBindScreenshot.getKeyCode()) { ~ this.ingameGUI.getChatGUI().printChatMessage(ScreenShotHelper.saveScreenshot()); -> DELETE 3 @ 41 : 43 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 5 : 13 +> DELETE 4 @ 4 : 12 -> CHANGE 11 : 15 @ 19 : 31 +> CHANGE 11 : 15 @ 11 : 23 ~ ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callableToSchedule); ~ synchronized (this.scheduledTasks) { ~ this.scheduledTasks.add(listenablefuturetask); ~ return listenablefuturetask; -> DELETE 12 @ 20 : 24 +> DELETE 8 @ 8 : 12 -> DELETE 24 @ 28 : 36 +> DELETE 24 @ 24 : 32 -> INSERT 7 : 11 @ 15 +> INSERT 7 : 11 @ 7 + + public static int getGLMaximumTextureSize() { diff --git a/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java b/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java index bb82cd8..f562999 100644 --- a/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/MusicTicker.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> CHANGE 5 : 6 @ 7 : 8 +> CHANGE 5 : 6 @ 5 : 6 ~ private final EaglercraftRandom rand = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java index cd62558..c0407aa 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/SoundCategory.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 4 @ 3 +> INSERT 2 : 4 @ 2 + import com.google.common.collect.Maps; + -> CHANGE 4 : 5 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ MOBS("hostile", 5), ANIMALS("neutral", 6), PLAYERS("player", 7), AMBIENT("ambient", 8), VOICE("voice", 9); diff --git a/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java index 190d4c9..a6cf541 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 7 +> CHANGE 1 : 5 @ 1 : 6 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import com.google.common.collect.Lists; ~ -> CHANGE 8 : 9 @ 9 : 10 +> CHANGE 4 : 5 @ 4 : 5 ~ private final EaglercraftRandom rnd = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java index 70e29b8..315a2cc 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 5 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> INSERT 2 : 3 @ 3 +> INSERT 2 : 3 @ 2 + import java.nio.charset.StandardCharsets; -> DELETE 3 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> CHANGE 1 : 14 @ 2 : 12 +> CHANGE 1 : 14 @ 1 : 11 ~ import java.util.Set; ~ @@ -31,25 +31,25 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 20 @ 17 : 21 +> DELETE 7 @ 7 : 11 -> CHANGE 3 : 4 @ 7 : 9 +> CHANGE 3 : 4 @ 3 : 5 ~ -> CHANGE 17 : 18 @ 18 : 19 +> CHANGE 16 : 17 @ 16 : 17 ~ private final EaglercraftSoundManager sndManager; -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ this.sndManager = new EaglercraftSoundManager(gameSettingsIn, this); -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ for (Entry entry : (Set) map.entrySet()) { -> INSERT 15 : 25 @ 15 +> INSERT 14 : 24 @ 14 + public static class SoundMap { + @@ -62,25 +62,25 @@ + } + -> CHANGE 11 : 12 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ Map map = null; -> CHANGE 2 : 6 @ 2 : 3 +> CHANGE 1 : 5 @ 1 : 2 ~ map = JSONTypeProvider.deserialize(IOUtils.inputStreamToString(stream, StandardCharsets.UTF_8), ~ SoundMap.class).soundMap; ~ } catch (IOException e) { ~ throw new RuntimeException("Exception caught reading JSON", e); -> INSERT 126 : 130 @ 123 +> INSERT 122 : 126 @ 122 + if (category == SoundCategory.VOICE) { + PlatformAudio.setMicVol(volume); + } + -> CHANGE 17 : 23 @ 13 : 15 +> CHANGE 13 : 19 @ 13 : 15 ~ SoundCategory cat = soundeventaccessorcomposite.getSoundCategory(); ~ for (int i = 0; i < categories.length; ++i) { @@ -89,7 +89,7 @@ ~ break; ~ } -> CHANGE 12 : 13 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ return (SoundEventAccessorComposite) arraylist.get((new EaglercraftRandom()).nextInt(arraylist.size())); diff --git a/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java index 6e96103..21111c9 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/SoundList.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> INSERT 1 : 3 @ 2 +> INSERT 1 : 3 @ 1 + import com.google.common.collect.Lists; + diff --git a/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java index 7718d24..80207d0 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/SoundListSerializer.edit.java @@ -7,37 +7,37 @@ > DELETE 2 @ 2 : 12 -> INSERT 1 : 4 @ 11 +> INSERT 1 : 4 @ 1 + import org.json.JSONArray; + import org.json.JSONException; + import org.json.JSONObject; -> CHANGE 4 : 8 @ 1 : 5 +> CHANGE 1 : 5 @ 1 : 5 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; ~ ~ public class SoundListSerializer implements JSONTypeDeserializer { ~ public SoundList deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ soundlist.setReplaceExisting(jsonobject.optBoolean("replace", false)); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ .getCategory(jsonobject.optString("category", SoundCategory.MASTER.getCategoryName())); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ JSONArray jsonarray = jsonobject.getJSONArray("sounds"); -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 1 : 3 @ 1 : 3 ~ for (int i = 0; i < jsonarray.length(); ++i) { ~ Object jsonelement = jsonarray.get(i); -> CHANGE 3 : 8 @ 3 : 8 +> CHANGE 1 : 6 @ 1 : 6 ~ if (jsonelement instanceof String) { ~ soundlist$soundentry.setSoundEntryName((String) jsonelement); @@ -45,23 +45,23 @@ ~ JSONObject jsonobject1 = (JSONObject) jsonelement; ~ soundlist$soundentry.setSoundEntryName(jsonobject1.getString("name")); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 2 : 3 @ 2 : 3 ~ .getType(jsonobject1.getString("type")); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ float f = jsonobject1.getFloat("volume"); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ float f1 = jsonobject1.getFloat("pitch"); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ int j = jsonobject1.getInt("weight"); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ soundlist$soundentry.setStreaming(jsonobject1.getBoolean("stream")); diff --git a/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java index 2d4d04f..314b145 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/SoundRegistry.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ ~ import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java index 41c5168..25c7260 100644 --- a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java +++ b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.edit.java @@ -9,10 +9,10 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> DELETE 3 @ 4 : 8 +> DELETE 2 @ 2 : 6 -> DELETE 6 @ 10 : 11 +> DELETE 6 @ 6 : 7 -> DELETE 44 @ 45 : 63 +> DELETE 44 @ 44 : 62 > EOF diff --git a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java index 6ef7c53..ea98f80 100644 --- a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java +++ b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.edit.java @@ -9,6 +9,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> DELETE 2 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java index 58a16d9..97db9e8 100644 --- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java +++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.edit.java @@ -7,19 +7,19 @@ > DELETE 5 @ 5 : 6 -> DELETE 51 @ 52 : 53 +> DELETE 51 @ 51 : 52 -> INSERT 22 : 23 @ 23 +> INSERT 22 : 23 @ 22 + private StatFileWriter statWriter; -> CHANGE 2 : 3 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ public EntityPlayerSP(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandler, StatFileWriter statWriter) { -> DELETE 3 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> INSERT 2 : 3 @ 3 +> INSERT 2 : 3 @ 2 + this.statWriter = statWriter; diff --git a/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java b/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java index 5f06a7e..646639d 100644 --- a/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/FontRenderer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 6 -> CHANGE 4 : 11 @ 8 : 10 +> CHANGE 4 : 11 @ 4 : 6 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -17,18 +17,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 8 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 7 @ 8 : 10 +> DELETE 7 @ 7 : 9 -> CHANGE 2 : 4 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ protected static final ResourceLocation[] unicodePageLocations = new ResourceLocation[256]; ~ protected int[] charWidth = new int[256]; -> CHANGE 3 : 22 @ 3 : 22 +> CHANGE 1 : 20 @ 1 : 20 ~ public EaglercraftRandom fontRandom = new EaglercraftRandom(); ~ protected byte[] glyphWidth = new byte[65536]; @@ -50,17 +50,17 @@ ~ protected boolean underlineStyle; ~ protected boolean strikethroughStyle; -> CHANGE 62 : 63 @ 62 : 63 +> CHANGE 43 : 44 @ 43 : 44 ~ ImageData bufferedimage; -> CHANGE 8 : 11 @ 8 : 12 +> CHANGE 7 : 10 @ 7 : 11 ~ int i = bufferedimage.width; ~ int j = bufferedimage.height; ~ int[] aint = bufferedimage.pixels; -> CHANGE 71 : 90 @ 72 : 82 +> CHANGE 68 : 87 @ 68 : 78 ~ Tessellator tessellator = Tessellator.getInstance(); ~ WorldRenderer worldrenderer = tessellator.getWorldRenderer(); @@ -82,11 +82,11 @@ ~ tessellator.draw(); ~ -> CHANGE 25 : 26 @ 16 : 17 +> CHANGE 6 : 7 @ 6 : 7 ~ HString.format("textures/font/unicode_page_%02x.png", new Object[] { Integer.valueOf(parInt1) })); -> CHANGE 24 : 42 @ 24 : 34 +> CHANGE 23 : 41 @ 23 : 33 ~ Tessellator tessellator = Tessellator.getInstance(); ~ WorldRenderer worldrenderer = tessellator.getWorldRenderer(); @@ -107,7 +107,7 @@ ~ tessellator.draw(); ~ -> CHANGE 45 : 53 @ 37 : 44 +> CHANGE 27 : 35 @ 27 : 34 ~ // try { ~ // Bidi bidi = new Bidi((new ArabicShaping(8)).shape(parString1), 127); @@ -118,59 +118,59 @@ ~ // } ~ return parString1; -> CHANGE 10 : 11 @ 9 : 10 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void resetStyles() { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ protected void renderStringAtPos(String parString1, boolean parFlag) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ int i1 = "0123456789abcdefklmnor".indexOf(Character.toLowerCase(parString1.charAt(i + 1))); -> CHANGE 134 : 135 @ 134 : 135 +> CHANGE 133 : 134 @ 133 : 134 ~ private int renderStringAligned(String text, int x, int y, int wrapWidth, int color, boolean parFlag) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ x = x + wrapWidth - i; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ return this.renderString(text, (float) x, (float) y, color, parFlag); -> CHANGE 5 : 7 @ 5 : 6 +> CHANGE 4 : 6 @ 4 : 5 ~ this.posX = x; ~ this.posY = y; -> DELETE 23 @ 22 : 23 +> DELETE 21 @ 21 : 22 -> INSERT 1 : 2 @ 2 +> INSERT 1 : 2 @ 1 + return (int) this.posX; -> INSERT 120 : 123 @ 119 +> INSERT 119 : 122 @ 119 + if ((textColor & -67108864) == 0) { + textColor |= -16777216; + } -> CHANGE 33 : 34 @ 30 : 31 +> CHANGE 30 : 31 @ 30 : 31 ~ return Arrays.asList(this.wrapFormattedStringToWidth(str, wrapWidth, 0).split("\n")); -> CHANGE 3 : 7 @ 3 : 4 +> CHANGE 2 : 6 @ 2 : 3 ~ String wrapFormattedStringToWidth(String str, int wrapWidth, int depthCheck) { // TODO: fix recursive ~ if (depthCheck > 20) { ~ return str; ~ } -> CHANGE 12 : 13 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ return s + "\n" + this.wrapFormattedStringToWidth(s1, wrapWidth, ++depthCheck); diff --git a/patches/minecraft/net/minecraft/client/gui/Gui.edit.java b/patches/minecraft/net/minecraft/client/gui/Gui.edit.java index ff6fc2c..95d8b6d 100644 --- a/patches/minecraft/net/minecraft/client/gui/Gui.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/Gui.edit.java @@ -11,9 +11,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 3 : 5 +> DELETE 1 @ 1 : 3 -> CHANGE 135 : 136 @ 137 : 138 +> CHANGE 135 : 136 @ 135 : 136 ~ public void drawTexturedModalRect(int xCoord, int yCoord, EaglerTextureAtlasSprite textureSprite, int widthIn, diff --git a/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java index 49ebceb..eb74dfc 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiButton.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 3 : 6 +> DELETE 3 @ 3 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java index 060e994..ee9ceb6 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiButtonLanguage.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java index 1535ae0..e3399d0 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 2 : 13 @ 3 : 5 +> CHANGE 2 : 13 @ 2 : 4 ~ ~ import org.apache.commons.lang3.StringUtils; @@ -21,32 +21,32 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.minecraft.client.resources.I18n; -> DELETE 17 @ 8 : 13 +> DELETE 6 @ 6 : 11 -> INSERT 12 : 14 @ 17 +> INSERT 12 : 14 @ 12 + private GuiButton exitButton; + -> INSERT 11 : 14 @ 9 +> INSERT 9 : 12 @ 9 + if (!(this instanceof GuiSleepMP)) { + this.buttonList.add(exitButton = new GuiButton(69, this.width - 100, 3, 97, 20, I18n.format("chat.exit"))); + } -> CHANGE 21 : 22 @ 18 : 19 +> CHANGE 18 : 19 @ 18 : 19 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 8 : 9 @ 8 : 11 +> CHANGE 7 : 8 @ 7 : 10 ~ if (parInt1 != 28 && parInt1 != 156) { -> CHANGE 44 : 45 @ 46 : 47 +> CHANGE 43 : 44 @ 43 : 44 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> INSERT 12 : 18 @ 12 +> INSERT 11 : 17 @ 11 + protected void actionPerformed(GuiButton par1GuiButton) { + if (par1GuiButton.id == 69) { @@ -55,11 +55,11 @@ + } + -> INSERT 91 : 92 @ 85 +> INSERT 85 : 86 @ 85 + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); -> INSERT 6 : 10 @ 5 +> INSERT 5 : 9 @ 5 + if (exitButton != null) { + exitButton.yPosition = 3 + mc.guiAchievement.getHeight(); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java index 3cc4f3a..9164ce8 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.edit.java @@ -12,17 +12,17 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 9 @ 10 : 13 +> DELETE 5 @ 5 : 8 -> CHANGE 44 : 45 @ 47 : 48 +> CHANGE 44 : 45 @ 44 : 45 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 25 : 26 @ 25 : 26 +> CHANGE 24 : 25 @ 24 : 25 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 13 : 14 @ 13 : 14 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java index 045df05..440ba83 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 6 -> CHANGE 30 : 31 @ 34 : 35 +> CHANGE 30 : 31 @ 30 : 31 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java index d25efad..007e66c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiControls.edit.java @@ -9,17 +9,17 @@ + -> DELETE 2 @ 1 : 6 +> DELETE 1 @ 1 : 6 -> CHANGE 49 : 50 @ 54 : 55 +> CHANGE 49 : 50 @ 49 : 50 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ protected void keyTyped(char parChar1, int parInt1) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java index 20607a8..8ebcdb3 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> CHANGE 30 : 31 @ 33 : 34 +> CHANGE 30 : 31 @ 30 : 31 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java index c529321..67985f8 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiDisconnected.edit.java @@ -7,23 +7,23 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 2 @ 2 : 4 +> CHANGE 1 : 2 @ 1 : 3 ~ -> INSERT 2 : 3 @ 3 +> INSERT 1 : 2 @ 1 + import net.minecraft.util.ChatComponentTranslation; -> CHANGE 16 : 17 @ 15 : 16 +> CHANGE 15 : 16 @ 15 : 16 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ protected void actionPerformed(GuiButton parGuiButton) { -> INSERT 21 : 25 @ 21 +> INSERT 20 : 24 @ 20 + + public static GuiScreen createRateLimitKick(GuiScreen prev) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java index 9ddd0c1..718f307 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 12 : 13 @ 14 : 15 +> CHANGE 12 : 13 @ 12 : 13 ~ protected void keyTyped(char parChar1, int parInt1) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java index 286e872..79e0548 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 1 : 6 @ 3 : 6 +> CHANGE 1 : 6 @ 1 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -15,33 +15,33 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 7 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> DELETE 13 @ 14 : 15 +> DELETE 13 @ 13 : 14 -> CHANGE 8 : 9 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ private EaglercraftRandom random = new EaglercraftRandom(); -> CHANGE 30 : 31 @ 30 : 31 +> CHANGE 29 : 30 @ 29 : 30 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> CHANGE 26 : 29 @ 26 : 29 +> CHANGE 25 : 28 @ 25 : 28 ~ GlStateManager.viewport((scaledresolution.getScaledWidth() - 290 - 110) / 2 * scaledresolution.getScaleFactor(), ~ (scaledresolution.getScaledHeight() - 220 + 60) / 2 * scaledresolution.getScaleFactor(), ~ 290 * scaledresolution.getScaleFactor(), 220 * scaledresolution.getScaleFactor()); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 1 : 2 @ 1 : 2 ~ GlStateManager.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F); -> INSERT 37 : 38 @ 37 +> INSERT 36 : 37 @ 36 + GlStateManager.enableDepth(); -> INSERT 2 : 3 @ 1 +> INSERT 1 : 2 @ 1 + GlStateManager.disableDepth(); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java index 95a913b..ce9d0cc 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiErrorScreen.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 5 -> CHANGE 23 : 24 @ 26 : 27 +> CHANGE 23 : 24 @ 23 : 24 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java index e4412cb..dbc213f 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.edit.java @@ -9,17 +9,17 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 7 : 8 +> DELETE 1 @ 1 : 2 -> CHANGE 33 : 34 @ 34 : 35 +> CHANGE 33 : 34 @ 33 : 34 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void actionPerformed(GuiButton parGuiButton) { -> INSERT 8 : 10 @ 8 +> INSERT 7 : 9 @ 7 + this.mc.theWorld.sendQuittingDisconnectingPacket(); + this.mc.loadWorld((WorldClient) null); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java index 7f1dded..c6b763f 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiHopper.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 2 : 3 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java index 6a3408b..22696b5 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java @@ -14,50 +14,50 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; + -> CHANGE 9 : 12 @ 3 : 6 +> CHANGE 3 : 6 @ 3 : 6 ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 5 @ 5 : 14 +> DELETE 2 @ 2 : 11 -> DELETE 2 @ 11 : 12 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 32 : 33 @ 33 : 34 +> CHANGE 32 : 33 @ 32 : 33 ~ private final EaglercraftRandom rand = new EaglercraftRandom(); -> DELETE 4 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 27 @ 28 : 29 +> DELETE 27 @ 27 : 28 -> CHANGE 95 : 96 @ 96 : 99 +> CHANGE 95 : 96 @ 95 : 98 ~ this.overlayDebug.renderDebugInfo(scaledresolution, partialTicks); -> INSERT 88 : 91 @ 90 +> INSERT 87 : 90 @ 87 + if (this.mc.gameSettings.hudWorld && (mc.currentScreen == null || !(mc.currentScreen instanceof GuiChat))) { + j -= 10; + } -> DELETE 169 @ 166 : 170 +> DELETE 166 @ 166 : 170 -> CHANGE 17 : 18 @ 21 : 22 +> CHANGE 17 : 18 @ 17 : 18 ~ for (Score score : (List) arraylist1) { -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ for (Score score1 : (List) arraylist1) { -> CHANGE 344 : 345 @ 344 : 345 +> CHANGE 343 : 344 @ 343 : 344 ~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getBlockRendererDispatcher().getBlockModelShapes() -> DELETE 58 @ 58 : 59 +> DELETE 57 @ 57 : 58 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java index 7c2486f..98ea338 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.edit.java @@ -9,29 +9,29 @@ ~ import net.lax1dude.eaglercraft.v1_8.Mouse; -> DELETE 5 @ 11 : 12 +> DELETE 4 @ 4 : 5 -> DELETE 2 @ 3 : 5 +> DELETE 2 @ 2 : 4 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> CHANGE 20 : 21 @ 21 : 22 +> CHANGE 20 : 21 @ 20 : 21 ~ guibutton.enabled = false; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void actionPerformed(GuiButton parGuiButton) { -> DELETE 7 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 5 @ 6 : 9 +> DELETE 5 @ 5 : 8 -> CHANGE 18 : 19 @ 21 : 22 +> CHANGE 18 : 19 @ 18 : 19 ~ break; -> CHANGE 7 : 10 @ 7 : 8 +> CHANGE 6 : 9 @ 6 : 7 ~ if (Mouse.isActuallyGrabbed()) { ~ Mouse.setGrabbed(false); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java index cd6e0d3..d340972 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.edit.java @@ -10,8 +10,8 @@ + + import net.lax1dude.eaglercraft.v1_8.ArrayUtils; -> DELETE 3 @ 1 : 4 +> DELETE 1 @ 1 : 4 -> DELETE 4 @ 7 : 8 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java index 2293683..3f5eefb 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiLabel.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 5 @ 2 +> INSERT 1 : 5 @ 1 + + import com.google.common.collect.Lists; + + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java index e0c6c8d..c3c64d4 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiLanguage.edit.java @@ -7,25 +7,25 @@ > DELETE 2 @ 2 : 4 -> INSERT 2 : 6 @ 4 +> INSERT 2 : 6 @ 2 + + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; + -> DELETE 5 @ 1 : 6 +> DELETE 1 @ 1 : 6 -> CHANGE 34 : 35 @ 39 : 40 +> CHANGE 34 : 35 @ 34 : 35 ~ protected void actionPerformed(GuiButton parGuiButton) { -> INSERT 57 : 59 @ 57 +> INSERT 56 : 58 @ 56 + this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"), + I18n.format("resourcePack.load.pleaseWait")); -> INSERT 11 : 12 @ 9 +> INSERT 9 : 10 @ 9 + GuiLanguage.this.mc.displayGuiScreen(GuiLanguage.this); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java index 060e994..ee9ceb6 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiLockIconButton.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java index 2304091..bfcd825 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 3 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> INSERT 1 : 2 @ 2 +> INSERT 1 : 2 @ 1 + import java.util.Arrays; -> CHANGE 3 : 20 @ 2 : 4 +> CHANGE 2 : 19 @ 2 : 4 ~ ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; @@ -33,23 +33,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; ~ import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile; -> CHANGE 18 : 19 @ 3 : 15 +> CHANGE 1 : 2 @ 1 : 13 ~ import net.minecraft.client.audio.PositionedSoundRecord; -> DELETE 2 @ 13 : 14 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 6 +> DELETE 3 @ 3 : 5 -> DELETE 2 @ 4 : 13 +> DELETE 2 @ 2 : 11 -> DELETE 2 @ 11 : 12 +> DELETE 2 @ 2 : 3 -> CHANGE 1 : 2 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom(); -> INSERT 2 : 8 @ 2 +> INSERT 1 : 7 @ 1 + private boolean isDefault; + private static final int lendef = 5987; @@ -58,25 +58,25 @@ + private static final byte[] sha1def = new byte[] { -107, 77, 108, 49, 11, -100, -8, -119, -1, -100, -85, -55, 18, + -69, -107, 113, -93, -101, -79, 32 }; -> CHANGE 9 : 10 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ private static DynamicTexture viewportTexture = null; +> DELETE 1 @ 1 : 2 + > DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 4 +> DELETE 10 @ 10 : 12 -> DELETE 10 @ 11 : 13 - -> CHANGE 6 : 7 @ 8 : 10 +> CHANGE 6 : 7 @ 6 : 8 ~ private static ResourceLocation backgroundTexture = null; -> DELETE 3 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 39 @ 40 : 46 +> DELETE 39 @ 39 : 45 -> INSERT 1 : 21 @ 7 +> INSERT 1 : 21 @ 1 + MD5Digest md5 = new MD5Digest(); + SHA1Digest sha1 = new SHA1Digest(); @@ -99,20 +99,20 @@ + this.isDefault = false; + } -> CHANGE 30 : 31 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 4 : 8 @ 4 : 7 +> CHANGE 3 : 7 @ 3 : 6 ~ if (viewportTexture == null) { ~ viewportTexture = new DynamicTexture(256, 256); ~ backgroundTexture = this.mc.getTextureManager().getDynamicTextureLocation("background", viewportTexture); ~ } -> DELETE 14 @ 13 : 14 +> DELETE 10 @ 10 : 11 -> CHANGE 1 : 6 @ 2 : 6 +> CHANGE 1 : 6 @ 1 : 5 ~ ~ boolean isFork = !EaglercraftVersion.projectOriginAuthor.equalsIgnoreCase(EaglercraftVersion.projectForkVendor); @@ -120,18 +120,18 @@ ~ if (isFork && EaglercraftVersion.mainMenuStringF != null && EaglercraftVersion.mainMenuStringF.length() > 0) { ~ i += 11; -> INSERT 7 : 9 @ 6 +> INSERT 2 : 4 @ 2 + this.addSingleplayerMultiplayerButtons(i, 24); + -> CHANGE 4 : 7 @ 2 : 4 +> CHANGE 2 : 5 @ 2 : 4 ~ this.buttonList.add(new GuiButton(4, this.width / 2 + 2, i + 72 + 12, 98, 20, ~ I18n.format("menu.editProfile", new Object[0]))); ~ -> CHANGE 4 : 9 @ 3 : 4 +> CHANGE 1 : 6 @ 1 : 2 ~ ~ if (isFork) { @@ -139,73 +139,73 @@ ~ this.openGLWarning2 = EaglercraftVersion.mainMenuStringF; ~ boolean line2 = this.openGLWarning2 != null && this.openGLWarning2.length() > 0; -> CHANGE 9 : 10 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ this.field_92021_u = ((GuiButton) this.buttonList.get(0)).yPosition - (line2 ? 32 : 21); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ this.field_92019_w = this.field_92021_u + (line2 ? 24 : 11); -> CHANGE 7 : 11 @ 7 : 10 +> CHANGE 6 : 10 @ 6 : 9 ~ // this.buttonList ~ // .add(new GuiButton(1, this.width / 2 - 100, parInt1, ~ // I18n.format("menu.singleplayer", new Object[0]))); ~ this.buttonList.add(new GuiButton(2, this.width / 2 - 100, parInt1 + parInt2 * 0, -> CHANGE 5 : 9 @ 4 : 6 +> CHANGE 1 : 5 @ 1 : 3 ~ GuiButton btn; ~ this.buttonList.add(btn = new GuiButton(14, this.width / 2 - 100, parInt1 + parInt2 * 1, ~ I18n.format("menu.forkOnGitlab", new Object[0]))); ~ btn.enabled = EaglercraftVersion.mainMenuEnableGithubButton; -> CHANGE 6 : 7 @ 4 : 18 +> CHANGE 2 : 3 @ 2 : 16 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 10 : 11 @ 23 : 24 +> CHANGE 9 : 10 @ 9 : 10 ~ logger.error("Singleplayer was removed dumbass"); -> DELETE 7 @ 7 : 11 +> DELETE 6 @ 6 : 10 -> CHANGE 1 : 2 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ this.mc.displayGuiScreen(new GuiScreenEditProfile(this)); -> CHANGE 3 : 5 @ 3 : 5 +> CHANGE 2 : 4 @ 2 : 4 ~ if (parGuiButton.id == 14) { ~ EagRuntime.openLink(EaglercraftVersion.projectForkURL); -> DELETE 4 @ 4 : 13 +> DELETE 2 @ 2 : 11 -> DELETE 2 @ 11 : 39 +> DELETE 2 @ 2 : 30 -> CHANGE 6 : 7 @ 34 : 35 +> CHANGE 6 : 7 @ 6 : 7 ~ GlStateManager.gluPerspective(120.0F, 1.0F, 0.05F, 10.0F); -> CHANGE 74 : 78 @ 74 : 78 +> CHANGE 73 : 77 @ 73 : 77 ~ this.mc.getTextureManager().bindTexture(backgroundTexture); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); ~ EaglercraftGPU.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 256, 256); -> DELETE 34 @ 34 : 35 +> DELETE 30 @ 30 : 31 -> DELETE 9 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> DELETE 24 @ 25 : 27 +> DELETE 24 @ 24 : 26 -> CHANGE 7 : 8 @ 9 : 10 +> CHANGE 7 : 8 @ 7 : 8 ~ if (this.isDefault || (double) this.updateCounter < 1.0E-4D) { -> INSERT 11 : 24 @ 11 +> INSERT 10 : 23 @ 10 + boolean isForkLabel = ((this.openGLWarning1 != null && this.openGLWarning1.length() > 0) + || (this.openGLWarning2 != null && this.openGLWarning2.length() > 0)); @@ -221,36 +221,36 @@ + } + -> CHANGE 15 : 16 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ GlStateManager.rotate(isForkLabel ? -12.0F : -20.0F, 0.0F, 0.0F, 1.0F); -> INSERT 4 : 7 @ 4 +> INSERT 3 : 6 @ 3 + if (isForkLabel) { + f1 *= 0.8f; + } -> DELETE 6 @ 3 : 7 +> DELETE 3 @ 3 : 7 -> INSERT 1 : 4 @ 5 +> INSERT 1 : 4 @ 1 + String s = EaglercraftVersion.mainMenuStringA; + this.drawString(this.fontRendererObj, s, 2, this.height - 20, -1); + s = EaglercraftVersion.mainMenuStringB; -> CHANGE 4 : 6 @ 1 : 2 +> CHANGE 1 : 3 @ 1 : 2 ~ ~ String s1 = EaglercraftVersion.mainMenuStringC; -> INSERT 3 : 6 @ 2 +> INSERT 1 : 4 @ 1 + this.height - 20, -1); + s1 = EaglercraftVersion.mainMenuStringD; + this.drawString(this.fontRendererObj, s1, this.width - this.fontRendererObj.getStringWidth(s1) - 2, -> CHANGE 4 : 12 @ 1 : 7 +> CHANGE 1 : 9 @ 1 : 7 ~ ~ String lbl = "CREDITS.txt"; @@ -261,7 +261,7 @@ ~ } else { ~ drawRect((this.width - w - 4), 0, this.width, 10, 0x55200000); -> INSERT 10 : 16 @ 8 +> INSERT 2 : 8 @ 2 + GlStateManager.pushMatrix(); + GlStateManager.translate((this.width - w - 2), 2.0f, 0.0f); @@ -270,7 +270,7 @@ + GlStateManager.popMatrix(); + -> CHANGE 9 : 21 @ 3 : 11 +> CHANGE 3 : 15 @ 3 : 11 ~ protected void mouseClicked(int par1, int par2, int par3) { ~ if (par3 == 0) { @@ -285,9 +285,9 @@ ~ .playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F)); ~ return; -> DELETE 13 @ 9 : 10 +> DELETE 1 @ 1 : 2 -> INSERT 1 : 2 @ 2 +> INSERT 1 : 2 @ 1 + super.mouseClicked(par1, par2, par3); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java index 982f7d2..13df89c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 7 -> CHANGE 11 : 12 @ 16 : 17 +> CHANGE 11 : 12 @ 11 : 12 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ protected void keyTyped(char parChar1, int parInt1) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java index 889892c..8112393 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiMerchant.edit.java @@ -12,13 +12,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 13 @ 14 : 16 +> DELETE 13 @ 13 : 15 -> CHANGE 44 : 45 @ 46 : 47 +> CHANGE 44 : 45 @ 44 : 45 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java index 7c31458..8bec6d2 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.edit.java @@ -10,42 +10,42 @@ + import java.io.IOException; + -> CHANGE 4 : 8 @ 2 : 15 +> CHANGE 2 : 6 @ 2 : 15 ~ ~ import net.lax1dude.eaglercraft.v1_8.Keyboard; ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 7 @ 16 : 18 +> DELETE 3 @ 3 : 5 -> DELETE 1 @ 3 : 6 +> DELETE 1 @ 1 : 4 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> DELETE 12 @ 13 : 15 +> DELETE 12 @ 12 : 14 -> INSERT 1 : 2 @ 3 +> INSERT 1 : 2 @ 1 + private static long lastRefreshCommit = 0l; -> CHANGE 11 : 12 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ this.savedServerList = ServerList.getServerList(); -> DELETE 2 @ 2 : 11 +> DELETE 1 @ 1 : 10 -> CHANGE 35 : 36 @ 44 : 51 +> CHANGE 35 : 36 @ 35 : 42 ~ this.savedServerList.updateServerPing(); -> DELETE 5 @ 11 : 17 +> DELETE 4 @ 4 : 10 -> CHANGE 2 : 3 @ 8 : 9 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 37 : 42 @ 37 : 38 +> CHANGE 36 : 41 @ 36 : 37 ~ long millis = System.currentTimeMillis(); ~ if (millis - lastRefreshCommit > 700l) { @@ -53,10 +53,18 @@ ~ this.refreshServerList(); ~ } -> CHANGE 10 : 11 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ public void refreshServerList() { +> CHANGE 14 : 19 @ 14 : 16 + +~ long millis = System.currentTimeMillis(); +~ if (millis - lastRefreshCommit > 700l) { +~ lastRefreshCommit = millis; +~ this.refreshServerList(); +~ } + > CHANGE 15 : 20 @ 15 : 17 ~ long millis = System.currentTimeMillis(); @@ -65,7 +73,7 @@ ~ this.refreshServerList(); ~ } -> CHANGE 20 : 25 @ 17 : 19 +> CHANGE 10 : 15 @ 10 : 12 ~ long millis = System.currentTimeMillis(); ~ if (millis - lastRefreshCommit > 700l) { @@ -73,41 +81,33 @@ ~ this.refreshServerList(); ~ } -> CHANGE 15 : 20 @ 12 : 14 +> DELETE 1 @ 1 : 2 -~ long millis = System.currentTimeMillis(); -~ if (millis - lastRefreshCommit > 700l) { -~ lastRefreshCommit = millis; -~ this.refreshServerList(); -~ } - -> DELETE 6 @ 3 : 4 - -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void keyTyped(char parChar1, int parInt1) { -> DELETE 19 @ 19 : 28 +> DELETE 18 @ 18 : 27 -> CHANGE 11 : 12 @ 20 : 21 +> CHANGE 11 : 12 @ 11 : 12 ~ } else if (i < this.serverListSelector.getSize() - 1) { -> DELETE 3 @ 3 : 12 +> DELETE 2 @ 2 : 11 -> DELETE 33 @ 42 : 47 +> DELETE 33 @ 33 : 38 -> DELETE 1 @ 6 : 7 +> DELETE 1 @ 1 : 2 -> CHANGE 13 : 14 @ 14 : 16 +> CHANGE 13 : 14 @ 13 : 15 ~ if (guilistextended$iguilistentry != null) { -> DELETE 7 @ 8 : 9 +> DELETE 6 @ 6 : 7 -> DELETE 2 @ 3 : 7 +> DELETE 2 @ 2 : 6 -> CHANGE 4 : 5 @ 8 : 9 +> CHANGE 4 : 5 @ 4 : 5 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java index 163ee0e..02bb7e8 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiNewChat.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 8 @ 3 +> INSERT 2 : 8 @ 2 + + import com.google.common.collect.Lists; @@ -16,11 +16,11 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 7 @ 1 : 7 +> DELETE 1 @ 1 : 7 -> DELETE 4 @ 10 : 12 +> DELETE 4 @ 4 : 6 -> CHANGE 108 : 109 @ 110 : 111 +> CHANGE 108 : 109 @ 108 : 109 ~ for (IChatComponent ichatcomponent : (List) list) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java index 060e994..ee9ceb6 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiOptionSlider.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java index 9c30a10..e61daed 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiOptions.edit.java @@ -10,60 +10,60 @@ ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.vfs.SYS; -> DELETE 6 @ 5 : 22 +> DELETE 4 @ 4 : 21 -> DELETE 2 @ 19 : 20 +> DELETE 2 @ 2 : 3 -> INSERT 12 : 14 @ 13 +> INSERT 12 : 14 @ 12 + private GuiButton notSoSuperSecret; + private GuiButton broadcastSettings; -> CHANGE 48 : 50 @ 46 : 48 +> CHANGE 46 : 48 @ 46 : 48 ~ this.buttonList.add(notSoSuperSecret = new GuiButton(8675309, this.width / 2 + 5, this.height / 6 + 48 - 6, 150, ~ 20, "Super Secret Settings...") { -> CHANGE 15 : 18 @ 15 : 17 +> CHANGE 13 : 16 @ 13 : 15 ~ this.buttonList.add(broadcastSettings = new GuiButton(107, this.width / 2 + 5, this.height / 6 + 72 - 6, 150, ~ 20, I18n.format(EagRuntime.getRecText(), new Object[0]))); ~ broadcastSettings.enabled = EagRuntime.recSupported(); -> CHANGE 11 : 13 @ 10 : 11 +> CHANGE 8 : 10 @ 8 : 9 ~ GuiButton rp; ~ this.buttonList.add(rp = new GuiButton(105, this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20, -> CHANGE 3 : 5 @ 2 : 3 +> CHANGE 1 : 3 @ 1 : 2 ~ GuiButton b; ~ this.buttonList.add(b = new GuiButton(104, this.width / 2 + 5, this.height / 6 + 144 - 6, 150, 20, -> INSERT 3 : 4 @ 2 +> INSERT 1 : 2 @ 1 + b.enabled = false; -> INSERT 3 : 5 @ 2 +> INSERT 2 : 4 @ 2 + + rp.enabled = SYS.VFS != null; -> CHANGE 24 : 25 @ 22 : 23 +> CHANGE 22 : 23 @ 22 : 23 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 33 : 34 @ 33 : 34 +> CHANGE 32 : 33 @ 32 : 33 ~ notSoSuperSecret.displayString = "Nope!"; -> DELETE 23 @ 23 : 28 +> DELETE 22 @ 22 : 27 -> CHANGE 16 : 18 @ 21 : 28 +> CHANGE 16 : 18 @ 16 : 23 ~ EagRuntime.toggleRec(); ~ broadcastSettings.displayString = I18n.format(EagRuntime.getRecText(), new Object[0]); -> DELETE 3 @ 8 : 9 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java index c18911f..0615d18 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiOptionsRowList.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 4 @ 1 : 5 +> DELETE 1 @ 1 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java index 22e9981..8c32f1c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java @@ -9,16 +9,16 @@ ~ import java.text.SimpleDateFormat; -> INSERT 2 : 4 @ 3 +> INSERT 1 : 3 @ 1 + import java.util.Calendar; + import java.util.Iterator; -> INSERT 3 : 4 @ 1 +> INSERT 1 : 2 @ 1 + import java.util.Locale; -> INSERT 2 : 14 @ 1 +> INSERT 1 : 13 @ 1 + import java.util.TimeZone; + @@ -33,30 +33,30 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> CHANGE 17 : 20 @ 5 : 10 +> CHANGE 5 : 8 @ 5 : 10 ~ import net.minecraft.client.renderer.RenderHelper; ~ import net.minecraft.client.renderer.entity.RenderManager; ~ import net.minecraft.client.resources.I18n; -> CHANGE 4 : 6 @ 6 : 7 +> CHANGE 1 : 3 @ 1 : 2 ~ import net.minecraft.entity.EntityLivingBase; ~ import net.minecraft.potion.PotionEffect; -> CHANGE 10 : 11 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ import net.minecraft.world.biome.BiomeGenBase; -> DELETE 2 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> CHANGE 10 : 13 @ 12 : 13 +> CHANGE 10 : 13 @ 10 : 11 ~ public void renderDebugInfo(ScaledResolution scaledResolutionIn, float partialTicks) { ~ int ww = scaledResolutionIn.getScaledWidth(); ~ int hh = scaledResolutionIn.getScaledHeight(); -> CHANGE 4 : 27 @ 2 : 8 +> CHANGE 1 : 24 @ 1 : 7 ~ if (this.mc.gameSettings.showDebugInfo) { ~ GlStateManager.pushMatrix(); @@ -82,7 +82,7 @@ ~ drawPlayer(ww - 3, 3, partialTicks); ~ } -> INSERT 25 : 49 @ 8 +> INSERT 2 : 26 @ 2 + if (this.mc.currentScreen == null || !(this.mc.currentScreen instanceof GuiChat)) { + if (this.mc.gameSettings.hudStats) { @@ -109,7 +109,7 @@ + } + -> INSERT 27 : 219 @ 3 +> INSERT 3 : 195 @ 3 + private void drawFPS(int x, int y) { + this.fontRenderer.drawStringWithShadow(this.mc.renderGlobal.getDebugInfoShort(), x, y, 0xFFFFFF); @@ -304,7 +304,7 @@ + } + -> INSERT 231 : 238 @ 39 +> INSERT 39 : 46 @ 39 + if (!this.mc.gameSettings.showDebugInfo) { + BlockPos blockpos = new BlockPos(this.mc.getRenderViewEntity().posX, @@ -314,41 +314,41 @@ + } + -> CHANGE 17 : 18 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ HString.format("Chunk-relative: %d %d %d", new Object[] { Integer.valueOf(blockpos.getX() & 15), -> CHANGE 26 : 27 @ 26 : 27 +> CHANGE 25 : 26 @ 25 : 26 ~ HString.format("XYZ: %.3f / %.5f / %.3f", -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ HString.format("Block: %d %d %d", -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ HString.format("Chunk: %d %d %d in %d %d %d", -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ HString.format("Facing: %s (%s) (%.1f / %.1f)", -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ arraylist.add("Biome: " + chunk.getBiome(blockpos).biomeName); -> CHANGE 5 : 6 @ 5 : 15 +> CHANGE 4 : 5 @ 4 : 14 ~ arraylist.add(HString.format("Local Difficulty: %.2f (Day %d)", -> DELETE 5 @ 14 : 18 +> DELETE 4 @ 4 : 8 -> CHANGE 4 : 5 @ 8 : 9 +> CHANGE 4 : 5 @ 4 : 5 ~ arraylist.add(HString.format("Looking at: %d %d %d", new Object[] { Integer.valueOf(blockpos1.getX()), -> CHANGE 9 : 37 @ 9 : 26 +> CHANGE 8 : 36 @ 8 : 25 ~ ArrayList arraylist; ~ if (EagRuntime.getPlatformType() != EnumPlatformType.JAVASCRIPT) { @@ -379,6 +379,6 @@ ~ EaglercraftGPU.glGetString(7937), EaglercraftGPU.glGetString(7938) }); ~ } -> DELETE 36 @ 25 : 29 +> DELETE 8 @ 8 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java index f1dc16f..05469b7 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiPageButtonList.edit.java @@ -10,10 +10,10 @@ + import java.util.List; + -> CHANGE 6 : 7 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ -> DELETE 2 @ 2 : 10 +> DELETE 1 @ 1 : 9 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java index 183949d..4c9b9fd 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> INSERT 2 : 8 @ 5 +> INSERT 2 : 8 @ 2 + + import com.google.common.collect.ComparisonChain; @@ -16,35 +16,35 @@ + import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 7 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> CHANGE 46 : 47 @ 47 : 48 +> CHANGE 46 : 47 @ 46 : 47 ~ for (NetworkPlayerInfo networkplayerinfo : (List) list) { -> CHANGE 21 : 22 @ 21 : 23 +> CHANGE 20 : 21 @ 20 : 22 ~ boolean flag = true; -> CHANGE 21 : 22 @ 22 : 23 +> CHANGE 20 : 21 @ 20 : 21 ~ for (String s : (List) list1) { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ for (String s2 : (List) list2) { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ for (String s3 : (List) list1) { -> CHANGE 33 : 34 @ 33 : 34 +> CHANGE 32 : 33 @ 32 : 33 ~ if (entityplayer == null || entityplayer.isWearing(EnumPlayerModelParts.HAT)) { -> CHANGE 34 : 35 @ 34 : 35 +> CHANGE 33 : 34 @ 33 : 34 ~ for (String s4 : (List) list2) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java index 2d39dfb..9c48933 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiRepair.edit.java @@ -7,24 +7,24 @@ > DELETE 2 @ 2 : 4 -> INSERT 1 : 5 @ 3 +> INSERT 1 : 5 @ 1 + + import net.lax1dude.eaglercraft.v1_8.netty.Unpooled; + import net.lax1dude.eaglercraft.v1_8.Keyboard; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 12 @ 13 : 14 +> DELETE 12 @ 12 : 13 -> CHANGE 70 : 71 @ 71 : 72 +> CHANGE 70 : 71 @ 70 : 71 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 22 : 23 @ 22 : 23 +> CHANGE 21 : 22 @ 21 : 22 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java index c0406de..fb3139b 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java index c0406de..fb3139b 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackList.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java index c0406de..fb3139b 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java index fe02855..175da1d 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 11 -> DELETE 1 @ 10 : 12 +> DELETE 1 @ 1 : 3 -> INSERT 4 : 19 @ 6 +> INSERT 4 : 19 @ 4 + + import org.apache.commons.lang3.StringUtils; @@ -27,24 +27,24 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> CHANGE 16 : 17 @ 1 : 9 +> CHANGE 1 : 2 @ 1 : 9 ~ import net.minecraft.client.gui.inventory.GuiContainer; -> DELETE 3 @ 10 : 11 +> DELETE 2 @ 2 : 3 -> INSERT 2 : 3 @ 3 +> INSERT 2 : 3 @ 2 + import net.minecraft.client.resources.I18n; -> DELETE 14 @ 13 : 19 +> DELETE 13 @ 13 : 19 -> CHANGE 17 : 19 @ 23 : 24 +> CHANGE 17 : 19 @ 17 : 18 ~ private String clickedLinkURI; ~ protected long showingCloseKey = 0; -> INSERT 12 : 42 @ 11 +> INSERT 10 : 40 @ 10 + long millis = System.currentTimeMillis(); + long closeKeyTimeout = millis - showingCloseKey; @@ -77,7 +77,7 @@ + } + -> CHANGE 32 : 44 @ 2 : 4 +> CHANGE 2 : 14 @ 2 : 4 ~ protected int getCloseKey() { ~ if (this instanceof GuiContainer) { @@ -92,26 +92,26 @@ ~ || parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode() ~ || (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) { -> INSERT 16 : 18 @ 6 +> INSERT 4 : 6 @ 4 + } else if (parInt1 == 1) { + showingCloseKey = System.currentTimeMillis(); -> DELETE 3 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> CHANGE 3 : 4 @ 4 : 14 +> CHANGE 3 : 4 @ 3 : 13 ~ return EagRuntime.getClipboard(); -> CHANGE 5 : 6 @ 14 : 21 +> CHANGE 4 : 5 @ 4 : 11 ~ EagRuntime.setClipboard(copyText); -> INSERT 177 : 178 @ 183 +> INSERT 176 : 177 @ 176 + String uri = clickevent.getValue(); -> CHANGE 2 : 7 @ 1 : 22 +> CHANGE 1 : 6 @ 1 : 22 ~ if (this.mc.gameSettings.chatLinksPrompt) { ~ this.clickedLinkURI = uri; @@ -119,11 +119,11 @@ ~ } else { ~ this.openWebLink(uri); -> CHANGE 7 : 8 @ 23 : 25 +> CHANGE 2 : 3 @ 2 : 4 ~ // rip -> CHANGE 6 : 13 @ 7 : 13 +> CHANGE 5 : 12 @ 5 : 11 ~ /* ~ * ChatUserInfo chatuserinfo = @@ -133,15 +133,15 @@ ~ */ ~ LOGGER.error("Tried to handle twitch user but couldn\'t find them!"); -> CHANGE 30 : 31 @ 29 : 30 +> CHANGE 23 : 24 @ 23 : 24 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> CHANGE 25 : 26 @ 25 : 26 +> CHANGE 24 : 25 @ 24 : 25 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 120 : 122 @ 120 : 129 +> CHANGE 119 : 121 @ 119 : 128 ~ private void openWebLink(String parURI) { ~ EagRuntime.openLink(parURI); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java index 2820fb6..99da0f1 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.edit.java @@ -10,27 +10,27 @@ ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.Keyboard; -> DELETE 4 @ 8 : 9 +> DELETE 2 @ 2 : 3 -> CHANGE 7 : 8 @ 8 : 27 +> CHANGE 7 : 8 @ 7 : 26 ~ private GuiButton hideAddress; -> INSERT 14 : 15 @ 32 +> INSERT 13 : 14 @ 13 + int i = 80; -> CHANGE 2 : 5 @ 1 : 2 +> CHANGE 1 : 4 @ 1 : 2 ~ GuiButton done; ~ GuiButton cancel; ~ this.buttonList.add(done = new GuiButton(0, this.width / 2 - 100, i + 96 + 12, -> CHANGE 4 : 5 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ this.buttonList.add(cancel = new GuiButton(1, this.width / 2 - 100, i + 120 + 12, -> CHANGE 2 : 9 @ 2 : 3 +> CHANGE 1 : 8 @ 1 : 2 ~ if (EagRuntime.requireSSL()) { ~ done.yPosition = cancel.yPosition; @@ -40,21 +40,21 @@ ~ } ~ this.buttonList.add(this.serverResourcePacks = new GuiButton(2, this.width / 2 - 100, i + 54, -> INSERT 9 : 12 @ 3 +> INSERT 2 : 5 @ 2 + this.buttonList.add(this.hideAddress = new GuiButton(3, this.width / 2 - 100, i + 78, + I18n.format("addServer.hideAddress", new Object[0]) + ": " + + I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]))); -> CHANGE 9 : 10 @ 6 : 9 +> CHANGE 6 : 7 @ 6 : 9 ~ ((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0; -> CHANGE 7 : 8 @ 9 : 10 +> CHANGE 6 : 7 @ 6 : 7 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 2 : 7 @ 2 : 3 +> CHANGE 1 : 6 @ 1 : 2 ~ if (parGuiButton.id == 3) { ~ this.serverData.hideAddress = !this.serverData.hideAddress; @@ -62,24 +62,24 @@ ~ + I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]); ~ } else if (parGuiButton.id == 2) { -> CHANGE 13 : 15 @ 9 : 11 +> CHANGE 8 : 10 @ 8 : 10 ~ this.serverData.serverName = this.serverNameField.getText().trim(); ~ this.serverData.serverIP = this.serverIPField.getText().trim(); -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 12 : 13 @ 12 : 14 +> CHANGE 11 : 12 @ 11 : 13 ~ ((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0; -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> INSERT 14 : 20 @ 14 +> INSERT 13 : 19 @ 13 + if (EagRuntime.requireSSL()) { + this.drawCenteredString(this.fontRendererObj, I18n.format("addServer.SSLWarn1"), this.width / 2, 184, diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java index c48dfd8..5070692 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 6 -> INSERT 1 : 11 @ 5 +> INSERT 1 : 11 @ 1 + + import org.json.JSONException; @@ -20,25 +20,25 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 11 @ 1 : 5 +> DELETE 1 @ 1 : 5 -> DELETE 16 @ 20 : 23 +> DELETE 16 @ 16 : 19 -> CHANGE 139 : 140 @ 142 : 143 +> CHANGE 139 : 140 @ 139 : 140 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 39 : 40 @ 39 : 41 +> CHANGE 38 : 39 @ 38 : 40 ~ protected void keyTyped(char parChar1, int parInt1) { -> DELETE 7 @ 8 : 9 +> DELETE 6 @ 6 : 7 -> CHANGE 129 : 130 @ 130 : 131 +> CHANGE 129 : 130 @ 129 : 130 ~ } catch (JSONException var13) { -> CHANGE 35 : 36 @ 35 : 36 +> CHANGE 34 : 35 @ 34 : 35 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java index ca0d261..a6d016e 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.edit.java @@ -9,9 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 5 : 8 +> DELETE 4 @ 4 : 7 -> CHANGE 37 : 38 @ 40 : 41 +> CHANGE 37 : 38 @ 37 : 38 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java index a9c9267..6f2b2ed 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.edit.java @@ -9,9 +9,9 @@ ~ import java.io.ByteArrayInputStream; -> DELETE 2 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> CHANGE 3 : 11 @ 4 : 9 +> CHANGE 3 : 11 @ 3 : 8 ~ ~ import com.google.common.collect.Lists; @@ -22,43 +22,43 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 13 @ 10 : 14 +> DELETE 5 @ 5 : 9 -> CHANGE 15 : 17 @ 19 : 20 +> CHANGE 15 : 17 @ 15 : 16 ~ GuiButton btn; ~ this.buttonList.add(btn = new GuiOptionButton(2, this.width / 2 - 154, this.height - 48, -> INSERT 3 : 4 @ 2 +> INSERT 1 : 2 @ 1 + btn.enabled = SYS.VFS != null; -> CHANGE 11 : 12 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ for (ResourcePackRepository.Entry resourcepackrepository$entry : (List) arraylist) { -> CHANGE 45 : 46 @ 45 : 46 +> CHANGE 44 : 45 @ 44 : 45 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 3 : 6 @ 3 : 40 +> CHANGE 2 : 5 @ 2 : 39 ~ if (SYS.VFS == null) ~ return; ~ EagRuntime.displayFileChooser("application/zip", "zip"); -> CHANGE 18 : 19 @ 52 : 53 +> CHANGE 15 : 16 @ 15 : 16 ~ for (ResourcePackRepository.Entry resourcepackrepository$entry : (List) arraylist) { -> INSERT 7 : 9 @ 7 +> INSERT 6 : 8 @ 6 + this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"), + I18n.format("resourcePack.load.pleaseWait")); -> DELETE 5 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> CHANGE 6 : 46 @ 7 : 8 +> CHANGE 6 : 46 @ 6 : 7 ~ public void updateScreen() { ~ FileChooserResult packFile = null; diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java index 89970bb..4e5671b 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.Keyboard; -> DELETE 4 @ 6 : 7 +> DELETE 2 @ 2 : 3 -> CHANGE 22 : 28 @ 23 : 24 +> CHANGE 22 : 28 @ 22 : 23 ~ if (EagRuntime.requireSSL()) { ~ this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, this.height / 4 + 35, @@ -21,31 +21,31 @@ ~ this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, 116, 200, 20); ~ } -> CHANGE 9 : 10 @ 4 : 6 +> CHANGE 3 : 4 @ 3 : 5 ~ ((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0; -> CHANGE 9 : 10 @ 10 : 11 +> CHANGE 8 : 9 @ 8 : 9 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ this.field_146301_f.serverIP = this.field_146302_g.getText().trim(); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 2 : 3 @ 2 : 4 +> CHANGE 1 : 2 @ 1 : 3 ~ ((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0; -> CHANGE 7 : 8 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> CHANGE 9 : 20 @ 9 : 11 +> CHANGE 8 : 19 @ 8 : 10 ~ if (EagRuntime.requireSSL()) { ~ this.drawString(this.fontRendererObj, I18n.format("addServer.enterIp", new Object[0]), this.width / 2 - 100, diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java index bc6bfa4..fcae178 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiSleepMP.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 5 -> CHANGE 11 : 12 @ 14 : 15 +> CHANGE 11 : 12 @ 11 : 12 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiSlider.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java index 9766009..e6d8672 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java @@ -13,19 +13,19 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 6 @ 1 : 4 +> DELETE 1 @ 1 : 4 -> DELETE 1 @ 4 : 5 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + private static final Logger excLogger = LogManager.getLogger("GuiSlotRenderer"); + -> CHANGE 384 : 391 @ 381 : 382 +> CHANGE 381 : 388 @ 381 : 382 ~ try { ~ this.drawSlot(j, mouseXIn, k, l, parInt3, parInt4); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java index e360253..584432e 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> DELETE 4 @ 6 : 7 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java index e0da413..8ed5d1b 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiTextField.edit.java @@ -11,13 +11,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 6 : 7 +> DELETE 1 @ 1 : 2 -> CHANGE 11 : 12 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ protected String text = ""; -> INSERT 45 : 57 @ 45 +> INSERT 44 : 56 @ 44 + public void updateText(String parString1) { + if (this.field_175209_y.apply(parString1)) { @@ -32,15 +32,15 @@ + } + -> CHANGE 365 : 368 @ 353 : 354 +> CHANGE 353 : 356 @ 353 : 354 ~ GlStateManager.color(0.2F, 0.2F, 1.0F, 1.0F); ~ GlStateManager.enableBlend(); ~ GlStateManager.blendFunc(775, 770); -> DELETE 4 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> CHANGE 6 : 7 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ GlStateManager.disableBlend(); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java index 409f927..1e9fa9c 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Lists; + -> DELETE 4 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java index 9721164..04379df 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java @@ -9,7 +9,7 @@ ~ -> CHANGE 13 : 18 @ 18 : 21 +> CHANGE 12 : 17 @ 12 : 15 ~ GameSettings.Options.PARTICLES, GameSettings.Options.FXAA, GameSettings.Options.MIPMAP_LEVELS, ~ GameSettings.Options.BLOCK_ALTERNATIVES, GameSettings.Options.ENTITY_SHADOWS, GameSettings.Options.FOG, @@ -17,28 +17,28 @@ ~ GameSettings.Options.HUD_STATS, GameSettings.Options.HUD_WORLD, GameSettings.Options.HUD_24H, ~ GameSettings.Options.CHUNK_FIX }; -> CHANGE 16 : 18 @ 14 : 17 +> CHANGE 11 : 13 @ 11 : 14 ~ GameSettings.Options[] agamesettings$options = new GameSettings.Options[videoOptions.length]; ~ int i = 0; -> CHANGE 3 : 6 @ 4 : 18 +> CHANGE 1 : 4 @ 1 : 15 ~ for (GameSettings.Options gamesettings$options : videoOptions) { ~ agamesettings$options[i] = gamesettings$options; ~ ++i; -> INSERT 5 : 8 @ 16 +> INSERT 2 : 5 @ 2 + this.optionsRowList = new GuiOptionsRowList(this.mc, this.width, this.height, 32, this.height - 32, 25, + agamesettings$options); + -> CHANGE 10 : 11 @ 7 : 8 +> CHANGE 7 : 8 @ 7 : 8 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java index c36695e..e34b735 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiWinGame.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 3 : 13 @ 4 : 5 +> CHANGE 3 : 13 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -22,25 +22,25 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; ~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile; -> DELETE 12 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> DELETE 1 @ 4 : 5 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 5 : 8 +> DELETE 4 @ 4 : 7 -> CHANGE 28 : 29 @ 31 : 32 +> CHANGE 28 : 29 @ 28 : 29 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 29 : 30 @ 29 : 30 +> CHANGE 28 : 29 @ 28 : 29 ~ EaglercraftRandom random = new EaglercraftRandom(8124371L); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ for (s = s.replaceAll("PLAYERNAME", EaglerProfile.getName()); s -> CHANGE 23 : 24 @ 23 : 24 +> CHANGE 22 : 23 @ 22 : 23 ~ s = s.replaceAll("PLAYERNAME", EaglerProfile.getName()); diff --git a/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java index 8f882f7..2cc6997 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiYesNo.edit.java @@ -7,21 +7,21 @@ > DELETE 2 @ 2 : 4 -> CHANGE 1 : 4 @ 3 : 7 +> CHANGE 1 : 4 @ 1 : 5 ~ ~ import com.google.common.collect.Lists; ~ -> INSERT 14 : 15 @ 15 +> INSERT 11 : 12 @ 11 + private boolean opaqueBackground = false; -> CHANGE 29 : 30 @ 28 : 29 +> CHANGE 28 : 29 @ 28 : 29 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 5 : 10 @ 5 : 6 +> CHANGE 4 : 9 @ 4 : 5 ~ if (opaqueBackground) { ~ this.drawBackground(0); @@ -29,7 +29,7 @@ ~ this.drawDefaultBackground(); ~ } -> INSERT 34 : 39 @ 30 +> INSERT 29 : 34 @ 29 + + public GuiYesNo withOpaqueBackground() { diff --git a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java index 58171ce..f4f1039 100644 --- a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 6 @ 2 +> INSERT 1 : 6 @ 1 + + import com.google.common.collect.Maps; @@ -15,23 +15,23 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 6 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> INSERT 65 : 66 @ 66 +> INSERT 65 : 66 @ 65 + int c; -> CHANGE 2 : 3 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ c = (i + i / 128 & 1) * 8 + 16 << 24; -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ c = MapColor.mapColorArray[j / 4].func_151643_b(j & 3); -> INSERT 2 : 3 @ 2 +> INSERT 1 : 2 @ 1 + this.mapTextureData[i] = (c & 0xFF00FF00) | ((c & 0x00FF0000) >> 16) | ((c & 0x000000FF) << 16); diff --git a/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java b/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java index 4432ef3..dfef2ed 100644 --- a/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/ScreenChatOptions.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 7 -> CHANGE 39 : 40 @ 44 : 45 +> CHANGE 39 : 40 @ 39 : 40 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java index 6933734..9aaf083 100644 --- a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.edit.java @@ -7,32 +7,32 @@ > DELETE 2 @ 2 : 10 -> CHANGE 1 : 5 @ 9 : 11 +> CHANGE 1 : 5 @ 1 : 3 ~ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 3 : 7 +> DELETE 1 @ 1 : 5 -> CHANGE 1 : 2 @ 5 : 8 +> CHANGE 1 : 2 @ 1 : 4 ~ import net.minecraft.client.resources.I18n; -> DELETE 3 @ 5 : 8 +> DELETE 2 @ 2 : 5 -> DELETE 3 @ 6 : 8 +> DELETE 3 @ 3 : 5 -> DELETE 6 @ 8 : 9 +> DELETE 6 @ 6 : 7 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 6 @ 7 : 9 +> DELETE 6 @ 6 : 8 -> DELETE 8 @ 10 : 27 +> DELETE 8 @ 8 : 25 -> CHANGE 8 : 18 @ 25 : 28 +> CHANGE 8 : 18 @ 8 : 11 ~ for (int k1 = 0; k1 < 2; ++k1) { ~ if (k1 < list.size()) { @@ -45,32 +45,32 @@ ~ j + 32 + 3, k + 12 + this.mc.fontRendererObj.FONT_HEIGHT * k1 + k1, 0x444444); ~ } -> CHANGE 59 : 63 @ 52 : 57 +> CHANGE 49 : 53 @ 49 : 54 ~ if (this.mc.gameSettings.touchscreen || flag) { ~ GlStateManager.enableShaderBlendAdd(); ~ GlStateManager.setShaderBlendSrc(0.6f, 0.6f, 0.6f, 1.0f); ~ GlStateManager.setShaderBlendAdd(0.3f, 0.3f, 0.3f, 0.0f); -> CHANGE 5 : 7 @ 6 : 9 +> CHANGE 1 : 3 @ 1 : 4 ~ if (field_148301_e.iconTextureObject != null) { ~ this.func_178012_a(j, k, field_148301_e.iconResourceLocation); -> INSERT 5 : 8 @ 6 +> INSERT 3 : 6 @ 3 + if (this.mc.gameSettings.touchscreen || flag) { + GlStateManager.disableShaderBlendAdd(); + } -> CHANGE 14 : 15 @ 11 : 12 +> CHANGE 11 : 12 @ 11 : 12 ~ // Gui.drawRect(j, k, j + 32, k + 32, -1601138544); -> INSERT 34 : 35 @ 34 +> INSERT 33 : 34 @ 33 + GlStateManager.blendFunc(770, 771); -> DELETE 9 @ 8 : 47 +> DELETE 8 @ 8 : 47 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java b/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java index b7f017a..e5bc715 100644 --- a/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/ServerSelectionList.edit.java @@ -7,26 +7,26 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 4 @ 1 : 6 +> DELETE 1 @ 1 : 6 -> DELETE 1 @ 6 : 7 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 5 : 7 +> DELETE 4 @ 4 : 6 -> CHANGE 9 : 10 @ 11 : 22 +> CHANGE 9 : 10 @ 9 : 20 ~ return (GuiListExtended.IGuiListEntry) this.field_148198_l.get(i); -> CHANGE 4 : 5 @ 14 : 15 +> CHANGE 3 : 4 @ 3 : 4 ~ return this.field_148198_l.size(); -> DELETE 24 @ 24 : 33 +> DELETE 23 @ 23 : 32 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java index 9641888..cee94b6 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.edit.java @@ -9,9 +9,9 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> INSERT 114 : 146 @ 115 +> INSERT 114 : 146 @ 114 + public int getHeight() { + if (this.theAchievement != null && this.notificationTime != 0L && Minecraft.getMinecraft().thePlayer != null) { diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java index af7374f..667e525 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.edit.java @@ -13,52 +13,52 @@ ~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 11 @ 8 : 9 +> DELETE 6 @ 6 : 7 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 10 @ 11 : 12 +> DELETE 10 @ 10 : 11 -> CHANGE 43 : 44 @ 44 : 45 +> CHANGE 43 : 44 @ 43 : 44 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 9 : 11 @ 9 : 17 +> CHANGE 8 : 10 @ 8 : 16 ~ protected int getCloseKey() { ~ return this.mc.gameSettings.keyBindInventory.getKeyCode(); -> CHANGE 78 : 79 @ 84 : 85 +> CHANGE 76 : 77 @ 76 : 77 ~ GlStateManager.disableLighting(); -> INSERT 62 : 66 @ 62 +> INSERT 61 : 65 @ 61 + GlStateManager.enableDepth(); + GlStateManager.clearDepth(0.0f); + GlStateManager.clear(256); + GlStateManager.clearDepth(1.0f); -> CHANGE 21 : 22 @ 17 : 18 +> CHANGE 17 : 18 @ 17 : 18 ~ EaglercraftRandom random = new EaglercraftRandom(); -> CHANGE 9 : 11 @ 9 : 10 +> CHANGE 8 : 10 @ 8 : 9 ~ random.setSeed( ~ (long) (this.mc.getSession().getProfile().getId().hashCode() + k1 + l2 + (l1 + k2) * 16)); -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ EaglerTextureAtlasSprite textureatlassprite = this.func_175371_a(Blocks.sand); -> DELETE 27 @ 27 : 28 +> DELETE 26 @ 26 : 27 -> CHANGE 158 : 159 @ 159 : 160 +> CHANGE 158 : 159 @ 158 : 159 ~ GlStateManager.disableBlend(); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ private EaglerTextureAtlasSprite func_175371_a(Block parBlock) { diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java index d32d9a5..5405aee 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 4 : 10 @ 5 +> INSERT 4 : 10 @ 4 + + import com.google.common.collect.Lists; @@ -16,13 +16,13 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 12 @ 6 : 7 +> DELETE 6 @ 6 : 7 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 11 @ 12 : 13 +> DELETE 11 @ 11 : 12 -> CHANGE 71 : 72 @ 72 : 73 +> CHANGE 71 : 72 @ 71 : 72 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java index 4dfe5c0..d3fb2d7 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.edit.java @@ -12,11 +12,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 7 @ 5 : 7 +> DELETE 3 @ 3 : 5 -> DELETE 12 @ 14 : 16 +> DELETE 12 @ 12 : 14 -> CHANGE 80 : 81 @ 82 : 83 +> CHANGE 80 : 81 @ 80 : 81 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java index 060e994..ee9ceb6 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiChest.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java index 9c29f36..be25553 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 1 : 9 @ 3 +> INSERT 1 : 9 @ 1 + + import com.google.common.collect.Sets; @@ -18,37 +18,37 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 10 @ 2 : 4 +> DELETE 2 @ 2 : 4 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> INSERT 81 : 82 @ 82 +> INSERT 81 : 82 @ 81 + GlStateManager.enableAlpha(); -> CHANGE 108 : 109 @ 107 : 108 +> CHANGE 107 : 108 @ 107 : 108 ~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks().getAtlasSprite(s1); -> CHANGE 57 : 58 @ 57 : 58 +> CHANGE 56 : 57 @ 56 : 57 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> CHANGE 236 : 240 @ 236 : 238 +> CHANGE 235 : 239 @ 235 : 237 ~ protected void keyTyped(char parChar1, int parInt1) { ~ if (parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode() ~ || parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode() ~ || (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) { -> CHANGE 5 : 7 @ 3 : 11 +> CHANGE 1 : 3 @ 1 : 9 ~ if (this.mc.currentScreen == null) { ~ this.mc.setIngameFocus(); -> INSERT 3 : 14 @ 9 +> INSERT 1 : 12 @ 1 + } else if (parInt1 == 1) { + showingCloseKey = System.currentTimeMillis(); @@ -62,6 +62,6 @@ + } + } -> DELETE 12 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java index 752b751..c949007 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 4 : 10 @ 5 +> INSERT 4 : 10 @ 4 + + import com.google.common.collect.Lists; @@ -16,21 +16,21 @@ + import net.lax1dude.eaglercraft.v1_8.Mouse; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 10 @ 4 : 7 +> DELETE 4 @ 4 : 7 -> DELETE 19 @ 22 : 24 +> DELETE 19 @ 19 : 21 -> CHANGE 186 : 187 @ 188 : 189 +> CHANGE 186 : 187 @ 186 : 187 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 14 : 17 @ 14 : 15 +> CHANGE 13 : 16 @ 13 : 14 ~ if (parInt1 == getCloseKey()) { ~ mc.displayGuiScreen(null); ~ } else if (!this.checkHotbarKeys(parInt1)) { -> INSERT 13 : 18 @ 11 +> INSERT 10 : 15 @ 10 + protected int getCloseKey() { + return selectedTabIndex != CreativeTabs.tabAllSearch.getTabIndex() ? super.getCloseKey() @@ -38,11 +38,11 @@ + } + -> CHANGE 54 : 55 @ 49 : 50 +> CHANGE 49 : 50 @ 49 : 50 ~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { -> CHANGE 323 : 324 @ 323 : 324 +> CHANGE 322 : 323 @ 322 : 323 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java index 759c718..8606e5c 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.Keyboard; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 6 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> CHANGE 34 : 35 @ 35 : 36 +> CHANGE 34 : 35 @ 34 : 35 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ protected void keyTyped(char parChar1, int parInt1) { diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java index a6114a4..4d54f36 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiInventory.edit.java @@ -10,19 +10,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 6 @ 5 : 7 +> DELETE 4 @ 4 : 6 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> INSERT 49 : 50 @ 50 +> INSERT 49 : 50 @ 49 + GlStateManager.enableDepth(); -> INSERT 3 : 4 @ 2 +> INSERT 2 : 3 @ 2 + GlStateManager.disableDepth(); -> CHANGE 43 : 44 @ 42 : 43 +> CHANGE 42 : 43 @ 42 : 43 ~ protected void actionPerformed(GuiButton parGuiButton) { diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java b/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java index cf67380..4f2c51f 100644 --- a/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 4 +> CHANGE 1 : 4 @ 1 : 3 ~ ~ import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java index 1d215bf..7056370 100644 --- a/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.edit.java @@ -10,13 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 4 : 7 +> DELETE 3 @ 3 : 6 -> DELETE 7 @ 10 : 11 +> DELETE 7 @ 7 : 8 -> DELETE 3 @ 4 : 6 +> DELETE 3 @ 3 : 5 -> CHANGE 11 : 13 @ 13 : 14 +> CHANGE 11 : 13 @ 11 : 12 ~ Minecraft.getMinecraft().getTextureManager().bindTexture( ~ Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(profile).getResourceLocation()); diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java index 7306f23..8595fed 100644 --- a/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 4 -> INSERT 2 : 6 @ 4 +> INSERT 2 : 6 @ 2 + + import com.google.common.base.Objects; + import com.google.common.collect.Lists; + -> DELETE 7 @ 3 : 7 +> DELETE 3 @ 3 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java index 73ff2d6..f1b7d06 100644 --- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.base.Objects; diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java index ee5bb33..30d6b56 100644 --- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> INSERT 3 : 8 @ 6 +> INSERT 3 : 8 @ 3 + + import com.google.common.collect.ComparisonChain; diff --git a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java index f869793..d383179 100644 --- a/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 6 @ 2 : 3 +> CHANGE 1 : 6 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -15,18 +15,18 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 13 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> INSERT 66 : 70 @ 67 +> INSERT 66 : 70 @ 66 + this.field_178677_c = DefaultPlayerSkin.getDefaultSkinLegacy(); + + // TODO: program team skins + -> CHANGE 5 : 10 @ 1 : 5 +> CHANGE 1 : 6 @ 1 : 5 ~ // String s1 = ((NetworkPlayerInfo) this.field_178675_d ~ // .get((new @@ -34,7 +34,7 @@ ~ // this.field_178677_c = AbstractClientPlayer.getLocationSkin(s1); ~ // AbstractClientPlayer.getDownloadImageSkin(this.field_178677_c, s1); -> CHANGE 6 : 7 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ // this.field_178677_c = DefaultPlayerSkin.getDefaultSkinLegacy(); diff --git a/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java b/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java index ce4bfa7..cac69b4 100644 --- a/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java +++ b/patches/minecraft/net/minecraft/client/main/GameConfiguration.edit.java @@ -7,28 +7,28 @@ > DELETE 2 @ 2 : 5 -> DELETE 5 @ 8 : 9 +> DELETE 5 @ 5 : 6 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 2 : 3 @ 3 : 5 +> CHANGE 2 : 3 @ 2 : 4 ~ GameConfiguration.DisplayInformation displayInfoIn, GameConfiguration.GameInformation gameInfoIn) { -> DELETE 3 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 16 @ 17 : 31 +> DELETE 16 @ 16 : 30 -> DELETE 10 @ 24 : 34 +> DELETE 10 @ 10 : 20 -> DELETE 2 @ 12 : 15 +> DELETE 2 @ 2 : 5 -> CHANGE 1 : 2 @ 4 : 6 +> CHANGE 1 : 2 @ 1 : 3 ~ public UserInformation(Session parSession) { -> DELETE 2 @ 3 : 6 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/main/Main.edit.java b/patches/minecraft/net/minecraft/client/main/Main.edit.java index 09755ea..9b70034 100644 --- a/patches/minecraft/net/minecraft/client/main/Main.edit.java +++ b/patches/minecraft/net/minecraft/client/main/Main.edit.java @@ -9,23 +9,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime; -> DELETE 2 @ 16 : 17 +> DELETE 1 @ 1 : 2 -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public static void appMain(String[] astring) { -> DELETE 2 @ 2 : 46 +> DELETE 1 @ 1 : 45 -> DELETE 1 @ 45 : 95 +> DELETE 1 @ 1 : 51 -> CHANGE 1 : 5 @ 51 : 62 +> CHANGE 1 : 5 @ 1 : 12 ~ new GameConfiguration.UserInformation(new Session()), ~ new GameConfiguration.DisplayInformation(854, 480, false, true), ~ new GameConfiguration.GameInformation(false, "1.8.8")); ~ PlatformRuntime.setThreadName("Client thread"); -> DELETE 6 @ 13 : 17 +> DELETE 2 @ 2 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java b/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java index c112a54..390a472 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelBase.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 2 : 7 @ 4 : 7 +> CHANGE 2 : 7 @ 2 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -15,7 +15,7 @@ ~ import com.google.common.collect.Maps; ~ -> CHANGE 26 : 27 @ 24 : 25 +> CHANGE 21 : 22 @ 21 : 22 ~ public ModelRenderer getRandomModelBox(EaglercraftRandom rand) { diff --git a/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java b/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java index a4d0f35..68bcded 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelBiped.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> CHANGE 72 : 73 @ 74 : 75 +> CHANGE 71 : 72 @ 71 : 72 ~ if (entity != null && entity.isSneaking()) { diff --git a/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java b/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java index d6ae189..33a6b1b 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelEnderman.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 4 -> CHANGE 37 : 38 @ 39 : 40 +> CHANGE 37 : 38 @ 37 : 38 ~ this.bipedBody.rotationPointZ = 0.0F; -> CHANGE 53 : 54 @ 53 : 54 +> CHANGE 52 : 53 @ 52 : 53 ~ this.bipedHead.rotationPointZ = 0.0F; diff --git a/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java b/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java index f3296ee..9dda503 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelGhast.edit.java @@ -11,7 +11,7 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> CHANGE 15 : 16 @ 16 : 17 +> CHANGE 12 : 13 @ 12 : 13 ~ EaglercraftRandom random = new EaglercraftRandom(1660L); diff --git a/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java b/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java index 251d3aa..767f2bc 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelPlayer.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> CHANGE 73 : 74 @ 75 : 76 +> CHANGE 72 : 73 @ 72 : 73 ~ if (entity != null && entity.isSneaking()) { -> CHANGE 32 : 33 @ 32 : 33 +> CHANGE 31 : 32 @ 31 : 32 ~ if (entity != null && entity.isSneaking()) { diff --git a/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java b/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java index 9bef5df..b39dbca 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelRenderer.edit.java @@ -10,7 +10,7 @@ ~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; ~ -> CHANGE 3 : 9 @ 2 : 5 +> CHANGE 1 : 7 @ 1 : 4 ~ ~ import com.google.common.collect.Lists; @@ -19,16 +19,16 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 7 @ 4 : 5 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> CHANGE 214 : 216 @ 216 : 218 +> CHANGE 214 : 216 @ 214 : 216 ~ this.displayList = GLAllocation.generateDisplayLists(); ~ EaglercraftGPU.glNewList(this.displayList, GL_COMPILE); -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ EaglercraftGPU.glEndList(); diff --git a/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java b/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java index 4eb1bf4..5f39d9f 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelSpider.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 81 : 82 @ 83 : 84 +> CHANGE 81 : 82 @ 81 : 82 ~ float f5 = 0.0F; diff --git a/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java b/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java index 2a65403..53488bc 100644 --- a/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java +++ b/patches/minecraft/net/minecraft/client/model/ModelZombie.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 3 -> CHANGE 5 : 6 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ this(0.0F, true); -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ super(modelSize, 0.0F, 64, parFlag ? 64 : 32); diff --git a/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java b/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java index b07e1da..59341de 100644 --- a/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java +++ b/patches/minecraft/net/minecraft/client/model/TexturedQuad.edit.java @@ -9,6 +9,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 2 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java index 4e5da61..9122a47 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java +++ b/patches/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 6 @ 2 +> INSERT 1 : 6 @ 1 + + import com.google.common.collect.Lists; @@ -15,6 +15,6 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 15 @ 10 : 12 +> DELETE 10 @ 10 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java index 6331eb7..9982bec 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java +++ b/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.edit.java @@ -18,32 +18,32 @@ ~ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager; ~ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker; -> CHANGE 14 : 15 @ 7 : 11 +> CHANGE 4 : 5 @ 4 : 8 ~ import net.minecraft.client.network.NetHandlerPlayClient; -> DELETE 3 @ 6 : 9 +> DELETE 2 @ 2 : 5 -> DELETE 1 @ 4 : 7 +> DELETE 1 @ 1 : 4 -> DELETE 2 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 3 +> CHANGE 1 : 5 @ 1 : 2 ~ private EaglercraftNetworkManager networkManager; ~ private String currentAddress; ~ private String currentPassword; ~ private boolean allowPlaintext; -> INSERT 5 : 6 @ 2 +> INSERT 1 : 2 @ 1 + private boolean hasOpened; -> INSERT 2 : 3 @ 1 +> INSERT 1 : 2 @ 1 + private int timer = 0; -> INSERT 3 : 16 @ 2 +> INSERT 2 : 15 @ 2 + this(parGuiScreen, mcIn, parServerData, false); + } @@ -59,11 +59,11 @@ + public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, ServerData parServerData, String password, + boolean allowPlaintext) { -> CHANGE 15 : 16 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ String serveraddress = AddressResolver.resolveURI(parServerData); -> CHANGE 3 : 8 @ 3 : 4 +> CHANGE 2 : 7 @ 2 : 3 ~ if (RateLimitTracker.isLockedOut(serveraddress)) { ~ logger.error("Server locked this client out on a previous connection, will not attempt to reconnect"); @@ -71,7 +71,7 @@ ~ this.connect(serveraddress, password, allowPlaintext); ~ } -> INSERT 8 : 21 @ 4 +> INSERT 3 : 16 @ 3 + this(parGuiScreen, mcIn, hostName, port, false); + } @@ -87,17 +87,17 @@ + public GuiConnecting(GuiScreen parGuiScreen, Minecraft mcIn, String hostName, int port, String password, + boolean allowPlaintext) { -> CHANGE 16 : 17 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ this.connect(hostName, password, allowPlaintext); -> CHANGE 3 : 6 @ 3 : 8 +> CHANGE 2 : 5 @ 2 : 7 ~ public GuiConnecting(GuiConnecting previous, String password) { ~ this(previous, password, false); ~ } -> CHANGE 4 : 9 @ 6 : 10 +> CHANGE 1 : 6 @ 1 : 5 ~ public GuiConnecting(GuiConnecting previous, String password, boolean allowPlaintext) { ~ this.mc = previous.mc; @@ -105,7 +105,7 @@ ~ this.connect(previous.currentAddress, password, allowPlaintext); ~ } -> CHANGE 6 : 11 @ 5 : 19 +> CHANGE 1 : 6 @ 1 : 15 ~ private void connect(String ip, String password, boolean allowPlaintext) { ~ this.currentAddress = ip; @@ -113,7 +113,7 @@ ~ this.allowPlaintext = allowPlaintext; ~ } -> CHANGE 6 : 42 @ 15 : 22 +> CHANGE 1 : 37 @ 1 : 8 ~ public void updateScreen() { ~ ++timer; @@ -152,13 +152,13 @@ ~ return; ~ } -> CHANGE 37 : 40 @ 8 : 14 +> CHANGE 1 : 4 @ 1 : 7 ~ try { ~ this.networkManager.processReceivedPackets(); ~ } catch (IOException ex) { -> CHANGE 4 : 32 @ 7 : 11 +> CHANGE 1 : 29 @ 1 : 5 ~ } else { ~ if (PlatformNetworking.playConnectionState() == EnumEaglerConnectionState.FAILED) { @@ -189,28 +189,28 @@ ~ } ~ } -> DELETE 29 @ 5 : 6 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 12 +> DELETE 1 @ 1 : 11 -> CHANGE 4 : 5 @ 14 : 15 +> CHANGE 4 : 5 @ 4 : 5 ~ protected void keyTyped(char parChar1, int parInt1) { -> CHANGE 5 : 7 @ 5 : 7 +> CHANGE 4 : 6 @ 4 : 6 ~ this.buttonList.add( ~ new GuiButton(0, this.width / 2 - 100, this.height / 2 - 10, I18n.format("gui.cancel", new Object[0]))); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ protected void actionPerformed(GuiButton parGuiButton) { -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 13 : 14 @ 13 : 14 ~ if (this.networkManager == null || !this.networkManager.isChannelOpen()) { -> INSERT 10 : 24 @ 10 +> INSERT 9 : 23 @ 9 + + private void checkLowLevelRatelimit() { diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java index e9197f8..ef93a85 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java +++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.edit.java @@ -11,13 +11,13 @@ + + import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager; -> DELETE 9 @ 6 : 7 +> DELETE 6 @ 6 : 7 -> INSERT 16 : 17 @ 17 +> INSERT 16 : 17 @ 16 + import net.minecraft.util.ChatComponentText; -> CHANGE 229 : 240 @ 228 : 229 +> CHANGE 228 : 239 @ 228 : 229 ~ try { ~ this.netClientHandler.getNetworkManager().processReceivedPackets(); @@ -31,7 +31,7 @@ ~ } ~ this.netClientHandler.getSkinCache().flush(); -> CHANGE 107 : 109 @ 97 : 99 +> CHANGE 96 : 98 @ 96 : 98 ~ public EntityPlayerSP func_178892_a(World worldIn, StatFileWriter statWriter) { ~ return new EntityPlayerSP(this.mc, worldIn, this.netClientHandler, statWriter); diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java index 9260003..8fd925b 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java +++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerAddress.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 7 -> CHANGE 4 : 5 @ 9 : 10 +> CHANGE 4 : 5 @ 4 : 5 ~ public ServerAddress(String parString1, int parInt1) { -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ return this.ipAddress; -> DELETE 7 @ 7 : 67 +> DELETE 6 @ 6 : 66 > EOF diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java index e3edb6c..2f5abc3 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java +++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerData.edit.java @@ -19,21 +19,21 @@ + import net.lax1dude.eaglercraft.v1_8.profile.EaglerSkinTexture; + import net.minecraft.client.Minecraft; -> INSERT 14 : 15 @ 3 +> INSERT 3 : 4 @ 3 + import net.minecraft.util.ResourceLocation; -> CHANGE 5 : 8 @ 4 : 7 +> CHANGE 4 : 7 @ 4 : 7 ~ public String populationInfo = ""; ~ public String serverMOTD = ""; ~ public long pingToServer = -1l; -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 5 : 6 @ 5 : 6 ~ public boolean hideAddress = false; -> INSERT 2 : 10 @ 2 +> INSERT 1 : 9 @ 1 + public IServerQuery currentQuery = null; + public final ResourceLocation iconResourceLocation; @@ -44,27 +44,27 @@ + public boolean serverIconEnabled = false; + public boolean isDefault = false; -> INSERT 9 : 13 @ 1 +> INSERT 1 : 5 @ 1 + private static final Logger logger = LogManager.getLogger("MOTDQuery"); + + private static int serverTextureId = 0; + -> INSERT 8 : 9 @ 4 +> INSERT 4 : 5 @ 4 + this.iconResourceLocation = new ResourceLocation("eagler:servers/icons/tex_" + serverTextureId++); -> DELETE 7 @ 6 : 9 +> DELETE 6 @ 6 : 9 -> INSERT 7 : 9 @ 10 +> INSERT 7 : 9 @ 7 + nbttagcompound.setBoolean("hideAddress", this.hideAddress); + -> DELETE 15 @ 13 : 16 +> DELETE 13 @ 13 : 16 -> INSERT 11 : 17 @ 14 +> INSERT 11 : 17 @ 11 + if (nbtCompound.hasKey("hideAddress", 1)) { + serverdata.hideAddress = nbtCompound.getBoolean("hideAddress"); @@ -73,13 +73,13 @@ + } + -> DELETE 9 @ 3 : 11 +> DELETE 3 @ 3 : 11 -> CHANGE 8 : 9 @ 16 : 17 +> CHANGE 8 : 9 @ 8 : 9 ~ this.hideAddress = serverDataIn.hideAddress; -> INSERT 17 : 83 @ 17 +> INSERT 16 : 82 @ 16 + + public void setMOTDFromQuery(QueryResponse pkt) { diff --git a/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java index 617a51e..0778084 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java +++ b/patches/minecraft/net/minecraft/client/multiplayer/ServerList.edit.java @@ -10,7 +10,7 @@ ~ import java.io.ByteArrayOutputStream; ~ import java.util.Iterator; -> INSERT 3 : 16 @ 3 +> INSERT 1 : 14 @ 1 + + import com.google.common.collect.Lists; @@ -26,25 +26,25 @@ + import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker; + import net.lax1dude.eaglercraft.v1_8.socket.ServerQueryDispatch; -> CHANGE 14 : 15 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ import net.minecraft.client.renderer.texture.TextureManager; -> CHANGE 4 : 5 @ 4 : 6 +> CHANGE 3 : 4 @ 3 : 5 ~ import net.minecraft.util.EnumChatFormatting; -> INSERT 5 : 6 @ 6 +> INSERT 4 : 5 @ 4 + private final List allServers = Lists.newArrayList(); -> CHANGE 3 : 6 @ 2 : 3 +> CHANGE 2 : 5 @ 2 : 3 ~ private static ServerList instance = null; ~ ~ private ServerList(Minecraft mcIn) { -> INSERT 7 : 15 @ 5 +> INSERT 4 : 12 @ 4 + public static void initServerList(Minecraft mc) { + instance = new ServerList(mc); @@ -55,7 +55,7 @@ + } + -> CHANGE 10 : 17 @ 2 : 6 +> CHANGE 2 : 9 @ 2 : 6 ~ freeServerIcons(); ~ @@ -65,11 +65,11 @@ ~ dat.isDefault = true; ~ this.allServers.add(dat); -> CHANGE 9 : 10 @ 6 : 7 +> CHANGE 2 : 3 @ 2 : 3 ~ byte[] localStorage = EagRuntime.getStorage("s"); -> CHANGE 2 : 15 @ 2 : 4 +> CHANGE 1 : 14 @ 1 : 3 ~ if (localStorage != null) { ~ NBTTagCompound nbttagcompound = CompressedStreamTools @@ -85,22 +85,22 @@ ~ this.allServers.add(srv); ~ } -> INSERT 14 : 15 @ 3 +> INSERT 1 : 2 @ 1 + -> INSERT 3 : 5 @ 2 +> INSERT 2 : 4 @ 2 + } finally { + refreshServerPing(); -> CHANGE 11 : 14 @ 9 : 10 +> CHANGE 9 : 12 @ 9 : 10 ~ if (!serverdata.isDefault) { ~ nbttaglist.appendTag(serverdata.getNBTCompound()); ~ } -> CHANGE 7 : 12 @ 5 : 6 +> CHANGE 4 : 9 @ 4 : 5 ~ ~ ByteArrayOutputStream bao = new ByteArrayOutputStream(); @@ -108,7 +108,7 @@ ~ EagRuntime.setStorage("s", bao.toByteArray()); ~ -> CHANGE 16 : 21 @ 12 : 13 +> CHANGE 11 : 16 @ 11 : 12 ~ ServerData data = this.servers.remove(parInt1); ~ if (data != null && data.iconTextureObject != null) { @@ -116,7 +116,7 @@ ~ data.iconTextureObject = null; ~ } -> INSERT 41 : 149 @ 37 +> INSERT 36 : 144 @ 36 + + public void freeServerIcons() { diff --git a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java index 2ada982..5dc4590 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java +++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java @@ -9,19 +9,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> INSERT 3 : 6 @ 4 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Sets; + -> DELETE 8 @ 5 : 6 +> DELETE 5 @ 5 : 6 -> CHANGE 211 : 212 @ 212 : 213 +> CHANGE 211 : 212 @ 211 : 212 ~ EaglercraftRandom random = new EaglercraftRandom(); -> CHANGE 84 : 85 @ 84 : 86 +> CHANGE 83 : 84 @ 83 : 85 ~ return "Non-integrated multiplayer server"; diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java index 00ef84a..862d5a9 100644 --- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java +++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 8 -> DELETE 4 @ 10 : 12 +> DELETE 4 @ 4 : 6 -> INSERT 1 : 13 @ 3 +> INSERT 1 : 13 @ 1 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; @@ -24,203 +24,203 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> DELETE 26 @ 14 : 16 +> DELETE 14 @ 14 : 16 -> DELETE 9 @ 11 : 12 +> DELETE 9 @ 9 : 10 -> DELETE 5 @ 6 : 9 +> DELETE 5 @ 5 : 8 -> DELETE 47 @ 50 : 51 +> DELETE 47 @ 47 : 48 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 78 @ 79 : 80 +> DELETE 78 @ 78 : 79 -> DELETE 32 @ 33 : 35 +> DELETE 32 @ 32 : 34 -> CHANGE 3 : 4 @ 5 : 6 +> CHANGE 3 : 4 @ 3 : 4 ~ private final EaglercraftNetworkManager netManager; -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ private final Map playerInfoMap = Maps.newHashMap(); -> CHANGE 3 : 5 @ 3 : 4 +> CHANGE 2 : 4 @ 2 : 3 ~ private final EaglercraftRandom avRandomizer = new EaglercraftRandom(); ~ private final ServerSkinCache skinCache; -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ public NetHandlerPlayClient(Minecraft mcIn, GuiScreen parGuiScreen, EaglercraftNetworkManager parNetworkManager, -> INSERT 6 : 7 @ 6 +> INSERT 5 : 6 @ 5 + this.skinCache = new ServerSkinCache(parNetworkManager, mcIn.getTextureManager()); -> INSERT 5 : 6 @ 4 +> INSERT 4 : 5 @ 4 + this.skinCache.destroy(); -> INSERT 3 : 7 @ 2 +> INSERT 2 : 6 @ 2 + public ServerSkinCache getSkinCache() { + return this.skinCache; + } + -> DELETE 5 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 19 @ 20 : 21 +> DELETE 19 @ 19 : 20 -> DELETE 105 @ 106 : 107 +> DELETE 105 @ 105 : 106 -> DELETE 12 @ 13 : 14 +> DELETE 12 @ 12 : 13 -> DELETE 21 @ 22 : 23 +> DELETE 21 @ 21 : 22 -> DELETE 6 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 31 @ 32 : 33 +> DELETE 31 @ 31 : 32 -> DELETE 22 @ 23 : 24 +> DELETE 22 @ 22 : 23 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 17 @ 18 : 19 +> DELETE 17 @ 17 : 18 -> DELETE 8 @ 9 : 11 +> DELETE 8 @ 8 : 10 -> DELETE 7 @ 9 : 10 +> DELETE 7 @ 7 : 8 -> DELETE 47 @ 48 : 50 +> DELETE 47 @ 47 : 49 -> DELETE 9 @ 11 : 12 +> DELETE 9 @ 9 : 10 -> DELETE 22 @ 23 : 24 +> DELETE 22 @ 22 : 23 -> CHANGE 8 : 11 @ 9 : 10 +> CHANGE 8 : 11 @ 8 : 9 ~ if (this.gameController.theWorld != null) { ~ this.gameController.loadWorld((WorldClient) null); ~ } -> CHANGE 4 : 6 @ 2 : 10 +> CHANGE 1 : 3 @ 1 : 9 ~ this.gameController ~ .displayGuiScreen(new GuiDisconnected(this.guiScreenServer, "disconnect.lost", ichatcomponent)); -> DELETE 6 @ 12 : 13 +> DELETE 4 @ 4 : 5 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> DELETE 23 @ 24 : 25 +> DELETE 23 @ 23 : 24 -> DELETE 9 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> DELETE 20 @ 21 : 22 +> DELETE 20 @ 20 : 21 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 35 @ 36 : 37 +> DELETE 35 @ 35 : 36 -> DELETE 5 @ 6 : 7 +> DELETE 5 @ 5 : 6 -> DELETE 5 @ 6 : 7 +> DELETE 5 @ 5 : 6 -> DELETE 39 @ 40 : 41 +> DELETE 39 @ 39 : 40 -> DELETE 12 @ 13 : 14 +> DELETE 12 @ 12 : 13 -> DELETE 6 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 5 @ 6 : 7 +> DELETE 5 @ 5 : 6 -> DELETE 17 @ 18 : 19 +> DELETE 17 @ 17 : 18 -> DELETE 9 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> DELETE 27 @ 28 : 29 +> DELETE 27 @ 27 : 28 -> DELETE 27 @ 28 : 29 +> DELETE 27 @ 27 : 28 -> DELETE 16 @ 17 : 18 +> DELETE 16 @ 16 : 17 -> DELETE 10 @ 11 : 12 +> DELETE 10 @ 10 : 11 -> DELETE 11 @ 12 : 13 +> DELETE 11 @ 11 : 12 -> DELETE 22 @ 23 : 24 +> DELETE 22 @ 22 : 23 -> DELETE 16 @ 17 : 18 +> DELETE 16 @ 16 : 17 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 5 @ 6 : 7 +> DELETE 5 @ 5 : 6 -> DELETE 5 @ 6 : 8 +> DELETE 5 @ 5 : 7 -> DELETE 18 @ 20 : 21 +> DELETE 18 @ 18 : 19 -> CHANGE 21 : 24 @ 22 : 41 +> CHANGE 21 : 24 @ 21 : 40 ~ ~ // minecraft demo screen ~ -> DELETE 21 @ 37 : 38 +> DELETE 18 @ 18 : 19 -> DELETE 6 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 11 @ 12 : 13 +> DELETE 11 @ 11 : 12 -> DELETE 9 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> DELETE 25 @ 26 : 27 +> DELETE 25 @ 25 : 26 -> DELETE 10 @ 11 : 27 +> DELETE 10 @ 10 : 26 -> INSERT 1 : 3 @ 17 +> INSERT 1 : 3 @ 1 + // used by twitch stream + -> DELETE 5 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> CHANGE 5 : 6 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ -> DELETE 9 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 36 @ 37 : 38 +> DELETE 36 @ 36 : 37 -> DELETE 8 @ 9 : 11 +> DELETE 8 @ 8 : 10 -> CHANGE 2 : 5 @ 4 : 5 +> CHANGE 2 : 5 @ 2 : 3 ~ EaglercraftUUID uuid = s38packetplayerlistitem$addplayerdata.getProfile().getId(); ~ this.playerInfoMap.remove(uuid); ~ this.skinCache.evictSkin(uuid); -> DELETE 37 @ 35 : 36 +> DELETE 34 @ 34 : 35 -> DELETE 10 @ 11 : 12 +> DELETE 10 @ 10 : 11 -> DELETE 9 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> CHANGE 8 : 30 @ 9 : 32 +> CHANGE 8 : 30 @ 8 : 31 ~ this.netManager ~ .sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED)); @@ -245,7 +245,7 @@ ~ this.netManager ~ .sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED)); -> CHANGE 23 : 31 @ 24 : 34 +> CHANGE 1 : 9 @ 1 : 11 ~ NetHandlerPlayClient.this.gameController.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() { ~ public void confirmClicked(boolean flag, int var2) { @@ -256,7 +256,7 @@ ~ .setResourceMode(ServerData.ServerResourceMode.ENABLED); ~ } -> CHANGE 9 : 19 @ 11 : 30 +> CHANGE 1 : 11 @ 1 : 20 ~ NetHandlerPlayClient.this.netManager.sendPacket( ~ new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.ACCEPTED)); @@ -269,7 +269,7 @@ ~ NetHandlerPlayClient.this.netManager.sendPacket(new C19PacketResourcePackStatus( ~ s1, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD)); -> INSERT 11 : 17 @ 20 +> INSERT 1 : 7 @ 1 + }); + } else { @@ -278,14 +278,14 @@ + .setResourceMode(ServerData.ServerResourceMode.DISABLED); + } -> CHANGE 7 : 9 @ 1 : 34 +> CHANGE 1 : 3 @ 1 : 34 ~ NetHandlerPlayClient.this.netManager.sendPacket( ~ new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED)); -> DELETE 3 @ 34 : 36 +> DELETE 1 @ 1 : 3 -> INSERT 1 : 6 @ 3 +> INSERT 1 : 6 @ 1 + ServerList.func_147414_b(NetHandlerPlayClient.this.gameController.getCurrentServerData()); + NetHandlerPlayClient.this.gameController.displayGuiScreen((GuiScreen) null); @@ -293,15 +293,15 @@ + }, I18n.format("multiplayer.texturePrompt.line1", new Object[0]), + I18n.format("multiplayer.texturePrompt.line2", new Object[0]), 0)); -> DELETE 9 @ 4 : 5 +> DELETE 4 @ 4 : 5 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 11 @ 12 : 14 +> DELETE 11 @ 11 : 13 -> INSERT 9 : 16 @ 11 +> INSERT 9 : 16 @ 9 + } else if ("EAG|Skins-1.8".equals(packetIn.getChannelName())) { + try { @@ -311,23 +311,23 @@ + logger.error(e); + } -> DELETE 12 @ 5 : 6 +> DELETE 5 @ 5 : 6 -> DELETE 19 @ 20 : 21 +> DELETE 19 @ 19 : 20 -> DELETE 16 @ 17 : 18 +> DELETE 16 @ 16 : 17 -> DELETE 11 @ 12 : 13 +> DELETE 11 @ 11 : 12 -> DELETE 39 @ 40 : 41 +> DELETE 39 @ 39 : 40 -> DELETE 35 @ 36 : 37 +> DELETE 35 @ 35 : 36 -> CHANGE 29 : 30 @ 30 : 31 +> CHANGE 29 : 30 @ 29 : 30 ~ public EaglercraftNetworkManager getNetworkManager() { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ public NetworkPlayerInfo getPlayerInfo(EaglercraftUUID parUUID) { diff --git a/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java b/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java index 3a9f305..0eab941 100644 --- a/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java +++ b/patches/minecraft/net/minecraft/client/network/NetworkPlayerInfo.edit.java @@ -11,27 +11,27 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile; -> DELETE 5 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> DELETE 10 @ 11 : 14 +> DELETE 10 @ 10 : 13 -> CHANGE 40 : 41 @ 43 : 44 +> CHANGE 40 : 41 @ 40 : 41 ~ return true; -> CHANGE 4 : 6 @ 4 : 5 +> CHANGE 3 : 5 @ 3 : 4 ~ return Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(this.gameProfile) ~ .getSkinModel().profileSkinType; -> CHANGE 5 : 6 @ 4 : 10 +> CHANGE 3 : 4 @ 3 : 9 ~ return Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(this.gameProfile).getResourceLocation(); -> CHANGE 4 : 5 @ 9 : 14 +> CHANGE 3 : 4 @ 3 : 8 ~ return null; -> DELETE 7 @ 11 : 38 +> DELETE 6 @ 6 : 33 > EOF diff --git a/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java b/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java index d879b7a..03f44fe 100644 --- a/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/Barrier.edit.java @@ -10,9 +10,9 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 3 @ 1 : 4 +> DELETE 1 @ 1 : 4 -> INSERT 54 : 62 @ 57 +> INSERT 54 : 62 @ 54 + public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2, + float f3, float f4, float f5) { diff --git a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java index 6b045b9..9c4ffb9 100644 --- a/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EffectRenderer.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 4 -> CHANGE 3 : 6 @ 5 : 6 +> CHANGE 3 : 6 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.minecraft.AcceleratedEffectRenderer; ~ -> INSERT 4 : 10 @ 2 +> INSERT 1 : 7 @ 1 + + import com.google.common.collect.Lists; @@ -22,27 +22,27 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 9 @ 3 : 36 +> DELETE 3 @ 3 : 36 -> DELETE 1 @ 34 : 35 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 20 : 21 @ 21 : 22 +> CHANGE 20 : 21 @ 20 : 21 ~ private EaglercraftRandom rand = new EaglercraftRandom(); -> INSERT 3 : 5 @ 3 +> INSERT 2 : 4 @ 2 + private AcceleratedEffectRenderer acceleratedParticleRenderer = new AcceleratedEffectRenderer(); + -> CHANGE 172 : 174 @ 170 : 172 +> CHANGE 170 : 172 @ 170 : 172 ~ for (int i = 0; i < 3; ++i) { ~ for (int j = 1; j >= 0; --j) { -> CHANGE 3 : 10 @ 3 : 10 +> CHANGE 1 : 8 @ 1 : 8 ~ // switch (j) { ~ // case 0: @@ -52,29 +52,29 @@ ~ // GlStateManager.depthMask(true); ~ // } -> INSERT 8 : 10 @ 8 +> INSERT 1 : 3 @ 1 + float texCoordWidth = 0.001f; + float texCoordHeight = 0.001f; -> INSERT 6 : 7 @ 4 +> INSERT 4 : 5 @ 4 + texCoordWidth = texCoordHeight = 1.0f / 256.0f; -> INSERT 4 : 7 @ 3 +> INSERT 3 : 6 @ 3 + TextureMap blockMap = (TextureMap) this.renderer.getTexture(TextureMap.locationBlocksTexture); + texCoordWidth = 1.0f / blockMap.getWidth(); + texCoordHeight = 1.0f / blockMap.getHeight(); -> INSERT 10 : 14 @ 7 +> INSERT 7 : 11 @ 7 + boolean legacyRenderingHasOccured = false; + + acceleratedParticleRenderer.begin(partialTicks); + -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 4 : 9 @ 4 : 5 ~ if (!entityfx.renderAccelerated(acceleratedParticleRenderer, entityIn, partialTicks, f, f4, ~ f1, f2, f3)) { @@ -82,17 +82,17 @@ ~ legacyRenderingHasOccured = true; ~ } -> INSERT 14 : 15 @ 10 +> INSERT 9 : 10 @ 9 + final int l = i; -> CHANGE 3 : 6 @ 2 : 5 +> CHANGE 2 : 5 @ 2 : 5 ~ return l == 0 ? "MISC_TEXTURE" ~ : (l == 1 ? "TERRAIN_TEXTURE" ~ : (l == 3 ? "ENTITY_PARTICLE_TEXTURE" : "Unknown - " + l)); -> CHANGE 9 : 16 @ 9 : 10 +> CHANGE 6 : 13 @ 6 : 7 ~ if (legacyRenderingHasOccured) { ~ tessellator.draw(); diff --git a/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java index c7dc115..6acf276 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntityBreakingFX.edit.java @@ -10,13 +10,13 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 3 @ 1 : 4 +> DELETE 1 @ 1 : 4 -> INSERT 4 : 5 @ 7 +> INSERT 4 : 5 @ 4 + import net.minecraft.util.MathHelper; -> INSERT 74 : 87 @ 73 +> INSERT 73 : 86 @ 73 + public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2, + float f3, float f4, float f5) { diff --git a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java index 337982f..5b4ad4a 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntityDiggingFX.edit.java @@ -10,13 +10,13 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 5 @ 3 : 6 +> DELETE 3 @ 3 : 6 -> INSERT 3 : 4 @ 6 +> INSERT 3 : 4 @ 3 + import net.minecraft.util.MathHelper; -> INSERT 91 : 104 @ 90 +> INSERT 90 : 103 @ 90 + public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2, + float f3, float f4, float f5) { diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java index 607d83c..bf3738c 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntityFX.edit.java @@ -11,13 +11,13 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> CHANGE 18 : 19 @ 20 : 21 +> CHANGE 18 : 19 @ 18 : 19 ~ protected EaglerTextureAtlasSprite particleIcon; -> INSERT 153 : 165 @ 153 +> INSERT 152 : 164 @ 152 + public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2, + float f3, float f4, float f5) { @@ -32,7 +32,7 @@ + } + -> CHANGE 22 : 23 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ public void setParticleIcon(EaglerTextureAtlasSprite icon) { diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java index eb0bcc3..0cc7c25 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntityFirework.edit.java @@ -10,9 +10,9 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.IAcceleratedParticleEngine; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 3 @ 1 : 5 +> DELETE 1 @ 1 : 5 -> INSERT 64 : 73 @ 68 +> INSERT 64 : 73 @ 64 + + public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, @@ -24,7 +24,7 @@ + return true; + } -> INSERT 231 : 232 @ 222 +> INSERT 222 : 223 @ 222 + entityfirework$overlayfx.particleAlpha = 0.99f; diff --git a/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java index 8aca2bd..cf3fe28 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntityFootStepFX.edit.java @@ -10,8 +10,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 3 @ 1 : 4 +> DELETE 1 @ 1 : 4 -> DELETE 1 @ 4 : 5 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java index 764eb85..9764a58 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.edit.java @@ -10,15 +10,15 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 3 @ 1 : 4 +> DELETE 1 @ 1 : 4 -> DELETE 2 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 6 @ 7 : 11 +> DELETE 6 @ 6 : 10 -> CHANGE 30 : 31 @ 34 : 35 +> CHANGE 30 : 31 @ 30 : 31 ~ worldrenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); diff --git a/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java index a93a316..0ec66a6 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntityPickupFX.edit.java @@ -11,6 +11,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 1 : 5 +> DELETE 1 @ 1 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java b/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java index 1f225b2..bcea90e 100644 --- a/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> CHANGE 7 : 8 @ 9 : 10 +> CHANGE 5 : 6 @ 5 : 6 ~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java b/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java index 62c88bc..71cb783 100644 --- a/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java +++ b/patches/minecraft/net/minecraft/client/particle/MobAppearance.edit.java @@ -11,6 +11,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 1 : 6 +> DELETE 1 @ 1 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java b/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java index 54ebf0a..f348eec 100644 --- a/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java +++ b/patches/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java index ceb60e6..c8748ac 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.edit.java @@ -14,18 +14,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 9 @ 5 : 7 +> DELETE 3 @ 3 : 5 -> DELETE 6 @ 8 : 10 +> DELETE 6 @ 6 : 8 -> CHANGE 2 : 6 @ 4 : 8 +> CHANGE 2 : 6 @ 2 : 6 ~ private static final int[] VIEWPORT = new int[4]; ~ private static final float[] MODELVIEW = new float[16]; ~ private static final float[] PROJECTION = new float[16]; ~ private static final float[] OBJECTCOORDS = new float[3]; -> CHANGE 14 : 19 @ 14 : 19 +> CHANGE 10 : 15 @ 10 : 15 ~ EaglercraftGPU.glGetInteger(GL_VIEWPORT, VIEWPORT); ~ float f = (float) ((VIEWPORT[0] + VIEWPORT[2]) / 2); @@ -33,7 +33,7 @@ ~ GlStateManager.gluUnProject(f, f1, 0.0F, MODELVIEW, PROJECTION, VIEWPORT, OBJECTCOORDS); ~ position = new Vec3((double) OBJECTCOORDS[0], (double) OBJECTCOORDS[1], (double) OBJECTCOORDS[2]); -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 12 : 13 @ 12 : 13 ~ double d1 = parEntity.prevPosY + (parEntity.posY - parEntity.prevPosY) * parDouble1 + parEntity.getEyeHeight(); diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java index fe9be80..9057f05 100644 --- a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.edit.java @@ -10,23 +10,23 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 6 @ 4 : 6 +> DELETE 4 @ 4 : 6 -> CHANGE 7 : 9 @ 9 : 11 +> CHANGE 7 : 9 @ 7 : 9 ~ private EaglerTextureAtlasSprite[] atlasSpritesLava = new EaglerTextureAtlasSprite[2]; ~ private EaglerTextureAtlasSprite[] atlasSpritesWater = new EaglerTextureAtlasSprite[2]; -> CHANGE 19 : 21 @ 19 : 20 +> CHANGE 17 : 19 @ 17 : 18 ~ EaglerTextureAtlasSprite[] atextureatlassprite = blockliquid.getMaterial() == Material.lava ~ ? this.atlasSpritesLava -> CHANGE 33 : 34 @ 32 : 33 +> CHANGE 31 : 32 @ 31 : 32 ~ EaglerTextureAtlasSprite textureatlassprite = atextureatlassprite[0]; -> CHANGE 106 : 107 @ 106 : 107 +> CHANGE 105 : 106 @ 105 : 106 ~ EaglerTextureAtlasSprite textureatlassprite1 = atextureatlassprite[1]; diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java index ef43f67..339d549 100644 --- a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java @@ -11,13 +11,13 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 6 @ 3 : 7 +> DELETE 3 @ 3 : 7 -> INSERT 75 : 76 @ 79 +> INSERT 75 : 76 @ 75 + BlockPos.MutableBlockPos pointer = new BlockPos.MutableBlockPos(); -> CHANGE 4 : 5 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ BlockPos blockpos = blockPosIn.offsetEvenFaster(enumfacing, pointer); diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java index e7ef6b7..7535fba 100644 --- a/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelShapes.edit.java @@ -7,33 +7,33 @@ > DELETE 2 @ 2 : 3 -> INSERT 3 : 7 @ 4 +> INSERT 3 : 7 @ 3 + + import com.google.common.collect.Maps; + + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 49 @ 45 : 46 +> DELETE 45 @ 45 : 46 -> CHANGE 21 : 22 @ 22 : 23 +> CHANGE 21 : 22 @ 21 : 22 ~ public EaglerTextureAtlasSprite getTexture(IBlockState state) { -> CHANGE 55 : 56 @ 55 : 56 +> CHANGE 54 : 55 @ 54 : 55 ~ this.bakedModelStore.put((IBlockState) entry.getKey(), -> CHANGE 176 : 177 @ 176 : 177 +> CHANGE 175 : 176 @ 175 : 176 ~ String s = BlockDirt.VARIANT.getName((BlockDirt.DirtType) linkedhashmap.remove(BlockDirt.VARIANT)); -> CHANGE 11 : 13 @ 11 : 12 +> CHANGE 10 : 12 @ 10 : 11 ~ String s = BlockStoneSlab.VARIANT ~ .getName((BlockStoneSlab.EnumType) linkedhashmap.remove(BlockStoneSlab.VARIANT)); -> CHANGE 11 : 12 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ .getName((BlockStoneSlabNew.EnumType) linkedhashmap.remove(BlockStoneSlabNew.VARIANT)); diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java index 0c62eb7..0c83185 100644 --- a/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.edit.java @@ -10,15 +10,15 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 2 : 9 +> DELETE 2 @ 2 : 9 -> DELETE 12 @ 19 : 20 +> DELETE 12 @ 12 : 13 -> CHANGE 17 : 18 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ public void renderBlockDamage(IBlockState state, BlockPos pos, EaglerTextureAtlasSprite texture, -> CHANGE 56 : 60 @ 56 : 62 +> CHANGE 55 : 59 @ 55 : 61 ~ ~ try { diff --git a/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java index 8d67b35..7273660 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/ChestRenderer.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java index 68e7007..85ffb32 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 3 +> CHANGE 1 : 5 @ 1 : 2 ~ ~ import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java index 123879f..76d46eb 100644 --- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java @@ -9,12 +9,12 @@ ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer; -> CHANGE 2 : 4 @ 6 : 7 +> CHANGE 1 : 3 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.HString; -> INSERT 3 : 16 @ 2 +> INSERT 1 : 14 @ 1 + + import com.google.common.base.Predicate; @@ -30,23 +30,23 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 23 @ 10 : 19 +> DELETE 10 @ 10 : 19 -> DELETE 7 @ 16 : 18 +> DELETE 7 @ 7 : 9 -> DELETE 7 @ 9 : 12 +> DELETE 7 @ 7 : 10 -> DELETE 20 @ 23 : 30 +> DELETE 20 @ 20 : 27 -> CHANGE 9 : 10 @ 16 : 17 +> CHANGE 9 : 10 @ 9 : 10 ~ private EaglercraftRandom random = new EaglercraftRandom(); -> DELETE 44 @ 44 : 45 +> DELETE 43 @ 43 : 44 -> DELETE 30 @ 31 : 32 +> DELETE 30 @ 30 : 31 -> INSERT 1 : 10 @ 2 +> INSERT 1 : 10 @ 1 + GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GlStateManager.matrixMode(5890); @@ -58,51 +58,51 @@ + GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); + -> CHANGE 22 : 23 @ 13 : 14 +> CHANGE 13 : 14 @ 13 : 14 ~ return false; -> DELETE 4 @ 4 : 10 +> DELETE 3 @ 3 : 9 -> DELETE 7 @ 13 : 28 +> DELETE 7 @ 7 : 22 -> DELETE 3 @ 18 : 33 +> DELETE 3 @ 3 : 18 -> CHANGE 3 : 4 @ 18 : 33 +> CHANGE 3 : 4 @ 3 : 18 ~ this.useShader = false; -> DELETE 4 @ 18 : 29 +> DELETE 3 @ 3 : 14 -> DELETE 3 @ 14 : 18 +> DELETE 3 @ 3 : 7 -> DELETE 44 @ 48 : 52 +> DELETE 44 @ 44 : 48 -> DELETE 1 @ 5 : 12 +> DELETE 1 @ 1 : 8 -> CHANGE 118 : 119 @ 125 : 126 +> CHANGE 118 : 119 @ 118 : 119 ~ f = this.mc.gameSettings.keyBindZoomCamera.isKeyDown() ? 17.0f : this.mc.gameSettings.fovSetting; -> CHANGE 170 : 171 @ 170 : 171 +> CHANGE 169 : 170 @ 169 : 170 ~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true), -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ this.farPlaneDistance * 2.0f * MathHelper.SQRT_2); -> CHANGE 58 : 59 @ 58 : 59 +> CHANGE 57 : 58 @ 57 : 58 ~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, false), -> DELETE 44 @ 44 : 56 +> DELETE 43 @ 43 : 55 -> CHANGE 121 : 122 @ 133 : 134 +> CHANGE 121 : 122 @ 121 : 122 ~ this.lightmapColors[i] = short1 << 24 | j | k << 8 | l << 16; -> INSERT 4 : 18 @ 4 +> INSERT 3 : 17 @ 3 + + GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit); @@ -119,35 +119,35 @@ + GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); + -> DELETE 37 @ 23 : 28 +> DELETE 23 @ 23 : 28 -> INSERT 4 : 7 @ 9 +> INSERT 4 : 7 @ 4 + if (this.mc.gameSettings.keyBindZoomCamera.isKeyDown()) { + f *= 0.7f; + } -> DELETE 42 @ 39 : 52 +> DELETE 39 @ 39 : 52 -> CHANGE 28 : 29 @ 41 : 42 +> CHANGE 28 : 29 @ 28 : 29 ~ return EntityRenderer.this.mc.currentScreen.getClass().getName(); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ return HString.format("Scaled: (%d, %d). Absolute: (%d, %d)", -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ return HString.format("Scaled: (%d, %d). Absolute: (%d, %d). Scale factor of %d", -> DELETE 16 @ 16 : 18 +> DELETE 15 @ 15 : 17 -> CHANGE 32 : 33 @ 34 : 35 +> CHANGE 32 : 33 @ 32 : 33 ~ EaglercraftGPU.glLineWidth(1.0F); -> INSERT 26 : 33 @ 26 +> INSERT 25 : 32 @ 25 + + boolean fxaa = (this.mc.gameSettings.fxaa == 0 && this.mc.gameSettings.fancyGraphics) @@ -157,76 +157,76 @@ + } + -> INSERT 23 : 27 @ 16 +> INSERT 16 : 20 @ 16 + if (fxaa) { + EffectPipelineFXAA.end(); + } + -> CHANGE 33 : 35 @ 29 : 31 +> CHANGE 29 : 31 @ 29 : 31 ~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true), ~ (float) this.mc.displayWidth / (float) this.mc.displayHeight, 0.05F, this.farPlaneDistance * 4.0F); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 4 : 5 @ 4 : 5 ~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true), -> INSERT 28 : 29 @ 28 +> INSERT 27 : 28 @ 27 + GlStateManager.disableBlend(); -> DELETE 7 @ 6 : 7 +> DELETE 6 @ 6 : 7 -> INSERT 1 : 2 @ 2 +> INSERT 1 : 2 @ 1 + GlStateManager.shadeModel(7424); -> CHANGE 92 : 93 @ 91 : 92 +> CHANGE 91 : 92 @ 91 : 92 ~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true), -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ GlStateManager.gluPerspective(this.getFOVModifier(partialTicks, true), -> CHANGE 88 : 89 @ 88 : 89 +> CHANGE 87 : 88 @ 87 : 88 ~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F); -> CHANGE 48 : 49 @ 48 : 49 +> CHANGE 47 : 48 @ 47 : 48 ~ if (f2 >= 0.15F) { -> CHANGE 237 : 238 @ 237 : 238 +> CHANGE 236 : 237 @ 236 : 237 ~ GlStateManager.clearColor(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F); -> CHANGE 10 : 13 @ 10 : 12 +> CHANGE 9 : 12 @ 9 : 11 ~ EaglercraftGPU.glFog(GL_FOG_COLOR, ~ this.setFogColorBuffer(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F)); ~ EaglercraftGPU.glNormal3f(0.0F, -1.0F, 0.0F); -> CHANGE 20 : 21 @ 19 : 23 +> CHANGE 17 : 18 @ 17 : 21 ~ EaglercraftGPU.glFogi('\u855a', '\u855b'); -> INSERT 15 : 18 @ 18 +> INSERT 14 : 17 @ 14 + } else if (!this.mc.gameSettings.fog) { + GlStateManager.setFog(2048); + GlStateManager.setFogDensity(0.0F); -> INSERT 4 : 5 @ 1 +> INSERT 1 : 2 @ 1 + GlStateManager.setFogDensity(0.001F); -> CHANGE 11 : 12 @ 10 : 13 +> CHANGE 10 : 11 @ 10 : 13 ~ EaglercraftGPU.glFogi('\u855a', '\u855b'); -> DELETE 10 @ 12 : 13 +> DELETE 9 @ 9 : 10 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java index 51c4946..0d6106e 100644 --- a/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.edit.java @@ -11,34 +11,34 @@ ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer; ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer; -> CHANGE 4 : 6 @ 7 : 16 +> CHANGE 1 : 3 @ 1 : 10 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; -> CHANGE 3 : 6 @ 10 : 15 +> CHANGE 1 : 4 @ 1 : 6 ~ public class GLAllocation { ~ public static int generateDisplayLists() { ~ return EaglercraftGPU.glGenLists(); -> CHANGE 5 : 7 @ 7 : 9 +> CHANGE 2 : 4 @ 2 : 4 ~ public static void deleteDisplayLists(int list) { ~ EaglercraftGPU.glDeleteLists(list); -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ public static ByteBuffer createDirectByteBuffer(int capacity) { ~ return EagRuntime.allocateByteBuffer(capacity); -> DELETE 4 @ 4 : 8 +> DELETE 2 @ 2 : 6 -> CHANGE 1 : 2 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ return EagRuntime.allocateIntBuffer(capacity); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ return EagRuntime.allocateFloatBuffer(capacity); diff --git a/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java b/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java index cebb853..660d60f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/IImageBuffer.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ ImageData parseUserSkin(ImageData var1); diff --git a/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java b/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java index 7138bf8..e8cea4f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/ImageBufferDownload.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> CHANGE 7 : 8 @ 11 : 12 +> CHANGE 6 : 7 @ 6 : 7 ~ public ImageData parseUserSkin(ImageData bufferedimage) { -> CHANGE 6 : 22 @ 6 : 22 +> CHANGE 5 : 21 @ 5 : 21 ~ ImageData bufferedimage1 = new ImageData(this.imageWidth, this.imageHeight, true); ~ bufferedimage1.copyPixelsFrom(bufferedimage, 0, 0, bufferedimage.width, bufferedimage.height, 0, 0, @@ -32,7 +32,7 @@ ~ bufferedimage1.drawLayer(bufferedimage, 44, 52, 40, 64, 40, 20, 44, 32); ~ bufferedimage1.drawLayer(bufferedimage, 48, 52, 44, 64, 52, 20, 56, 32); -> CHANGE 18 : 19 @ 18 : 20 +> CHANGE 2 : 3 @ 2 : 4 ~ this.imageData = bufferedimage1.pixels; diff --git a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java index b011127..043d001 100644 --- a/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.edit.java @@ -10,9 +10,9 @@ + + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> INSERT 44 : 45 @ 45 +> INSERT 44 : 45 @ 44 + GlStateManager.enableAlpha(); diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java b/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java index 1ffabc9..a0c3e2f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/ItemModelMesher.edit.java @@ -7,22 +7,22 @@ > DELETE 2 @ 2 : 3 -> CHANGE 2 : 6 @ 3 : 5 +> CHANGE 2 : 6 @ 2 : 4 ~ ~ import com.google.common.collect.Maps; ~ ~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> CHANGE 20 : 21 @ 18 : 19 +> CHANGE 16 : 17 @ 16 : 17 ~ public EaglerTextureAtlasSprite getParticleIcon(Item item) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public EaglerTextureAtlasSprite getParticleIcon(Item item, int meta) { -> CHANGE 50 : 51 @ 50 : 51 +> CHANGE 49 : 50 @ 49 : 50 ~ this.simpleShapesCache.put((Integer) entry.getKey(), diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java index 3149912..cb85d67 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.edit.java @@ -13,33 +13,33 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 11 @ 6 : 11 +> DELETE 6 @ 6 : 11 -> DELETE 5 @ 10 : 11 +> DELETE 5 @ 5 : 6 -> DELETE 12 @ 13 : 14 +> DELETE 12 @ 12 : 13 -> CHANGE 26 : 29 @ 27 : 30 +> CHANGE 26 : 29 @ 26 : 29 ~ // if (this.isBlockTranslucent(block)) { //TODO: figure out why this code exists, it breaks slime blocks ~ // GlStateManager.depthMask(false); ~ // } -> CHANGE 6 : 9 @ 6 : 9 +> CHANGE 3 : 6 @ 3 : 6 ~ // if (this.isBlockTranslucent(block)) { ~ // GlStateManager.depthMask(true); ~ // } -> CHANGE 104 : 105 @ 104 : 105 +> CHANGE 101 : 102 @ 101 : 102 ~ EaglercraftGPU.glNormal3f(0.0F, 0.0F, -1.0F); -> CHANGE 195 : 196 @ 195 : 196 +> CHANGE 194 : 195 @ 194 : 195 ~ private void func_178108_a(float parFloat1, EaglerTextureAtlasSprite parTextureAtlasSprite) { -> CHANGE 66 : 67 @ 66 : 67 +> CHANGE 65 : 66 @ 65 : 66 ~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks() diff --git a/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java b/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java index 33a471f..04b2809 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/RegionRenderCache.edit.java @@ -9,11 +9,11 @@ + -> CHANGE 11 : 12 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ private final IBlockState DEFAULT_STATE = Blocks.air.getDefaultState(); -> INSERT 42 : 56 @ 42 +> INSERT 41 : 55 @ 41 + /** + * only use with a regular "net.minecraft.util.BlockPos"! @@ -30,7 +30,7 @@ + } + -> INSERT 24 : 37 @ 10 +> INSERT 10 : 23 @ 10 + /** + * only use with a regular "net.minecraft.util.BlockPos"! @@ -46,7 +46,7 @@ + } + -> INSERT 19 : 29 @ 6 +> INSERT 6 : 16 @ 6 + + /** diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java index c468d59..2faf18d 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 7 -> CHANGE 6 : 8 @ 11 : 12 +> CHANGE 6 : 8 @ 6 : 7 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.HString; -> INSERT 4 : 18 @ 3 +> INSERT 2 : 16 @ 2 + + import com.google.common.collect.Lists; @@ -29,52 +29,52 @@ + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; + import net.lax1dude.eaglercraft.v1_8.vector.Vector4f; -> DELETE 26 @ 12 : 25 +> DELETE 12 @ 12 : 25 -> DELETE 4 @ 17 : 18 +> DELETE 4 @ 4 : 5 -> DELETE 6 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 4 @ 5 : 8 +> DELETE 4 @ 4 : 7 -> DELETE 2 @ 5 : 8 +> DELETE 2 @ 2 : 5 -> DELETE 29 @ 32 : 37 +> DELETE 29 @ 29 : 34 -> DELETE 20 @ 25 : 29 +> DELETE 20 @ 20 : 24 -> CHANGE 3 : 4 @ 7 : 10 +> CHANGE 3 : 4 @ 3 : 6 ~ private final EaglerTextureAtlasSprite[] destroyBlockIcons = new EaglerTextureAtlasSprite[10]; -> CHANGE 12 : 13 @ 14 : 15 +> CHANGE 11 : 12 @ 11 : 12 ~ private final ChunkUpdateManager renderDispatcher = new ChunkUpdateManager(); -> CHANGE 23 : 25 @ 23 : 25 +> CHANGE 22 : 24 @ 22 : 24 ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); -> CHANGE 4 : 7 @ 4 : 16 +> CHANGE 2 : 5 @ 2 : 14 ~ this.vboEnabled = false; ~ this.renderContainer = new RenderList(); ~ this.renderChunkFactory = new ListChunkFactory(); -> DELETE 22 @ 31 : 35 +> DELETE 19 @ 19 : 23 -> DELETE 1 @ 5 : 26 +> DELETE 1 @ 1 : 22 -> DELETE 3 @ 24 : 30 +> DELETE 3 @ 3 : 9 -> CHANGE 4 : 5 @ 10 : 12 +> CHANGE 4 : 5 @ 4 : 6 ~ return false; -> DELETE 6 @ 7 : 10 +> DELETE 5 @ 5 : 8 -> CHANGE 6 : 11 @ 9 : 22 +> CHANGE 6 : 11 @ 6 : 19 ~ this.glSkyList2 = GLAllocation.generateDisplayLists(); ~ EaglercraftGPU.glNewList(this.glSkyList2, GL_COMPILE); @@ -82,9 +82,9 @@ ~ tessellator.draw(); ~ EaglercraftGPU.glEndList(); -> DELETE 11 @ 19 : 22 +> DELETE 6 @ 6 : 9 -> CHANGE 6 : 11 @ 9 : 22 +> CHANGE 6 : 11 @ 6 : 19 ~ this.glSkyList = GLAllocation.generateDisplayLists(); ~ EaglercraftGPU.glNewList(this.glSkyList, GL_COMPILE); @@ -92,9 +92,9 @@ ~ tessellator.draw(); ~ EaglercraftGPU.glEndList(); -> DELETE 34 @ 42 : 45 +> DELETE 29 @ 29 : 32 -> CHANGE 6 : 13 @ 9 : 24 +> CHANGE 6 : 13 @ 6 : 21 ~ this.starGLCallList = GLAllocation.generateDisplayLists(); ~ GlStateManager.pushMatrix(); @@ -104,42 +104,42 @@ ~ EaglercraftGPU.glEndList(); ~ GlStateManager.popMatrix(); -> CHANGE 11 : 12 @ 19 : 20 +> CHANGE 4 : 5 @ 4 : 5 ~ EaglercraftRandom random = new EaglercraftRandom(10842L); -> DELETE 71 @ 71 : 80 +> DELETE 70 @ 70 : 79 -> DELETE 1 @ 10 : 16 +> DELETE 1 @ 1 : 7 -> DELETE 28 @ 34 : 38 +> DELETE 28 @ 28 : 32 -> DELETE 1 @ 5 : 6 +> DELETE 1 @ 1 : 2 -> DELETE 41 @ 42 : 79 - -> CHANGE 53 : 54 @ 90 : 91 - -~ for (TileEntity tileentity2 : (List) list1) { +> DELETE 41 @ 41 : 78 > CHANGE 53 : 54 @ 53 : 54 +~ for (TileEntity tileentity2 : (List) list1) { + +> CHANGE 52 : 53 @ 52 : 53 + ~ return HString.format("C: %d/%d %sD: %d, %s", -> DELETE 116 @ 116 : 117 +> DELETE 115 @ 115 : 116 -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ if ((!flag1 || !renderglobal$containerlocalrenderinformation1.setFacing // TODO: -> DELETE 23 @ 23 : 24 +> DELETE 22 @ 22 : 23 -> CHANGE 7 : 9 @ 8 : 9 +> CHANGE 7 : 9 @ 7 : 8 ~ if (this.mc.gameSettings.chunkFix ? this.isPositionInRenderChunkHack(blockpos1, renderchunk4) ~ : this.isPositionInRenderChunk(blockpos, renderchunk4)) { -> INSERT 23 : 33 @ 22 +> INSERT 21 : 31 @ 21 + /** + * WARNING: use only in the above "build near" logic @@ -152,49 +152,49 @@ + } + -> INSERT 39 : 40 @ 29 +> INSERT 29 : 30 @ 29 + ((ClippingHelperImpl) this.debugFixedClippingHelper).destroy(); -> DELETE 95 @ 94 : 104 +> DELETE 94 @ 94 : 104 -> DELETE 1 @ 11 : 31 +> DELETE 1 @ 1 : 21 -> CHANGE 93 : 94 @ 113 : 123 +> CHANGE 93 : 94 @ 93 : 103 ~ GlStateManager.callList(this.glSkyList); -> CHANGE 39 : 40 @ 48 : 49 +> CHANGE 38 : 39 @ 38 : 39 ~ .pos((double) (f12 * 120.0F), (double) (f13 * 120.0F), (double) (f13 * 40.0F * afloat[3])) -> CHANGE 43 : 44 @ 43 : 53 +> CHANGE 42 : 43 @ 42 : 52 ~ GlStateManager.callList(this.starGLCallList); -> CHANGE 14 : 15 @ 23 : 33 +> CHANGE 13 : 14 @ 13 : 23 ~ GlStateManager.callList(this.glSkyList2); -> CHANGE 373 : 374 @ 382 : 383 +> CHANGE 372 : 373 @ 372 : 373 ~ this.displayListEntitiesDirty |= this.renderDispatcher.updateChunks(finishTimeNano); -> DELETE 18 @ 18 : 19 +> DELETE 17 @ 17 : 18 -> CHANGE 175 : 176 @ 176 : 177 +> CHANGE 175 : 176 @ 175 : 176 ~ EaglerTextureAtlasSprite textureatlassprite = this.destroyBlockIcons[i]; -> CHANGE 22 : 23 @ 22 : 23 +> CHANGE 21 : 22 @ 21 : 22 ~ EaglercraftGPU.glLineWidth(2.0F); -> CHANGE 241 : 242 @ 241 : 242 +> CHANGE 240 : 241 @ 240 : 241 ~ EaglercraftRandom random = this.theWorld.rand; -> INSERT 230 : 247 @ 230 +> INSERT 229 : 246 @ 229 + + public String getDebugInfoShort() { diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java index 8ea9f0b..1633db4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/RenderHelper.edit.java @@ -11,19 +11,19 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 4 : 5 +> DELETE 1 @ 1 : 2 -> CHANGE 8 : 10 @ 9 : 11 +> CHANGE 8 : 10 @ 8 : 10 ~ GlStateManager.disableMCLight(0); ~ GlStateManager.disableMCLight(1); -> CHANGE 7 : 10 @ 7 : 9 +> CHANGE 5 : 8 @ 5 : 7 ~ GlStateManager.enableMCLight(0, 0.6f, LIGHT0_POS.xCoord, LIGHT0_POS.yCoord, LIGHT0_POS.zCoord, 0.0D); ~ GlStateManager.enableMCLight(1, 0.6f, LIGHT1_POS.xCoord, LIGHT1_POS.yCoord, LIGHT1_POS.zCoord, 0.0D); ~ GlStateManager.setMCLightAmbient(0.4f, 0.4f, 0.4f); -> DELETE 4 @ 3 : 17 +> DELETE 1 @ 1 : 15 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java b/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java index 1fa7d64..e69bfcf 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/RenderList.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> CHANGE 8 : 9 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ EaglercraftGPU.glCallList( diff --git a/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java b/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java index 9adbfa1..412dbf0 100644 --- a/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/Tessellator.edit.java @@ -11,7 +11,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldVertexBufferUploader; -> INSERT 7 : 16 @ 6 +> INSERT 4 : 13 @ 4 + + public static final int GL_TRIANGLES = RealOpenGLEnums.GL_TRIANGLES; diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java index 30e46c4..1209cf9 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.edit.java @@ -11,36 +11,36 @@ ~ import org.json.JSONException; ~ import org.json.JSONObject; -> INSERT 4 : 6 @ 9 +> INSERT 1 : 3 @ 1 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; + -> CHANGE 44 : 46 @ 42 : 46 +> CHANGE 42 : 44 @ 42 : 46 ~ public static class Deserializer implements JSONTypeDeserializer { ~ public BlockFaceUV deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 7 : 9 @ 9 : 11 +> CHANGE 5 : 7 @ 5 : 7 ~ protected int parseRotation(JSONObject parJsonObject) { ~ int i = parJsonObject.optInt("rotation", 0); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 3 : 4 @ 3 : 4 ~ throw new JSONException("Invalid rotation " + i + " found, only 0/90/180/270 allowed"); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ private float[] parseUV(JSONObject parJsonObject) { -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 3 : 6 @ 3 : 6 ~ JSONArray jsonarray = parJsonObject.getJSONArray("uv"); ~ if (jsonarray.length() != 4) { ~ throw new JSONException("Expected 4 uv values, found: " + jsonarray.length()); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 4 : 5 @ 4 : 5 ~ afloat[i] = jsonarray.getFloat(i); diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java index 8e2f393..ff27219 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 10 -> CHANGE 3 : 13 @ 11 : 13 +> CHANGE 3 : 13 @ 3 : 5 ~ ~ import org.json.JSONArray; @@ -20,107 +20,107 @@ ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; ~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; -> DELETE 11 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 50 : 52 @ 51 : 55 +> CHANGE 50 : 52 @ 50 : 54 ~ public static class Deserializer implements JSONTypeDeserializer { ~ public BlockPart deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 5 : 8 @ 7 : 10 +> CHANGE 3 : 6 @ 3 : 6 ~ Map map = this.parseFacesCheck(jsonobject); ~ if (jsonobject.has("shade") && !(jsonobject.get("shade") instanceof Boolean)) { ~ throw new JSONException("Expected shade to be a Boolean"); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 1 : 2 @ 1 : 2 ~ boolean flag = jsonobject.optBoolean("shade", true); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ private BlockPartRotation parseRotation(JSONObject parJsonObject) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ JSONObject jsonobject = parJsonObject.getJSONObject("rotation"); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ boolean flag = jsonobject.optBoolean("rescale", false); -> CHANGE 7 : 9 @ 7 : 9 +> CHANGE 6 : 8 @ 6 : 8 ~ private float parseAngle(JSONObject parJsonObject) { ~ float f = parJsonObject.getFloat("angle"); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ throw new JSONException("Invalid rotation " + f + " found, only -45/-22.5/0/22.5/45 allowed"); -> CHANGE 6 : 8 @ 6 : 8 +> CHANGE 5 : 7 @ 5 : 7 ~ private EnumFacing.Axis parseAxis(JSONObject parJsonObject) { ~ String s = parJsonObject.getString("axis"); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ throw new JSONException("Invalid rotation axis: " + s); -> CHANGE 6 : 8 @ 6 : 9 +> CHANGE 5 : 7 @ 5 : 8 ~ private Map parseFacesCheck(JSONObject parJsonObject) { ~ Map map = this.parseFaces(parJsonObject); -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 1 : 2 @ 1 : 2 ~ throw new JSONException("Expected between 1 and 6 unique faces, got 0"); -> CHANGE 6 : 7 @ 6 : 8 +> CHANGE 5 : 6 @ 5 : 7 ~ private Map parseFaces(JSONObject parJsonObject) { -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ JSONObject jsonobject = parJsonObject.getJSONObject("faces"); -> CHANGE 2 : 6 @ 2 : 6 +> CHANGE 1 : 5 @ 1 : 5 ~ for (String entry : jsonobject.keySet()) { ~ EnumFacing enumfacing = this.parseEnumFacing(entry); ~ enummap.put(enumfacing, ~ JSONTypeProvider.deserialize(jsonobject.getJSONObject(entry), BlockPartFace.class)); -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 8 : 9 @ 8 : 9 ~ throw new JSONException("Unknown facing: " + name); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ private Vector3f parsePositionTo(JSONObject parJsonObject) { -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ throw new JSONException("\'to\' specifier exceeds the allowed boundaries: " + vector3f); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ private Vector3f parsePositionFrom(JSONObject parJsonObject) { -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ throw new JSONException("\'from\' specifier exceeds the allowed boundaries: " + vector3f); -> CHANGE 4 : 8 @ 4 : 8 +> CHANGE 3 : 7 @ 3 : 7 ~ private Vector3f parsePosition(JSONObject parJsonObject, String parString1) { ~ JSONArray jsonarray = parJsonObject.getJSONArray(parString1); ~ if (jsonarray.length() != 3) { ~ throw new JSONException("Expected 3 " + parString1 + " values, found: " + jsonarray.length()); -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 4 : 5 @ 4 : 5 ~ afloat[i] = jsonarray.getFloat(i); diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java index d66f025..9175439 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.edit.java @@ -13,28 +13,28 @@ ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -> DELETE 6 @ 8 : 9 +> DELETE 1 @ 1 : 2 -> CHANGE 15 : 17 @ 16 : 20 +> CHANGE 15 : 17 @ 15 : 19 ~ public static class Deserializer implements JSONTypeDeserializer { ~ public BlockPartFace deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 5 : 6 @ 7 : 9 +> CHANGE 3 : 4 @ 3 : 5 ~ BlockFaceUV blockfaceuv = JSONTypeProvider.deserialize(jsonobject, BlockFaceUV.class); -> CHANGE 4 : 6 @ 5 : 7 +> CHANGE 3 : 5 @ 3 : 5 ~ protected int parseTintIndex(JSONObject parJsonObject) { ~ return parJsonObject.optInt("tintindex", -1); -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ private String parseTexture(JSONObject parJsonObject) { ~ return parJsonObject.getString("texture"); -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ private EnumFacing parseCullFace(JSONObject parJsonObject) { ~ String s = parJsonObject.optString("cullface", ""); diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java index 1ae6df6..3d107f2 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java index e5e83e7..ed66bdf 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.edit.java @@ -7,16 +7,16 @@ > DELETE 3 @ 3 : 6 -> INSERT 1 : 3 @ 4 +> INSERT 1 : 3 @ 1 + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; + -> CHANGE 3 : 4 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ private final EaglerTextureAtlasSprite texture; -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ public BreakingFour(BakedQuad parBakedQuad, EaglerTextureAtlasSprite textureIn) { diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java index bab815f..8b98f45 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.edit.java @@ -12,34 +12,34 @@ + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; + import net.lax1dude.eaglercraft.v1_8.vector.Vector4f; -> DELETE 5 @ 1 : 6 +> DELETE 1 @ 1 : 6 -> DELETE 4 @ 9 : 12 +> DELETE 4 @ 4 : 7 -> CHANGE 5 : 8 @ 8 : 11 +> CHANGE 5 : 8 @ 5 : 8 ~ public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, ~ EaglerTextureAtlasSprite sprite, EnumFacing facing, ModelRotation modelRotationIn, ~ BlockPartRotation partRotation, boolean uvLocked, boolean shade) { -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 14 : 15 @ 14 : 15 ~ private int[] makeQuadVertexData(BlockPartFace partFace, EaglerTextureAtlasSprite sprite, EnumFacing facing, -> CHANGE 48 : 50 @ 48 : 50 +> CHANGE 47 : 49 @ 47 : 49 ~ float[] sprite, EaglerTextureAtlasSprite modelRotationIn, ModelRotation partRotation, ~ BlockPartRotation uvLocked, boolean shade, boolean parFlag2) { -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 13 : 14 @ 13 : 14 ~ EaglerTextureAtlasSprite sprite, BlockFaceUV faceUV) { -> CHANGE 114 : 115 @ 114 : 115 +> CHANGE 113 : 114 @ 113 : 114 ~ EaglerTextureAtlasSprite parTextureAtlasSprite) { -> CHANGE 77 : 78 @ 77 : 78 +> CHANGE 76 : 77 @ 76 : 77 ~ EaglerTextureAtlasSprite parTextureAtlasSprite) { diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java index 1eb2e73..f236921 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.edit.java @@ -10,14 +10,14 @@ ~ import org.json.JSONException; ~ import org.json.JSONObject; -> INSERT 3 : 7 @ 9 +> INSERT 1 : 5 @ 1 + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + -> CHANGE 85 : 93 @ 81 : 97 +> CHANGE 81 : 89 @ 81 : 97 ~ public static class Deserializer implements JSONTypeDeserializer { ~ public ItemCameraTransforms deserialize(JSONObject jsonobject) throws JSONException { @@ -28,11 +28,11 @@ ~ ItemTransformVec3f itemtransformvec3f4 = this.func_181683_a(jsonobject, "ground"); ~ ItemTransformVec3f itemtransformvec3f5 = this.func_181683_a(jsonobject, "fixed"); -> CHANGE 12 : 13 @ 20 : 22 +> CHANGE 4 : 5 @ 4 : 6 ~ private ItemTransformVec3f func_181683_a(JSONObject parJsonObject, String parString1) { -> CHANGE 2 : 3 @ 3 : 5 +> CHANGE 1 : 2 @ 1 : 3 ~ ? JSONTypeProvider.deserialize(parJsonObject.get(parString1), ItemTransformVec3f.class) diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java index f40be89..272a769 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 3 : 9 @ 5 : 11 +> CHANGE 3 : 9 @ 3 : 9 ~ ~ import com.google.common.collect.Lists; @@ -16,24 +16,24 @@ ~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; ~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; -> DELETE 9 @ 9 : 10 +> DELETE 3 @ 3 : 4 -> CHANGE 17 : 19 @ 18 : 19 +> CHANGE 17 : 19 @ 17 : 18 ~ EaglerTextureAtlasSprite textureatlassprite = textureMapIn ~ .getAtlasSprite((new ResourceLocation(s1)).toString()); -> CHANGE 14 : 16 @ 13 : 14 +> CHANGE 12 : 14 @ 12 : 13 ~ private List func_178394_a(int parInt1, String parString1, ~ EaglerTextureAtlasSprite parTextureAtlasSprite) { -> CHANGE 14 : 16 @ 13 : 14 +> CHANGE 12 : 14 @ 12 : 13 ~ private List func_178397_a(EaglerTextureAtlasSprite parTextureAtlasSprite, String parString1, ~ int parInt1) { -> CHANGE 104 : 105 @ 103 : 104 +> CHANGE 102 : 103 @ 102 : 103 ~ private List func_178393_a(EaglerTextureAtlasSprite parTextureAtlasSprite) { diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java index c20dd02..aa589c6 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.edit.java @@ -14,27 +14,27 @@ ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; ~ import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; -> DELETE 7 @ 9 : 10 +> DELETE 1 @ 1 : 2 -> CHANGE 34 : 35 @ 35 : 36 +> CHANGE 34 : 35 @ 34 : 35 ~ public static class Deserializer implements JSONTypeDeserializer { -> CHANGE 5 : 6 @ 5 : 8 +> CHANGE 4 : 5 @ 4 : 7 ~ public ItemTransformVec3f deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 14 : 15 @ 16 : 17 +> CHANGE 13 : 14 @ 13 : 14 ~ private Vector3f parseVector3f(JSONObject jsonObject, String key, Vector3f defaultValue) { -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 3 : 6 @ 3 : 6 ~ JSONArray jsonarray = jsonObject.getJSONArray(key); ~ if (jsonarray.length() != 3) { ~ throw new JSONException("Expected 3 " + key + " values, found: " + jsonarray.length()); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 4 : 5 @ 4 : 5 ~ afloat[i] = jsonarray.getFloat(i); diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java index f850efc..a294920 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.edit.java @@ -7,16 +7,16 @@ > DELETE 2 @ 2 : 11 -> CHANGE 9 : 10 @ 18 : 25 +> CHANGE 9 : 10 @ 9 : 16 ~ -> CHANGE 2 : 4 @ 8 : 10 +> CHANGE 1 : 3 @ 1 : 3 ~ import org.json.JSONException; ~ import org.json.JSONObject; -> INSERT 3 : 12 @ 3 +> INSERT 1 : 10 @ 1 + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; @@ -28,69 +28,69 @@ + import net.minecraft.util.ResourceLocation; + -> CHANGE 11 : 12 @ 2 : 9 +> CHANGE 2 : 3 @ 2 : 9 ~ -> DELETE 10 @ 16 : 20 +> DELETE 9 @ 9 : 13 -> CHANGE 1 : 2 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ return (ModelBlock) JSONTypeProvider.deserialize(new JSONObject(parString1), ModelBlock.class); -> CHANGE 125 : 128 @ 125 : 126 +> CHANGE 124 : 127 @ 124 : 125 ~ } catch (ModelBlock.LoopException var5) { ~ throw var5; ~ } catch (Throwable var6) { -> CHANGE 18 : 21 @ 16 : 21 +> CHANGE 15 : 18 @ 15 : 20 ~ public static class Deserializer implements JSONTypeDeserializer { ~ public ModelBlock deserialize(JSONObject jsonobject) throws JSONException { ~ List list = this.getModelElements(jsonobject); -> CHANGE 7 : 8 @ 9 : 10 +> CHANGE 4 : 5 @ 4 : 5 ~ throw new JSONException("BlockModel requires either elements or parent, found neither"); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ throw new JSONException("BlockModel requires either elements or parent, found both"); -> CHANGE 6 : 8 @ 6 : 9 +> CHANGE 5 : 7 @ 5 : 8 ~ JSONObject jsonobject1 = jsonobject.getJSONObject("display"); ~ itemcameratransforms = JSONTypeProvider.deserialize(jsonobject1, ItemCameraTransforms.class); -> CHANGE 9 : 10 @ 10 : 11 +> CHANGE 7 : 8 @ 7 : 8 ~ private Map getTextures(JSONObject parJsonObject) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ JSONObject jsonobject = parJsonObject.getJSONObject("textures"); -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 1 : 3 @ 1 : 3 ~ for (String entry : jsonobject.keySet()) { ~ hashmap.put(entry, jsonobject.getString(entry)); -> CHANGE 8 : 10 @ 8 : 10 +> CHANGE 6 : 8 @ 6 : 8 ~ private String getParent(JSONObject parJsonObject) { ~ return parJsonObject.optString("parent", ""); -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ protected boolean getAmbientOcclusionEnabled(JSONObject parJsonObject) { ~ return parJsonObject.optBoolean("ambientocclusion", true); -> CHANGE 4 : 5 @ 4 : 6 +> CHANGE 2 : 3 @ 2 : 4 ~ protected List getModelElements(JSONObject parJsonObject) { -> CHANGE 3 : 5 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ for (Object jsonelement : parJsonObject.getJSONArray("elements")) { ~ arraylist.add((BlockPart) JSONTypeProvider.deserialize(jsonelement, BlockPart.class)); diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java index 6c06e67..909e2e5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 11 -> INSERT 7 : 17 @ 16 +> INSERT 7 : 17 @ 7 + + import org.json.JSONArray; @@ -20,73 +20,73 @@ + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -> DELETE 11 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> CHANGE 3 : 4 @ 4 : 8 +> CHANGE 3 : 4 @ 3 : 7 ~ -> CHANGE 4 : 5 @ 7 : 8 +> CHANGE 3 : 4 @ 3 : 4 ~ return (ModelBlockDefinition) JSONTypeProvider.deserialize(parReader, ModelBlockDefinition.class); -> CHANGE 42 : 46 @ 42 : 48 +> CHANGE 41 : 45 @ 41 : 47 ~ public static class Deserializer implements JSONTypeDeserializer { ~ public ModelBlockDefinition deserialize(JSONObject jsonobject) throws JSONException { ~ List list = this.parseVariantsList(jsonobject); ~ return new ModelBlockDefinition((Collection) list); -> CHANGE 6 : 8 @ 8 : 11 +> CHANGE 2 : 4 @ 2 : 5 ~ protected List parseVariantsList(JSONObject parJsonObject) { ~ JSONObject jsonobject = parJsonObject.getJSONObject("variants"); -> CHANGE 4 : 6 @ 5 : 7 +> CHANGE 2 : 4 @ 2 : 4 ~ for (String entry : jsonobject.keySet()) { ~ arraylist.add(this.parseVariants(entry, jsonobject.get(entry))); -> CHANGE 7 : 8 @ 7 : 10 +> CHANGE 5 : 6 @ 5 : 8 ~ protected ModelBlockDefinition.Variants parseVariants(String s, Object jsonelement) { -> CHANGE 2 : 5 @ 4 : 9 +> CHANGE 1 : 4 @ 1 : 6 ~ if (jsonelement instanceof JSONArray) { ~ for (Object jsonelement1 : (JSONArray) jsonelement) { ~ arraylist.add(JSONTypeProvider.deserialize(jsonelement1, ModelBlockDefinition.Variant.class)); -> CHANGE 5 : 6 @ 7 : 9 +> CHANGE 2 : 3 @ 2 : 4 ~ arraylist.add(JSONTypeProvider.deserialize(jsonelement, ModelBlockDefinition.Variant.class)); -> CHANGE 60 : 62 @ 61 : 65 +> CHANGE 59 : 61 @ 59 : 63 ~ public static class Deserializer implements JSONTypeDeserializer { ~ public ModelBlockDefinition.Variant deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 16 : 18 @ 18 : 20 +> CHANGE 14 : 16 @ 14 : 16 ~ private boolean parseUvLock(JSONObject parJsonObject) { ~ return parJsonObject.optBoolean("uvlock", false); -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 2 : 5 @ 2 : 5 ~ protected ModelRotation parseRotation(JSONObject parJsonObject) { ~ int i = parJsonObject.optInt("x", 0); ~ int j = parJsonObject.optInt("y", 0); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 2 : 3 @ 2 : 3 ~ throw new JSONException("Invalid BlockModelRotation x: " + i + ", y: " + j); -> CHANGE 6 : 8 @ 6 : 8 +> CHANGE 5 : 7 @ 5 : 7 ~ protected String parseModel(JSONObject parJsonObject) { ~ return parJsonObject.getString("model"); -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ protected int parseWeight(JSONObject parJsonObject) { ~ return parJsonObject.optInt("weight", 1); diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java index 1a3fb7f..6ae6c78 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> INSERT 4 : 9 @ 7 +> INSERT 4 : 9 @ 4 + + import com.google.common.base.Objects; @@ -15,6 +15,6 @@ + import com.google.common.collect.Sets; + -> DELETE 7 @ 2 : 4 +> DELETE 2 @ 2 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java index 3c921b9..bf93486 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.edit.java @@ -7,20 +7,20 @@ > DELETE 2 @ 2 : 4 -> INSERT 3 : 7 @ 5 +> INSERT 3 : 7 @ 3 + + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; + -> DELETE 7 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> CHANGE 15 : 16 @ 16 : 17 +> CHANGE 15 : 16 @ 15 : 16 ~ LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(iblockstate.getProperties()); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ s = this.name.getName(linkedhashmap.remove(this.name)); diff --git a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java index 1ded474..285f5db 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Maps; + -> DELETE 6 @ 3 : 4 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java index 93ae523..9abb1f4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.edit.java @@ -7,57 +7,57 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ ~ import com.google.common.collect.Lists; ~ -> CHANGE 4 : 5 @ 2 : 4 +> CHANGE 1 : 2 @ 1 : 3 ~ import net.minecraft.util.EnumWorldBlockLayer; -> DELETE 4 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> INSERT 6 : 8 @ 7 +> INSERT 6 : 8 @ 6 + public long goddamnFuckingTimeout = 0l; + public long time = 0; -> CHANGE 33 : 34 @ 31 : 39 +> CHANGE 31 : 32 @ 31 : 39 ~ this.status = statusIn; -> CHANGE 4 : 8 @ 11 : 12 +> CHANGE 3 : 7 @ 3 : 4 ~ if (this.type == ChunkCompileTaskGenerator.Type.REBUILD_CHUNK ~ && this.status != ChunkCompileTaskGenerator.Status.DONE) { ~ this.renderChunk.setNeedsUpdate(true); ~ } -> CHANGE 5 : 7 @ 2 : 7 +> CHANGE 1 : 3 @ 1 : 6 ~ this.finished = true; ~ this.status = ChunkCompileTaskGenerator.Status.DONE; -> CHANGE 3 : 5 @ 6 : 14 +> CHANGE 1 : 3 @ 1 : 9 ~ for (Runnable runnable : this.listFinishRunnables) { ~ runnable.run(); -> DELETE 3 @ 9 : 10 +> DELETE 1 @ 1 : 2 -> CHANGE 3 : 6 @ 4 : 13 +> CHANGE 3 : 6 @ 3 : 12 ~ this.listFinishRunnables.add(parRunnable); ~ if (this.finished) { ~ parRunnable.run(); -> DELETE 4 @ 10 : 11 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 7 +> DELETE 2 @ 2 : 6 -> INSERT 8 : 16 @ 12 +> INSERT 8 : 16 @ 8 + public boolean canExecuteYet() { + if (this.type == ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY) { diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java index 7f3daa6..a296d17 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.edit.java @@ -11,94 +11,94 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.minecraft.ChunkUpdateManager; -> DELETE 5 @ 9 : 13 +> DELETE 2 @ 2 : 6 -> DELETE 2 @ 6 : 8 +> DELETE 2 @ 2 : 4 -> CHANGE 1 : 2 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ public class ChunkRenderWorker { -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ private final ChunkUpdateManager chunkRenderDispatcher; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ public ChunkRenderWorker(ChunkUpdateManager parChunkRenderDispatcher) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public ChunkRenderWorker(ChunkUpdateManager chunkRenderDispatcherIn, -> DELETE 6 @ 6 : 22 +> DELETE 5 @ 5 : 21 -> CHANGE 1 : 5 @ 17 : 27 +> CHANGE 1 : 5 @ 1 : 11 ~ if (generator.getStatus() != ChunkCompileTaskGenerator.Status.PENDING) { ~ if (!generator.isFinished()) { ~ LOGGER.warn("Chunk render task was " + generator.getStatus() ~ + " when I expected it to be pending; ignoring task"); -> CHANGE 6 : 7 @ 12 : 15 +> CHANGE 2 : 3 @ 2 : 5 ~ return; -> INSERT 3 : 5 @ 5 +> INSERT 2 : 4 @ 2 + generator.setStatus(ChunkCompileTaskGenerator.Status.COMPILING); + -> CHANGE 17 : 21 @ 15 : 26 +> CHANGE 15 : 19 @ 15 : 26 ~ if (generator.getStatus() != ChunkCompileTaskGenerator.Status.COMPILING) { ~ if (!generator.isFinished()) { ~ LOGGER.warn("Chunk render task was " + generator.getStatus() ~ + " when I expected it to be compiling; aborting task"); -> CHANGE 6 : 8 @ 13 : 16 +> CHANGE 2 : 4 @ 2 : 5 ~ this.freeRenderBuilder(generator); ~ return; -> INSERT 4 : 6 @ 5 +> INSERT 2 : 4 @ 2 + generator.setStatus(ChunkCompileTaskGenerator.Status.UPLOADING); + -> CHANGE 3 : 6 @ 1 : 2 +> CHANGE 1 : 4 @ 1 : 2 ~ if (compiledchunk == null) { ~ System.out.println(chunkcompiletaskgenerator$type); ~ } -> CHANGE 5 : 7 @ 3 : 5 +> CHANGE 2 : 4 @ 2 : 4 ~ if (!compiledchunk.isLayerEmpty(enumworldblocklayer)) { ~ this.chunkRenderDispatcher.uploadChunk(enumworldblocklayer, -> CHANGE 3 : 6 @ 3 : 4 +> CHANGE 1 : 4 @ 1 : 2 ~ generator.getRenderChunk(), compiledchunk); ~ generator.getRenderChunk().setCompiledChunk(compiledchunk); ~ generator.setStatus(ChunkCompileTaskGenerator.Status.DONE); -> CHANGE 6 : 7 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ this.chunkRenderDispatcher.uploadChunk( -> CHANGE 3 : 6 @ 3 : 4 +> CHANGE 2 : 5 @ 2 : 3 ~ generator.getRenderChunk(), compiledchunk); ~ generator.getRenderChunk().setCompiledChunk(compiledchunk); ~ generator.setStatus(ChunkCompileTaskGenerator.Status.DONE); -> DELETE 5 @ 3 : 43 +> DELETE 2 @ 2 : 42 -> CHANGE 4 : 5 @ 44 : 46 +> CHANGE 4 : 5 @ 4 : 6 ~ return this.regionRenderCacheBuilder; -> DELETE 4 @ 5 : 8 +> DELETE 3 @ 3 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java index 1ef107a..a88dcf3 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 4 +> CHANGE 1 : 5 @ 1 : 3 ~ ~ import com.google.common.collect.Lists; ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> CHANGE 19 : 20 @ 17 : 18 +> CHANGE 15 : 16 @ 15 : 16 ~ return true; diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java index 81a3954..e48a09e 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.edit.java @@ -9,30 +9,30 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; -> DELETE 3 @ 2 : 4 +> DELETE 2 @ 2 : 4 -> CHANGE 5 : 6 @ 7 : 8 +> CHANGE 5 : 6 @ 5 : 6 ~ private final int[] baseDisplayList; -> INSERT 4 : 8 @ 4 +> INSERT 3 : 7 @ 3 + this.baseDisplayList = new int[EnumWorldBlockLayer.values().length]; + for (int i = 0; i < this.baseDisplayList.length; ++i) { + this.baseDisplayList[i] = GLAllocation.generateDisplayLists(); + } -> CHANGE 7 : 8 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ return !parCompiledChunk.isLayerEmpty(layer) ? this.baseDisplayList[layer.ordinal()] : -1; -> CHANGE 5 : 8 @ 5 : 6 +> CHANGE 4 : 7 @ 4 : 5 ~ for (int i = 0; i < this.baseDisplayList.length; ++i) { ~ GLAllocation.deleteDisplayLists(this.baseDisplayList[i]); ~ } -> INSERT 4 : 14 @ 2 +> INSERT 1 : 11 @ 1 + + public void rebuildChunk(float x, float y, float z, ChunkCompileTaskGenerator generator) { diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java index f22b535..2840d98 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer; -> CHANGE 4 : 10 @ 6 : 7 +> CHANGE 3 : 9 @ 3 : 4 ~ ~ import com.google.common.collect.Maps; @@ -18,47 +18,47 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 10 @ 5 : 8 +> DELETE 4 @ 4 : 7 -> DELETE 2 @ 5 : 9 +> DELETE 2 @ 2 : 6 -> DELETE 3 @ 7 : 8 +> DELETE 3 @ 3 : 4 -> DELETE 13 @ 14 : 16 +> DELETE 13 @ 13 : 15 -> CHANGE 3 : 4 @ 5 : 7 +> CHANGE 3 : 4 @ 3 : 5 ~ private final float[] modelviewMatrix = new float[16]; -> DELETE 14 @ 15 : 21 +> DELETE 13 @ 13 : 19 -> DELETE 11 @ 17 : 21 +> DELETE 11 @ 11 : 15 -> DELETE 31 @ 35 : 36 +> DELETE 31 @ 31 : 32 -> CHANGE 2 : 4 @ 3 : 12 +> CHANGE 2 : 4 @ 2 : 11 ~ if (generator.getStatus() != ChunkCompileTaskGenerator.Status.COMPILING) { ~ return; -> INSERT 4 : 7 @ 11 +> INSERT 2 : 5 @ 2 + regionrendercache = new RegionRenderCache(this.world, blockpos.add(-1, -1, -1), blockpos1.add(1, 1, 1), 1); + generator.setCompiledChunk(compiledchunk); + -> CHANGE 10 : 12 @ 7 : 9 +> CHANGE 7 : 9 @ 7 : 9 ~ for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBox(blockpos, blockpos1)) { ~ IBlockState iblockstate = regionrendercache.getBlockStateFaster(blockpos$mutableblockpos); -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ TileEntity tileentity = regionrendercache.getTileEntity(blockpos$mutableblockpos); -> DELETE 39 @ 39 : 40 +> DELETE 38 @ 38 : 39 -> CHANGE 1 : 8 @ 2 : 13 +> CHANGE 1 : 8 @ 1 : 12 ~ HashSet hashset1 = Sets.newHashSet(hashset); ~ HashSet hashset2 = Sets.newHashSet(this.field_181056_j); @@ -68,34 +68,34 @@ ~ this.field_181056_j.addAll(hashset); ~ this.renderGlobal.func_181023_a(hashset2, hashset1); -> CHANGE 11 : 14 @ 15 : 24 +> CHANGE 4 : 7 @ 4 : 13 ~ if (this.compileTask != null && this.compileTask.getStatus() != ChunkCompileTaskGenerator.Status.DONE) { ~ this.compileTask.finish(); ~ this.compileTask = null; -> DELETE 4 @ 10 : 11 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 7 +> DELETE 2 @ 2 : 6 -> DELETE 1 @ 5 : 7 +> DELETE 1 @ 1 : 3 -> CHANGE 1 : 4 @ 3 : 11 +> CHANGE 1 : 4 @ 1 : 9 ~ this.finishCompileTask(); ~ this.compileTask = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.REBUILD_CHUNK); ~ chunkcompiletaskgenerator = this.compileTask; -> CHANGE 7 : 10 @ 12 : 35 +> CHANGE 4 : 7 @ 4 : 27 ~ this.compileTask = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY); ~ this.compileTask.setCompiledChunk(this.compiledChunk); ~ return this.compileTask; -> CHANGE 40 : 41 @ 60 : 68 +> CHANGE 37 : 38 @ 37 : 45 ~ this.compiledChunk = compiledChunkIn; -> DELETE 11 @ 18 : 25 +> DELETE 10 @ 10 : 17 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java b/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java index 97c8b7d..701f1fd 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/VisGraph.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 4 : 7 @ 5 : 6 +> CHANGE 4 : 7 @ 4 : 5 ~ ~ import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java b/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java index 434181a..343dbb4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.edit.java @@ -12,22 +12,22 @@ ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 4 @ 6 : 9 +> DELETE 4 @ 4 : 7 -> INSERT 3 : 4 @ 6 +> INSERT 3 : 4 @ 3 + instance.destroy(); -> DELETE 14 @ 13 : 18 +> DELETE 13 @ 13 : 18 -> CHANGE 2 : 4 @ 7 : 11 +> CHANGE 2 : 4 @ 2 : 6 ~ GlStateManager.getFloat(2983, afloat); ~ GlStateManager.getFloat(2982, afloat1); -> INSERT 71 : 75 @ 73 +> INSERT 69 : 73 @ 69 + + public void destroy() { diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java index 0fec1a6..93ed245 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 2 : 5 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java index 72039fe..18e7f9c 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/Render.edit.java @@ -12,24 +12,24 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 7 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 10 @ 12 : 13 +> DELETE 10 @ 10 : 11 -> CHANGE 61 : 63 @ 62 : 64 +> CHANGE 61 : 63 @ 61 : 63 ~ EaglerTextureAtlasSprite textureatlassprite = texturemap.getAtlasSprite("minecraft:blocks/fire_layer_0"); ~ EaglerTextureAtlasSprite textureatlassprite1 = texturemap.getAtlasSprite("minecraft:blocks/fire_layer_1"); -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 18 : 19 @ 18 : 19 ~ EaglerTextureAtlasSprite textureatlassprite2 = i % 2 == 0 ? textureatlassprite : textureatlassprite1; -> CHANGE 180 : 181 @ 180 : 181 +> CHANGE 179 : 180 @ 179 : 180 ~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java index 7962639..9f3ba17 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderArrow.edit.java @@ -11,19 +11,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 2 : 5 +> DELETE 1 @ 1 : 4 -> DELETE 4 @ 7 : 8 +> DELETE 4 @ 4 : 5 -> CHANGE 41 : 42 @ 42 : 43 +> CHANGE 41 : 42 @ 41 : 42 ~ EaglercraftGPU.glNormal3f(f10, 0.0F, 0.0F); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ EaglercraftGPU.glNormal3f(-f10, 0.0F, 0.0F); -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ EaglercraftGPU.glNormal3f(0.0F, 0.0F, f10); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBat.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java index 0fec1a6..93ed245 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBoat.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 2 : 5 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java index 3505ff1..aea3df4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderDragon.edit.java @@ -10,8 +10,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 3 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 6 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java index 96c68ea..7ae9caa 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 4 @ 3 : 5 +> DELETE 2 @ 2 : 4 -> CHANGE 9 : 10 @ 11 : 12 +> CHANGE 9 : 10 @ 9 : 10 ~ private EaglercraftRandom rnd = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java index ea98d30..5afffcb 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.edit.java @@ -11,13 +11,13 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 3 : 6 +> DELETE 1 @ 1 : 4 -> CHANGE 10 : 11 @ 13 : 14 +> CHANGE 10 : 11 @ 10 : 11 ~ private EaglercraftRandom field_177079_e = new EaglercraftRandom(); -> CHANGE 29 : 31 @ 29 : 31 +> CHANGE 28 : 30 @ 28 : 30 ~ float f6 = 0.0F * (float) (i - 1) * 0.5F; ~ float f4 = 0.0F * (float) (i - 1) * 0.5F; diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java index 56e761d..0e55a2d 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.edit.java @@ -10,8 +10,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 6 @ 4 : 5 +> DELETE 4 @ 4 : 5 -> DELETE 1 @ 2 : 5 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java index d751c10..2068f97 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFireball.edit.java @@ -11,11 +11,11 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> CHANGE 20 : 21 @ 24 : 25 +> CHANGE 20 : 21 @ 20 : 21 ~ EaglerTextureAtlasSprite textureatlassprite = Minecraft.getMinecraft().getRenderItem().getItemModelMesher() diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java index 6aa9145..2e4ed6d 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.edit.java @@ -10,8 +10,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 3 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 5 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGhast.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java index 5aa7279..1c337df 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.edit.java @@ -9,9 +9,9 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 2 : 5 +> DELETE 2 @ 2 : 5 -> CHANGE 15 : 17 @ 18 : 20 +> CHANGE 15 : 17 @ 15 : 17 ~ this.field_177189_c = new ModelZombie(0.5F, false); ~ this.field_177186_d = new ModelZombie(1.0F, false); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java index 2c83355..22740c4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.edit.java @@ -12,15 +12,15 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 5 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 6 @ 8 : 9 +> DELETE 6 @ 6 : 7 -> CHANGE 57 : 59 @ 58 : 60 +> CHANGE 57 : 59 @ 57 : 59 ~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 10497.0F); ~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 10497.0F); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java index 45804cf..a068ac3 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderHorse.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 5 @ 2 +> INSERT 1 : 5 @ 1 + + import com.google.common.collect.Maps; + + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 6 @ 2 : 5 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java index b38a359..b06c915 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.edit.java @@ -11,8 +11,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 24 @ 21 : 22 +> DELETE 21 @ 21 : 22 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java index bca66ba..c873a41 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.edit.java @@ -12,13 +12,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 5 @ 3 : 6 +> DELETE 1 @ 1 : 4 -> CHANGE 21 : 22 @ 24 : 25 +> CHANGE 21 : 22 @ 21 : 22 ~ EaglercraftRandom random = new EaglercraftRandom(entitylightningbolt.boltVertex); -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ EaglercraftRandom random1 = new EaglercraftRandom(entitylightningbolt.boltVertex); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java index 7bb4f24..495d3fe 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLiving.edit.java @@ -11,10 +11,10 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java index 1cc4a6c..f82ec83 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 7 @ 2 +> INSERT 1 : 7 @ 1 + + import com.google.common.collect.Maps; @@ -16,22 +16,22 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 22 @ 16 : 18 +> DELETE 16 @ 16 : 18 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 56 +> DELETE 1 @ 1 : 55 -> CHANGE 163 : 165 @ 217 : 218 +> CHANGE 163 : 165 @ 163 : 164 ~ this.skinMap.put("slim", new RenderPlayer(this, true, false)); ~ this.skinMap.put("zombie", new RenderPlayer(this, false, true)); -> CHANGE 13 : 14 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ render = this.getEntityClassRenderObject((Class) parClass1.getSuperclass()); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ public Render getEntityRenderObject(Entity entityIn) { diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java index f3b8c08..07de8a7 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 4 : 7 +> DELETE 4 @ 4 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java index 72b3314..747184d 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPainting.edit.java @@ -11,6 +11,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 3 : 6 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java index b653f27..a512832 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.edit.java @@ -7,7 +7,7 @@ > DELETE 3 @ 3 : 5 -> CHANGE 14 : 16 @ 16 : 18 +> CHANGE 14 : 16 @ 14 : 16 ~ this.field_177189_c = new ModelZombie(0.5F, false); ~ this.field_177186_d = new ModelZombie(1.0F, false); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java index 9375854..b42cbd3 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.edit.java @@ -9,41 +9,41 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> INSERT 3 : 4 @ 2 +> INSERT 2 : 3 @ 2 + import net.minecraft.client.model.ModelBiped; -> CHANGE 2 : 3 @ 1 : 4 +> CHANGE 1 : 2 @ 1 : 4 ~ import net.minecraft.client.model.ModelZombie; -> INSERT 17 : 18 @ 19 +> INSERT 16 : 17 @ 16 + private boolean zombieModel; -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ this(renderManager, false, false); -> CHANGE 3 : 5 @ 3 : 5 +> CHANGE 2 : 4 @ 2 : 4 ~ public RenderPlayer(RenderManager renderManager, boolean useSmallArms, boolean zombieModel) { ~ super(renderManager, zombieModel ? new ModelZombie(0.0F, true) : new ModelPlayer(0.0F, useSmallArms), 0.5F); -> INSERT 3 : 4 @ 3 +> INSERT 1 : 2 @ 1 + this.zombieModel = zombieModel; -> CHANGE 9 : 11 @ 8 : 10 +> CHANGE 8 : 10 @ 8 : 10 ~ public ModelBiped getMainModel() { ~ return (ModelBiped) super.getMainModel(); -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 16 : 17 @ 16 : 17 ~ ModelBiped modelplayer = this.getMainModel(); -> CHANGE 9 : 17 @ 9 : 14 +> CHANGE 8 : 16 @ 8 : 13 ~ if (!zombieModel) { ~ ModelPlayer modelplayer_ = (ModelPlayer) modelplayer; @@ -54,7 +54,7 @@ ~ modelplayer_.bipedRightArmwear.showModel = clientPlayer.isWearing(EnumPlayerModelParts.RIGHT_SLEEVE); ~ } -> CHANGE 58 : 68 @ 55 : 63 +> CHANGE 50 : 60 @ 50 : 58 ~ if (!zombieModel) { ~ float f = 1.0F; @@ -67,7 +67,7 @@ ~ ((ModelPlayer) modelplayer).renderRightArm(); ~ } -> CHANGE 13 : 23 @ 11 : 19 +> CHANGE 3 : 13 @ 3 : 11 ~ if (!zombieModel) { ~ float f = 1.0F; diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSlime.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java index 0e94dd3..1394c59 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java @@ -9,6 +9,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 2 : 5 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSquid.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java index 0fec1a6..93ed245 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 2 : 5 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java index 49ebceb..eb74dfc 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 3 : 6 +> DELETE 3 @ 3 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWitch.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWither.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java index 42e703d..4e3f995 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderWolf.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java index 72b3314..747184d 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.edit.java @@ -11,6 +11,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 4 @ 3 : 6 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java index f49c6f2..4957126 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderZombie.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 6 @ 3 : 5 +> DELETE 3 @ 3 : 5 -> CHANGE 25 : 27 @ 27 : 29 +> CHANGE 25 : 27 @ 25 : 27 ~ this.field_177189_c = new ModelZombie(0.5F, false); ~ this.field_177186_d = new ModelZombie(1.0F, false); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java index d11d76e..9554ec8 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer; -> INSERT 2 : 11 @ 3 +> INSERT 1 : 10 @ 1 + + import com.google.common.collect.Lists; @@ -21,17 +21,17 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 14 @ 5 : 7 +> DELETE 5 @ 5 : 7 -> DELETE 1 @ 3 : 6 +> DELETE 1 @ 1 : 4 -> DELETE 10 @ 13 : 16 +> DELETE 10 @ 10 : 13 -> CHANGE 16 : 17 @ 19 : 20 +> CHANGE 16 : 17 @ 16 : 17 ~ return this.layerRenderers.add((LayerRenderer) layer); -> CHANGE 195 : 202 @ 195 : 251 +> CHANGE 194 : 201 @ 194 : 250 ~ GlStateManager.enableShaderBlendAdd(); ~ float f1 = 1.0F - (float) (i >> 24 & 255) / 255.0F; @@ -41,11 +41,11 @@ ~ GlStateManager.setShaderBlendSrc(f1, f1, f1, 1.0F); ~ GlStateManager.setShaderBlendAdd(f2 * f1 + 0.4F, f3 * f1, f4 * f1, 0.0f); -> CHANGE 12 : 13 @ 61 : 98 +> CHANGE 5 : 6 @ 5 : 42 ~ GlStateManager.disableShaderBlendAdd(); -> CHANGE 74 : 75 @ 110 : 111 +> CHANGE 73 : 74 @ 73 : 74 ~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java index 34ea310..fbee664 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 6 @ 2 +> INSERT 1 : 6 @ 1 + + import com.google.common.collect.Maps; @@ -15,23 +15,23 @@ + import net.lax1dude.eaglercraft.v1_8.HString; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 6 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 47 : 48 @ 48 : 49 +> CHANGE 47 : 48 @ 47 : 48 ~ this.func_177179_a((T) modelbase, parInt1); -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 19 : 20 @ 19 : 20 ~ this.func_177183_a(entitylivingbaseIn, (T) modelbase, armorSlot, parFloat2, parFloat3, parFloat4, -> CHANGE 59 : 60 @ 59 : 60 +> CHANGE 58 : 59 @ 58 : 59 ~ String s = HString.format("textures/models/armor/%s_layer_%d%s.png", -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ parString1 == null ? "" : HString.format("_%s", new Object[] { parString1 }) }); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java index 5f98a42..00ae44f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.edit.java @@ -11,11 +11,11 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> CHANGE 17 : 18 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ EaglercraftRandom random = new EaglercraftRandom((long) entitylivingbase.getEntityId()); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java index 8d8f336..be3ea86 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.edit.java @@ -9,18 +9,18 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> CHANGE 2 : 3 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ import net.minecraft.client.model.ModelPlayer; -> DELETE 2 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 14 : 16 @ 15 : 16 +> CHANGE 14 : 16 @ 14 : 15 ~ && abstractclientplayer.getLocationCape() != null ~ && this.playerRenderer.getMainModel() instanceof ModelPlayer) { -> CHANGE 44 : 45 @ 43 : 44 +> CHANGE 42 : 43 @ 42 : 43 ~ ((ModelPlayer) this.playerRenderer.getMainModel()).renderCape(0.0625F); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java index 3f8fbda..8e1f8dc 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java index efa94ac..9801448 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.edit.java @@ -12,11 +12,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 6 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 69 : 70 @ 70 : 71 +> CHANGE 69 : 70 @ 69 : 70 ~ gameprofile = TileEntitySkull.updateGameprofile(new GameProfile((EaglercraftUUID) null, s)); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java index e885110..973722b 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.edit.java @@ -9,17 +9,17 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> CHANGE 2 : 3 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ import net.minecraft.client.model.ModelPlayer; -> DELETE 2 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 11 : 12 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ && !abstractclientplayer.isInvisible() && this.playerRenderer.getMainModel() instanceof ModelPlayer) { -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 19 : 20 @ 19 : 20 ~ ((ModelPlayer) this.playerRenderer.getMainModel()).renderDeadmau5Head(0.0625F); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java index 7d0d3c8..f615a82 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.edit.java @@ -12,9 +12,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 6 @ 4 : 6 +> DELETE 2 @ 2 : 4 -> CHANGE 16 : 17 @ 18 : 19 +> CHANGE 16 : 17 @ 16 : 17 ~ EaglercraftRandom random = new EaglercraftRandom(432L); diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java index f7f5eb7..89c19f1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.edit.java @@ -10,6 +10,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 3 @ 3 : 4 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java index f7f5eb7..89c19f1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.edit.java @@ -10,6 +10,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 3 @ 3 : 4 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java index 2abc02a..a1c2b18 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.edit.java @@ -10,8 +10,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 6 @ 4 : 6 +> DELETE 4 @ 4 : 6 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java index 43b007d..ca8c2a5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java index 43b007d..ca8c2a5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java index 155464d..ecfc521 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.edit.java @@ -10,8 +10,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 5 @ 3 : 5 +> DELETE 3 @ 3 : 5 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java index 50f3e4e..65a5713 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 4 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java index 3f8fbda..8e1f8dc 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java index 95e548e..5aaefa9 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.edit.java @@ -9,12 +9,12 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 14 @ 15 : 16 +> DELETE 14 @ 14 : 15 -> DELETE 5 @ 6 : 7 +> DELETE 5 @ 5 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java index 426ef1b..90c77dd 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java index f7f5eb7..89c19f1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.edit.java @@ -10,6 +10,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 3 @ 3 : 4 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java index 3f8fbda..8e1f8dc 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.edit.java @@ -9,8 +9,8 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java index e696635..669b739 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.edit.java @@ -9,6 +9,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java index 5804d75..439e2ff 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.edit.java @@ -9,12 +9,12 @@ ~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; -> INSERT 2 : 4 @ 4 +> INSERT 1 : 3 @ 1 + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; + -> CHANGE 10 : 22 @ 8 : 19 +> CHANGE 8 : 20 @ 8 : 19 ~ if (blur != parFlag || mipmap != parFlag2) { ~ this.blur = parFlag; @@ -29,7 +29,7 @@ ~ short1 = 9728; ~ } -> CHANGE 13 : 16 @ 12 : 14 +> CHANGE 1 : 4 @ 1 : 3 ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, i); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, short1); diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java index 2c672ed..83ce47e 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 3 @ 2 : 4 +> CHANGE 1 : 3 @ 1 : 3 ~ ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> CHANGE 9 : 12 @ 9 : 13 +> CHANGE 7 : 10 @ 7 : 11 ~ public DynamicTexture(ImageData bufferedImage) { ~ this(bufferedImage.width, bufferedImage.height); diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java index 630665b..af73414 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.edit.java @@ -7,34 +7,34 @@ > DELETE 2 @ 2 : 5 -> INSERT 3 : 7 @ 6 +> INSERT 3 : 7 @ 3 + + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 5 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> DELETE 4 @ 6 : 8 +> DELETE 4 @ 4 : 6 -> CHANGE 17 : 18 @ 19 : 20 +> CHANGE 17 : 18 @ 17 : 18 ~ ImageData bufferedimage; -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ ImageData bufferedimage1 = TextureUtil -> DELETE 2 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> CHANGE 1 : 4 @ 5 : 8 +> CHANGE 1 : 4 @ 1 : 4 ~ bufferedimage = new ImageData(bufferedimage1.width, bufferedimage1.height, false); ~ bufferedimage.drawLayer(bufferedimage1, 0, 0, bufferedimage1.width, bufferedimage1.height, 0, 0, ~ bufferedimage1.width, bufferedimage1.height); -> CHANGE 9 : 14 @ 9 : 16 +> CHANGE 6 : 11 @ 6 : 13 ~ ImageData bufferedimage2 = TextureUtil.readBufferedImage(inputstream); ~ if (bufferedimage2.width == bufferedimage.width && bufferedimage2.height == bufferedimage.height) { @@ -42,14 +42,14 @@ ~ for (int l = 0; l < bufferedimage2.width; ++l) { ~ int i1 = bufferedimage2.pixels[k * bufferedimage2.width + l]; -> CHANGE 7 : 11 @ 9 : 12 +> CHANGE 2 : 6 @ 2 : 5 ~ int k1 = bufferedimage1.pixels[k * bufferedimage1.width + l]; ~ int l1 = MathHelper.func_180188_d(k1, ImageData.swapRB(mapcolor.colorValue)) ~ & 16777215; ~ bufferedimage2.pixels[k * bufferedimage2.width + l] = j1 | l1; -> CHANGE 8 : 10 @ 7 : 8 +> CHANGE 4 : 6 @ 4 : 5 ~ bufferedimage.drawLayer(bufferedimage2, 0, 0, bufferedimage2.width, bufferedimage2.height, 0, 0, ~ bufferedimage2.width, bufferedimage2.height); diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java index ccc7863..e3d5a0f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> CHANGE 3 : 9 @ 6 : 8 +> CHANGE 3 : 9 @ 3 : 5 ~ ~ import com.google.common.collect.Lists; @@ -16,21 +16,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 8 @ 4 : 6 +> DELETE 2 @ 2 : 4 -> CHANGE 11 : 12 @ 13 : 14 +> CHANGE 11 : 12 @ 11 : 12 ~ ImageData bufferedimage = null; -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ ImageData bufferedimage1 = TextureUtil.readBufferedImage(inputstream); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ bufferedimage = new ImageData(bufferedimage1.width, bufferedimage1.height, true); -> CHANGE 3 : 5 @ 3 : 4 +> CHANGE 2 : 4 @ 2 : 3 ~ bufferedimage.drawLayer(bufferedimage1, 0, 0, bufferedimage1.width, bufferedimage1.height, 0, 0, ~ bufferedimage1.width, bufferedimage1.height); diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java index 511ed47..dc54503 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.edit.java @@ -7,16 +7,16 @@ > DELETE 2 @ 2 : 3 -> CHANGE 2 : 6 @ 3 : 5 +> CHANGE 2 : 6 @ 2 : 4 ~ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 8 @ 6 : 8 +> DELETE 4 @ 4 : 6 -> CHANGE 16 : 17 @ 18 : 19 +> CHANGE 16 : 17 @ 16 : 17 ~ ImageData bufferedimage = TextureUtil.readBufferedImage(inputstream); diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java index c143352..a3997b0 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 4 : 11 @ 6 +> INSERT 4 : 11 @ 4 + + import net.lax1dude.eaglercraft.v1_8.HString; @@ -17,37 +17,37 @@ + import com.google.common.collect.Sets; + -> DELETE 8 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> CHANGE 29 : 30 @ 30 : 31 +> CHANGE 29 : 30 @ 29 : 30 ~ public void addSprite(EaglerTextureAtlasSprite parTextureAtlasSprite) { -> CHANGE 16 : 17 @ 16 : 17 +> CHANGE 15 : 16 @ 15 : 16 ~ String s = HString.format("Unable to fit: %s - size: %dx%d - Maybe try a lowerresolution resourcepack?", -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ public List getStichSlots() { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ for (Stitcher.Slot stitcher$slot1 : (List) arraylist) { -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ EaglerTextureAtlasSprite textureatlassprite = stitcher$holder.getAtlasSprite(); -> CHANGE 91 : 92 @ 91 : 92 +> CHANGE 90 : 91 @ 90 : 91 ~ private final EaglerTextureAtlasSprite theTexture; -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ public Holder(EaglerTextureAtlasSprite parTextureAtlasSprite, int parInt1) { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ public EaglerTextureAtlasSprite getAtlasSprite() { diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java index 980df9b..d6a9e05 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.edit.java @@ -9,18 +9,18 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> CHANGE 2 : 3 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ public class TextureClock extends EaglerTextureAtlasSprite { -> CHANGE 42 : 44 @ 42 : 44 +> CHANGE 41 : 43 @ 41 : 43 ~ animationCache.copyFrameLevelsToTex2D(this.frameCounter, this.originX, this.originY, this.width, ~ this.height); -> INSERT 6 : 7 @ 6 +> INSERT 4 : 5 @ 4 + diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java index 38d7f36..fb9880a 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.edit.java @@ -9,18 +9,18 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> CHANGE 4 : 5 @ 6 : 7 +> CHANGE 4 : 5 @ 4 : 5 ~ public class TextureCompass extends EaglerTextureAtlasSprite { -> CHANGE 63 : 65 @ 63 : 65 +> CHANGE 62 : 64 @ 62 : 64 ~ animationCache.copyFrameLevelsToTex2D(this.frameCounter, this.originX, this.originY, this.width, ~ this.height); -> INSERT 6 : 7 @ 6 +> INSERT 4 : 5 @ 4 + diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java index 93958a1..f745e8b 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 5 : 12 @ 7 : 13 +> CHANGE 5 : 12 @ 5 : 11 ~ ~ import com.google.common.collect.Lists; @@ -17,9 +17,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 13 @ 12 : 14 +> DELETE 6 @ 6 : 8 -> CHANGE 13 : 21 @ 15 : 20 +> CHANGE 13 : 21 @ 13 : 18 ~ if (resource.cachedPointer != null) { ~ TextureUtil.bindTexture(((ITextureObject) resource.cachedPointer).getGlTextureId()); // unsafe, lol @@ -30,29 +30,29 @@ ~ this.loadTexture(resource, (ITextureObject) object); ~ } -> CHANGE 9 : 12 @ 6 : 7 +> CHANGE 1 : 4 @ 1 : 2 ~ resource.cachedPointer = object; ~ TextureUtil.bindTexture(((ITextureObject) object).getGlTextureId()); ~ } -> CHANGE 14 : 15 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ public boolean loadTexture(ResourceLocation textureLocation, ITextureObject textureObj) { -> INSERT 14 : 15 @ 14 +> INSERT 13 : 14 @ 13 + final ITextureObject textureObj2 = textureObj; -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ return textureObj2.getClass().getName(); -> INSERT 6 : 7 @ 6 +> INSERT 5 : 6 @ 5 + textureLocation.cachedPointer = textureObj; -> CHANGE 6 : 11 @ 5 : 6 +> CHANGE 5 : 10 @ 5 : 6 ~ if (textureLocation.cachedPointer != null) { ~ return (ITextureObject) textureLocation.cachedPointer; @@ -60,14 +60,14 @@ ~ return (ITextureObject) (textureLocation.cachedPointer = this.mapTextureObjects.get(textureLocation)); ~ } -> CHANGE 17 : 18 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ HString.format("dynamic/%s_%d", new Object[] { name, integer })); -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ ITextureObject itextureobject = this.mapTextureObjects.remove(textureLocation); -> DELETE 4 @ 4 : 5 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java index 15dbc21..1958a98 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 5 -> INSERT 1 : 2 @ 4 +> INSERT 1 : 2 @ 1 + import java.util.Collection; -> INSERT 7 : 16 @ 6 +> INSERT 6 : 15 @ 6 + + import com.google.common.collect.Lists; @@ -23,90 +23,90 @@ + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 11 @ 2 : 8 +> DELETE 2 @ 2 : 8 -> DELETE 9 @ 15 : 17 +> DELETE 9 @ 9 : 11 -> CHANGE 5 : 8 @ 7 : 10 +> CHANGE 5 : 8 @ 5 : 8 ~ private final List listAnimatedSprites; ~ private final Map mapRegisteredSprites; ~ private final Map mapUploadedSprites; -> CHANGE 6 : 9 @ 6 : 7 +> CHANGE 3 : 6 @ 3 : 4 ~ private final EaglerTextureAtlasSprite missingImage; ~ private int width; ~ private int height; -> CHANGE 12 : 13 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ this.missingImage = new EaglerTextureAtlasSprite("missingno"); -> DELETE 18 @ 18 : 19 +> DELETE 17 @ 17 : 18 -> INSERT 3 : 4 @ 4 +> INSERT 3 : 4 @ 3 + destroyAnimationCaches(); -> CHANGE 17 : 18 @ 16 : 17 +> CHANGE 16 : 17 @ 16 : 17 ~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) entry.getValue(); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ ImageData[] abufferedimage = new ImageData[1 + this.mipmapLevels]; -> CHANGE 7 : 9 @ 7 : 9 +> CHANGE 6 : 8 @ 6 : 8 ~ int l = abufferedimage[0].width; ~ int i1 = abufferedimage[0].height; -> CHANGE 20 : 22 @ 20 : 21 +> CHANGE 18 : 20 @ 18 : 19 ~ new Object[] { Integer.valueOf(i2), resourcelocation2 }); ~ logger.error(ioexception); -> CHANGE 11 : 13 @ 10 : 11 +> CHANGE 9 : 11 @ 9 : 10 ~ logger.error("Unable to parse metadata from " + resourcelocation1); ~ logger.error(runtimeexception); -> CHANGE 4 : 6 @ 3 : 4 +> CHANGE 2 : 4 @ 2 : 3 ~ logger.error("Using missing texture, unable to load " + resourcelocation1); ~ logger.error(ioexception1); -> CHANGE 28 : 29 @ 27 : 28 +> CHANGE 26 : 27 @ 26 : 27 ~ for (final EaglerTextureAtlasSprite textureatlassprite1 : this.mapRegisteredSprites.values()) { -> CHANGE 41 : 45 @ 41 : 42 +> CHANGE 40 : 44 @ 40 : 41 ~ width = stitcher.getCurrentWidth(); ~ height = stitcher.getCurrentHeight(); ~ ~ for (EaglerTextureAtlasSprite textureatlassprite2 : stitcher.getStichSlots()) { -> CHANGE 25 : 26 @ 22 : 23 +> CHANGE 21 : 22 @ 21 : 22 ~ for (EaglerTextureAtlasSprite textureatlassprite3 : (Collection) hashmap.values()) { -> CHANGE 9 : 11 @ 9 : 11 +> CHANGE 8 : 10 @ 8 : 10 ~ HString.format("%s/%s%s", new Object[] { this.basePath, location.getResourcePath(), ".png" })) ~ : new ResourceLocation(location.getResourceDomain(), HString.format("%s/mipmaps/%s.%d%s", -> CHANGE 5 : 7 @ 5 : 7 +> CHANGE 3 : 5 @ 3 : 5 ~ public EaglerTextureAtlasSprite getAtlasSprite(String iconName) { ~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.mapUploadedSprites.get(iconName); -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 10 : 11 @ 10 : 11 ~ for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) { -> CHANGE 6 : 13 @ 6 : 7 +> CHANGE 5 : 12 @ 5 : 6 ~ private void destroyAnimationCaches() { ~ for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) { @@ -116,20 +116,20 @@ ~ ~ public EaglerTextureAtlasSprite registerSprite(ResourceLocation location) { -> CHANGE 10 : 12 @ 4 : 5 +> CHANGE 3 : 5 @ 3 : 4 ~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.mapRegisteredSprites ~ .get(location); -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ textureatlassprite = EaglerTextureAtlasSprite.makeAtlasSprite(location); -> CHANGE 16 : 17 @ 16 : 17 +> CHANGE 15 : 16 @ 15 : 16 ~ public EaglerTextureAtlasSprite getMissingSprite() { -> INSERT 3 : 12 @ 3 +> INSERT 2 : 11 @ 2 + + public int getWidth() { diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java index 88cd34c..880d1bb 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.edit.java @@ -10,7 +10,7 @@ ~ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; ~ -> CHANGE 4 : 12 @ 3 : 5 +> CHANGE 2 : 10 @ 2 : 4 ~ import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer; ~ @@ -21,93 +21,93 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 10 @ 4 : 6 +> DELETE 2 @ 2 : 4 -> DELETE 2 @ 4 : 8 +> DELETE 2 @ 2 : 6 -> CHANGE 16 : 17 @ 20 : 21 +> CHANGE 16 : 17 @ 16 : 17 ~ public static int uploadTextureImage(int parInt1, ImageData parBufferedImage) { -> CHANGE 121 : 123 @ 121 : 122 +> CHANGE 120 : 122 @ 120 : 121 ~ EaglercraftGPU.glTexSubImage2D(GL_TEXTURE_2D, parInt1, parInt4, parInt5 + k, parInt2, l, GL_RGBA, ~ GL_UNSIGNED_BYTE, dataBuffer); -> CHANGE 6 : 7 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ public static int uploadTextureImageAllocate(int parInt1, ImageData parBufferedImage, boolean parFlag, -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ allocateTexture(parInt1, parBufferedImage.width, parBufferedImage.height); -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ // deleteTexture(parInt1); //TODO: why -> CHANGE 3 : 7 @ 3 : 7 +> CHANGE 2 : 6 @ 2 : 6 ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, '\u813d', parInt2); ~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813a', 0.0F); ~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u813b', (float) parInt2); ~ // EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, '\u8501', 0.0F); -> CHANGE 7 : 9 @ 7 : 8 +> CHANGE 3 : 5 @ 3 : 4 ~ EaglercraftGPU.glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA, parInt3 >> i, parInt4 >> i, 0, GL_RGBA, ~ GL_UNSIGNED_BYTE, (IntBuffer) null); -> CHANGE 6 : 7 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ public static int uploadTextureImageSub(int textureId, ImageData parBufferedImage, int parInt2, int parInt3, -> CHANGE 7 : 11 @ 7 : 11 +> CHANGE 6 : 10 @ 6 : 10 ~ private static void uploadTextureImageSubImpl(ImageData parBufferedImage, int parInt1, int parInt2, boolean parFlag, ~ boolean parFlag2) { ~ int i = parBufferedImage.width; ~ int j = parBufferedImage.height; -> CHANGE 15 : 17 @ 15 : 16 +> CHANGE 11 : 13 @ 11 : 12 ~ EaglercraftGPU.glTexSubImage2D(GL_TEXTURE_2D, 0, parInt1, parInt2 + i1, i, j1, GL_RGBA, GL_UNSIGNED_BYTE, ~ dataBuffer); -> CHANGE 8 : 10 @ 7 : 9 +> CHANGE 6 : 8 @ 6 : 8 ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); -> CHANGE 3 : 5 @ 3 : 5 +> CHANGE 1 : 3 @ 1 : 3 ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); -> CHANGE 12 : 14 @ 12 : 14 +> CHANGE 10 : 12 @ 10 : 12 ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, parFlag2 ? 9987 : 9729); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -> CHANGE 3 : 5 @ 3 : 5 +> CHANGE 1 : 3 @ 1 : 3 ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, parFlag2 ? 9986 : 9728); ~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); -> CHANGE 27 : 28 @ 27 : 33 +> CHANGE 25 : 26 @ 25 : 31 ~ return readBufferedImage(resourceManager.getResource(imageLocation).getInputStream()).pixels; -> CHANGE 3 : 5 @ 8 : 10 +> CHANGE 2 : 4 @ 2 : 4 ~ public static ImageData readBufferedImage(InputStream imageStream) throws IOException { ~ ImageData bufferedimage; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ bufferedimage = ImageData.loadImageFile(imageStream); -> INSERT 41 : 49 @ 41 +> INSERT 40 : 48 @ 40 + public static int[] convertComponentOrder(int[] arr) { + for (int i = 0; i < arr.length; ++i) { diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java index 7f1dded..c6b763f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 3 @ 2 : 3 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java index ecc2e81..b519de4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.edit.java @@ -12,35 +12,35 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 7 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 16 @ 17 : 18 +> DELETE 16 @ 16 : 17 -> INSERT 36 : 38 @ 37 +> INSERT 36 : 38 @ 36 + GlStateManager.enableLighting(); + GlStateManager.enableColorMaterial(); -> INSERT 9 : 11 @ 7 +> INSERT 7 : 9 @ 7 + GlStateManager.enableLighting(); + GlStateManager.enableColorMaterial(); -> DELETE 35 @ 33 : 54 +> DELETE 33 @ 33 : 54 -> CHANGE 5 : 6 @ 26 : 27 +> CHANGE 5 : 6 @ 5 : 6 ~ GlStateManager.pushLightCoords(); -> CHANGE 4 : 5 @ 4 : 8 +> CHANGE 3 : 4 @ 3 : 7 ~ GlStateManager.popLightCoords(); -> CHANGE 22 : 23 @ 25 : 26 +> CHANGE 21 : 22 @ 21 : 22 ~ EaglercraftGPU.glNormal3f(0.0F, 1.0F, 0.0F); diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java index 8d67b35..7273660 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java index 60b03aa..e991097 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 4 : 9 @ 6 +> INSERT 4 : 9 @ 4 + + import com.google.common.collect.Lists; @@ -15,11 +15,11 @@ + + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 7 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 95 : 96 @ 96 : 97 +> CHANGE 95 : 96 @ 95 : 96 ~ for (TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern : (List) list1) { diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java index 57d16f7..eca1a99 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.edit.java @@ -12,11 +12,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 5 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 4 @ 6 : 7 +> DELETE 4 @ 4 : 5 -> CHANGE 19 : 21 @ 20 : 22 +> CHANGE 19 : 21 @ 19 : 21 ~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 10497.0F); ~ EaglercraftGPU.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 10497.0F); diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java index ab8fabc..c6fbbf1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.edit.java @@ -10,22 +10,22 @@ + + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 6 @ 4 : 6 +> DELETE 4 @ 4 : 6 -> INSERT 49 : 50 @ 51 +> INSERT 49 : 50 @ 49 + isChristams = true; -> DELETE 8 @ 7 : 9 +> DELETE 7 @ 7 : 9 -> INSERT 2 : 4 @ 4 +> INSERT 2 : 4 @ 2 + } else if (tileentitychest.getChestType() == 1) { + this.bindTexture(textureTrapped); -> DELETE 14 @ 12 : 14 +> DELETE 12 @ 12 : 14 -> INSERT 2 : 4 @ 4 +> INSERT 2 : 4 @ 2 + } else if (tileentitychest.getChestType() == 1) { + this.bindTexture(textureTrappedDouble); diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java index 060e994..ee9ceb6 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java index 69897e4..7395aef 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.edit.java @@ -13,23 +13,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; ~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 8 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> CHANGE 7 : 8 @ 9 : 10 +> CHANGE 7 : 8 @ 7 : 8 ~ private static final EaglercraftRandom field_147527_e = new EaglercraftRandom(31100L); -> CHANGE 35 : 36 @ 35 : 36 +> CHANGE 34 : 35 @ 34 : 35 ~ float f7 = (float) (-(d1 + (double) f3 - 1.25)); -> CHANGE 14 : 15 @ 14 : 18 +> CHANGE 13 : 14 @ 13 : 17 ~ GlStateManager.enableTexGen(); -> CHANGE 35 : 36 @ 38 : 42 +> CHANGE 34 : 35 @ 34 : 38 ~ GlStateManager.disableTexGen(); diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java index 060e994..ee9ceb6 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java index 526f424..cc4c77c 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.edit.java @@ -12,9 +12,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 5 @ 3 : 6 +> DELETE 1 @ 1 : 4 -> CHANGE 31 : 32 @ 34 : 35 +> CHANGE 31 : 32 @ 31 : 32 ~ gameprofile = new GameProfile((EaglercraftUUID) null, nbttagcompound.getString("SkullOwner")); diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java index 060e994..ee9ceb6 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.edit.java @@ -9,6 +9,6 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java index c7169a2..3c8ccf3 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.edit.java @@ -10,10 +10,10 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; -> DELETE 9 @ 7 : 8 +> DELETE 7 @ 7 : 8 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java index d0fe3c4..40349ad 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 6 @ 2 +> INSERT 1 : 6 @ 1 + + import com.google.common.collect.Maps; @@ -15,11 +15,11 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; -> DELETE 6 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 14 +> DELETE 1 @ 1 : 12 -> CHANGE 58 : 60 @ 69 : 70 +> CHANGE 58 : 60 @ 58 : 59 ~ tileentityspecialrenderer = this ~ .getSpecialRendererByClass((Class) teClass.getSuperclass()); diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java index 8b9acae..b814513 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.edit.java @@ -11,11 +11,11 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 7 @ 4 : 6 +> DELETE 4 @ 4 : 6 -> DELETE 4 @ 6 : 7 +> DELETE 4 @ 4 : 5 -> CHANGE 55 : 56 @ 56 : 57 +> CHANGE 55 : 56 @ 55 : 56 ~ EaglercraftGPU.glNormal3f(0.0F, 0.0F, -1.0F * f3); diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java index 070d55e..1e9c667 100644 --- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.edit.java @@ -10,19 +10,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> CHANGE 5 : 6 @ 8 : 11 +> CHANGE 3 : 4 @ 3 : 6 ~ import net.minecraft.client.network.NetHandlerPlayClient; -> DELETE 3 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> CHANGE 55 : 59 @ 56 : 65 +> CHANGE 55 : 59 @ 55 : 64 ~ if (parGameProfile != null && parGameProfile.getId() != null) { ~ NetHandlerPlayClient netHandler = Minecraft.getMinecraft().getNetHandler(); ~ if (netHandler != null) { ~ resourcelocation = netHandler.getSkinCache().getSkin(parGameProfile).getResourceLocation(); -> DELETE 6 @ 11 : 12 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java b/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java index 7cbfbee..11c00fd 100644 --- a/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.opengl.VertexFormat; -> CHANGE 3 : 15 @ 4 : 72 +> CHANGE 2 : 14 @ 2 : 70 ~ public static final VertexFormat BLOCK = VertexFormat.BLOCK; ~ public static final VertexFormat ITEM = VertexFormat.ITEM; diff --git a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java index 83e0d65..27c07ba 100644 --- a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 9 -> CHANGE 2 : 13 @ 9 : 10 +> CHANGE 2 : 13 @ 2 : 3 ~ import java.nio.charset.StandardCharsets; ~ @@ -21,25 +21,25 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 12 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 7 +> DELETE 3 @ 3 : 6 -> CHANGE 3 : 4 @ 6 : 7 +> CHANGE 3 : 4 @ 3 : 4 ~ protected final String resourcePackFile; -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ public AbstractResourcePack(String resourcePackFileIn) { -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ return HString.format("%s/%s/%s", -> DELETE 4 @ 4 : 8 +> DELETE 3 @ 3 : 7 -> CHANGE 19 : 27 @ 23 : 24 +> CHANGE 19 : 27 @ 19 : 20 ~ try { ~ return readMetadata(parIMetadataSerializer, this.getInputStreamByName("pack.mcmeta"), parString1); @@ -50,25 +50,25 @@ ~ throw e; ~ } -> CHANGE 12 : 13 @ 5 : 7 +> CHANGE 4 : 5 @ 4 : 6 ~ JSONObject jsonobject = null; -> CHANGE 3 : 6 @ 4 : 8 +> CHANGE 2 : 5 @ 2 : 6 ~ jsonobject = new JSONObject(IOUtils.inputStreamToString(parInputStream, StandardCharsets.UTF_8)); ~ } catch (RuntimeException | IOException runtimeexception) { ~ throw new JSONException(runtimeexception); -> CHANGE 4 : 5 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ IOUtils.closeQuietly(parInputStream); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ public ImageData getPackImage() throws IOException { -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ return this.resourcePackFile; diff --git a/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java b/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java index 49d3d8b..222b1de 100644 --- a/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> CHANGE 12 : 13 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ public static ResourceLocation getDefaultSkin(EaglercraftUUID playerUUID) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public static String getSkinType(EaglercraftUUID playerUUID) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ private static boolean isSlimSkin(EaglercraftUUID playerUUID) { diff --git a/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java index 9c12a9a..00c55c0 100644 --- a/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/DefaultResourcePack.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 6 -> DELETE 3 @ 7 : 8 +> DELETE 3 @ 3 : 4 -> INSERT 1 : 6 @ 2 +> INSERT 1 : 6 @ 1 + + import com.google.common.collect.ImmutableSet; @@ -17,35 +17,35 @@ + import net.lax1dude.eaglercraft.v1_8.EagRuntime; + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 6 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> CHANGE 5 : 6 @ 7 : 9 +> CHANGE 5 : 6 @ 5 : 7 ~ public static final Set defaultResourceDomains = ImmutableSet.of("minecraft", "eagler"); -> DELETE 2 @ 3 : 7 +> DELETE 1 @ 1 : 5 -> CHANGE 15 : 16 @ 19 : 21 +> CHANGE 15 : 16 @ 15 : 17 ~ return null; -> CHANGE 4 : 6 @ 5 : 7 +> CHANGE 3 : 5 @ 3 : 5 ~ return EagRuntime ~ .getResourceStream("/assets/" + location.getResourceDomain() + "/" + location.getResourcePath()); -> CHANGE 5 : 6 @ 5 : 7 +> CHANGE 3 : 4 @ 3 : 5 ~ return this.getResourceStream(resourcelocation) != null; -> CHANGE 10 : 12 @ 11 : 13 +> CHANGE 9 : 11 @ 9 : 11 ~ return AbstractResourcePack.readMetadata(parIMetadataSerializer, ~ EagRuntime.getResourceStream("pack.mcmeta"), parString1); -> DELETE 4 @ 4 : 6 +> DELETE 2 @ 2 : 4 -> CHANGE 3 : 5 @ 5 : 8 +> CHANGE 3 : 5 @ 3 : 6 ~ public ImageData getPackImage() throws IOException { ~ return TextureUtil.readBufferedImage(EagRuntime.getResourceStream("pack.png")); diff --git a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java index 09ff017..70bad54 100644 --- a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 4 -> DELETE 3 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> CHANGE 3 : 8 @ 4 : 8 +> CHANGE 3 : 8 @ 3 : 7 ~ ~ import com.google.common.collect.Lists; @@ -17,12 +17,12 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 7 @ 6 : 8 +> DELETE 2 @ 2 : 4 -> CHANGE 43 : 44 @ 45 : 50 +> CHANGE 43 : 44 @ 43 : 48 ~ return resourcePack.getInputStream(location); -> DELETE 28 @ 32 : 63 +> DELETE 27 @ 27 : 58 > EOF diff --git a/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java b/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java index aaa99f5..4cc3c2b 100644 --- a/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.edit.java @@ -9,9 +9,9 @@ + -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> CHANGE 8 : 10 @ 10 : 11 +> CHANGE 8 : 10 @ 8 : 9 ~ ColorizerFoliage.setFoliageBiomeColorizer( ~ TextureUtil.convertComponentOrder(TextureUtil.readImageData(iresourcemanager, LOC_FOLIAGE_PNG))); diff --git a/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java b/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java index 7e44877..badb305 100644 --- a/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/GrassColorReloadListener.edit.java @@ -9,9 +9,9 @@ + -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> CHANGE 8 : 10 @ 10 : 11 +> CHANGE 8 : 10 @ 8 : 9 ~ ColorizerGrass.setGrassBiomeColorizer( ~ TextureUtil.convertComponentOrder(TextureUtil.readImageData(iresourcemanager, LOC_GRASS_PNG))); diff --git a/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java b/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java index 3b653ae..1c40fd2 100644 --- a/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/IResourcePack.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 3 : 5 @ 4 +> INSERT 3 : 5 @ 3 + + import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> CHANGE 15 : 16 @ 13 : 14 +> CHANGE 13 : 14 @ 13 : 14 ~ ImageData getPackImage() throws IOException; diff --git a/patches/minecraft/net/minecraft/client/resources/Language.edit.java b/patches/minecraft/net/minecraft/client/resources/Language.edit.java index cc1c99d..1a29254 100644 --- a/patches/minecraft/net/minecraft/client/resources/Language.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/Language.edit.java @@ -10,7 +10,7 @@ + import net.lax1dude.eaglercraft.v1_8.HString; + -> CHANGE 24 : 25 @ 22 : 23 +> CHANGE 22 : 23 @ 22 : 23 ~ return HString.format("%s (%s)", new Object[] { this.name, this.region }); diff --git a/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java b/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java index c0c3e1c..9649c5b 100644 --- a/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/LanguageManager.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> CHANGE 5 : 12 @ 8 : 14 +> CHANGE 5 : 12 @ 5 : 11 ~ ~ import com.google.common.collect.Lists; @@ -17,6 +17,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 10 @ 9 : 11 +> DELETE 3 @ 3 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/client/resources/Locale.edit.java b/patches/minecraft/net/minecraft/client/resources/Locale.edit.java index 8df9f52..67eb150 100644 --- a/patches/minecraft/net/minecraft/client/resources/Locale.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/Locale.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 5 -> INSERT 2 : 3 @ 5 +> INSERT 2 : 3 @ 2 + import java.util.HashSet; -> INSERT 4 : 5 @ 3 +> INSERT 3 : 4 @ 3 + import java.util.Set; -> CHANGE 2 : 11 @ 1 : 3 +> CHANGE 1 : 10 @ 1 : 3 ~ ~ import com.google.common.base.Charsets; @@ -27,18 +27,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.HString; ~ import net.lax1dude.eaglercraft.v1_8.IOUtils; -> DELETE 10 @ 3 : 5 +> DELETE 1 @ 1 : 3 -> INSERT 7 : 9 @ 9 +> INSERT 7 : 9 @ 7 + private static final Set hasShownMissing = new HashSet(); + -> CHANGE 6 : 7 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ String s1 = HString.format("lang/%s.lang", new Object[] { s }); -> CHANGE 4 : 12 @ 4 : 5 +> CHANGE 3 : 11 @ 3 : 4 ~ List res = resourceManager.getAllResources(new ResourceLocation(s2, s1)); ~ if (res.size() > 0) { @@ -49,24 +49,24 @@ ~ } ~ } -> CHANGE 9 : 12 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ if (s2.equalsIgnoreCase("minecraft") && hasShownMissing.add(s)) { ~ EagRuntime.showPopup("ERROR: language \"" + s + "\" is not available on this site!"); ~ } -> CHANGE 53 : 55 @ 51 : 52 +> CHANGE 50 : 52 @ 50 : 51 ~ String s2 = pattern.matcher(astring[1]).replaceAll("%s"); // TODO: originally "%$1s" but must be ~ // "%s" to work with TeaVM (why?) -> INSERT 3 : 6 @ 2 +> INSERT 1 : 4 @ 1 + if (s1.startsWith("eaglercraft.")) { + this.properties.put(s1.substring(12), s2); + } -> CHANGE 18 : 19 @ 15 : 16 +> CHANGE 15 : 16 @ 15 : 16 ~ return HString.format(s, parameters); diff --git a/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java index 2fb614a..118d42a 100644 --- a/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/ResourceIndex.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 18 -> CHANGE 1 : 3 @ 17 : 19 +> CHANGE 1 : 3 @ 1 : 3 ~ // private static final Logger logger = LogManager.getLogger(); ~ // private final Map resourceMap = Maps.newHashMap(); -> CHANGE 3 : 27 @ 3 : 8 +> CHANGE 1 : 25 @ 1 : 6 ~ // public ResourceIndex(File parFile, String parString1) { ~ /* @@ -39,7 +39,7 @@ ~ */ ~ // } -> CHANGE 25 : 28 @ 6 : 35 +> CHANGE 1 : 4 @ 1 : 30 ~ // public Map getResourceMap() { ~ // return this.resourceMap; diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java index 5fbba6a..9a97000 100644 --- a/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.edit.java @@ -10,7 +10,7 @@ + import net.lax1dude.eaglercraft.v1_8.HString; + -> CHANGE 4 : 5 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ super(HString.format("\'%s\' in ResourcePack \'%s\'", new Object[] { parString1, parFile })); diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java index 51fb3e2..6c9b4a9 100644 --- a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntry.edit.java @@ -13,9 +13,9 @@ + import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -> DELETE 11 @ 6 : 8 +> DELETE 6 @ 6 : 8 -> INSERT 128 : 157 @ 130 +> INSERT 128 : 157 @ 128 + private void proceedWithBs(int l, boolean deleteInstead) { + if (!deleteInstead && l != 1) { @@ -47,24 +47,24 @@ + } + -> CHANGE 34 : 38 @ 5 : 9 +> CHANGE 5 : 9 @ 5 : 9 ~ if (Keyboard.isKeyDown(KeyboardConstants.KEY_LSHIFT) ~ || Keyboard.isKeyDown(KeyboardConstants.KEY_RSHIFT)) { ~ proceedWithBs(l, false); ~ } else { -> CHANGE 6 : 7 @ 6 : 14 +> CHANGE 2 : 3 @ 2 : 10 ~ proceedWithBs(l, flag); -> CHANGE 3 : 7 @ 10 : 14 +> CHANGE 2 : 6 @ 2 : 6 ~ }, I18n.format("resourcePack.prompt.title", this.func_148312_b()), ~ I18n.format("resourcePack.prompt.text", new Object[0]), ~ I18n.format("resourcePack.prompt.delete", new Object[0]), ~ I18n.format("resourcePack.prompt.add", new Object[0]), 0).withOpaqueBackground()); -> DELETE 5 @ 5 : 6 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java index 6c6b047..e021aca 100644 --- a/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 6 @ 2 +> INSERT 1 : 6 @ 1 + + import org.json.JSONException; @@ -15,11 +15,11 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 8 @ 3 : 5 +> DELETE 3 @ 3 : 5 -> DELETE 3 @ 5 : 7 +> DELETE 3 @ 3 : 5 -> CHANGE 32 : 33 @ 34 : 35 +> CHANGE 32 : 33 @ 32 : 33 ~ } catch (JSONException jsonparseexception) { diff --git a/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java index af04e9b..7f6f7e7 100644 --- a/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 11 -> DELETE 1 @ 10 : 12 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 6 +> DELETE 1 @ 1 : 4 -> CHANGE 2 : 14 @ 5 : 7 +> CHANGE 2 : 14 @ 2 : 4 ~ import java.util.function.Consumer; ~ @@ -26,73 +26,73 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; ~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; -> DELETE 13 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> DELETE 4 @ 7 : 8 +> DELETE 4 @ 4 : 5 -> DELETE 1 @ 2 : 9 +> DELETE 1 @ 1 : 8 -> DELETE 3 @ 10 : 18 +> DELETE 3 @ 3 : 11 -> DELETE 1 @ 9 : 10 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> CHANGE 4 : 5 @ 5 : 7 +> CHANGE 4 : 5 @ 4 : 6 ~ public ResourcePackRepository(IResourcePack rprDefaultResourcePackIn, IMetadataSerializer rprMetadataSerializerIn, -> DELETE 2 @ 3 : 5 +> DELETE 1 @ 1 : 3 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 23 @ 24 : 42 +> DELETE 23 @ 23 : 41 -> CHANGE 1 : 3 @ 19 : 20 +> CHANGE 1 : 3 @ 1 : 2 ~ if (SYS.VFS == null) ~ return; -> CHANGE 3 : 6 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ List list = Lists.newArrayList(); ~ ~ for (String file1 : SYS.getResourcePackNames()) { -> INSERT 4 : 5 @ 2 +> INSERT 1 : 2 @ 1 + -> CHANGE 4 : 5 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ list.add(resourcepackrepository$entry); -> CHANGE 2 : 6 @ 2 : 3 +> CHANGE 1 : 5 @ 1 : 2 ~ logger.error("Failed to call \"updateResourcePack\" for resource pack \"{}\"", ~ resourcepackrepository$entry.resourcePackFile); ~ logger.error(var6); ~ list.remove(resourcepackrepository$entry); -> INSERT 7 : 8 @ 4 +> INSERT 3 : 4 @ 3 + -> CHANGE 2 : 3 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ list.add(this.repositoryEntriesAll.get(i)); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ this.repositoryEntriesAll.removeAll(list); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ this.repositoryEntriesAll = list; -> CHANGE 16 : 23 @ 16 : 48 +> CHANGE 15 : 22 @ 15 : 47 ~ public void downloadResourcePack(String s1, String s2, Consumer cb) { ~ SYS.loadRemoteResourcePack(s1, s2, res -> { @@ -102,7 +102,7 @@ ~ cb.accept(true); ~ return; -> CHANGE 8 : 15 @ 33 : 61 +> CHANGE 1 : 8 @ 1 : 29 ~ cb.accept(false); ~ }, runnable -> { @@ -112,55 +112,55 @@ ~ "Server resource pack"); ~ }); -> DELETE 9 @ 30 : 50 +> DELETE 2 @ 2 : 22 -> CHANGE 5 : 8 @ 25 : 39 +> CHANGE 5 : 8 @ 5 : 19 ~ if (this.resourcePackInstance != null) { ~ this.resourcePackInstance = null; ~ Minecraft.getMinecraft().scheduleResourcesRefresh(); -> DELETE 4 @ 15 : 16 - -> CHANGE 3 : 4 @ 4 : 5 - -~ private final String resourcePackFile; +> DELETE 1 @ 1 : 2 > CHANGE 3 : 4 @ 3 : 4 +~ private final String resourcePackFile; + +> CHANGE 2 : 3 @ 2 : 3 + ~ private ImageData texturePackIcon; -> INSERT 2 : 3 @ 2 +> INSERT 1 : 2 @ 1 + private TextureManager iconTextureManager; -> CHANGE 2 : 3 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ private Entry(String resourcePackFileIn) { -> CHANGE 5 : 8 @ 5 : 8 +> CHANGE 4 : 7 @ 4 : 7 ~ if (SYS.VFS == null) ~ return; ~ this.reResourcePack = (IResourcePack) new FolderResourcePack(this.resourcePackFile, "resourcepacks/"); -> CHANGE 9 : 11 @ 9 : 10 +> CHANGE 6 : 8 @ 6 : 7 ~ logger.error("Failed to load resource pack icon for \"{}\"!", resourcePackFile); ~ logger.error(var2); -> INSERT 13 : 14 @ 12 +> INSERT 11 : 12 @ 11 + this.iconTextureManager = textureManagerIn; -> INSERT 9 : 13 @ 8 +> INSERT 8 : 12 @ 8 + if (this.locationTexturePackIcon != null) { + this.iconTextureManager.deleteTexture(this.locationTexturePackIcon); + this.locationTexturePackIcon = null; + } -> CHANGE 39 : 40 @ 35 : 39 +> CHANGE 35 : 36 @ 35 : 39 ~ return this.resourcePackFile; diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java index 696856b..359343e 100644 --- a/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.edit.java @@ -14,12 +14,12 @@ + import java.util.Set; + -> CHANGE 12 : 15 @ 6 : 17 +> CHANGE 6 : 9 @ 6 : 17 ~ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 5 @ 13 : 15 +> DELETE 2 @ 2 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java b/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java index 0da7f3f..1c8588b 100644 --- a/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/SimpleResource.edit.java @@ -9,11 +9,11 @@ ~ import java.io.IOException; -> CHANGE 2 : 3 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ import java.nio.charset.StandardCharsets; -> CHANGE 2 : 9 @ 2 : 3 +> CHANGE 1 : 8 @ 1 : 2 ~ ~ import org.json.JSONException; @@ -23,22 +23,22 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.IOUtils; -> DELETE 10 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> CHANGE 9 : 10 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ private JSONObject mcmetaJson; -> DELETE 30 @ 30 : 31 +> DELETE 29 @ 29 : 30 -> CHANGE 2 : 6 @ 3 : 5 +> CHANGE 2 : 6 @ 2 : 4 ~ this.mcmetaJson = new JSONObject( ~ IOUtils.inputStreamToString(this.mcmetaInputStream, StandardCharsets.UTF_8)); ~ } catch (IOException e) { ~ throw new JSONException(e); -> CHANGE 5 : 6 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ IOUtils.closeQuietly(this.mcmetaInputStream); diff --git a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java index 19d88e1..f5d3b0a 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 3 -> DELETE 3 @ 4 : 6 +> DELETE 3 @ 3 : 5 -> INSERT 1 : 3 @ 3 +> INSERT 1 : 3 @ 1 + import com.google.common.collect.Sets; + diff --git a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java index 3c3223b..a7c4223 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.edit.java @@ -7,55 +7,55 @@ > DELETE 2 @ 2 : 12 -> CHANGE 1 : 2 @ 11 : 15 +> CHANGE 1 : 2 @ 1 : 5 ~ -> INSERT 2 : 5 @ 5 +> INSERT 1 : 4 @ 1 + import org.json.JSONArray; + import org.json.JSONException; + import org.json.JSONObject; -> INSERT 4 : 8 @ 1 +> INSERT 1 : 5 @ 1 + import com.google.common.collect.Lists; + + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeSerializer; + -> CHANGE 5 : 7 @ 1 : 4 +> CHANGE 1 : 3 @ 1 : 4 ~ implements JSONTypeSerializer { ~ public AnimationMetadataSection deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 3 : 4 @ 4 : 6 +> CHANGE 1 : 2 @ 1 : 3 ~ int i = jsonobject.optInt("frametime", 1); -> CHANGE 7 : 8 @ 8 : 9 +> CHANGE 6 : 7 @ 6 : 7 ~ JSONArray jsonarray = jsonobject.getJSONArray("frames"); -> CHANGE 2 : 4 @ 2 : 5 +> CHANGE 1 : 3 @ 1 : 4 ~ for (int j = 0; j < jsonarray.length(); ++j) { ~ AnimationFrame animationframe = this.parseAnimationFrame(j, jsonarray.get(j)); -> CHANGE 7 : 8 @ 8 : 10 +> CHANGE 5 : 6 @ 5 : 7 ~ throw new JSONException("Invalid animation->frames: expected array, was " + jsonobject.get("frames"), -> CHANGE 5 : 7 @ 6 : 8 +> CHANGE 4 : 6 @ 4 : 6 ~ int k = jsonobject.optInt("width", -1); ~ int l = jsonobject.optInt("height", -1); -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 8 : 9 @ 8 : 9 ~ boolean flag = jsonobject.optBoolean("interpolate", false); -> CHANGE 4 : 10 @ 4 : 10 +> CHANGE 3 : 9 @ 3 : 9 ~ private AnimationFrame parseAnimationFrame(int parInt1, Object parJsonElement) { ~ if (parJsonElement instanceof Number) { @@ -64,40 +64,40 @@ ~ JSONObject jsonobject = (JSONObject) parJsonElement; ~ int i = jsonobject.optInt("time", -1); -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 4 : 5 @ 4 : 5 ~ int j = jsonobject.getInt(getSectionName()); -> CHANGE 8 : 11 @ 8 : 12 +> CHANGE 7 : 10 @ 7 : 11 ~ public JSONObject serialize(AnimationMetadataSection animationmetadatasection) { ~ JSONObject jsonobject = new JSONObject(); ~ jsonobject.put("frametime", Integer.valueOf(animationmetadatasection.getFrameTime())); -> CHANGE 4 : 5 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ jsonobject.put("width", Integer.valueOf(animationmetadatasection.getFrameWidth())); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("height", Integer.valueOf(animationmetadatasection.getFrameHeight())); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ JSONArray jsonarray = new JSONArray(); -> CHANGE 4 : 8 @ 4 : 8 +> CHANGE 3 : 7 @ 3 : 7 ~ JSONObject jsonobject1 = new JSONObject(); ~ jsonobject1.put("index", Integer.valueOf(animationmetadatasection.getFrameIndex(i))); ~ jsonobject1.put("time", Integer.valueOf(animationmetadatasection.getFrameTimeSingle(i))); ~ jsonarray.put(jsonobject1); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 1 : 2 @ 1 : 2 ~ jsonarray.put(Integer.valueOf(animationmetadatasection.getFrameIndex(i))); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("frames", jsonarray); diff --git a/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java index 7a0be76..5b39276 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.edit.java @@ -7,56 +7,56 @@ > DELETE 2 @ 2 : 10 -> INSERT 1 : 3 @ 9 +> INSERT 1 : 3 @ 1 + import org.json.JSONException; + import org.json.JSONObject; -> CHANGE 4 : 5 @ 2 : 5 +> CHANGE 2 : 3 @ 2 : 5 ~ public FontMetadataSection deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 8 : 10 @ 10 : 12 +> CHANGE 7 : 9 @ 7 : 9 ~ if (!(jsonobject.get("characters") instanceof JSONObject)) { ~ throw new JSONException( -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 3 : 4 @ 3 : 4 ~ JSONObject jsonobject1 = jsonobject.getJSONObject("characters"); -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 1 : 3 @ 1 : 3 ~ if (!(jsonobject1.get("default") instanceof JSONObject)) { ~ throw new JSONException( -> CHANGE 5 : 7 @ 5 : 7 +> CHANGE 3 : 5 @ 3 : 5 ~ JSONObject jsonobject2 = jsonobject1.getJSONObject("default"); ~ f = jsonobject2.optFloat("width", f); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ f1 = jsonobject2.optFloat("spacing", f1); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ f2 = jsonobject2.optFloat("left", f1); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ JSONObject jsonobject3 = jsonobject1.optJSONObject(Integer.toString(i)); -> CHANGE 4 : 6 @ 4 : 7 +> CHANGE 3 : 5 @ 3 : 6 ~ if (jsonobject3 != null) { ~ f3 = jsonobject3.optFloat("width", f); -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 1 : 2 @ 1 : 2 ~ f4 = jsonobject3.optFloat("spacing", f1); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ f5 = jsonobject3.optFloat("left", f2); diff --git a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java index 7c3b43b..ef60695 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.edit.java @@ -9,7 +9,7 @@ ~ import org.json.JSONObject; -> CHANGE 2 : 5 @ 3 : 4 +> CHANGE 1 : 4 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; ~ diff --git a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java index c7932e0..851418a 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.edit.java @@ -11,24 +11,24 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -> DELETE 8 @ 13 : 15 +> DELETE 5 @ 5 : 7 -> DELETE 1 @ 3 : 9 +> DELETE 1 @ 1 : 7 -> DELETE 4 @ 10 : 12 +> DELETE 4 @ 4 : 6 -> CHANGE 2 : 3 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ public T parseMetadataSection(String parString1, JSONObject parJsonObject) { -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ } else if (parJsonObject.optJSONObject(parString1) == null) { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ return (T) ((IMetadataSection) JSONTypeProvider.deserialize(parJsonObject.getJSONObject(parString1), -> DELETE 6 @ 6 : 14 +> DELETE 5 @ 5 : 13 > EOF diff --git a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java index c0406de..fb3139b 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java index 587c5c0..f21c05d 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 8 -> CHANGE 1 : 7 @ 7 : 8 +> CHANGE 1 : 7 @ 1 : 2 ~ ~ import org.json.JSONException; @@ -16,13 +16,13 @@ ~ import com.google.common.collect.Sets; ~ -> DELETE 7 @ 2 : 5 +> DELETE 1 @ 1 : 4 -> CHANGE 2 : 3 @ 5 : 8 +> CHANGE 2 : 3 @ 2 : 5 ~ public LanguageMetadataSection deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 3 : 8 @ 5 : 11 +> CHANGE 2 : 7 @ 2 : 8 ~ for (String s : jsonobject.keySet()) { ~ JSONObject jsonobject1 = jsonobject.getJSONObject(s); @@ -30,15 +30,15 @@ ~ String s2 = jsonobject1.getString("name"); ~ boolean flag = jsonobject1.optBoolean("bidirectional", false); -> CHANGE 6 : 7 @ 7 : 8 +> CHANGE 1 : 2 @ 1 : 2 ~ throw new JSONException("Invalid language->\'" + s + "\'->region: empty value"); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ throw new JSONException("Invalid language->\'" + s + "\'->name: empty value"); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ throw new JSONException("Duplicate language->\'" + s + "\' defined"); diff --git a/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java index 6770811..6262d38 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.edit.java @@ -13,24 +13,24 @@ ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeSerializer; ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -> DELETE 6 @ 10 : 11 +> DELETE 1 @ 1 : 2 -> CHANGE 2 : 6 @ 3 : 9 +> CHANGE 2 : 6 @ 2 : 8 ~ implements JSONTypeSerializer { ~ public PackMetadataSection deserialize(JSONObject jsonobject) throws JSONException { ~ IChatComponent ichatcomponent = JSONTypeProvider.deserialize(jsonobject.get("description"), ~ IChatComponent.class); -> CHANGE 5 : 6 @ 7 : 8 +> CHANGE 1 : 2 @ 1 : 2 ~ throw new JSONException("Invalid/missing description!"); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ int i = jsonobject.getInt("pack_format"); -> CHANGE 5 : 10 @ 5 : 10 +> CHANGE 4 : 9 @ 4 : 9 ~ public JSONObject serialize(PackMetadataSection packmetadatasection) { ~ JSONObject jsonobject = new JSONObject(); diff --git a/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java b/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java index a5c37e8..1ddadb0 100644 --- a/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 9 -> DELETE 1 @ 8 : 11 +> DELETE 1 @ 1 : 4 -> INSERT 1 : 7 @ 4 +> INSERT 1 : 7 @ 1 + import org.json.JSONArray; + import org.json.JSONException; @@ -18,36 +18,36 @@ + import com.google.common.collect.Lists; + -> CHANGE 7 : 10 @ 1 : 6 +> CHANGE 1 : 4 @ 1 : 6 ~ public TextureMetadataSection deserialize(JSONObject jsonobject) throws JSONException { ~ boolean flag = jsonobject.optBoolean("blur", false); ~ boolean flag1 = jsonobject.optBoolean("clamp", false); -> CHANGE 6 : 7 @ 8 : 9 +> CHANGE 3 : 4 @ 3 : 4 ~ JSONArray jsonarray = jsonobject.getJSONArray("mipmaps"); -> CHANGE 2 : 5 @ 2 : 5 +> CHANGE 1 : 4 @ 1 : 4 ~ for (int i = 0; i < jsonarray.length(); ++i) { ~ Object jsonelement = jsonarray.get(i); ~ if (jsonelement instanceof Number) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 1 : 2 @ 1 : 2 ~ arraylist.add(((Number) jsonelement).intValue()); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ throw new JSONException( -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 3 : 5 @ 3 : 5 ~ } else if (jsonelement instanceof JSONObject) { ~ throw new JSONException( -> CHANGE 6 : 7 @ 6 : 8 +> CHANGE 4 : 5 @ 4 : 6 ~ throw new JSONException("Invalid texture->mipmaps: expected array, was " + jsonobject.get("mipmaps"), diff --git a/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java index d81f3f2..dd62f31 100644 --- a/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/model/BuiltInModel.edit.java @@ -10,9 +10,9 @@ + + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 4 @ 2 : 4 +> DELETE 2 @ 2 : 4 -> CHANGE 29 : 30 @ 31 : 32 +> CHANGE 29 : 30 @ 29 : 30 ~ public EaglerTextureAtlasSprite getParticleTexture() { diff --git a/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java index c1641b8..fdf68a2 100644 --- a/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/model/IBakedModel.edit.java @@ -10,9 +10,9 @@ + + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 4 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> CHANGE 13 : 14 @ 14 : 15 +> CHANGE 13 : 14 @ 13 : 14 ~ EaglerTextureAtlasSprite getParticleTexture(); diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java index 7f7e3e8..e9f7c60 100644 --- a/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 8 -> INSERT 6 : 7 @ 12 +> INSERT 6 : 7 @ 6 + import java.nio.charset.StandardCharsets; -> DELETE 9 @ 8 : 9 +> DELETE 8 @ 8 : 9 -> INSERT 1 : 13 @ 2 +> INSERT 1 : 13 @ 1 + import java.util.Set; + @@ -28,108 +28,108 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 21 @ 9 : 10 +> DELETE 9 @ 9 : 10 -> DELETE 3 @ 4 : 10 +> DELETE 3 @ 3 : 9 -> DELETE 7 @ 13 : 16 +> DELETE 7 @ 7 : 10 -> CHANGE 20 : 21 @ 23 : 24 +> CHANGE 20 : 21 @ 20 : 21 ~ private final Map sprites = Maps.newHashMap(); -> INSERT 61 : 62 @ 61 +> INSERT 60 : 61 @ 60 + LOGGER.warn(var6); -> CHANGE 3 : 5 @ 2 : 3 +> CHANGE 2 : 4 @ 2 : 3 ~ LOGGER.warn("Unable to load definition " + modelresourcelocation); ~ LOGGER.warn(exception); -> CHANGE 41 : 42 @ 40 : 41 +> CHANGE 39 : 40 @ 39 : 40 ~ modelblockdefinition = new ModelBlockDefinition((ArrayList) arraylist); -> CHANGE 23 : 25 @ 23 : 24 +> CHANGE 22 : 24 @ 22 : 23 ~ + modelresourcelocation + "\'"); ~ LOGGER.warn(exception); -> CHANGE 20 : 21 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 ~ String str; -> CHANGE 3 : 5 @ 3 : 5 +> CHANGE 2 : 4 @ 2 : 4 ~ str = (String) BUILT_IN_MODELS.get(s1); ~ if (str == null) { -> DELETE 4 @ 4 : 6 +> DELETE 2 @ 2 : 4 -> CHANGE 2 : 5 @ 4 : 5 +> CHANGE 2 : 5 @ 2 : 3 ~ try (InputStream is = iresource.getInputStream()) { ~ str = IOUtils.inputStreamToString(is, StandardCharsets.UTF_8); ~ } -> CHANGE 5 : 7 @ 3 : 11 +> CHANGE 2 : 4 @ 2 : 10 ~ ModelBlock modelblock = ModelBlock.deserialize(str); ~ modelblock.name = parResourceLocation.toString(); -> CHANGE 3 : 4 @ 9 : 10 +> CHANGE 1 : 2 @ 1 : 2 ~ return modelblock; -> CHANGE 22 : 24 @ 22 : 23 +> CHANGE 21 : 23 @ 21 : 22 ~ + Item.itemRegistry.getNameForObject(item) + "\'"); ~ LOGGER.warn(exception); -> CHANGE 190 : 191 @ 189 : 190 +> CHANGE 188 : 189 @ 188 : 189 ~ for (ModelResourceLocation modelresourcelocation : (List) arraylist) { -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 19 : 20 @ 19 : 20 ~ EaglerTextureAtlasSprite textureatlassprite = (EaglerTextureAtlasSprite) this.sprites -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ EaglerTextureAtlasSprite textureatlassprite1 = (EaglerTextureAtlasSprite) this.sprites -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ EaglerTextureAtlasSprite parTextureAtlasSprite, EnumFacing parEnumFacing, ModelRotation parModelRotation, -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ List arraydeque = Lists.newLinkedList(); -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ ResourceLocation resourcelocation2 = (ResourceLocation) arraydeque.remove(0); -> CHANGE 15 : 17 @ 15 : 16 +> CHANGE 14 : 16 @ 14 : 15 ~ + "; unable to load model: \'" + resourcelocation2 + "\'"); ~ LOGGER.warn(exception); -> CHANGE 52 : 54 @ 51 : 53 +> CHANGE 50 : 52 @ 50 : 52 ~ for (ResourceLocation resourcelocation : (Set) set) { ~ EaglerTextureAtlasSprite textureatlassprite = texturemap.registerSprite(resourcelocation); -> CHANGE 23 : 24 @ 23 : 24 +> CHANGE 21 : 22 @ 21 : 22 ~ EaglerTextureAtlasSprite.setLocationNameCompass(resourcelocation2.toString()); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ EaglerTextureAtlasSprite.setLocationNameClock(resourcelocation2.toString()); -> CHANGE 53 : 54 @ 53 : 54 +> CHANGE 52 : 53 @ 52 : 53 ~ for (EaglerTextureAtlasSprite textureatlassprite : this.sprites.values()) { diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java index 3fc7b5f..9878d6c 100644 --- a/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 4 @ 3 +> INSERT 2 : 4 @ 2 + import net.minecraft.util.ResourceLocation; + diff --git a/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java b/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java index 98e8b15..bd65f5b 100644 --- a/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/model/ModelRotation.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 6 @ 2 +> INSERT 1 : 6 @ 1 + + import com.google.common.collect.Maps; @@ -15,6 +15,6 @@ + import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; + import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; -> DELETE 7 @ 2 : 4 +> DELETE 2 @ 2 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java index 692b867..edd8f33 100644 --- a/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.edit.java @@ -7,45 +7,45 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 5 @ 2 +> INSERT 1 : 5 @ 1 + + import com.google.common.collect.Lists; + + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 8 @ 4 : 6 +> DELETE 4 @ 4 : 6 -> CHANGE 7 : 8 @ 9 : 10 +> CHANGE 7 : 8 @ 7 : 8 ~ protected final EaglerTextureAtlasSprite texture; -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ EaglerTextureAtlasSprite parTextureAtlasSprite, ItemCameraTransforms parItemCameraTransforms) { -> CHANGE 29 : 30 @ 29 : 30 +> CHANGE 28 : 29 @ 28 : 29 ~ public EaglerTextureAtlasSprite getParticleTexture() { -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ private EaglerTextureAtlasSprite builderTexture; -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ public Builder(IBakedModel parIBakedModel, EaglerTextureAtlasSprite parTextureAtlasSprite) { -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ private void addFaceBreakingFours(IBakedModel parIBakedModel, EaglerTextureAtlasSprite parTextureAtlasSprite, -> CHANGE 8 : 10 @ 8 : 9 +> CHANGE 7 : 9 @ 7 : 8 ~ private void addGeneralBreakingFours(IBakedModel parIBakedModel, ~ EaglerTextureAtlasSprite parTextureAtlasSprite) { -> CHANGE 31 : 32 @ 30 : 31 +> CHANGE 29 : 30 @ 29 : 30 ~ public SimpleBakedModel.Builder setTexture(EaglerTextureAtlasSprite parTextureAtlasSprite) { diff --git a/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java b/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java index db2058f..980bc2d 100644 --- a/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 2 : 7 @ 4 +> INSERT 2 : 7 @ 2 + + import com.google.common.collect.ComparisonChain; @@ -15,9 +15,9 @@ + + import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; -> DELETE 7 @ 2 : 4 +> DELETE 2 @ 2 : 4 -> CHANGE 34 : 35 @ 36 : 37 +> CHANGE 34 : 35 @ 34 : 35 ~ public EaglerTextureAtlasSprite getParticleTexture() { diff --git a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java index c0b5619..81b38d0 100644 --- a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java +++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 7 -> CHANGE 1 : 4 @ 6 : 9 +> CHANGE 1 : 4 @ 1 : 4 ~ import java.io.ByteArrayOutputStream; ~ import java.io.InputStreamReader; ~ import java.io.OutputStreamWriter; -> DELETE 4 @ 4 : 6 +> DELETE 1 @ 1 : 3 -> INSERT 3 : 21 @ 5 +> INSERT 3 : 21 @ 3 + + import org.json.JSONArray; @@ -36,29 +36,29 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 23 @ 5 : 7 +> DELETE 5 @ 5 : 7 -> DELETE 5 @ 7 : 13 +> DELETE 5 @ 5 : 11 -> DELETE 3 @ 9 : 14 +> DELETE 3 @ 3 : 8 -> DELETE 1 @ 6 : 14 +> DELETE 1 @ 1 : 9 -> CHANGE 23 : 26 @ 31 : 34 +> CHANGE 23 : 26 @ 23 : 26 ~ public int clouds = 1; ~ public boolean fancyGraphics = false; ~ public int ambientOcclusion = 0; -> DELETE 11 @ 11 : 12 +> DELETE 8 @ 8 : 9 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 36 : 37 @ 37 : 38 +> CHANGE 36 : 37 @ 36 : 37 ~ public KeyBinding keyBindSprint = new KeyBinding("key.sprint", KeyboardConstants.KEY_R, "key.categories.movement"); -> CHANGE 11 : 17 @ 11 : 18 +> CHANGE 10 : 16 @ 10 : 17 ~ public KeyBinding keyBindSmoothCamera = new KeyBinding("key.smoothCamera", KeyboardConstants.KEY_M, ~ "key.categories.misc"); @@ -67,13 +67,13 @@ ~ public KeyBinding keyBindFunction = new KeyBinding("key.function", KeyboardConstants.KEY_F, "key.categories.misc"); ~ public KeyBinding keyBindClose = new KeyBinding("key.close", KeyboardConstants.KEY_GRAVE, "key.categories.misc"); -> DELETE 18 @ 19 : 20 +> DELETE 12 @ 12 : 13 -> CHANGE 12 : 13 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ public int guiScale = 3; -> INSERT 4 : 13 @ 4 +> INSERT 3 : 12 @ 3 + public boolean hudFps = true; + public boolean hudCoords = true; @@ -85,46 +85,46 @@ + public boolean fog = true; + public int fxaa = 0; -> CHANGE 10 : 11 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ public GameSettings(Minecraft mcIn) { -> CHANGE 5 : 7 @ 5 : 8 +> CHANGE 4 : 6 @ 4 : 7 ~ this.keyBindTogglePerspective, this.keyBindSmoothCamera, this.keyBindZoomCamera, this.keyBindFunction, ~ this.keyBindClose }, this.keyBindsHotbar); -> CHANGE 5 : 7 @ 6 : 7 +> CHANGE 3 : 5 @ 3 : 4 ~ this.gammaSetting = 1.0F; ~ this.language = EagRuntime.getConfiguration().getDefaultLocale(); -> CHANGE 4 : 5 @ 3 : 9 +> CHANGE 2 : 3 @ 2 : 8 ~ GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F); -> CHANGE 2 : 3 @ 7 : 8 +> CHANGE 1 : 2 @ 1 : 2 ~ this.renderDistanceChunks = 4; -> DELETE 4 @ 4 : 19 +> DELETE 3 @ 3 : 18 -> CHANGE 3 : 4 @ 18 : 19 +> CHANGE 3 : 4 @ 3 : 4 ~ : HString.format("%c", new Object[] { Character.valueOf((char) (parInt1 - 256)) }) -> DELETE 84 @ 84 : 85 +> DELETE 83 @ 83 : 84 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> INSERT 45 : 47 @ 46 +> INSERT 45 : 47 @ 45 + this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"), + I18n.format("resourcePack.load.pleaseWait")); -> DELETE 60 @ 58 : 75 +> DELETE 58 @ 58 : 75 -> INSERT 13 : 49 @ 30 +> INSERT 13 : 49 @ 13 + if (parOptions == GameSettings.Options.HUD_FPS) { + this.hudFps = !this.hudFps; @@ -163,9 +163,9 @@ + } + -> DELETE 90 @ 54 : 60 +> DELETE 54 @ 54 : 60 -> INSERT 12 : 28 @ 18 +> INSERT 12 : 28 @ 12 + case HUD_COORDS: + return this.hudCoords; @@ -184,21 +184,21 @@ + case FOG: + return this.fog; -> CHANGE 59 : 62 @ 43 : 47 +> CHANGE 43 : 46 @ 43 : 47 ~ : (parOptions == GameSettings.Options.CHAT_SCALE ~ ? s + (int) (f * 90.0F + 10.0F) + "%" ~ : (parOptions == GameSettings.Options.CHAT_HEIGHT_UNFOCUSED -> CHANGE 6 : 7 @ 7 : 8 +> CHANGE 3 : 4 @ 3 : 4 ~ : (parOptions == GameSettings.Options.CHAT_HEIGHT_FOCUSED -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ .calculateChatboxHeight( -> CHANGE 3 : 22 @ 3 : 37 +> CHANGE 2 : 21 @ 2 : 36 ~ : (parOptions == GameSettings.Options.CHAT_WIDTH ~ ? s + GuiNewChat @@ -220,7 +220,7 @@ ~ + "%") ~ : "yee")))))))))))); -> INSERT 47 : 55 @ 62 +> INSERT 28 : 36 @ 28 + } else if (parOptions == GameSettings.Options.FXAA) { + if (this.fxaa == 0) { @@ -231,17 +231,17 @@ + return s + I18n.format("options.off"); + } -> CHANGE 15 : 17 @ 7 : 8 +> CHANGE 7 : 9 @ 7 : 8 ~ byte[] options = EagRuntime.getStorage("g"); ~ if (options == null) { -> CHANGE 5 : 7 @ 4 : 5 +> CHANGE 3 : 5 @ 3 : 4 ~ BufferedReader bufferedreader = new BufferedReader( ~ new InputStreamReader(EaglerZLIB.newGZIPInputStream(new EaglerInputStream(options)))); -> CHANGE 85 : 91 @ 84 : 85 +> CHANGE 83 : 89 @ 83 : 84 ~ this.resourcePacks.clear(); ~ for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) { @@ -250,7 +250,7 @@ ~ } ~ } -> CHANGE 12 : 18 @ 7 : 8 +> CHANGE 6 : 12 @ 6 : 7 ~ this.field_183018_l.clear(); ~ for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) { @@ -259,11 +259,11 @@ ~ } ~ } -> DELETE 44 @ 39 : 43 +> DELETE 38 @ 38 : 42 -> DELETE 4 @ 8 : 12 +> DELETE 4 @ 4 : 8 -> INSERT 116 : 153 @ 120 +> INSERT 116 : 153 @ 116 + if (astring[0].equals("hudFps")) { + this.hudFps = astring[1].equals("true"); @@ -303,28 +303,28 @@ + } + -> INSERT 43 : 45 @ 6 +> INSERT 6 : 8 @ 6 + Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode()); + -> DELETE 19 @ 17 : 18 +> DELETE 17 @ 17 : 18 -> CHANGE 12 : 14 @ 13 : 14 +> CHANGE 12 : 14 @ 12 : 13 ~ ByteArrayOutputStream bao = new ByteArrayOutputStream(); ~ PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(EaglerZLIB.newGZIPOutputStream(bao))); -> CHANGE 28 : 30 @ 27 : 29 +> CHANGE 26 : 28 @ 26 : 28 ~ printwriter.println("resourcePacks:" + toJSONArray(this.resourcePacks)); ~ printwriter.println("incompatibleResourcePacks:" + toJSONArray(this.field_183018_l)); -> DELETE 10 @ 10 : 11 +> DELETE 8 @ 8 : 9 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> INSERT 29 : 38 @ 30 +> INSERT 29 : 38 @ 29 + printwriter.println("hudFps:" + this.hudFps); + printwriter.println("hudWorld:" + this.hudWorld); @@ -336,21 +336,21 @@ + printwriter.println("fog:" + this.fog); + printwriter.println("fxaa:" + this.fxaa); -> INSERT 14 : 16 @ 5 +> INSERT 5 : 7 @ 5 + Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode()); + -> INSERT 13 : 15 @ 11 +> INSERT 11 : 13 @ 11 + + EagRuntime.setStorage("g", bao.toByteArray()); -> CHANGE 12 : 13 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ : (parSoundCategory == SoundCategory.VOICE ? 0.0F : 1.0F); -> INSERT 54 : 62 @ 54 +> INSERT 53 : 61 @ 53 + private String toJSONArray(List e) { + JSONArray arr = new JSONArray(); @@ -361,16 +361,16 @@ + } + -> CHANGE 12 : 13 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ RENDER_DISTANCE("options.renderDistance", true, false, 1.0F, 16.0F, 1.0F), -> CHANGE 9 : 11 @ 9 : 13 +> CHANGE 8 : 10 @ 8 : 12 ~ TOUCHSCREEN("options.touchscreen", false, true), CHAT_SCALE("options.chat.scale", true, false), ~ CHAT_WIDTH("options.chat.width", true, false), CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false), -> CHANGE 16 : 21 @ 18 : 19 +> CHANGE 14 : 19 @ 14 : 15 ~ ENTITY_SHADOWS("options.entityShadows", false, true), HUD_FPS("options.hud.fps", false, true), ~ HUD_COORDS("options.hud.coords", false, true), HUD_STATS("options.hud.stats", false, true), diff --git a/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java b/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java index 76297ce..171d49f 100644 --- a/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java +++ b/patches/minecraft/net/minecraft/client/settings/KeyBinding.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 2 : 6 @ 4 +> INSERT 2 : 6 @ 2 + + import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/client/stream/IStream.edit.java b/patches/minecraft/net/minecraft/client/stream/IStream.edit.java index fe182f3..0edbe56 100644 --- a/patches/minecraft/net/minecraft/client/stream/IStream.edit.java +++ b/patches/minecraft/net/minecraft/client/stream/IStream.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 8 -> DELETE 13 @ 19 : 23 +> DELETE 13 @ 13 : 17 -> DELETE 14 @ 18 : 20 +> DELETE 14 @ 14 : 16 -> DELETE 2 @ 4 : 6 +> DELETE 2 @ 2 : 4 -> DELETE 8 @ 10 : 12 +> DELETE 8 @ 8 : 10 -> DELETE 4 @ 6 : 8 +> DELETE 4 @ 4 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java b/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java index 192f46d..cecf372 100644 --- a/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java +++ b/patches/minecraft/net/minecraft/client/util/JsonBlendingMode.edit.java @@ -9,41 +9,41 @@ ~ import org.json.JSONObject; -> INSERT 2 : 5 @ 5 +> INSERT 1 : 4 @ 1 + import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; + import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; + -> CHANGE 48 : 49 @ 45 : 46 +> CHANGE 45 : 46 @ 45 : 46 ~ EaglercraftGPU.glBlendEquation(this.field_148112_f); -> CHANGE 43 : 44 @ 43 : 44 +> CHANGE 42 : 43 @ 42 : 43 ~ public static JsonBlendingMode func_148110_a(JSONObject parJsonObject) { -> CHANGE 11 : 13 @ 11 : 13 +> CHANGE 10 : 12 @ 10 : 12 ~ if (parJsonObject.get("func") instanceof String) { ~ i = func_148108_a(parJsonObject.getString("func")); -> CHANGE 7 : 9 @ 7 : 9 +> CHANGE 5 : 7 @ 5 : 7 ~ if (parJsonObject.get("srcrgb") instanceof String) { ~ j = func_148107_b(parJsonObject.getString("srcrgb")); -> CHANGE 7 : 9 @ 7 : 9 +> CHANGE 5 : 7 @ 5 : 7 ~ if (parJsonObject.get("dstrgb") instanceof String) { ~ k = func_148107_b(parJsonObject.getString("dstrgb")); -> CHANGE 7 : 9 @ 7 : 9 +> CHANGE 5 : 7 @ 5 : 7 ~ if (parJsonObject.get("srcalpha") instanceof String) { ~ l = func_148107_b(parJsonObject.getString("srcalpha")); -> CHANGE 9 : 11 @ 9 : 11 +> CHANGE 7 : 9 @ 7 : 9 ~ if (parJsonObject.get("dstalpha") instanceof String) { ~ i1 = func_148107_b(parJsonObject.getString("dstalpha")); diff --git a/patches/minecraft/net/minecraft/client/util/JsonException.edit.java b/patches/minecraft/net/minecraft/client/util/JsonException.edit.java index 5d78d70..0fb7bc9 100644 --- a/patches/minecraft/net/minecraft/client/util/JsonException.edit.java +++ b/patches/minecraft/net/minecraft/client/util/JsonException.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 3 -> INSERT 3 : 4 @ 4 +> INSERT 3 : 4 @ 3 + -> INSERT 3 : 5 @ 2 +> INSERT 2 : 4 @ 2 + import com.google.common.collect.Lists; + diff --git a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java index 2c4c901..e380bd7 100644 --- a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java +++ b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java @@ -7,6 +7,6 @@ > DELETE 2 @ 2 : 3 -> DELETE 25 @ 26 : 27 +> DELETE 25 @ 25 : 26 > EOF diff --git a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java index a7acbff..91d2ce5 100644 --- a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java +++ b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 8 -> DELETE 6 @ 12 : 13 +> DELETE 6 @ 6 : 7 -> INSERT 1 : 2 @ 2 +> INSERT 1 : 2 @ 1 + import java.util.Set; -> CHANGE 3 : 12 @ 2 : 4 +> CHANGE 2 : 11 @ 2 : 4 ~ ~ import com.google.common.base.Predicate; @@ -25,95 +25,95 @@ ~ ~ import net.minecraft.client.Minecraft; -> DELETE 13 @ 6 : 7 +> DELETE 4 @ 4 : 5 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 17 @ 18 : 22 +> DELETE 17 @ 17 : 21 -> CHANGE 13 : 14 @ 17 : 18 +> CHANGE 13 : 14 @ 13 : 14 ~ for (Entity entity : (List) list) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ return IChatComponent.join(arraylist); -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ for (World world : (List) list) { -> CHANGE 27 : 31 @ 27 : 28 +> CHANGE 26 : 30 @ 26 : 27 ~ Minecraft mc = Minecraft.getMinecraft(); ~ if (mc.theWorld != null) { ~ arraylist.add(mc.thePlayer); ~ } -> CHANGE 26 : 28 @ 23 : 25 +> CHANGE 22 : 24 @ 22 : 24 ~ String ss = func_179651_b(parMap, "type"); ~ final boolean flag = ss != null && ss.startsWith("!"); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ ss = ss.substring(1); -> INSERT 2 : 3 @ 2 +> INSERT 1 : 2 @ 1 + final String s = ss; -> CHANGE 30 : 31 @ 29 : 36 +> CHANGE 29 : 30 @ 29 : 36 ~ return false; -> CHANGE 14 : 15 @ 20 : 26 +> CHANGE 13 : 14 @ 13 : 19 ~ return false; -> CHANGE 10 : 12 @ 15 : 17 +> CHANGE 9 : 11 @ 9 : 11 ~ String ss = func_179651_b(parMap, "team"); ~ final boolean flag = ss != null && ss.startsWith("!"); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ ss = ss.substring(1); -> INSERT 2 : 3 @ 2 +> INSERT 1 : 2 @ 1 + final String s = ss; -> CHANGE 22 : 23 @ 21 : 22 +> CHANGE 21 : 22 @ 21 : 22 ~ final Map map = func_96560_a(parMap); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ Scoreboard scoreboard = Minecraft.getMinecraft().theWorld.getScoreboard(); -> CHANGE 15 : 16 @ 15 : 17 +> CHANGE 14 : 15 @ 14 : 16 ~ String s1 = entity instanceof EntityPlayer ? entity.getName() : entity.getUniqueID().toString(); -> CHANGE 26 : 28 @ 27 : 29 +> CHANGE 25 : 27 @ 25 : 27 ~ String ss = func_179651_b(parMap, "name"); ~ final boolean flag = ss != null && ss.startsWith("!"); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ ss = ss.substring(1); -> INSERT 2 : 3 @ 2 +> INSERT 1 : 2 @ 1 + final String s = ss; -> CHANGE 141 : 142 @ 140 : 141 +> CHANGE 140 : 141 @ 140 : 141 ~ parList = (List) Lists.newArrayList(new Entity[] { entity }); -> INSERT 134 : 135 @ 134 +> INSERT 133 : 134 @ 133 + diff --git a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java index a9ce147..3aa909a 100644 --- a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java @@ -7,41 +7,41 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 3 @ 2 : 9 +> CHANGE 1 : 3 @ 1 : 8 ~ ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; -> DELETE 4 @ 9 : 10 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ public abstract class CommandBlockLogic { -> DELETE 7 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 17 @ 18 : 20 +> DELETE 17 @ 17 : 19 -> DELETE 16 @ 18 : 20 +> DELETE 16 @ 16 : 18 -> DELETE 16 @ 18 : 21 +> DELETE 16 @ 16 : 19 -> DELETE 1 @ 4 : 30 +> DELETE 1 @ 1 : 27 -> DELETE 15 @ 41 : 46 +> DELETE 15 @ 15 : 20 -> CHANGE 4 : 5 @ 9 : 12 +> CHANGE 4 : 5 @ 4 : 7 ~ return true; -> DELETE 3 @ 5 : 9 +> DELETE 2 @ 2 : 6 -> CHANGE 22 : 23 @ 26 : 30 +> CHANGE 22 : 23 @ 22 : 26 ~ playerIn.openEditCommandBlock(this); -> DELETE 4 @ 7 : 11 +> DELETE 3 @ 3 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/crash/CrashReport.edit.java b/patches/minecraft/net/minecraft/crash/CrashReport.edit.java index 4a9252b..4d6f168 100644 --- a/patches/minecraft/net/minecraft/crash/CrashReport.edit.java +++ b/patches/minecraft/net/minecraft/crash/CrashReport.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 5 -> DELETE 2 @ 5 : 7 +> DELETE 2 @ 2 : 4 -> CHANGE 4 : 13 @ 6 : 7 +> CHANGE 4 : 13 @ 4 : 5 ~ ~ import com.google.common.collect.Lists; @@ -21,19 +21,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 10 @ 2 : 7 +> DELETE 1 @ 1 : 6 -> DELETE 7 @ 12 : 13 +> DELETE 7 @ 7 : 8 -> CHANGE 1 : 2 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ private String[] stacktrace; -> INSERT 5 : 6 @ 5 +> INSERT 4 : 5 @ 4 + this.stacktrace = EagRuntime.getStackTraceElements(causeThrowable); -> CHANGE 27 : 38 @ 26 : 54 +> CHANGE 26 : 37 @ 26 : 54 ~ if (EagRuntime.getPlatformType() != EnumPlatformType.JAVASCRIPT) { ~ this.theReportCategory.addCrashSectionCallable("Memory", new Callable() { @@ -47,24 +47,24 @@ ~ return k + " bytes (" + j1 + " MB) / " + j + " bytes (" + i1 + " MB) up to " + i + " bytes (" + l ~ + " MB)"; -> CHANGE 12 : 14 @ 29 : 38 +> CHANGE 1 : 3 @ 1 : 10 ~ }); ~ } -> CHANGE 14 : 15 @ 21 : 22 +> CHANGE 12 : 13 @ 12 : 13 ~ this.stacktrace = (String[]) ArrayUtils -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ for (String stacktraceelement : this.stacktrace) { -> CHANGE 17 : 18 @ 17 : 28 +> CHANGE 16 : 17 @ 16 : 27 ~ StringBuilder stackTrace = new StringBuilder(); -> CHANGE 2 : 9 @ 12 : 13 +> CHANGE 1 : 8 @ 1 : 2 ~ if ((this.cause.getMessage() == null || this.cause.getMessage().length() == 0) ~ && ((this.cause instanceof NullPointerException) || (this.cause instanceof StackOverflowError) @@ -74,29 +74,29 @@ ~ } else { ~ stackTrace.append(this.cause.toString()).append('\n'); -> CHANGE 9 : 12 @ 3 : 4 +> CHANGE 2 : 5 @ 2 : 3 ~ EagRuntime.getStackTrace(this.cause, (s) -> { ~ stackTrace.append("\tat ").append(s).append('\n'); ~ }); -> CHANGE 4 : 5 @ 2 : 13 +> CHANGE 1 : 2 @ 1 : 12 ~ return stackTrace.toString(); -> DELETE 28 @ 38 : 63 +> DELETE 27 @ 27 : 52 -> CHANGE 12 : 15 @ 37 : 40 +> CHANGE 12 : 15 @ 12 : 15 ~ String[] astacktraceelement = EagRuntime.getStackTraceElements(cause); ~ String stacktraceelement = null; ~ String stacktraceelement1 = null; -> CHANGE 24 : 25 @ 24 : 25 +> CHANGE 21 : 22 @ 21 : 22 ~ this.stacktrace = new String[j]; -> CHANGE 12 : 13 @ 12 : 31 +> CHANGE 11 : 12 @ 11 : 30 ~ return "eagler"; diff --git a/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java b/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java index 6b99ecc..d952215 100644 --- a/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java +++ b/patches/minecraft/net/minecraft/crash/CrashReportCategory.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 7 @ 3 +> INSERT 2 : 7 @ 2 + + import com.google.common.collect.Lists; @@ -15,76 +15,76 @@ + import net.lax1dude.eaglercraft.v1_8.EagRuntime; + import net.lax1dude.eaglercraft.v1_8.HString; -> DELETE 7 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> CHANGE 6 : 7 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ private String[] stackTrace = new String[0]; -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ return HString.format("%.2f,%.2f,%.2f - %s", new Object[] { Double.valueOf(x), Double.valueOf(y), -> CHANGE 11 : 12 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ stringbuilder.append(HString.format("World: (%d,%d,%d)", -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ stringbuilder.append(HString.format("Chunk: (at %d,%d,%d in %d,%d; contains blocks %d,0,%d to %d,255,%d)", -> CHANGE 22 : 23 @ 22 : 23 +> CHANGE 21 : 22 @ 21 : 22 ~ HString.format("Region: (%d,%d; contains chunks %d,%d to %d,%d, blocks %d,0,%d to %d,255,%d)", -> CHANGE 29 : 31 @ 29 : 31 +> CHANGE 28 : 30 @ 28 : 30 ~ String[] astacktraceelement = EagRuntime.getStackTraceElements(new Exception()); ~ if (astacktraceelement.length - 3 - size <= 0) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ this.stackTrace = new String[astacktraceelement.length - 3 - size]; -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ public boolean firstTwoElementsOfStackTraceMatch(String s1, String s2) { -> CHANGE 2 : 4 @ 2 : 7 +> CHANGE 1 : 3 @ 1 : 6 ~ String stacktraceelement = this.stackTrace[0]; ~ if (s1.equals(stacktraceelement)) { -> CHANGE 19 : 20 @ 22 : 23 +> CHANGE 17 : 18 @ 17 : 18 ~ String[] astacktraceelement = new String[this.stackTrace.length - amount]; -> CHANGE 19 : 20 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 ~ for (String stacktraceelement : this.stackTrace) { -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ builder.append(stacktraceelement); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ public String[] getStackTrace() { -> CHANGE 10 : 12 @ 10 : 12 +> CHANGE 9 : 11 @ 9 : 11 ~ return HString.format("ID #%d (%s // %s)", new Object[] { Integer.valueOf(i), ~ blockIn.getUnlocalizedName(), blockIn.getClass().getName() }); -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 10 : 11 @ 10 : 11 ~ String s = HString.format("%4s", new Object[] { Integer.toBinaryString(blockData) }).replace(" ", -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ return HString.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(blockData), s }); -> CHANGE 34 : 35 @ 34 : 35 +> CHANGE 33 : 34 @ 33 : 34 ~ this.value = "~~ERROR~~ " + throwable.getClass().getName() + ": " + throwable.getMessage(); diff --git a/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java b/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java index 440760c..2ce060f 100644 --- a/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java +++ b/patches/minecraft/net/minecraft/enchantment/Enchantment.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 3 : 7 @ 5 : 23 +> CHANGE 3 : 7 @ 3 : 21 ~ ~ import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java index 9ba3984..897b9bd 100644 --- a/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java +++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentDurability.edit.java @@ -10,7 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 28 : 29 @ 29 : 30 +> CHANGE 26 : 27 @ 26 : 27 ~ public static boolean negateDamage(ItemStack parItemStack, int parInt1, EaglercraftRandom parRandom) { diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java index a6e8fa8..3e755dd 100644 --- a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java +++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 6 : 11 @ 8 : 11 +> CHANGE 6 : 11 @ 6 : 9 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -15,29 +15,29 @@ ~ import com.google.common.collect.Maps; ~ -> CHANGE 18 : 19 @ 16 : 17 +> CHANGE 13 : 14 @ 13 : 14 ~ private static final EaglercraftRandom enchantmentRand = new EaglercraftRandom(); -> CHANGE 212 : 214 @ 212 : 213 +> CHANGE 211 : 213 @ 211 : 212 ~ public static int calcItemStackEnchantability(EaglercraftRandom parRandom, int parInt1, int parInt2, ~ ItemStack parItemStack) { -> CHANGE 16 : 17 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ public static ItemStack addRandomEnchantment(EaglercraftRandom parRandom, ItemStack parItemStack, int parInt1) { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ for (EnchantmentData enchantmentdata : (List) list) { -> CHANGE 12 : 14 @ 12 : 13 +> CHANGE 11 : 13 @ 11 : 12 ~ public static List buildEnchantmentList(EaglercraftRandom randomIn, ItemStack itemStackIn, ~ int parInt1) { -> CHANGE 32 : 33 @ 31 : 32 +> CHANGE 30 : 31 @ 30 : 31 ~ for (EnchantmentData enchantmentdata1 : (List) arraylist) { diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java b/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java index e5ddfd8..d6c09bd 100644 --- a/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java +++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentThorns.edit.java @@ -10,15 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 32 : 33 @ 34 : 35 +> CHANGE 30 : 31 @ 30 : 31 ~ EaglercraftRandom random = entitylivingbase.getRNG(); -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ public static boolean func_92094_a(int parInt1, EaglercraftRandom parRandom) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public static int func_92095_b(int parInt1, EaglercraftRandom parRandom) { diff --git a/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java b/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java index 8c6587a..2b134a9 100644 --- a/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java +++ b/patches/minecraft/net/minecraft/entity/DataWatcher.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 4 : 10 @ 6 : 8 +> CHANGE 4 : 10 @ 4 : 6 ~ ~ import org.apache.commons.lang3.ObjectUtils; @@ -16,38 +16,38 @@ ~ import com.google.common.collect.Maps; ~ -> DELETE 8 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 5 @ 6 : 7 +> DELETE 5 @ 5 : 6 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> DELETE 16 @ 17 : 18 +> DELETE 16 @ 16 : 17 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 28 @ 29 : 31 +> DELETE 28 @ 28 : 30 -> DELETE 9 @ 11 : 13 +> DELETE 9 @ 9 : 11 -> DELETE 41 @ 43 : 45 +> DELETE 41 @ 41 : 43 -> DELETE 10 @ 12 : 14 +> DELETE 10 @ 10 : 12 -> DELETE 7 @ 9 : 11 +> DELETE 7 @ 7 : 9 -> DELETE 3 @ 5 : 7 +> DELETE 3 @ 3 : 5 -> DELETE 5 @ 7 : 8 +> DELETE 5 @ 5 : 6 -> DELETE 9 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> DELETE 93 @ 94 : 95 +> DELETE 93 @ 93 : 94 -> DELETE 10 @ 11 : 12 +> DELETE 10 @ 10 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/entity/Entity.edit.java b/patches/minecraft/net/minecraft/entity/Entity.edit.java index d91872a..3a48633 100644 --- a/patches/minecraft/net/minecraft/entity/Entity.edit.java +++ b/patches/minecraft/net/minecraft/entity/Entity.edit.java @@ -11,139 +11,139 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ import net.lax1dude.eaglercraft.v1_8.HString; -> INSERT 4 : 5 @ 3 +> INSERT 1 : 2 @ 1 + -> DELETE 8 @ 7 : 10 +> DELETE 7 @ 7 : 10 -> DELETE 4 @ 7 : 10 +> DELETE 4 @ 4 : 7 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> DELETE 8 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> DELETE 14 @ 15 : 16 +> DELETE 14 @ 14 : 15 -> CHANGE 1 : 2 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ public abstract class Entity { -> CHANGE 45 : 46 @ 45 : 46 +> CHANGE 44 : 45 @ 44 : 45 ~ protected EaglercraftRandom rand; -> CHANGE 28 : 29 @ 28 : 30 +> CHANGE 27 : 28 @ 27 : 29 ~ protected EaglercraftUUID entityUniqueID; -> CHANGE 21 : 22 @ 22 : 23 +> CHANGE 20 : 21 @ 20 : 21 ~ this.rand = new EaglercraftRandom(); -> DELETE 4 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 59 @ 60 : 63 +> DELETE 59 @ 59 : 62 -> DELETE 45 @ 48 : 63 +> DELETE 45 @ 45 : 60 -> DELETE 1 @ 16 : 38 +> DELETE 1 @ 1 : 23 -> CHANGE 2 : 3 @ 24 : 36 +> CHANGE 2 : 3 @ 2 : 14 ~ this.fire = 0; -> DELETE 2 @ 13 : 17 +> DELETE 1 @ 1 : 5 -> DELETE 9 @ 13 : 17 +> DELETE 9 @ 9 : 13 -> CHANGE 116 : 117 @ 120 : 121 +> CHANGE 116 : 117 @ 116 : 117 ~ for (AxisAlignedBB axisalignedbb1 : (List) list1) { -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ for (AxisAlignedBB axisalignedbb2 : (List) list1) { -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ for (AxisAlignedBB axisalignedbb13 : (List) list1) { -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ for (AxisAlignedBB axisalignedbb6 : (List) list) { -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ for (AxisAlignedBB axisalignedbb7 : (List) list) { -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ for (AxisAlignedBB axisalignedbb8 : (List) list) { -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ for (AxisAlignedBB axisalignedbb9 : (List) list) { -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ for (AxisAlignedBB axisalignedbb10 : (List) list) { -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ for (AxisAlignedBB axisalignedbb11 : (List) list) { -> CHANGE 19 : 20 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 ~ for (AxisAlignedBB axisalignedbb12 : (List) list) { -> DELETE 596 @ 596 : 597 +> DELETE 595 @ 595 : 596 -> CHANGE 55 : 57 @ 56 : 57 +> CHANGE 55 : 57 @ 55 : 56 ~ this.entityUniqueID = new EaglercraftUUID(tagCompund.getLong("UUIDMost"), ~ tagCompund.getLong("UUIDLeast")); -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ this.entityUniqueID = EaglercraftUUID.fromString(tagCompund.getString("UUID")); -> DELETE 10 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> CHANGE 216 : 217 @ 217 : 218 +> CHANGE 216 : 217 @ 216 : 217 ~ for (AxisAlignedBB axisalignedbb : (List) list) { -> DELETE 24 @ 24 : 45 +> DELETE 23 @ 23 : 44 -> CHANGE 28 : 29 @ 49 : 50 +> CHANGE 28 : 29 @ 28 : 29 ~ boolean flag = this.worldObj != null; -> CHANGE 184 : 185 @ 184 : 185 +> CHANGE 183 : 184 @ 183 : 184 ~ return HString.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", -> DELETE 26 @ 26 : 60 +> DELETE 25 @ 25 : 59 -> CHANGE 30 : 31 @ 64 : 65 +> CHANGE 30 : 31 @ 30 : 31 ~ return EntityList.getEntityString(Entity.this) + " (" + Entity.this.getClass().getName() + ")"; -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ category.addCrashSection("Entity\'s Exact location", HString.format("%.2f, %.2f, %.2f", -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ category.addCrashSection("Entity\'s Momentum", HString.format("%.2f, %.2f, %.2f", new Object[] { -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ public EaglercraftUUID getUniqueID() { -> DELETE 63 @ 63 : 67 +> DELETE 62 @ 62 : 66 -> DELETE 51 @ 55 : 67 +> DELETE 51 @ 51 : 63 > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java index ccfff42..8ac69de 100644 --- a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 4 -> DELETE 24 @ 26 : 49 +> DELETE 24 @ 24 : 47 -> CHANGE 12 : 13 @ 35 : 36 +> CHANGE 12 : 13 @ 12 : 13 ~ return this.dataWatcher.getWatchableObjectByte(12); -> CHANGE 53 : 60 @ 53 : 64 +> CHANGE 52 : 59 @ 52 : 63 ~ if (this.field_175503_c > 0) { ~ if (this.field_175503_c % 4 == 0) { @@ -23,11 +23,11 @@ ~ this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 0.0D, ~ 0.0D, 0.0D, new int[0]); -> CHANGE 9 : 10 @ 13 : 26 +> CHANGE 2 : 3 @ 2 : 15 ~ --this.field_175503_c; -> INSERT 3 : 4 @ 15 +> INSERT 2 : 3 @ 2 + this.setScaleForAge(this.isChild()); diff --git a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java index c1a3395..1503a6d 100644 --- a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java @@ -10,23 +10,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 4 @ 7 : 8 +> DELETE 2 @ 2 : 3 -> CHANGE 4 : 6 @ 5 : 6 +> CHANGE 4 : 6 @ 4 : 5 ~ public static final EaglercraftUUID FLEEING_SPEED_MODIFIER_UUID = EaglercraftUUID ~ .fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A"); -> DELETE 6 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> CHANGE 16 : 17 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ return false; -> DELETE 49 @ 49 : 54 +> DELETE 48 @ 48 : 53 -> DELETE 4 @ 9 : 13 +> DELETE 4 @ 4 : 8 -> DELETE 14 @ 18 : 23 +> DELETE 14 @ 14 : 19 > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java index a99fa03..7b40649 100644 --- a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java @@ -10,18 +10,18 @@ + import org.apache.commons.lang3.Validate; + -> DELETE 4 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> CHANGE 68 : 69 @ 69 : 77 +> CHANGE 68 : 69 @ 68 : 76 ~ this.tickCounter1++; -> DELETE 47 @ 54 : 68 +> DELETE 46 @ 46 : 60 -> DELETE 1 @ 15 : 19 +> DELETE 1 @ 1 : 5 -> DELETE 4 @ 8 : 12 +> DELETE 4 @ 4 : 8 > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java index 60e1a9f..b406cd0 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java @@ -7,8 +7,8 @@ > DELETE 3 @ 3 : 6 -> DELETE 1 @ 4 : 6 +> DELETE 1 @ 1 : 3 -> DELETE 59 @ 61 : 90 +> DELETE 59 @ 59 : 88 > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityList.edit.java b/patches/minecraft/net/minecraft/entity/EntityList.edit.java index 0b80322..39d585c 100644 --- a/patches/minecraft/net/minecraft/entity/EntityList.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityList.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 4 : 10 @ 6 : 10 +> CHANGE 4 : 10 @ 4 : 8 ~ ~ import com.google.common.collect.Lists; @@ -16,81 +16,81 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 72 @ 70 : 72 +> DELETE 66 @ 66 : 68 -> INSERT 4 : 6 @ 6 +> INSERT 4 : 6 @ 4 + private static final Map> stringToConstructorMapping = Maps + .newHashMap(); -> INSERT 4 : 5 @ 2 +> INSERT 2 : 3 @ 2 + private static final Map> idToConstructorMapping = Maps.newHashMap(); -> CHANGE 5 : 7 @ 4 : 5 +> CHANGE 4 : 6 @ 4 : 5 ~ private static void addMapping(Class entityClass, ~ EntityConstructor entityConstructor, String entityName, int id) { -> INSERT 12 : 13 @ 11 +> INSERT 10 : 11 @ 10 + stringToConstructorMapping.put(entityName, entityConstructor); -> INSERT 3 : 4 @ 2 +> INSERT 2 : 3 @ 2 + idToConstructorMapping.put(Integer.valueOf(id), entityConstructor); -> CHANGE 6 : 8 @ 5 : 6 +> CHANGE 5 : 7 @ 5 : 6 ~ private static void addMapping(Class entityClass, ~ EntityConstructor entityConstructor, String entityName, int entityID, int baseColor, -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ addMapping(entityClass, entityConstructor, entityName, entityID); -> CHANGE 8 : 11 @ 8 : 12 +> CHANGE 7 : 10 @ 7 : 11 ~ EntityConstructor constructor = stringToConstructorMapping.get(entityName); ~ if (constructor != null) { ~ entity = constructor.createEntity(worldIn); -> CHANGE 5 : 6 @ 6 : 7 +> CHANGE 2 : 3 @ 2 : 3 ~ logger.error("Could not create entity", exception); -> CHANGE 14 : 17 @ 14 : 18 +> CHANGE 13 : 16 @ 13 : 17 ~ EntityConstructor constructor = stringToConstructorMapping.get(nbt.getString("id")); ~ if (constructor != null) { ~ entity = constructor.createEntity(worldIn); -> CHANGE 5 : 6 @ 6 : 7 +> CHANGE 2 : 3 @ 2 : 3 ~ logger.error("Could not create entity", exception); -> CHANGE 16 : 19 @ 16 : 20 +> CHANGE 15 : 18 @ 15 : 19 ~ EntityConstructor constructor = getConstructorFromID(entityID); ~ if (constructor != null) { ~ entity = constructor.createEntity(worldIn); -> CHANGE 5 : 6 @ 6 : 7 +> CHANGE 2 : 3 @ 2 : 3 ~ logger.error("Could not create entity", exception); -> INSERT 19 : 23 @ 19 +> INSERT 18 : 22 @ 18 + public static EntityConstructor getConstructorFromID(int entityID) { + return idToConstructorMapping.get(Integer.valueOf(entityID)); + } + -> CHANGE 21 : 22 @ 17 : 18 +> CHANGE 17 : 18 @ 17 : 18 ~ Set set = stringToClassMapping.keySet(); -> CHANGE 30 : 99 @ 30 : 92 +> CHANGE 29 : 98 @ 29 : 91 ~ addMapping(EntityItem.class, (w) -> new EntityItem(w), "Item", 1); ~ addMapping(EntityXPOrb.class, (w) -> new EntityXPOrb(w), "XPOrb", 2); diff --git a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java index 10ebb13..6f210ba 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java @@ -10,25 +10,25 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 3 @ 2 : 14 +> DELETE 1 @ 1 : 13 -> DELETE 17 @ 29 : 32 +> DELETE 17 @ 17 : 20 -> DELETE 7 @ 10 : 11 +> DELETE 7 @ 7 : 8 -> DELETE 4 @ 5 : 8 +> DELETE 4 @ 4 : 7 -> DELETE 1 @ 4 : 7 +> DELETE 1 @ 1 : 4 -> DELETE 1 @ 4 : 5 +> DELETE 1 @ 1 : 2 -> DELETE 10 @ 11 : 17 +> DELETE 10 @ 10 : 16 -> DELETE 1 @ 7 : 14 +> DELETE 1 @ 1 : 8 -> DELETE 7 @ 14 : 38 +> DELETE 7 @ 7 : 31 -> CHANGE 61 : 71 @ 85 : 100 +> CHANGE 61 : 71 @ 61 : 76 ~ for (int i = 0; i < 20; ++i) { ~ double d0 = this.rand.nextGaussian() * 0.02D; @@ -41,19 +41,19 @@ ~ this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width - d2 * d3, ~ d0, d1, d2, new int[0]); -> DELETE 11 @ 16 : 17 +> DELETE 1 @ 1 : 2 -> DELETE 11 @ 12 : 20 +> DELETE 11 @ 11 : 19 -> DELETE 113 @ 121 : 137 +> DELETE 113 @ 113 : 129 -> DELETE 95 @ 111 : 139 +> DELETE 95 @ 95 : 123 -> DELETE 328 @ 356 : 364 +> DELETE 328 @ 328 : 336 -> DELETE 19 @ 27 : 32 +> DELETE 19 @ 19 : 24 -> CHANGE 5 : 7 @ 10 : 11 +> CHANGE 5 : 7 @ 5 : 6 ~ EaglercraftUUID uuid = new EaglercraftUUID(this.leashNBTTag.getLong("UUIDMost"), ~ this.leashNBTTag.getLong("UUIDLeast")); diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java index 00aaeba..256fcf4 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> CHANGE 4 : 11 @ 7 : 9 +> CHANGE 4 : 11 @ 4 : 6 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; @@ -17,94 +17,94 @@ ~ import com.google.common.collect.Maps; ~ -> DELETE 9 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 5 @ 9 : 12 +> DELETE 5 @ 5 : 8 -> DELETE 1 @ 4 : 6 +> DELETE 1 @ 1 : 3 -> DELETE 9 @ 11 : 14 +> DELETE 9 @ 9 : 12 -> DELETE 13 @ 16 : 17 +> DELETE 13 @ 13 : 14 -> CHANGE 2 : 4 @ 3 : 4 +> CHANGE 2 : 4 @ 2 : 3 ~ private static final EaglercraftUUID sprintingSpeedBoostModifierUUID = EaglercraftUUID ~ .fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D"); -> DELETE 95 @ 94 : 111 +> DELETE 93 @ 93 : 110 -> CHANGE 25 : 26 @ 42 : 45 +> CHANGE 25 : 26 @ 25 : 28 ~ this.extinguish(); -> DELETE 23 @ 25 : 28 +> DELETE 22 @ 22 : 25 -> CHANGE 14 : 15 @ 17 : 18 +> CHANGE 14 : 15 @ 14 : 15 ~ if (this.hurtResistantTime > 0) { -> DELETE 42 @ 42 : 45 +> DELETE 41 @ 41 : 44 -> DELETE 1 @ 4 : 12 +> DELETE 1 @ 1 : 9 -> CHANGE 33 : 34 @ 41 : 42 +> CHANGE 33 : 34 @ 33 : 34 ~ public EaglercraftRandom getRNG() { -> DELETE 75 @ 75 : 78 +> DELETE 74 @ 74 : 77 -> CHANGE 37 : 38 @ 40 : 46 +> CHANGE 37 : 38 @ 37 : 43 ~ if (potioneffect.onUpdate(this) && potioneffect.getDuration() % 600 == 0) { -> CHANGE 5 : 6 @ 10 : 14 +> CHANGE 4 : 5 @ 4 : 8 ~ this.potionsNeedUpdate = false; -> DELETE 2 @ 5 : 8 +> DELETE 1 @ 1 : 4 -> DELETE 47 @ 50 : 51 +> DELETE 47 @ 47 : 48 -> DELETE 1 @ 2 : 11 +> DELETE 1 @ 1 : 10 -> DELETE 62 @ 71 : 76 +> DELETE 62 @ 62 : 67 -> DELETE 4 @ 9 : 16 +> DELETE 4 @ 4 : 11 -> DELETE 4 @ 11 : 16 +> DELETE 4 @ 4 : 9 -> CHANGE 19 : 20 @ 24 : 117 +> CHANGE 19 : 20 @ 19 : 112 ~ return false; -> DELETE 34 @ 126 : 131 +> DELETE 33 @ 33 : 38 -> DELETE 1 @ 6 : 15 +> DELETE 1 @ 1 : 10 -> DELETE 190 @ 199 : 203 +> DELETE 190 @ 190 : 194 -> DELETE 59 @ 63 : 64 +> DELETE 59 @ 59 : 60 -> CHANGE 154 : 157 @ 155 : 160 +> CHANGE 154 : 157 @ 154 : 159 ~ if (!this.worldObj.isBlockLoaded(new BlockPos((int) this.posX, 0, (int) this.posZ)) ~ || !this.worldObj.getChunkFromBlockCoords(new BlockPos((int) this.posX, 0, (int) this.posZ)) ~ .isLoaded()) { -> DELETE 90 @ 92 : 128 +> DELETE 87 @ 87 : 123 -> DELETE 158 @ 194 : 198 +> DELETE 158 @ 158 : 162 -> DELETE 29 @ 33 : 37 +> DELETE 29 @ 29 : 33 -> DELETE 31 @ 35 : 41 +> DELETE 31 @ 31 : 37 -> DELETE 1 @ 7 : 18 +> DELETE 1 @ 1 : 12 -> CHANGE 31 : 32 @ 42 : 43 +> CHANGE 31 : 32 @ 31 : 32 ~ return false; diff --git a/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java b/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java index 76fd257..14cf225 100644 --- a/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.edit.java @@ -9,6 +9,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; -> DELETE 3 @ 3 : 4 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java index 2d4d04f..314b145 100644 --- a/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ ~ import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java b/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java index 21d029c..12c831f 100644 --- a/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java +++ b/patches/minecraft/net/minecraft/entity/SharedMonsterAttributes.edit.java @@ -12,13 +12,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 11 @ 8 : 10 +> DELETE 7 @ 7 : 9 -> CHANGE 33 : 34 @ 35 : 36 +> CHANGE 33 : 34 @ 33 : 34 ~ for (AttributeModifier attributemodifier : (Collection) collection) { -> CHANGE 58 : 60 @ 58 : 59 +> CHANGE 57 : 59 @ 57 : 58 ~ EaglercraftUUID uuid = new EaglercraftUUID(parNBTTagCompound.getLong("UUIDMost"), ~ parNBTTagCompound.getLong("UUIDLeast")); diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java index 314be98..b9fb1a8 100644 --- a/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java @@ -10,21 +10,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> INSERT 4 : 7 @ 5 +> INSERT 2 : 5 @ 2 + import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom; + import net.minecraft.util.MathHelper; + -> CHANGE 7 : 8 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ private final EaglercraftUUID id; -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ public AttributeModifier(EaglercraftUUID idIn, String nameIn, double amountIn, int operationIn) { -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ public EaglercraftUUID getID() { diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java index f48bce2..1c8b299 100644 --- a/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> CHANGE 3 : 8 @ 6 : 9 +> CHANGE 3 : 8 @ 3 : 6 ~ ~ import com.google.common.collect.HashMultimap; diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java index d45888b..d8e223c 100644 --- a/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> CHANGE 15 : 16 @ 17 : 18 +> CHANGE 14 : 15 @ 14 : 15 ~ AttributeModifier getModifier(EaglercraftUUID var1); diff --git a/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java b/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java index 87d424e..1f5811d 100644 --- a/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java @@ -7,34 +7,34 @@ > DELETE 2 @ 2 : 5 -> INSERT 2 : 3 @ 5 +> INSERT 2 : 3 @ 2 + import java.util.List; -> CHANGE 3 : 4 @ 2 : 7 +> CHANGE 2 : 3 @ 2 : 7 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> INSERT 2 : 6 @ 6 +> INSERT 1 : 5 @ 1 + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; + import com.google.common.collect.Sets; + -> CHANGE 9 : 10 @ 5 : 6 +> CHANGE 5 : 6 @ 5 : 6 ~ private final Map mapByUUID = Maps.newHashMap(); -> CHANGE 45 : 46 @ 45 : 46 +> CHANGE 44 : 45 @ 44 : 45 ~ public AttributeModifier getModifier(EaglercraftUUID uuid) { -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ Set object = (Set) this.mapByName.get(attributemodifier.getName()); -> CHANGE 39 : 40 @ 39 : 40 +> CHANGE 38 : 39 @ 38 : 39 ~ for (AttributeModifier attributemodifier : (List) Lists.newArrayList(collection)) { diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java index ef03c0f..6d7cc0e 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java +++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java @@ -7,23 +7,23 @@ > DELETE 2 @ 2 : 5 -> CHANGE 1 : 2 @ 4 : 7 +> CHANGE 1 : 2 @ 1 : 4 ~ -> DELETE 3 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 5 +> DELETE 2 @ 2 : 4 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> DELETE 2 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 5 +> DELETE 2 @ 2 : 4 -> CHANGE 71 : 76 @ 73 : 80 +> CHANGE 71 : 76 @ 71 : 78 ~ float f = MathHelper.cos(this.animTime * 3.1415927F * 2.0F); ~ float f1 = MathHelper.cos(this.prevAnimTime * 3.1415927F * 2.0F); @@ -31,7 +31,7 @@ ~ this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.enderdragon.wings", 5.0F, ~ 0.8F + this.rand.nextFloat() * 0.3F, false); -> CHANGE 43 : 56 @ 45 : 139 +> CHANGE 38 : 51 @ 38 : 132 ~ if (this.newPosRotationIncrements > 0) { ~ double d10 = this.posX + (this.newPosX - this.posX) / (double) this.newPosRotationIncrements; @@ -47,26 +47,26 @@ ~ this.setPosition(d10, d0, d1); ~ this.setRotation(this.rotationYaw, this.rotationPitch); -> DELETE 42 @ 123 : 133 +> DELETE 29 @ 29 : 39 -> DELETE 37 @ 47 : 52 +> DELETE 37 @ 37 : 42 -> DELETE 7 @ 12 : 17 +> DELETE 7 @ 7 : 12 -> CHANGE 13 : 14 @ 18 : 19 +> CHANGE 13 : 14 @ 13 : 14 ~ for (EntityEnderCrystal entityendercrystal1 : (List) list) { -> DELETE 13 @ 13 : 75 +> DELETE 12 @ 12 : 74 -> DELETE 4 @ 66 : 107 +> DELETE 4 @ 4 : 45 -> DELETE 45 @ 86 : 104 +> DELETE 45 @ 45 : 63 -> DELETE 2 @ 20 : 23 +> DELETE 2 @ 2 : 5 -> DELETE 1 @ 4 : 16 +> DELETE 1 @ 1 : 13 -> DELETE 2 @ 14 : 57 +> DELETE 2 @ 2 : 45 > EOF diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java index 8f3cfa3..4f14a4d 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java +++ b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java @@ -10,24 +10,24 @@ + import java.util.List; + -> CHANGE 4 : 5 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ -> DELETE 4 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 4 @ 5 : 13 +> DELETE 4 @ 4 : 12 -> DELETE 8 @ 16 : 17 +> DELETE 8 @ 8 : 9 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 28 @ 29 : 38 +> DELETE 28 @ 28 : 37 -> DELETE 35 @ 44 : 51 +> DELETE 35 @ 35 : 42 -> DELETE 1 @ 8 : 22 +> DELETE 1 @ 1 : 15 -> DELETE 311 @ 325 : 332 +> DELETE 311 @ 311 : 318 > EOF diff --git a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java index f24b247..f72a5df 100644 --- a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java +++ b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 7 -> DELETE 1 @ 6 : 9 +> DELETE 1 @ 1 : 4 -> DELETE 13 @ 16 : 35 +> DELETE 13 @ 13 : 32 -> DELETE 19 @ 38 : 45 +> DELETE 19 @ 19 : 26 -> CHANGE 4 : 5 @ 11 : 23 +> CHANGE 4 : 5 @ 4 : 16 ~ this.worldObj.setLastLightningBolt(2); diff --git a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java index b11ddf5..df876a8 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java @@ -9,24 +9,24 @@ ~ +> DELETE 3 @ 3 : 4 + +> DELETE 1 @ 1 : 6 + > DELETE 4 @ 4 : 5 -> DELETE 1 @ 2 : 7 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 9 : 10 +> DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 3 +> DELETE 248 @ 248 : 311 -> DELETE 3 @ 4 : 5 +> DELETE 5 @ 5 : 32 -> DELETE 248 @ 249 : 312 - -> DELETE 5 @ 68 : 95 - -> CHANGE 1 : 2 @ 28 : 83 +> CHANGE 1 : 2 @ 1 : 56 ~ return false; -> DELETE 13 @ 67 : 107 +> DELETE 12 @ 12 : 52 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java index 2e14f18..13069cb 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java @@ -7,26 +7,26 @@ > DELETE 2 @ 2 : 3 -> DELETE 6 @ 7 : 9 +> DELETE 6 @ 6 : 8 -> DELETE 3 @ 5 : 7 +> DELETE 3 @ 3 : 5 -> DELETE 62 @ 64 : 97 +> DELETE 62 @ 62 : 95 -> CHANGE 109 : 110 @ 142 : 143 +> CHANGE 109 : 110 @ 109 : 110 ~ if (this.isBoatEmpty) { -> CHANGE 94 : 95 @ 94 : 108 +> CHANGE 93 : 94 @ 93 : 107 ~ if (!(this.isCollidedHorizontally && d9 > 0.2975D)) { -> DELETE 25 @ 38 : 55 +> DELETE 24 @ 24 : 41 -> CHANGE 19 : 20 @ 36 : 46 +> CHANGE 19 : 20 @ 19 : 29 ~ return true; -> DELETE 7 @ 16 : 29 +> DELETE 6 @ 6 : 19 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java index 74c46c6..4adb285 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java @@ -7,6 +7,6 @@ > DELETE 6 @ 6 : 7 -> DELETE 55 @ 56 : 73 +> DELETE 55 @ 55 : 72 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java index 220a498..6624360 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java @@ -7,10 +7,10 @@ > DELETE 3 @ 3 : 6 -> DELETE 105 @ 108 : 118 +> DELETE 105 @ 105 : 115 -> DELETE 1 @ 11 : 20 +> DELETE 1 @ 1 : 10 -> DELETE 15 @ 24 : 38 +> DELETE 15 @ 15 : 29 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java index 2852316..6085c67 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java @@ -7,10 +7,10 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 38 @ 39 : 68 +> DELETE 38 @ 38 : 67 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java index ec70b0d..577aff6 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java @@ -7,10 +7,10 @@ > DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 29 @ 30 : 33 +> DELETE 29 @ 29 : 32 -> DELETE 1 @ 4 : 13 +> DELETE 1 @ 1 : 10 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java index 4dcca6b..a491366 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java @@ -7,28 +7,28 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 5 @ 2 +> INSERT 1 : 5 @ 1 + import java.util.List; + + import com.google.common.collect.Lists; + -> DELETE 6 @ 2 : 4 +> DELETE 2 @ 2 : 4 -> DELETE 5 @ 7 : 9 +> DELETE 5 @ 5 : 7 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 55 @ 56 : 59 +> DELETE 55 @ 55 : 58 -> DELETE 8 @ 11 : 26 +> DELETE 8 @ 8 : 23 -> DELETE 1 @ 16 : 49 +> DELETE 1 @ 1 : 34 -> CHANGE 13 : 14 @ 46 : 47 +> CHANGE 13 : 14 @ 13 : 14 ~ for (Entity entity : (List) arraylist) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java index 760f5fb..a3cbfc5 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java @@ -9,9 +9,9 @@ ~ if (this.fireworkAge % 2 < 2) { -> DELETE 6 @ 6 : 11 +> DELETE 5 @ 5 : 10 -> CHANGE 3 : 4 @ 8 : 9 +> CHANGE 3 : 4 @ 3 : 4 ~ if (b0 == 17) { diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java index 64df19a..b2f6acb 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java @@ -10,20 +10,20 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 7 @ 5 : 6 +> DELETE 5 @ 5 : 6 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 5 @ 6 : 8 +> DELETE 5 @ 5 : 7 -> DELETE 68 @ 70 : 74 +> DELETE 68 @ 68 : 72 -> DELETE 21 @ 25 : 28 +> DELETE 21 @ 21 : 24 -> DELETE 136 @ 139 : 148 +> DELETE 136 @ 136 : 145 -> DELETE 1 @ 10 : 45 +> DELETE 1 @ 1 : 36 -> DELETE 11 @ 46 : 54 +> DELETE 11 @ 11 : 19 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java index 9a5336d..d9dfeee 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java @@ -7,6 +7,6 @@ > DELETE 41 @ 41 : 46 -> DELETE 126 @ 131 : 144 +> DELETE 126 @ 126 : 139 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java index 4a71f85..54b5790 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java @@ -7,23 +7,23 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Maps; + -> DELETE 11 @ 8 : 15 +> DELETE 8 @ 8 : 15 -> DELETE 4 @ 11 : 12 +> DELETE 4 @ 4 : 5 -> DELETE 11 @ 12 : 13 +> DELETE 11 @ 11 : 12 -> CHANGE 85 : 86 @ 86 : 113 +> CHANGE 85 : 86 @ 85 : 112 ~ return true; -> CHANGE 43 : 54 @ 69 : 124 +> CHANGE 42 : 53 @ 42 : 97 ~ if (this.turnProgress > 0) { ~ double d4 = this.posX + (this.minecartX - this.posX) / (double) this.turnProgress; @@ -37,14 +37,14 @@ ~ this.setPosition(d4, d5, d6); ~ this.setRotation(this.rotationYaw, this.rotationPitch); -> CHANGE 12 : 13 @ 56 : 96 +> CHANGE 1 : 2 @ 1 : 41 ~ this.setPosition(this.posX, this.posY, this.posZ); -> DELETE 2 @ 41 : 58 +> DELETE 1 @ 1 : 18 -> DELETE 351 @ 368 : 378 +> DELETE 351 @ 351 : 361 -> DELETE 1 @ 11 : 78 +> DELETE 1 @ 1 : 68 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java index 17045d7..c03abff 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java @@ -7,6 +7,6 @@ > DELETE 2 @ 2 : 3 -> DELETE 142 @ 143 : 147 +> DELETE 142 @ 142 : 146 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java index 6a6277f..8245f5f 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java @@ -7,6 +7,6 @@ > DELETE 3 @ 3 : 4 -> DELETE 19 @ 20 : 24 +> DELETE 19 @ 19 : 23 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java index 97f9774..f77a69b 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java @@ -9,10 +9,10 @@ + -> DELETE 2 @ 1 : 4 +> DELETE 1 @ 1 : 4 -> DELETE 44 @ 47 : 51 +> DELETE 44 @ 44 : 48 -> DELETE 35 @ 39 : 60 +> DELETE 35 @ 35 : 56 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java index bd79954..4dfe37f 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java @@ -7,10 +7,10 @@ > DELETE 5 @ 5 : 6 -> DELETE 75 @ 76 : 81 +> DELETE 75 @ 75 : 80 -> DELETE 1 @ 6 : 11 +> DELETE 1 @ 1 : 6 -> DELETE 29 @ 34 : 41 +> DELETE 29 @ 29 : 36 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java index 6e6896b..aaf5e80 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityPainting.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java index 8f3adca..956a427 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java @@ -7,6 +7,6 @@ > DELETE 61 @ 61 : 64 -> DELETE 8 @ 11 : 16 +> DELETE 8 @ 8 : 13 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java index 684ed89..1b04d0b 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java @@ -7,20 +7,20 @@ > DELETE 4 @ 4 : 14 -> DELETE 2 @ 12 : 13 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 10 @ 11 : 18 +> DELETE 10 @ 10 : 17 -> CHANGE 39 : 43 @ 46 : 51 +> CHANGE 39 : 43 @ 39 : 44 ~ if (this.rand.nextInt(24) == 0 && !this.isSilent()) { ~ this.worldObj.playSound(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire", ~ 1.0F + this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F, false); ~ } -> CHANGE 5 : 10 @ 6 : 13 +> CHANGE 1 : 6 @ 1 : 8 ~ for (int i = 0; i < 2; ++i) { ~ this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, @@ -28,6 +28,6 @@ ~ this.posY + this.rand.nextDouble() * (double) this.height, ~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, 0.0D, 0.0D, 0.0D, new int[0]); -> DELETE 72 @ 74 : 152 +> DELETE 67 @ 67 : 145 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java index 63a1516..2515a48 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java @@ -7,14 +7,14 @@ > DELETE 4 @ 4 : 13 -> DELETE 1 @ 10 : 13 +> DELETE 1 @ 1 : 4 -> DELETE 17 @ 20 : 29 +> DELETE 17 @ 17 : 26 -> DELETE 74 @ 83 : 84 +> DELETE 74 @ 74 : 75 -> DELETE 66 @ 67 : 72 +> DELETE 66 @ 66 : 71 -> DELETE 5 @ 10 : 21 +> DELETE 5 @ 5 : 16 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java index a91d474..a952acc 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java @@ -7,35 +7,35 @@ > DELETE 2 @ 2 : 7 -> CHANGE 1 : 5 @ 6 : 7 +> CHANGE 1 : 5 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ ~ import com.google.common.collect.Sets; ~ -> DELETE 5 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 5 : 13 +> DELETE 4 @ 4 : 12 -> DELETE 1 @ 9 : 12 +> DELETE 1 @ 1 : 4 -> DELETE 1 @ 4 : 5 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 6 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> CHANGE 4 : 6 @ 5 : 6 +> CHANGE 4 : 6 @ 4 : 5 ~ private static final EaglercraftUUID attackingSpeedBoostModifierUUID = EaglercraftUUID ~ .fromString("020E0DFB-87AE-4653-9556-831010E291A0"); -> DELETE 11 @ 10 : 25 +> DELETE 9 @ 9 : 24 -> DELETE 38 @ 53 : 69 +> DELETE 38 @ 38 : 54 -> CHANGE 5 : 12 @ 21 : 30 +> CHANGE 5 : 12 @ 5 : 14 ~ for (int i = 0; i < 2; ++i) { ~ this.worldObj.spawnParticle(EnumParticleTypes.PORTAL, @@ -45,18 +45,18 @@ ~ (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), ~ (this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]); -> DELETE 8 @ 10 : 11 +> DELETE 1 @ 1 : 2 -> DELETE 143 @ 144 : 147 +> DELETE 143 @ 143 : 146 -> CHANGE 2 : 3 @ 5 : 11 +> CHANGE 2 : 3 @ 2 : 8 ~ this.isAggressive = true; -> CHANGE 33 : 34 @ 38 : 39 +> CHANGE 32 : 33 @ 32 : 33 ~ public static void bootstrap() { -> DELETE 17 @ 17 : 168 +> DELETE 16 @ 16 : 167 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java index 3d96b90..05711e8 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java @@ -7,9 +7,9 @@ > DELETE 5 @ 5 : 13 -> DELETE 15 @ 23 : 30 +> DELETE 15 @ 15 : 22 -> CHANGE 64 : 71 @ 71 : 88 +> CHANGE 64 : 71 @ 64 : 81 ~ for (int i = 0; i < 2; ++i) { ~ this.worldObj.spawnParticle(EnumParticleTypes.PORTAL, @@ -19,6 +19,6 @@ ~ (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), ~ (this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]); -> DELETE 8 @ 18 : 19 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java index e37ce75..00e44e7 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java @@ -7,20 +7,20 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 1 @ 5 : 6 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 5 : 7 +> DELETE 4 @ 4 : 6 -> DELETE 1 @ 3 : 5 +> DELETE 1 @ 1 : 3 -> DELETE 11 @ 13 : 18 +> DELETE 11 @ 11 : 16 -> DELETE 14 @ 19 : 27 +> DELETE 14 @ 14 : 22 -> DELETE 85 @ 93 : 260 +> DELETE 85 @ 85 : 252 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java index c7978da..36f0a2f 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java @@ -7,33 +7,33 @@ > DELETE 2 @ 2 : 3 -> DELETE 4 @ 5 : 17 +> DELETE 4 @ 4 : 16 -> DELETE 6 @ 18 : 23 +> DELETE 6 @ 6 : 11 -> DELETE 3 @ 8 : 9 +> DELETE 3 @ 3 : 4 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 11 @ 12 : 13 +> DELETE 11 @ 11 : 12 -> DELETE 5 @ 6 : 18 +> DELETE 5 @ 5 : 17 -> DELETE 21 @ 33 : 37 +> DELETE 21 @ 21 : 25 -> DELETE 24 @ 28 : 32 +> DELETE 24 @ 24 : 28 -> DELETE 16 @ 20 : 21 +> DELETE 16 @ 16 : 17 -> DELETE 9 @ 10 : 14 +> DELETE 9 @ 9 : 13 -> CHANGE 7 : 8 @ 11 : 12 +> CHANGE 7 : 8 @ 7 : 8 ~ } else { -> DELETE 12 @ 12 : 14 +> DELETE 11 @ 11 : 13 -> CHANGE 50 : 55 @ 52 : 70 +> CHANGE 50 : 55 @ 50 : 68 ~ this.field_175484_c = this.field_175482_b; ~ if (!this.isInWater()) { @@ -41,7 +41,7 @@ ~ if (this.motionY > 0.0D && this.field_175480_bp && !this.isSilent()) { ~ this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.guardian.flop", 1.0F, 1.0F, false); -> CHANGE 7 : 12 @ 20 : 26 +> CHANGE 2 : 7 @ 2 : 8 ~ this.field_175480_bp = this.motionY < 0.0D ~ && this.worldObj.isBlockNormalCube((new BlockPos(this)).down(), false); @@ -49,17 +49,17 @@ ~ if (this.field_175483_bk < 0.5F) { ~ this.field_175483_bk = 4.0F; -> CHANGE 6 : 7 @ 7 : 8 +> CHANGE 1 : 2 @ 1 : 2 ~ this.field_175483_bk += (0.5F - this.field_175483_bk) * 0.1F; -> INSERT 2 : 5 @ 2 +> INSERT 1 : 4 @ 1 + } else { + this.field_175483_bk += (0.125F - this.field_175483_bk) * 0.2F; + } -> CHANGE 4 : 13 @ 1 : 3 +> CHANGE 1 : 10 @ 1 : 3 ~ this.field_175482_b += this.field_175483_bk; ~ this.field_175486_bm = this.field_175485_bl; @@ -71,7 +71,7 @@ ~ this.field_175485_bl += (1.0F - this.field_175485_bl) * 0.06F; ~ } -> CHANGE 10 : 19 @ 3 : 10 +> CHANGE 1 : 10 @ 1 : 8 ~ if (this.func_175472_n() && this.isInWater()) { ~ Vec3 vec3 = this.getLook(0.0F); @@ -83,18 +83,18 @@ ~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width - vec3.zCoord * 1.5D, 0.0D, ~ 0.0D, 0.0D, new int[0]); -> INSERT 10 : 11 @ 8 +> INSERT 1 : 2 @ 1 + } -> CHANGE 2 : 6 @ 1 : 5 +> CHANGE 1 : 5 @ 1 : 5 ~ if (this.hasTargetedEntity()) { ~ if (this.field_175479_bo < this.func_175464_ck()) { ~ ++this.field_175479_bo; ~ } -> CHANGE 5 : 17 @ 5 : 19 +> CHANGE 1 : 13 @ 1 : 15 ~ EntityLivingBase entitylivingbase = this.getTargetedEntity(); ~ if (entitylivingbase != null) { @@ -109,7 +109,7 @@ ~ d2 = d2 / d3; ~ double d4 = this.rand.nextDouble(); -> CHANGE 13 : 18 @ 15 : 21 +> CHANGE 1 : 6 @ 1 : 7 ~ while (d4 < d3) { ~ d4 += 1.8D - d5 + this.rand.nextDouble() * (1.7D - d5); @@ -117,10 +117,10 @@ ~ this.posY + d1 * d4 + (double) this.getEyeHeight(), this.posZ + d2 * d4, 0.0D, 0.0D, 0.0D, ~ new int[0]); -> DELETE 39 @ 40 : 73 +> DELETE 34 @ 34 : 67 -> DELETE 48 @ 81 : 82 +> DELETE 48 @ 48 : 49 -> DELETE 27 @ 28 : 164 +> DELETE 27 @ 27 : 163 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java index ef26d3f..8bfc043 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java @@ -7,22 +7,22 @@ > DELETE 2 @ 2 : 3 -> DELETE 5 @ 6 : 8 +> DELETE 5 @ 5 : 7 -> DELETE 2 @ 4 : 18 +> DELETE 2 @ 2 : 16 -> DELETE 5 @ 19 : 20 +> DELETE 5 @ 5 : 6 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 6 @ 7 : 20 +> DELETE 6 @ 6 : 19 -> DELETE 7 @ 20 : 35 +> DELETE 7 @ 7 : 22 -> DELETE 87 @ 102 : 106 +> DELETE 87 @ 87 : 91 -> DELETE 54 @ 58 : 105 +> DELETE 54 @ 54 : 101 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java index 31da3d8..3bf41ad 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java @@ -7,6 +7,6 @@ > DELETE 7 @ 7 : 8 -> DELETE 23 @ 24 : 32 +> DELETE 23 @ 23 : 31 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java index e22a849..975328c 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java @@ -10,26 +10,26 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 3 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 6 +> DELETE 3 @ 3 : 5 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> CHANGE 10 : 11 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ private static final EaglercraftUUID ATTACK_SPEED_BOOST_MODIFIER_UUID = EaglercraftUUID -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ private EaglercraftUUID angerTargetUUID; -> DELETE 15 @ 15 : 20 +> DELETE 14 @ 14 : 19 -> CHANGE 64 : 65 @ 69 : 70 +> CHANGE 64 : 65 @ 64 : 65 ~ this.angerTargetUUID = EaglercraftUUID.fromString(s); -> DELETE 83 @ 83 : 106 +> DELETE 82 @ 82 : 105 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java index 1bd155b..a625dbb 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 2 @ 4 : 11 +> DELETE 2 @ 2 : 9 -> DELETE 4 @ 11 : 14 +> DELETE 4 @ 4 : 7 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> DELETE 4 @ 5 : 11 +> DELETE 4 @ 4 : 10 -> DELETE 33 @ 39 : 51 +> DELETE 33 @ 33 : 45 -> DELETE 35 @ 47 : 156 +> DELETE 35 @ 35 : 144 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java index 0eff036..e1e4d39 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java @@ -9,24 +9,24 @@ + -> DELETE 11 @ 10 : 25 +> DELETE 10 @ 10 : 25 -> DELETE 14 @ 29 : 30 +> DELETE 14 @ 14 : 15 -> DELETE 2 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> DELETE 3 @ 6 : 20 +> DELETE 3 @ 3 : 17 -> DELETE 45 @ 59 : 73 +> DELETE 45 @ 45 : 59 -> CHANGE 1 : 2 @ 15 : 25 +> CHANGE 1 : 2 @ 1 : 11 ~ if (this.getSkeletonType() == 1) { -> DELETE 77 @ 86 : 96 +> DELETE 76 @ 76 : 86 -> DELETE 15 @ 25 : 34 +> DELETE 15 @ 15 : 24 -> DELETE 56 @ 65 : 73 +> DELETE 56 @ 56 : 64 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java index bea441a..19c4fc8 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java @@ -7,14 +7,14 @@ > DELETE 7 @ 7 : 13 -> DELETE 4 @ 10 : 11 +> DELETE 4 @ 4 : 5 -> DELETE 19 @ 20 : 27 +> DELETE 19 @ 19 : 26 -> DELETE 48 @ 55 : 60 +> DELETE 48 @ 48 : 53 -> DELETE 59 @ 64 : 91 +> DELETE 59 @ 59 : 86 -> DELETE 109 @ 136 : 294 +> DELETE 109 @ 109 : 267 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java index 210bd86..e063eb6 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 4 -> DELETE 3 @ 5 : 13 +> DELETE 3 @ 3 : 11 -> DELETE 1 @ 9 : 10 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> DELETE 7 @ 10 : 17 +> DELETE 7 @ 7 : 14 -> DELETE 8 @ 15 : 46 +> DELETE 8 @ 8 : 39 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java index 4db7a4b..fdd25b1 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java @@ -10,21 +10,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 3 @ 5 : 17 +> DELETE 3 @ 3 : 15 -> DELETE 2 @ 14 : 16 +> DELETE 2 @ 2 : 4 -> DELETE 11 @ 13 : 23 +> DELETE 11 @ 11 : 21 -> DELETE 6 @ 16 : 20 +> DELETE 6 @ 6 : 10 -> DELETE 5 @ 9 : 17 +> DELETE 5 @ 5 : 13 -> DELETE 97 @ 105 : 136 +> DELETE 97 @ 97 : 128 -> CHANGE 3 : 4 @ 34 : 35 +> CHANGE 3 : 4 @ 3 : 4 ~ public void func_111104_a(EaglercraftRandom rand) { diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java index f60a238..6682e77 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java @@ -10,21 +10,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 5 @ 6 : 13 +> DELETE 3 @ 3 : 10 -> DELETE 1 @ 8 : 11 +> DELETE 1 @ 1 : 4 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 6 : 8 @ 7 : 8 +> CHANGE 6 : 8 @ 6 : 7 ~ private static final EaglercraftUUID MODIFIER_UUID = EaglercraftUUID ~ .fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E"); -> DELETE 11 @ 10 : 17 +> DELETE 9 @ 9 : 16 -> DELETE 33 @ 40 : 97 +> DELETE 33 @ 33 : 90 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java index 1e1751b..ca8ad52 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java @@ -10,39 +10,39 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 9 @ 8 : 18 +> DELETE 7 @ 7 : 17 -> DELETE 2 @ 12 : 13 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 8 @ 12 : 13 +> DELETE 8 @ 8 : 9 -> CHANGE 13 : 15 @ 14 : 15 +> CHANGE 13 : 15 @ 13 : 14 ~ private static final EaglercraftUUID babySpeedBoostUUID = EaglercraftUUID ~ .fromString("B9766B59-9566-4402-BC1F-2EE2A276D836"); -> DELETE 4 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 7 @ 8 : 16 +> DELETE 7 @ 7 : 15 -> DELETE 3 @ 11 : 21 +> DELETE 3 @ 3 : 13 -> DELETE 29 @ 39 : 51 +> DELETE 29 @ 29 : 41 -> DELETE 14 @ 26 : 34 +> DELETE 14 @ 14 : 22 -> DELETE 11 @ 19 : 51 +> DELETE 11 @ 11 : 43 -> DELETE 53 @ 85 : 97 +> DELETE 53 @ 53 : 65 -> DELETE 90 @ 102 : 104 +> DELETE 90 @ 90 : 92 -> DELETE 86 @ 88 : 89 +> DELETE 86 @ 86 : 87 -> DELETE 24 @ 25 : 26 +> DELETE 24 @ 24 : 25 -> DELETE 17 @ 18 : 22 +> DELETE 17 @ 17 : 21 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java index aaa84d2..0eb4731 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java @@ -9,10 +9,10 @@ + -> DELETE 4 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 141 @ 142 : 154 +> DELETE 141 @ 141 : 153 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java index ce57a21..6927a0e 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java @@ -7,8 +7,8 @@ > DELETE 6 @ 6 : 15 -> DELETE 22 @ 31 : 39 +> DELETE 22 @ 22 : 30 -> DELETE 28 @ 36 : 42 +> DELETE 28 @ 28 : 34 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java index 68d2b34..dd2538a 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java @@ -7,8 +7,8 @@ > DELETE 5 @ 5 : 14 -> DELETE 4 @ 13 : 14 +> DELETE 4 @ 4 : 5 -> DELETE 7 @ 8 : 17 +> DELETE 7 @ 7 : 16 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java index e66e08c..b2f407b 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java @@ -9,47 +9,47 @@ + -> DELETE 8 @ 7 : 15 +> DELETE 7 @ 7 : 15 -> DELETE 3 @ 11 : 12 +> DELETE 3 @ 3 : 4 -> DELETE 10 @ 11 : 12 +> DELETE 10 @ 10 : 11 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 59 @ 60 : 69 +> DELETE 59 @ 59 : 68 -> CHANGE 212 : 213 @ 221 : 225 +> CHANGE 212 : 213 @ 212 : 216 ~ -> DELETE 62 @ 65 : 71 +> DELETE 61 @ 61 : 67 -> DELETE 215 @ 221 : 226 +> DELETE 215 @ 215 : 220 -> DELETE 146 @ 151 : 154 +> DELETE 146 @ 146 : 149 -> DELETE 34 @ 37 : 45 +> DELETE 34 @ 34 : 42 -> DELETE 6 @ 14 : 40 +> DELETE 6 @ 6 : 32 -> CHANGE 4 : 5 @ 30 : 31 +> CHANGE 4 : 5 @ 4 : 5 ~ if (this.dataWatcher.hasObjectChanged()) { -> DELETE 10 @ 10 : 15 +> DELETE 9 @ 9 : 14 -> DELETE 56 @ 61 : 65 +> DELETE 56 @ 56 : 60 -> DELETE 25 @ 29 : 33 +> DELETE 25 @ 25 : 29 -> DELETE 18 @ 22 : 29 +> DELETE 18 @ 18 : 25 -> DELETE 1 @ 8 : 9 +> DELETE 1 @ 1 : 2 -> DELETE 48 @ 49 : 54 +> DELETE 48 @ 48 : 53 -> CHANGE 70 : 71 @ 75 : 83 +> CHANGE 70 : 71 @ 70 : 78 ~ String s = nbttagcompound.getString("OwnerUUID"); diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java index 5d0a801..9185940 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java @@ -7,8 +7,8 @@ > DELETE 3 @ 3 : 5 -> DELETE 34 @ 36 : 44 +> DELETE 34 @ 34 : 42 -> DELETE 1 @ 9 : 20 +> DELETE 1 @ 1 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java index 497639d..0104971 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java @@ -7,20 +7,20 @@ > DELETE 2 @ 2 : 3 -> DELETE 6 @ 7 : 22 +> DELETE 6 @ 6 : 21 -> DELETE 5 @ 20 : 21 +> DELETE 5 @ 5 : 6 -> DELETE 7 @ 8 : 10 +> DELETE 7 @ 7 : 9 -> DELETE 4 @ 6 : 18 +> DELETE 4 @ 4 : 16 -> DELETE 7 @ 19 : 39 +> DELETE 7 @ 7 : 27 -> DELETE 53 @ 73 : 74 +> DELETE 53 @ 53 : 54 -> DELETE 7 @ 8 : 44 +> DELETE 7 @ 7 : 43 -> DELETE 67 @ 103 : 115 +> DELETE 67 @ 67 : 79 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java index c937c98..5a06c73 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java @@ -7,20 +7,20 @@ > DELETE 5 @ 5 : 14 -> DELETE 1 @ 10 : 12 +> DELETE 1 @ 1 : 3 -> DELETE 5 @ 7 : 8 +> DELETE 5 @ 5 : 6 -> DELETE 5 @ 6 : 7 +> DELETE 5 @ 5 : 6 -> DELETE 4 @ 5 : 16 +> DELETE 4 @ 4 : 15 -> DELETE 44 @ 55 : 67 +> DELETE 44 @ 44 : 56 -> DELETE 35 @ 47 : 56 +> DELETE 35 @ 35 : 44 -> DELETE 1 @ 10 : 13 +> DELETE 1 @ 1 : 4 -> DELETE 17 @ 20 : 24 +> DELETE 17 @ 17 : 21 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java index 4633ef7..91031c9 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java @@ -7,36 +7,36 @@ > DELETE 3 @ 3 : 5 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 18 +> DELETE 2 @ 2 : 17 -> DELETE 6 @ 21 : 24 +> DELETE 6 @ 6 : 9 -> DELETE 2 @ 5 : 8 +> DELETE 2 @ 2 : 5 -> DELETE 4 @ 7 : 8 +> DELETE 4 @ 4 : 5 -> DELETE 12 @ 13 : 29 +> DELETE 12 @ 12 : 28 -> DELETE 2 @ 18 : 23 +> DELETE 2 @ 2 : 7 -> DELETE 9 @ 14 : 19 +> DELETE 9 @ 9 : 14 -> DELETE 7 @ 12 : 13 +> DELETE 7 @ 7 : 8 -> DELETE 22 @ 23 : 78 +> DELETE 22 @ 22 : 77 -> DELETE 3 @ 58 : 80 +> DELETE 3 @ 3 : 25 -> DELETE 3 @ 25 : 29 +> DELETE 3 @ 3 : 7 -> DELETE 106 @ 110 : 121 +> DELETE 106 @ 106 : 117 -> DELETE 23 @ 34 : 38 +> DELETE 23 @ 23 : 27 -> DELETE 24 @ 28 : 141 +> DELETE 24 @ 24 : 137 -> DELETE 33 @ 146 : 193 +> DELETE 33 @ 33 : 80 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java index 367525a..8feae13 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java @@ -7,30 +7,30 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 3 +> CHANGE 1 : 5 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import com.google.common.collect.Maps; ~ -> DELETE 8 @ 5 : 16 +> DELETE 4 @ 4 : 15 -> DELETE 10 @ 21 : 22 +> DELETE 10 @ 10 : 11 -> DELETE 13 @ 14 : 15 +> DELETE 13 @ 13 : 14 -> DELETE 8 @ 9 : 19 +> DELETE 8 @ 8 : 18 -> DELETE 4 @ 14 : 19 +> DELETE 4 @ 4 : 9 -> CHANGE 1 : 2 @ 6 : 10 +> CHANGE 1 : 2 @ 1 : 5 ~ this.sheepTimer = Math.max(0, this.sheepTimer - 1); -> DELETE 65 @ 68 : 82 +> DELETE 64 @ 64 : 78 -> CHANGE 58 : 59 @ 72 : 73 +> CHANGE 58 : 59 @ 58 : 59 ~ public static EnumDyeColor getRandomSheepColor(EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java index 143271e..4a9ace1 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java @@ -7,16 +7,16 @@ > DELETE 4 @ 4 : 6 -> DELETE 28 @ 30 : 31 +> DELETE 28 @ 28 : 29 -> CHANGE 57 : 58 @ 58 : 68 +> CHANGE 57 : 58 @ 57 : 67 ~ this.squidRotation = 6.2831855F; -> DELETE 19 @ 28 : 34 +> DELETE 18 @ 18 : 24 -> DELETE 9 @ 15 : 22 +> DELETE 9 @ 9 : 16 -> DELETE 32 @ 39 : 64 +> DELETE 32 @ 32 : 57 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java index 4ca1582..dd0699e 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java @@ -10,24 +10,24 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 4 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> DELETE 2 @ 5 : 7 +> DELETE 2 @ 2 : 4 -> DELETE 4 @ 6 : 7 +> DELETE 4 @ 4 : 5 -> CHANGE 25 : 26 @ 26 : 34 +> CHANGE 25 : 26 @ 25 : 33 ~ String s = nbttagcompound.getString("OwnerUUID"); -> DELETE 5 @ 12 : 14 +> DELETE 4 @ 4 : 6 -> CHANGE 75 : 76 @ 77 : 78 +> CHANGE 75 : 76 @ 75 : 76 ~ EaglercraftUUID uuid = EaglercraftUUID.fromString(this.getOwnerId()); -> DELETE 11 @ 11 : 15 +> DELETE 10 @ 10 : 14 -> DELETE 29 @ 33 : 42 +> DELETE 29 @ 29 : 38 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java index a2eec1b..af81cd9 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java @@ -10,27 +10,27 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 5 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 4 @ 6 : 22 +> DELETE 4 @ 4 : 20 -> DELETE 3 @ 19 : 22 +> DELETE 3 @ 3 : 6 -> DELETE 9 @ 12 : 15 +> DELETE 9 @ 9 : 12 -> DELETE 4 @ 7 : 8 +> DELETE 4 @ 4 : 5 -> DELETE 6 @ 7 : 8 +> DELETE 6 @ 6 : 7 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> CHANGE 12 : 13 @ 13 : 165 +> CHANGE 12 : 13 @ 12 : 164 ~ private static EntityVillager.ITradeList[][][][] DEFAULT_TRADE_LIST_MAP = null; -> INSERT 2 : 167 @ 153 +> INSERT 1 : 166 @ 1 + public static void bootstrap() { + DEFAULT_TRADE_LIST_MAP = new EntityVillager.ITradeList[][][][] { @@ -198,52 +198,52 @@ + } + -> DELETE 174 @ 9 : 25 +> DELETE 9 @ 9 : 25 -> DELETE 3 @ 19 : 39 +> DELETE 3 @ 3 : 23 -> DELETE 5 @ 25 : 68 +> DELETE 5 @ 5 : 48 -> DELETE 4 @ 47 : 52 +> DELETE 4 @ 4 : 9 -> DELETE 57 @ 62 : 63 +> DELETE 57 @ 57 : 58 -> DELETE 42 @ 43 : 82 +> DELETE 42 @ 42 : 81 -> DELETE 73 @ 112 : 120 +> DELETE 73 @ 73 : 81 -> DELETE 140 @ 148 : 149 +> DELETE 140 @ 140 : 141 -> DELETE 19 @ 20 : 30 +> DELETE 19 @ 19 : 29 -> DELETE 1 @ 11 : 14 +> DELETE 1 @ 1 : 4 -> CHANGE 94 : 95 @ 97 : 98 +> CHANGE 94 : 95 @ 94 : 95 ~ public void modifyMerchantRecipeList(MerchantRecipeList recipeList, EaglercraftRandom random) { -> CHANGE 11 : 12 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ void modifyMerchantRecipeList(MerchantRecipeList var1, EaglercraftRandom var2); -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 16 : 17 @ 16 : 17 ~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { -> CHANGE 19 : 20 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 + +~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { + +> CHANGE 23 : 24 @ 23 : 24 + +~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { + +> CHANGE 26 : 27 @ 26 : 27 ~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { > CHANGE 24 : 25 @ 24 : 25 -~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { - -> CHANGE 27 : 28 @ 27 : 28 - -~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { - -> CHANGE 25 : 26 @ 25 : 26 - ~ public int getPrice(EaglercraftRandom rand) { > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java index 53898d3..7d21cb6 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java @@ -7,20 +7,20 @@ > DELETE 2 @ 2 : 3 -> DELETE 5 @ 6 : 20 +> DELETE 5 @ 5 : 19 -> DELETE 2 @ 16 : 22 +> DELETE 2 @ 2 : 8 -> DELETE 8 @ 14 : 15 +> DELETE 8 @ 8 : 9 -> DELETE 17 @ 18 : 39 +> DELETE 17 @ 17 : 38 -> DELETE 80 @ 101 : 116 +> DELETE 80 @ 80 : 95 -> DELETE 84 @ 99 : 100 +> DELETE 84 @ 84 : 85 -> DELETE 61 @ 62 : 69 +> DELETE 61 @ 61 : 68 -> DELETE 9 @ 16 : 32 +> DELETE 9 @ 9 : 25 > EOF diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java index 8741dfa..75b9cea 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> CHANGE 2 : 8 @ 5 : 6 +> CHANGE 2 : 8 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ @@ -16,39 +16,39 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> INSERT 11 : 12 @ 6 +> INSERT 5 : 6 @ 5 + import net.minecraft.command.ICommandSender; -> DELETE 16 @ 15 : 16 +> DELETE 15 @ 15 : 16 -> DELETE 3 @ 4 : 8 +> DELETE 3 @ 3 : 7 -> DELETE 16 @ 20 : 21 +> DELETE 16 @ 16 : 17 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> CHANGE 20 : 21 @ 21 : 22 +> CHANGE 20 : 21 @ 20 : 21 ~ public abstract class EntityPlayer extends EntityLivingBase implements ICommandSender { -> CHANGE 43 : 44 @ 43 : 44 +> CHANGE 42 : 43 @ 42 : 43 ~ this.inventoryContainer = new ContainerPlayer(this.inventory, false, this); -> DELETE 50 @ 50 : 54 +> DELETE 49 @ 49 : 53 -> CHANGE 19 : 20 @ 23 : 26 +> CHANGE 19 : 20 @ 19 : 22 ~ --this.itemInUseCount; -> DELETE 15 @ 17 : 25 +> DELETE 14 @ 14 : 22 -> DELETE 8 @ 16 : 20 +> DELETE 8 @ 8 : 12 -> DELETE 43 @ 47 : 55 +> DELETE 43 @ 43 : 51 -> CHANGE 100 : 113 @ 108 : 127 +> CHANGE 100 : 113 @ 100 : 119 ~ double d0 = this.posX; ~ double d1 = this.posY; @@ -64,41 +64,41 @@ ~ this.rotationYaw = f; ~ this.renderYawOffset = ((EntityPig) this.ridingEntity).renderYawOffset; -> DELETE 49 @ 55 : 58 +> DELETE 36 @ 36 : 39 -> CHANGE 108 : 109 @ 111 : 112 +> CHANGE 108 : 109 @ 108 : 109 ~ for (ScoreObjective scoreobjective : (Collection) collection) { -> DELETE 212 @ 212 : 216 +> DELETE 211 @ 211 : 215 -> DELETE 201 @ 205 : 214 +> DELETE 201 @ 201 : 210 -> DELETE 82 @ 91 : 95 +> DELETE 82 @ 82 : 86 -> DELETE 1 @ 5 : 30 +> DELETE 1 @ 1 : 26 -> DELETE 36 @ 61 : 64 +> DELETE 36 @ 36 : 39 -> DELETE 39 @ 42 : 45 +> DELETE 39 @ 39 : 42 -> DELETE 292 @ 295 : 299 +> DELETE 292 @ 292 : 296 -> DELETE 1 @ 5 : 6 +> DELETE 1 @ 1 : 2 -> DELETE 18 @ 19 : 23 +> DELETE 18 @ 18 : 22 -> CHANGE 156 : 158 @ 160 : 162 +> CHANGE 156 : 158 @ 156 : 158 ~ public static EaglercraftUUID getUUID(GameProfile profile) { ~ EaglercraftUUID uuid = profile.getId(); -> CHANGE 9 : 11 @ 9 : 11 +> CHANGE 7 : 9 @ 7 : 9 ~ public static EaglercraftUUID getOfflineUUID(String username) { ~ return EaglercraftUUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(Charsets.UTF_8)); -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 18 : 19 @ 18 : 19 ~ return true; diff --git a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java index 63c41b9..89aa57a 100644 --- a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java +++ b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.edit.java @@ -9,6 +9,6 @@ + -> DELETE 4 @ 3 : 4 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java index 2df3b19..a5a7e08 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java @@ -9,14 +9,14 @@ + -> DELETE 10 @ 9 : 12 +> DELETE 9 @ 9 : 12 -> DELETE 1 @ 4 : 5 +> DELETE 1 @ 1 : 2 -> DELETE 250 @ 251 : 255 +> DELETE 250 @ 250 : 254 -> DELETE 17 @ 21 : 28 +> DELETE 17 @ 17 : 24 -> DELETE 141 @ 148 : 167 +> DELETE 141 @ 141 : 160 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java index 2e5a918..aa0fc30 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java @@ -7,8 +7,8 @@ > DELETE 3 @ 3 : 5 -> DELETE 26 @ 28 : 42 +> DELETE 26 @ 26 : 40 -> DELETE 8 @ 22 : 26 +> DELETE 8 @ 8 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java index 0681a50..b995b5e 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java @@ -9,7 +9,7 @@ + -> CHANGE 75 : 76 @ 74 : 76 +> CHANGE 74 : 75 @ 74 : 76 ~ if (this.worldObj.isBlockLoaded(new BlockPos(this))) { diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java index 6dd69f6..9415c0b 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java @@ -9,28 +9,28 @@ + -> DELETE 3 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 7 @ 9 : 10 +> DELETE 7 @ 7 : 8 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 165 @ 166 : 175 +> DELETE 165 @ 165 : 174 -> DELETE 1 @ 10 : 23 +> DELETE 1 @ 1 : 14 -> DELETE 118 @ 131 : 232 +> DELETE 118 @ 118 : 219 -> CHANGE 40 : 41 @ 141 : 180 +> CHANGE 40 : 41 @ 40 : 79 ~ return 0; -> DELETE 3 @ 41 : 66 +> DELETE 2 @ 2 : 27 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java index 19b298b..eb0a400 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java @@ -7,10 +7,10 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 20 @ 21 : 34 +> DELETE 20 @ 20 : 33 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java index 5bab53a..8bf5672 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 8 +> DELETE 3 @ 3 : 7 -> DELETE 57 @ 61 : 74 +> DELETE 57 @ 57 : 70 -> DELETE 1 @ 14 : 36 +> DELETE 1 @ 1 : 23 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java index cdf4193..237ed1b 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java @@ -7,10 +7,10 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 5 +> DELETE 1 @ 1 : 4 -> DELETE 22 @ 25 : 40 +> DELETE 22 @ 22 : 37 -> DELETE 1 @ 16 : 27 +> DELETE 1 @ 1 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java index 3d26f13..c73ab3c 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 5 -> DELETE 34 @ 35 : 39 +> DELETE 34 @ 34 : 38 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java index 29df262..2c8544d 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 4 -> DELETE 7 @ 9 : 10 +> DELETE 7 @ 7 : 8 -> DELETE 7 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> DELETE 142 @ 143 : 172 +> DELETE 142 @ 142 : 171 -> DELETE 101 @ 130 : 140 +> DELETE 101 @ 101 : 111 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java index cebbe5a..d6d7feb 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java @@ -7,10 +7,10 @@ > DELETE 6 @ 6 : 9 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> DELETE 38 @ 39 : 53 +> DELETE 38 @ 38 : 52 -> DELETE 1 @ 15 : 35 +> DELETE 1 @ 1 : 21 > EOF diff --git a/patches/minecraft/net/minecraft/event/ClickEvent.edit.java b/patches/minecraft/net/minecraft/event/ClickEvent.edit.java index c694cb2..c728a4b 100644 --- a/patches/minecraft/net/minecraft/event/ClickEvent.edit.java +++ b/patches/minecraft/net/minecraft/event/ClickEvent.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 4 @ 3 +> INSERT 2 : 4 @ 2 + import com.google.common.collect.Maps; + diff --git a/patches/minecraft/net/minecraft/event/HoverEvent.edit.java b/patches/minecraft/net/minecraft/event/HoverEvent.edit.java index 54ebf0a..f348eec 100644 --- a/patches/minecraft/net/minecraft/event/HoverEvent.edit.java +++ b/patches/minecraft/net/minecraft/event/HoverEvent.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/init/Blocks.edit.java b/patches/minecraft/net/minecraft/init/Blocks.edit.java index c52fb29..e739d7f 100644 --- a/patches/minecraft/net/minecraft/init/Blocks.edit.java +++ b/patches/minecraft/net/minecraft/init/Blocks.edit.java @@ -7,7 +7,7 @@ > DELETE 34 @ 34 : 35 -> CHANGE 3 : 201 @ 4 : 202 +> CHANGE 3 : 201 @ 3 : 201 ~ public static Block air; ~ public static Block stone; @@ -208,7 +208,7 @@ ~ public static BlockSlab double_stone_slab2; ~ public static BlockSlab stone_slab2; -> CHANGE 203 : 204 @ 203 : 204 +> CHANGE 5 : 6 @ 5 : 6 ~ static void doBootstrap() { diff --git a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java index 007176b..fd785f7 100644 --- a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java +++ b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java @@ -7,76 +7,76 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 4 +> CHANGE 1 : 5 @ 1 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> INSERT 26 : 28 @ 24 +> INSERT 22 : 24 @ 22 + import net.minecraft.entity.monster.EntityEnderman; + import net.minecraft.entity.passive.EntityVillager; -> DELETE 7 @ 5 : 7 +> DELETE 5 @ 5 : 7 -> INSERT 2 : 3 @ 4 +> INSERT 2 : 3 @ 2 + import net.minecraft.item.ItemAxe; -> INSERT 4 : 5 @ 3 +> INSERT 3 : 4 @ 3 + import net.minecraft.item.ItemPickaxe; -> INSERT 2 : 3 @ 1 +> INSERT 1 : 2 @ 1 + import net.minecraft.item.ItemSpade; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> CHANGE 1 : 2 @ 2 : 4 +> CHANGE 1 : 2 @ 1 : 3 ~ import net.minecraft.world.biome.BiomeGenBase; -> CHANGE 103 : 104 @ 104 : 105 +> CHANGE 102 : 103 @ 102 : 103 ~ EaglercraftRandom random = world.rand; -> CHANGE 139 : 140 @ 139 : 144 +> CHANGE 138 : 139 @ 138 : 143 ~ if (!ItemDye.applyBonemeal(itemstack, world, blockpos)) { -> CHANGE 41 : 42 @ 45 : 79 +> CHANGE 40 : 41 @ 40 : 74 ~ if (!(world.isAirBlock(blockpos) && blockskull.canDispenserPlace(world, blockpos, itemstack))) { -> DELETE 26 @ 59 : 63 +> DELETE 25 @ 25 : 29 -> INSERT 27 : 29 @ 31 +> INSERT 27 : 29 @ 27 + Blocks.doBootstrap(); + BiomeGenBase.bootstrap(); -> INSERT 3 : 7 @ 1 +> INSERT 1 : 5 @ 1 + EntityEnderman.bootstrap(); + ItemAxe.bootstrap(); + ItemPickaxe.bootstrap(); + ItemSpade.bootstrap(); -> INSERT 5 : 7 @ 1 +> INSERT 1 : 3 @ 1 + Items.doBootstrap(); + EntityVillager.bootstrap(); -> CHANGE 8 : 10 @ 6 : 8 +> CHANGE 6 : 8 @ 6 : 8 ~ System.setErr(new LoggingPrintStream("STDERR", true, System.err)); ~ System.setOut(new LoggingPrintStream("STDOUT", false, SYSOUT)); diff --git a/patches/minecraft/net/minecraft/init/Items.edit.java b/patches/minecraft/net/minecraft/init/Items.edit.java index eb43f05..4c70716 100644 --- a/patches/minecraft/net/minecraft/init/Items.edit.java +++ b/patches/minecraft/net/minecraft/init/Items.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 13 : 200 @ 14 : 201 +> CHANGE 13 : 200 @ 13 : 200 ~ public static Item iron_shovel; ~ public static Item iron_pickaxe; @@ -197,7 +197,7 @@ ~ public static Item prismarine_crystals; ~ public static Item banner; -> CHANGE 192 : 193 @ 192 : 193 +> CHANGE 5 : 6 @ 5 : 6 ~ static void doBootstrap() { diff --git a/patches/minecraft/net/minecraft/inventory/Container.edit.java b/patches/minecraft/net/minecraft/inventory/Container.edit.java index b56fa4e..9a57534 100644 --- a/patches/minecraft/net/minecraft/inventory/Container.edit.java +++ b/patches/minecraft/net/minecraft/inventory/Container.edit.java @@ -7,16 +7,16 @@ > DELETE 2 @ 2 : 4 -> INSERT 3 : 7 @ 5 +> INSERT 3 : 7 @ 3 + + import com.google.common.collect.Lists; + import com.google.common.collect.Sets; + -> DELETE 6 @ 2 : 5 +> DELETE 2 @ 2 : 5 -> CHANGE 19 : 20 @ 22 : 23 +> CHANGE 19 : 20 @ 19 : 20 ~ this.inventoryItemStacks.add((ItemStack) null); diff --git a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java index 0579462..e4c39bf 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 8 -> DELETE 37 @ 41 : 52 +> DELETE 37 @ 37 : 48 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java index c5dd921..4ab1808 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java @@ -10,24 +10,24 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 8 @ 7 : 12 +> DELETE 6 @ 6 : 11 -> DELETE 2 @ 7 : 8 +> DELETE 2 @ 2 : 3 -> CHANGE 7 : 8 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ private EaglercraftRandom rand; -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 19 : 20 @ 19 : 20 ~ this.rand = new EaglercraftRandom(); -> CHANGE 77 : 78 @ 77 : 146 +> CHANGE 76 : 77 @ 76 : 145 ~ if (!(itemstack != null && itemstack.isItemEnchantable())) { -> DELETE 19 @ 87 : 119 +> DELETE 18 @ 18 : 50 -> DELETE 21 @ 53 : 66 +> DELETE 21 @ 21 : 34 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java index f0c6695..3092c4c 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java @@ -7,6 +7,6 @@ > DELETE 5 @ 5 : 11 -> DELETE 101 @ 107 : 119 +> DELETE 101 @ 101 : 113 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java index 1bcdb9c..0954778 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerPlayer.edit.java @@ -7,20 +7,20 @@ > DELETE 6 @ 6 : 12 -> CHANGE 23 : 25 @ 29 : 30 +> CHANGE 23 : 25 @ 23 : 24 ~ for (int k = 0; k < 4; ++k) { ~ final int k2 = k; -> CHANGE 11 : 12 @ 10 : 11 +> CHANGE 9 : 10 @ 9 : 10 ~ ? ((ItemArmor) itemstack.getItem()).armorType == k2 -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ && itemstack.getItem() != Items.skull ? false : k2 == 0)); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ return ItemArmor.EMPTY_SLOT_NAMES[k2]; diff --git a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java index cddcd81..b9b9196 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java @@ -13,12 +13,12 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 11 @ 8 : 14 +> DELETE 6 @ 6 : 12 -> DELETE 3 @ 9 : 12 +> DELETE 3 @ 3 : 6 -> DELETE 60 @ 63 : 79 +> DELETE 60 @ 60 : 76 -> DELETE 219 @ 235 : 248 +> DELETE 219 @ 219 : 232 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java index 1e4a4f7..c0997c6 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java @@ -7,6 +7,6 @@ > DELETE 5 @ 5 : 11 -> DELETE 41 @ 47 : 60 +> DELETE 41 @ 41 : 54 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java b/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java index aeefed6..c484008 100644 --- a/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java +++ b/patches/minecraft/net/minecraft/inventory/InventoryBasic.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 4 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java b/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java index 8441c6b..c61e180 100644 --- a/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java +++ b/patches/minecraft/net/minecraft/inventory/InventoryHelper.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 4 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> CHANGE 6 : 7 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java index 8427109..a8e39c2 100644 --- a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java +++ b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 5 +> DELETE 2 @ 2 : 4 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 34 @ 35 : 46 +> DELETE 34 @ 34 : 45 -> DELETE 1 @ 12 : 23 +> DELETE 1 @ 1 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/item/Item.edit.java b/patches/minecraft/net/minecraft/item/Item.edit.java index 4085034..7bbf8fd 100644 --- a/patches/minecraft/net/minecraft/item/Item.edit.java +++ b/patches/minecraft/net/minecraft/item/Item.edit.java @@ -13,18 +13,18 @@ + import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; + -> CHANGE 9 : 10 @ 4 : 8 +> CHANGE 4 : 5 @ 4 : 8 ~ -> DELETE 24 @ 27 : 95 +> DELETE 23 @ 23 : 91 -> CHANGE 16 : 18 @ 84 : 85 +> CHANGE 16 : 18 @ 16 : 17 ~ protected static final EaglercraftUUID itemModifierUUID = EaglercraftUUID ~ .fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF"); -> CHANGE 3 : 4 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ protected static EaglercraftRandom itemRand = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java index bf7c596..7615eed 100644 --- a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java @@ -9,12 +9,12 @@ + -> DELETE 3 @ 2 : 8 +> DELETE 2 @ 2 : 8 -> CHANGE 17 : 18 @ 23 : 34 +> CHANGE 17 : 18 @ 17 : 28 ~ if (itemstack.getMetadata() == 0) { -> DELETE 3 @ 13 : 14 +> DELETE 2 @ 2 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemArmor.edit.java b/patches/minecraft/net/minecraft/item/ItemArmor.edit.java index d37e68f..f1e1405 100644 --- a/patches/minecraft/net/minecraft/item/ItemArmor.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemArmor.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.base.Predicates; + -> DELETE 12 @ 9 : 11 +> DELETE 9 @ 9 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java index 4cb59f8..d60633c 100644 --- a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java @@ -9,14 +9,14 @@ ~ -> DELETE 3 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 5 +> DELETE 1 @ 1 : 4 -> DELETE 3 @ 6 : 8 +> DELETE 3 @ 3 : 5 -> DELETE 33 @ 35 : 56 +> DELETE 33 @ 33 : 54 -> DELETE 7 @ 28 : 40 +> DELETE 7 @ 7 : 19 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemAxe.edit.java b/patches/minecraft/net/minecraft/item/ItemAxe.edit.java index 68cc775..0dda355 100644 --- a/patches/minecraft/net/minecraft/item/ItemAxe.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemAxe.edit.java @@ -7,19 +7,19 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Sets; + -> DELETE 6 @ 3 : 6 +> DELETE 3 @ 3 : 6 -> CHANGE 2 : 3 @ 5 : 8 +> CHANGE 2 : 3 @ 2 : 5 ~ private static Set EFFECTIVE_ON; -> INSERT 2 : 7 @ 4 +> INSERT 1 : 6 @ 1 + public static void bootstrap() { + EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, diff --git a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java index 6e415cf..9506091 100644 --- a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java @@ -9,14 +9,14 @@ ~ -> DELETE 4 @ 5 : 9 +> DELETE 3 @ 3 : 7 -> DELETE 2 @ 6 : 7 +> DELETE 2 @ 2 : 3 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 24 @ 25 : 27 +> DELETE 24 @ 24 : 26 -> DELETE 1 @ 3 : 19 +> DELETE 1 @ 1 : 17 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBed.edit.java b/patches/minecraft/net/minecraft/item/ItemBed.edit.java index adcb487..e848c2c 100644 --- a/patches/minecraft/net/minecraft/item/ItemBed.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBed.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 5 -> DELETE 2 @ 5 : 8 +> DELETE 2 @ 2 : 5 -> DELETE 2 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> CHANGE 9 : 10 @ 10 : 50 +> CHANGE 9 : 10 @ 9 : 49 ~ return true; diff --git a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java index 98e71d9..569148f 100644 --- a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java @@ -9,9 +9,9 @@ + -> DELETE 7 @ 6 : 11 +> DELETE 6 @ 6 : 11 -> CHANGE 53 : 54 @ 58 : 89 +> CHANGE 53 : 54 @ 53 : 84 ~ return false; diff --git a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java index 8cf0990..dbc67c4 100644 --- a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java @@ -9,8 +9,8 @@ + -> DELETE 6 @ 5 : 7 +> DELETE 5 @ 5 : 7 -> DELETE 73 @ 75 : 79 +> DELETE 73 @ 73 : 77 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBow.edit.java b/patches/minecraft/net/minecraft/item/ItemBow.edit.java index fe76d21..eed8cdc 100644 --- a/patches/minecraft/net/minecraft/item/ItemBow.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBow.edit.java @@ -7,6 +7,6 @@ > DELETE 8 @ 8 : 11 -> DELETE 56 @ 59 : 62 +> DELETE 56 @ 56 : 59 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java index e75a6a0..317f686 100644 --- a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java @@ -7,6 +7,6 @@ > DELETE 10 @ 10 : 12 -> DELETE 105 @ 107 : 111 +> DELETE 105 @ 105 : 109 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java index 6ec6b36..c177d2c 100644 --- a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java @@ -7,6 +7,6 @@ > DELETE 5 @ 5 : 8 -> DELETE 13 @ 16 : 21 +> DELETE 13 @ 13 : 18 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java index 6a52ff6..365b9cf 100644 --- a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java @@ -7,8 +7,8 @@ > DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 18 @ 22 : 37 +> DELETE 18 @ 18 : 33 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemCoal.edit.java b/patches/minecraft/net/minecraft/item/ItemCoal.edit.java index e888843..c2de725 100644 --- a/patches/minecraft/net/minecraft/item/ItemCoal.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemCoal.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java b/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java index a3ed4c9..52cc3b7 100644 --- a/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemDoublePlant.edit.java @@ -9,6 +9,6 @@ + -> DELETE 3 @ 2 : 4 +> DELETE 2 @ 2 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemDye.edit.java b/patches/minecraft/net/minecraft/item/ItemDye.edit.java index d2526cd..1933807 100644 --- a/patches/minecraft/net/minecraft/item/ItemDye.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemDye.edit.java @@ -9,11 +9,11 @@ + -> DELETE 11 @ 10 : 13 +> DELETE 10 @ 10 : 13 -> DELETE 28 @ 31 : 35 +> DELETE 28 @ 28 : 32 -> CHANGE 36 : 37 @ 40 : 49 +> CHANGE 36 : 37 @ 36 : 45 ~ if (igrowable.canGrow(worldIn, target, iblockstate, true)) { diff --git a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java index 3b9eec3..a4be7df 100644 --- a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java @@ -9,12 +9,12 @@ + -> DELETE 2 @ 1 : 6 +> DELETE 1 @ 1 : 6 -> DELETE 3 @ 8 : 9 +> DELETE 3 @ 3 : 4 -> DELETE 57 @ 58 : 62 +> DELETE 57 @ 57 : 61 -> DELETE 28 @ 32 : 39 +> DELETE 28 @ 28 : 35 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java index cca4131..38beeba 100644 --- a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 7 -> DELETE 15 @ 18 : 21 +> DELETE 15 @ 15 : 18 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java b/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java index 2bd9de1..dcaeee1 100644 --- a/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEnchantedBook.edit.java @@ -10,13 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 7 @ 6 : 9 +> DELETE 5 @ 5 : 8 -> CHANGE 82 : 83 @ 85 : 86 +> CHANGE 82 : 83 @ 82 : 83 ~ public WeightedRandomChestContent getRandom(EaglercraftRandom rand) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public WeightedRandomChestContent getRandom(EaglercraftRandom rand, int minChance, int maxChance, int weight) { diff --git a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java index 6c257ef..a9b9c47 100644 --- a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java @@ -7,14 +7,14 @@ > DELETE 5 @ 5 : 6 -> DELETE 2 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> DELETE 2 @ 5 : 7 +> DELETE 2 @ 2 : 4 -> CHANGE 13 : 14 @ 15 : 98 +> CHANGE 13 : 14 @ 13 : 96 ~ return true; -> DELETE 6 @ 88 : 116 +> DELETE 5 @ 5 : 33 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java index 3e82668..5fef791 100644 --- a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java @@ -7,8 +7,8 @@ > DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 15 @ 17 : 20 +> DELETE 15 @ 15 : 18 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java index ac45663..d534e37 100644 --- a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java @@ -7,8 +7,8 @@ > DELETE 3 @ 3 : 4 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 18 @ 20 : 23 +> DELETE 18 @ 18 : 21 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java index c6daf60..9590805 100644 --- a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 6 +> DELETE 2 @ 2 : 5 -> CHANGE 11 : 12 @ 14 : 35 +> CHANGE 11 : 12 @ 11 : 32 ~ return true; diff --git a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java index 748f826..06f999f 100644 --- a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java @@ -7,20 +7,20 @@ > DELETE 2 @ 2 : 3 -> CHANGE 2 : 5 @ 3 : 4 +> CHANGE 2 : 5 @ 2 : 3 ~ ~ import com.google.common.collect.Lists; ~ -> DELETE 4 @ 2 : 5 +> DELETE 1 @ 1 : 4 -> DELETE 2 @ 5 : 7 +> DELETE 2 @ 2 : 4 -> DELETE 1 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 13 +> DELETE 2 @ 2 : 12 -> DELETE 1 @ 11 : 17 +> DELETE 1 @ 1 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java b/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java index 107d5a7..f548cc5 100644 --- a/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFireworkCharge.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 5 +> DELETE 1 @ 1 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java b/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java index 69859d5..009bc4b 100644 --- a/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFishFood.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Maps; + -> DELETE 5 @ 2 : 5 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java index c8ed442..6f57171 100644 --- a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 7 -> DELETE 25 @ 28 : 32 +> DELETE 25 @ 25 : 29 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFood.edit.java b/patches/minecraft/net/minecraft/item/ItemFood.edit.java index e78a5fe..1a6366b 100644 --- a/patches/minecraft/net/minecraft/item/ItemFood.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFood.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 8 -> DELETE 36 @ 40 : 45 +> DELETE 36 @ 36 : 41 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java index e8c7aba..498585d 100644 --- a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java @@ -7,6 +7,6 @@ > DELETE 7 @ 7 : 9 -> DELETE 25 @ 27 : 31 +> DELETE 25 @ 25 : 29 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java index 3b8c269..7d51b90 100644 --- a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java @@ -7,7 +7,7 @@ > DELETE 9 @ 9 : 11 -> CHANGE 48 : 49 @ 50 : 57 +> CHANGE 48 : 49 @ 48 : 55 ~ return true; diff --git a/patches/minecraft/net/minecraft/item/ItemLead.edit.java b/patches/minecraft/net/minecraft/item/ItemLead.edit.java index 1274b99..8edb0be 100644 --- a/patches/minecraft/net/minecraft/item/ItemLead.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemLead.edit.java @@ -7,7 +7,7 @@ > DELETE 8 @ 8 : 10 -> CHANGE 14 : 15 @ 16 : 22 +> CHANGE 14 : 15 @ 14 : 20 ~ return true; diff --git a/patches/minecraft/net/minecraft/item/ItemMap.edit.java b/patches/minecraft/net/minecraft/item/ItemMap.edit.java index f7b0ed8..5033693 100644 --- a/patches/minecraft/net/minecraft/item/ItemMap.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemMap.edit.java @@ -10,14 +10,14 @@ + import java.util.List; + -> CHANGE 5 : 6 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ -> DELETE 10 @ 10 : 12 +> DELETE 9 @ 9 : 11 -> DELETE 26 @ 28 : 40 +> DELETE 26 @ 26 : 38 -> DELETE 137 @ 149 : 164 +> DELETE 137 @ 137 : 152 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java index a4976b0..7076d20 100644 --- a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java @@ -7,6 +7,6 @@ > DELETE 12 @ 12 : 14 -> DELETE 75 @ 77 : 97 +> DELETE 75 @ 75 : 95 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java index 83fa8cf..ad54662 100644 --- a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java @@ -9,14 +9,14 @@ ~ -> DELETE 8 @ 10 : 17 +> DELETE 7 @ 7 : 14 -> DELETE 3 @ 10 : 11 +> DELETE 3 @ 3 : 4 -> CHANGE 29 : 30 @ 30 : 71 +> CHANGE 29 : 30 @ 29 : 70 ~ return true; -> DELETE 3 @ 43 : 84 +> DELETE 2 @ 2 : 43 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java b/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java index e888843..c2de725 100644 --- a/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemMultiTexture.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java b/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java index 1e58716..3e15ece 100644 --- a/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemPickaxe.edit.java @@ -7,19 +7,19 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Sets; + -> DELETE 6 @ 3 : 6 +> DELETE 3 @ 3 : 6 -> CHANGE 2 : 3 @ 5 : 11 +> CHANGE 2 : 3 @ 2 : 8 ~ private static Set EFFECTIVE_ON; -> INSERT 2 : 11 @ 7 +> INSERT 1 : 10 @ 1 + public static void bootstrap() { + EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone, diff --git a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java index 81b7f26..9b5266a 100644 --- a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> INSERT 5 : 11 @ 8 +> INSERT 5 : 11 @ 5 + import java.util.Set; + @@ -16,27 +16,27 @@ + import com.google.common.collect.Maps; + -> DELETE 10 @ 4 : 5 +> DELETE 4 @ 4 : 5 -> DELETE 1 @ 2 : 5 +> DELETE 1 @ 1 : 4 -> DELETE 61 @ 64 : 73 +> DELETE 61 @ 61 : 70 -> DELETE 27 @ 36 : 39 +> DELETE 27 @ 27 : 30 -> CHANGE 24 : 25 @ 27 : 28 +> CHANGE 24 : 25 @ 24 : 25 ~ for (PotionEffect potioneffect : (List) list) { -> CHANGE 38 : 39 @ 38 : 39 +> CHANGE 37 : 38 @ 37 : 38 ~ for (PotionEffect potioneffect : (List) list1) { -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ for (Entry entry : (Set) map.entrySet()) { -> CHANGE 34 : 35 @ 34 : 35 +> CHANGE 33 : 34 @ 33 : 34 ~ for (Entry entry1 : (Set) hashmultimap.entries()) { diff --git a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java index f6c1d3d..cba0d8f 100644 --- a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Maps; + -> DELETE 8 @ 5 : 9 +> DELETE 5 @ 5 : 9 -> CHANGE 21 : 22 @ 25 : 34 +> CHANGE 21 : 22 @ 21 : 30 ~ return true; diff --git a/patches/minecraft/net/minecraft/item/ItemSign.edit.java b/patches/minecraft/net/minecraft/item/ItemSign.edit.java index 1917d81..84582bc 100644 --- a/patches/minecraft/net/minecraft/item/ItemSign.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSign.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 4 -> DELETE 3 @ 5 : 10 +> DELETE 3 @ 3 : 8 -> DELETE 2 @ 7 : 8 +> DELETE 2 @ 2 : 3 -> DELETE 20 @ 21 : 23 +> DELETE 20 @ 20 : 22 -> DELETE 1 @ 3 : 20 +> DELETE 1 @ 1 : 18 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java index 4ebc8fd..ae951e1 100644 --- a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java @@ -7,23 +7,23 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> DELETE 4 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 4 @ 5 : 7 +> DELETE 4 @ 4 : 6 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 33 @ 34 : 70 +> DELETE 33 @ 33 : 69 -> CHANGE 47 : 48 @ 83 : 84 +> CHANGE 47 : 48 @ 47 : 48 ~ GameProfile gameprofile = new GameProfile((EaglercraftUUID) null, nbt.getString("SkullOwner")); diff --git a/patches/minecraft/net/minecraft/item/ItemSlab.edit.java b/patches/minecraft/net/minecraft/item/ItemSlab.edit.java index 4f39eb2..5501059 100644 --- a/patches/minecraft/net/minecraft/item/ItemSlab.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSlab.edit.java @@ -7,7 +7,7 @@ > DELETE 7 @ 7 : 9 -> CHANGE 88 : 89 @ 90 : 91 +> CHANGE 88 : 89 @ 88 : 89 ~ .withProperty((IProperty) this.singleSlab.getVariantProperty(), comparable); diff --git a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java index cca4131..38beeba 100644 --- a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 7 -> DELETE 15 @ 18 : 21 +> DELETE 15 @ 15 : 18 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemSpade.edit.java b/patches/minecraft/net/minecraft/item/ItemSpade.edit.java index b958d33..e32677d 100644 --- a/patches/minecraft/net/minecraft/item/ItemSpade.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSpade.edit.java @@ -7,19 +7,19 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Sets; + -> DELETE 5 @ 2 : 4 +> DELETE 2 @ 2 : 4 -> CHANGE 2 : 3 @ 4 : 7 +> CHANGE 2 : 3 @ 2 : 5 ~ private static Set EFFECTIVE_ON; -> INSERT 2 : 7 @ 4 +> INSERT 1 : 6 @ 1 + public static void bootstrap() { + EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, diff --git a/patches/minecraft/net/minecraft/item/ItemStack.edit.java b/patches/minecraft/net/minecraft/item/ItemStack.edit.java index 77282d5..68693db 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemStack.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 5 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> INSERT 1 : 9 @ 2 +> INSERT 1 : 9 @ 1 + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + import net.lax1dude.eaglercraft.v1_8.HString; @@ -20,21 +20,21 @@ + import com.google.common.collect.Multimap; + -> DELETE 21 @ 13 : 17 +> DELETE 13 @ 13 : 17 -> CHANGE 185 : 186 @ 189 : 190 +> CHANGE 185 : 186 @ 185 : 186 ~ public boolean attemptDamageItem(int amount, EaglercraftRandom rand) { -> CHANGE 250 : 251 @ 250 : 251 +> CHANGE 249 : 250 @ 249 : 250 ~ s = s + HString.format("#%04d/%d%s", -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ s = s + HString.format("#%04d%s", new Object[] { Integer.valueOf(i), s1 }); -> CHANGE 57 : 58 @ 57 : 58 +> CHANGE 56 : 57 @ 56 : 57 ~ for (Entry entry : (Set) multimap.entries()) { diff --git a/patches/minecraft/net/minecraft/item/ItemSword.edit.java b/patches/minecraft/net/minecraft/item/ItemSword.edit.java index bab7d9a..211f65d 100644 --- a/patches/minecraft/net/minecraft/item/ItemSword.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSword.edit.java @@ -9,6 +9,6 @@ + -> DELETE 9 @ 8 : 11 +> DELETE 8 @ 8 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemTool.edit.java b/patches/minecraft/net/minecraft/item/ItemTool.edit.java index 6f6d809..fa42c09 100644 --- a/patches/minecraft/net/minecraft/item/ItemTool.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemTool.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Multimap; + -> DELETE 8 @ 5 : 7 +> DELETE 5 @ 5 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java index 22b52f4..ee5553c 100644 --- a/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/CraftingManager.edit.java @@ -7,20 +7,20 @@ > DELETE 2 @ 2 : 4 -> INSERT 5 : 9 @ 7 +> INSERT 5 : 9 @ 5 + + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; + -> DELETE 16 @ 12 : 29 +> DELETE 12 @ 12 : 29 -> CHANGE 3 : 4 @ 20 : 21 +> CHANGE 3 : 4 @ 3 : 4 ~ private static CraftingManager instance; -> INSERT 4 : 7 @ 4 +> INSERT 3 : 6 @ 3 + if (instance == null) { + instance = new CraftingManager(); diff --git a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java index 874a3ce..a48d66c 100644 --- a/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/FurnaceRecipes.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Maps; + -> CHANGE 13 : 14 @ 10 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ private static FurnaceRecipes smeltingBase; -> INSERT 5 : 8 @ 5 +> INSERT 4 : 7 @ 4 + if (smeltingBase == null) { + smeltingBase = new FurnaceRecipes(); diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java index 5752feb..c1942cd 100644 --- a/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 7 @ 4 : 5 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java index 54b1248..f9bf971 100644 --- a/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/RecipeRepairItem.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 6 @ 3 : 4 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java index 39ee64c..0697ce3 100644 --- a/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 9 @ 6 : 7 +> DELETE 6 @ 6 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java index 7e8d3e8..15bb982 100644 --- a/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/RecipesIngots.edit.java @@ -7,11 +7,11 @@ > DELETE 7 @ 7 : 8 -> CHANGE 2 : 3 @ 3 : 11 +> CHANGE 2 : 3 @ 2 : 10 ~ private Object[][] recipeItems; -> INSERT 3 : 12 @ 10 +> INSERT 2 : 11 @ 2 + recipeItems = new Object[][] { { Blocks.gold_block, new ItemStack(Items.gold_ingot, 9) }, + { Blocks.iron_block, new ItemStack(Items.iron_ingot, 9) }, diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java index d813a24..6f9cb3d 100644 --- a/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/RecipesTools.edit.java @@ -7,11 +7,11 @@ > DELETE 6 @ 6 : 7 -> CHANGE 4 : 5 @ 5 : 12 +> CHANGE 4 : 5 @ 4 : 11 ~ private Object[][] recipeItems; -> INSERT 3 : 11 @ 9 +> INSERT 2 : 10 @ 2 + recipeItems = new Object[][] { + { Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot }, diff --git a/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java b/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java index 2d56ae8..82bb98f 100644 --- a/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/RecipesWeapons.edit.java @@ -7,11 +7,11 @@ > DELETE 6 @ 6 : 7 -> CHANGE 3 : 4 @ 4 : 7 +> CHANGE 3 : 4 @ 3 : 6 ~ private Object[][] recipeItems; -> INSERT 3 : 6 @ 5 +> INSERT 2 : 5 @ 2 + recipeItems = new Object[][] { + { Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot }, diff --git a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java index 5d71fec..c526572 100644 --- a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java +++ b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Lists; + -> DELETE 5 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> CHANGE 37 : 38 @ 38 : 39 +> CHANGE 37 : 38 @ 37 : 38 ~ for (ItemStack itemstack1 : (List) arraylist) { diff --git a/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java index 5434aae..48601b0 100644 --- a/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java +++ b/patches/minecraft/net/minecraft/nbt/CompressedStreamTools.edit.java @@ -7,22 +7,22 @@ > DELETE 8 @ 8 : 11 -> CHANGE 3 : 5 @ 6 : 8 +> CHANGE 3 : 5 @ 3 : 5 ~ ~ import net.lax1dude.eaglercraft.v1_8.EaglerZLIB; -> DELETE 4 @ 4 : 8 +> DELETE 2 @ 2 : 6 -> CHANGE 4 : 6 @ 8 : 9 +> CHANGE 4 : 6 @ 4 : 5 ~ DataInputStream datainputstream = new DataInputStream( ~ new BufferedInputStream(EaglerZLIB.newGZIPInputStream(is))); -> CHANGE 15 : 16 @ 14 : 15 +> CHANGE 13 : 14 @ 13 : 14 ~ new BufferedOutputStream(EaglerZLIB.newGZIPOutputStream(parOutputStream))); -> DELETE 10 @ 10 : 56 +> DELETE 9 @ 9 : 55 > EOF diff --git a/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java b/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java index e671686..aeacfec 100644 --- a/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java +++ b/patches/minecraft/net/minecraft/nbt/JsonToNBT.edit.java @@ -11,9 +11,9 @@ + import java.util.regex.Pattern; + -> DELETE 6 @ 3 : 19 +> DELETE 3 @ 3 : 19 -> INSERT 1 : 4 @ 17 +> INSERT 1 : 4 @ 1 + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java index 6ae1dbd..b953686 100644 --- a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java +++ b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 3 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> INSERT 1 : 2 @ 2 +> INSERT 1 : 2 @ 1 + import java.util.Set; -> INSERT 2 : 5 @ 1 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Maps; + -> DELETE 5 @ 2 : 14 +> DELETE 2 @ 2 : 14 > EOF diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java b/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java index 3d76569..2e17c5d 100644 --- a/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java +++ b/patches/minecraft/net/minecraft/nbt/NBTTagList.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 3 -> DELETE 4 @ 5 : 14 +> DELETE 4 @ 4 : 13 -> INSERT 1 : 6 @ 10 +> INSERT 1 : 6 @ 1 + import com.google.common.collect.Lists; + diff --git a/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java b/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java index e756cf5..85a1f14 100644 --- a/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java +++ b/patches/minecraft/net/minecraft/nbt/NBTUtil.edit.java @@ -15,25 +15,25 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property; -> CHANGE 24 : 25 @ 23 : 24 +> CHANGE 17 : 18 @ 17 : 18 ~ EaglercraftUUID uuid; -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ uuid = EaglercraftUUID.fromString(s1); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ Multimap propertiesMap = MultimapBuilder.hashKeys().arrayListValues().build(); -> DELETE 3 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> CHANGE 2 : 3 @ 3 : 5 +> CHANGE 2 : 3 @ 2 : 4 ~ for (int i = 0, l = nbttaglist.tagCount(); i < l; ++i) { -> CHANGE 2 : 10 @ 3 : 9 +> CHANGE 1 : 9 @ 1 : 7 ~ String value = nbttagcompound1.getString("Value"); ~ if (!StringUtils.isNullOrEmpty(value)) { @@ -44,17 +44,17 @@ ~ propertiesMap.put(s2, new Property(s2, value)); ~ } -> CHANGE 13 : 14 @ 11 : 12 +> CHANGE 5 : 6 @ 5 : 6 ~ return new GameProfile(uuid, s, propertiesMap); -> CHANGE 13 : 15 @ 13 : 14 +> CHANGE 12 : 14 @ 12 : 13 ~ Multimap propertiesMap = profile.getProperties(); ~ if (!propertiesMap.isEmpty()) { -> DELETE 3 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 15 @ 16 : 18 +> DELETE 15 @ 15 : 17 > EOF diff --git a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java index db70db5..40c6198 100644 --- a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java +++ b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java @@ -11,18 +11,18 @@ + import java.util.Map; + -> CHANGE 6 : 8 @ 3 : 6 +> CHANGE 3 : 5 @ 3 : 6 ~ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -> DELETE 107 @ 108 : 109 +> DELETE 105 @ 105 : 106 -> CHANGE 147 : 148 @ 148 : 149 +> CHANGE 147 : 148 @ 147 : 148 ~ this.directionMaps.put(direction, (BiMap>) object); -> CHANGE 46 : 48 @ 46 : 47 +> CHANGE 45 : 47 @ 45 : 46 ~ for (Class oclass : (Collection) ((BiMap) enumconnectionstate.directionMaps ~ .get(enumpacketdirection)).values()) { diff --git a/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java b/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java index b9c5aec..9b1a75c 100644 --- a/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java +++ b/patches/minecraft/net/minecraft/network/PacketBuffer.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 10 -> DELETE 6 @ 14 : 16 +> DELETE 6 @ 6 : 8 -> CHANGE 1 : 10 @ 3 : 4 +> CHANGE 1 : 10 @ 1 : 2 ~ import java.nio.charset.StandardCharsets; ~ @@ -21,26 +21,26 @@ ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBufInputStream; ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBufOutputStream; -> CHANGE 107 : 108 @ 99 : 100 +> CHANGE 98 : 99 @ 98 : 99 ~ public void writeUuid(EaglercraftUUID uuid) { -> CHANGE 5 : 7 @ 5 : 7 +> CHANGE 4 : 6 @ 4 : 6 ~ public EaglercraftUUID readUuid() { ~ return new EaglercraftUUID(this.readLong(), this.readLong()); -> CHANGE 84 : 85 @ 84 : 85 +> CHANGE 82 : 83 @ 82 : 83 ~ String s = new String(this.readBytes(i).array(), StandardCharsets.UTF_8); -> CHANGE 11 : 12 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ byte[] abyte = string.getBytes(StandardCharsets.UTF_8); -> DELETE 22 @ 22 : 26 +> DELETE 21 @ 21 : 25 -> CHANGE 153 : 158 @ 157 : 158 +> CHANGE 153 : 158 @ 153 : 154 ~ if (parByteBuf instanceof PacketBuffer) { ~ return this.buf.getBytes(parInt1, ((PacketBuffer) parByteBuf).buf); @@ -48,7 +48,7 @@ ~ return this.buf.getBytes(parInt1, parByteBuf); ~ } -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 3 : 8 @ 3 : 4 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.getBytes(i, ((PacketBuffer) bytebuf).buf, j); @@ -56,7 +56,7 @@ ~ return this.buf.getBytes(i, bytebuf, j); ~ } -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 3 : 8 @ 3 : 4 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.getBytes(i, ((PacketBuffer) bytebuf).buf, j, k); @@ -64,9 +64,9 @@ ~ return this.buf.getBytes(i, bytebuf, j, k); ~ } -> DELETE 23 @ 19 : 23 +> DELETE 18 @ 18 : 22 -> CHANGE 41 : 46 @ 45 : 46 +> CHANGE 41 : 46 @ 41 : 42 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.setBytes(i, ((PacketBuffer) bytebuf).buf, j); @@ -74,7 +74,7 @@ ~ return this.buf.setBytes(i, bytebuf, j); ~ } -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 3 : 8 @ 3 : 4 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.setBytes(i, ((PacketBuffer) bytebuf).buf, j, k); @@ -82,9 +82,9 @@ ~ return this.buf.setBytes(i, bytebuf, j, k); ~ } -> DELETE 23 @ 19 : 23 +> DELETE 18 @ 18 : 22 -> CHANGE 65 : 70 @ 69 : 70 +> CHANGE 65 : 70 @ 65 : 66 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.readBytes(((PacketBuffer) bytebuf).buf); @@ -92,7 +92,7 @@ ~ return this.buf.readBytes(bytebuf); ~ } -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 3 : 8 @ 3 : 4 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.readBytes(((PacketBuffer) bytebuf).buf, i); @@ -100,7 +100,7 @@ ~ return this.buf.readBytes(bytebuf, i); ~ } -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 3 : 8 @ 3 : 4 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.readBytes(((PacketBuffer) bytebuf).buf, i, j); @@ -108,9 +108,9 @@ ~ return this.buf.readBytes(bytebuf, i, j); ~ } -> DELETE 23 @ 19 : 23 +> DELETE 18 @ 18 : 22 -> CHANGE 41 : 46 @ 45 : 46 +> CHANGE 41 : 46 @ 41 : 42 ~ if (parByteBuf instanceof PacketBuffer) { ~ return this.buf.writeBytes(((PacketBuffer) parByteBuf).buf); @@ -118,7 +118,7 @@ ~ return this.buf.writeBytes(parByteBuf); ~ } -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 3 : 8 @ 3 : 4 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.writeBytes(((PacketBuffer) bytebuf).buf, i); @@ -126,7 +126,7 @@ ~ return this.buf.writeBytes(bytebuf, i); ~ } -> CHANGE 8 : 13 @ 4 : 5 +> CHANGE 3 : 8 @ 3 : 4 ~ if (bytebuf instanceof PacketBuffer) { ~ return this.buf.writeBytes(((PacketBuffer) bytebuf).buf, i, j); @@ -134,10 +134,10 @@ ~ return this.buf.writeBytes(bytebuf, i, j); ~ } -> DELETE 23 @ 19 : 23 +> DELETE 18 @ 18 : 22 -> DELETE 20 @ 24 : 40 +> DELETE 20 @ 20 : 36 -> DELETE 88 @ 104 : 123 +> DELETE 88 @ 88 : 107 > EOF diff --git a/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java b/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java index 88f0976..c33468e 100644 --- a/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java +++ b/patches/minecraft/net/minecraft/network/ServerStatusResponse.edit.java @@ -16,9 +16,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> DELETE 9 @ 12 : 13 +> DELETE 1 @ 1 : 2 -> CHANGE 57 : 62 @ 58 : 65 +> CHANGE 57 : 62 @ 57 : 64 ~ implements JSONTypeCodec { ~ public ServerStatusResponse.MinecraftProtocolVersionIdentifier deserialize(JSONObject jsonobject) @@ -26,7 +26,7 @@ ~ return new ServerStatusResponse.MinecraftProtocolVersionIdentifier(jsonobject.getString("name"), ~ jsonobject.getInt("protocol")); -> CHANGE 7 : 12 @ 9 : 15 +> CHANGE 2 : 7 @ 2 : 8 ~ public JSONObject serialize( ~ ServerStatusResponse.MinecraftProtocolVersionIdentifier serverstatusresponse$minecraftprotocolversionidentifier) { @@ -34,12 +34,12 @@ ~ jsonobject.put("name", serverstatusresponse$minecraftprotocolversionidentifier.getName()); ~ jsonobject.put("protocol", -> CHANGE 37 : 39 @ 38 : 43 +> CHANGE 32 : 34 @ 32 : 37 ~ public static class Serializer implements JSONTypeCodec { ~ public ServerStatusResponse.PlayerCountData deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 3 : 8 @ 6 : 11 +> CHANGE 1 : 6 @ 1 : 6 ~ jsonobject.getInt("max"), jsonobject.getInt("online")); ~ JSONArray jsonarray = jsonobject.optJSONArray("sample"); @@ -47,14 +47,14 @@ ~ if (jsonarray.length() > 0) { ~ GameProfile[] agameprofile = new GameProfile[jsonarray.length()]; -> CHANGE 7 : 11 @ 7 : 11 +> CHANGE 2 : 6 @ 2 : 6 ~ JSONObject jsonobject1 = jsonarray.getJSONObject(i); ~ String s = jsonobject1.getString("id"); ~ agameprofile[i] = new GameProfile(EaglercraftUUID.fromString(s), ~ jsonobject1.getString("name")); -> CHANGE 13 : 18 @ 13 : 19 +> CHANGE 9 : 14 @ 9 : 15 ~ public JSONObject serialize(ServerStatusResponse.PlayerCountData serverstatusresponse$playercountdata) ~ throws JSONException { @@ -62,11 +62,11 @@ ~ jsonobject.put("max", Integer.valueOf(serverstatusresponse$playercountdata.getMaxPlayers())); ~ jsonobject.put("online", Integer.valueOf(serverstatusresponse$playercountdata.getOnlinePlayerCount())); -> CHANGE 7 : 8 @ 8 : 9 +> CHANGE 2 : 3 @ 2 : 3 ~ JSONArray jsonarray = new JSONArray(); -> CHANGE 3 : 8 @ 3 : 8 +> CHANGE 2 : 7 @ 2 : 7 ~ JSONObject jsonobject1 = new JSONObject(); ~ EaglercraftUUID uuid = serverstatusresponse$playercountdata.getPlayers()[i].getId(); @@ -74,55 +74,55 @@ ~ jsonobject1.put("name", serverstatusresponse$playercountdata.getPlayers()[i].getName()); ~ jsonarray.put(jsonobject1); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 2 : 3 @ 2 : 3 ~ jsonobject.put("sample", jsonarray); -> CHANGE 8 : 10 @ 8 : 13 +> CHANGE 7 : 9 @ 7 : 12 ~ public static class Serializer implements JSONTypeCodec { ~ public ServerStatusResponse deserialize(JSONObject jsonobject) throws JSONException { -> CHANGE 4 : 5 @ 7 : 8 +> CHANGE 2 : 3 @ 2 : 3 ~ serverstatusresponse.setServerDescription((IChatComponent) JSONTypeProvider -> CHANGE 5 : 7 @ 5 : 8 +> CHANGE 4 : 6 @ 4 : 7 ~ serverstatusresponse.setPlayerCountData((ServerStatusResponse.PlayerCountData) JSONTypeProvider ~ .deserialize(jsonobject.get("players"), ServerStatusResponse.PlayerCountData.class)); -> CHANGE 6 : 9 @ 7 : 10 +> CHANGE 4 : 7 @ 4 : 7 ~ (ServerStatusResponse.MinecraftProtocolVersionIdentifier) JSONTypeProvider.deserialize( ~ jsonobject.get("version"), ~ ServerStatusResponse.MinecraftProtocolVersionIdentifier.class)); -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 3 : 4 @ 3 : 4 ~ serverstatusresponse.setFavicon(jsonobject.getString("favicon")); -> CHANGE 6 : 8 @ 6 : 9 +> CHANGE 5 : 7 @ 5 : 8 ~ public JSONObject serialize(ServerStatusResponse serverstatusresponse) { ~ JSONObject jsonobject = new JSONObject(); -> CHANGE 3 : 5 @ 4 : 6 +> CHANGE 1 : 3 @ 1 : 3 ~ jsonobject.put("description", ~ (Object) JSONTypeProvider.serialize(serverstatusresponse.getServerDescription())); -> CHANGE 5 : 7 @ 5 : 7 +> CHANGE 3 : 5 @ 3 : 5 ~ jsonobject.put("players", ~ (Object) JSONTypeProvider.serialize(serverstatusresponse.getPlayerCountData())); -> CHANGE 5 : 7 @ 5 : 7 +> CHANGE 3 : 5 @ 3 : 5 ~ jsonobject.put("version", ~ (Object) JSONTypeProvider.serialize(serverstatusresponse.getProtocolVersionInfo())); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("favicon", serverstatusresponse.getFavicon()); diff --git a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java index 4f0c46f..b75a366 100644 --- a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java +++ b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> CHANGE 18 : 19 @ 16 : 17 +> CHANGE 15 : 16 @ 15 : 16 ~ this.profile = new GameProfile((EaglercraftUUID) null, parPacketBuffer.readStringFromBuffer(16)); diff --git a/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java b/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java index 28e45f2..2a0b6e4 100644 --- a/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java +++ b/patches/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java @@ -9,22 +9,22 @@ ~ -> DELETE 4 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> CHANGE 8 : 12 @ 9 : 13 +> CHANGE 8 : 12 @ 8 : 12 ~ // public C01PacketEncryptionResponse(SecretKey secretKey, PublicKey publicKey, byte[] verifyToken) { ~ // this.secretKeyEncrypted = CryptManager.encryptData(publicKey, secretKey.getEncoded()); ~ // this.verifyTokenEncrypted = CryptManager.encryptData(publicKey, verifyToken); ~ // } -> CHANGE 19 : 22 @ 19 : 22 +> CHANGE 15 : 18 @ 15 : 18 ~ // public SecretKey getSecretKey(PrivateKey key) { ~ // return CryptManager.decryptSharedKey(key, this.secretKeyEncrypted); ~ // } -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 1 : 4 @ 1 : 4 ~ // public byte[] getVerifyToken(PrivateKey key) { ~ // return key == null ? this.verifyTokenEncrypted : CryptManager.decryptData(key, this.verifyTokenEncrypted); diff --git a/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java b/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java index 9145e0f..d7bb1e4 100644 --- a/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java +++ b/patches/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java @@ -9,13 +9,13 @@ ~ -> DELETE 4 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ // private PublicKey publicKey; -> CHANGE 6 : 11 @ 6 : 11 +> CHANGE 5 : 10 @ 5 : 10 ~ // public S01PacketEncryptionRequest(String serverId, PublicKey key, byte[] verifyToken) { ~ // this.hashedServerId = serverId; @@ -23,19 +23,19 @@ ~ // this.verifyToken = verifyToken; ~ // } -> CHANGE 8 : 11 @ 8 : 9 +> CHANGE 3 : 6 @ 3 : 4 ~ // this.publicKey = ~ // CryptManager.decodePublicKey(parPacketBuffer.readByteArray()); ~ parPacketBuffer.readByteArray(); // skip -> CHANGE 7 : 10 @ 5 : 8 +> CHANGE 4 : 7 @ 4 : 7 ~ // parPacketBuffer.writeString(this.hashedServerId); ~ // parPacketBuffer.writeByteArray(this.publicKey.getEncoded()); ~ // parPacketBuffer.writeByteArray(this.verifyToken); -> CHANGE 13 : 16 @ 13 : 16 +> CHANGE 10 : 13 @ 10 : 13 ~ // public PublicKey getPublicKey() { ~ // return this.publicKey; diff --git a/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java b/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java index 4d2148c..3bec484 100644 --- a/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java +++ b/patches/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 2 : 3 +> CHANGE 1 : 4 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> CHANGE 20 : 21 @ 18 : 19 +> CHANGE 17 : 18 @ 17 : 18 ~ EaglercraftUUID uuid = EaglercraftUUID.fromString(s); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ EaglercraftUUID uuid = this.profile.getId(); diff --git a/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java b/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java index e7b6e6d..3289ff8 100644 --- a/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java +++ b/patches/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.edit.java @@ -11,6 +11,6 @@ + import org.apache.commons.lang3.StringUtils; + -> DELETE 7 @ 4 : 5 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java b/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java index 6335ae1..58db6d2 100644 --- a/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java +++ b/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 3 @ 2 +> INSERT 1 : 3 @ 1 + + import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; diff --git a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java index 8e5589f..fb321fb 100644 --- a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java +++ b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java @@ -10,16 +10,16 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 5 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ private EaglercraftUUID id; -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ public C18PacketSpectate(EaglercraftUUID id) { -> DELETE 16 @ 16 : 19 +> DELETE 15 @ 15 : 18 > EOF diff --git a/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java b/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java index f1dfe50..d223caa 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java @@ -10,11 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> CHANGE 13 : 14 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ private EaglercraftUUID playerId; -> CHANGE 66 : 67 @ 66 : 67 +> CHANGE 65 : 66 @ 65 : 66 ~ public EaglercraftUUID getPlayer() { diff --git a/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java b/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java index 048cd4a..8580f41 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 3 -> CHANGE 4 : 8 @ 5 : 6 +> CHANGE 4 : 8 @ 4 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ ~ import com.google.common.collect.Lists; ~ -> CHANGE 39 : 40 @ 36 : 37 +> CHANGE 35 : 36 @ 35 : 36 ~ EaglercraftUUID uuid = parPacketBuffer.readUuid(); diff --git a/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java b/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java index 863cb5c..ca2c410 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S21PacketChunkData.edit.java @@ -7,21 +7,21 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Lists; + -> CHANGE 77 : 78 @ 74 : 75 +> CHANGE 74 : 75 @ 74 : 75 ~ for (ExtendedBlockStorage extendedblockstorage1 : (ArrayList) arraylist) { -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ for (ExtendedBlockStorage extendedblockstorage2 : (ArrayList) arraylist) { -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 5 : 6 @ 5 : 6 ~ for (ExtendedBlockStorage extendedblockstorage3 : (ArrayList) arraylist) { diff --git a/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java b/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java index b641099..f6f7bae 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.edit.java @@ -9,6 +9,6 @@ + -> DELETE 4 @ 3 : 4 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java b/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java index ee5b2dc..aaea441 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S27PacketExplosion.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java b/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java index 6bc3b95..3d6c1b3 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.edit.java @@ -11,6 +11,6 @@ + import org.apache.commons.lang3.Validate; + -> DELETE 7 @ 4 : 5 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java b/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java index 3827cac..6b4c391 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S37PacketStatistics.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 3 : 6 @ 4 +> INSERT 3 : 6 @ 3 + + import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java index b9ac5e2..4581b87 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 6 -> CHANGE 2 : 8 @ 6 : 7 +> CHANGE 2 : 8 @ 2 : 3 ~ ~ import com.google.common.base.Objects; @@ -16,9 +16,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property; -> DELETE 19 @ 14 : 36 +> DELETE 13 @ 13 : 35 -> CHANGE 58 : 59 @ 80 : 133 +> CHANGE 58 : 59 @ 58 : 111 ~ // server only diff --git a/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java b/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java index ee5b2dc..aaea441 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S3EPacketTeams.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java b/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java index 6335ae1..58db6d2 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 3 @ 2 +> INSERT 1 : 3 @ 1 + + import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; diff --git a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java b/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java index 3ccd40a..2772ce4 100644 --- a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java +++ b/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 1 : 6 @ 3 +> INSERT 1 : 6 @ 1 + + import org.json.JSONException; @@ -15,13 +15,13 @@ + + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -> DELETE 10 @ 5 : 6 +> DELETE 5 @ 5 : 6 -> CHANGE 3 : 4 @ 4 : 13 +> CHANGE 3 : 4 @ 3 : 12 ~ -> CHANGE 11 : 17 @ 19 : 21 +> CHANGE 10 : 16 @ 10 : 12 ~ try { ~ this.response = (ServerStatusResponse) JSONTypeProvider.deserialize( @@ -30,7 +30,7 @@ ~ throw new IOException("Invalid ServerStatusResponse JSON payload", exc); ~ } -> CHANGE 9 : 14 @ 5 : 6 +> CHANGE 3 : 8 @ 3 : 4 ~ try { ~ parPacketBuffer.writeString(((JSONObject) JSONTypeProvider.serialize(this.response)).toString()); diff --git a/patches/minecraft/net/minecraft/potion/Potion.edit.java b/patches/minecraft/net/minecraft/potion/Potion.edit.java index c02590d..6bba0cf 100644 --- a/patches/minecraft/net/minecraft/potion/Potion.edit.java +++ b/patches/minecraft/net/minecraft/potion/Potion.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> INSERT 1 : 6 @ 3 +> INSERT 1 : 6 @ 1 + import java.util.Set; + import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; @@ -17,13 +17,13 @@ + import com.google.common.collect.Maps; + -> DELETE 13 @ 8 : 13 +> DELETE 8 @ 8 : 13 -> CHANGE 123 : 124 @ 128 : 131 +> CHANGE 123 : 124 @ 123 : 126 ~ // multiplayer only -> CHANGE 102 : 104 @ 104 : 106 +> CHANGE 101 : 103 @ 101 : 103 ~ AttributeModifier attributemodifier = new AttributeModifier(EaglercraftUUID.fromString(parString1), ~ this.getName(), parDouble1, parInt1); diff --git a/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java b/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java index 238f84f..8922386 100644 --- a/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java +++ b/patches/minecraft/net/minecraft/potion/PotionEffect.edit.java @@ -10,6 +10,6 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 4 @ 2 : 5 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java b/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java index 48a11e1..987bd05 100644 --- a/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java +++ b/patches/minecraft/net/minecraft/potion/PotionHelper.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> CHANGE 4 : 8 @ 6 : 8 +> CHANGE 4 : 8 @ 4 : 6 ~ ~ import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/profiler/Profiler.edit.java b/patches/minecraft/net/minecraft/profiler/Profiler.edit.java index bc35fbf..2fda01d 100644 --- a/patches/minecraft/net/minecraft/profiler/Profiler.edit.java +++ b/patches/minecraft/net/minecraft/profiler/Profiler.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 4 -> DELETE 4 @ 6 : 8 +> DELETE 4 @ 4 : 6 -> INSERT 1 : 7 @ 3 +> INSERT 1 : 7 @ 1 + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java b/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java index c0406de..fb3139b 100644 --- a/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/GoalColor.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java index f8171f1..29e7889 100644 --- a/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Maps; + -> DELETE 4 @ 1 : 4 +> DELETE 1 @ 1 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/scoreboard/Score.edit.java b/patches/minecraft/net/minecraft/scoreboard/Score.edit.java index 4d6a666..6c28ae7 100644 --- a/patches/minecraft/net/minecraft/scoreboard/Score.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/Score.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java index c0406de..fb3139b 100644 --- a/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 2 +> DELETE 1 @ 1 : 2 > EOF diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java index e888843..c2de725 100644 --- a/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.edit.java @@ -9,6 +9,6 @@ + -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 > EOF diff --git a/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java index 3124671..dd59b85 100644 --- a/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> CHANGE 2 : 5 @ 3 : 5 +> CHANGE 2 : 5 @ 2 : 4 ~ ~ import com.google.common.collect.Sets; diff --git a/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java b/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java index ede8791..cea32b1 100644 --- a/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/Scoreboard.edit.java @@ -7,24 +7,24 @@ > DELETE 2 @ 2 : 4 -> INSERT 5 : 9 @ 7 +> INSERT 5 : 9 @ 5 + + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; + -> DELETE 6 @ 2 : 6 +> DELETE 2 @ 2 : 6 -> CHANGE 27 : 28 @ 31 : 32 +> CHANGE 27 : 28 @ 27 : 28 ~ this.scoreObjectiveCriterias.put(criteria, (List) object); -> CHANGE 33 : 34 @ 33 : 34 +> CHANGE 32 : 33 @ 32 : 33 ~ this.entitiesScoreObjectives.put(name, (Map) object); -> CHANGE 62 : 63 @ 62 : 63 +> CHANGE 61 : 62 @ 61 : 62 ~ for (Map map : (Collection) collection) { diff --git a/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java b/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java index 6b20785..8abf638 100644 --- a/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.edit.java @@ -10,8 +10,8 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 5 @ 3 : 9 +> DELETE 3 @ 3 : 9 -> DELETE 2 @ 8 : 10 +> DELETE 2 @ 2 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/scoreboard/Team.edit.java b/patches/minecraft/net/minecraft/scoreboard/Team.edit.java index e566f15..21d348c 100644 --- a/patches/minecraft/net/minecraft/scoreboard/Team.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/Team.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 3 : 5 @ 4 +> INSERT 3 : 5 @ 3 + import com.google.common.collect.Maps; + diff --git a/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java b/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java index a3c6529..b8809a9 100644 --- a/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java +++ b/patches/minecraft/net/minecraft/server/management/LowerStringMap.edit.java @@ -7,14 +7,14 @@ > DELETE 2 @ 2 : 3 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> INSERT 1 : 3 @ 2 +> INSERT 1 : 3 @ 1 + import com.google.common.collect.Maps; + -> CHANGE 35 : 36 @ 33 : 34 +> CHANGE 33 : 34 @ 33 : 34 ~ this.put((String) entry.getKey(), (V) entry.getValue()); diff --git a/patches/minecraft/net/minecraft/stats/AchievementList.edit.java b/patches/minecraft/net/minecraft/stats/AchievementList.edit.java index df3bb8c..4da52e1 100644 --- a/patches/minecraft/net/minecraft/stats/AchievementList.edit.java +++ b/patches/minecraft/net/minecraft/stats/AchievementList.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 6 @ 3 : 4 +> DELETE 3 @ 3 : 4 -> CHANGE 7 : 42 @ 8 : 77 +> CHANGE 7 : 42 @ 7 : 76 ~ public static List achievementList; ~ public static Achievement openInventory; @@ -53,7 +53,7 @@ ~ public static Achievement exploreAllBiomes; ~ public static Achievement overpowered; -> INSERT 37 : 100 @ 71 +> INSERT 2 : 65 @ 2 + achievementList = Lists.newArrayList(); + openInventory = (new Achievement("achievement.openInventory", "openInventory", 0, 0, Items.book, diff --git a/patches/minecraft/net/minecraft/stats/StatBase.edit.java b/patches/minecraft/net/minecraft/stats/StatBase.edit.java index 2978a6d..1f3621c 100644 --- a/patches/minecraft/net/minecraft/stats/StatBase.edit.java +++ b/patches/minecraft/net/minecraft/stats/StatBase.edit.java @@ -9,6 +9,6 @@ + -> DELETE 3 @ 2 : 5 +> DELETE 2 @ 2 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java b/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java index 54c27d7..6eba9fc 100644 --- a/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java +++ b/patches/minecraft/net/minecraft/stats/StatFileWriter.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Maps; + -> DELETE 4 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> CHANGE 4 : 5 @ 6 : 7 +> CHANGE 4 : 5 @ 4 : 5 ~ protected final Map statsData = Maps.newHashMap(); diff --git a/patches/minecraft/net/minecraft/stats/StatList.edit.java b/patches/minecraft/net/minecraft/stats/StatList.edit.java index 4924f23..f81d27d 100644 --- a/patches/minecraft/net/minecraft/stats/StatList.edit.java +++ b/patches/minecraft/net/minecraft/stats/StatList.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> INSERT 3 : 8 @ 6 +> INSERT 3 : 8 @ 3 + + import com.google.common.collect.Lists; @@ -15,9 +15,9 @@ + import com.google.common.collect.Sets; + -> DELETE 14 @ 9 : 13 +> DELETE 9 @ 9 : 13 -> CHANGE 146 : 147 @ 150 : 151 +> CHANGE 146 : 147 @ 146 : 147 ~ for (Item item : (HashSet) hashset) { diff --git a/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java b/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java index 1bf4fb4..b20d8b2 100644 --- a/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 12 @ 9 : 10 +> DELETE 9 @ 9 : 10 -> CHANGE 47 : 55 @ 48 : 118 +> CHANGE 47 : 55 @ 47 : 117 ~ double d3 = (double) ((float) blockpos.getX() + this.getSpawnerWorld().rand.nextFloat()); ~ double d4 = (double) ((float) blockpos.getY() + this.getSpawnerWorld().rand.nextFloat()); @@ -26,12 +26,12 @@ ~ if (this.spawnDelay > 0) { ~ --this.spawnDelay; -> INSERT 10 : 12 @ 72 +> INSERT 2 : 4 @ 2 + this.prevMobRotation = this.mobRotation; + this.mobRotation = (this.mobRotation + (double) (1000.0F / ((float) this.spawnDelay + 200.0F))) % 360.0D; -> CHANGE 158 : 159 @ 156 : 157 +> CHANGE 156 : 157 @ 156 : 157 ~ if (delay == 1) { diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java index cd4868d..ba7fe96 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntity.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 8 @ 3 +> INSERT 2 : 8 @ 2 + + import com.google.common.collect.Maps; @@ -16,27 +16,27 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 13 @ 7 : 27 +> DELETE 7 @ 7 : 27 -> DELETE 2 @ 22 : 24 +> DELETE 2 @ 2 : 4 -> CHANGE 58 : 59 @ 60 : 61 +> CHANGE 58 : 59 @ 58 : 59 ~ logger.error("Could not create TileEntity", exception); -> CHANGE 85 : 86 @ 85 : 86 +> CHANGE 84 : 85 @ 84 : 85 ~ + TileEntity.this.getClass().getName(); -> CHANGE 11 : 12 @ 11 : 12 +> CHANGE 10 : 11 @ 10 : 11 ~ return HString.format("ID #%d (%s // %s)", -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ Block.getBlockById(i).getClass().getName() }); -> CHANGE 13 : 15 @ 13 : 15 +> CHANGE 12 : 14 @ 12 : 14 ~ String s = HString.format("%4s", new Object[] { Integer.toBinaryString(i) }).replace(" ", "0"); ~ return HString.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(i), s }); diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java index 8f30dfb..66d1aab 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBanner.edit.java @@ -7,16 +7,16 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 5 @ 2 +> INSERT 1 : 5 @ 1 + import java.util.function.Supplier; + + import com.google.common.collect.Lists; + -> DELETE 13 @ 9 : 10 +> DELETE 9 @ 9 : 10 -> CHANGE 169 : 178 @ 170 : 177 +> CHANGE 169 : 178 @ 169 : 176 ~ BORDER("border", "bo", "###", "# #", "###"), ~ CURLY_BORDER("curly_border", "cbo", () -> new ItemStack(Blocks.vine)), @@ -28,27 +28,27 @@ ~ () -> new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.OXEYE_DAISY.getMeta())), ~ MOJANG("mojang", "moj", () -> new ItemStack(Items.golden_apple, 1, 1)); -> INSERT 13 : 14 @ 11 +> INSERT 4 : 5 @ 4 + private Supplier patternCraftingStackSupplier; -> CHANGE 9 : 10 @ 8 : 9 +> CHANGE 8 : 9 @ 8 : 9 ~ private EnumBannerPattern(String name, String id, Supplier craftingItem) { -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ this.patternCraftingStackSupplier = craftingItem; -> CHANGE 23 : 24 @ 23 : 24 +> CHANGE 22 : 23 @ 22 : 23 ~ return this.patternCraftingStackSupplier != null || this.craftingLayers[0] != null; -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ return this.patternCraftingStackSupplier != null; -> INSERT 4 : 7 @ 4 +> INSERT 3 : 6 @ 3 + if (patternCraftingStack == null) { + patternCraftingStack = patternCraftingStackSupplier.get(); diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java index 015a8bf..286a1f8 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java @@ -7,18 +7,18 @@ > DELETE 2 @ 2 : 3 -> INSERT 2 : 5 @ 3 +> INSERT 2 : 5 @ 2 + + import com.google.common.collect.Lists; + -> DELETE 21 @ 18 : 22 +> DELETE 18 @ 18 : 22 -> DELETE 29 @ 33 : 39 +> DELETE 29 @ 29 : 35 -> DELETE 1 @ 7 : 26 +> DELETE 1 @ 1 : 20 -> DELETE 82 @ 101 : 109 +> DELETE 82 @ 82 : 90 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java index 420728b..859b5d3 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 2 @ 2 : 4 +> CHANGE 1 : 2 @ 1 : 3 ~ -> DELETE 13 @ 14 : 15 +> DELETE 12 @ 12 : 13 -> DELETE 46 @ 47 : 65 +> DELETE 46 @ 46 : 64 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java index 0a82d88..cc41410 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java @@ -7,10 +7,10 @@ > DELETE 9 @ 9 : 10 -> DELETE 3 @ 4 : 7 +> DELETE 3 @ 3 : 6 -> DELETE 207 @ 210 : 213 +> DELETE 207 @ 207 : 210 -> DELETE 1 @ 4 : 18 +> DELETE 1 @ 1 : 15 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java index b5f8d4d..05816d8 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java @@ -9,8 +9,8 @@ ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; -> DELETE 6 @ 7 : 8 +> DELETE 5 @ 5 : 6 -> DELETE 68 @ 69 : 72 +> DELETE 68 @ 68 : 71 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java index c71a017..95f936a 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java @@ -7,6 +7,6 @@ > DELETE 2 @ 2 : 4 -> DELETE 4 @ 6 : 13 +> DELETE 4 @ 4 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java index 688644a..d40399a 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityDispenser.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 10 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ private static final EaglercraftRandom RNG = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java index 39b42e6..bf3236f 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 7 @ 6 : 7 +> DELETE 5 @ 5 : 6 -> CHANGE 18 : 19 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 ~ private static EaglercraftRandom rand = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java index 402e9b3..e26986f 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java @@ -7,12 +7,12 @@ > DELETE 3 @ 3 : 4 -> DELETE 19 @ 20 : 21 +> DELETE 19 @ 19 : 20 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 136 @ 137 : 139 +> DELETE 136 @ 136 : 138 -> DELETE 3 @ 5 : 47 +> DELETE 3 @ 3 : 45 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java index ba5f55d..1674dc7 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java @@ -9,18 +9,18 @@ + -> DELETE 3 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> DELETE 11 @ 12 : 16 +> DELETE 11 @ 11 : 15 -> DELETE 136 @ 140 : 148 +> DELETE 136 @ 136 : 144 -> CHANGE 3 : 4 @ 11 : 33 +> CHANGE 3 : 4 @ 3 : 25 ~ return false; -> DELETE 3 @ 24 : 72 +> DELETE 2 @ 2 : 50 -> DELETE 188 @ 236 : 243 +> DELETE 188 @ 188 : 195 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java index 45058e0..d217679 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityPiston.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 8 @ 5 : 6 +> DELETE 5 @ 5 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java index 9a18851..699266e 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java @@ -10,28 +10,28 @@ ~ import org.json.JSONException; ~ -> DELETE 3 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 3 @ 4 : 6 +> DELETE 3 @ 3 : 5 -> DELETE 3 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> DELETE 10 @ 11 : 12 +> DELETE 10 @ 10 : 11 -> DELETE 9 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> DELETE 42 @ 43 : 45 +> DELETE 42 @ 42 : 44 -> CHANGE 14 : 15 @ 16 : 17 +> CHANGE 14 : 15 @ 14 : 15 ~ } catch (JSONException var8) { -> DELETE 5 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 33 @ 34 : 87 +> DELETE 33 @ 33 : 86 -> DELETE 3 @ 56 : 59 +> DELETE 3 @ 3 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java index ce5a96b..69621ed 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntitySkull.edit.java @@ -11,13 +11,13 @@ ~ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> DELETE 7 @ 8 : 10 +> DELETE 4 @ 4 : 6 -> CHANGE 29 : 30 @ 31 : 32 +> CHANGE 29 : 30 @ 29 : 30 ~ this.playerProfile = new GameProfile((EaglercraftUUID) null, s); -> CHANGE 35 : 36 @ 35 : 59 +> CHANGE 34 : 35 @ 34 : 58 ~ return input; diff --git a/patches/minecraft/net/minecraft/util/BlockPos.edit.java b/patches/minecraft/net/minecraft/util/BlockPos.edit.java index a7c89cb..46a7ca8 100644 --- a/patches/minecraft/net/minecraft/util/BlockPos.edit.java +++ b/patches/minecraft/net/minecraft/util/BlockPos.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.AbstractIterator; + -> DELETE 4 @ 1 : 5 +> DELETE 1 @ 1 : 5 -> INSERT 103 : 120 @ 107 +> INSERT 103 : 120 @ 103 + public BlockPos offsetFaster(EnumFacing facing, MutableBlockPos ret) { + ret.x = this.getX() + facing.getFrontOffsetX(); @@ -35,9 +35,9 @@ + } + -> DELETE 125 @ 108 : 111 +> DELETE 108 @ 108 : 111 -> CHANGE 6 : 7 @ 9 : 13 +> CHANGE 6 : 7 @ 6 : 10 ~ super(x_, y_, z_); diff --git a/patches/minecraft/net/minecraft/util/Cartesian.edit.java b/patches/minecraft/net/minecraft/util/Cartesian.edit.java index a7a09a6..6df27ff 100644 --- a/patches/minecraft/net/minecraft/util/Cartesian.edit.java +++ b/patches/minecraft/net/minecraft/util/Cartesian.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 6 -> INSERT 8 : 13 @ 12 +> INSERT 8 : 13 @ 8 + import com.google.common.base.Function; + import com.google.common.collect.Iterables; @@ -15,11 +15,11 @@ + import com.google.common.collect.UnmodifiableIterator; + -> CHANGE 37 : 38 @ 32 : 33 +> CHANGE 32 : 33 @ 32 : 33 ~ return (List) Arrays.asList((Object[]) aobject); -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ ? Collections.singletonList((T[]) Cartesian.createArray(this.clazz, 0)).iterator() diff --git a/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java index d6b0d30..739540a 100644 --- a/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java +++ b/patches/minecraft/net/minecraft/util/ChatComponentProcessor.edit.java @@ -9,6 +9,6 @@ + -> DELETE 6 @ 5 : 11 +> DELETE 5 @ 5 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java index 35de7f2..403de85 100644 --- a/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java +++ b/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java @@ -7,6 +7,6 @@ > DELETE 2 @ 2 : 10 -> DELETE 23 @ 31 : 43 +> DELETE 23 @ 23 : 35 > EOF diff --git a/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java index 52a90c7..84d1005 100644 --- a/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java +++ b/patches/minecraft/net/minecraft/util/ChatComponentStyle.edit.java @@ -11,6 +11,6 @@ + import java.util.List; + -> DELETE 6 @ 3 : 9 +> DELETE 3 @ 3 : 9 > EOF diff --git a/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java index 3c2d1d2..16e8199 100644 --- a/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java +++ b/patches/minecraft/net/minecraft/util/ChatComponentTranslation.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 4 -> DELETE 6 @ 8 : 14 +> DELETE 6 @ 6 : 12 -> INSERT 1 : 6 @ 7 +> INSERT 1 : 6 @ 1 + import com.google.common.collect.Iterators; + import com.google.common.collect.Lists; @@ -17,11 +17,11 @@ + import net.lax1dude.eaglercraft.v1_8.HString; + -> CHANGE 63 : 64 @ 58 : 59 +> CHANGE 58 : 59 @ 58 : 59 ~ HString.format(format.substring(j, k), new Object[0])); -> CHANGE 26 : 27 @ 26 : 27 +> CHANGE 25 : 26 @ 25 : 26 ~ HString.format(format.substring(j), new Object[0])); diff --git a/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java index 614791f..51f8aa4 100644 --- a/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java +++ b/patches/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.edit.java @@ -9,15 +9,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.HString; -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ super(HString.format("Error parsing: %s: %s", new Object[] { component, message })); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ super(HString.format("Invalid index %d requested for %s", new Object[] { Integer.valueOf(index), component })); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ super(HString.format("Error while parsing: %s", new Object[] { component }), cause); diff --git a/patches/minecraft/net/minecraft/util/ChatStyle.edit.java b/patches/minecraft/net/minecraft/util/ChatStyle.edit.java index b909b50..1a08571 100644 --- a/patches/minecraft/net/minecraft/util/ChatStyle.edit.java +++ b/patches/minecraft/net/minecraft/util/ChatStyle.edit.java @@ -13,9 +13,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeCodec; ~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -> DELETE 7 @ 11 : 13 +> DELETE 2 @ 2 : 4 -> CHANGE 330 : 339 @ 332 : 344 +> CHANGE 330 : 339 @ 330 : 342 ~ public static class Serializer implements JSONTypeCodec { ~ public ChatStyle deserialize(JSONObject jsonobject) throws JSONException { @@ -27,43 +27,43 @@ ~ chatstyle.bold = jsonobject.getBoolean("bold"); ~ } -> CHANGE 10 : 13 @ 13 : 16 +> CHANGE 1 : 4 @ 1 : 4 ~ if (jsonobject.has("italic")) { ~ chatstyle.italic = jsonobject.getBoolean("italic"); ~ } -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 1 : 4 @ 1 : 4 ~ if (jsonobject.has("underlined")) { ~ chatstyle.underlined = jsonobject.getBoolean("underlined"); ~ } -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 1 : 4 @ 1 : 4 ~ if (jsonobject.has("strikethrough")) { ~ chatstyle.strikethrough = jsonobject.getBoolean("strikethrough"); ~ } -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 1 : 4 @ 1 : 4 ~ if (jsonobject.has("obfuscated")) { ~ chatstyle.obfuscated = jsonobject.getBoolean("obfuscated"); ~ } -> CHANGE 4 : 7 @ 4 : 8 +> CHANGE 1 : 4 @ 1 : 5 ~ if (jsonobject.has("color")) { ~ chatstyle.color = EnumChatFormatting.getValueByName(jsonobject.getString("color")); ~ } -> CHANGE 4 : 7 @ 5 : 8 +> CHANGE 1 : 4 @ 1 : 4 ~ if (jsonobject.has("insertion")) { ~ chatstyle.insertion = jsonobject.getString("insertion"); ~ } -> CHANGE 4 : 14 @ 4 : 15 +> CHANGE 1 : 11 @ 1 : 12 ~ if (jsonobject.has("clickEvent")) { ~ JSONObject jsonobject1 = jsonobject.getJSONObject("clickEvent"); @@ -76,11 +76,11 @@ ~ && clickevent$action.shouldAllowInChat()) { ~ chatstyle.chatClickEvent = new ClickEvent(clickevent$action, jsonprimitive1); -> INSERT 12 : 13 @ 13 +> INSERT 2 : 3 @ 2 + } -> CHANGE 2 : 13 @ 1 : 13 +> CHANGE 1 : 12 @ 1 : 13 ~ if (jsonobject.has("hoverEvent")) { ~ JSONObject jsonobject2 = jsonobject.getJSONObject("hoverEvent"); @@ -94,57 +94,57 @@ ~ && hoverevent$action.shouldAllowInChat()) { ~ chatstyle.chatHoverEvent = new HoverEvent(hoverevent$action, ichatcomponent); -> DELETE 13 @ 14 : 16 +> DELETE 2 @ 2 : 4 -> CHANGE 1 : 3 @ 3 : 5 +> CHANGE 1 : 3 @ 1 : 3 ~ ~ return chatstyle; -> CHANGE 5 : 6 @ 5 : 7 +> CHANGE 3 : 4 @ 3 : 5 ~ public JSONObject serialize(ChatStyle chatstyle) { -> CHANGE 4 : 5 @ 5 : 6 +> CHANGE 3 : 4 @ 3 : 4 ~ JSONObject jsonobject = new JSONObject(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ jsonobject.put("bold", chatstyle.bold); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("italic", chatstyle.italic); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("underlined", chatstyle.underlined); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("strikethrough", chatstyle.strikethrough); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("obfuscated", chatstyle.obfuscated); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("color", (String) JSONTypeProvider.serialize(chatstyle.color)); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("insertion", chatstyle.insertion); -> CHANGE 4 : 8 @ 4 : 8 +> CHANGE 3 : 7 @ 3 : 7 ~ JSONObject jsonobject1 = new JSONObject(); ~ jsonobject1.put("action", chatstyle.chatClickEvent.getAction().getCanonicalName()); ~ jsonobject1.put("value", chatstyle.chatClickEvent.getValue()); ~ jsonobject.put("clickEvent", jsonobject1); -> CHANGE 7 : 12 @ 7 : 11 +> CHANGE 3 : 8 @ 3 : 7 ~ JSONObject jsonobject2 = new JSONObject(); ~ jsonobject2.put("action", chatstyle.chatHoverEvent.getAction().getCanonicalName()); diff --git a/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java b/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java index 9909ca5..54bf577 100644 --- a/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java +++ b/patches/minecraft/net/minecraft/util/ClassInheritanceMultiMap.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 6 -> INSERT 6 : 11 @ 10 +> INSERT 6 : 11 @ 6 + import com.google.common.collect.Iterators; + import com.google.common.collect.Lists; @@ -15,11 +15,11 @@ + import com.google.common.collect.Sets; + -> CHANGE 28 : 29 @ 23 : 24 +> CHANGE 23 : 24 @ 23 : 24 ~ this.func_181743_a((T) object, clazz); -> CHANGE 32 : 33 @ 32 : 33 +> CHANGE 31 : 32 @ 31 : 32 ~ this.map.put(parClass1, (List) Lists.newArrayList(new Object[] { parObject })); diff --git a/patches/minecraft/net/minecraft/util/CombatTracker.edit.java b/patches/minecraft/net/minecraft/util/CombatTracker.edit.java index d316741..24ba4ad 100644 --- a/patches/minecraft/net/minecraft/util/CombatTracker.edit.java +++ b/patches/minecraft/net/minecraft/util/CombatTracker.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 9 @ 6 : 11 +> DELETE 6 @ 6 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java b/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java index fe36e3d..9e0f719 100644 --- a/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java +++ b/patches/minecraft/net/minecraft/util/EnchantmentNameParts.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ private EaglercraftRandom rand = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java b/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java index c1547f7..d2461fe 100644 --- a/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java +++ b/patches/minecraft/net/minecraft/util/EnumChatFormatting.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 5 : 8 @ 7 +> INSERT 5 : 8 @ 5 + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/util/EnumFacing.edit.java b/patches/minecraft/net/minecraft/util/EnumFacing.edit.java index 2f5dd99..754994b 100644 --- a/patches/minecraft/net/minecraft/util/EnumFacing.edit.java +++ b/patches/minecraft/net/minecraft/util/EnumFacing.edit.java @@ -12,13 +12,13 @@ + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + -> DELETE 7 @ 3 : 9 +> DELETE 3 @ 3 : 9 -> CHANGE 171 : 172 @ 177 : 178 +> CHANGE 171 : 172 @ 171 : 172 ~ public static EnumFacing random(EaglercraftRandom rand) { -> CHANGE 141 : 142 @ 141 : 142 +> CHANGE 140 : 141 @ 140 : 141 ~ public EnumFacing random(EaglercraftRandom rand) { diff --git a/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java b/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java index fb60ee1..928d01d 100644 --- a/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java +++ b/patches/minecraft/net/minecraft/util/EnumParticleTypes.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 3 : 6 @ 5 +> INSERT 3 : 6 @ 3 + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; diff --git a/patches/minecraft/net/minecraft/util/IChatComponent.edit.java b/patches/minecraft/net/minecraft/util/IChatComponent.edit.java index 460bb09..a9e5299 100644 --- a/patches/minecraft/net/minecraft/util/IChatComponent.edit.java +++ b/patches/minecraft/net/minecraft/util/IChatComponent.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 14 -> DELETE 1 @ 13 : 21 +> DELETE 1 @ 1 : 9 -> INSERT 1 : 8 @ 9 +> INSERT 1 : 8 @ 1 + import org.json.JSONArray; + import org.json.JSONException; @@ -19,11 +19,11 @@ + import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; + -> CHANGE 26 : 27 @ 19 : 21 +> CHANGE 19 : 20 @ 19 : 21 ~ public static class Serializer implements JSONTypeCodec { -> CHANGE 2 : 8 @ 3 : 10 +> CHANGE 1 : 7 @ 1 : 8 ~ public IChatComponent deserialize(Object parJsonElement) throws JSONException { ~ if (parJsonElement instanceof String) { @@ -32,138 +32,138 @@ ~ if (parJsonElement instanceof JSONArray) { ~ JSONArray jsonarray1 = (JSONArray) parJsonElement; -> CHANGE 8 : 10 @ 9 : 12 +> CHANGE 2 : 4 @ 2 : 5 ~ for (Object jsonelement : jsonarray1) { ~ IChatComponent ichatcomponent1 = this.deserialize(jsonelement); -> CHANGE 11 : 13 @ 12 : 14 +> CHANGE 9 : 11 @ 9 : 11 ~ throw new JSONException("Don\'t know how to turn " + parJsonElement.getClass().getSimpleName() ~ + " into a Component"); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ JSONObject jsonobject = (JSONObject) parJsonElement; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ object = new ChatComponentText(jsonobject.getString("text")); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ String s = jsonobject.getString("translate"); -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 1 : 3 @ 1 : 3 ~ JSONArray jsonarray = jsonobject.getJSONArray("with"); ~ Object[] aobject = new Object[jsonarray.length()]; -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ aobject[i] = this.deserialize(jsonarray.get(i)); -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ JSONObject jsonobject1 = jsonobject.getJSONObject("score"); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ throw new JSONException("A score component needs a least a name and an objective"); -> CHANGE 3 : 4 @ 3 : 5 +> CHANGE 2 : 3 @ 2 : 4 ~ object = new ChatComponentScore(jsonobject1.getString("name"), jsonobject1.getString("objective")); -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ ((ChatComponentScore) object).setValue(jsonobject1.getString("value")); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ throw new JSONException( -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ object = new ChatComponentSelector(jsonobject.getString("selector")); -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 3 : 6 @ 3 : 6 ~ JSONArray jsonarray2 = jsonobject.getJSONArray("extra"); ~ if (jsonarray2.length() <= 0) { ~ throw new JSONException("Unexpected empty array of components"); -> CHANGE 5 : 7 @ 5 : 8 +> CHANGE 2 : 4 @ 2 : 5 ~ for (int j = 0; j < jsonarray2.length(); ++j) { ~ ((IChatComponent) object).appendSibling(this.deserialize(jsonarray2.get(j))); -> CHANGE 5 : 6 @ 6 : 8 +> CHANGE 3 : 4 @ 3 : 5 ~ ((IChatComponent) object).setChatStyle(JSONTypeProvider.deserialize(parJsonElement, ChatStyle.class)); -> CHANGE 5 : 9 @ 6 : 14 +> CHANGE 4 : 8 @ 4 : 12 ~ private void serializeChatStyle(ChatStyle style, JSONObject object) { ~ JSONObject jsonelement = JSONTypeProvider.serialize(style); ~ for (String entry : jsonelement.keySet()) { ~ object.put(entry, jsonelement.get(entry)); -> DELETE 5 @ 9 : 10 +> DELETE 1 @ 1 : 2 -> CHANGE 2 : 3 @ 3 : 5 +> CHANGE 2 : 3 @ 2 : 4 ~ public Object serialize(IChatComponent ichatcomponent) { -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ return ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ JSONObject jsonobject = new JSONObject(); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ this.serializeChatStyle(ichatcomponent.getChatStyle(), jsonobject); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ JSONArray jsonarray = new JSONArray(); -> CHANGE 3 : 4 @ 3 : 5 +> CHANGE 2 : 3 @ 2 : 4 ~ jsonarray.put(this.serialize(ichatcomponent1)); -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ jsonobject.put("extra", jsonarray); -> CHANGE 4 : 5 @ 4 : 6 +> CHANGE 3 : 4 @ 3 : 5 ~ jsonobject.put("text", ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue()); -> CHANGE 3 : 4 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ jsonobject.put("translate", chatcomponenttranslation.getKey()); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ JSONArray jsonarray1 = new JSONArray(); -> CHANGE 4 : 5 @ 4 : 6 +> CHANGE 3 : 4 @ 3 : 5 ~ jsonarray1.put(this.serialize((IChatComponent) object)); -> CHANGE 2 : 3 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ jsonarray1.put(String.valueOf(object)); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ jsonobject.put("with", jsonarray1); -> CHANGE 4 : 9 @ 4 : 9 +> CHANGE 3 : 8 @ 3 : 8 ~ JSONObject jsonobject1 = new JSONObject(); ~ jsonobject1.put("name", chatcomponentscore.getName()); @@ -171,17 +171,17 @@ ~ jsonobject1.put("value", chatcomponentscore.getUnformattedTextForChat()); ~ jsonobject.put("score", jsonobject1); -> CHANGE 12 : 13 @ 12 : 13 +> CHANGE 7 : 8 @ 7 : 8 ~ jsonobject.put("selector", chatcomponentselector.getSelector()); -> INSERT 7 : 10 @ 7 +> INSERT 6 : 9 @ 6 + /** + * So sorry for this implementation + */ -> CHANGE 4 : 10 @ 1 : 2 +> CHANGE 1 : 7 @ 1 : 2 ~ if (component instanceof ChatComponentText) { ~ String escaped = new JSONObject().put("E", component.getUnformattedTextForChat()).toString(); @@ -190,15 +190,15 @@ ~ return JSONTypeProvider.serialize(component).toString(); ~ } -> CHANGE 9 : 10 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ return (IChatComponent) JSONTypeProvider.deserialize(json, IChatComponent.class); -> INSERT 2 : 3 @ 2 +> INSERT 1 : 2 @ 1 + } -> CHANGE 2 : 15 @ 1 : 7 +> CHANGE 1 : 14 @ 1 : 7 ~ public static IChatComponent join(List components) { ~ ChatComponentText chatcomponenttext = new ChatComponentText(""); @@ -214,7 +214,7 @@ ~ ~ chatcomponenttext.appendSibling((IChatComponent) components.get(i)); -> INSERT 14 : 16 @ 7 +> INSERT 1 : 3 @ 1 + + return chatcomponenttext; diff --git a/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java b/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java index 3ca6a7d..23970d9 100644 --- a/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java +++ b/patches/minecraft/net/minecraft/util/IJsonSerializable.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 4 -> CHANGE 1 : 2 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 2 ~ void fromJson(Object var1); -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ Object getSerializableElement(); diff --git a/patches/minecraft/net/minecraft/util/IThreadListener.edit.java b/patches/minecraft/net/minecraft/util/IThreadListener.edit.java index d171883..121a6b4 100644 --- a/patches/minecraft/net/minecraft/util/IThreadListener.edit.java +++ b/patches/minecraft/net/minecraft/util/IThreadListener.edit.java @@ -9,6 +9,6 @@ ~ import net.lax1dude.eaglercraft.v1_8.futures.ListenableFuture; -> DELETE 4 @ 4 : 6 +> DELETE 3 @ 3 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java b/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java index 662d16f..2087643 100644 --- a/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java +++ b/patches/minecraft/net/minecraft/util/JsonSerializableSet.edit.java @@ -12,9 +12,9 @@ + import org.json.JSONArray; + -> DELETE 6 @ 2 : 7 +> DELETE 2 @ 2 : 7 -> CHANGE 4 : 9 @ 9 : 13 +> CHANGE 4 : 9 @ 4 : 8 ~ public void fromJson(Object jsonelement) { ~ if (jsonelement instanceof JSONArray) { @@ -22,12 +22,12 @@ ~ for (int i = 0; i < arr.length(); ++i) { ~ underlyingSet.add(arr.getString(i)); -> CHANGE 10 : 12 @ 9 : 11 +> CHANGE 5 : 7 @ 5 : 7 ~ public Object getSerializableElement() { ~ JSONArray jsonarray = new JSONArray(); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 2 : 3 @ 2 : 3 ~ jsonarray.put(s); diff --git a/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java b/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java index 8f96408..91150b7 100644 --- a/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java +++ b/patches/minecraft/net/minecraft/util/LoggingPrintStream.edit.java @@ -7,30 +7,30 @@ > DELETE 4 @ 4 : 6 -> INSERT 1 : 5 @ 3 +> INSERT 1 : 5 @ 1 + import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime; + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + -> DELETE 5 @ 1 : 2 +> DELETE 1 @ 1 : 2 -> INSERT 1 : 3 @ 2 +> INSERT 1 : 3 @ 1 + private final Logger logger; + private final boolean err; -> CHANGE 3 : 4 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ public LoggingPrintStream(String domainIn, boolean err, OutputStream outStream) { -> INSERT 3 : 5 @ 3 +> INSERT 2 : 4 @ 2 + this.logger = LogManager.getLogger(domainIn); + this.err = err; -> CHANGE 13 : 27 @ 11 : 15 +> CHANGE 11 : 25 @ 11 : 15 ~ String callingClass = PlatformRuntime.getCallingClass(3); ~ if (callingClass == null) { diff --git a/patches/minecraft/net/minecraft/util/MapPopulator.edit.java b/patches/minecraft/net/minecraft/util/MapPopulator.edit.java index 16a5e05..4b73345 100644 --- a/patches/minecraft/net/minecraft/util/MapPopulator.edit.java +++ b/patches/minecraft/net/minecraft/util/MapPopulator.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 4 : 6 @ 5 +> INSERT 4 : 6 @ 4 + import com.google.common.collect.Maps; + -> CHANGE 11 : 12 @ 9 : 10 +> CHANGE 9 : 10 @ 9 : 10 ~ map.put((K) object, (V) iterator.next()); diff --git a/patches/minecraft/net/minecraft/util/MathHelper.edit.java b/patches/minecraft/net/minecraft/util/MathHelper.edit.java index d22112e..445ac2d 100644 --- a/patches/minecraft/net/minecraft/util/MathHelper.edit.java +++ b/patches/minecraft/net/minecraft/util/MathHelper.edit.java @@ -10,23 +10,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> CHANGE 101 : 102 @ 102 : 103 +> CHANGE 99 : 100 @ 99 : 100 ~ public static int getRandomIntegerInRange(EaglercraftRandom parRandom, int parInt1, int parInt2) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public static float randomFloatClamp(EaglercraftRandom parRandom, float parFloat1, float parFloat2) { -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ public static double getRandomDoubleInRange(EaglercraftRandom parRandom, double parDouble1, double parDouble2) { -> CHANGE 148 : 149 @ 148 : 149 +> CHANGE 147 : 148 @ 147 : 148 ~ public static EaglercraftUUID getRandomUuid(EaglercraftRandom rand) { -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ return new EaglercraftUUID(i, j); diff --git a/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java b/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java index 3e6f303..b54eaae 100644 --- a/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java +++ b/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.edit.java @@ -7,16 +7,16 @@ > DELETE 2 @ 2 : 5 -> DELETE 3 @ 6 : 7 +> DELETE 3 @ 3 : 4 -> INSERT 1 : 5 @ 2 +> INSERT 1 : 5 @ 1 + import com.google.common.base.Predicates; + import com.google.common.collect.Iterators; + import com.google.common.collect.Lists; + -> CHANGE 12 : 13 @ 8 : 9 +> CHANGE 8 : 9 @ 8 : 9 ~ this.objectList.add((T) null); diff --git a/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java b/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java index 38b9b04..1e0f3dd 100644 --- a/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java +++ b/patches/minecraft/net/minecraft/util/RegistryNamespaced.edit.java @@ -7,9 +7,9 @@ > DELETE 2 @ 2 : 4 -> DELETE 2 @ 4 : 7 +> DELETE 2 @ 2 : 5 -> INSERT 1 : 4 @ 4 +> INSERT 1 : 4 @ 1 + import com.google.common.collect.BiMap; + import com.google.common.collect.HashBiMap; diff --git a/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java b/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java index 155f415..1173b12 100644 --- a/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java +++ b/patches/minecraft/net/minecraft/util/RegistrySimple.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 3 -> CHANGE 4 : 5 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ -> DELETE 2 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> INSERT 1 : 6 @ 3 +> INSERT 1 : 6 @ 1 + import com.google.common.collect.Maps; + diff --git a/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java b/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java index bb75570..e0728cf 100644 --- a/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java +++ b/patches/minecraft/net/minecraft/util/ScreenShotHelper.edit.java @@ -9,13 +9,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication; -> DELETE 3 @ 21 : 25 +> DELETE 2 @ 2 : 6 -> CHANGE 1 : 3 @ 5 : 7 +> CHANGE 1 : 3 @ 1 : 3 ~ public static IChatComponent saveScreenshot() { ~ return new ChatComponentText("Saved Screenshot As: " + PlatformApplication.saveScreenshot()); -> DELETE 3 @ 3 : 79 +> DELETE 1 @ 1 : 77 > EOF diff --git a/patches/minecraft/net/minecraft/util/Session.edit.java b/patches/minecraft/net/minecraft/util/Session.edit.java index a807b35..78deaaa 100644 --- a/patches/minecraft/net/minecraft/util/Session.edit.java +++ b/patches/minecraft/net/minecraft/util/Session.edit.java @@ -12,41 +12,41 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile; -> CHANGE 6 : 7 @ 7 : 11 +> CHANGE 2 : 3 @ 2 : 6 ~ private GameProfile profile; -> CHANGE 2 : 3 @ 5 : 11 +> CHANGE 1 : 2 @ 1 : 7 ~ private static final EaglercraftUUID offlineUUID; -> CHANGE 2 : 4 @ 7 : 9 +> CHANGE 1 : 3 @ 1 : 3 ~ public Session() { ~ reset(); -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ public GameProfile getProfile() { ~ return profile; -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ public void update(String serverUsername, EaglercraftUUID uuid) { ~ profile = new GameProfile(uuid, serverUsername); -> CHANGE 4 : 6 @ 4 : 6 +> CHANGE 2 : 4 @ 2 : 4 ~ public void reset() { ~ update(EaglerProfile.getName(), offlineUUID); -> CHANGE 4 : 8 @ 4 : 11 +> CHANGE 2 : 6 @ 2 : 9 ~ static { ~ byte[] bytes = new byte[16]; ~ (new EaglercraftRandom()).nextBytes(bytes); ~ offlineUUID = new EaglercraftUUID(bytes); -> DELETE 6 @ 9 : 34 +> DELETE 2 @ 2 : 27 > EOF diff --git a/patches/minecraft/net/minecraft/util/StringTranslate.edit.java b/patches/minecraft/net/minecraft/util/StringTranslate.edit.java index dd4d068..773bca4 100644 --- a/patches/minecraft/net/minecraft/util/StringTranslate.edit.java +++ b/patches/minecraft/net/minecraft/util/StringTranslate.edit.java @@ -7,13 +7,13 @@ > DELETE 2 @ 2 : 6 -> INSERT 3 : 4 @ 7 +> INSERT 3 : 4 @ 3 + import java.util.regex.Matcher; -> DELETE 2 @ 1 : 3 +> DELETE 1 @ 1 : 3 -> INSERT 1 : 10 @ 3 +> INSERT 1 : 10 @ 1 + import com.google.common.base.Charsets; + import com.google.common.base.Splitter; @@ -25,12 +25,12 @@ + import net.lax1dude.eaglercraft.v1_8.IOUtils; + -> CHANGE 17 : 19 @ 8 : 10 +> CHANGE 8 : 10 @ 8 : 10 ~ this.lastUpdateTimeInMilliseconds = System.currentTimeMillis(); ~ } -> CHANGE 3 : 15 @ 3 : 11 +> CHANGE 1 : 13 @ 1 : 9 ~ public static void doCLINIT() { ~ InputStream inputstream = EagRuntime.getResourceStream("/assets/minecraft/lang/en_US.lang"); @@ -45,13 +45,13 @@ ~ // (why?) ~ instance.languageList.put(s1, s2); -> DELETE 14 @ 10 : 14 +> DELETE 2 @ 2 : 6 -> INSERT 2 : 3 @ 6 +> INSERT 2 : 3 @ 2 + instance.lastUpdateTimeInMilliseconds = System.currentTimeMillis(); -> CHANGE 21 : 22 @ 20 : 21 +> CHANGE 20 : 21 @ 20 : 21 ~ return HString.format(s, format); diff --git a/patches/minecraft/net/minecraft/util/Util.edit.java b/patches/minecraft/net/minecraft/util/Util.edit.java index 8e28bfe..02161b4 100644 --- a/patches/minecraft/net/minecraft/util/Util.edit.java +++ b/patches/minecraft/net/minecraft/util/Util.edit.java @@ -12,7 +12,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.futures.FutureTask; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 7 : 8 @ 6 : 13 +> CHANGE 3 : 4 @ 3 : 10 ~ return EagRuntime.getPlatformOS().getMinecraftEnum(); diff --git a/patches/minecraft/net/minecraft/util/Vec3i.edit.java b/patches/minecraft/net/minecraft/util/Vec3i.edit.java index db24c16..b310acc 100644 --- a/patches/minecraft/net/minecraft/util/Vec3i.edit.java +++ b/patches/minecraft/net/minecraft/util/Vec3i.edit.java @@ -7,7 +7,7 @@ > DELETE 3 @ 3 : 4 -> CHANGE 3 : 6 @ 4 : 7 +> CHANGE 3 : 6 @ 3 : 6 ~ public int x; ~ public int y; diff --git a/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java b/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java index 6f5992b..abf7014 100644 --- a/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java +++ b/patches/minecraft/net/minecraft/util/WeightedRandom.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 12 : 13 @ 12 : 13 ~ public static T getRandomItem(EaglercraftRandom random, Collection collection, -> CHANGE 21 : 22 @ 21 : 22 +> CHANGE 20 : 21 @ 20 : 21 ~ public static T getRandomItem(EaglercraftRandom random, Collection collection) { diff --git a/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java index 39389c9..528bd70 100644 --- a/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java +++ b/patches/minecraft/net/minecraft/util/WeightedRandomChestContent.edit.java @@ -7,21 +7,21 @@ > DELETE 2 @ 2 : 3 -> CHANGE 3 : 7 @ 4 : 5 +> CHANGE 3 : 7 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import com.google.common.collect.Lists; ~ -> DELETE 8 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> CHANGE 21 : 23 @ 22 : 24 +> CHANGE 21 : 23 @ 21 : 23 ~ public static void generateChestContents(EaglercraftRandom random, List listIn, ~ IInventory inv, int max) { -> CHANGE 22 : 23 @ 22 : 23 +> CHANGE 20 : 21 @ 20 : 21 ~ public static void generateDispenserContents(EaglercraftRandom random, List listIn, diff --git a/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java b/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java index df46143..d42fc1f 100644 --- a/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java +++ b/patches/minecraft/net/minecraft/util/WeightedRandomFishable.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 4 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> CHANGE 11 : 12 @ 12 : 13 +> CHANGE 11 : 12 @ 11 : 12 ~ public ItemStack getItemStack(EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java b/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java index e44982d..803e7e6 100644 --- a/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java +++ b/patches/minecraft/net/minecraft/village/MerchantRecipeList.edit.java @@ -9,6 +9,6 @@ + -> DELETE 6 @ 5 : 6 +> DELETE 5 @ 5 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/world/Explosion.edit.java b/patches/minecraft/net/minecraft/world/Explosion.edit.java index a4e043e..28424ae 100644 --- a/patches/minecraft/net/minecraft/world/Explosion.edit.java +++ b/patches/minecraft/net/minecraft/world/Explosion.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 5 -> CHANGE 3 : 9 @ 6 : 7 +> CHANGE 3 : 9 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ @@ -16,13 +16,13 @@ ~ import com.google.common.collect.Sets; ~ -> DELETE 21 @ 16 : 17 +> DELETE 15 @ 15 : 16 -> CHANGE 4 : 5 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ private final EaglercraftRandom explosionRNG; -> CHANGE 23 : 24 @ 23 : 24 +> CHANGE 22 : 23 @ 22 : 23 ~ this.explosionRNG = new EaglercraftRandom(); diff --git a/patches/minecraft/net/minecraft/world/World.edit.java b/patches/minecraft/net/minecraft/world/World.edit.java index de79521..d6f151b 100644 --- a/patches/minecraft/net/minecraft/world/World.edit.java +++ b/patches/minecraft/net/minecraft/world/World.edit.java @@ -7,15 +7,15 @@ > DELETE 2 @ 2 : 5 -> CHANGE 5 : 6 @ 8 : 9 +> CHANGE 5 : 6 @ 5 : 6 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 1 : 2 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> INSERT 2 : 7 @ 2 +> INSERT 1 : 6 @ 1 + + import com.google.common.base.Predicate; @@ -23,93 +23,93 @@ + import com.google.common.collect.Sets; + -> DELETE 23 @ 18 : 19 +> DELETE 18 @ 18 : 19 -> DELETE 12 @ 13 : 28 +> DELETE 12 @ 12 : 27 -> DELETE 1 @ 16 : 17 +> DELETE 1 @ 1 : 2 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> CHANGE 18 : 19 @ 19 : 20 +> CHANGE 18 : 19 @ 18 : 19 ~ protected int updateLCG = (new EaglercraftRandom()).nextInt(); -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 6 : 7 @ 6 : 7 ~ public final EaglercraftRandom rand = new EaglercraftRandom(); -> DELETE 8 @ 8 : 9 +> DELETE 7 @ 7 : 8 -> DELETE 3 @ 4 : 5 +> DELETE 3 @ 3 : 4 -> INSERT 10 : 13 @ 11 +> INSERT 10 : 13 @ 10 + if (!client) { + throw new IllegalStateException("Singleplayer is unavailable because all of it's code was deleted"); + } -> DELETE 11 @ 8 : 9 - -> CHANGE 12 : 13 @ 13 : 14 - -~ return chunk.getBiome(pos); +> DELETE 8 @ 8 : 9 > CHANGE 12 : 13 @ 12 : 13 +~ return chunk.getBiome(pos); + +> CHANGE 11 : 12 @ 11 : 12 + ~ return BiomeGenBase.plains; -> DELETE 4 @ 4 : 8 +> DELETE 3 @ 3 : 7 -> DELETE 54 @ 58 : 66 +> DELETE 54 @ 54 : 62 -> DELETE 36 @ 44 : 46 +> DELETE 36 @ 36 : 38 -> CHANGE 15 : 16 @ 17 : 18 +> CHANGE 15 : 16 @ 15 : 16 ~ if ((flags & 2) != 0 && ((flags & 4) == 0) && chunk.isPopulated()) { -> DELETE 4 @ 4 : 11 +> DELETE 3 @ 3 : 10 -> CHANGE 36 : 37 @ 43 : 47 +> CHANGE 36 : 37 @ 36 : 40 ~ this.notifyNeighborsOfStateChange(pos, blockType); -> DELETE 68 @ 71 : 73 +> DELETE 67 @ 67 : 69 -> DELETE 1 @ 3 : 23 +> DELETE 1 @ 1 : 21 -> DELETE 1404 @ 1424 : 1482 +> DELETE 1404 @ 1404 : 1462 -> DELETE 40 @ 98 : 122 +> DELETE 40 @ 40 : 64 -> CHANGE 8 : 9 @ 32 : 33 +> CHANGE 8 : 9 @ 8 : 9 ~ public void forceBlockUpdateTick(Block blockType, BlockPos pos, EaglercraftRandom random) { -> DELETE 232 @ 232 : 236 +> DELETE 231 @ 231 : 235 -> CHANGE 28 : 29 @ 32 : 33 +> CHANGE 28 : 29 @ 28 : 29 ~ if (entityType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) { -> CHANGE 11 : 13 @ 11 : 13 +> CHANGE 10 : 12 @ 10 : 12 ~ for (EntityPlayer entity : this.playerEntities) { ~ if (playerType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) { -> CHANGE 234 : 235 @ 234 : 235 +> CHANGE 232 : 233 @ 232 : 233 ~ public EntityPlayer getPlayerEntityByUUID(EaglercraftUUID uuid) { -> CHANGE 198 : 199 @ 198 : 199 +> CHANGE 197 : 198 @ 197 : 198 ~ public EaglercraftRandom setRandomSeed(int parInt1, int parInt2, int parInt3) { -> CHANGE 53 : 54 @ 53 : 54 +> CHANGE 52 : 53 @ 52 : 53 ~ this.theCalendar.setTimeInMillis(System.currentTimeMillis()); -> DELETE 68 @ 68 : 72 +> DELETE 67 @ 67 : 71 > EOF diff --git a/patches/minecraft/net/minecraft/world/WorldProvider.edit.java b/patches/minecraft/net/minecraft/world/WorldProvider.edit.java index 6536577..51017bb 100644 --- a/patches/minecraft/net/minecraft/world/WorldProvider.edit.java +++ b/patches/minecraft/net/minecraft/world/WorldProvider.edit.java @@ -7,18 +7,18 @@ > DELETE 6 @ 6 : 14 -> DELETE 1 @ 9 : 14 +> DELETE 1 @ 1 : 6 -> DELETE 6 @ 11 : 12 +> DELETE 6 @ 6 : 7 -> DELETE 25 @ 26 : 38 +> DELETE 25 @ 25 : 37 -> DELETE 3 @ 15 : 27 +> DELETE 3 @ 3 : 15 -> CHANGE 31 : 32 @ 43 : 44 +> CHANGE 31 : 32 @ 31 : 32 ~ float f2 = 0.0F; -> DELETE 64 @ 64 : 68 +> DELETE 63 @ 63 : 67 > EOF diff --git a/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java b/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java index bc2e88d..06c2851 100644 --- a/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java +++ b/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java @@ -7,8 +7,8 @@ > DELETE 5 @ 5 : 10 -> DELETE 3 @ 8 : 9 +> DELETE 3 @ 3 : 4 -> DELETE 4 @ 5 : 9 +> DELETE 4 @ 4 : 8 > EOF diff --git a/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java b/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java index 2af1c44..02635ca 100644 --- a/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java +++ b/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java @@ -7,10 +7,10 @@ > DELETE 3 @ 3 : 6 -> DELETE 1 @ 4 : 6 +> DELETE 1 @ 1 : 3 -> DELETE 3 @ 5 : 6 +> DELETE 3 @ 3 : 4 -> DELETE 19 @ 20 : 25 +> DELETE 19 @ 19 : 24 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java index 6b0c851..3370ab9 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java @@ -7,11 +7,11 @@ > DELETE 2 @ 2 : 5 -> CHANGE 3 : 4 @ 6 : 7 +> CHANGE 3 : 4 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> INSERT 2 : 9 @ 2 +> INSERT 1 : 8 @ 1 + + import com.google.common.collect.Lists; @@ -21,13 +21,13 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 9 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> DELETE 25 @ 26 : 45 +> DELETE 25 @ 25 : 44 -> DELETE 2 @ 21 : 30 +> DELETE 2 @ 2 : 11 -> CHANGE 19 : 64 @ 28 : 119 +> CHANGE 19 : 64 @ 19 : 110 ~ public static BiomeGenBase ocean; ~ public static BiomeGenBase plains; @@ -75,33 +75,33 @@ ~ protected static final NoiseGeneratorPerlin GRASS_COLOR_NOISE = new NoiseGeneratorPerlin( ~ new EaglercraftRandom(2345L), 1); -> DELETE 56 @ 102 : 103 +> DELETE 11 @ 11 : 12 -> DELETE 7 @ 8 : 11 +> DELETE 7 @ 7 : 10 -> DELETE 12 @ 15 : 18 +> DELETE 12 @ 12 : 15 -> DELETE 2 @ 5 : 6 +> DELETE 2 @ 2 : 3 -> DELETE 16 @ 17 : 21 +> DELETE 16 @ 16 : 20 -> CHANGE 21 : 22 @ 25 : 34 +> CHANGE 21 : 22 @ 21 : 30 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom rand, BlockPos pos) { -> DELETE 95 @ 103 : 107 +> DELETE 94 @ 94 : 98 -> CHANGE 16 : 18 @ 20 : 22 +> CHANGE 16 : 18 @ 16 : 18 ~ public void genTerrainBlocks(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn, int parInt1, ~ int parInt2, double parDouble1) { -> CHANGE 5 : 7 @ 5 : 7 +> CHANGE 3 : 5 @ 3 : 5 ~ public final void generateBiomeTerrain(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn, ~ int parInt1, int parInt2, double parDouble1) { -> CHANGE 103 : 216 @ 103 : 104 +> CHANGE 101 : 214 @ 101 : 102 ~ public static class Height { ~ public float rootHeight; @@ -217,8 +217,8 @@ ~ field_180279_ad = ocean; ~ -> DELETE 154 @ 42 : 45 +> DELETE 41 @ 41 : 44 -> DELETE 2 @ 5 : 41 +> DELETE 2 @ 2 : 38 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java index faca344..abf6df2 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java @@ -7,6 +7,6 @@ > DELETE 3 @ 3 : 4 -> DELETE 7 @ 8 : 12 +> DELETE 7 @ 7 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java index 04d3335..b003544 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java @@ -7,10 +7,10 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 7 @ 11 : 15 +> DELETE 7 @ 7 : 11 -> DELETE 2 @ 6 : 17 +> DELETE 2 @ 2 : 13 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java index 0ad5cc9..89a2373 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 6 -> DELETE 11 @ 13 : 14 +> DELETE 11 @ 11 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java index 8f04768..3fa8e38 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java @@ -10,21 +10,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 6 @ 6 : 13 +> DELETE 4 @ 4 : 11 -> DELETE 3 @ 10 : 13 +> DELETE 3 @ 3 : 6 -> DELETE 4 @ 7 : 14 +> DELETE 4 @ 4 : 11 -> DELETE 13 @ 20 : 24 +> DELETE 13 @ 13 : 17 -> CHANGE 16 : 17 @ 20 : 26 +> CHANGE 16 : 17 @ 16 : 22 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) { -> DELETE 15 @ 20 : 70 +> DELETE 14 @ 14 : 64 -> CHANGE 15 : 17 @ 65 : 75 +> CHANGE 15 : 17 @ 15 : 25 ~ && this.biomeID != BiomeGenBase.birchForestHills.biomeID ? new BiomeGenMutated(i, this) ~ : new BiomeGenMutated(i, this); diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java index 9f55e36..a155832 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java @@ -10,17 +10,17 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 3 : 4 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 2 @ 6 : 10 +> DELETE 2 @ 2 : 6 -> DELETE 9 @ 13 : 14 +> DELETE 9 @ 9 : 10 -> CHANGE 5 : 7 @ 6 : 34 +> CHANGE 5 : 7 @ 5 : 33 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java index 15b0db5..bd9f22c 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java @@ -7,17 +7,17 @@ > DELETE 2 @ 2 : 3 -> DELETE 4 @ 5 : 6 +> DELETE 4 @ 4 : 5 -> DELETE 4 @ 5 : 16 +> DELETE 4 @ 4 : 15 -> CHANGE 3 : 6 @ 14 : 22 +> CHANGE 3 : 6 @ 3 : 11 ~ private final IBlockState field_181620_aE; ~ private final IBlockState field_181621_aF; ~ private final IBlockState field_181622_aG; -> INSERT 6 : 12 @ 11 +> INSERT 3 : 9 @ 3 + field_181620_aE = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.JUNGLE); + field_181621_aF = Blocks.leaves.getDefaultState() @@ -26,8 +26,8 @@ + field_181622_aG = Blocks.leaves.getDefaultState().withProperty(BlockOldLeaf.VARIANT, BlockPlanks.EnumType.OAK) + .withProperty(BlockLeaves.CHECK_DECAY, Boolean.valueOf(false)); -> DELETE 7 @ 1 : 9 +> DELETE 1 @ 1 : 9 -> DELETE 7 @ 15 : 45 +> DELETE 7 @ 7 : 37 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java index 1722511..f3f9e9c 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java @@ -10,26 +10,26 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 11 @ 10 : 11 +> DELETE 9 @ 9 : 10 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 19 @ 20 : 25 +> DELETE 19 @ 19 : 24 -> DELETE 1 @ 6 : 10 +> DELETE 1 @ 1 : 5 -> DELETE 2 @ 6 : 10 +> DELETE 2 @ 2 : 6 -> CHANGE 8 : 10 @ 12 : 17 +> CHANGE 8 : 10 @ 8 : 13 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { -> CHANGE 7 : 8 @ 10 : 11 +> CHANGE 5 : 6 @ 5 : 6 ~ EaglercraftRandom random1 = new EaglercraftRandom(this.field_150622_aD); -> CHANGE 112 : 113 @ 112 : 113 +> CHANGE 111 : 112 @ 111 : 112 ~ EaglercraftRandom random = new EaglercraftRandom(parLong1); diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java index a79f106..7321d19 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 5 -> DELETE 4 @ 5 : 10 +> DELETE 4 @ 4 : 9 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java index 19e745d..9469829 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java @@ -10,19 +10,19 @@ + import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + -> CHANGE 3 : 4 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 ~ -> DELETE 3 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 29 : 31 @ 30 : 35 +> CHANGE 29 : 31 @ 29 : 34 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { -> DELETE 9 @ 12 : 16 +> DELETE 7 @ 7 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java index e617874..4e0875f 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenOcean.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> CHANGE 12 : 14 @ 13 : 14 +> CHANGE 12 : 14 @ 12 : 13 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java index 6a5bbce..d3a4c6f 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java @@ -10,14 +10,14 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 5 @ 5 : 7 +> DELETE 3 @ 3 : 5 -> DELETE 9 @ 11 : 14 +> DELETE 9 @ 9 : 12 -> CHANGE 2 : 3 @ 5 : 6 +> CHANGE 2 : 3 @ 2 : 3 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) { -> DELETE 25 @ 25 : 58 +> DELETE 24 @ 24 : 57 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java index 8798dcf..9bc7110 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java @@ -10,29 +10,29 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 2 @ 3 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 1 @ 3 : 5 +> DELETE 1 @ 1 : 3 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 4 @ 5 : 8 +> DELETE 4 @ 4 : 7 -> DELETE 2 @ 5 : 9 +> DELETE 2 @ 2 : 6 -> DELETE 8 @ 12 : 25 +> DELETE 8 @ 8 : 21 -> DELETE 3 @ 16 : 19 +> DELETE 3 @ 3 : 6 -> CHANGE 2 : 4 @ 5 : 6 +> CHANGE 2 : 4 @ 2 : 3 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { -> DELETE 14 @ 13 : 17 +> DELETE 12 @ 12 : 16 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java index cdaf83e..a79c34c 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java @@ -7,10 +7,10 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 9 +> DELETE 1 @ 1 : 8 -> DELETE 3 @ 10 : 12 +> DELETE 3 @ 3 : 5 -> DELETE 11 @ 13 : 35 +> DELETE 11 @ 11 : 33 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java index faca344..abf6df2 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java @@ -7,6 +7,6 @@ > DELETE 3 @ 3 : 4 -> DELETE 7 @ 8 : 12 +> DELETE 7 @ 7 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java index 8da48bf..bf39ec8 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java @@ -10,20 +10,20 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 4 @ 8 : 18 +> DELETE 4 @ 4 : 14 -> DELETE 4 @ 14 : 18 +> DELETE 4 @ 4 : 8 -> CHANGE 10 : 11 @ 14 : 15 +> CHANGE 10 : 11 @ 10 : 11 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom var1, BlockPos var2) { -> DELETE 3 @ 3 : 25 +> DELETE 2 @ 2 : 24 > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java index 0acd820..46c6f43 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java @@ -10,23 +10,23 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> DELETE 2 @ 4 : 5 +> DELETE 2 @ 2 : 3 -> DELETE 1 @ 2 : 3 +> DELETE 1 @ 1 : 2 -> DELETE 1 @ 2 : 9 +> DELETE 1 @ 1 : 8 -> DELETE 2 @ 9 : 14 +> DELETE 2 @ 2 : 7 -> DELETE 6 @ 11 : 21 +> DELETE 6 @ 6 : 16 -> CHANGE 2 : 4 @ 12 : 25 +> CHANGE 2 : 4 @ 2 : 15 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { -> DELETE 3 @ 14 : 38 +> DELETE 1 @ 1 : 25 > EOF diff --git a/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java b/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java index 10e1dd0..23e06f3 100644 --- a/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java +++ b/patches/minecraft/net/minecraft/world/border/WorldBorder.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> INSERT 1 : 4 @ 2 +> INSERT 1 : 4 @ 1 + + import com.google.common.collect.Lists; + -> DELETE 7 @ 4 : 6 +> DELETE 4 @ 4 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java b/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java index eb98ba5..83b664e 100644 --- a/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java @@ -9,11 +9,11 @@ ~ import java.util.ArrayList; -> CHANGE 4 : 5 @ 6 : 7 +> CHANGE 3 : 4 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 2 : 8 @ 2 : 3 +> CHANGE 1 : 7 @ 1 : 2 ~ ~ import com.google.common.base.Predicate; @@ -22,21 +22,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 24 @ 19 : 20 +> DELETE 18 @ 18 : 19 -> DELETE 1 @ 2 : 6 +> DELETE 1 @ 1 : 5 -> DELETE 1 @ 5 : 8 +> DELETE 1 @ 1 : 4 -> CHANGE 24 : 25 @ 27 : 28 +> CHANGE 24 : 25 @ 24 : 25 ~ private List tileEntityPosQueue; -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ this.tileEntityPosQueue = new ArrayList(); -> CHANGE 343 : 352 @ 343 : 347 +> CHANGE 342 : 351 @ 342 : 346 ~ try { ~ if (pos.getY() >= 0 && pos.getY() >> 4 < this.storageArrays.length) { @@ -48,7 +48,7 @@ ~ return extendedblockstorage.get(j, k, i); ~ } -> CHANGE 11 : 18 @ 6 : 21 +> CHANGE 2 : 9 @ 2 : 17 ~ return Blocks.air.getDefaultState(); ~ } catch (Throwable throwable) { @@ -58,14 +58,14 @@ ~ public String call() throws Exception { ~ return CrashReportCategory.getCoordinateInfo(pos); -> INSERT 8 : 12 @ 16 +> INSERT 1 : 5 @ 1 + }); + throw new ReportedException(crashreport); + } + } -> CHANGE 5 : 18 @ 1 : 11 +> CHANGE 1 : 14 @ 1 : 11 ~ /** ~ * only use with a regular "net.minecraft.util.BlockPos"! @@ -81,7 +81,7 @@ ~ return extendedblockstorage.get(j, k, i); ~ } -> INSERT 14 : 25 @ 11 +> INSERT 1 : 12 @ 1 + + return Blocks.air.getDefaultState(); @@ -95,34 +95,34 @@ + }); + throw new ReportedException(crashreport); -> CHANGE 57 : 58 @ 46 : 49 +> CHANGE 46 : 47 @ 46 : 49 ~ if (block1 instanceof ITileEntityProvider) { -> DELETE 34 @ 36 : 40 +> DELETE 33 @ 33 : 37 -> CHANGE 251 : 253 @ 255 : 257 +> CHANGE 251 : 253 @ 251 : 253 ~ && (predicate == null || predicate.apply((T) entity))) { ~ list.add((T) entity); -> CHANGE 20 : 22 @ 20 : 22 +> CHANGE 18 : 20 @ 18 : 20 ~ public EaglercraftRandom getRandomWithSeed(long i) { ~ return new EaglercraftRandom(this.worldObj.getSeed() + (long) (this.xPosition * this.xPosition * 4987142) -> CHANGE 85 : 86 @ 85 : 86 +> CHANGE 83 : 84 @ 83 : 84 ~ this.recheckGaps(true); -> CHANGE 9 : 10 @ 9 : 10 +> CHANGE 8 : 9 @ 8 : 9 ~ BlockPos blockpos = (BlockPos) this.tileEntityPosQueue.remove(0); -> CHANGE 110 : 111 @ 110 : 111 +> CHANGE 109 : 110 @ 109 : 110 ~ public BiomeGenBase getBiome(BlockPos pos) { -> DELETE 4 @ 4 : 10 +> DELETE 3 @ 3 : 9 > EOF diff --git a/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java b/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java index bf73787..bca5f54 100644 --- a/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java +++ b/patches/minecraft/net/minecraft/world/chunk/EmptyChunk.edit.java @@ -7,16 +7,16 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 5 @ 2 : 3 +> CHANGE 1 : 5 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ ~ import com.google.common.base.Predicate; ~ -> DELETE 12 @ 9 : 10 +> DELETE 8 @ 8 : 9 -> CHANGE 90 : 92 @ 91 : 93 +> CHANGE 90 : 92 @ 90 : 92 ~ public EaglercraftRandom getRandomWithSeed(long seed) { ~ return new EaglercraftRandom(this.getWorld().getSeed() + (long) (this.xPosition * this.xPosition * 4987142) diff --git a/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java b/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java index c939e8b..6800930 100644 --- a/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java +++ b/patches/minecraft/net/minecraft/world/chunk/IChunkProvider.edit.java @@ -9,6 +9,6 @@ + -> DELETE 6 @ 5 : 6 +> DELETE 5 @ 5 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java b/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java index 40c0cdc..e599ab8 100644 --- a/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 5 : 10 @ 7 +> INSERT 5 : 10 @ 5 + import java.util.Set; + @@ -15,9 +15,9 @@ + import com.google.common.collect.Maps; + -> DELETE 9 @ 4 : 5 +> DELETE 4 @ 4 : 5 -> CHANGE 62 : 63 @ 63 : 64 +> CHANGE 62 : 63 @ 62 : 63 ~ for (Entry entry1 : (Set) map.entrySet()) { diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java index 8a211a3..784b339 100644 --- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 19 : 20 @ 20 : 21 +> CHANGE 18 : 19 @ 18 : 19 ~ this(new EaglercraftRandom()); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ public NoiseGeneratorImproved(EaglercraftRandom parRandom) { diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java index c93aa2a..7676916 100644 --- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java @@ -10,9 +10,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 2 : 4 +> DELETE 1 @ 1 : 3 -> CHANGE 5 : 6 @ 7 : 8 +> CHANGE 5 : 6 @ 5 : 6 ~ public NoiseGeneratorOctaves(EaglercraftRandom parRandom, int parInt1) { diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java index 95e7ff2..fcc1c5d 100644 --- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java @@ -9,7 +9,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 6 : 7 @ 8 : 9 +> CHANGE 5 : 6 @ 5 : 6 ~ public NoiseGeneratorPerlin(EaglercraftRandom parRandom, int parInt1) { diff --git a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java index 79dd0ea..8b14c5c 100644 --- a/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 14 : 15 @ 14 : 15 ~ this(new EaglercraftRandom()); -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ public NoiseGeneratorSimplex(EaglercraftRandom parRandom) { diff --git a/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java b/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java index 91b516c..ef27d2d 100644 --- a/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java @@ -7,10 +7,10 @@ > DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 7 +> DELETE 2 @ 2 : 6 -> DELETE 6 @ 10 : 12 +> DELETE 6 @ 6 : 8 -> DELETE 8 @ 10 : 14 +> DELETE 8 @ 8 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/world/storage/MapData.edit.java b/patches/minecraft/net/minecraft/world/storage/MapData.edit.java index 33a8856..d38ca5b 100644 --- a/patches/minecraft/net/minecraft/world/storage/MapData.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/MapData.edit.java @@ -7,7 +7,7 @@ > DELETE 2 @ 2 : 4 -> INSERT 2 : 6 @ 4 +> INSERT 2 : 6 @ 2 + + import com.google.common.collect.Lists; diff --git a/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java b/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java index a478a11..15b87c2 100644 --- a/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java @@ -7,30 +7,30 @@ > DELETE 2 @ 2 : 10 -> CHANGE 2 : 6 @ 10 : 14 +> CHANGE 2 : 6 @ 2 : 6 ~ ~ import com.google.common.collect.Lists; ~ import com.google.common.collect.Maps; ~ -> DELETE 5 @ 5 : 6 +> DELETE 1 @ 1 : 2 -> CHANGE 13 : 14 @ 14 : 46 +> CHANGE 13 : 14 @ 13 : 45 ~ return (WorldSavedData) this.loadedDataMap.get(s); -> CHANGE 14 : 15 @ 45 : 50 +> CHANGE 13 : 14 @ 13 : 18 ~ ((WorldSavedData) this.loadedDataList.get(i)).setDirty(false); -> DELETE 5 @ 9 : 29 +> DELETE 4 @ 4 : 24 -> CHANGE 1 : 2 @ 21 : 46 +> CHANGE 1 : 2 @ 1 : 26 ~ this.idCounts.clear(); -> CHANGE 12 : 13 @ 36 : 59 +> CHANGE 11 : 12 @ 11 : 34 ~ return oshort.shortValue(); diff --git a/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java b/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java index b9ea626..a390f74 100644 --- a/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java @@ -7,12 +7,12 @@ > DELETE 2 @ 2 : 3 -> DELETE 2 @ 3 : 8 +> DELETE 2 @ 2 : 7 -> DELETE 9 @ 14 : 18 +> DELETE 9 @ 9 : 13 -> DELETE 13 @ 17 : 21 +> DELETE 13 @ 13 : 17 -> DELETE 4 @ 8 : 11 +> DELETE 4 @ 4 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java b/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java index cb24657..b8b9f44 100644 --- a/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java @@ -9,35 +9,35 @@ + -> DELETE 3 @ 2 : 3 +> DELETE 2 @ 2 : 3 -> INSERT 6 : 8 @ 7 +> INSERT 6 : 8 @ 6 + import net.lax1dude.eaglercraft.v1_8.HString; + -> CHANGE 239 : 240 @ 237 : 238 +> CHANGE 237 : 238 @ 237 : 238 ~ // nbt.setLong("LastPlayed", MinecraftServer.getCurrentTimeMillis()); -> CHANGE 302 : 303 @ 302 : 303 +> CHANGE 301 : 302 @ 301 : 302 ~ return HString.format("ID %02d - %s, ver %d. Features enabled: %b", -> CHANGE 20 : 22 @ 20 : 22 +> CHANGE 19 : 21 @ 19 : 21 ~ return HString.format("%d game time, %d day time", new Object[] { ~ Long.valueOf(WorldInfo.this.totalTime), Long.valueOf(WorldInfo.this.worldTime) }); -> CHANGE 25 : 26 @ 25 : 26 +> CHANGE 23 : 24 @ 23 : 24 ~ return HString.format("0x%05X - %s", new Object[] { Integer.valueOf(WorldInfo.this.saveVersion), s }); -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 4 : 5 @ 4 : 5 ~ return HString.format("Rain time: %d (now: %b), thunder time: %d (now: %b)", -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 7 : 8 @ 7 : 8 ~ return HString.format("Game mode: %s (ID %d). Hardcore: %b. Cheats: %b", new Object[] { diff --git a/patches/resources/assets/minecraft/lang/en_US.edit.lang b/patches/resources/assets/minecraft/lang/en_US.edit.lang index 36efd61..760b6c7 100644 --- a/patches/resources/assets/minecraft/lang/en_US.edit.lang +++ b/patches/resources/assets/minecraft/lang/en_US.edit.lang @@ -12,7 +12,7 @@ ~ eaglercraft.recording.start=Record Screen... ~ eaglercraft.soundCategory.voice=Voice -> INSERT 5 : 72 @ 8 +> INSERT 1 : 68 @ 1 + eaglercraft.resourcePack.prompt.title=What do you want to do with '%s'? + eaglercraft.resourcePack.prompt.text=Tip: Hold Shift to skip this screen when selecting a resource pack! @@ -82,11 +82,11 @@ + eaglercraft.auth.continue=Join Server + -> CHANGE 535 : 536 @ 468 : 469 +> CHANGE 468 : 469 @ 468 : 469 ~ resourcePack.openFolder=Open resource pack -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ resourcePack.folderInfo=(Select resource pack files here) diff --git a/sources/resources/assets/eagler/glsl/post_fxaa.fsh b/sources/resources/assets/eagler/glsl/post_fxaa.fsh index 1103f4f..5abc2dd 100644 --- a/sources/resources/assets/eagler/glsl/post_fxaa.fsh +++ b/sources/resources/assets/eagler/glsl/post_fxaa.fsh @@ -57,8 +57,6 @@ out vec4 output4f; uniform sampler2D u_screenTexture; uniform vec2 u_screenSize2f; -#define FXAA_PC 1 - #ifndef FXAA_GREEN_AS_LUMA // For those using non-linear color, // and either not able to get luma in alpha, or not wanting to,