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

Fix merge conflicts

Browse Source
This commit is contained in:
shedaniel
2023-12-26 18:45:04 +08:00
parent beb04d30f2
commit cea4b39f22
6 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/fabricmc/loom/api/remapping/TinyRemapperExtension.java
View File

@@ -24,11 +24,10 @@
package net.fabricmc.loom.api.remapping;
import dev.architectury.tinyremapper.TinyRemapper;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.tinyremapper.TinyRemapper;
/**
* A remapper extension, that has direct access to the TinyRemapper APIs.
*

2
src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java
View File

@@ -183,7 +183,7 @@ public final class IncludedJarFactory {
File tempFile = new File(tempDir, input.getName());
if (tempFile.exists() && FabricModJsonFactory.isModJar(tempFile)) {
if (tempFile.exists() && FabricModJsonFactory.isModJar(tempFile, LoomGradleExtension.get(project).getPlatform().get())) {
return tempFile;
}

2
src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/TinyJarInfo.java
View File

@@ -53,9 +53,9 @@ public record TinyJarInfo(boolean v2, Optional<String> minecraftVersionId) {
private static boolean doesJarContainV2Mappings(FileSystemUtil.Delegate fs) throws IOException {
try (BufferedReader reader = Files.newBufferedReader(fs.getPath("mappings", "mappings.tiny"))) {
return MappingReader.detectFormat(reader) == MappingFormat.TINY_2_FILE;
}
} catch (NoSuchFileException e) {
return false;
}
}
private static Optional<String> getMinecraftVersionId(FileSystemUtil.Delegate fs) throws IOException {

7
src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
View File

@@ -265,8 +265,6 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
return new LayeredMappingsDependency(getProject(), new GradleMappingContext(getProject(), builtSpec.getVersion().replace("+", "_").replace(".", "_")), builtSpec, builtSpec.getVersion());
}
protected abstract String getMinecraftVersion();
@Override
public void runs(Action<NamedDomainObjectContainer<RunConfigSettings>> action) {
action.execute(runConfigs);
@@ -558,11 +556,6 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
throw new RuntimeException("Yeah... something is really wrong");
}
@Override
protected String getMinecraftVersion() {
throw new RuntimeException("Yeah... something is really wrong");
}
@Override
public ForgeExtensionAPI getForge() {
throw new RuntimeException("Yeah... something is really wrong");

5
src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
View File

@@ -302,11 +302,6 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen
provider.getDownloader().disallowChanges();
}
@Override
protected String getMinecraftVersion() {
return getMinecraftProvider().minecraftVersion();
}
@Override
public ForgeExtensionAPI getForge() {
ModPlatform.assertPlatform(this, ModPlatform.FORGE);

4
src/main/java/net/fabricmc/loom/extension/RemapperExtensionHolder.java
View File

@@ -26,6 +26,8 @@ package net.fabricmc.loom.extension;
import javax.inject.Inject;
import dev.architectury.tinyremapper.TinyRemapper;
import dev.architectury.tinyremapper.api.TrClass;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.provider.Property;
import org.gradle.api.tasks.Input;
@@ -39,8 +41,6 @@ import net.fabricmc.loom.api.remapping.RemapperContext;
import net.fabricmc.loom.api.remapping.RemapperExtension;
import net.fabricmc.loom.api.remapping.RemapperParameters;
import net.fabricmc.loom.api.remapping.TinyRemapperExtension;
import net.fabricmc.tinyremapper.TinyRemapper;
import net.fabricmc.tinyremapper.api.TrClass;
public abstract class RemapperExtensionHolder {
// Null when RemapperParameters.None.class