Merge pull request 'Simplify Env' (#16) from TheKodeToad/simplify-env into main

Reviewed-on: #16

src/main/java/dev/frogmc/frogloader/api/env/Env.java

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

src/main/java/dev/frogmc/frogloader/impl/mixin/FrogMixinService.java

@@ -120,7 +120,7 @@ public class FrogMixinService implements IMixinService, IClassProvider, IClassBy
 
 	@Override
 	public String getSideName() {
-		return FrogLauncher.getInstance().getEnv().getMixinName();
+		return FrogLauncher.getInstance().getEnv().name();
 	}
 
 	@Override

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

@@ -53,7 +53,7 @@ public class MinecraftGamePlugin implements GamePlugin {
 		}
 		try (FileSystem fs = FileSystems.newFileSystem(jar)) {
 			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);
 					foundMainClass = n.substring(0, n.length() - 6).replace("/", ".");
 					try {