From 777f30913b3d6f7bf313ffe3f6ac3811ae3af446 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 16 Jul 2021 22:36:22 +0100 Subject: [PATCH] Add back customManifest api --- .../java/net/fabricmc/loom/LoomGradleExtension.java | 5 ----- .../fabricmc/loom/api/LoomGradleExtensionAPI.java | 4 ++++ .../loom/extension/LoomGradleExtensionApiImpl.java | 12 ++++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index bff7e68..8cb82c6 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -98,11 +98,6 @@ public interface LoomGradleExtension extends LoomGradleExtensionAPI { return Boolean.parseBoolean(System.getProperty("idea.sync.active", "false")); } - default String getCustomManifest() { - // TODO reimplement - return null; - } - default String getIntermediaryUrl(String minecraftVersion) { // TODO reimplement a way to change this, was never really supported api anyway return String.format("https://maven.fabricmc.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar", minecraftVersion); diff --git a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java index 4650d4e..72e6695 100644 --- a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java +++ b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java @@ -80,4 +80,8 @@ public interface LoomGradleExtensionAPI { void runs(Action> action); NamedDomainObjectContainer getRunConfigs(); + + void setCustomManifest(String customManifest); + + String getCustomManifest(); } diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java index 89b7dc4..5c1e5f1 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java @@ -57,6 +57,7 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA protected boolean shareCaches = false; protected String refmapName = null; protected boolean remapMod = true; + protected String customManifest; private NamedDomainObjectContainer runConfigs; @@ -158,6 +159,17 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA return remapMod; } + @Override + public void setCustomManifest(String customManifest) { + Objects.requireNonNull(customManifest, "Custom manifest cannot be null"); + this.customManifest = customManifest; + } + + @Override + public String getCustomManifest() { + return customManifest; + } + protected abstract Project getProject(); protected abstract LoomFiles getFiles();