From 7b02351f1138315e3504b1ca737c5783da2c18ed Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:39:15 -0400 Subject: [PATCH] Update for 1.18 --- .../modernfix/searchtree/JEIBackedSearchTree.java | 2 +- .../modernfix/searchtree/REIBackedSearchTree.java | 2 +- .../embeddedt/modernfix/spark/SparkLaunchProfiler.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java index 6779e51c..d7ce5d98 100644 --- a/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java +++ b/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java @@ -99,7 +99,7 @@ public class JEIBackedSearchTree extends DummySearchTree { @Override public boolean canUse() { - return ModernFixPlatformHooks.modPresent("jei") && !ModernFixPlatformHooks.modPresent("emi") && getIngredientListUncached != null && filterField != null; + return ModernFixPlatformHooks.INSTANCE.modPresent("jei") && !ModernFixPlatformHooks.INSTANCE.modPresent("emi") && getIngredientListUncached != null && filterField != null; } @Override diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java index fdd5f3d0..b88232c6 100644 --- a/common/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java +++ b/common/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java @@ -123,7 +123,7 @@ public class REIBackedSearchTree extends DummySearchTree { @Override public boolean canUse() { - return ModernFixPlatformHooks.modPresent("roughlyenoughitems"); + return ModernFixPlatformHooks.INSTANCE.modPresent("roughlyenoughitems"); } @Override diff --git a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java index e0d933e4..428a6586 100644 --- a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java +++ b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java @@ -87,17 +87,17 @@ public class SparkLaunchProfiler { @Override public Type getType() { - return ModernFixPlatformHooks.isClient() ? Type.CLIENT : Type.SERVER; + return ModernFixPlatformHooks.INSTANCE.isClient() ? Type.CLIENT : Type.SERVER; } @Override public String getName() { - return ModernFixPlatformHooks.getPlatformName(); + return ModernFixPlatformHooks.INSTANCE.getPlatformName(); } @Override public String getVersion() { - return ModernFixPlatformHooks.getVersionString(); + return ModernFixPlatformHooks.INSTANCE.getVersionString(); } @Override @@ -146,7 +146,7 @@ public class SparkLaunchProfiler { @Override public Path getPluginDirectory() { - return ModernFixPlatformHooks.getGameDirectory().resolve("spark-modernfix"); + return ModernFixPlatformHooks.INSTANCE.getGameDirectory().resolve("spark-modernfix"); } @Override