Skip to content

Commit 0d4eec0

Browse files
committed
Fix typo in obf test, and add better fallbacks
1 parent e56c8ab commit 0d4eec0

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/common/java/net/minecraftforge/gradle/common/util/Utils.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,11 +545,21 @@ public static String getIntellijOutName(final SourceSet sourceSet) {
545545

546546
private static final MinecraftVersion OFFICIAL_RUNTIME_START = MinecraftVersion.from("1.20.5");
547547
public static boolean isOfficialRuntime(String version) {
548-
return MinecraftVersion.from(version).compareTo(OFFICIAL_RUNTIME_START) >= 0;
548+
try {
549+
return MinecraftVersion.from(version).compareTo(OFFICIAL_RUNTIME_START) >= 0;
550+
} catch (Exception e) {
551+
System.out.println("Failed to parse MC Version: " + version + " Defaulting to non-official runtime");
552+
return false;
553+
}
549554
}
550555

551556
private static final MinecraftVersion UNOBFED_START = MinecraftVersion.from("26.1-snapshot-1");
552557
public static boolean isObfuscated(String version) {
553-
return MinecraftVersion.from(version).compareTo(UNOBFED_START) < 0;
558+
try {
559+
return MinecraftVersion.from(version).compareTo(UNOBFED_START) < 0;
560+
} catch (Exception e) {
561+
System.out.println("Failed to parse MC Version: " + version + " Defaulting to obfuscated");
562+
return true;
563+
}
554564
}
555565
}

src/userdev/java/net/minecraftforge/gradle/userdev/UserDevPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public void apply(Project project) {
281281
downloadMCMeta.configure(t -> t.getMCVersion().convention(mcVer));
282282

283283
// Register reobfJar for the 'jar' task
284-
if (extension.getReobf() && (!extension.reobfDefault || !Utils.isOfficialRuntime(mcpVer))) {
284+
if (extension.getReobf() && (!extension.reobfDefault || !Utils.isOfficialRuntime(mcVer))) {
285285
reobfExtension.create(JavaPlugin.JAR_TASK_NAME);
286286
project.getTasks().withType(JarJar.class).all(jarJar -> {
287287
logger.info("Creating reobfuscation task for JarJar task: {}", jarJar.getName());

0 commit comments

Comments
 (0)