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

Simplify Env #16

Merged
owlsys merged 3 commits from TheKodeToad/simplify-env into main 2024-09-02 12:33:40 -04:00
Conversation 0 Commits 3 Files changed 3 +7 -17
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/dev/frogmc/frogloader/api/env/Env.java vendored
View file

@ -15,31 +15,21 @@ public enum Env {
/** /**
* The physical client environment * The physical client environment
*/ */
CLIENT("CLIENT", "client"), CLIENT("client"),
/** /**
* The physical (dedicated) server environment * The physical (dedicated) server environment
*/ */
SERVER("SERVER", "server") SERVER("server");
;
private final String mixinName, identifier; private final String id;
/**
* Get this environment's name, in the format Mixin understands.
*
* @return This environment's mixin name
*/
public String getMixinName() {
return this.mixinName;
}
/** /**
* Get this environment's identifier * Get this environment's identifier
* *
* @return This environment's identifier * @return This environment's identifier
*/ */
public String getIdentifier() { public String getId() {
return this.identifier; return this.id;
} }
/** /**

2
src/main/java/dev/frogmc/frogloader/impl/mixin/FrogMixinService.java
View file

@ -120,7 +120,7 @@ public class FrogMixinService implements IMixinService, IClassProvider, IClassBy
@Override @Override
public String getSideName() { public String getSideName() {
return FrogLauncher.getInstance().getEnv().getMixinName(); return FrogLauncher.getInstance().getEnv().name();
} }
kode marked this conversation as resolved Outdated
owlsys commented 2024-09-02 12:24:00 -04:00
Outdated
Review
Copy link

did you test that this still works?

did you test that this still works?
kode commented 2024-09-02 12:27:04 -04:00
Outdated
Review
Copy link

It launches

It launches
@Override @Override

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

@ -53,7 +53,7 @@ public class MinecraftGamePlugin implements GamePlugin {
} }
try (FileSystem fs = FileSystems.newFileSystem(jar)) { try (FileSystem fs = FileSystems.newFileSystem(jar)) {
for (String n : MINECRAFT_CLASSES) { for (String n : MINECRAFT_CLASSES) {
if (Files.exists(fs.getPath(n)) && n.contains(FrogLoaderImpl.getInstance().getEnv().getIdentifier())) { if (Files.exists(fs.getPath(n)) && n.contains(FrogLoaderImpl.getInstance().getEnv().getId())) {
LOGGER.info("Found game: {}", jar); LOGGER.info("Found game: {}", jar);
foundMainClass = n.substring(0, n.length() - 6).replace("/", "."); foundMainClass = n.substring(0, n.length() - 6).replace("/", ".");
try { try {