Skip to content
Closed

Froge #332

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion legacytest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ plugins {
id 'net.neoforged.moddev.legacyforge'
}

repositories {
maven {url = "https://maven.minecraftforge.net"}
}

group = 'com.example.legacy'
version = '1.0.0'

Expand All @@ -13,7 +17,11 @@ java {
}

legacyForge {
mcpVersion = '1.19.2'
//mcpVersion = '1.20.6'
enable {
mcpVersion = "1.20.6"
disableRecompilation = true
}
}

publishing {
Expand Down
65 changes: 65 additions & 0 deletions legacytest/froge12005/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
plugins {
id 'net.neoforged.moddev.legacyforge'
id 'maven-publish'
}

repositories {
maven {
name = "Jared's maven"
url = "https://maven.blamejared.com/"
}
maven {
name 'cursemaven'
url 'https://cursemaven.com'
content {
includeGroup "curse.maven"
}
}
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

dependencies {
// modCompileOnly('mezz.jei:jei-1.20.1-forge:15.17.0.76')
// modRuntimeOnly('curse.maven:mekanism-268560:5662583')
// modImplementation('curse.maven:applied-energistics-2-223794:5641282')
// jarJar('curse.maven:applied-energistics-2-223794:5641282')
jarJar(project(':nonmc'))
}

legacyForge {
enable {
forgeVersion = "1.20.6-50.2.8"
disableRecompilation = true
}
runs {
client {
client()
}
data {
data()
}
}
mods {
myMod {
sourceSet(sourceSets.main)
}
}
}

publishing {
publications {
maven(MavenPublication) {
from components.java
}
}
repositories {
maven {
url rootProject.file('repo')
}
}
}
5 changes: 5 additions & 0 deletions legacytest/froge12005/src/main/java/help/Test.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package help;

public class Test {
public static void main(String [] args) {}
}
4 changes: 2 additions & 2 deletions legacytest/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ plugins {

includeBuild '..'

include 'forge'
include 'forgedownstream'
include 'froge12005'
//include 'forgedownstream'
include 'nonmc'
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,19 @@ public void enable(Project project, LegacyForgeModdingSettings settings, LegacyF
var obf = ExtensionUtils.getExtension(project, OBFUSCATION_EXTENSION, ObfuscationExtension.class);

// We use this directory to store intermediate files used during moddev
var namedToIntermediate = artifacts.requestAdditionalMinecraftArtifact("namedToIntermediaryMapping", "namedToIntermediate.tsrg");
obf.getNamedToSrgMappings().set(namedToIntermediate);
var intermediateToNamed = artifacts.requestAdditionalMinecraftArtifact("intermediaryToNamedMapping", "intermediateToNamed.srg");
var mappingsCsv = artifacts.requestAdditionalMinecraftArtifact("csvMapping", "intermediateToNamed.zip");
obf.getSrgToNamedMappings().set(mappingsCsv);
// var namedToIntermediate = artifacts.requestAdditionalMinecraftArtifact("namedToIntermediaryMapping", "namedToIntermediate.tsrg");
// obf.getNamedToSrgMappings().set(namedToIntermediate);
//var intermediateToNamed = artifacts.requestAdditionalMinecraftArtifact("intermediaryToNamedMapping", "intermediateToNamed.srg");
//var mappingsCsv = artifacts.requestAdditionalMinecraftArtifact("csvMapping", "intermediateToNamed.zip");
//obf.getSrgToNamedMappings().set(mappingsCsv);

extension.getRuns().configureEach(run -> {
// Old BSL versions before 2022 (i.e. on 1.18.2) did not export any packages, causing DevLaunch to be unable to access the main method
run.getJvmArguments().addAll("--add-exports", "cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED");

// Mixin needs the intermediate (SRG) -> named (Mojang, MCP) mapping file in SRG (TSRG is not supported) to be able to ignore the refmaps of dependencies
run.getSystemProperties().put("mixin.env.remapRefMap", "true");
run.getSystemProperties().put("mixin.env.refMapRemappingFile", intermediateToNamed.map(f -> f.getAsFile().getAbsolutePath()));
//run.getSystemProperties().put("mixin.env.remapRefMap", "true");
//run.getSystemProperties().put("mixin.env.refMapRemappingFile", intermediateToNamed.map(f -> f.getAsFile().getAbsolutePath()));

run.getProgramArguments().addAll(mixin.getConfigs().map(cfgs -> cfgs.stream().flatMap(config -> Stream.of("--mixin.config", config)).toList()));
});
Expand All @@ -193,8 +193,8 @@ public void enable(Project project, LegacyForgeModdingSettings settings, LegacyF
}

// Forge expects the mapping csv files on the root classpath
artifacts.runtimeDependencies()
.getDependencies().add(project.getDependencyFactory().create(project.files(mappingsCsv)));
// artifacts.runtimeDependencies()
// .getDependencies().add(project.getDependencyFactory().create(project.files(mappingsCsv)));

var remapDeps = project.getConfigurations().create("remappingDependencies", spec -> {
spec.setDescription("An internal configuration that contains the Minecraft dependencies, used for remapping mods");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,14 @@ private void writeJvmArguments(UserDevRunType runConfig, Map<String, String> add
lines.add(RunUtils.escapeJvmArg("-Dlog4j2.configurationFile=" + log4jConfigFile.getAbsolutePath()));
}

for (var prop : runConfig.props().entrySet()) {
var propValue = prop.getValue();
if (propValue.equals("{minecraft_classpath_file}")) {
propValue = getLegacyClasspathFile().getAsFile().get().getAbsolutePath();
}

addSystemProp(prop.getKey(), propValue, lines);
}
// for (var prop : runConfig.props().entrySet()) {
// var propValue = prop.getValue();
// if (propValue.equals("{minecraft_classpath_file}")) {
// propValue = getLegacyClasspathFile().getAsFile().get().getAbsolutePath();
// }
//
// addSystemProp(prop.getKey(), propValue, lines);
// }

additionalProperties.putAll(getSystemProperties().get());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
Expand Down Expand Up @@ -393,7 +394,11 @@ public void createArtifacts() {
args.add("--problems-report");
args.add(problemsReport.getAbsolutePath());

args.add("--add-repository");
args.add("https://maven.minecraftforge.net/");

try {
getLogger().error("{}", args);
run(args);
} finally {
reportProblems(problemsReport);
Expand Down
Loading