From 361a21a2c91acee1159025f5b8b0b4f0c1bb975a Mon Sep 17 00:00:00 2001 From: Treer Date: Tue, 5 Feb 2019 21:25:22 +1100 Subject: [PATCH] Set version to v1.4 --- .../java/amidst/minetest/world/mapgen/DefaultBiomes.java | 6 +++++- .../amidst/minetest/world/oracle/BiomeDataOracleV5.java | 4 ++-- src/main/resources/amidst/metadata.properties | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/amidst/minetest/world/mapgen/DefaultBiomes.java b/src/main/java/amidst/minetest/world/mapgen/DefaultBiomes.java index 00b31703..c2c75018 100644 --- a/src/main/java/amidst/minetest/world/mapgen/DefaultBiomes.java +++ b/src/main/java/amidst/minetest/world/mapgen/DefaultBiomes.java @@ -56,6 +56,8 @@ public class DefaultBiomes { if (biomeLists == null) { biomeLists = new LinkedHashMap(); + // Constructed from mapgen.lua in Master branch, where mapgen.lua last updated in ab1a79b13c on Oct 10, 2018 + // https://github.com/minetest/minetest_game/blob/ab1a79b13c5739d73083236ca29869b60ff3b380/mods/default/mapgen.lua biomeLists.put( BIOMEPROFILENAME_MINETEST_GAME, setIndexes( @@ -103,7 +105,9 @@ public class DefaultBiomes { ) ); - + // Constructed from mapgen.lua in backport branch, where mapgen.lua last updated in c2d1a5e on 24 Apr 2017 + // (and the mapgen.lua file in stable-0.4 branch is identical) + // https://github.com/minetest/minetest_game/blob/c2d1a5ed4bebd01a1a9340d55cb2d5edf6d59df2/mods/default/mapgen.lua biomeLists.put( "Minetest Game v.4", setIndexes( diff --git a/src/main/java/amidst/minetest/world/oracle/BiomeDataOracleV5.java b/src/main/java/amidst/minetest/world/oracle/BiomeDataOracleV5.java index 7c245e7e..4941295c 100644 --- a/src/main/java/amidst/minetest/world/oracle/BiomeDataOracleV5.java +++ b/src/main/java/amidst/minetest/world/oracle/BiomeDataOracleV5.java @@ -45,8 +45,8 @@ public class BiomeDataOracleV5 extends MinetestBiomeDataOracle { @Override public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) { - // FYI: at the time of writing this, the mapgen for v5 is not yet officially stable - // See https://forum.minetest.net/viewtopic.php?f=18&t=19132 + // The v5 mapgen terrain became officially stable in Minetest v5, Dec 2018 + // See https://github.com/minetest/minetest/commit/40007351569413fd9dcff861ee00562d0c405722 int width = result.length; if (width > 0) { diff --git a/src/main/resources/amidst/metadata.properties b/src/main/resources/amidst/metadata.properties index 63b684d5..af8e0170 100644 --- a/src/main/resources/amidst/metadata.properties +++ b/src/main/resources/amidst/metadata.properties @@ -1,7 +1,7 @@ project.build.sourceEncoding=UTF-8 amidst.build.jdk.version=1.8 -amidst.build.filename=amidst-minetest-v1-3c +amidst.build.filename=amidst-minetest-v1-4 amidst.version.major=1 -amidst.version.minor=3 -amidst.version.preReleaseSuffix=c +amidst.version.minor=4 +amidst.version.preReleaseSuffix=