Fix Shipwreck locations for 1.13-pre7 and newer

Closes #418.
toolbox4minecraft · Aug 25, 2018 · da3a710 · da3a710
1 parent 129d3fb
commit da3a710
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/amidst/mojangapi/world/WorldBuilder.java b/src/main/java/amidst/mojangapi/world/WorldBuilder.java
@@ -239,7 +239,8 @@ private World create(
 								new ScatteredFeaturesLocationChecker(
 										seed,
 										biomeDataOracle,
-										(byte) 15, (byte) 8,
+										versionFeatures.getMaxDistanceScatteredFeatures_Shipwreck(),
+										(byte) 8,
 										versionFeatures.getValidBiomesAtMiddleOfChunk_Shipwreck(),
 										versionFeatures.getSeedForStructure_Shipwreck(),
 										buggyStructureCoordinateMath),

diff --git a/src/main/java/amidst/mojangapi/world/versionfeatures/DefaultVersionFeatures.java b/src/main/java/amidst/mojangapi/world/versionfeatures/DefaultVersionFeatures.java
@@ -49,6 +49,7 @@ public static VersionFeatures create(RecognisedVersion version) {
 				INSTANCE.seedForStructure_WitchHut.getValue(version),
 				INSTANCE.seedForStructure_OceanRuins.getValue(version),
 				INSTANCE.seedForStructure_Shipwreck.getValue(version),
+				INSTANCE.maxDistanceScatteredFeatures_Shipwreck.getValue(version),
 				INSTANCE.buggyStructureCoordinateMath.getValue(version));
 	}
 
@@ -75,6 +76,7 @@ public static VersionFeatures create(RecognisedVersion version) {
 	private final VersionFeature<Long> seedForStructure_WitchHut;
 	private final VersionFeature<Long> seedForStructure_OceanRuins;
 	private final VersionFeature<Long> seedForStructure_Shipwreck;
+	private final VersionFeature<Byte> maxDistanceScatteredFeatures_Shipwreck;
 	private final VersionFeature<Boolean> buggyStructureCoordinateMath;
 
 	private DefaultVersionFeatures() {
@@ -328,6 +330,12 @@ private DefaultVersionFeatures() {
 				.init(
 						165745295L
 				).construct();
+		this.maxDistanceScatteredFeatures_Shipwreck = VersionFeature.<Byte> builder()
+				.init(
+					(byte) 15
+				).since(RecognisedVersion._1_13_pre7,
+					(byte) 16
+				).construct();
 
 		this.buggyStructureCoordinateMath = VersionFeature.<Boolean> builder()
 				.init(

diff --git a/src/main/java/amidst/mojangapi/world/versionfeatures/VersionFeatures.java b/src/main/java/amidst/mojangapi/world/versionfeatures/VersionFeatures.java
@@ -35,6 +35,7 @@ public class VersionFeatures {
 	private final Long seedForStructure_WitchHut;
 	private final Long seedForStructure_OceanRuins;
 	private final Long seedForStructure_Shipwreck;
+	private final Byte maxDistanceScatteredFeatures_Shipwreck;
 	private final Boolean buggyStructureCoordinateMath;
 
 	public VersionFeatures(
@@ -61,6 +62,7 @@ public VersionFeatures(
 			Long seedForStructure_WitchHut,
 			Long seedForStructure_OceanRuins,
 			Long seedForStructure_Shipwreck,
+			Byte maxDistanceScatteredFeatures_Shipwreck,
 			Boolean buggyStructureCoordinateMath) {
 		this.enabledLayers = enabledLayers;
 		this.validBiomesForStructure_Spawn = validBiomesForStructure_Spawn;
@@ -85,6 +87,7 @@ public VersionFeatures(
 		this.seedForStructure_WitchHut = seedForStructure_WitchHut;
 		this.seedForStructure_OceanRuins = seedForStructure_OceanRuins;
 		this.seedForStructure_Shipwreck = seedForStructure_Shipwreck;
+		this.maxDistanceScatteredFeatures_Shipwreck = maxDistanceScatteredFeatures_Shipwreck;
 		this.buggyStructureCoordinateMath = buggyStructureCoordinateMath;
 	}
 
@@ -179,6 +182,10 @@ public Long getSeedForStructure_OceanRuins() {
 	public Long getSeedForStructure_Shipwreck() {
 		return seedForStructure_Shipwreck;
 	}
+
+	public Byte getMaxDistanceScatteredFeatures_Shipwreck() {
+		return maxDistanceScatteredFeatures_Shipwreck;
+	}
 
 	public Boolean getBuggyStructureCoordinateMath() {
 		return buggyStructureCoordinateMath;