Merge v7.38 into 1.20.1

.github/workflows/gradle.yml

@@ -34,8 +34,10 @@ jobs:
     - name: Execute Gradle build
       run: ./gradlew build
     - name: VirusTotal scan
+      if: github.event_name == 'push'
       uses: crazy-max/ghaction-virustotal@v4
       with:
         vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
         files: |
           ./build/libs/*.jar
+      continue-on-error: true

.github/workflows/stale.yml

@@ -0,0 +1,37 @@
+name: "Close stale issues and pull requests"
+on:
+  schedule:
+    - cron: "30 1 * * 1-5"
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@main
+        with:
+          stale-issue-message: |
+            This issue has been open for a while with no recent activity. If this issue is still important to you, please add a comment within the next 7 days to keep it open. Otherwise, the issue will be automatically closed to free up time for other tasks.
+            
+            Issues should be closed if:
+            - They are duplicates of other issues
+            - There is not enough demand
+            - They are no longer relevant
+            - There are not enough details
+          stale-pr-message: |
+            This pull request has been open for a while with no recent activity. If you're still working on this or waiting for a review, please add a comment or commit within the next 7 days to keep it open. Otherwise, the pull request will be automatically closed to free up time for other tasks.
+            
+            Pull requests should be closed if:
+            - They have been superseded by another pull request
+            - They are out of scope or don't align with the project
+            - They have become obsolete due to other changes
+            - They have bugs or conflicts that won't be resolved
+          days-before-stale: 60
+          days-before-close: 7
+          stale-issue-label: "status:stale"
+          stale-pr-label: "status:stale"
+          operations-per-run: 30
+          enable-statistics: true

gradle.properties

@@ -13,7 +13,7 @@ loader_version=0.14.24
 fabric_version=0.90.4+1.20.1
 
 # Mod Properties
-mod_version = v7.37.1-MC1.20.1
+mod_version = v7.38-MC1.20.1
 maven_group = net.wurstclient
 archives_base_name = Wurst-Client
 

src/main/java/net/wurstclient/WurstClient.java

@@ -57,7 +57,7 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.37.1";
+	public static final String VERSION = "7.38";
 	public static final String MC_VERSION = "1.20.1";
 
 	private WurstAnalytics analytics;

src/main/java/net/wurstclient/commands/FollowCmd.java

@@ -39,7 +39,7 @@ public void call(String[] args) throws CmdException
 
 		Entity entity = StreamSupport
 			.stream(MC.world.getEntities().spliterator(), true)
-			.filter(e -> e instanceof LivingEntity)
+			.filter(LivingEntity.class::isInstance)
 			.filter(e -> !e.isRemoved() && ((LivingEntity)e).getHealth() > 0)
 			.filter(e -> e != MC.player)
 			.filter(e -> !(e instanceof FakePlayerEntity))

src/main/java/net/wurstclient/commands/GoToCmd.java

@@ -89,7 +89,7 @@ private BlockPos argsToEntityPos(String name) throws CmdError
 	{
 		LivingEntity entity = StreamSupport
 			.stream(MC.world.getEntities().spliterator(), true)
-			.filter(e -> e instanceof LivingEntity).map(e -> (LivingEntity)e)
+			.filter(LivingEntity.class::isInstance).map(e -> (LivingEntity)e)
 			.filter(e -> !e.isRemoved() && e.getHealth() > 0)
 			.filter(e -> e != MC.player)
 			.filter(e -> !(e instanceof FakePlayerEntity))

src/main/java/net/wurstclient/commands/PathCmd.java

@@ -129,7 +129,7 @@ private BlockPos argsToEntityPos(String name) throws CmdError
 	{
 		LivingEntity entity = StreamSupport
 			.stream(MC.world.getEntities().spliterator(), true)
-			.filter(e -> e instanceof LivingEntity).map(e -> (LivingEntity)e)
+			.filter(LivingEntity.class::isInstance).map(e -> (LivingEntity)e)
 			.filter(e -> !e.isRemoved() && e.getHealth() > 0)
 			.filter(e -> e != MC.player)
 			.filter(e -> !(e instanceof FakePlayerEntity))

src/main/java/net/wurstclient/commands/ProtectCmd.java

@@ -40,7 +40,7 @@ public void call(String[] args) throws CmdException
 
 		Entity entity = StreamSupport
 			.stream(MC.world.getEntities().spliterator(), true)
-			.filter(e -> e instanceof LivingEntity)
+			.filter(LivingEntity.class::isInstance)
 			.filter(e -> !e.isRemoved() && ((LivingEntity)e).getHealth() > 0)
 			.filter(e -> e != MC.player)
 			.filter(e -> !(e instanceof FakePlayerEntity))

src/main/java/net/wurstclient/commands/TpCmd.java

@@ -67,7 +67,7 @@ private BlockPos argsToEntityPos(String name) throws CmdError
 	{
 		LivingEntity entity = StreamSupport
 			.stream(MC.world.getEntities().spliterator(), true)
-			.filter(e -> e instanceof LivingEntity).map(e -> (LivingEntity)e)
+			.filter(LivingEntity.class::isInstance).map(e -> (LivingEntity)e)
 			.filter(e -> !e.isRemoved() && e.getHealth() > 0)
 			.filter(e -> e != MC.player)
 			.filter(e -> !(e instanceof FakePlayerEntity))

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

@@ -15,14 +15,17 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
 import net.wurstclient.Category;
 import net.wurstclient.events.RenderListener;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
 import net.wurstclient.settings.filterlists.EntityFilterList;
 import net.wurstclient.settings.filters.*;
+import net.wurstclient.util.BlockUtils;
 import net.wurstclient.util.EntityUtils;
 import net.wurstclient.util.RotationUtils;
 import net.wurstclient.util.RotationUtils.Rotation;
@@ -42,18 +45,32 @@ public final class AimAssistHack extends Hack
 			+ "360\u00b0 = aims at entities all around you.",
 		120, 30, 360, 10, ValueDisplay.DEGREES);
 
+	private final CheckboxSetting checkLOS = new CheckboxSetting(
+		"Check line of sight", "Won't aim at entities behind blocks.", true);
+
 	private final EntityFilterList entityFilters =
 		new EntityFilterList(FilterPlayersSetting.genericCombat(false),
 			FilterSleepingSetting.genericCombat(false),
 			FilterFlyingSetting.genericCombat(0),
-			FilterMonstersSetting.genericCombat(false),
-			FilterPigmenSetting.genericCombat(false),
-			FilterEndermenSetting.genericCombat(false),
-			FilterAnimalsSetting.genericCombat(true),
+			FilterHostileSetting.genericCombat(false),
+			FilterNeutralSetting
+				.genericCombat(AttackDetectingEntityFilter.Mode.OFF),
+			FilterPassiveSetting.genericCombat(true),
+			FilterPassiveWaterSetting.genericCombat(true),
 			FilterBabiesSetting.genericCombat(true),
+			FilterBatsSetting.genericCombat(true),
+			FilterSlimesSetting.genericCombat(true),
 			FilterPetsSetting.genericCombat(true),
-			FilterTradersSetting.genericCombat(true),
+			FilterVillagersSetting.genericCombat(true),
+			FilterZombieVillagersSetting.genericCombat(true),
 			FilterGolemsSetting.genericCombat(false),
+			FilterPiglinsSetting
+				.genericCombat(AttackDetectingEntityFilter.Mode.OFF),
+			FilterZombiePiglinsSetting
+				.genericCombat(AttackDetectingEntityFilter.Mode.OFF),
+			FilterEndermenSetting
+				.genericCombat(AttackDetectingEntityFilter.Mode.OFF),
+			FilterShulkersSetting.genericCombat(false),
 			FilterInvisibleSetting.genericCombat(true),
 			FilterNamedSetting.genericCombat(false),
 			FilterShulkerBulletSetting.genericCombat(false),
@@ -72,6 +89,7 @@ public AimAssistHack()
 		addSetting(range);
 		addSetting(rotationSpeed);
 		addSetting(fov);
+		addSetting(checkLOS);
 
 		entityFilters.forEach(this::addSetting);
 	}
@@ -87,7 +105,6 @@ protected void onEnable()
 		WURST.getHax().killauraLegitHack.setEnabled(false);
 		WURST.getHax().multiAuraHack.setEnabled(false);
 		WURST.getHax().protectHack.setEnabled(false);
-		WURST.getHax().triggerBotHack.setEnabled(false);
 		WURST.getHax().tpAuraHack.setEnabled(false);
 
 		EVENTS.add(UpdateListener.class, this);
@@ -126,6 +143,13 @@ public void onUpdate()
 		if(target == null)
 			return;
 
+		Vec3d hitVec = target.getBoundingBox().getCenter();
+		if(checkLOS.isChecked() && !BlockUtils.hasLineOfSight(hitVec))
+		{
+			target = null;
+			return;
+		}
+
 		WURST.getHax().autoSwordHack.setSlot();
 		faceEntityClient(target);
 	}

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

@@ -20,13 +20,11 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
-import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.RaycastContext;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
@@ -240,11 +238,8 @@ private boolean rightClickBlock(BlockPos pos)
 			if(distanceSqHitVec >= distanceSqPosVec)
 				continue;
 
-			if(checkLOS.isChecked() && MC.world
-				.raycast(new RaycastContext(eyesPos, hitVec,
-					RaycastContext.ShapeType.COLLIDER,
-					RaycastContext.FluidHandling.NONE, MC.player))
-				.getType() != HitResult.Type.MISS)
+			if(checkLOS.isChecked()
+				&& !BlockUtils.hasLineOfSight(eyesPos, hitVec))
 				continue;
 
 			faceBlocks.getSelected().face(hitVec);
@@ -284,11 +279,8 @@ private boolean placeAnchor(BlockPos pos)
 			if(distanceSqPosVec > eyesPos.squaredDistanceTo(posVec.add(dirVec)))
 				continue;
 
-			if(checkLOS.isChecked() && MC.world
-				.raycast(new RaycastContext(eyesPos, hitVec,
-					RaycastContext.ShapeType.COLLIDER,
-					RaycastContext.FluidHandling.NONE, MC.player))
-				.getType() != HitResult.Type.MISS)
+			if(checkLOS.isChecked()
+				&& !BlockUtils.hasLineOfSight(eyesPos, hitVec))
 				continue;
 
 			InventoryUtils.selectItem(Items.RESPAWN_ANCHOR,

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

@@ -23,5 +23,6 @@ public AntiBlindHack()
 		setCategory(Category.RENDER);
 	}
 
-	// See BackgroundRendererMixin, LightTextureManagerMixin, WorldRendererMixin
+	// See BackgroundRendererMixin, WorldRendererMixin,
+	// ClientPlayerEntityMixin.hasStatusEffect()
 }

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

@@ -26,7 +26,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.RaycastContext;
 import net.wurstclient.Category;
 import net.wurstclient.events.RenderListener;
 import net.wurstclient.events.RightClickListener;
@@ -253,11 +252,8 @@ private boolean tryToPlace(BlockPos pos, Vec3d eyesPos, double rangeSq)
 				continue;
 
 			// check line of sight
-			if(checkLOS.isChecked() && MC.world
-				.raycast(new RaycastContext(eyesPos, hitVec,
-					RaycastContext.ShapeType.COLLIDER,
-					RaycastContext.FluidHandling.NONE, MC.player))
-				.getType() != HitResult.Type.MISS)
+			if(checkLOS.isChecked()
+				&& !BlockUtils.hasLineOfSight(eyesPos, hitVec))
 				continue;
 
 			// face block

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

@@ -452,7 +452,7 @@ private void setTargetVillager()
 		Stream<VillagerEntity> stream =
 			StreamSupport.stream(MC.world.getEntities().spliterator(), true)
 				.filter(e -> !e.isRemoved())
-				.filter(e -> e instanceof VillagerEntity)
+				.filter(VillagerEntity.class::isInstance)
 				.map(e -> (VillagerEntity)e).filter(e -> e.getHealth() > 0)
 				.filter(e -> player.squaredDistanceTo(e) <= rangeSq)
 				.filter(e -> e.getVillagerData()

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

@@ -18,11 +18,9 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
-import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.RaycastContext;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
@@ -244,11 +242,7 @@ private boolean rightClickBlockLegit(BlockPos pos)
 				continue;
 
 			// check line of sight
-			if(MC.world
-				.raycast(new RaycastContext(eyesPos, hitVec,
-					RaycastContext.ShapeType.COLLIDER,
-					RaycastContext.FluidHandling.NONE, MC.player))
-				.getType() != HitResult.Type.MISS)
+			if(!BlockUtils.hasLineOfSight(eyesPos, hitVec))
 				continue;
 
 			// face block

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

@@ -192,7 +192,7 @@ else if(entity instanceof ChestBoatEntity)
 	public void onCameraTransformViewBobbing(
 		CameraTransformViewBobbingEvent event)
 	{
-		if(style.getSelected().hasLines())
+		if(style.hasLines())
 			event.cancel();
 	}
 
@@ -211,16 +211,17 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 		entityGroups.stream().filter(ChestEspGroup::isEnabled)
 			.forEach(g -> g.updateBoxes(partialTicks));
 
-		ChestEspRenderer espRenderer = new ChestEspRenderer(matrixStack);
+		ChestEspRenderer espRenderer =
+			new ChestEspRenderer(matrixStack, partialTicks);
 
-		if(style.getSelected().hasBoxes())
+		if(style.hasBoxes())
 		{
 			RenderSystem.setShader(GameRenderer::getPositionProgram);
 			groups.stream().filter(ChestEspGroup::isEnabled)
 				.forEach(espRenderer::renderBoxes);
 		}
 
-		if(style.getSelected().hasLines())
+		if(style.hasLines())
 		{
 			RenderSystem.setShader(GameRenderer::getPositionProgram);
 			groups.stream().filter(ChestEspGroup::isEnabled)

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

@@ -21,12 +21,10 @@
 import net.minecraft.entity.decoration.EndCrystalEntity;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
-import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.RaycastContext;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
@@ -200,11 +198,8 @@ private boolean placeCrystal(BlockPos pos)
 			if(distanceSqPosVec > eyesPos.squaredDistanceTo(posVec.add(dirVec)))
 				continue;
 
-			if(checkLOS.isChecked() && MC.world
-				.raycast(new RaycastContext(eyesPos, hitVec,
-					RaycastContext.ShapeType.COLLIDER,
-					RaycastContext.FluidHandling.NONE, MC.player))
-				.getType() != HitResult.Type.MISS)
+			if(checkLOS.isChecked()
+				&& !BlockUtils.hasLineOfSight(eyesPos, hitVec))
 				continue;
 
 			InventoryUtils.selectItem(Items.END_CRYSTAL,
@@ -234,7 +229,7 @@ private ArrayList<Entity> getNearbyCrystals()
 			.reversed();
 
 		return StreamSupport.stream(MC.world.getEntities().spliterator(), true)
-			.filter(e -> e instanceof EndCrystalEntity)
+			.filter(EndCrystalEntity.class::isInstance)
 			.filter(e -> !e.isRemoved())
 			.filter(e -> player.squaredDistanceTo(e) <= rangeSq)
 			.sorted(furthestFromPlayer)

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

@@ -40,7 +40,7 @@ public void onDisable()
 	public void onUpdate()
 	{
 		ClientPlayerEntity player = MC.player;
-		if(!player.isWet() || player.isSneaking())
+		if(!player.isTouchingWater() || player.isSneaking())
 			return;
 
 		Vec3d velocity = player.getVelocity();

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

@@ -40,7 +40,7 @@ public void onDisable()
 	public void onUpdate()
 	{
 		ClientPlayerEntity player = MC.player;
-		if(!player.isWet() || player.isSneaking())
+		if(!player.isTouchingWater() || player.isSneaking())
 			return;
 
 		Vec3d velocity = player.getVelocity();

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

@@ -150,7 +150,7 @@ public void onUpdate()
 		{
 			entity = StreamSupport
 				.stream(MC.world.getEntities().spliterator(), true)
-				.filter(e -> e instanceof LivingEntity)
+				.filter(LivingEntity.class::isInstance)
 				.filter(
 					e -> !e.isRemoved() && ((LivingEntity)e).getHealth() > 0)
 				.filter(e -> e != MC.player)