From 3714b38752257bf1e451ebc623ec7a4ff8fd2786 Mon Sep 17 00:00:00 2001 From: Zodsmar Date: Sun, 29 Dec 2019 13:03:47 -0500 Subject: [PATCH] Updated to 1.15.1 --- src/main/java/sassa/gui/GUI.java | 4 ++-- src/main/java/sassa/main/BiomeSearcher.java | 19 +++++++++---------- src/main/java/sassa/util/Version.java | 2 ++ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/sassa/gui/GUI.java b/src/main/java/sassa/gui/GUI.java index 0e084cb..3de5ad2 100644 --- a/src/main/java/sassa/gui/GUI.java +++ b/src/main/java/sassa/gui/GUI.java @@ -83,9 +83,9 @@ public class GUI { private static int searchQuadrantWidth = 512; private static int searchQuadrantHeight = 512; private static int maximumMatchingWorldsCount = 10; - public static String minecraftVersion = Version.V1_15; + public static String minecraftVersion = Version.V1_15_1; String[] versions = { - /*1.15.x*/ Version.V1_15, + /*1.15.x*/ Version.V1_15_1, Version.V1_15, /*1.14.x*/ Version.V1_14_4, Version.V1_14_3, Version.V1_14, /*1.13.x*/ Version.V1_13_2, Version.V1_13_1, Version.V1_13, /*1.12.x*/ Version.V1_12_2, Version.V1_12, diff --git a/src/main/java/sassa/main/BiomeSearcher.java b/src/main/java/sassa/main/BiomeSearcher.java index 944ff36..02bf738 100644 --- a/src/main/java/sassa/main/BiomeSearcher.java +++ b/src/main/java/sassa/main/BiomeSearcher.java @@ -221,13 +221,12 @@ boolean accept(World world) throws MinecraftInterfaceException, UnknownBiomeInde if(undiscoveredStructures.contains(struct)){ undiscoveredStructures.remove(struct); - } else { - return false; - } - System.out.println(undiscoveredStructures); - if(undiscoveredStructures.isEmpty()){ - return true; } + + /*else { + return false; + }*/ + } /* @@ -251,7 +250,7 @@ boolean accept(World world) throws MinecraftInterfaceException, UnknownBiomeInde Set undiscoveredRejectedBiomes = new HashSet<>(Arrays.asList(rejectedBiomes)); HashMap undiscoveredBiomeSets = new HashMap<>(biomeSets); HashMap undiscoveredRejectedBiomeSets = new HashMap<>(rejectedBiomeSets); - + System.out.println(undiscoveredBiomes); for (int biomeCodeIndex = 0; biomeCodeIndex < biomeCodesCount; biomeCodeIndex++) { if (undiscoveredBiomes.remove(Biome.getByIndex(biomeCodes[biomeCodeIndex]))) { // A new biome has been found. @@ -277,11 +276,11 @@ boolean accept(World world) throws MinecraftInterfaceException, UnknownBiomeInde } } - if (undiscoveredBiomes.isEmpty() && undiscoveredBiomeSets.isEmpty()) { - - // && (GUI.findStructures.isSelected() && hasStructures)) { + if (undiscoveredBiomes.isEmpty() && undiscoveredBiomeSets.isEmpty() && undiscoveredStructures.isEmpty()) { return true; } + + System.out.println(undiscoveredStructures); System.out.println(undiscoveredBiomes); System.out.println(undiscoveredBiomeSets); return false; diff --git a/src/main/java/sassa/util/Version.java b/src/main/java/sassa/util/Version.java index dff3804..5e0e0f2 100644 --- a/src/main/java/sassa/util/Version.java +++ b/src/main/java/sassa/util/Version.java @@ -8,6 +8,7 @@ public class Version { public static final String V9_99_99 = "9.99.9"; // Used to block out unsupported biomes/structures + public static final String V1_15_1 = "1.15.1"; public static final String V1_15 = "1.15"; public static final String V1_14_4 = "1.14.4"; public static final String V1_14_3 = "1.14.3"; @@ -34,6 +35,7 @@ public class Version { public static void registerSupportedVersions() { versions.put(V9_99_99, 99999); + versions.put(V1_15_1, 1501); versions.put(V1_15, 1500); versions.put(V1_14_4, 1404); versions.put(V1_14_3, 1403);