Skip to content

Commit b3b8b6c

Browse files
OroArmorOroArmor
committed
Fairly easy port!
1 parent ace5911 commit b3b8b6c

File tree

5 files changed

+72
-66
lines changed

5 files changed

+72
-66
lines changed

‎fabric-loom‎

Submodule fabric-loom updated 112 files

‎patches/0001-Initial-Quiltification.patch‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This includes:
1212
- Automatically applying the Quilt Maven
1313

1414
diff --git a/build.gradle b/build.gradle
15-
index a9e824c9f9abb7d55d1516dfa2e53e218b002fa8..28263657c1b06bce0a78b68c1cce135b67b196c5 100644
15+
index 4d69e8bc5d092e6e092cbc719895e0459be67795..5ec49f85b30b2844d50c0523980ec5a109004e8c 100644
1616
--- a/build.gradle
1717
+++ b/build.gradle
1818
@@ -22,7 +22,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
@@ -21,10 +21,10 @@ index a9e824c9f9abb7d55d1516dfa2e53e218b002fa8..28263657c1b06bce0a78b68c1cce135b
2121

2222
-group = 'net.fabricmc'
2323
+group = 'org.quiltmc'
24-
def baseVersion = '1.14'
24+
def baseVersion = '1.15'
2525

2626
def ENV = System.getenv()
27-
@@ -234,23 +234,42 @@ codenarc {
27+
@@ -224,23 +224,42 @@ codenarc {
2828

2929
gradlePlugin {
3030
plugins {
@@ -76,7 +76,7 @@ index a9e824c9f9abb7d55d1516dfa2e53e218b002fa8..28263657c1b06bce0a78b68c1cce135b
7676
}
7777
}
7878

79-
@@ -320,11 +339,11 @@ publishing {
79+
@@ -310,11 +329,11 @@ publishing {
8080
Node dependencies = root.appendChild(document.createElement('dependencies'))
8181
Node dependency = dependencies.appendChild(document.createElement('dependency'))
8282
Node groupId = dependency.appendChild(document.createElement('groupId'))
@@ -91,15 +91,15 @@ index a9e824c9f9abb7d55d1516dfa2e53e218b002fa8..28263657c1b06bce0a78b68c1cce135b
9191
})
9292
}
9393
}
94-
@@ -332,6 +351,7 @@ publishing {
94+
@@ -322,6 +341,7 @@ publishing {
9595
}
9696
repositories {
9797
maven {
9898
+ name = 'release'
9999
if (ENV.MAVEN_URL) {
100100
url ENV.MAVEN_URL
101101
credentials {
102-
@@ -421,4 +441,4 @@ abstract class PrintActionsTestName extends DefaultTask {
102+
@@ -422,4 +442,4 @@ abstract class PrintActionsTestName extends DefaultTask {
103103
}
104104

105105
apply from: rootProject.file('gradle/versions.gradle')
@@ -259,7 +259,7 @@ index 2237933d7828e72f2b1b0ba78de2249e7f19b078..316b3b451a49a49854eefda878dc2046
259259
}
260260

261261
diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.java b/src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.java
262-
index b13cf33d38a4b7463d4858a69c9b8a08ec965592..74feadf0ce04f99686c328a429841dee4b29b261 100644
262+
index 13c1914691746bec6d87690364b08026b76fe255..7aefff99c3f0af65325fd79b0b5aee24e669f7fc 100644
263263
--- a/src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.java
264264
+++ b/src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.java
265265
@@ -26,6 +26,7 @@ package net.fabricmc.loom.configuration.mods;
@@ -333,10 +333,10 @@ index 720181615f578e0f4c88e3f2043e4e4c0ae79284..3491e0d8eb9cd47d3940a84475ff689d
333333

334334
@Override
335335
diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
336-
index a55e3d9427f2274c8daae378f6152ec36df05f03..0fae8cb4f3c3685f31038bc2034c93c3518230c5 100644
336+
index 4fa3c8d6e08a320bc39b1d60527b88075099a71d..f435eb09a55b2ca3c0ba04f58a7bdce1c9ef2956 100644
337337
--- a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
338338
+++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
339-
@@ -132,18 +132,20 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask {
339+
@@ -138,19 +138,21 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask {
340340
}
341341

342342
final LaunchConfig launchConfig = new LaunchConfig()
@@ -345,7 +345,9 @@ index a55e3d9427f2274c8daae378f6152ec36df05f03..0fae8cb4f3c3685f31038bc2034c93c3
345345
.property("log4j.configurationFile", getLog4jConfigPaths().get())
346346
.property("log4j2.formatMsgNoLookups", "true")
347347
- .property("fabric.defaultModDistributionNamespace", getProductionNamespace().get())
348+
- .property("fabric.defaultMixinRemapType", getDefaultMixinRemapType().get())
348349
+ .property("loader.defaultModDistributionNamespace", getProductionNamespace().get())
350+
+ .property("loader.defaultMixinRemapType", getDefaultMixinRemapType().get())
349351

350352
.argument("client", "--assetIndex")
351353
.argument("client", versionInfo.assetIndex().fabricId(getMinecraftVersion().get()))
@@ -361,7 +363,7 @@ index a55e3d9427f2274c8daae378f6152ec36df05f03..0fae8cb4f3c3685f31038bc2034c93c3
361363
}
362364

363365
if (versionInfo.hasNativesToExtract()) {
364-
@@ -155,15 +157,15 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask {
366+
@@ -162,15 +164,15 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask {
365367
}
366368

367369
if (getSplitSourceSets().get()) {
@@ -380,7 +382,7 @@ index a55e3d9427f2274c8daae378f6152ec36df05f03..0fae8cb4f3c3685f31038bc2034c93c3
380382
}
381383
}
382384

383-
@@ -207,6 +209,11 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask {
385+
@@ -214,6 +216,11 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask {
384386
}
385387

386388
public LaunchConfig property(String side, String key, String value) {
@@ -406,7 +408,7 @@ index 7f06e06ddfbdb524f1e8b14b3c8ea43bf3b3bd6f..697a9f4c7e8006e1f9fcc3cebd9748d3
406408
}
407409

408410
diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java
409-
index 27c5cf504cc61e433c57b733ac9d124a5b0391cc..9bd3380b46d23daf6c3ff07825bead62c19675eb 100644
411+
index 53fcb19c6d87eb2fc2fdabc6f47568f974682017..308e145609bf10aaad4ea776b16d061aafe586fb 100644
410412
--- a/src/main/java/net/fabricmc/loom/util/Constants.java
411413
+++ b/src/main/java/net/fabricmc/loom/util/Constants.java
412414
@@ -33,6 +33,7 @@ public class Constants {
@@ -435,7 +437,7 @@ index 3350a985f73e403f086a2a988283cbe4644d0cc2..eef1cd42b1e53497012165e1580c6199
435437
+ }
436438
}
437439
diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
438-
index 0da65dd135a5428394f2653c52948fb7e13f9a75..584b87e96280e1a058b907d17d16b65051cf1355 100644
440+
index 44fde279e8565d5294732ce7db6f203163ca39f4..1bbf8c51c7a6a830735cba379c803f33e32c427c 100644
439441
--- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
440442
+++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
441443
@@ -125,7 +125,7 @@ public class SourceRemapper {

‎patches/0002-Support-QMJ.patch‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Support QMJ
55

66

77
diff --git a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
8-
index 2c644561d75e47b08fc8895aa28a7a2e763b902c..5306266824abf4b63a9856a2cb04d83ceb55d4a3 100644
8+
index 642302449d3584a9ddd23d9820718224316a3181..41ab47230992548874d4a7cc97b876156399e46d 100644
99
--- a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
1010
+++ b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
11-
@@ -184,10 +184,10 @@ public interface LoomGradleExtensionAPI {
11+
@@ -183,10 +183,10 @@ public interface LoomGradleExtensionAPI {
1212
void disableDeprecatedPomGeneration(MavenPublication publication);
1313

1414
/**
@@ -452,7 +452,7 @@ index 72c39b417441a0fbb590cb19c30c0911a2737333..d0ea700d17f3e3e829ee0759007c14ca
452452
public int hashCode() {
453453
int result = Objects.hash(path, modId);
454454
diff --git a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerJarProcessor.java b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerJarProcessor.java
455-
index 06886fff81a95baa0b914d6d9602405643acfcc1..7a46a48ebedf7dfcf5f6c3c5587e8eeba02af403 100644
455+
index 01abf15aec77b90a404d4e4608149de1e80dc9d9..35069d92de8200558b009fcfb12bf8f218951bf6 100644
456456
--- a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerJarProcessor.java
457457
+++ b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerJarProcessor.java
458458
@@ -40,11 +40,11 @@ import org.jspecify.annotations.Nullable;
@@ -472,9 +472,9 @@ index 06886fff81a95baa0b914d6d9602405643acfcc1..7a46a48ebedf7dfcf5f6c3c5587e8eeb
472472
*/
473473

474474
if (includeTransitive) {
475-
- for (FabricModJson fabricModJson : context.modDependencies()) {
475+
- for (FabricModJson fabricModJson : context.modDependenciesCompileRuntime()) {
476476
- accessWideners.addAll(ModAccessWidenerEntry.readAll(fabricModJson, true));
477-
+ for (ModJson modJson : context.modDependencies()) {
477+
+ for (ModJson modJson : context.modDependenciesCompileRuntime()) {
478478
+ accessWideners.addAll(ModAccessWidenerEntry.readAll(modJson, true));
479479
}
480480
}
@@ -536,7 +536,7 @@ index 3f74f27988f71c5b18477ff846f63793fc5e81d6..f74dec8ac3490c55c364fec0caa672b4
536536

537537
extension.getMods().create(modId.get(), mod -> {
538538
diff --git a/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java b/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
539-
index 67050399ec4cfac055392cf3012866900589ee17..def09d5b92ca121fc6bf8caa80db3db2698a6f50 100644
539+
index 25b418a76dd62f7f415ea5a4c981064b21a98efb..419d2b07d2d35e6e24ea1de557ad81d3556d66d3 100644
540540
--- a/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
541541
+++ b/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
542542
@@ -53,6 +53,7 @@ import org.slf4j.Logger;
@@ -553,9 +553,9 @@ index 67050399ec4cfac055392cf3012866900589ee17..def09d5b92ca121fc6bf8caa80db3db2
553553
import net.fabricmc.loom.util.ZipUtils;
554554
-import net.fabricmc.loom.util.fmj.FabricModJson;
555555
import net.fabricmc.mappingio.tree.MappingTree;
556+
import net.fabricmc.mappingio.tree.MappingTreeView;
556557
import net.fabricmc.mappingio.tree.MemoryMappingTree;
557-
import net.fabricmc.tinyremapper.TinyRemapper;
558-
@@ -100,7 +100,7 @@ public abstract class InterfaceInjectionProcessor implements MinecraftJarProcess
558+
@@ -101,7 +101,7 @@ public abstract class InterfaceInjectionProcessor implements MinecraftJarProcess
559559
}
560560

561561
Set<String> clientOnlyModIds = context.modDependenciesCompileRuntimeClient().stream()
@@ -564,7 +564,7 @@ index 67050399ec4cfac055392cf3012866900589ee17..def09d5b92ca121fc6bf8caa80db3db2
564564
.collect(Collectors.toSet());
565565

566566
return new Spec(injectedInterfaces, clientOnlyModIds);
567-
@@ -235,9 +235,9 @@ public abstract class InterfaceInjectionProcessor implements MinecraftJarProcess
567+
@@ -238,9 +238,9 @@ public abstract class InterfaceInjectionProcessor implements MinecraftJarProcess
568568
}
569569

570570
private record InjectedInterface(String modId, String className, String ifaceName, @Nullable String generics) {
@@ -577,7 +577,7 @@ index 67050399ec4cfac055392cf3012866900589ee17..def09d5b92ca121fc6bf8caa80db3db2
577577

578578
if (jsonElement == null) {
579579
return Collections.emptyList();
580-
@@ -273,8 +273,8 @@ public abstract class InterfaceInjectionProcessor implements MinecraftJarProcess
580+
@@ -276,8 +276,8 @@ public abstract class InterfaceInjectionProcessor implements MinecraftJarProcess
581581
return result;
582582
}
583583

@@ -636,7 +636,7 @@ index 3ebf78349865db0e26dc1cbeeb9e477455698cf5..9d370b6ae15fc50895b54f3abb66d988
636636

637637
return new AccessWidenerData(accessWidenerPath, header, accessWidener);
638638
diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
639-
index 28385f8b98df47926c48fafe19bf0233c8224035..05c2d0cd9a91b25706311733a7e46e79ffd4f5d4 100644
639+
index d6c9a247353f07779004aa208986fa99a717849f..8d636196e03f6c59d3bf28ba86c485236eae54c7 100644
640640
--- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
641641
+++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
642642
@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
@@ -707,7 +707,7 @@ index d9d35fd76b54d6706bbfac48a47db0e4c0a5562c..037a0ce414e2c97acaac4c7be61e4b9b
707707
throw ExceptionUtil.createDescriptiveWrapper(IOException::new, "Failed to read mixin configuration from " + mod.getInputFile(), e);
708708
}
709709
diff --git a/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java b/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java
710-
index 5a5a1977aec7b7160b770b4750b949ebd087c57c..243b405d5f6c9bae1ff2924cb53808662b651550 100644
710+
index 29916105a3f9532c9d927b2292fc60969b26cb89..341e55e858c1903b8a9bfbb12535b9c1237aabdc 100644
711711
--- a/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java
712712
+++ b/src/main/java/net/fabricmc/loom/configuration/processors/ModJavadocProcessor.java
713713
@@ -39,18 +39,16 @@ import java.util.Objects;
@@ -730,18 +730,18 @@ index 5a5a1977aec7b7160b770b4750b949ebd087c57c..243b405d5f6c9bae1ff2924cb5380866
730730
import net.fabricmc.mappingio.MappedElementKind;
731731
import net.fabricmc.mappingio.MappingReader;
732732
import net.fabricmc.mappingio.MappingUtil;
733-
@@ -79,8 +77,8 @@ public abstract class ModJavadocProcessor implements MinecraftJarProcessor<ModJa
733+
@@ -80,8 +78,8 @@ public abstract class ModJavadocProcessor implements MinecraftJarProcessor<ModJa
734734
public ModJavadocProcessor.@Nullable Spec buildSpec(SpecContext context) {
735735
List<ModJavadoc> javadocs = new ArrayList<>();
736736

737-
- for (FabricModJson fabricModJson : context.allMods()) {
737+
- for (FabricModJson fabricModJson : context.modDependenciesCompileRuntime()) {
738738
- ModJavadoc javadoc = ModJavadoc.create(fabricModJson, context.productionNamespace());
739-
+ for (ModJson modJson : context.allMods()) {
739+
+ for (ModJson modJson : context.modDependenciesCompileRuntime()) {
740740
+ ModJavadoc javadoc = ModJavadoc.create(modJson, context.productionNamespace());
741741

742742
if (javadoc != null) {
743743
javadocs.add(javadoc);
744-
@@ -116,20 +114,19 @@ public abstract class ModJavadocProcessor implements MinecraftJarProcessor<ModJa
744+
@@ -117,20 +115,19 @@ public abstract class ModJavadocProcessor implements MinecraftJarProcessor<ModJa
745745

746746
public record ModJavadoc(String modId, MemoryMappingTree mappingTree, String mappingsHash) {
747747
@Nullable
@@ -1126,10 +1126,10 @@ index 00aec308c71d5044b7c8ce2680be610e7977fb95..2983268f4607f446a1d01adb40abe992
11261126
}
11271127
}
11281128
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
1129-
index 400fff15daa24a1dc0fe9cbf400faba3c4afc425..ac6eeb52e0392e3cca30bc75a1eeeb04af77938b 100644
1129+
index c0de68e806da886a2bd64e17319fed678ae3b389..b5ec64d36291f5747df9068f03175bec8b8a198b 100644
11301130
--- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
11311131
+++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
1132-
@@ -74,7 +74,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets;
1132+
@@ -75,7 +75,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets;
11331133
import net.fabricmc.loom.task.GenerateSourcesTask;
11341134
import net.fabricmc.loom.util.DeprecationHelper;
11351135
import net.fabricmc.loom.util.MirrorUtil;
@@ -1138,7 +1138,7 @@ index 400fff15daa24a1dc0fe9cbf400faba3c4afc425..ac6eeb52e0392e3cca30bc75a1eeeb04
11381138
import net.fabricmc.loom.util.fmj.FabricModJsonHelpers;
11391139
import net.fabricmc.loom.util.gradle.SourceSetHelper;
11401140

1141-
@@ -320,13 +320,13 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
1141+
@@ -330,13 +330,13 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
11421142

11431143
@Override
11441144
public String getModVersion() {
@@ -1156,7 +1156,7 @@ index 400fff15daa24a1dc0fe9cbf400faba3c4afc425..ac6eeb52e0392e3cca30bc75a1eeeb04
11561156

11571157
@Override
11581158
diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
1159-
index 0c0fa39db738fd9e015d90716ea54c3dc1f12f42..f2cc03b0594126b6d5016fc6a4d5897f31530bea 100644
1159+
index 1e395e167e40cd5f4b77a8c7fc8bfc4ad7233a86..4520a4fc1f72e658e35aa1c0e3efc387ecbd00ae 100644
11601160
--- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
11611161
+++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
11621162
@@ -55,9 +55,9 @@ import net.fabricmc.classtweaker.api.ClassTweakerReader;

0 commit comments

Comments
 (0)