Merge pull request #2

Add Opacity Xray

Author: DustinRepo

src/main/java/me/dustin/jex/event/render/EventBufferQuadAlpha.java

@@ -0,0 +1,19 @@
+package me.dustin.jex.event.render;
+
+import me.dustin.events.core.Event;
+
+public class EventBufferQuadAlpha extends Event {
+    private int alpha;
+
+    public EventBufferQuadAlpha(int alpha) {
+        this.alpha = alpha;
+    }
+
+    public int getAlpha() {
+        return alpha;
+    }
+
+    public void setAlpha(int alpha) {
+        this.alpha = alpha;
+    }
+}

src/main/java/me/dustin/jex/event/render/EventGetRenderLayer.java

@@ -0,0 +1,26 @@
+package me.dustin.jex.event.render;
+
+import me.dustin.events.core.Event;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.RenderLayer;
+
+public class EventGetRenderLayer extends Event {
+    private BlockState state;
+    private RenderLayer renderLayer;
+
+    public EventGetRenderLayer(BlockState state) {
+        this.state = state;
+    }
+
+    public BlockState getState() {
+        return state;
+    }
+
+    public RenderLayer getRenderLayer() {
+        return renderLayer;
+    }
+
+    public void setRenderLayer(RenderLayer renderLayer) {
+        this.renderLayer = renderLayer;
+    }
+}

src/main/java/me/dustin/jex/event/render/EventIsBlockOpaque.java

@@ -0,0 +1,19 @@
+package me.dustin.jex.event.render;
+
+import me.dustin.events.core.Event;
+
+public class EventIsBlockOpaque extends Event {
+    private boolean opaque;
+
+    public EventIsBlockOpaque(boolean opaque) {
+        this.opaque = opaque;
+    }
+
+    public boolean isOpaque() {
+        return opaque;
+    }
+
+    public void setOpaque(boolean opaque) {
+        this.opaque = opaque;
+    }
+}

src/main/java/me/dustin/jex/feature/impl/world/Xray.java

@@ -8,8 +8,11 @@
 import me.dustin.jex.feature.core.Feature;
 import me.dustin.jex.feature.core.annotate.Feat;
 import me.dustin.jex.feature.core.enums.FeatureCategory;
