Skip to content

Commit 8c9dfd5

Browse files
committed
Default mappings to official, closes #1041
1 parent 81add1b commit 8c9dfd5

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

src/main/java/net/minecraftforge/gradle/MinecraftMappings.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
*/
55
package net.minecraftforge.gradle;
66

7+
import org.jspecify.annotations.Nullable;
8+
79
import java.io.Serializable;
810

911
/// The mappings used for the Minecraft dependency.
@@ -18,5 +20,5 @@ public interface MinecraftMappings extends Serializable {
1820
/// Gets the version for these mappings (i.e. `1.21.11`)
1921
///
2022
/// @return The version
21-
String getVersion();
23+
@Nullable String getVersion();
2224
}

src/main/java/net/minecraftforge/gradle/internal/MinecraftExtensionImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ static void register(
9393
public MinecraftExtensionImpl(ForgeGradlePlugin plugin) {
9494
this.plugin = plugin;
9595
this.mavenizerOutput.convention(plugin.rootProjectDirectory().dir(".gradle/mavenizer/repo").map(this.problems.ensureFileLocation()));
96+
this.mappings.convention(getObjects().newInstance(MinecraftMappingsImpl.class, "official", ""));
9697
}
9798

9899
@Override
@@ -432,9 +433,9 @@ public MavenizerInstance dependency(
432433

433434
var mappings = minecraftDependency.getMappings();
434435
if ("parchment".equals(mappings.getChannel()))
435-
ret.addAll(List.of("--parchment", mappings.getVersion()));
436+
ret.addAll(List.of("--parchment", Objects.requireNonNull(mappings.getVersion())));
436437
else if (!"official".equals(mappings.getChannel()))
437-
ret.addAll(List.of("--mappings", mappings.getChannel() + ':' + mappings.getVersion()));
438+
ret.addAll(List.of("--mappings", mappings.getChannel() + ':' + Objects.requireNonNull(mappings.getVersion())));
438439

439440
for (var repo : this.getRepositories()) {
440441
if (MAVENIZER_REPO_NAME.equals(repo.getName()))

src/main/java/net/minecraftforge/gradle/internal/MinecraftMappingsImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package net.minecraftforge.gradle.internal;
66

77
import org.gradle.api.model.ObjectFactory;
8+
import org.jspecify.annotations.Nullable;
89

910
import javax.inject.Inject;
1011
import java.io.Serial;
@@ -13,7 +14,7 @@ abstract class MinecraftMappingsImpl implements MinecraftMappingsInternal {
1314
private static final @Serial long serialVersionUID = 6944934115402768018L;
1415

1516
private final String channel;
16-
private final String version;
17+
private final @Nullable String version;
1718

1819
protected abstract @Inject ObjectFactory getObjects();
1920

@@ -23,6 +24,8 @@ public MinecraftMappingsImpl(String channel, String version) {
2324
this.channel = Util.checkMappingsParam(problems, channel, "channel");
2425
if (this.channel.equals("parchment"))
2526
this.version = ParchmentVersion.parse(Util.checkMappingsParam(problems, version, "version")).toFriendly();
27+
else if (this.channel.equals("official"))
28+
this.version = version.isEmpty() ? null : version;
2629
else
2730
this.version = Util.checkMappingsParam(problems, version, "version");
2831
}
@@ -33,7 +36,7 @@ public String getChannel() {
3336
}
3437

3538
@Override
36-
public String getVersion() {
39+
public @Nullable String getVersion() {
3740
return this.version;
3841
}
3942
}

src/main/java/net/minecraftforge/gradle/internal/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
final class Util extends SharedUtil {
2424
static String checkMappingsParam(ForgeGradleProblems problems, @Nullable Object param, String name) {
25-
if (param == null)
25+
if (param == null || param.toString().isEmpty())
2626
throw problems.nullMappingsParam(name);
2727

2828
return param.toString();

0 commit comments

Comments
 (0)