Prep fixes

xafmo7a · Apr 18, 2024 · 6bad887 · 6bad887
1 parent 2b1a45b
commit 6bad887
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ object Constants {
     const val IS_SHARED_BETA: Boolean = false
     const val ACTIVATE_RENDERDOC: Boolean = false
     const val BETA_TAG: String = "DH Support"
-    const val BETA_VERSION = 2
+    const val BETA_VERSION = 4
 
     const val SODIUM_VERSION: String = "mc1.20.4-0.5.8"
 }
@@ -153,7 +153,6 @@ dependencies {
     modRuntimeOnly(fabricApi.module("fabric-rendering-data-attachment-v1", Constants.FABRIC_API_VERSION))
     modRuntimeOnly(fabricApi.module("fabric-resource-loader-v0", Constants.FABRIC_API_VERSION))
     modRuntimeOnly(fabricApi.module("fabric-block-view-api-v2", Constants.FABRIC_API_VERSION))
-    modRuntimeOnly(fabricApi.module("fabric-block-view-api-v2", Constants.FABRIC_API_VERSION))
 
     modCompileOnly(files(projectDir.resolve("DHApi.jar")))
 

diff --git a/src/main/java/net/irisshaders/iris/Iris.java b/src/main/java/net/irisshaders/iris/Iris.java
@@ -530,13 +530,6 @@ public static void reload() throws IOException {
 		if (Minecraft.getInstance().level != null) {
 			Iris.getPipelineManager().preparePipeline(Iris.getCurrentDimension());
 		}
-
-		if (loadedIncompatiblePack() && Minecraft.getInstance().player != null) {
-			Minecraft.getInstance().gui.setTimes(10, 70, 140);
-			Iris.logger.warn("Incompatible pack for DH!");
-			Minecraft.getInstance().gui.setTitle(Component.literal("This pack doesn't have DH support").withStyle(ChatFormatting.BOLD, ChatFormatting.RED));
-			Minecraft.getInstance().gui.setSubtitle(Component.literal("Distant Horizons (DH) chunks won't show up. This isn't a bug, get another shader.").withStyle(ChatFormatting.RED));
-		}
 	}
 
 	/**

diff --git a/src/main/java/net/irisshaders/iris/compat/dh/IrisLodRenderProgram.java b/src/main/java/net/irisshaders/iris/compat/dh/IrisLodRenderProgram.java
@@ -168,9 +168,7 @@ public static IrisLodRenderProgram createProgram(String name, boolean isShadowPa
 	// Noise Uniforms
 
 	public int tryGetUniformLocation2(CharSequence name) {
-		int i = GL32.glGetUniformLocation(this.id, name);
-		if (i == -1) Iris.logger.warn("Couldn't find " + name);
-		return i;
+		return GL32.glGetUniformLocation(this.id, name);
 	}
 
 	public void setUniform(int index, Matrix4f matrix) {

diff --git a/src/main/java/net/irisshaders/iris/pipeline/transform/ShaderPrinter.java b/src/main/java/net/irisshaders/iris/pipeline/transform/ShaderPrinter.java
@@ -122,8 +122,6 @@ public void print() {
 								return !FilenameUtils.getExtension(s.toString()).contains("properties");
 							})) {
 								stream.forEach(path -> {
-									Iris.logger.warn(path.toString());
-
 									try {
 										Files.delete(path);
 									} catch (IOException e) {