diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMod.java b/common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMod.java index 725208bfa..c53fa9ecd 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMod.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMod.java @@ -3,9 +3,7 @@ import dev.engine_room.flywheel.impl.FlwImplXplat; public enum CompatMod { - EMBEDDIUM("embeddium"), IRIS("iris"), - OCULUS("oculus"), SODIUM("sodium"); public final String id; 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 deleted file mode 100644 index 756360d01..000000000 --- a/common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMods.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.engine_room.flywheel.impl.compat; - -import dev.engine_room.flywheel.impl.FlwImplXplat; - -public enum CompatMods { - IRIS("iris"), - SODIUM("sodium"); - - public final boolean isLoaded; - - CompatMods(String modId) { - isLoaded = FlwImplXplat.INSTANCE.isModLoaded(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 index 901c12957..a3e178fac 100644 --- 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 @@ -5,7 +5,6 @@ import org.spongepowered.asm.mixin.Unique; import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; -import dev.engine_room.flywheel.impl.compat.CompatMods; import dev.engine_room.flywheel.impl.compat.SodiumCompat; import dev.engine_room.flywheel.impl.extension.BlockEntityTypeExtension; import net.minecraft.world.level.block.entity.BlockEntity; 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 index 8c2f7069d..d1c346906 100644 --- 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,7 +1,7 @@ package dev.engine_room.flywheel.impl; import dev.engine_room.flywheel.api.event.ReloadLevelRendererCallback; -import dev.engine_room.flywheel.impl.compat.CompatMods; +import dev.engine_room.flywheel.impl.compat.CompatMod; import dev.engine_room.flywheel.impl.compat.FabricSodiumCompat; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.multiplayer.ClientLevel; @@ -34,6 +34,6 @@ public boolean useSodium0_6Compat() { @Override public boolean useIrisCompat() { - return CompatMods.IRIS.isLoaded; + return CompatMod.IRIS.isLoaded; } }