Change ShouldDrawFacelessModelEvent back to ShouldDrawSideEvent

src/main/java/net/wurstclient/events/ShouldDrawSideListener.java

@@ -8,6 +8,7 @@
 package net.wurstclient.events;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
@@ -27,7 +28,7 @@ public static class ShouldDrawSideEvent
 
 		public ShouldDrawSideEvent(BlockState state, BlockPos pos)
 		{
-			this.state = state;
+			this.state = Objects.requireNonNull(state);
 			this.pos = pos;
 		}
 

src/main/java/net/wurstclient/hacks/XRayHack.java

@@ -24,7 +24,6 @@
 import net.wurstclient.events.GetAmbientOcclusionLightLevelListener;
 import net.wurstclient.events.RenderBlockEntityListener;
 import net.wurstclient.events.SetOpaqueCubeListener;
-import net.wurstclient.events.ShouldDrawFacelessModelListener;
 import net.wurstclient.events.ShouldDrawSideListener;
 import net.wurstclient.events.TesselateBlockListener;
 import net.wurstclient.events.UpdateListener;
@@ -38,8 +37,7 @@
 @SearchTags({"XRay", "x ray", "OreFinder", "ore finder"})
 public final class XRayHack extends Hack implements UpdateListener,
 	SetOpaqueCubeListener, GetAmbientOcclusionLightLevelListener,
-	ShouldDrawSideListener, ShouldDrawFacelessModelListener,
-	TesselateBlockListener, RenderBlockEntityListener
+	ShouldDrawSideListener, TesselateBlockListener, RenderBlockEntityListener
 {
 	private final BlockListSetting ores = new BlockListSetting("Ores",
 		"A list of blocks that X-Ray will show. They don't have to be just ores"
@@ -111,7 +109,6 @@ public void onEnable()
 		EVENTS.add(SetOpaqueCubeListener.class, this);
 		EVENTS.add(GetAmbientOcclusionLightLevelListener.class, this);
 		EVENTS.add(ShouldDrawSideListener.class, this);
-		EVENTS.add(ShouldDrawFacelessModelListener.class, this);
 		EVENTS.add(TesselateBlockListener.class, this);
 		EVENTS.add(RenderBlockEntityListener.class, this);
 
@@ -131,7 +128,6 @@ public void onDisable()
 		EVENTS.remove(SetOpaqueCubeListener.class, this);
 		EVENTS.remove(GetAmbientOcclusionLightLevelListener.class, this);
 		EVENTS.remove(ShouldDrawSideListener.class, this);
-		EVENTS.remove(ShouldDrawFacelessModelListener.class, this);
 		EVENTS.remove(TesselateBlockListener.class, this);
 		EVENTS.remove(RenderBlockEntityListener.class, this);
 
@@ -172,13 +168,6 @@ public void onShouldDrawSide(ShouldDrawSideEvent event)
 			isVisible(event.getState().getBlock(), event.getPos()));
 	}
 
-	@Override
-	public void onShouldDrawFacelessModel(ShouldDrawFacelessModelEvent event)
-	{
-		if(!isVisible(event.getState().getBlock(), null))
-			event.cancel();
-	}
-
 	@Override
 	public void onTesselateBlock(TesselateBlockEvent event)
 	{

src/main/java/net/wurstclient/mixin/BasicBakedModelMixin.java

@@ -22,7 +22,7 @@
 import net.minecraft.util.math.random.Random;
 import net.wurstclient.WurstClient;
 import net.wurstclient.event.EventManager;
-import net.wurstclient.events.ShouldDrawFacelessModelListener.ShouldDrawFacelessModelEvent;
+import net.wurstclient.events.ShouldDrawSideListener.ShouldDrawSideEvent;
 
 @Mixin(BasicBakedModel.class)
 public class BasicBakedModelMixin
@@ -39,11 +39,10 @@ private void getQuads(@Nullable BlockState state, @Nullable Direction face,
 			|| !WurstClient.INSTANCE.getHax().xRayHack.isEnabled())
 			return;
 
-		ShouldDrawFacelessModelEvent event =
-			new ShouldDrawFacelessModelEvent(state);
+		ShouldDrawSideEvent event = new ShouldDrawSideEvent(state, null);
 		EventManager.fire(event);
 
-		if(event.isCancelled())
+		if(Boolean.FALSE.equals(event.isRendered()))
 			cir.setReturnValue(List.of());
 	}
 }