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

It "works" now, though resources are gone

Browse Source
This commit is contained in:
Juuxel
2020-07-27 17:31:49 +03:00
parent e7d779a64b
commit 0958d98269
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -21,7 +21,7 @@ if (ENV.BUILD_NUMBER) {
build = 'jenkins #${ENV.BUILD_NUMBER}'
version = baseVersion + '.' + ENV.BUILD_NUMBER
} else {
version = baseVersion + '-forge.6'
version = baseVersion + '-forge.8'
}
repositories {

5
src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
View File

@@ -147,8 +147,9 @@ public class MinecraftMappedProvider extends DependencyProvider {
public void initFiles(MinecraftProvider minecraftProvider, MappingsProvider mappingsProvider) {
this.minecraftProvider = minecraftProvider;
minecraftIntermediaryJar = new File(getExtension().getUserCache(), "minecraft-" + getJarVersionString("intermediary") + ".jar");
minecraftMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar");
PatchProvider patchProvider = getExtension().getPatchProvider();
minecraftIntermediaryJar = new File(getExtension().getProjectPersistentCache(), "minecraft-" + getJarVersionString("intermediary") + "-patched-" + patchProvider.forgeVersion + ".jar");
minecraftMappedJar = new File(getJarDirectory(getExtension().getProjectPersistentCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + "-patched-" + patchProvider.forgeVersion + ".jar");
}
protected File getJarDirectory(File parentDirectory, String type) {

12
src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
View File

@@ -224,7 +224,7 @@ public class MinecraftProvider extends DependencyProvider {
}
private void createSrgJars(Logger logger) throws Exception {
logger.info(":remapping minecraft: official->srg");
logger.lifecycle(":remapping minecraft (MCP, official -> srg)");
McpConfigProvider volde = getExtension().getMcpConfigProvider();
File root = new File(getExtension().getUserCache(), "mcp_root");
@@ -247,7 +247,7 @@ public class MinecraftProvider extends DependencyProvider {
}
private void createPatchedJars(Logger logger) throws IOException {
logger.info(":remapping minecraft: srg->official");
logger.lifecycle(":remapping minecraft (Atlas, srg -> official)");
useAtlas(MappingSet::reverse, atlas -> {
atlas.run(minecraftClientPatchedSrgJar.toPath(), minecraftClientPatchedJar.toPath());
@@ -274,7 +274,7 @@ public class MinecraftProvider extends DependencyProvider {
}
private void patchJars(Logger logger) throws IOException {
logger.info(":patching jars");
logger.lifecycle(":patching jars");
PatchProvider patchProvider = getExtension().getPatchProvider();
patchJars(minecraftClientSrgJar, minecraftClientPatchedSrgJar, patchProvider.clientPatches);
@@ -292,10 +292,12 @@ public class MinecraftProvider extends DependencyProvider {
private void mergeJars(Logger logger) throws IOException {
logger.lifecycle(":merging jars");
try (JarMerger jarMerger = new JarMerger(minecraftClientPatchedJar, minecraftServerPatchedJar, minecraftMergedJar)) {
// FIXME: Hack here: There are no server-only classes so we can just copy the client JAR.
Files.copy(minecraftClientPatchedJar, minecraftMergedJar);
/*try (JarMerger jarMerger = new JarMerger(minecraftClientPatchedJar, minecraftServerPatchedJar, minecraftMergedJar)) {
jarMerger.enableSyntheticParamsOffset();
jarMerger.merge();
}
}*/
}
public File getMergedJar() {