Skip to content

Commit 7c53939

Browse files
authored
Revert to old run config template code. (#1327)
1 parent 7a465a8 commit 7c53939

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.util.Map;
3939
import java.util.Objects;
4040
import java.util.Set;
41-
import java.util.regex.Pattern;
4241
import java.util.stream.Collectors;
4342

4443
import com.google.gson.JsonElement;
@@ -62,8 +61,6 @@
6261
import net.fabricmc.loom.util.gradle.SourceSetReference;
6362

6463
public class RunConfig {
65-
private static final Pattern VARIABLE = Pattern.compile("%[A-Z_]+%");
66-
6764
public String configName;
6865
public String eclipseProjectName;
6966
public String ideaModuleName;
@@ -178,20 +175,18 @@ public String fromDummy(String dummy, boolean relativeDir, Project project) thro
178175
runDir = relativePath + "/" + runDir;
179176
}
180177

181-
var replacements = Map.of(
182-
"%NAME%", configName,
183-
"%MAIN_CLASS%", mainClass,
184-
"%ECLIPSE_PROJECT%", eclipseProjectName,
185-
"%IDEA_MODULE%", ideaModuleName,
186-
"%RUN_DIRECTORY%", runDir,
187-
"%PROGRAM_ARGS%", joinArguments(programArgs).replaceAll("\"", """),
188-
"%VM_ARGS%", joinArguments(vmArgs).replaceAll("\"", """),
189-
"%IDEA_ENV_VARS%", getEnvVars("<env name=\"%s\" value=\"%s\"/>"),
190-
"%ECLIPSE_ENV_VARS%", getEnvVars("<mapEntry key=\"%s\" value=\"%s\"/>"),
191-
"%IDEA_FOLDER_NAME%", folderName == null ? "" : "folderName=\"" + XmlUtil.escapeXml(folderName) + "\""
192-
);
193-
194-
return VARIABLE.matcher(dummyConfig).replaceAll(x -> replacements.getOrDefault(x.group(), ""));
178+
dummyConfig = dummyConfig.replace("%NAME%", configName);
179+
dummyConfig = dummyConfig.replace("%MAIN_CLASS%", mainClass);
180+
dummyConfig = dummyConfig.replace("%ECLIPSE_PROJECT%", eclipseProjectName);
181+
dummyConfig = dummyConfig.replace("%IDEA_MODULE%", ideaModuleName);
182+
dummyConfig = dummyConfig.replace("%RUN_DIRECTORY%", runDir);
183+
dummyConfig = dummyConfig.replace("%PROGRAM_ARGS%", joinArguments(programArgs).replaceAll("\"", "&quot;"));
184+
dummyConfig = dummyConfig.replace("%VM_ARGS%", joinArguments(vmArgs).replaceAll("\"", "&quot;"));
185+
dummyConfig = dummyConfig.replace("%IDEA_ENV_VARS%", getEnvVars("<env name=\"%s\" value=\"%s\"/>"));
186+
dummyConfig = dummyConfig.replace("%ECLIPSE_ENV_VARS%", getEnvVars("<mapEntry key=\"%s\" value=\"%s\"/>"));
187+
dummyConfig = dummyConfig.replace("%IDEA_FOLDER_NAME%", folderName == null ? "" : "folderName=\"" + XmlUtil.escapeXml(folderName) + "\"");
188+
189+
return dummyConfig;
195190
}
196191

197192
private String getEnvVars(String pattern) {

0 commit comments

Comments
 (0)