mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-11-15 19:49:11 +03:00
Compare commits
No commits in common. "51411c5838e9ad348dbe1eddf3d3b7c0bffb490c" and "7f6a645dd7ceea7502575a18ee05152ffdf1893c" have entirely different histories.
51411c5838
...
7f6a645dd7
7 changed files with 21 additions and 28 deletions
|
@ -61,6 +61,7 @@
|
|||
dependsOn jar
|
||||
archiveClassifier.set('clean')
|
||||
manifest.attributes("Main-Class": mainClassName,
|
||||
"Premain-Class": mainAgentName,
|
||||
"Automatic-Module-Name": "launchserver"
|
||||
)
|
||||
from sourceSets.main.output
|
||||
|
@ -70,6 +71,7 @@
|
|||
dependencies {
|
||||
pack project(':LauncherAPI')
|
||||
bundle group: 'me.tongfei', name: 'progressbar', version: '0.10.1'
|
||||
bundle group: 'com.github.Marcono1234', name: 'gson-record-type-adapter-factory', version: 'v0.3.0'
|
||||
bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi']
|
||||
bundle group: 'org.jline', name: 'jline', version: rootProject['verJline']
|
||||
bundle group: 'org.jline', name: 'jline-reader', version: rootProject['verJline']
|
||||
|
@ -94,12 +96,17 @@ pack project(':LauncherAPI')
|
|||
annotationProcessor(group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j'])
|
||||
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
|
||||
|
||||
hikari 'io.micrometer:micrometer-core:1.13.1'
|
||||
hikari('com.zaxxer:HikariCP:5.1.0') {
|
||||
hikari 'io.micrometer:micrometer-core:1.8.4'
|
||||
hikari('com.zaxxer:HikariCP:5.0.1') {
|
||||
exclude group: 'javassist'
|
||||
exclude group: 'io.micrometer'
|
||||
exclude group: 'org.slf4j'
|
||||
}
|
||||
|
||||
compileOnlyA group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC']
|
||||
// Do not update (laggy deps).
|
||||
compileOnlyA 'log4j:log4j:1.2.17'
|
||||
compileOnlyA 'org.apache.logging.log4j:log4j-core:2.14.1'
|
||||
}
|
||||
|
||||
tasks.register('hikari', Copy) {
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
import java.nio.file.Path;
|
||||
import java.security.Security;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class LaunchServerStarter {
|
||||
|
@ -136,24 +135,7 @@ public static void main(String[] args) throws Exception {
|
|||
.setLaunchServerConfigManager(launchServerConfigManager)
|
||||
.setCertificateManager(certificateManager)
|
||||
.build();
|
||||
List<String> allArgs = List.of(args);
|
||||
boolean isPrepareMode = prepareMode || allArgs.contains("--prepare");
|
||||
boolean isRunCommand = false;
|
||||
String runCommand = null;
|
||||
for(var e : allArgs) {
|
||||
if(e.equals("--run")) {
|
||||
isRunCommand = true;
|
||||
continue;
|
||||
}
|
||||
if(isRunCommand) {
|
||||
runCommand = e;
|
||||
isRunCommand = false;
|
||||
}
|
||||
}
|
||||
if(runCommand != null) {
|
||||
localCommandHandler.eval(runCommand, false);
|
||||
}
|
||||
if (!isPrepareMode) {
|
||||
if (!prepareMode) {
|
||||
server.run();
|
||||
} else {
|
||||
server.close();
|
||||
|
|
|
@ -196,9 +196,6 @@ public static String getMainClassByVersion(ClientProfile.Version version, MakePr
|
|||
if(version.compareTo(ClientProfileVersions.MINECRAFT_1_7_10) == 0) {
|
||||
return "com.gtnewhorizons.retrofuturabootstrap.Main";
|
||||
}
|
||||
if(version.compareTo(ClientProfileVersions.MINECRAFT_1_12_2) == 0) {
|
||||
return "top.outlands.foundation.boot.Foundation"; // Cleanroom
|
||||
}
|
||||
if (findOption(options, MakeProfileOptionLaunchWrapper.class).isPresent()) {
|
||||
return "net.minecraft.launchwrapper.Launch";
|
||||
}
|
||||
|
@ -206,7 +203,7 @@ public static String getMainClassByVersion(ClientProfile.Version version, MakePr
|
|||
return "cpw.mods.modlauncher.Launcher";
|
||||
}
|
||||
if (findOption(options, MakeProfileOptionFabric.class).isPresent()) {
|
||||
return "net.fabricmc.loader.impl.launch.knot.KnotClient";
|
||||
return "net.fabricmc.loader.launch.knot.KnotClient";
|
||||
}
|
||||
if(findOption(options, MakeProfilesOptionsQuilt.class).isPresent()) {
|
||||
return "org.quiltmc.loader.impl.launch.knot.KnotClient";
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package pro.gravit.launchserver.manangers;
|
||||
|
||||
import com.google.gson.GsonBuilder;
|
||||
import marcono1234.gson.recordadapter.RecordTypeAdapterFactory;
|
||||
import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
|
||||
import pro.gravit.launcher.core.managers.GsonManager;
|
||||
import pro.gravit.launcher.base.modules.events.PreGsonPhase;
|
||||
|
@ -33,6 +34,9 @@ public LaunchServerGsonManager(LaunchServerModulesManager modulesManager) {
|
|||
@Override
|
||||
public void registerAdapters(GsonBuilder builder) {
|
||||
super.registerAdapters(builder);
|
||||
builder.registerTypeAdapterFactory(RecordTypeAdapterFactory.builder()
|
||||
.allowMissingComponentValues()
|
||||
.create());
|
||||
builder.registerTypeAdapter(ClientProfile.Version.class, new ClientProfile.Version.GsonSerializer());
|
||||
builder.registerTypeAdapter(TextureProvider.class, new UniversalJsonAdapter<>(TextureProvider.providers));
|
||||
builder.registerTypeAdapter(AuthCoreProvider.class, new UniversalJsonAdapter<>(AuthCoreProvider.providers));
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
compileOnly group: 'org.jline', name: 'jline', version: rootProject['verJline']
|
||||
compileOnly group: 'org.jline', name: 'jline-reader', version: rootProject['verJline']
|
||||
compileOnly group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline']
|
||||
compileOnly group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: rootProject['verBcprov']
|
||||
compileOnly group: 'org.slf4j', name: 'slf4j-api', version: rootProject['verSlf4j']
|
||||
api group: 'com.google.code.gson', name: 'gson', version: rootProject['verGson']
|
||||
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
|
||||
|
|
2
modules
2
modules
|
@ -1 +1 @@
|
|||
Subproject commit cd2e4cbcec932601e4f6814b92da5ee9edf9f8dc
|
||||
Subproject commit a52b9cc8552445167b95e8933f4289bbaa70677d
|
|
@ -1,16 +1,18 @@
|
|||
project.ext {
|
||||
verAsm = '9.7'
|
||||
verNetty = '4.1.111.Final'
|
||||
verNetty = '4.1.110.Final'
|
||||
verOshiCore = '6.6.1'
|
||||
verJunit = '5.10.2'
|
||||
verGuavaC = '30.1.1-jre'
|
||||
verJansi = '2.4.1'
|
||||
verJline = '3.26.1'
|
||||
verJwt = '0.12.5'
|
||||
verBcprov = '1.70'
|
||||
verGson = '2.11.0'
|
||||
verBcpkix = '1.78.1'
|
||||
verSlf4j = '2.0.13'
|
||||
verLog4j = '2.23.1'
|
||||
verMySQLConn = '9.0.0'
|
||||
verMySQLConn = '8.4.0'
|
||||
verMariaDBConn = '3.4.0'
|
||||
verPostgreSQLConn = '42.7.3'
|
||||
verH2Conn = '2.2.224'
|
||||
|
|
Loading…
Reference in a new issue