Upgrade support for Distant Horizons 2.2 (#702)

* Upgrade support for Distant Horizons 2.2

* upload artifact fix

* Forgot a file

* Apply requested fixes

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
         run: chmod +x gradlew
       - name: Build the mod
         run: ./gradlew --no-daemon build
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: Oculus-Artifacts
           path: build/libs

build.gradle

@@ -110,7 +110,7 @@ dependencies {
 	forge "net.neoforged:forge:${minecraft_version}-${forge_version}"
 
 	modImplementation "org.embeddedt:embeddium-${minecraft_version}:${embeddium_version}"
-	modCompileOnly(files("DistantHorizons-forge-2.0.4-a-dev-1.20.1.jar"))
+	modCompileOnly("maven.modrinth:distanthorizonsapi:3.0.0")
 
 	forgeRuntimeLibrary(implementation(shadow(project(path: ":glsl-relocated", configuration: "bundledJar")))) {
 		transitive = false

src/main/java/net/irisshaders/iris/Iris.java

@@ -45,6 +45,7 @@
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.network.NetworkConstants;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
@@ -105,6 +106,8 @@ public class Iris {
 
 	private static String IRIS_VERSION;
 	private static boolean fallback;
+	private static boolean loadPackWhenPossible = false;
+	private static boolean renderSystemInit = false;
 
 	public Iris() {
 		try {
@@ -119,6 +122,14 @@ public Iris() {
 		}
 	}
 
+	public static void loadShaderpackWhenPossible() {
+		loadPackWhenPossible = true;
+	}
+
+	public static boolean isPackInUseQuick() {
+		return pipelineManager.getPipelineNullable() instanceof IrisRenderingPipeline;
+	}
+
 	public void onKeyRegister(RegisterKeyMappingsEvent event) {
 		event.register(reloadKeybind);
 		event.register(toggleShadersKeybind);
@@ -141,8 +152,12 @@ public static void onRenderSystemInit() {
 
 		PBRTextureManager.INSTANCE.init();
 
+		renderSystemInit = true;
+
 		// Only load the shader pack when we can access OpenGL
-		loadShaderpack();
+		if (LoadingModList.get().getModFileById("distanthorizons") == null) {
+			loadShaderpack();
+		}
 	}
 
 	public static void duringRenderSystemInit() {
@@ -630,6 +645,19 @@ public static PipelineManager getPipelineManager() {
 			pipelineManager = new PipelineManager(Iris::createPipeline);
 		}
 
+		if (loadPackWhenPossible && renderSystemInit) {
+			loadPackWhenPossible = false;
+			try {
+				reload();
+			} catch (IOException e) {
+				logger.error("Error while reloading Shaders for " + MODNAME + "!", e);
+
+				if (Minecraft.getInstance().player != null) {
+					Minecraft.getInstance().player.displayClientMessage(Component.translatable("iris.shaders.reloaded.failure", Throwables.getRootCause(e).getMessage()).withStyle(ChatFormatting.RED), false);
+				}
+			}
+		}
+
 		return pipelineManager;
 	}
 

src/main/java/net/irisshaders/iris/compat/dh/DHCompat.java

@@ -16,7 +16,6 @@
 public class DHCompat {
 	private static boolean dhPresent = true;
 	private static boolean lastIncompatible;
-	private static MethodHandle setupEventHandlers;
 	private static MethodHandle deletePipeline;
 	private static MethodHandle incompatible;
 	private static MethodHandle getDepthTex;
@@ -59,7 +58,7 @@ public static void run() {
 		try {
 			if (LoadingModList.get().getModFileById("distanthorizons") != null) {
 				deletePipeline = MethodHandles.lookup().findVirtual(Class.forName("net.irisshaders.iris.compat.dh.DHCompatInternal"), "clear", MethodType.methodType(void.class));
-				setupEventHandlers = MethodHandles.lookup().findStatic(Class.forName("net.irisshaders.iris.compat.dh.LodRendererEvents"), "setupEventHandlers", MethodType.methodType(void.class));
+				MethodHandle setupEventHandlers = MethodHandles.lookup().findStatic(Class.forName("net.irisshaders.iris.compat.dh.LodRendererEvents"), "setupEventHandlers", MethodType.methodType(void.class));
 				getDepthTex = MethodHandles.lookup().findVirtual(Class.forName("net.irisshaders.iris.compat.dh.DHCompatInternal"), "getStoredDepthTex", MethodType.methodType(int.class));
 				getRenderDistance = MethodHandles.lookup().findStatic(Class.forName("net.irisshaders.iris.compat.dh.DHCompatInternal"), "getRenderDistance", MethodType.methodType(int.class));
 				incompatible = MethodHandles.lookup().findVirtual(Class.forName("net.irisshaders.iris.compat.dh.DHCompatInternal"), "incompatiblePack", MethodType.methodType(boolean.class));
@@ -79,7 +78,7 @@ public static void run() {
 				if (e instanceof ExceptionInInitializerError eiie) {
 					throw new RuntimeException("Failure loading DH compat.", eiie.getCause());
 				} else {
-					throw new RuntimeException("DH 2.0 not found, yet Fabric claims it's there. Curious.", e);
+					throw new RuntimeException("DH found, but one or more API methods are missing. Iris requires DH [2.0.4] or DH API version [1.1.0] or newer. Please make sure you are on the latest version of DH and Iris.", e);
 				}
 			} else {
 				Iris.logger.info("DH not found, and classes not found.");

src/main/java/net/irisshaders/iris/compat/dh/DHCompatInternal.java

@@ -3,16 +3,17 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.interfaces.override.rendering.IDhApiFramebuffer;
+import com.seibel.distanthorizons.api.interfaces.override.rendering.IDhApiGenericObjectShaderProgram;
+import com.seibel.distanthorizons.api.objects.math.DhApiVec3f;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector;
-import com.seibel.distanthorizons.coreapi.util.math.Vec3f;
 import net.irisshaders.iris.Iris;
-import net.irisshaders.iris.api.v0.IrisApi;
 import net.irisshaders.iris.gl.IrisRenderSystem;
 import net.irisshaders.iris.gl.framebuffer.GlFramebuffer;
 import net.irisshaders.iris.gl.texture.DepthBufferFormat;
 import net.irisshaders.iris.gl.texture.DepthCopyStrategy;
 import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
 import net.irisshaders.iris.shaderpack.programs.ProgramSource;
+import net.irisshaders.iris.shaderpack.properties.CloudSetting;
 import net.irisshaders.iris.targets.Blaze3dRenderTargetExt;
 import net.irisshaders.iris.targets.DepthTexture;
 import net.irisshaders.iris.uniforms.CapturedRenderingState;
@@ -28,7 +29,9 @@ public class DHCompatInternal {
 	private final IrisRenderingPipeline pipeline;
 	public boolean shouldOverrideShadow;
 	public boolean shouldOverride;
+	private GlFramebuffer dhGenericFramebuffer;
 	private IrisLodRenderProgram solidProgram;
+	private IrisGenericRenderProgram genericShader;
 	private IrisLodRenderProgram translucentProgram;
 	private IrisLodRenderProgram shadowProgram;
 	private GlFramebuffer dhTerrainFramebuffer;
@@ -54,6 +57,7 @@ public DHCompatInternal(IrisRenderingPipeline pipeline, boolean dhShadowEnabled)
 			incompatible = true;
 			return;
 		}
+
 		cachedVersion = ((Blaze3dRenderTargetExt) Minecraft.getInstance().getMainRenderTarget()).iris$getDepthBufferVersion();
 
 		createDepthTex(Minecraft.getInstance().getMainRenderTarget().width, Minecraft.getInstance().getMainRenderTarget().height);
@@ -62,6 +66,10 @@ public DHCompatInternal(IrisRenderingPipeline pipeline, boolean dhShadowEnabled)
 		ProgramSource terrain = pipeline.getDHTerrainShader().get();
 		solidProgram = IrisLodRenderProgram.createProgram(terrain.getName(), false, false, terrain, pipeline.getCustomUniforms(), pipeline);
 
+		ProgramSource generic = pipeline.getDHGenericShader().get();
+		genericShader = IrisGenericRenderProgram.createProgram(generic.getName() + "_g", false, false, generic, pipeline.getCustomUniforms(), pipeline);
+		dhGenericFramebuffer = pipeline.createDHFramebuffer(generic, false);
+
 		if (pipeline.getDHWaterShader().isPresent()) {
 			ProgramSource water = pipeline.getDHWaterShader().get();
 			translucentProgram = IrisLodRenderProgram.createProgram(water.getName(), false, true, water, pipeline.getCustomUniforms(), pipeline);
@@ -129,13 +137,10 @@ public static boolean checkFrame() {
 			guiScale = Minecraft.getInstance().options.guiScale().get();
 		}
 
-		// TODO fix early initialization
-		if (DhApi.Delayed.configs == null) {
-			return true;
-		}
+		if (DhApi.Delayed.configs == null) return dhEnabled;
 
 		if ((dhEnabled != DhApi.Delayed.configs.graphics().renderingEnabled().getValue() || guiScale != Minecraft.getInstance().options.guiScale().get())
-			&& IrisApi.getInstance().isShaderPackInUse()) {
+			&& Iris.getPipelineManager().getPipelineNullable() instanceof IrisRenderingPipeline) {
 			guiScale = Minecraft.getInstance().options.guiScale().get();
 			dhEnabled = DhApi.Delayed.configs.graphics().renderingEnabled().getValue();
 			try {
@@ -163,6 +168,9 @@ public void reconnectDHTextures(int depthTex) {
 			if (dhWaterFramebuffer != null) {
 				dhWaterFramebuffer.addDepthAttachment(depthTex);
 			}
+			if (dhGenericFramebuffer != null) {
+				dhGenericFramebuffer.addDepthAttachment(depthTex);
+			}
 		}
 	}
 
@@ -199,12 +207,13 @@ public void clear() {
 		translucentDepthDirty = true;
 
 		OverrideInjector.INSTANCE.unbind(IDhApiFramebuffer.class, dhTerrainFramebufferWrapper);
+		OverrideInjector.INSTANCE.unbind(IDhApiGenericObjectShaderProgram.class, genericShader);
 		OverrideInjector.INSTANCE.unbind(IDhApiFramebuffer.class, dhShadowFramebufferWrapper);
 		dhTerrainFramebufferWrapper = null;
 		dhShadowFramebufferWrapper = null;
 	}
 
-	public void setModelPos(Vec3f modelPos) {
+	public void setModelPos(DhApiVec3f modelPos) {
 		solidProgram.bind();
 		solidProgram.setModelPos(modelPos);
 		translucentProgram.bind();
@@ -262,9 +271,21 @@ public GlFramebuffer getTranslucentFB() {
 		return dhWaterFramebuffer;
 	}
 
+	public GlFramebuffer getGenericFB() {
+		return dhGenericFramebuffer;
+	}
+
 	public int getDepthTexNoTranslucent() {
 		if (depthTexNoTranslucent == null) return 0;
 
 		return depthTexNoTranslucent.getTextureId();
 	}
+
+	public IDhApiGenericObjectShaderProgram getGenericShader() {
+		return genericShader;
+	}
+
+	public boolean avoidRenderingClouds() {
+		return pipeline != null && (pipeline.getDHCloudSetting() == CloudSetting.OFF || (pipeline.getDHCloudSetting() == CloudSetting.DEFAULT && pipeline.getCloudSetting() == CloudSetting.OFF));
+	}
 }

src/main/java/net/irisshaders/iris/compat/dh/DhFrameBufferWrapper.java

@@ -36,8 +36,7 @@ public int getId() {
 	@Override
 	public int getStatus() {
 		this.bind();
-		int status = GL32.glCheckFramebufferStatus(GL32.GL_FRAMEBUFFER);
-		return status;
+		return GL32.glCheckFramebufferStatus(GL32.GL_FRAMEBUFFER);
 	}
 
 	@Override