imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0

Browse Source 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
This commit is contained in:
shedaniel
2021-11-18 02:35:59 +08:00
parent 08aae05000 9c2b1e8d6d
commit 4765504fc1
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java
View File

@@ -28,6 +28,8 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Objects;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
@@ -78,4 +80,11 @@ public record AccessWidenerFile(
content
);
}
@Override
public int hashCode() {
int result = Objects.hash(name, modId);
result = 31 * result + Arrays.hashCode(content);
return result;
}
}

4
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
View File

@@ -416,6 +416,10 @@ public class MinecraftMappedProvider extends DependencyProvider {
return minecraftMappedJar;
}
public final File getBaseMappedJar() {
return minecraftMappedJar;
}
public File getForgeIntermediaryJar() {
return forgeIntermediaryJar;
}