From 4af17873208475a8e2c159420bbc81bd1cc09042 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Thu, 16 Feb 2023 20:01:21 +0100
Subject: [PATCH] fixed some issues with the ward effect

---
 .../tiles/render/RenderGeneratorLimitRemover.java    | 12 ++++++------
 .../blocks/tiles/render/RenderLowerLimiter.java      |  9 +++++----
 .../assets/naturesaura/models/block/spring.json      |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java
index f0bc6041..949d3767 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java
@@ -34,19 +34,19 @@ public class RenderGeneratorLimitRemover implements BlockEntityRenderer<BlockEnt
     public void render(BlockEntityGeneratorLimitRemover te, float v, PoseStack matrixStack, MultiBufferSource iRenderTypeBuffer, int combinedLightIn, int combinedOverlayIn) {
         var above = te.getLevel().getBlockEntity(te.getBlockPos().above());
         if (above instanceof BlockEntityImpl && ((BlockEntityImpl) above).wantsLimitRemover()) {
-            RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, 0, 1, 0, combinedOverlayIn, RenderGeneratorLimitRemover.RES);
-            RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, 0, 0, 0, combinedOverlayIn, RenderGeneratorLimitRemover.RES);
+            RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, 0, 1, 0, combinedOverlayIn, RenderGeneratorLimitRemover.RES, 1);
+            RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, 0, 0, 0, combinedOverlayIn, RenderGeneratorLimitRemover.RES, 1);
         }
     }
 
-    public static void renderGlint(PoseStack stack, MultiBufferSource buffer, ModelLimitRemoverGlint model, int xOff, int yOff, int zOff, int combinedOverlayIn, ResourceLocation texture) {
+    public static void renderGlint(PoseStack stack, MultiBufferSource buffer, ModelLimitRemoverGlint model, int xOff, int yOff, int zOff, int combinedOverlayIn, ResourceLocation texture, float maxAlpha) {
         stack.pushPose();
         var brightness = 15 << 20 | 15 << 4;
         var alpha = ((float) Math.sin(System.currentTimeMillis() / 800D) + 1F) / 2F;
-        stack.translate(-0.001F + xOff, 1 + 0.001F + yOff, 1 + 0.001F + zOff);
+        stack.translate(-0.002F + xOff, 1 + 0.002F + yOff, 1 + 0.002F + zOff);
         stack.mulPose(Vector3f.XP.rotationDegrees(180F));
-        stack.scale(1.002F, 1.002F, 1.002F);
-        model.renderToBuffer(stack, buffer.getBuffer(model.renderType(texture)), brightness, combinedOverlayIn, 1, 1, 1, alpha);
+        stack.scale(1.004F, 1.004F, 1.004F);
+        model.renderToBuffer(stack, buffer.getBuffer(model.renderType(texture)), brightness, combinedOverlayIn, 1, 1, 1, alpha * maxAlpha);
         stack.popPose();
     }
 
diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderLowerLimiter.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderLowerLimiter.java
index 39d4c791..43863b74 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderLowerLimiter.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderLowerLimiter.java
@@ -25,10 +25,11 @@ public class RenderLowerLimiter implements BlockEntityRenderer<BlockEntityLowerL
     @Override
     public void render(BlockEntityLowerLimiter te, float v, PoseStack matrixStack, MultiBufferSource iRenderTypeBuffer, int combinedLightIn, int combinedOverlayIn) {
         for (var dir : Direction.values()) {
-            var entity = te.getLevel().getBlockEntity(te.getBlockPos().relative(dir));
-            if (entity instanceof BlockEntityImpl impl && impl.allowsLowerLimiter()) {
-                RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, dir.getStepX(), dir.getStepY(), dir.getStepZ(), combinedOverlayIn, RenderLowerLimiter.RES);
-                RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, 0, 0, 0, combinedOverlayIn, RenderLowerLimiter.RES);
+            var offset = te.getBlockPos().relative(dir);
+            if (te.getLevel().getBlockEntity(offset) instanceof BlockEntityImpl impl && impl.allowsLowerLimiter()) {
+                var alpha = te.getLevel().getBlockState(offset).isCollisionShapeFullBlock(te.getLevel(), offset) ? 1 : 0.25F;
+                RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, dir.getStepX(), dir.getStepY(), dir.getStepZ(), combinedOverlayIn, RenderLowerLimiter.RES, alpha);
+                RenderGeneratorLimitRemover.renderGlint(matrixStack, iRenderTypeBuffer, this.model, 0, 0, 0, combinedOverlayIn, RenderLowerLimiter.RES, 1);
             }
         }
     }
diff --git a/src/main/resources/assets/naturesaura/models/block/spring.json b/src/main/resources/assets/naturesaura/models/block/spring.json
index 5d907f77..1a14bdc0 100644
--- a/src/main/resources/assets/naturesaura/models/block/spring.json
+++ b/src/main/resources/assets/naturesaura/models/block/spring.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/block",
-    "render_type": "translucent",
+    "render_type": "cutout_mipped",
     "ambientocclusion": false,
     "textures": {
         "particle": "naturesaura:block/spring",