Uplandustries/Eaglercraft-1.8
1
0
Fork 0
mirror of https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git synced 2025-06-27 18:38:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update #42 - Fixed several WebRTC bugs and other issues

Browse Source
This commit is contained in:
lax1dude
2024-11-16 21:47:35 -08:00
parent 4d66ca140a
commit 64ac208565
95 changed files with 1084 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,11 @@
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
> CHANGE 66 : 67 @ 66 : 67
> CHANGE 33 : 34 @ 33 : 35
~ for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBoxMutable(pos.add(-4, 0, -4), pos.add(4, 1, 4))) {
> CHANGE 31 : 32 @ 31 : 32
~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) {

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

@ -14,7 +14,28 @@
~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
> DELETE 18 @ 18 : 19
> CHANGE 1 : 4 @ 1 : 3
~ BlockPos tmp = new BlockPos();
~ if (world.getLightFromNeighbors(blockpos.up(tmp)) < 4
~ && world.getBlockState(blockpos.up(tmp)).getBlock().getLightOpacity() > 2) {
> CHANGE 2 : 4 @ 2 : 3
~ if (world.getLightFromNeighbors(blockpos.up(tmp)) >= 9) {
~ BlockPos tmp2 = new BlockPos();
> CHANGE 2 : 4 @ 2 : 4
~ random.nextInt(3) - 1, tmp2);
~ Block block = world.getBlockState(blockpos1.up(tmp)).getBlock();
> CHANGE 3 : 5 @ 3 : 4
~ && world.getLightFromNeighbors(blockpos1.up(tmp)) >= 4
~ && block.getLightOpacity() <= 2) {
> DELETE 4 @ 4 : 5
> CHANGE 4 : 5 @ 4 : 5

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

@ -14,7 +14,11 @@
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
> DELETE 79 @ 79 : 80
> CHANGE 16 : 17 @ 16 : 17
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> DELETE 62 @ 62 : 63
> CHANGE 3 : 4 @ 3 : 4

24
patches/minecraft/net/minecraft/block/BlockVine.edit.java
View File

@ -26,11 +26,15 @@
~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) {
> INSERT 22 : 23 @ 22
> INSERT 6 : 7 @ 6
+ BlockPos tmp = new BlockPos(0, 0, 0);
> CHANGE 4 : 9 @ 4 : 7
> CHANGE 3 : 4 @ 3 : 4
~ if (world.getBlockState(blockpos.add(j, l, k, tmp)).getBlock() == this) {
> CHANGE 16 : 21 @ 16 : 19
~ EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
~ for (int j = 0; j < facings.length; ++j) {
@ -38,7 +42,11 @@
~ if (random.nextBoolean() || !this.canPlaceOn(
~ world.getBlockState(blockpos2.offsetEvenFaster(enumfacing3, tmp)).getBlock())) {
> CHANGE 33 : 35 @ 33 : 35
> CHANGE 16 : 17 @ 16 : 17
~ BlockPos blockpos4 = blockpos.offsetEvenFaster(enumfacing1, blockpos2);
> CHANGE 16 : 18 @ 16 : 18
~ } else if (flag1 && world.isAirBlock(blockpos5) && this.canPlaceOn(
~ world.getBlockState(blockpos.offsetEvenFaster(enumfacing2, tmp)).getBlock())) {
@ -48,7 +56,15 @@
~ } else if (flag2 && world.isAirBlock(blockpos1) && this.canPlaceOn(
~ world.getBlockState(blockpos.offsetEvenFaster(enumfacing4, tmp)).getBlock())) {
> INSERT 16 : 17 @ 16
> CHANGE 2 : 3 @ 2 : 3
~ } else if (this.canPlaceOn(world.getBlockState(blockpos4.up(tmp)).getBlock())) {
> CHANGE 10 : 11 @ 10 : 11
~ BlockPos blockpos3 = blockpos.down(blockpos2);
> INSERT 2 : 3 @ 2
+ EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;

7
patches/minecraft/net/minecraft/client/Minecraft.edit.java
View File

@ -713,7 +713,7 @@
+ currentScreen != null ? currentScreen.getClass().getName() : null, scaledResolution.getScaledWidth(),
+ scaledResolution.getScaledHeight(), displayWidth, displayHeight, scaledResolution.getScaleFactor());
> CHANGE 11 : 50 @ 11 : 12
> CHANGE 11 : 55 @ 11 : 12
~ RateLimitTracker.tick();
~
@ -728,6 +728,11 @@
~
~ if (wasPaused != isGamePaused) {
~ SingleplayerServerController.setPaused(this.isGamePaused);
~ if (isGamePaused) {
~ mcSoundHandler.pauseSounds();
~ } else {
~ mcSoundHandler.resumeSounds();
~ }
~ wasPaused = isGamePaused;
~ }
~

2
patches/minecraft/net/minecraft/client/audio/GuardianSound.edit.java
View File

@ -7,4 +7,6 @@
> DELETE 2 @ 2 : 4
> DELETE 11 @ 11 : 12
> EOF

10
patches/minecraft/net/minecraft/client/audio/ISound.edit.java Normal file
View File

@ -0,0 +1,10 @@
# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> DELETE 9 @ 9 : 11
> EOF

4
patches/minecraft/net/minecraft/client/audio/MovingSoundMinecart.edit.java
View File

@ -7,4 +7,8 @@
> DELETE 2 @ 2 : 3
> DELETE 12 @ 12 : 13
> DELETE 18 @ 18 : 19
> EOF

2
patches/minecraft/net/minecraft/client/audio/MovingSoundMinecartRiding.edit.java
View File

@ -7,4 +7,6 @@
> DELETE 2 @ 2 : 4
> DELETE 15 @ 15 : 16
> EOF

4
patches/minecraft/net/minecraft/client/audio/PositionedSound.edit.java
View File

@ -7,4 +7,8 @@
> DELETE 2 @ 2 : 3
> DELETE 10 @ 10 : 11
> DELETE 14 @ 14 : 18
> EOF

22
patches/minecraft/net/minecraft/client/audio/PositionedSoundRecord.edit.java
View File

@ -7,4 +7,26 @@
> DELETE 2 @ 2 : 4
> CHANGE 4 : 5 @ 4 : 5
~ return new PositionedSoundRecord(soundResource, 0.25F, pitch, false, ISound.AttenuationType.NONE, 0.0F, 0.0F,
> CHANGE 4 : 5 @ 4 : 5
~ return new PositionedSoundRecord(soundResource, 1.0F, 1.0F, false, ISound.AttenuationType.NONE, 0.0F, 0.0F,
> CHANGE 5 : 6 @ 5 : 6
~ return new PositionedSoundRecord(soundResource, 4.0F, 1.0F, false, ISound.AttenuationType.LINEAR, xPosition,
> CHANGE 5 : 6 @ 5 : 6
~ this(soundResource, volume, pitch, false, ISound.AttenuationType.LINEAR, xPosition, yPosition, zPosition);
> CHANGE 3 : 4 @ 3 : 5
~ ISound.AttenuationType attenuationType, float xPosition, float yPosition, float zPosition) {
> DELETE 7 @ 7 : 8
> EOF

6
patches/minecraft/net/minecraft/client/multiplayer/WorldClient.edit.java
View File

@ -43,7 +43,11 @@
~ EaglercraftRandom random = new EaglercraftRandom();
> CHANGE 83 : 84 @ 83 : 85
> CHANGE 3 : 4 @ 3 : 4
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 79 : 80 @ 79 : 81
~ return "Non-integrated multiplayer server";

2
patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.edit.java
View File

@ -36,7 +36,7 @@
> CHANGE 2 : 6 @ 2 : 3
~ BlockPos.MutableBlockPos pointer = new BlockPos.MutableBlockPos();
~ BlockPos pointer = new BlockPos();
~ EnumFacing[] facings = EnumFacing._VALUES;
~ for (int m = 0; m < facings.length; ++m) {
~ EnumFacing enumfacing = facings[m];

6
patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java
View File

@ -616,7 +616,11 @@
~ b0 = 8;
~ } else if (this.mc.gameSettings.fancyGraphics) {
> CHANGE 38 : 39 @ 38 : 39
> CHANGE 7 : 8 @ 7 : 8
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 30 : 31 @ 30 : 31
~ if (f2 >= 0.15F) {

6
patches/minecraft/net/minecraft/client/renderer/RenderGlobal.edit.java
View File

@ -489,7 +489,11 @@
+ }
+
> INSERT 29 : 30 @ 29
> CHANGE 5 : 6 @ 5 : 7
~ for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBoxMutable(blockpos, blockpos.add(15, 15, 15))) {
> INSERT 22 : 23 @ 22
+ ((ClippingHelperImpl) this.debugFixedClippingHelper).destroy();

2
patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.edit.java
View File

@ -88,7 +88,7 @@
> CHANGE 2 : 4 @ 2 : 4
~ for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBox(blockpos, blockpos1)) {
~ for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBoxMutable(blockpos, blockpos1)) {
~ IBlockState iblockstate = regionrendercache.getBlockStateFaster(blockpos$mutableblockpos);
> CHANGE 6 : 7 @ 6 : 7

5
patches/minecraft/net/minecraft/command/CommandCompare.edit.java
View File

@ -11,4 +11,9 @@
+
> CHANGE 40 : 42 @ 40 : 42
~ BlockPos blockpos$mutableblockpos = new BlockPos();
~ BlockPos blockpos$mutableblockpos1 = new BlockPos();
> EOF

6
patches/minecraft/net/minecraft/entity/Entity.edit.java
View File

@ -147,7 +147,11 @@
~ for (int i = 0; i < numbers.length; ++i) {
~ nbttaglist.appendTag(new NBTTagFloat(numbers[i]));
> CHANGE 172 : 173 @ 172 : 173
> CHANGE 33 : 34 @ 33 : 35
~ BlockPos blockpos$mutableblockpos = new BlockPos(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
> CHANGE 137 : 138 @ 137 : 138
~ for (AxisAlignedBB axisalignedbb : (List<AxisAlignedBB>) list) {

4
patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java
View File

@ -16,4 +16,8 @@
~ private static final EaglercraftUUID babySpeedBoostUUID = EaglercraftUUID
~ .fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
> CHANGE 489 : 490 @ 489 : 490
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/item/ItemMap.edit.java
View File

@ -16,4 +16,8 @@
> DELETE 9 @ 9 : 11
> CHANGE 91 : 92 @ 91 : 92
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/pathfinding/PathNavigateGround.edit.java
View File

@ -7,4 +7,8 @@
> DELETE 8 @ 8 : 11
> CHANGE 168 : 169 @ 168 : 169
~ for (BlockPos blockpos : BlockPos.getAllInBoxMutable(new BlockPos(parInt1, parInt2, parInt3),
> EOF

4
patches/minecraft/net/minecraft/stats/StatisticsFile.edit.java
View File

@ -5,9 +5,9 @@
# Version: 1.0
# Author: lax1dude
> DELETE 4 @ 4 : 10
> DELETE 4 @ 4 : 11
> DELETE 10 @ 10 : 15
> DELETE 9 @ 9 : 14
> CHANGE 3 : 5 @ 3 : 6

6
patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java
View File

@ -21,7 +21,11 @@
~ for (int m = 0, l = list.size(); m < l; ++m) {
~ list.get(m).addPotionEffect(new PotionEffect(this.secondaryEffect, 180, 0, true, true));
> CHANGE 87 : 88 @ 87 : 88
> CHANGE 18 : 19 @ 18 : 19
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 68 : 69 @ 68 : 69
~ List<EntityPlayer> lst = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class,

131
patches/minecraft/net/minecraft/util/BlockPos.edit.java
View File

@ -15,7 +15,45 @@
> DELETE 1 @ 1 : 5
> INSERT 55 : 65 @ 55
> INSERT 12 : 16 @ 12
+ public BlockPos() {
+ super(0, 0, 0);
+ }
+
> CHANGE 22 : 23 @ 22 : 23
~ : new BlockPos((double) this.x + x, (double) this.y + y, (double) this.z + z);
> CHANGE 3 : 4 @ 3 : 4
~ return x == 0 && y == 0 && z == 0 ? this : new BlockPos(this.x + x, this.y + y, this.z + z);
> INSERT 2 : 12 @ 2
+ /**
+ * eagler
+ */
+ public BlockPos add(int x, int y, int z, BlockPos dst) {
+ dst.x = this.x + x;
+ dst.y = this.y + y;
+ dst.z = this.z + z;
+ return dst;
+ }
+
> CHANGE 1 : 3 @ 1 : 3
~ return vec.x == 0 && vec.y == 0 && vec.z == 0 ? this
~ : new BlockPos(this.x + vec.x, this.y + vec.y, this.z + vec.z);
> CHANGE 3 : 5 @ 3 : 5
~ return vec.x == 0 && vec.y == 0 && vec.z == 0 ? this
~ : new BlockPos(this.x - vec.x, this.y - vec.y, this.z - vec.z);
> INSERT 6 : 16 @ 6
+ /**
+ * eagler
@ -96,9 +134,9 @@
> INSERT 4 : 21 @ 4
+ public BlockPos offsetFaster(EnumFacing facing, BlockPos ret) {
+ ret.x = this.getX() + facing.getFrontOffsetX();
+ ret.y = this.getY() + facing.getFrontOffsetY();
+ ret.z = this.getZ() + facing.getFrontOffsetZ();
+ ret.x = this.x + facing.getFrontOffsetX();
+ ret.y = this.y + facing.getFrontOffsetY();
+ ret.z = this.z + facing.getFrontOffsetZ();
+ return ret;
+ }
+
@ -118,10 +156,89 @@
~ : new BlockPos(this.x + facing.getFrontOffsetX() * n, this.y + facing.getFrontOffsetY() * n,
~ this.z + facing.getFrontOffsetZ() * n);
> DELETE 104 @ 104 : 107
> CHANGE 3 : 5 @ 3 : 6
> CHANGE 6 : 7 @ 6 : 10
~ return new BlockPos(this.y * vec3i.z - this.z * vec3i.y, this.z * vec3i.x - this.x * vec3i.z,
~ this.x * vec3i.y - this.y * vec3i.x);
~ super(x_, y_, z_);
> CHANGE 3 : 5 @ 3 : 5
~ return ((long) this.x & X_MASK) << X_SHIFT | ((long) this.y & Y_MASK) << Y_SHIFT
~ | ((long) this.z & Z_MASK) << 0;
> CHANGE 10 : 12 @ 10 : 14
~ final BlockPos blockpos = new BlockPos(Math.min(from.x, to.x), Math.min(from.y, to.y), Math.min(from.z, to.z));
~ final BlockPos blockpos1 = new BlockPos(Math.max(from.x, to.x), Math.max(from.y, to.y), Math.max(from.z, to.z));
> CHANGE 12 : 16 @ 12 : 16
~ int i = this.lastReturned.x;
~ int j = this.lastReturned.y;
~ int k = this.lastReturned.z;
~ if (i < blockpos1.x) {
> CHANGE 1 : 3 @ 1 : 3
~ } else if (j < blockpos1.y) {
~ i = blockpos.x;
> CHANGE 1 : 4 @ 1 : 4
~ } else if (k < blockpos1.z) {
~ i = blockpos.x;
~ j = blockpos.y;
> CHANGE 12 : 19 @ 12 : 21
~ public static Iterable<BlockPos> getAllInBoxMutable(BlockPos from, BlockPos to) {
~ final BlockPos blockpos = new BlockPos(Math.min(from.x, to.x), Math.min(from.y, to.y), Math.min(from.z, to.z));
~ final BlockPos blockpos1 = new BlockPos(Math.max(from.x, to.x), Math.max(from.y, to.y), Math.max(from.z, to.z));
~ return new Iterable<BlockPos>() {
~ public Iterator<BlockPos> iterator() {
~ return new AbstractIterator<BlockPos>() {
~ private BlockPos theBlockPos = null;
> CHANGE 1 : 2 @ 1 : 2
~ protected BlockPos computeNext() {
> CHANGE 1 : 2 @ 1 : 3
~ this.theBlockPos = new BlockPos(blockpos.x, blockpos.y, blockpos.z);
> CHANGE 2 : 3 @ 2 : 3
~ return (BlockPos) this.endOfData();
> CHANGE 1 : 5 @ 1 : 5
~ int i = this.theBlockPos.x;
~ int j = this.theBlockPos.y;
~ int k = this.theBlockPos.z;
~ if (i < blockpos1.x) {
> CHANGE 1 : 3 @ 1 : 3
~ } else if (j < blockpos1.y) {
~ i = blockpos.x;
> CHANGE 1 : 4 @ 1 : 4
~ } else if (k < blockpos1.z) {
~ i = blockpos.x;
~ j = blockpos.y;
> CHANGE 14 : 19 @ 14 : 48
~ public BlockPos func_181079_c(int x, int y, int z) {
~ this.x = x;
~ this.y = y;
~ this.z = z;
~ return this;
> INSERT 1 : 2 @ 1
+
> EOF

5
patches/minecraft/net/minecraft/util/IChatComponent.edit.java
View File

@ -189,8 +189,11 @@
+ * So sorry for this implementation
+ */
> CHANGE 1 : 8 @ 1 : 2
> CHANGE 1 : 11 @ 1 : 2
~ if (component == null) {
~ return "null";
~ }
~ if ((component instanceof ChatComponentText) && component.getChatStyle().isEmpty()
~ && component.getSiblings().isEmpty()) {
~ String escaped = new JSONObject().put("E", component.getUnformattedTextForChat()).toString();

4
patches/minecraft/net/minecraft/world/Teleporter.edit.java
View File

@ -19,4 +19,8 @@
~ this.random = new EaglercraftRandom(worldIn.getSeed(), !worldIn.getWorldInfo().isOldEaglercraftRandom());
> CHANGE 152 : 153 @ 152 : 153
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

139
patches/minecraft/net/minecraft/world/World.edit.java
View File

@ -69,11 +69,29 @@
~ return HString.format("ID #%d (%s // %s)",
> CHANGE 128 : 129 @ 128 : 129
> CHANGE 60 : 66 @ 60 : 65
~ BlockPos tmp = new BlockPos(0, 0, 0);
~ int i1 = this.getLight(pos.up(tmp), false);
~ int i = this.getLight(pos.east(tmp), false);
~ int j = this.getLight(pos.west(tmp), false);
~ int k = this.getLight(pos.south(tmp), false);
~ int l = this.getLight(pos.north(tmp), false);
> CHANGE 63 : 64 @ 63 : 64
~ return Chunk.getNoSkyLightValue();
> CHANGE 74 : 80 @ 74 : 75
> CHANGE 10 : 16 @ 10 : 15
~ BlockPos tmp = new BlockPos();
~ int i1 = this.getLightFor(type, pos.up(tmp));
~ int i = this.getLightFor(type, pos.east(tmp));
~ int j = this.getLightFor(type, pos.west(tmp));
~ int k = this.getLightFor(type, pos.south(tmp));
~ int l = this.getLightFor(type, pos.north(tmp));
> CHANGE 59 : 65 @ 59 : 60
~ if (lightValue < 0) {
~ j += -lightValue;
@ -82,7 +100,15 @@
~ }
~ } else if (j < lightValue) {
> DELETE 579 @ 579 : 582
> CHANGE 320 : 321 @ 320 : 321
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 72 : 73 @ 72 : 73
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> DELETE 185 @ 185 : 188
> DELETE 23 @ 23 : 24
@ -104,7 +130,31 @@
> DELETE 38 @ 38 : 39
> CHANGE 400 : 401 @ 400 : 401
> CHANGE 37 : 38 @ 37 : 38
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 22 : 23 @ 22 : 23
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 23 : 24 @ 23 : 24
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 28 : 29 @ 28 : 29
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 38 : 39 @ 38 : 39
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 22 : 23 @ 22 : 23
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 224 : 225 @ 224 : 225
~ if (!this.provider.getHasNoSky() && this.getGameRules().getBoolean("doWeatherCycle")) {
@ -140,7 +190,13 @@
~ public void forceBlockUpdateTick(Block blockType, BlockPos pos, EaglercraftRandom random) {
> CHANGE 93 : 96 @ 93 : 94
> CHANGE 28 : 31 @ 28 : 30
~ BlockPos tmp = new BlockPos();
~ boolean flag = this.isWater(pos.west(tmp)) && this.isWater(pos.east(tmp))
~ && this.isWater(pos.north(tmp)) && this.isWater(pos.south(tmp));
> CHANGE 63 : 66 @ 63 : 64
~ EnumFacing[] facings = EnumFacing._VALUES;
~ for (int m = 0; m < facings.length; ++m) {
@ -148,7 +204,11 @@
> DELETE 22 @ 22 : 23
> CHANGE 27 : 30 @ 27 : 28
> CHANGE 25 : 26 @ 25 : 26
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 1 : 4 @ 1 : 2
~ EnumFacing[] facings = EnumFacing._VALUES;
~ for (int m = 0; m < facings.length; ++m) {
@ -156,7 +216,35 @@
> DELETE 20 @ 20 : 23
> DELETE 50 @ 50 : 51
> INSERT 6 : 7 @ 6
+ BlockPos tmp = new BlockPos(0, 0, 0);
> CHANGE 10 : 11 @ 10 : 11
~ if (this.getLightFor(lightType, blockpos1.west(tmp)) < j6) {
> CHANGE 4 : 5 @ 4 : 5
~ if (this.getLightFor(lightType, blockpos1.east(tmp)) < j6) {
> CHANGE 4 : 5 @ 4 : 5
~ if (this.getLightFor(lightType, blockpos1.down(tmp)) < j6) {
> CHANGE 4 : 5 @ 4 : 5
~ if (this.getLightFor(lightType, blockpos1.up(tmp)) < j6) {
> CHANGE 4 : 5 @ 4 : 5
~ if (this.getLightFor(lightType, blockpos1.north(tmp)) < j6) {
> CHANGE 4 : 5 @ 4 : 5
~ if (this.getLightFor(lightType, blockpos1.south(tmp)) < j6) {
> DELETE 8 @ 8 : 9
> CHANGE 43 : 46 @ 43 : 45
@ -175,7 +263,42 @@
~ for (int j = 0, l = this.loadedEntityList.size(); j < l; ++j) {
~ Entity entity = this.loadedEntityList.get(j);
> CHANGE 102 : 107 @ 102 : 104
> CHANGE 51 : 53 @ 51 : 52
~ BlockPos tmp = new BlockPos();
~ i = Math.max(i, this.getStrongPower(pos.down(tmp), EnumFacing.DOWN));
> CHANGE 3 : 4 @ 3 : 4
~ i = Math.max(i, this.getStrongPower(pos.up(tmp), EnumFacing.UP));
> CHANGE 3 : 4 @ 3 : 4
~ i = Math.max(i, this.getStrongPower(pos.north(tmp), EnumFacing.NORTH));
> CHANGE 3 : 4 @ 3 : 4
~ i = Math.max(i, this.getStrongPower(pos.south(tmp), EnumFacing.SOUTH));
> CHANGE 3 : 4 @ 3 : 4
~ i = Math.max(i, this.getStrongPower(pos.west(tmp), EnumFacing.WEST));
> CHANGE 3 : 4 @ 3 : 4
~ i = Math.max(i, this.getStrongPower(pos.east(tmp), EnumFacing.EAST));
> CHANGE 19 : 26 @ 19 : 25
~ BlockPos tmp = new BlockPos(0, 0, 0);
~ return this.getRedstonePower(pos.down(tmp), EnumFacing.DOWN) > 0 ? true
~ : (this.getRedstonePower(pos.up(tmp), EnumFacing.UP) > 0 ? true
~ : (this.getRedstonePower(pos.north(tmp), EnumFacing.NORTH) > 0 ? true
~ : (this.getRedstonePower(pos.south(tmp), EnumFacing.SOUTH) > 0 ? true
~ : (this.getRedstonePower(pos.west(tmp), EnumFacing.WEST) > 0 ? true
~ : this.getRedstonePower(pos.east(tmp), EnumFacing.EAST) > 0))));
> CHANGE 5 : 10 @ 5 : 7
~ EnumFacing[] facings = EnumFacing._VALUES;
~ BlockPos tmp = new BlockPos(0, 0, 0);

4
patches/minecraft/net/minecraft/world/biome/BiomeColorHelper.edit.java
View File

@ -7,4 +7,8 @@
> DELETE 4 @ 4 : 5
> CHANGE 24 : 25 @ 24 : 25
~ for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBoxMutable(parBlockPos.add(-1, 0, -1),
> EOF

6
patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java
View File

@ -93,7 +93,11 @@
~ public final void generateBiomeTerrain(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn,
~ int parInt1, int parInt2, double parDouble1) {
> CHANGE 101 : 177 @ 101 : 102
> CHANGE 7 : 8 @ 7 : 8
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 93 : 169 @ 93 : 94
~ public static void doBootstrap() {
~ ocean = (new BiomeGenOcean(0)).setColor(112).setBiomeName("Ocean").setHeight(height_Oceans);

4
patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java
View File

@ -195,4 +195,8 @@
~ for (int i = 0; i < facings.length; ++i) {
~ EnumFacing enumfacing = facings[i];
> CHANGE 49 : 50 @ 49 : 51
~ BlockPos blockpos$mutableblockpos = new BlockPos((this.xPosition << 4) + x, 0, (this.zPosition << 4) + z);
> EOF

4
patches/minecraft/net/minecraft/world/chunk/storage/ChunkLoader.edit.java
View File

@ -7,4 +7,8 @@
> DELETE 8 @ 8 : 9
> CHANGE 87 : 88 @ 87 : 88
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/MapGenCaves.edit.java
View File

@ -23,4 +23,8 @@
~ EaglercraftRandom random = new EaglercraftRandom(parLong1, this.rand.isScramble());
> CHANGE 106 : 107 @ 106 : 107
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/MapGenRavine.edit.java
View File

@ -22,4 +22,8 @@
~ EaglercraftRandom random = new EaglercraftRandom(parLong1, this.rand.isScramble());
> CHANGE 105 : 106 @ 105 : 106
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.edit.java
View File

@ -15,4 +15,8 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 13 : 14 @ 13 : 14
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

26
patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigTree.edit.java
View File

@ -23,14 +23,22 @@
> CHANGE 111 : 113 @ 111 : 113
~ for (int i = 0, l = this.field_175948_j.size(); i < l; ++i) {
~ this.generateLeafNode(this.field_175948_j.get(i));
~ this.generateLeafNode(this.field_175948_j.get(i).blockPos);
> CHANGE 22 : 24 @ 22 : 23
~ for (int j = 0, l = this.field_175948_j.size(); j < l; ++j) {
~ WorldGenBigTree.FoliageCoordinates worldgenbigtree$foliagecoordinates = this.field_175948_j.get(j);
> CHANGE 35 : 36 @ 35 : 36
> CHANGE 2 : 3 @ 2 : 3
~ if (!blockpos.equals(worldgenbigtree$foliagecoordinates.blockPos)
> CHANGE 1 : 2 @ 1 : 2
~ this.func_175937_a(blockpos, worldgenbigtree$foliagecoordinates.blockPos, Blocks.log);
> CHANGE 30 : 31 @ 30 : 31
~ public boolean generate(World worldIn, EaglercraftRandom rand, BlockPos position) {
@ -38,4 +46,18 @@
~ this.rand = new EaglercraftRandom(rand.nextLong(), !worldIn.getWorldInfo().isOldEaglercraftRandom());
> CHANGE 32 : 33 @ 32 : 33
~ static class FoliageCoordinates {
> INSERT 1 : 2 @ 1
+ private final BlockPos blockPos;
> DELETE 2 @ 2 : 3
> INSERT 1 : 2 @ 1
+ this.blockPos = parBlockPos;
> EOF

5
patches/minecraft/net/minecraft/world/gen/feature/WorldGenBlockBlob.edit.java
View File

@ -15,4 +15,9 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 25 : 27 @ 25 : 26
~ for (BlockPos blockpos1 : BlockPos.getAllInBoxMutable(blockpos.add(-j, -k, -l),
~ blockpos.add(j, k, l))) {
> EOF

4
patches/minecraft/net/minecraft/world/gen/feature/WorldGenCanopyTree.edit.java
View File

@ -15,4 +15,8 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 111 : 112 @ 111 : 112
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/feature/WorldGenForest.edit.java
View File

@ -15,4 +15,8 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 17 : 18 @ 17 : 18
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/feature/WorldGenSavannaTree.edit.java
View File

@ -15,4 +15,8 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 13 : 14 @ 13 : 14
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/feature/WorldGenSpikes.edit.java
View File

@ -15,4 +15,8 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 3 : 4 @ 3 : 4
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

8
patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.edit.java
View File

@ -15,4 +15,12 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 18 : 19 @ 18 : 19
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 57 : 58 @ 57 : 58
~ BlockPos blockpos$mutableblockpos1 = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.edit.java
View File

@ -15,4 +15,8 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 14 : 15 @ 14 : 15
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

4
patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.edit.java
View File

@ -15,4 +15,8 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 14 : 15 @ 14 : 15
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

10
patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.edit.java
View File

@ -15,7 +15,15 @@
~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
> CHANGE 126 : 129 @ 126 : 127
> CHANGE 13 : 14 @ 13 : 14
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 75 : 76 @ 75 : 76
~ BlockPos blockpos$mutableblockpos1 = new BlockPos();
> CHANGE 36 : 39 @ 36 : 37
~ EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
~ for (int m = 0; m < facings.length; ++m) {

6
patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.edit.java
View File

@ -39,7 +39,11 @@
~ protected Feature(EaglercraftRandom parRandom, int parInt1, int parInt2, int parInt3, int parInt4, int parInt5,
> CHANGE 86 : 87 @ 86 : 87
> CHANGE 39 : 40 @ 39 : 40
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 46 : 47 @ 46 : 47
~ public JunglePyramid(EaglercraftRandom parRandom, int parInt1, int parInt2) {

6
patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.edit.java
View File

@ -19,7 +19,11 @@
~ public abstract boolean addComponentParts(World var1, EaglercraftRandom var2, StructureBoundingBox var3);
> CHANGE 408 : 409 @ 408 : 409
> CHANGE 32 : 33 @ 32 : 33
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 375 : 376 @ 375 : 376
~ int minZ, int maxX, int maxY, int maxZ, boolean alwaysReplace, EaglercraftRandom rand,

6
patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.edit.java
View File

@ -216,7 +216,11 @@
~ List<StructureComponent> rand, EaglercraftRandom parRandom, int parInt1, int parInt2) {
> CHANGE 138 : 139 @ 138 : 139
> CHANGE 27 : 28 @ 27 : 28
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> CHANGE 110 : 111 @ 110 : 111
~ public Well(StructureVillagePieces.Start start, int parInt1, EaglercraftRandom rand, int parInt2, int parInt3) {

4
patches/minecraft/net/minecraft/world/pathfinder/SwimNodeProcessor.edit.java
View File

@ -13,4 +13,8 @@
~ for (int j = 0; j < facings.length; ++j) {
~ EnumFacing enumfacing = facings[j];
> CHANGE 16 : 17 @ 16 : 17
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF

9
patches/minecraft/net/minecraft/world/pathfinder/WalkNodeProcessor.edit.java
View File

@ -7,4 +7,13 @@
> DELETE 15 @ 15 : 16
> CHANGE 22 : 24 @ 22 : 24
~ BlockPos blockpos$mutableblockpos = new BlockPos(MathHelper.floor_double(entity.posX), i,
~ MathHelper.floor_double(entity.posZ));
> CHANGE 113 : 114 @ 113 : 114
~ BlockPos blockpos$mutableblockpos = new BlockPos();
> EOF