Twas a snowy night full of scripting the builds

- Post merge fixes - Remove stubs
Engine-Room · Nov 2, 2024 · 90395f0 · 90395f0
1 parent 6a71ed8
commit 90395f0
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 250 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -78,6 +78,7 @@ dependencies {
     modCompileOnly("net.fabricmc:fabric-loader:${property("fabric_loader_version")}")
 
     modCompileOnly("maven.modrinth:sodium:${property("sodium_version")}-fabric")
+    modCompileOnly("maven.modrinth:iris:${property("iris_version")}-fabric")
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
 }

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
@@ -13,8 +13,4 @@ public interface FlwImplXplat {
 	String getVersionStr();
 
 	FlwConfig getConfig();
-
-	boolean useSodium0_6Compat();
-
-	boolean useIrisCompat();
 }
diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/compat/IrisCompat.java b/common/src/main/java/dev/engine_room/flywheel/impl/compat/IrisCompat.java
@@ -1,11 +1,10 @@
 package dev.engine_room.flywheel.impl.compat;
 
 import dev.engine_room.flywheel.impl.FlwImpl;
-import dev.engine_room.flywheel.impl.FlwImplXplat;
 import net.irisshaders.iris.api.v0.IrisApi;
 
 public final class IrisCompat {
-	public static final boolean ACTIVE = FlwImplXplat.INSTANCE.useIrisCompat();
+	public static final boolean ACTIVE = CompatMod.IRIS.isLoaded;
 
 	static {
 		if (ACTIVE) {

diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java b/common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java
@@ -4,19 +4,18 @@
 
 import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer;
 import dev.engine_room.flywheel.impl.FlwImpl;
-import dev.engine_room.flywheel.impl.FlwImplXplat;
 import dev.engine_room.flywheel.lib.visualization.VisualizationHelper;
 import net.caffeinemc.mods.sodium.api.blockentity.BlockEntityRenderHandler;
 import net.caffeinemc.mods.sodium.api.blockentity.BlockEntityRenderPredicate;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public final class SodiumCompat {
-	public static final boolean USE_0_6_COMPAT = FlwImplXplat.INSTANCE.useSodium0_6Compat();
+	public static final boolean ACTIVE = CompatMod.SODIUM.isLoaded;
 
 	static {
-		if (USE_0_6_COMPAT) {
-			FlwImpl.LOGGER.debug("Detected Sodium 0.6");
+		if (ACTIVE) {
+			FlwImpl.LOGGER.debug("Detected Sodium");
 		}
 	}
 
@@ -25,7 +24,7 @@ private SodiumCompat() {
 
 	@Nullable
 	public static <T extends BlockEntity> Object onSetBlockEntityVisualizer(BlockEntityType<T> type, @Nullable BlockEntityVisualizer<? super T> oldVisualizer, @Nullable BlockEntityVisualizer<? super T> newVisualizer, @Nullable Object predicate) {
-		if (!USE_0_6_COMPAT) {
+		if (!ACTIVE) {
 			return null;
 		}
 

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
@@ -28,7 +28,7 @@ abstract class BlockEntityTypeMixin<T extends BlockEntity> implements BlockEntit
 
 	@Override
 	public void flywheel$setVisualizer(@Nullable BlockEntityVisualizer<? super T> visualizer) {
-		if (SodiumCompat.USE_0_6_COMPAT) {
+		if (SodiumCompat.ACTIVE) {
 			flywheel$sodiumPredicate = SodiumCompat.onSetBlockEntityVisualizer((BlockEntityType<T>) (Object) this, flywheel$visualizer, visualizer, flywheel$sodiumPredicate);
 		}
 

diff --git a/...n/src/stubs/java/net/caffeinemc/mods/sodium/api/blockentity/BlockEntityRenderHandler.java b/...n/src/stubs/java/net/caffeinemc/mods/sodium/api/blockentity/BlockEntityRenderHandler.java
diff --git a/...src/stubs/java/net/caffeinemc/mods/sodium/api/blockentity/BlockEntityRenderPredicate.java b/...src/stubs/java/net/caffeinemc/mods/sodium/api/blockentity/BlockEntityRenderPredicate.java
diff --git a/common/src/stubs/java/net/irisshaders/iris/api/v0/IrisApi.java b/common/src/stubs/java/net/irisshaders/iris/api/v0/IrisApi.java
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,8 +1,6 @@
 package dev.engine_room.flywheel.impl;
 
 import dev.engine_room.flywheel.api.event.ReloadLevelRendererCallback;
-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;
 
@@ -26,14 +24,4 @@ public String getVersionStr() {
 	public FlwConfig getConfig() {
 		return FabricFlwConfig.INSTANCE;
 	}
-
-	@Override
-	public boolean useSodium0_6Compat() {
-		return FabricSodiumCompat.USE_0_6_COMPAT;
-	}
-
-	@Override
-	public boolean useIrisCompat() {
-		return CompatMod.IRIS.isLoaded;
-	}
 }
diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/compat/FabricSodiumCompat.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/compat/FabricSodiumCompat.java
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
@@ -26,14 +26,4 @@ public String getVersionStr() {
 	public FlwConfig getConfig() {
 		return NeoForgeFlwConfig.INSTANCE;
 	}
-
-	@Override
-	public boolean useSodium0_6Compat() {
-		return CompatMod.SODIUM.isLoaded && !CompatMod.EMBEDDIUM.isLoaded;
-	}
-
-	@Override
-	public boolean useIrisCompat() {
-		return CompatMod.IRIS.isLoaded || CompatMod.OCULUS.isLoaded;
-	}
 }