PictureSign 1.3.0 - Enable translucency in pictures

Also use Iris API instead of internal references
This commit is contained in:
Motschen
2022-04-29 14:37:25 +02:00
parent b3249b9664
commit 69cf564ae7
3 changed files with 12 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '0.8-SNAPSHOT' id 'fabric-loom' version '0.11-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
@@ -10,7 +10,7 @@ archivesBaseName = project.archives_base_name
version = project.mod_version version = project.mod_version
group = project.maven_group group = project.maven_group
minecraft { loom {
} }
repositories { repositories {

View File

@@ -8,12 +8,12 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.11.7 loader_version=0.11.7
# Mod Properties # Mod Properties
mod_version = 1.2.0 mod_version = 1.3.0
maven_group = eu.midnightdust maven_group = eu.midnightdust
archives_base_name = picturesign archives_base_name = picturesign
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # 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 fabric_version=0.40.1+1.17
midnightlib_version=0.2.9 midnightlib_version=0.4.0
iris_version=mc1.17.1-1.1.2 iris_version=1.17.x-v1.2.2

View File

@@ -3,8 +3,8 @@ package eu.midnightdust.picturesign.render;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import eu.midnightdust.picturesign.PictureDownloader; import eu.midnightdust.picturesign.PictureDownloader;
import eu.midnightdust.picturesign.config.PictureSignConfig; import eu.midnightdust.picturesign.config.PictureSignConfig;
import net.coderbot.iris.Iris;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.irisshaders.iris.api.v0.IrisApi;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.client.render.*; import net.minecraft.client.render.*;
@@ -94,12 +94,12 @@ public class PictureSignRenderer {
Tessellator tessellator = Tessellator.getInstance(); Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBuffer(); BufferBuilder buffer = tessellator.getBuffer();
matrixStack.push();
int l; 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); RenderSystem.setShader(GameRenderer::getRenderTypeCutoutShader);
l = 230; l = 15728880;
} }
else { else {
RenderSystem.setShader(GameRenderer::getPositionColorTexLightmapShader); RenderSystem.setShader(GameRenderer::getPositionColorTexLightmapShader);
@@ -107,10 +107,11 @@ public class PictureSignRenderer {
} }
RenderSystem.setShaderTexture(0, data.identifier); RenderSystem.setShaderTexture(0, data.identifier);
RenderSystem.disableBlend(); RenderSystem.enableBlend();
RenderSystem.enableDepthTest(); RenderSystem.enableDepthTest();
RenderSystem.depthMask(true); RenderSystem.depthMask(true);
matrixStack.push();
matrixStack.translate(xOffset + x, 0.00F + y, zOffset + z); matrixStack.translate(xOffset + x, 0.00F + y, zOffset + z);
matrixStack.multiply(yRotation); matrixStack.multiply(yRotation);
@@ -131,6 +132,7 @@ public class PictureSignRenderer {
tessellator.draw(); tessellator.draw();
matrixStack.pop(); matrixStack.pop();
RenderSystem.disableBlend();
RenderSystem.disableDepthTest(); RenderSystem.disableDepthTest();
} }