Skip to content

Commit 79eb243

Browse files
committed
Remove need for "LATEST_KNOWN_VERSION"
1 parent 15a19fe commit 79eb243

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

core/src/main/java/de/bluecolored/bluemap/core/resources/MinecraftVersion.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
*/
2525
package de.bluecolored.bluemap.core.resources;
2626

27-
import com.google.gson.*;
27+
import com.google.gson.FieldNamingPolicy;
28+
import com.google.gson.Gson;
29+
import com.google.gson.GsonBuilder;
2830
import com.google.gson.annotations.JsonAdapter;
2931
import com.google.gson.annotations.SerializedName;
3032
import com.google.gson.reflect.TypeToken;
@@ -39,12 +41,10 @@
3941
import lombok.NoArgsConstructor;
4042
import lombok.RequiredArgsConstructor;
4143
import org.jetbrains.annotations.Nullable;
42-
import org.spongepowered.configurate.objectmapping.FieldData;
4344

4445
import java.io.IOException;
4546
import java.io.OutputStream;
4647
import java.io.Reader;
47-
import java.lang.reflect.Type;
4848
import java.nio.charset.StandardCharsets;
4949
import java.nio.file.FileSystem;
5050
import java.nio.file.FileSystems;
@@ -62,7 +62,6 @@ public class MinecraftVersion {
6262
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
6363
.create();
6464

65-
private static final String LATEST_KNOWN_VERSION = "1.21.8";
6665
private static final String EARLIEST_RESOURCEPACK_VERSION = "1.13";
6766
private static final String EARLIEST_DATAPACK_VERSION = "1.19.4";
6867

@@ -99,15 +98,6 @@ public static MinecraftVersion load(@Nullable String id, Path dataRoot, boolean
9998
VersionManifest.Version resourcePackVersion = manifest.getVersion(EARLIEST_RESOURCEPACK_VERSION);
10099
VersionManifest.Version dataPackVersion = manifest.getVersion(EARLIEST_DATAPACK_VERSION);
101100

102-
if (version == null) {
103-
Logger.global.logWarning("Could not find any version for id '" + id + "'. Using fallback-version: " + LATEST_KNOWN_VERSION);
104-
version = manifest.getVersion(LATEST_KNOWN_VERSION);
105-
}
106-
107-
if (version == null || resourcePackVersion == null || dataPackVersion == null) {
108-
throw new IOException("Manifest is missing versions.");
109-
}
110-
111101
if (version.compareTo(resourcePackVersion) > 0) resourcePackVersion = version;
112102
if (version.compareTo(dataPackVersion) > 0) dataPackVersion = version;
113103

core/src/main/java/de/bluecolored/bluemap/core/resources/VersionManifest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,16 @@ public synchronized Version[] getVersions() {
8989
return versions;
9090
}
9191

92-
public synchronized @Nullable Version getVersion(String id) {
92+
public synchronized Version getVersion(String id) throws IOException {
9393
if (versionMap == null) {
9494
versionMap = new HashMap<>();
9595
for (Version version : versions)
9696
versionMap.put(version.id, version);
9797
}
9898

99-
return versionMap.get(id);
99+
Version version = versionMap.get(id);
100+
if (version == null) throw new IOException("There is no version '%s' in manifest.".formatted(id));
101+
return version;
100102
}
101103

102104
@Getter

0 commit comments

Comments
 (0)