Skip to content

Commit

Permalink
Add the ability to merge launcher profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
marchermans committed Aug 12, 2024
1 parent 47be513 commit 308bf85
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .run/Attach to Gradle Debugger.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Attach to Gradle Debugger" type="Remote" focusToolWindowBeforeRun="true">
<module name="NeoGradle.userdev.main" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5005" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,38 @@ import org.gradle.api.tasks.Optional

import javax.inject.Inject
import java.lang.reflect.Type
import java.util.function.BiFunction

import static net.neoforged.gradle.dsl.common.util.PropertyUtils.*

@CompileStatic
abstract class LauncherProfile implements ConfigurableDSLElement<LauncherProfile> {

public static LauncherProfile merge(
final ObjectFactory factory,
final LauncherProfile left,
final LauncherProfile right
) {
final LauncherProfile result = factory.newInstance(LauncherProfile.class)

result.id.set(right.id.orElse(left.id))
result.time.set(right.id.orElse(left.time))
result.releaseTime.set(right.releaseTime.orElse(left.releaseTime))
result.type.set(right.type.orElse(left.type))
result.mainClass.set(right.mainClass.orElse(left.mainClass))
result.minimumLauncherVersion.set(right.minimumLauncherVersion.orElse(left.minimumLauncherVersion))
result.inheritsFrom.set("") //We force this to be empty
result.arguments.set(Arguments.merge(factory, left.arguments.get(), right.arguments.get()))
result.assetIndex.set(right.assetIndex.orElse(left.assetIndex))
result.assets.set(right.assets.orElse(left.assets))
result.complianceLevel.set(right.complianceLevel.orElse(left.complianceLevel))




return result
}

@Inject
public LauncherProfile(ObjectFactory factory) {
this.getArguments().set(factory.newInstance(Arguments.class))
Expand Down Expand Up @@ -186,6 +212,21 @@ abstract class LauncherProfile implements ConfigurableDSLElement<LauncherProfile
@CompileStatic
abstract static class Arguments implements ConfigurableDSLElement<Arguments> {

static Arguments merge(ObjectFactory objectFactory, Arguments left, Arguments right) {
final Arguments result = objectFactory.newInstance(Arguments.class)

result.game.set(left.game.zip(right.game, this::merge))
result.JVM.set(left.JVM.zip(right.JVM, this::merge))

return result
}

static List<Argument> merge(List<Argument> left, List<Argument> right) {
final List<Argument> result = new ArrayList<>(left)
result.addAll(right)
return result
}

@Inject
abstract ObjectFactory getObjectFactory();

Expand Down

0 comments on commit 308bf85

Please sign in to comment.