From 1ce82cc3b9d1dd2e7a0b41b3fbaddb7dac5c072a Mon Sep 17 00:00:00 2001 From: yueh Date: Wed, 1 Jul 2020 20:23:27 +0200 Subject: [PATCH] Update MCP mappings --- gradle.properties | 2 +- src/main/java/appeng/spatial/StorageChunkGenerator.java | 2 +- .../appeng/worldgen/meteorite/MeteoriteStructureStart.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index aee000602..0edae7d09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ artifact_basename=appliedenergistics2 ######################################################### minecraft_release=1.15 minecraft_version=1.15.2 -mcp_mappings=20200613-1.15.1 +mcp_mappings=20200701-1.15.1 forge_version=31.2.20 ######################################################### diff --git a/src/main/java/appeng/spatial/StorageChunkGenerator.java b/src/main/java/appeng/spatial/StorageChunkGenerator.java index 045945440..44f324d0b 100644 --- a/src/main/java/appeng/spatial/StorageChunkGenerator.java +++ b/src/main/java/appeng/spatial/StorageChunkGenerator.java @@ -84,7 +84,7 @@ public class StorageChunkGenerator extends ChunkGenerator { } @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; } diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java index df9d8259d..48d5cb0b5 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java @@ -53,7 +53,7 @@ public class MeteoriteStructureStart extends StructureStart { int scanRadius = (int) Math.max(1, meteoriteRadius * 2); for (int x = -scanRadius; x <= scanRadius; x++) { 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); } } @@ -105,7 +105,7 @@ public class MeteoriteStructureStart extends StructureStart { final double distanceFrom = dx * dx + dz * dz; 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) { return true; }