address requested changes

Engine-Room · Oct 14, 2024 · c705fdf · c705fdf
1 parent fa57f34
commit c705fdf
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 34 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,20 +1,14 @@
 package dev.engine_room.flywheel.impl.compat;
 
-import java.util.function.BooleanSupplier;
-
 import dev.engine_room.flywheel.impl.FlwImplXplat;
 
 public enum CompatMods {
 	SODIUM("sodium"),
 	IRIS("iris");
 
-	private final BooleanSupplier isLoaded;
-
-	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
@@ -29,7 +29,7 @@ abstract class BlockEntityTypeMixin<T extends BlockEntity> implements BlockEntit
 
 	@Override
 	public void flywheel$setVisualizer(@Nullable BlockEntityVisualizer<? super T> visualizer) {
-		if (CompatMods.SODIUM.isLoaded()) {
+		if (CompatMods.SODIUM.isLoaded) {
 			if (flywheel$visualizer == null && visualizer != null) {
 				flywheel$sodiumPredicate = SodiumCompat.forBlockEntityType((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/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.neoforged.fml.loading.LoadingModList;
 import net.neoforged.neoforge.common.NeoForge;
 
 public class FlwImplXplatImpl implements FlwImplXplat {
+	@Override
+	public boolean getModLoaded(String modId) {
+		return LoadingModList.get().getModFileById(modId) != null;
+	}
+
 	@Override
 	public void dispatchReloadLevelRendererEvent(ClientLevel level) {
 		NeoForge.EVENT_BUS.post(new ReloadLevelRendererEvent(level));
@@ -22,9 +25,4 @@ public String getVersionStr() {
 	public FlwConfig getConfig() {
 		return NeoForgeFlwConfig.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
@@ -2,18 +2,17 @@
 
 import java.lang.reflect.Field;
 
-import dev.engine_room.flywheel.lib.model.baked.NeoForgeBlockModelBuilder;
-import dev.engine_room.flywheel.lib.model.baked.NeoForgeMultiBlockModelBuilder;
-
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
 
 import dev.engine_room.flywheel.impl.compat.CompatMods;
 import dev.engine_room.flywheel.lib.internal.FlwLibXplat;
 import dev.engine_room.flywheel.lib.model.baked.BakedModelBuilder;
 import dev.engine_room.flywheel.lib.model.baked.BlockModelBuilder;
-import dev.engine_room.flywheel.lib.model.baked.NeoForgeBakedModelBuilder;
 import dev.engine_room.flywheel.lib.model.baked.MultiBlockModelBuilder;
+import dev.engine_room.flywheel.lib.model.baked.NeoForgeBakedModelBuilder;
+import dev.engine_room.flywheel.lib.model.baked.NeoForgeBlockModelBuilder;
+import dev.engine_room.flywheel.lib.model.baked.NeoForgeMultiBlockModelBuilder;
 import dev.engine_room.flywheel.lib.util.ShadersModHandler;
 import net.irisshaders.iris.api.v0.IrisApi;
 import net.minecraft.client.Minecraft;
@@ -70,7 +69,7 @@ public MultiBlockModelBuilder createMultiBlockModelBuilder(BlockAndTintGetter le
 	@Override
 	@Nullable
 	public ShadersModHandler.InternalHandler createIrisHandler() {
-		if (!CompatMods.IRIS.isLoaded()) {
+		if (!CompatMods.IRIS.isLoaded) {
 			return null;
 		}