From 69cf564ae773b43c0efb589d17d456e07c387f52 Mon Sep 17 00:00:00 2001
From: Motschen <motschen@midnightdust.eu>
Date: Fri, 29 Apr 2022 14:37:25 +0200
Subject: [PATCH] PictureSign 1.3.0 - Enable translucency in pictures

Also use Iris API instead of internal references
---
 build.gradle                                         |  4 ++--
 gradle.properties                                    |  6 +++---
 .../picturesign/render/PictureSignRenderer.java      | 12 +++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5c882b4..de157a0 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -10,7 +10,7 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
-minecraft {
+loom {
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index a33382c..30ecd7c 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,12 +8,12 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.11.7
 
 # Mod Properties
-	mod_version = 1.2.0
+	mod_version = 1.3.0
 	maven_group = eu.midnightdust
 	archives_base_name = picturesign
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 	fabric_version=0.40.1+1.17
-	midnightlib_version=0.2.9
-	iris_version=mc1.17.1-1.1.2
+	midnightlib_version=0.4.0
+	iris_version=1.17.x-v1.2.2
diff --git a/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java b/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java
index a26cb67..2aaa6ef 100755
--- a/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java
+++ b/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java
@@ -3,8 +3,8 @@ package eu.midnightdust.picturesign.render;
 import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.picturesign.PictureDownloader;
 import eu.midnightdust.picturesign.config.PictureSignConfig;
-import net.coderbot.iris.Iris;
 import net.fabricmc.loader.api.FabricLoader;
+import net.irisshaders.iris.api.v0.IrisApi;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.render.*;
@@ -94,12 +94,12 @@ public class PictureSignRenderer {
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
 
-        matrixStack.push();
+
 
         int l;
-        if (FabricLoader.getInstance().isModLoaded("iris") && Iris.getIrisConfig().areShadersEnabled() && Iris.getCurrentPack().isPresent()) {
+        if (FabricLoader.getInstance().isModLoaded("iris") && IrisApi.getInstance().isShaderPackInUse()) {
             RenderSystem.setShader(GameRenderer::getRenderTypeCutoutShader);
-            l = 230;
+            l = 15728880;
         }
         else {
             RenderSystem.setShader(GameRenderer::getPositionColorTexLightmapShader);
@@ -107,10 +107,11 @@ public class PictureSignRenderer {
         }
         RenderSystem.setShaderTexture(0, data.identifier);
 
-        RenderSystem.disableBlend();
+        RenderSystem.enableBlend();
         RenderSystem.enableDepthTest();
         RenderSystem.depthMask(true);
 
+        matrixStack.push();
         matrixStack.translate(xOffset + x, 0.00F + y, zOffset + z);
         matrixStack.multiply(yRotation);
 
@@ -131,6 +132,7 @@ public class PictureSignRenderer {
 
         tessellator.draw();
         matrixStack.pop();
+        RenderSystem.disableBlend();
 
         RenderSystem.disableDepthTest();
     }