address requested changes

Engine-Room · Oct 14, 2024 · ad4c012 · ad4c012
1 parent 94232f7
commit ad4c012
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 37 deletions.
diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java
@@ -1,18 +1,16 @@
 package dev.engine_room.flywheel.impl;
 
-import java.util.function.BooleanSupplier;
-
 import dev.engine_room.flywheel.api.internal.DependencyInjection;
 import net.minecraft.client.multiplayer.ClientLevel;
 
 public interface FlwImplXplat {
 	FlwImplXplat INSTANCE = DependencyInjection.load(FlwImplXplat.class, "dev.engine_room.flywheel.impl.FlwImplXplatImpl");
 
+	boolean getModLoaded(String modId);
+
 	void dispatchReloadLevelRendererEvent(ClientLevel level);
 
 	String getVersionStr();
 
 	FlwConfig getConfig();
-
-	BooleanSupplier getModLoaded(String modId);
 }
diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMods.java b/common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMods.java
@@ -1,23 +1,17 @@
 package dev.engine_room.flywheel.impl.compat;
 
-import java.util.function.BooleanSupplier;
-
 import dev.engine_room.flywheel.impl.FlwImplXplat;
 
 public enum CompatMods {
-	SODIUM("sodium"),
-	RUBIDIUM("rubidium"),
 	EMBEDDIUM("embeddium"),
 	IRIS("iris"),
-	OCULUS("oculus");
-
-	private final BooleanSupplier isLoaded;
+	OCULUS("oculus"),
+	RUBIDIUM("rubidium"),
+	SODIUM("sodium");
 
-	CompatMods(String modid) {
-		isLoaded = FlwImplXplat.INSTANCE.getModLoaded(modid);
-	}
+	public final boolean isLoaded;
 
-	public boolean isLoaded() {
-		return isLoaded.getAsBoolean();
+	CompatMods(String modId) {
+		isLoaded = FlwImplXplat.INSTANCE.getModLoaded(modId);
 	}
 }
diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java
@@ -30,7 +30,7 @@ abstract class BlockEntityTypeMixin<T extends BlockEntity> implements BlockEntit
 
 	@Override
 	public void flywheel$setVisualizer(@Nullable BlockEntityVisualizer<? super T> visualizer) {
-		if (CompatMods.SODIUM.isLoaded() && !CompatMods.EMBEDDIUM.isLoaded() && SodiumCompatHelper.IS_SODIUM_0_6) {
+		if (CompatMods.SODIUM.isLoaded && !CompatMods.EMBEDDIUM.isLoaded && SodiumCompatHelper.IS_SODIUM_0_6) {
 			if (flywheel$visualizer == null && visualizer != null) {
 				flywheel$sodiumPredicate = SodiumCompat.addPredicate((BlockEntityType<?>) (Object) this);
 			} else if (flywheel$visualizer != null && visualizer == null && flywheel$sodiumPredicate != null) {

diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java
@@ -1,12 +1,15 @@
 package dev.engine_room.flywheel.impl;
 
-import java.util.function.BooleanSupplier;
-
 import dev.engine_room.flywheel.api.event.ReloadLevelRendererCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.multiplayer.ClientLevel;
 
 public class FlwImplXplatImpl implements FlwImplXplat {
+	@Override
+	public boolean getModLoaded(String modId) {
+		return FabricLoader.getInstance().isModLoaded(modId);
+	}
+
 	@Override
 	public void dispatchReloadLevelRendererEvent(ClientLevel level) {
 		ReloadLevelRendererCallback.EVENT.invoker().onReloadLevelRenderer(level);
@@ -21,9 +24,4 @@ public String getVersionStr() {
 	public FlwConfig getConfig() {
 		return FabricFlwConfig.INSTANCE;
 	}
-
-	@Override
-	public BooleanSupplier getModLoaded(String modId) {
-		return () -> FabricLoader.getInstance().isModLoaded(modId);
-	}
 }
diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java
@@ -52,7 +52,7 @@ public MultiBlockModelBuilder createMultiBlockModelBuilder(BlockAndTintGetter le
 	@Override
 	@Nullable
 	public ShadersModHandler.InternalHandler createIrisHandler() {
-		if (!CompatMods.IRIS.isLoaded()) {
+		if (!CompatMods.IRIS.isLoaded) {
 			return null;
 		}
 

diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/compat/FabricSodiumCompatHelper.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/compat/FabricSodiumCompatHelper.java
@@ -8,7 +8,7 @@
 
 public class FabricSodiumCompatHelper {
 	public static void init() {
-		if (CompatMods.SODIUM.isLoaded() && !CompatMods.EMBEDDIUM.isLoaded()) {
+		if (CompatMods.SODIUM.isLoaded && !CompatMods.EMBEDDIUM.isLoaded) {
 			FabricLoader.getInstance().getModContainer("sodium").ifPresent(c -> {
 				Version sodiumVersion = c.getMetadata().getVersion();
 

diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java
@@ -22,7 +22,7 @@ public String getRefMapperConfig() {
 
 	@Override
 	public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-		return CompatMods.SODIUM.isLoaded() && SodiumCompatHelper.IS_SODIUM_0_5;
+		return CompatMods.SODIUM.isLoaded && SodiumCompatHelper.IS_SODIUM_0_5;
 	}
 
 	@Override

diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java
@@ -1,13 +1,16 @@
 package dev.engine_room.flywheel.impl;
 
-import java.util.function.BooleanSupplier;
-
 import dev.engine_room.flywheel.api.event.ReloadLevelRendererEvent;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.loading.LoadingModList;
 
 public class FlwImplXplatImpl implements FlwImplXplat {
+	@Override
+	public boolean getModLoaded(String modId) {
+		return LoadingModList.get().getModFileById(modId) != null;
+	}
+
 	@Override
 	public void dispatchReloadLevelRendererEvent(ClientLevel level) {
 		MinecraftForge.EVENT_BUS.post(new ReloadLevelRendererEvent(level));
@@ -22,9 +25,4 @@ public String getVersionStr() {
 	public FlwConfig getConfig() {
 		return ForgeFlwConfig.INSTANCE;
 	}
-
-	@Override
-	public BooleanSupplier getModLoaded(String modId) {
-		return () -> LoadingModList.get().getModFileById(modId) != null;
-	}
 }
diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java
@@ -68,7 +68,7 @@ public MultiBlockModelBuilder createMultiBlockModelBuilder(BlockAndTintGetter le
 	@Override
 	@Nullable
 	public ShadersModHandler.InternalHandler createIrisHandler() {
-		if (!(CompatMods.IRIS.isLoaded() || CompatMods.OCULUS.isLoaded())) {
+		if (!(CompatMods.IRIS.isLoaded || CompatMods.OCULUS.isLoaded)) {
 			return null;
 		}
 

diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
@@ -66,7 +66,7 @@ private static void clientInit(IEventBus forgeEventBus, IEventBus modEventBus) {
 		CrashReportCallables.registerCrashCallable("Flywheel Backend", BackendManagerImpl::getBackendString);
 		FlwImpl.init();
 
-		if (CompatMods.EMBEDDIUM.isLoaded()) {
+		if (CompatMods.EMBEDDIUM.isLoaded) {
 			EmbeddiumCompat.init();
 		}
 	}

diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/compat/ForgeSodiumCompatHelper.java b/forge/src/main/java/dev/engine_room/flywheel/impl/compat/ForgeSodiumCompatHelper.java
@@ -4,7 +4,7 @@
 
 public class ForgeSodiumCompatHelper {
 	public static void init() {
-		if (CompatMods.SODIUM.isLoaded() && !(CompatMods.RUBIDIUM.isLoaded() && CompatMods.EMBEDDIUM.isLoaded())) {
+		if (CompatMods.SODIUM.isLoaded && !(CompatMods.RUBIDIUM.isLoaded && CompatMods.EMBEDDIUM.isLoaded)) {
 			SodiumCompatHelper.IS_SODIUM_0_6 = true;
 		}
 	}