File tree Expand file tree Collapse file tree 2 files changed +31
-3
lines changed
src/main/java/net/minecraftforge/gradle/user/patcherUser/forge Expand file tree Collapse file tree 2 files changed +31
-3
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ public class ForgeExtension extends UserBaseExtension
2020{
2121 protected ForgeVersion forgeJson ;
2222 private String forgeVersion ;
23+ private String coreMod = null ;
2324
2425 public ForgeExtension (UserBasePlugin <ForgeExtension > plugin )
2526 {
@@ -34,7 +35,7 @@ public String getForgeVersion()
3435 public void setForgeVersion (String forgeVersion )
3536 {
3637 checkAndSetVersion (forgeVersion );
37-
38+
3839 TokenReplacer .putReplacement (Constants .REPLACE_MC_VERSION , version );
3940
4041 mcpVersion = MCP_VERSION_MAP .get (version );
@@ -210,4 +211,14 @@ private boolean getFromBuildNumber(Integer num)
210211 return false ;
211212 }
212213
214+ public String getCoreMod ()
215+ {
216+ return coreMod ;
217+ }
218+
219+ public void setCoreMod (String coreMod )
220+ {
221+ this .coreMod = coreMod ;
222+ }
223+
213224}
Original file line number Diff line number Diff line change @@ -53,6 +53,11 @@ protected void afterEvaluate()
5353 {
5454 JavaPluginConvention javaConv = (JavaPluginConvention ) project .getConvention ().getPlugins ().get ("java" );
5555 Jar jarTask = (Jar ) project .getTasks ().getByName ("jar" );
56+
57+ if (!Strings .isNullOrEmpty (ext .getCoreMod ()))
58+ {
59+ jarTask .getManifest ().getAttributes ().put ("FMLCorePlugin" , ext .getCoreMod ());
60+ }
5661
5762 TaskSingleReobf reobfTask = ((TaskSingleReobf ) project .getTasks ().getByName (UserConstants .TASK_REOBF ));
5863 reobfTask .setClasspath (javaConv .getSourceSets ().getByName ("main" ).getCompileClasspath ());
@@ -140,12 +145,24 @@ protected List<String> getServerRunArgs(ForgeExtension ext)
140145 @ Override
141146 protected List <String > getClientJvmArgs (ForgeExtension ext )
142147 {
143- return ext .getResolvedClientJvmArgs ();
148+ List <String > out = ext .getResolvedClientJvmArgs ();
149+ if (!Strings .isNullOrEmpty (ext .getCoreMod ()))
150+ {
151+ out .add ("-Dfml.coreMods.load" );
152+ out .add (ext .getCoreMod ());
153+ }
154+ return out ;
144155 }
145156
146157 @ Override
147158 protected List <String > getServerJvmArgs (ForgeExtension ext )
148159 {
149- return ext .getResolvedServerJvmArgs ();
160+ List <String > out = ext .getResolvedServerJvmArgs ();
161+ if (!Strings .isNullOrEmpty (ext .getCoreMod ()))
162+ {
163+ out .add ("-Dfml.coreMods.load" );
164+ out .add (ext .getCoreMod ());
165+ }
166+ return out ;
150167 }
151168}
You can’t perform that action at this time.
0 commit comments