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 'architectury/dev/0.7-forge' into feature/perf

Browse Source
This commit is contained in:
shedaniel
2021-04-30 10:38:28 +08:00
parent 001f4b58f6 73dbebbf95
commit c28fe56870
7 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/publish.yml vendored
View File

@@ -18,6 +18,6 @@ jobs:
with:
java-version: 1.8
- name: Upload to Maven
run: ./gradlew publish
run: ./gradlew publish --stacktrace
env:
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}

2
build.gradle
View File

@@ -47,7 +47,7 @@ sourceSets {
repositories {
maven { url "https://maven.fabricmc.net/" }
maven { url "https://files.minecraftforge.net/maven/" }
maven { url "https://maven.minecraftforge.net/" }
maven { url "https://maven.shedaniel.me/" }
mavenCentral()
}

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

@@ -25,6 +25,7 @@
package net.fabricmc.loom.build;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
@@ -106,6 +107,7 @@ public class JarRemapper {
project.getLogger().info(":remapper output -> " + data.output.getFileName().toString());
try {
Files.deleteIfExists(data.output);
outputConsumer = new OutputConsumerPath.Builder(data.output).build();
} catch (Exception e) {
throw new RuntimeException("Failed to create remapper output " + data.output.getFileName().toString(), e);

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

@@ -137,6 +137,7 @@ public final class CompileConfiguration {
extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project);
extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project);
extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project);
}
public static void configureCompile(Project p) {

2
src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java
View File

@@ -55,7 +55,7 @@ public class MavenConfiguration {
project.getRepositories().maven(repo -> {
repo.setName("Forge");
repo.setUrl("https://files.minecraftforge.net/maven/");
repo.setUrl("https://maven.minecraftforge.net/");
repo.metadataSources(sources -> {
sources.mavenPom();

2
src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java
View File

@@ -40,7 +40,7 @@ public class ForgeProvider extends DependencyProvider {
@Override
public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulationScheduler) throws Exception {
version = new ForgeVersion(dependency.getDependency().getVersion());
version = new ForgeVersion(dependency.getResolvedVersion());
addDependency(dependency.getDepString() + ":userdev", Constants.Configurations.FORGE_USERDEV);
addDependency(dependency.getDepString() + ":installer", Constants.Configurations.FORGE_INSTALLER);
}

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

@@ -111,7 +111,7 @@ public class Constants {
* Constants for versions of dependencies.
*/
public static final class Versions {
public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.0";
public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.3";
public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8";
public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0";
public static final String JETBRAINS_ANNOTATIONS = "19.0.0";