frogmc/FrogLoader
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into TheKodeToad/extension-namespace

Browse source
This commit is contained in:
TheKodeToad 2024-09-02 12:08:13 -04:00
parent 7e2c29b359 aeb621d704
commit c84e2c0a9e
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -7,7 +7,7 @@ plugins {
} }
group = "dev.frogmc" group = "dev.frogmc"
version = "0.0.1-alpha.27" version = "0.0.1-alpha.29"
repositories { repositories {
maven { maven {

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
#Sat May 11 16:50:23 CEST 2024 #Sat May 11 16:50:23 CEST 2024
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

25
src/main/java/dev/frogmc/frogloader/impl/plugin/game/minecraft/MinecraftGamePlugin.java
View file

@ -26,7 +26,7 @@ import dev.frogmc.frogloader.impl.mod.ModPropertiesImpl;
import dev.frogmc.frogloader.impl.util.SystemProperties; import dev.frogmc.frogloader.impl.util.SystemProperties;
import dev.frogmc.thyroxine.HttpHelper; import dev.frogmc.thyroxine.HttpHelper;
import dev.frogmc.thyroxine.Thyroxine; import dev.frogmc.thyroxine.Thyroxine;
import dev.frogmc.thyroxine.api.data.MappingBundle; import dev.frogmc.thyroxine.api.data.MappingData;
import dev.frogmc.thyroxine.parser.tiny.TinyV2Parser; import dev.frogmc.thyroxine.parser.tiny.TinyV2Parser;
import dev.frogmc.thyroxine.provider.MojmapProvider; import dev.frogmc.thyroxine.provider.MojmapProvider;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -135,7 +135,7 @@ public class MinecraftGamePlugin implements GamePlugin {
if (!loader.isDevelopment()) { if (!loader.isDevelopment()) {
if (!Files.exists(remappedGamePath)) { if (!Files.exists(remappedGamePath)) {
LOGGER.atInfo().setMessage("Remapping game, this may take a moment...").log(); LOGGER.atInfo().setMessage("Remapping game, this may take a moment...").log();
MappingBundle mappings; MappingData mappings;
String mappingPath = System.getProperty(SystemProperties.INTERMEDIARY_MAPPINGS); String mappingPath = System.getProperty(SystemProperties.INTERMEDIARY_MAPPINGS);
try { try {
if (mappingPath != null) { if (mappingPath != null) {
@ -143,7 +143,7 @@ public class MinecraftGamePlugin implements GamePlugin {
} else { } else {
try { try {
mappings = MojmapProvider.get(version, remappedGamePath.resolveSibling("client-" + version + ".txt")) mappings = MojmapProvider.get(version, remappedGamePath.resolveSibling("client-" + version + ".txt"))
.reverse(); .flattenData().reverse();
} catch (NullPointerException e) { // NPE is only thrown if the mappings for this version can't be found } catch (NullPointerException e) { // NPE is only thrown if the mappings for this version can't be found
LOGGER.info("Mojmap is not available for version {}, using ornithe's calamus as a fallback!", version); LOGGER.info("Mojmap is not available for version {}, using ornithe's calamus as a fallback!", version);
Path file = remappedGamePath.resolveSibling("calamus-"+version+".tiny"); Path file = remappedGamePath.resolveSibling("calamus-"+version+".tiny");
@ -155,30 +155,29 @@ public class MinecraftGamePlugin implements GamePlugin {
location.replaceAll("[.:]", "/")+"/"+groups[1]+"-"+groups[2]+".jar"), location.replaceAll("[.:]", "/")+"/"+groups[1]+"-"+groups[2]+".jar"),
file); file);
} }
mappings = TinyV2Parser.parse(Files.readString(file)); mappings = TinyV2Parser.parse(Files.readString(file)).flattenData();
} }
} }
if (mappings == null) { if (mappings == null) {
mappings = readIntemediaryMappings("/mappings/mappings.tiny"); mappings = readIntemediaryMappings("/mappings/mappings.tiny");
} }
if (mappings != null) { if (mappings != null) {
Thyroxine.remap(mappings.flattenData(), gamePath, remappedGamePath, true, false); Thyroxine.remap(mappings, gamePath, remappedGamePath, true, false);
return; } else {
}
} catch (Exception e) {
throw new IllegalStateException("Failed to remap game: ", e);
}
runtimePath = gamePath; runtimePath = gamePath;
LOGGER.error("No intermediary mappings found! The game will be launched obfuscated. Mods are likely to error! " + LOGGER.error("No intermediary mappings found! The game will be launched obfuscated. Mods are likely to error! " +
"You may need to specify the path of your mappings manually. " + "You may need to specify the path of your mappings manually. " +
"Use -D" + SystemProperties.INTERMEDIARY_MAPPINGS + " to specify a file!"); "Use -D" + SystemProperties.INTERMEDIARY_MAPPINGS + " to specify a file!");
} }
} catch (Exception e) {
throw new IllegalStateException("Failed to remap game: ", e);
}
}
} }
FrogLoaderImpl.getInstance().getClassloader().addURL(runtimePath.toUri().toURL()); FrogLoaderImpl.getInstance().getClassloader().addURL(runtimePath.toUri().toURL());
} }
private MappingBundle readIntemediaryMappings(String path) throws IOException { private MappingData readIntemediaryMappings(String path) throws IOException {
URL resource = this.getClass().getResource(path); URL resource = this.getClass().getResource(path);
String data; String data;
if (resource != null) { if (resource != null) {
@ -187,7 +186,7 @@ public class MinecraftGamePlugin implements GamePlugin {
data = Files.readString(Paths.get(path)); data = Files.readString(Paths.get(path));
} }
try { try {
MappingBundle mappings = TinyV2Parser.parse(data); MappingData mappings = TinyV2Parser.parse(data).flattenData();
LOGGER.warn("Using non-standard intermediary mappings! Mods may not work!"); LOGGER.warn("Using non-standard intermediary mappings! Mods may not work!");
return mappings; return mappings;
} catch (IllegalStateException e) { } catch (IllegalStateException e) {