From 4e2807cff5a47193f3968cc89ce5cf6b74b1a025 Mon Sep 17 00:00:00 2001 From: Luck Date: Fri, 10 Sep 2021 18:32:13 +0100 Subject: [PATCH] Refactor mod container retrieval in Fabric mod --- .../lucko/luckperms/fabric/LPFabricBootstrap.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java index 0f2423945..468c7d8dc 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java @@ -62,8 +62,11 @@ import java.util.concurrent.CountDownLatch; public final class LPFabricBootstrap implements LuckPermsBootstrap, DedicatedServerModInitializer { private static final String MODID = "luckperms"; - private static final ModContainer MOD_CONTAINER = FabricLoader.getInstance().getModContainer(MODID) - .orElseThrow(() -> new RuntimeException("Could not get the LuckPerms mod container.")); + + /** + * The mod container + */ + private final ModContainer modContainer; /** * The plugin logger @@ -100,6 +103,8 @@ public final class LPFabricBootstrap implements LuckPermsBootstrap, DedicatedSer private MinecraftServer server; public LPFabricBootstrap() { + this.modContainer = FabricLoader.getInstance().getModContainer(MODID) + .orElseThrow(() -> new RuntimeException("Could not get the LuckPerms mod container.")); this.logger = new Log4jPluginLogger(LogManager.getLogger(MODID)); this.schedulerAdapter = new FabricSchedulerAdapter(this); this.classPathAppender = new FabricClassPathAppender(); @@ -171,7 +176,7 @@ public final class LPFabricBootstrap implements LuckPermsBootstrap, DedicatedSer @Override public String getVersion() { - return MOD_CONTAINER.getMetadata().getVersion().getFriendlyString(); + return this.modContainer.getMetadata().getVersion().getFriendlyString(); } @Override @@ -217,7 +222,7 @@ public final class LPFabricBootstrap implements LuckPermsBootstrap, DedicatedSer @Override public InputStream getResourceStream(String path) { try { - return Files.newInputStream(LPFabricBootstrap.MOD_CONTAINER.getPath(path)); + return Files.newInputStream(this.modContainer.getPath(path)); } catch (IOException e) { return null; }