Skip to content

server data model attempts to parse out the forge loader version #23

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

Open
wants to merge 1 commit into
base: MCU4-Refactor
Choose a base branch
from
Open

server data model attempts to parse out the forge loader version #23

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
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
}

version = sharedVersion
sourceCompatibility = 16

dependencies {
implementation project(':MCU-DownloadLib')
Expand Down
26 changes: 24 additions & 2 deletions src/main/java/org/mcupdater/model/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import org.mcupdater.api.Version;
import org.mcupdater.util.ServerPackParser;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import java.util.*;

Expand All @@ -15,6 +17,7 @@ public abstract class Server implements Comparable<Server>, IPackElement{
String iconUrl;
String version; // minecraft version
String mcuVersion; // minimum version of MCU required to use this pack
String loaderVersion; // forge (or other loader) version, used when launching the pack
String address;
boolean generateList = true;
boolean autoConnect = true;
Expand All @@ -34,7 +37,8 @@ public static void fromElement(String mcuVersion, String serverUrl, Element docE
newSL.setName(docEle.getAttribute("name"));
newSL.setNewsUrl(docEle.getAttribute("newsUrl"));
newSL.setIconUrl(docEle.getAttribute("iconUrl"));
newSL.setVersion(docEle.getAttribute("version"));
final String mcVersion = docEle.getAttribute("version");
newSL.setVersion(mcVersion);
newSL.setAddress(docEle.getAttribute("serverAddress"));
newSL.setGenerateList(ServerPackParser.parseBoolean(docEle.getAttribute("generateList"), true));
newSL.setAutoConnect(ServerPackParser.parseBoolean(docEle.getAttribute("autoConnect"), true));
Expand All @@ -43,7 +47,21 @@ public static void fromElement(String mcuVersion, String serverUrl, Element docE
newSL.setMainClass(docEle.getAttribute("mainClass"));
newSL.setServerClass(docEle.getAttribute("serverClass"));
if (docEle.hasAttribute("launcherType")) {
newSL.setLauncherType(docEle.getAttribute("launcherType"));
final String launcherType = docEle.getAttribute("launcherType");
newSL.setLauncherType(launcherType);
// determine if we have a <Launcher/> child to parse a version number out of...
// NB: do this the hard way for now - is only going to work for forge atm
final NodeList nodes = docEle.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) {
final Node node = nodes.item(i);
if (node.getNodeName().equals("Loader") && node.getAttributes().getNamedItem("type").getNodeValue().equals(launcherType)) {
final String loaderVersion = node.getAttributes().getNamedItem("version").getNodeValue();
if (loaderVersion.contains("-")) {
int idx = loaderVersion.lastIndexOf("-");
newSL.loaderVersion = mcVersion + "-" + launcherType.toLowerCase() + loaderVersion.substring(idx);
}
}
}
} else {
if (Version.requestedFeatureLevel(mcuVersion,"3")) {
newSL.setLauncherType("Vanilla");
Expand Down Expand Up @@ -94,6 +112,10 @@ public String getVersion() {
return version;
}

public String getLoaderVersion() {
return loaderVersion;
}

public void setVersion(String version) {
this.version = version;
}
Expand Down