+import me.dustin.jex.option.annotate.Op;
+import me.dustin.jex.option.annotate.OpChild;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.client.render.RenderLayer;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
@@ -18,6 +21,10 @@
 public class Xray extends Feature {
 
     public static ArrayList<Block> blockList = new ArrayList<>();
+    @Op(name = "Opacity")
+    public boolean opacity = false;
+    @OpChild(name = "Alpha Value", parent = "Opacity", max = 255)
+    public int alphaValue = 64;
 
     public static void firstLoad() {
         blockList.add(Blocks.DIAMOND_ORE);
@@ -33,18 +40,20 @@ public Xray() {
         this.setKey(GLFW.GLFW_KEY_X);
     }
 
-    @EventListener(events = {EventShouldDrawSide.class, EventBlockBrightness.class, EventMarkChunkClosed.class, EventRenderBlockEntity.class, EventRenderBlock.class, EventRenderFluid.class})
+    @EventListener(events = {EventShouldDrawSide.class, EventBlockBrightness.class, EventMarkChunkClosed.class, EventRenderBlockEntity.class, EventRenderBlock.class, EventRenderFluid.class,
+            EventGetRenderLayer.class, EventIsBlockOpaque.class, EventBufferQuadAlpha.class})
     private void run(Event event) {
         if (event instanceof EventMarkChunkClosed) {
             event.cancel();
         }
         if (event instanceof EventShouldDrawSide) {
-            try {
-                EventShouldDrawSide eventShouldDrawSide = (EventShouldDrawSide) event;
+            EventShouldDrawSide eventShouldDrawSide = (EventShouldDrawSide) event;
+            if (this.opacity && isValid(eventShouldDrawSide.getBlock())) {
+                eventShouldDrawSide.setShouldDrawSide(true);
+                event.cancel();
+            } else if (!this.opacity) {
                 eventShouldDrawSide.setShouldDrawSide(isValid(eventShouldDrawSide.getBlock()));
                 event.cancel();
-            } catch (Exception e) {
-
             }
         }
         if (event instanceof EventBlockBrightness) {
@@ -53,19 +62,39 @@ private void run(Event event) {
         }
         if (event instanceof EventRenderBlockEntity) {
             EventRenderBlockEntity eventRenderBlockEntity = (EventRenderBlockEntity) event;
-            if (!blockList.contains(WorldHelper.INSTANCE.getBlock(eventRenderBlockEntity.blockEntity.getPos())))
+            if (!blockList.contains(WorldHelper.INSTANCE.getBlock(eventRenderBlockEntity.blockEntity.getPos())) && !this.opacity)
                 event.cancel();
         }
         if (event instanceof EventRenderBlock) {
             EventRenderBlock eventRenderBlock = (EventRenderBlock) event;
-            if (!blockList.contains(eventRenderBlock.block))
+            if (!blockList.contains(eventRenderBlock.block) && !this.opacity)
                 event.cancel();
         }
         if (event instanceof EventRenderFluid) {
             EventRenderFluid eventRenderFluid = (EventRenderFluid) event;
             if (!blockList.contains(eventRenderFluid.getBlock()))
                 event.cancel();
         }
+        if (event instanceof EventGetRenderLayer) {
+            EventGetRenderLayer eventGetRenderLayer = (EventGetRenderLayer) event;
+            if (!blockList.contains(eventGetRenderLayer.getState().getBlock()) && this.opacity) {
+                eventGetRenderLayer.setRenderLayer(RenderLayer.getTranslucent());
+                event.cancel();
+            }
+        }
+        if (event instanceof EventIsBlockOpaque) {
+            //This is intended to stop non-opaque blocks from rendering if they're fully covered by other blocks i.e clumps of leaves on trees, glass etc..
+            EventIsBlockOpaque eventIsBlockOpaque = (EventIsBlockOpaque) event;
+            if (this.opacity) {
+                eventIsBlockOpaque.setOpaque(true);
+            }
+        }
+        if (event instanceof EventBufferQuadAlpha) {
+            EventBufferQuadAlpha eventBufferQuadAlpha = (EventBufferQuadAlpha) event;
+            if (this.opacity) {
+                eventBufferQuadAlpha.setAlpha(alphaValue);
+            }
+        }
     }
 
     @Override

src/main/java/me/dustin/jex/load/mixin/MixinAbstractBlockstate.java

@@ -1,6 +1,7 @@
 package me.dustin.jex.load.mixin;
 
 import me.dustin.jex.event.render.EventBlockBrightness;
+import me.dustin.jex.event.render.EventIsBlockOpaque;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
 import org.spongepowered.asm.mixin.Final;
@@ -10,13 +11,17 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(AbstractBlock.AbstractBlockState.class)
+@Mixin(value = AbstractBlock.AbstractBlockState.class, remap = false)
 public abstract class MixinAbstractBlockstate {
 
     @Shadow
     @Final
     private int luminance;
 
+    @Shadow
+    @Final
+    private boolean opaque;
+
     @Shadow
     public abstract Block getBlock();
 
@@ -26,4 +31,9 @@ public void getLuminance(CallbackInfoReturnable<Integer> cir) {
         cir.setReturnValue(eventBlockBrightness.getBrightness());
     }
 
+    @Inject(method = "isOpaque", at = @At("HEAD"), cancellable = true)
+    public void isOpaque(CallbackInfoReturnable<Boolean> cir) {
+        EventIsBlockOpaque eventIsBlockOpaque = new EventIsBlockOpaque(opaque).run();
+        cir.setReturnValue(eventIsBlockOpaque.isOpaque());
+    }
 }

src/main/java/me/dustin/jex/load/mixin/MixinAbstractQuadRenderer.java

@@ -0,0 +1,19 @@
+package me.dustin.jex.load.mixin;
+
+import me.dustin.jex.event.render.EventBufferQuadAlpha;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractQuadRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Pseudo
+@Mixin(value = AbstractQuadRenderer.class, remap = false)
+public class MixinAbstractQuadRenderer {
+    @ModifyArg(method = "bufferQuad(Lnet/minecraft/client/render/VertexConsumer;Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;Lnet/minecraft/util/math/Matrix4f;ILnet/minecraft/util/math/Matrix3f;Lnet/minecraft/util/math/Vec3f;)V",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/VertexConsumer;color(IIII)Lnet/minecraft/client/render/VertexConsumer;"), index = 3)
+    private static int colorAlpha(int alpha) {
+        EventBufferQuadAlpha eventBufferQuadAlpha = new EventBufferQuadAlpha(alpha).run();
+        return eventBufferQuadAlpha.getAlpha();
+    }
+}

src/main/java/me/dustin/jex/load/mixin/MixinRenderLayers.java

@@ -0,0 +1,22 @@
+package me.dustin.jex.load.mixin;
+
+import me.dustin.jex.event.render.EventGetRenderLayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(RenderLayers.class)
+public class MixinRenderLayers {
+    @Inject(method = "getBlockLayer", at = @At("HEAD"), cancellable = true)
+    private static void getBlockLayer(BlockState state, CallbackInfoReturnable<RenderLayer> cir) {
+        EventGetRenderLayer eventGetRenderLayer = new EventGetRenderLayer(state).run();
+        if (eventGetRenderLayer.isCancelled()) {
+            cir.setReturnValue(eventGetRenderLayer.getRenderLayer());
+            cir.cancel();
+        }
+    }
+}

src/main/resources/jex.mixins.json

@@ -8,6 +8,7 @@
   "client": [
     "MixinAbstractBlockstate",
     "MixinAbstractClientPlayerEntity",
+    "MixinAbstractQuadRenderer",
     "MixinBackgroundRenderer",
     "MixinBlock",
     "MixinBlockEntityRenderDispatcher",
@@ -45,6 +46,7 @@
     "MixinPlayerEntity",
     "MixinPlayerEntityRenderer",
     "MixinProjectileEntity",
+    "MixinRenderLayers",
     "MixinRenderTickCounter",
     "MixinScreen",
     "MixinSignEditScreen",