Using latest fabric API

This commit is contained in:
Frank 2021-11-03 15:44:25 +01:00
parent 3efa71b08a
commit b7c83923ea
2 changed files with 12 additions and 9 deletions

View file

@ -7,8 +7,8 @@ loom_version=0.8-SNAPSHOT
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/versions.html # check these on https://fabricmc.net/versions.html
minecraft_version= 1.17.1 minecraft_version= 1.17.1
loader_version= 0.11.6 loader_version= 0.12.4
fabric_version = 0.39.1+1.17 fabric_version = 0.41.3+1.17
# Mod Properties # Mod Properties
mod_version = 0.4.2 mod_version = 0.4.2

View file

@ -5,17 +5,18 @@ import net.fabricmc.loader.api.ModContainer;
import net.fabricmc.loader.api.SemanticVersion; import net.fabricmc.loader.api.SemanticVersion;
import net.fabricmc.loader.api.Version; import net.fabricmc.loader.api.Version;
import net.fabricmc.loader.api.metadata.ModMetadata; import net.fabricmc.loader.api.metadata.ModMetadata;
import net.fabricmc.loader.metadata.ModMetadataParser; import net.fabricmc.loader.impl.metadata.ModMetadataParser;
import net.fabricmc.loader.metadata.ParseMetadataException;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import ru.bclib.BCLib; import ru.bclib.BCLib;
import java.io.IOException; import java.io.InputStream;
import java.net.URI; import java.net.URI;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
import java.nio.file.FileSystems; import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -55,15 +56,17 @@ public class ModUtil {
try { try {
Path modMetaFile = fs.getPath("fabric.mod.json"); Path modMetaFile = fs.getPath("fabric.mod.json");
if (modMetaFile != null) { if (modMetaFile != null) {
ModMetadata mc = ModMetadataParser.parseMetadata(logger, modMetaFile); try (InputStream is = Files.newInputStream(modMetaFile)) {
mods.put(mc.getId(), new ModInfo(mc, file)); ModMetadata mc = ModMetadataParser.parseMetadata(is, uri.toString(), new LinkedList<String>());
mods.put(mc.getId(), new ModInfo(mc, file));
}
} }
} catch (ParseMetadataException e) { } catch (Exception e) {
BCLib.LOGGER.error(e.getMessage()); BCLib.LOGGER.error(e.getMessage());
} }
} }
} }
catch (IOException e) { catch (Exception e) {
BCLib.LOGGER.error(e.getMessage()); BCLib.LOGGER.error(e.getMessage());
} }
})); }));