Skip to content

Support Split Dist #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
vfyjxf wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Support Split Dist #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gradleutils_version=5.0.1

test_neoforge_version=26.1.0.5-beta
test_neoforge_version=26.1.2.29-beta
test_minecraft_version=26.1

mergetool_version=2.0.0
Expand Down
7 changes: 5 additions & 2 deletions loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/GameLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,12 @@ private static List<JarContents.FilteredPath> getMinecraftResourcesRoots(ILaunch
result.add(buildFilteredMinecraftResourcesFilteredPath(commonResources, context.getRequiredDistribution(), systemFiles));

if (clientResources != null && clientResources != commonResources) {
result.add(buildFilteredMinecraftResourcesFilteredPath(clientResources, context.getRequiredDistribution(), systemFiles));
JarContents.PathFilter pathFilter = null;
if (systemFiles.getClassesRoots().contains(clientResources)) {
pathFilter = relativePath -> !relativePath.endsWith(".class");
}
result.add(new JarContents.FilteredPath(clientResources.getPrimaryPath(), pathFilter));
}

return result;
}

Expand Down
2 changes: 1 addition & 1 deletion ...er/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/RequiredSystemFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ final class RequiredSystemFiles implements AutoCloseable {
static final String COMMON_CLASS = "net/minecraft/DetectedVersion.class";
static final String CLIENT_CLASS = "net/minecraft/client/Minecraft.class";
static final String COMMON_RESOURCE_ROOT = "data/.mcassetsroot";
static final String CLIENT_RESOURCE_ROOT = "assets/.mcassetsroot";
static final String CLIENT_RESOURCE_ROOT = "pack.png";//TODO:find a better solution
static final String NEOFORGE_COMMON_CLASS = "net/neoforged/neoforge/common/NeoForgeMod.class";
static final String NEOFORGE_CLIENT_CLASS = "net/neoforged/neoforge/client/ClientNeoForgeMod.class";
private JarContents commonClasses;
Expand Down
7 changes: 5 additions & 2 deletions tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ plugins {

sourceSets {
moddevTest
moddevTestClient
}

neoForge {
enable {
version = test_neoforge_version
enabledSourceSets = [sourceSets.moddevTest]
splitDist = true
enabledSourceSets = [sourceSets.moddevTest,sourceSets.moddevTestClient]
}
addModdingDependenciesTo(sourceSets.moddevTestClient, true)
runs {
client {
client()
gameDirectory = file("build/runs/client")
sourceSet = sourceSets.moddevTest
sourceSet = sourceSets.moddevTestClient
}
server {
server()
Expand Down
Loading