diff --git a/build.gradle b/build.gradle index 9fff755..f9c66f6 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ archivesBaseName = "MinicraftGameProvider" dependencies { implementation 'com.github.skeeto:Minicraft:21e7007696' compileOnly group: 'org.jetbrains', name: 'intellij-fernflower', version: '1.2.1.16' - compileOnly group: 'net.fabricmc', name: 'fabric-loader', version: '0.12.12' + compileOnly group: 'net.fabricmc', name: 'fabric-loader', version: '0.13.0' //mixin requirements: compileOnly 'org.spongepowered:mixin:' + mixinVersion diff --git a/gradle.properties b/gradle.properties index 607576e..1c317b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -providerVersion = 1.1.0 +providerVersion = 1.1.1 mixinVersion = 0.8.5 asmVersion = 9.2 diff --git a/src/main/java/io/github/pseudodistant/provider/services/GetVersionFromHash.java b/src/main/java/io/github/pseudodistant/provider/services/GetVersionFromHash.java index f14ada9..0a3906f 100644 --- a/src/main/java/io/github/pseudodistant/provider/services/GetVersionFromHash.java +++ b/src/main/java/io/github/pseudodistant/provider/services/GetVersionFromHash.java @@ -20,6 +20,9 @@ public static StringVersion getVersionFromHash(String hash) { case "e96d6ca22a402d69b8e35e4a80cd2582" -> "2.1.0-dev1"; default -> "0.0.0"; }; + if (!gameVersion.equals("0.0.0")) { + MinicraftGameProvider.setIsPlus(); + } return new StringVersion(gameVersion); } } diff --git a/src/main/java/io/github/pseudodistant/provider/services/MinicraftGameProvider.java b/src/main/java/io/github/pseudodistant/provider/services/MinicraftGameProvider.java index b5679ce..d2d157f 100644 --- a/src/main/java/io/github/pseudodistant/provider/services/MinicraftGameProvider.java +++ b/src/main/java/io/github/pseudodistant/provider/services/MinicraftGameProvider.java @@ -90,8 +90,7 @@ public Collection getBuiltinMods() { .setContact(new ContactInformationImpl(minicraftPlusContactInformation)) .setDescription("Minicraft+ is a modded version of Minicraft that adds many more features to the original version. The original Minicraft game was made by Markus 'Notch' Persson in the Ludum Dare 22 contest."); - - return isPlus ? Collections.singletonList(new BuiltinMod(gameJar, minicraftPlusMetaData.build())) : Collections.singletonList(new BuiltinMod(gameJar, minicraftMetaData.build())); + return isPlus ? Collections.singletonList(new BuiltinMod(Collections.singletonList(gameJar), minicraftPlusMetaData.build())) : Collections.singletonList(new BuiltinMod(Collections.singletonList(gameJar), minicraftMetaData.build())); } @Override