imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 05:05:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update Architectury TinyRemapper

Browse Source 
Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2022-08-10 15:42:02 +08:00
parent 66d13ebf6e
commit 5526ee050c
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@@ -98,8 +98,7 @@ dependencies {
}
// tinyfile management
implementation ('dev.architectury:tiny-remapper:1.7.19')
// TODO: implementation ('net.fabricmc:tiny-remapper:0.8.5')
implementation ('dev.architectury:tiny-remapper:1.8.20')
implementation 'net.fabricmc:access-widener:2.1.0'
implementation 'net.fabricmc:mapping-io:0.2.1'

5
src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
View File

@@ -38,6 +38,7 @@ import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.ConfigurationContainer;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.AbstractCopyTask;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.compile.JavaCompile;
@@ -89,7 +90,7 @@ public final class CompileConfiguration {
project.afterEvaluate(project1 -> {
if (extension.shouldGenerateSrgTiny()) {
extension.createLazyConfiguration(Constants.Configurations.SRG).configure(configuration -> configuration.setTransitive(false));
configurations.register(Constants.Configurations.SRG, configuration -> configuration.setTransitive(false));
}
if (extension.isDataGenEnabled()) {
@@ -255,7 +256,7 @@ public final class CompileConfiguration {
if (extension.isForge()) {
// Create default mod from main source set
extension.mods(mods -> {
final SourceSet main = javaPluginExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
final SourceSet main = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
mods.create("main").sourceSet(main);
});
}

8
src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
View File

@@ -85,11 +85,11 @@ public class ModProcessor {
}
private void stripNestedJars(Path path) {
if (!ZipUtils.contains(file.toPath(), "fabric.mod.json")) {
if (ZipUtils.contains(file.toPath(), "quilt.mod.json")) {
if (!ZipUtils.contains(path, "fabric.mod.json")) {
if (ZipUtils.contains(path, "quilt.mod.json")) {
// Strip out all contained jar info as we dont want loader to try and load the jars contained in dev.
try {
ZipUtils.transformJson(JsonObject.class, file.toPath(), Map.of("quilt.mod.json", json -> {
ZipUtils.transformJson(JsonObject.class, path, Map.of("quilt.mod.json", json -> {
if (json.has("quilt_loader")) {
json.getAsJsonObject("quilt_loader").remove("jars");
}
@@ -97,7 +97,7 @@ public class ModProcessor {
return json;
}));
} catch (IOException e) {
throw new UncheckedIOException("Failed to strip nested jars from %s".formatted(file), e);
throw new UncheckedIOException("Failed to strip nested jars from %s".formatted(path), e);
}
}

2
src/main/java/net/fabricmc/loom/task/ValidateMixinNameTask.java
View File

@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import dev.architectury.tinyremapper.extension.mixin.common.data.Constant;
import org.gradle.api.GradleException;
import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.provider.Property;
@@ -58,7 +59,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.tinyremapper.extension.mixin.common.data.Constant;
/**
* Task to validate mixin names.

2
src/main/java/net/fabricmc/loom/util/FileSystemUtil.java
View File

@@ -35,7 +35,7 @@ import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.function.Supplier;
import net.fabricmc.tinyremapper.FileSystemReference;
import dev.architectury.tinyremapper.FileSystemReference;
public final class FileSystemUtil {
public record Delegate(FileSystemReference reference) implements AutoCloseable, Supplier<FileSystem> {