Skip to content

Commit fef7def

Browse files
author
eaglercraft
committed
u42
1 parent 5c8e040 commit fef7def

File tree

95 files changed

+732
-658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+732
-658
lines changed

‎EAGLERCRAFTX_README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,4 @@ The `crashReportShow` hook can be used to capture crash reports and append addit
247247

248248
There is currently no system in place to make forks of 1.8 and merge commits made to the patch files in this repository with the patch files or workspace of the fork, you're on your own if you try to keep a fork of this repo for reasons other than to contribute to it
249249

250-
A javascript-based modding API resembling Minecraft Forge may be implemented someday though for adding custom content to the game.
250+
**Note:** If you are trying to use the desktop runtime on Linux, make sure you add the "desktopRuntime" folder to the `LD_LIBRARY_PATH` environment variable of the Java process. This should be done automatically by the Eclipse project's default run configuration, but it might not work properly on every system, or when the Eclipse project is imported into IntelliJ.

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Java must be added to your PATH!
2222
2. Open one of the .java files from the source folders (workaround for a bug)
2323
3. Run/Debug the client with the included "eaglercraftDebugRuntime" configuration
2424

25+
**Note:** If you are trying to use the desktop runtime on Linux, make sure you add the "desktopRuntime" folder to the `LD_LIBRARY_PATH` environment variable of the Java process. This should be done automatically by the Eclipse project's default run configuration, but it might not work properly on every system, or when the Eclipse project is imported into IntelliJ.
26+
2527
**See the main 1.8 repository's README for more info**
2628

2729
The source codes of EaglercraftXBungee and EaglercraftXVelocity are not included here.

‎desktopRuntime/resources/EPKVersionIdentifier.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
u41
1+
u42

‎desktopRuntime/resources/assets/eagler/boot_menu/boot_menu_markup.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="PEYTON_V1">PeytonPlayz585 Indev</option>
3131
<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="PEYTON_V2">PeytonPlayz585 Alpha/Beta</option>
3232
<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="STANDARD_OFFLINE_V1">Standard Offline</option>
33-
<option class="_eaglercraftX_boot_menu_launch_conf_val_launch_type_opt" value="IFRAME_SANDBOX_V1">IFrame HTML File</option>
3433
</select>
3534
</p>
3635
</div>

‎desktopRuntime/resources/plugin_download.zip‎

973 Bytes
Binary file not shown.

‎desktopRuntime/resources/plugin_version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"pluginName":"EaglercraftXBungee","pluginVersion":"1.3.2","pluginButton":"Download \"EaglerXBungee-1.3.2.jar\"","pluginFilename":"EaglerXBungee.zip"}
1+
{"pluginName":"EaglercraftXBungee","pluginVersion":"1.3.3","pluginButton":"Download \"EaglerXBungee-1.3.3.jar\"","pluginFilename":"EaglerXBungee.zip"}

‎desktopRuntime/resources/relay_download.zip‎

85 Bytes
Binary file not shown.

‎src/game/java/net/minecraft/block/BlockFarmland.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ private boolean hasCrops(World worldIn, BlockPos pos) {
103103
}
104104

105105
private boolean hasWater(World worldIn, BlockPos pos) {
106-
for (BlockPos.MutableBlockPos blockpos$mutableblockpos : BlockPos.getAllInBoxMutable(pos.add(-4, 0, -4),
107-
pos.add(4, 1, 4))) {
106+
for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBoxMutable(pos.add(-4, 0, -4), pos.add(4, 1, 4))) {
108107
if (worldIn.getBlockState(blockpos$mutableblockpos).getBlock().getMaterial() == Material.water) {
109108
return true;
110109
}

‎src/game/java/net/minecraft/block/BlockGrass.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,22 @@ public int colorMultiplier(IBlockAccess iblockaccess, BlockPos blockpos, int var
7171

7272
public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) {
7373
if (!world.isRemote) {
74-
if (world.getLightFromNeighbors(blockpos.up()) < 4
75-
&& world.getBlockState(blockpos.up()).getBlock().getLightOpacity() > 2) {
74+
BlockPos tmp = new BlockPos();
75+
if (world.getLightFromNeighbors(blockpos.up(tmp)) < 4
76+
&& world.getBlockState(blockpos.up(tmp)).getBlock().getLightOpacity() > 2) {
7677
world.setBlockState(blockpos, Blocks.dirt.getDefaultState());
7778
} else {
78-
if (world.getLightFromNeighbors(blockpos.up()) >= 9) {
79+
if (world.getLightFromNeighbors(blockpos.up(tmp)) >= 9) {
80+
BlockPos tmp2 = new BlockPos();
7981
for (int i = 0; i < 4; ++i) {
8082
BlockPos blockpos1 = blockpos.add(random.nextInt(3) - 1, random.nextInt(5) - 3,
81-
random.nextInt(3) - 1);
82-
Block block = world.getBlockState(blockpos1.up()).getBlock();
83+
random.nextInt(3) - 1, tmp2);
84+
Block block = world.getBlockState(blockpos1.up(tmp)).getBlock();
8385
IBlockState iblockstate = world.getBlockState(blockpos1);
8486
if (iblockstate.getBlock() == Blocks.dirt
8587
&& iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT
86-
&& world.getLightFromNeighbors(blockpos1.up()) >= 4 && block.getLightOpacity() <= 2) {
88+
&& world.getLightFromNeighbors(blockpos1.up(tmp)) >= 4
89+
&& block.getLightOpacity() <= 2) {
8790
world.setBlockState(blockpos1, Blocks.grass.getDefaultState());
8891
}
8992
}

‎src/game/java/net/minecraft/block/BlockLeaves.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate,
106106
}
107107

108108
if (world.isAreaLoaded(new BlockPos(j - i, k - i, l - i), new BlockPos(j + i, k + i, l + i))) {
109-
BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
109+
BlockPos blockpos$mutableblockpos = new BlockPos();
110110

111111
for (int k1 = -b0; k1 <= b0; ++k1) {
112112
for (int l1 = -b0; l1 <= b0; ++l1) {

0 commit comments

Comments
 (0)