fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MCP mappings

Browse Source
This commit is contained in:
yueh
2020-07-01 20:23:27 +02:00
parent 400fcdb633
commit 1ce82cc3b9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -10,7 +10,7 @@ artifact_basename=appliedenergistics2
######################################################### #########################################################
minecraft_release=1.15 minecraft_release=1.15
minecraft_version=1.15.2 minecraft_version=1.15.2
mcp_mappings=20200613-1.15.1 mcp_mappings=20200701-1.15.1
forge_version=31.2.20 forge_version=31.2.20
######################################################### #########################################################
src/main/java/appeng/spatial/StorageChunkGenerator.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class StorageChunkGenerator extends ChunkGenerator<GenerationSettings> {
} }
@Override @Override
public int func_222529_a(int p_222529_1_, int p_222529_2_, Heightmap.Type heightmapType) { public int getHeight(int p_222529_1_, int p_222529_2_, Heightmap.Type heightmapType) {
return 0; return 0;
} }
src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
+2 -2
View File
@@ -53,7 +53,7 @@ public class MeteoriteStructureStart extends StructureStart {
int scanRadius = (int) Math.max(1, meteoriteRadius * 2); int scanRadius = (int) Math.max(1, meteoriteRadius * 2);
for (int x = -scanRadius; x <= scanRadius; x++) { for (int x = -scanRadius; x <= scanRadius; x++) {
for (int z = -scanRadius; z <= scanRadius; z++) { for (int z = -scanRadius; z <= scanRadius; z++) {
int h = generator.func_222529_a(centerX + x, centerZ + z, heightmapType); int h = generator.getHeight(centerX + x, centerZ + z, heightmapType);
stats.add(h); stats.add(h);
} }
} }
@@ -105,7 +105,7 @@ public class MeteoriteStructureStart extends StructureStart {
final double distanceFrom = dx * dx + dz * dz; final double distanceFrom = dx * dx + dz * dz;
if (maxY > h + distanceFrom * 0.0175 && maxY < h + distanceFrom * 0.02) { if (maxY > h + distanceFrom * 0.0175 && maxY < h + distanceFrom * 0.02) {
int heigth = generator.func_222529_a(blockPos.getX(), blockPos.getZ(), Heightmap.Type.OCEAN_FLOOR); int heigth = generator.getHeight(blockPos.getX(), blockPos.getZ(), Heightmap.Type.OCEAN_FLOOR);
if (heigth < seaLevel) { if (heigth < seaLevel) {
return true; return true;
} }