Separated client/server code for icons

Author: Faboslav

common/src/main/java/com/faboslav/structurify/common/platform/PlatformHelper.java

@@ -1,12 +1,5 @@
 package com.faboslav.structurify.common.platform;
 
-import com.faboslav.structurify.common.Structurify;
-import com.mojang.blaze3d.platform.NativeImage;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.DynamicTexture;
-
-import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,33 +16,5 @@ public interface PlatformHelper
 	String getModVersion();
 
 	Path getConfigDirectory();
-
-	default Optional<ModIconInfo> getModIconInfo(String id, Optional<String> iconPath, Optional<Path> path) {
-		try(var stream = Files.newInputStream(path.orElseThrow())) {
-			return getModIconInfo(id, iconPath, stream);
-		} catch(Exception exception) {
-			return Optional.empty();
-		}
-	}
-
-	default Optional<ModIconInfo> getModIconInfo(String id, Optional<String> iconPath, InputStream stream) {
-		try {
-			var image = NativeImage.read(stream);
-			var width = image.getWidth();
-			var height = image.getHeight();
-			//? if >= 1.21.5 {
-			var texture = new DynamicTexture(() -> "mod_icon/" + id, image);
-			//?} else {
-			/*var texture = new DynamicTexture(image);
-			 *///?}
-			var textureId = Structurify.makeId(id, iconPath.get());
-			Minecraft.getInstance()
-				.getTextureManager()
-				.register(textureId, texture);
-			return Optional.of(new ModIconInfo(textureId, width, height));
-		} catch(Exception exception) {
-			return Optional.empty();
-		}
-	}
 }
 

common/src/main/java/com/faboslav/structurify/common/util/FileUtil.java

@@ -0,0 +1,43 @@
+package com.faboslav.structurify.common.util;
+
+import com.faboslav.structurify.common.Structurify;
+import com.faboslav.structurify.common.platform.ModIconInfo;
+import com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+public class FileUtil
+{
+	public static Optional<ModIconInfo> getModIconInfo(String id, Optional<String> iconPath, Optional<Path> path) {
+		try(var stream = Files.newInputStream(path.orElseThrow())) {
+			return getModIconInfo(id, iconPath, stream);
+		} catch(Exception exception) {
+			return Optional.empty();
+		}
+	}
+
+	public static Optional<ModIconInfo> getModIconInfo(String id, Optional<String> iconPath, InputStream stream) {
+		try {
+			var image = NativeImage.read(stream);
+			var width = image.getWidth();
+			var height = image.getHeight();
+			//? if >= 1.21.5 {
+			var texture = new DynamicTexture(() -> "mod_icon/" + id, image);
+			//?} else {
+			/*var texture = new DynamicTexture(image);
+			 *///?}
+			var textureId = Structurify.makeId(id, iconPath.get());
+			Minecraft.getInstance()
+				.getTextureManager()
+				.register(textureId, texture);
+			return Optional.of(new ModIconInfo(textureId, width, height));
+		} catch(Exception exception) {
+			return Optional.empty();
+		}
+	}
+}

fabric/src/main/java/com/faboslav/structurify/fabric/platform/FabricPlatformHelper.java

@@ -3,6 +3,7 @@
 import com.faboslav.structurify.common.Structurify;
 import com.faboslav.structurify.common.platform.ModIconInfo;
 import com.faboslav.structurify.common.platform.PlatformHelper;
+import com.faboslav.structurify.common.util.FileUtil;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.nio.file.Path;
@@ -30,7 +31,7 @@ public Optional<ModIconInfo> getModIconInfo(String modId) {
 				return Optional.empty();
 			}
 
-			return getModIconInfo(id, iconPath, modContainer.get().findPath(iconPath.get()));
+			return FileUtil.getModIconInfo(id, iconPath, modContainer.get().findPath(iconPath.get()));
 		});
 	}
 

forge/src/main/java/com/faboslav/structurify/forge/platform/ForgePlatformHelper.java

@@ -8,6 +8,7 @@
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLPaths;
+import com.faboslav.structurify.common.util.FileUtil;
 
 import javax.annotation.Nullable;
 import java.nio.file.Files;
@@ -35,7 +36,7 @@ public Optional<ModIconInfo> getModIconInfo(String modId) {
 				return Optional.empty();
 			}
 
-			return getModIconInfo(id, iconPath, Optional.of(modContainer.get().getModInfo().getOwningFile().getFile().findResource(iconPath.get())));
+			return FileUtil.getModIconInfo(id, iconPath, Optional.of(modContainer.get().getModInfo().getOwningFile().getFile().findResource(iconPath.get())));
 		});
 	}
 

neoforge/src/main/java/com/faboslav/structurify/neoforge/platform/NeoForgePlatformHelper.java

@@ -3,6 +3,7 @@
 import com.faboslav.structurify.common.Structurify;
 import com.faboslav.structurify.common.platform.ModIconInfo;
 import com.faboslav.structurify.common.platform.PlatformHelper;
+import com.faboslav.structurify.common.util.FileUtil;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLPaths;
 import org.jetbrains.annotations.Nullable;
@@ -36,12 +37,12 @@ public Optional<ModIconInfo> getModIconInfo(String modId) {
 
 			//? if >= 1.21.10 {
 			try {
-				return getModIconInfo(id, iconPath, modContainer.get().getModInfo().getOwningFile().getFile().getContents().openFile(iconPath.get()));
+				return FileUtil.getModIconInfo(id, iconPath, modContainer.get().getModInfo().getOwningFile().getFile().getContents().openFile(iconPath.get()));
 			} catch (IOException e) {
 				return Optional.empty();
 			}
 			//?} else {
-			/*return getModIconInfo(id, iconPath, Optional.of(modContainer.get().getModInfo().getOwningFile().getFile().findResource(iconPath.get())));
+			/*return FileUtil.getModIconInfo(id, iconPath, Optional.of(modContainer.get().getModInfo().getOwningFile().getFile().findResource(iconPath.get())));
 			*///?}
 		});
 	}