Merge #743 (BarrierESP) into v7.39

Closes #715
Closes #790

src/main/java/net/wurstclient/hack/HackList.java

@@ -65,6 +65,7 @@ public final class HackList implements UpdateListener
 	public final AutoToolHack autoToolHack = new AutoToolHack();
 	public final AutoTotemHack autoTotemHack = new AutoTotemHack();
 	public final AutoWalkHack autoWalkHack = new AutoWalkHack();
+	public final BarrierEspHack barrierEspHack = new BarrierEspHack();
 	public final BaseFinderHack baseFinderHack = new BaseFinderHack();
 	public final BlinkHack blinkHack = new BlinkHack();
 	public final BoatFlyHack boatFlyHack = new BoatFlyHack();

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2014-2023 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.hacks;
+
+import net.wurstclient.Category;
+import net.wurstclient.SearchTags;
+import net.wurstclient.hack.Hack;
+
+@SearchTags({"barrier esp"})
+public class BarrierEspHack extends Hack
+{
+	public BarrierEspHack()
+	{
+		super("BarrierESP");
+		setCategory(Category.RENDER);
+	}
+
+	// See ClientWorldMixin
+}

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2014-2023 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.mixin;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.item.Items;
+import net.minecraft.world.GameMode;
+import net.wurstclient.WurstClient;
+
+@Mixin(ClientWorld.class)
+public class ClientWorldMixin
+{
+	@Shadow
+	@Final
+	private MinecraftClient client;
+
+	/**
+	 * This is the part that makes BarrierESP work.
+	 */
+	@Inject(at = @At("HEAD"),
+		method = "getBlockParticle()Lnet/minecraft/block/Block;",
+		cancellable = true)
+	private void onGetBlockParticle(CallbackInfoReturnable<Block> cir)
+	{
+		if(!WurstClient.INSTANCE.getHax().barrierEspHack.isEnabled())
+			return;
+
+		// Pause BarrierESP when holding a light in Creative Mode, since it
+		// would otherwise prevent the player from seeing light blocks.
+		if(client.interactionManager.getCurrentGameMode() == GameMode.CREATIVE
+			&& client.player.getMainHandStack().getItem() == Items.LIGHT)
+			return;
+
+		cir.setReturnValue(Blocks.BARRIER);
+	}
+}

src/main/resources/assets/wurst/lang/en_us.json

@@ -46,6 +46,7 @@
   "description.wurst.hack.autotool": "Automatically equips the fastest applicable tool in your hotbar when you try to break a block.",
   "description.wurst.hack.autototem": "Automatically moves totems of undying to your off-hand.",
   "description.wurst.hack.autowalk": "Makes you walk automatically.",
+  "description.wurst.hack.barrieresp": "Allows you to see nearby barrier blocks.\n\nNote: Due to Minecraft bug MC-47607, this hack does not work if your \"Particles\" option is set to \"Minimal\".",
   "description.wurst.hack.basefinder": "Finds player bases by searching for man-made blocks.\nThe blocks that it finds will be highlighted in the selected color.\nGood for finding faction bases.",
   "description.wurst.hack.blink": "Suspends all motion updates while enabled.",
   "description.wurst.hack.boatfly": "Allows you to fly with boats and other vehicles.\nPress the sprint key to go down faster.",

src/main/resources/wurst.mixins.json

@@ -24,6 +24,7 @@
     "ClientPlayerEntityMixin",
     "ClientPlayerInteractionManagerMixin",
     "ClientPlayNetworkHandlerMixin",
+    "ClientWorldMixin",
     "CreativeInventoryScreenMixin",
     "DeathScreenMixin",
     "DirectConnectScreenMixin",