Merge branch 'v7.50'

Author: Alexander01998

gradle.properties

@@ -1,26 +1,26 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-org.gradle.parallel=true
-
-# Fabric Properties
-# check these at https://fabricmc.net/develop/ and
-# https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
-loader_version=0.16.14
-loom_version=1.11-SNAPSHOT
-
-# Fabric API
-fabric_version=0.130.0+1.21.8
-
-# Mod Properties
-mod_version=v7.49-MC1.21.8
-maven_group=net.wurstclient
-archives_base_name=Wurst-Client
-mod_loader=Fabric
-
-# GitHub
-gh_repo_id=Wurst-Imperium/Wurst7
-mcx_repo_id=Wurst-Imperium/Wurst-MCX2
-
-# Dependencies
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these at https://fabricmc.net/develop/ and
+# https://modrinth.com/mod/fabric-api/versions
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
+
+# Fabric API
+fabric_version=0.131.0+1.21.8
+
+# Mod Properties
+mod_version=v7.50-MC1.21.8
+maven_group=net.wurstclient
+archives_base_name=Wurst-Client
+mod_loader=Fabric
+
+# GitHub
+gh_repo_id=Wurst-Imperium/Wurst7
+mcx_repo_id=Wurst-Imperium/Wurst-MCX2
+
+# Dependencies

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

@@ -50,7 +50,7 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.49";
+	public static final String VERSION = "7.50";
 	public static final String MC_VERSION = "1.21.8";
 
 	private PlausibleAnalytics plausible;

src/main/java/net/wurstclient/analytics/AnalyticsConfigFile.java

@@ -20,6 +20,7 @@
 public final class AnalyticsConfigFile
 {
 	private final Path path;
+	private boolean disableSaving;
 
 	public AnalyticsConfigFile(Path path)
 	{
@@ -31,7 +32,7 @@ public void load(PlausibleAnalytics plausible)
 		try
 		{
 			WsonObject wson = JsonUtils.parseFileToObject(path);
-			plausible.setEnabled(wson.getBoolean("enabled"));
+			loadJson(wson, plausible);
 
 		}catch(NoSuchFileException e)
 		{
@@ -46,8 +47,30 @@ public void load(PlausibleAnalytics plausible)
 		save(plausible);
 	}
 
+	private void loadJson(WsonObject wson, PlausibleAnalytics plausible)
+		throws JsonException
+	{
+		try
+		{
+			disableSaving = true;
+			
+			// v1 was bugged, don't load it
+			if(!wson.has("version"))
+				return;
+			
+			plausible.setEnabled(wson.getBoolean("enabled"));
+			
+		}finally
+		{
+			disableSaving = false;
+		}
+	}
+	
 	public void save(PlausibleAnalytics plausible)
 	{
+		if(disableSaving)
+			return;
+		
 		JsonObject json = createJson(plausible);
 
 		try
@@ -64,6 +87,7 @@ public void save(PlausibleAnalytics plausible)
 	private JsonObject createJson(PlausibleAnalytics plausible)
 	{
 		JsonObject json = new JsonObject();
+		json.addProperty("version", 2);
 		json.addProperty("enabled", plausible.isEnabled());
 		return json;
 	}

src/main/java/net/wurstclient/analytics/PlausibleAnalytics.java

@@ -57,7 +57,7 @@ public final class PlausibleAnalytics
 		new LinkedBlockingQueue<>();
 	private final JsonObject sessionProps = new JsonObject();
 	private final AnalyticsConfigFile configFile;
-	private boolean enabled = false;
+	private boolean enabled = true;
 
 	/**
 	 * Creates a new PlausibleAnalytics instance and starts a background thread
@@ -134,6 +134,7 @@ public boolean isEnabled()
 	public void setEnabled(boolean enabled)
 	{
 		this.enabled = enabled;
+		configFile.save(this);
 	}
 
 	private boolean isDebugMode()

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

@@ -18,15 +18,16 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.component.ComponentMap;
 import net.minecraft.component.ComponentType;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 import net.wurstclient.command.CmdError;
 import net.wurstclient.command.CmdException;
 import net.wurstclient.command.CmdSyntaxError;
 import net.wurstclient.command.Command;
 import net.wurstclient.util.ChatUtils;
+import net.wurstclient.util.InventoryUtils;
 
 public final class ModifyCmd extends Command
 {
@@ -48,7 +49,9 @@ public void call(String[] args) throws CmdException
 		if(args.length < 2)
 			throw new CmdSyntaxError();
 
-		ItemStack stack = player.getInventory().getSelectedStack();
+		PlayerInventory inventory = player.getInventory();
+		int slot = inventory.getSelectedSlot();
+		ItemStack stack = inventory.getSelectedStack();
 		if(stack == null)
 			throw new CmdError("You must hold an item in your main hand.");
 
@@ -66,10 +69,7 @@ public void call(String[] args) throws CmdException
 			throw new CmdSyntaxError();
 		}
 
-		MC.player.networkHandler
-			.sendPacket(new CreativeInventoryActionC2SPacket(
-				36 + player.getInventory().getSelectedSlot(), stack));
-		
+		InventoryUtils.setCreativeStack(slot, stack);
 		ChatUtils.message("Item modified.");
 	}
 

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

@@ -9,12 +9,12 @@
 
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket;
 import net.wurstclient.command.CmdError;
 import net.wurstclient.command.CmdException;
 import net.wurstclient.command.CmdSyntaxError;
 import net.wurstclient.command.Command;
 import net.wurstclient.util.ChatUtils;
+import net.wurstclient.util.InventoryUtils;
 
 public final class RepairCmd extends Command
 {
@@ -35,11 +35,10 @@ public void call(String[] args) throws CmdException
 		if(!player.getAbilities().creativeMode)
 			throw new CmdError("Creative mode only.");
 
+		int slot = player.getInventory().getSelectedSlot();
 		ItemStack stack = getHeldStack(player);
 		stack.setDamage(0);
-		MC.player.networkHandler
-			.sendPacket(new CreativeInventoryActionC2SPacket(
-				36 + player.getInventory().getSelectedSlot(), stack));
+		InventoryUtils.setCreativeStack(slot, stack);
 
 		ChatUtils.message("Item repaired.");
 	}

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

@@ -109,6 +109,7 @@ public final class HackList implements UpdateListener
 	public final HealthTagsHack healthTagsHack = new HealthTagsHack();
 	public final HighJumpHack highJumpHack = new HighJumpHack();
 	public final InfiniChatHack infiniChatHack = new InfiniChatHack();
+	public final InstaBuildHack instaBuildHack = new InstaBuildHack();
 	public final InstantBunkerHack instantBunkerHack = new InstantBunkerHack();
 	public final InvWalkHack invWalkHack = new InvWalkHack();
 	public final ItemEspHack itemEspHack = new ItemEspHack();

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

@@ -9,10 +9,15 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
@@ -28,7 +33,6 @@
 import net.wurstclient.settings.FileSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
-import net.wurstclient.settings.SwingHandSetting.SwingHand;
 import net.wurstclient.util.*;
 import net.wurstclient.util.BlockPlacer.BlockPlacingParams;
 import net.wurstclient.util.json.JsonException;
@@ -55,18 +59,27 @@ public final class AutoBuildHack extends Hack
 		"Makes sure that you don't reach through walls when placing blocks. Can help with AntiCheat plugins but slows down building.",
 		false);
 
-	private final CheckboxSetting instaBuild = new CheckboxSetting("InstaBuild",
-		"Builds small templates (<= 64 blocks) instantly.\n"
-			+ "For best results, stand close to the block you're placing.",
+	private final CheckboxSetting useSavedBlocks = new CheckboxSetting(
+		"Use saved blocks",
+		"Tries to place the same blocks that were saved in the template.\n\n"
+			+ "If the template does not specify block types, it will be built"
+			+ " from whatever block you are holding.",
 		true);
 
 	private final CheckboxSetting fastPlace =
 		new CheckboxSetting("Always FastPlace",
 			"Builds as if FastPlace was enabled, even if it's not.", true);
 
+	private final CheckboxSetting strictBuildOrder = new CheckboxSetting(
+		"Strict build order",
+		"Places blocks in exactly the same order that they appear in the"
+			+ " template. This is slower, but provides more consistent results.",
+		false);
+	
 	private Status status = Status.NO_TEMPLATE;
 	private AutoBuildTemplate template;
-	private LinkedHashSet<BlockPos> remainingBlocks = new LinkedHashSet<>();
+	private LinkedHashMap<BlockPos, Item> remainingBlocks =
+		new LinkedHashMap<>();
 
 	public AutoBuildHack()
 	{
@@ -75,8 +88,9 @@ public AutoBuildHack()
 		addSetting(templateSetting);
 		addSetting(range);
 		addSetting(checkLOS);
-		addSetting(instaBuild);
+		addSetting(useSavedBlocks);
 		addSetting(fastPlace);
+		addSetting(strictBuildOrder);
 	}
 
 	@Override
@@ -111,6 +125,7 @@ public String getRenderName()
 	@Override
 	protected void onEnable()
 	{
+		WURST.getHax().instaBuildHack.setEnabled(false);
 		WURST.getHax().templateToolHack.setEnabled(false);
 
 		EVENTS.add(UpdateListener.class, this);
@@ -150,12 +165,9 @@ public void onRightClick(RightClickEvent event)
 
 		BlockPos startPos = hitResultPos.offset(blockHitResult.getSide());
 		Direction direction = MC.player.getHorizontalFacing();
-		remainingBlocks = template.getPositions(startPos, direction);
+		remainingBlocks = template.getBlocksToPlace(startPos, direction);
 
-		if(instaBuild.isChecked() && template.size() <= 64)
-			buildInstantly();
-		else
-			status = Status.BUILDING;
+		status = Status.BUILDING;
 	}
 
 	@Override
@@ -187,7 +199,7 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 		if(status != Status.BUILDING)
 			return;
 
-		List<BlockPos> blocksToDraw = remainingBlocks.stream()
+		List<BlockPos> blocksToDraw = remainingBlocks.keySet().stream()
 			.filter(pos -> BlockUtils.getState(pos).isReplaceable()).limit(1024)
 			.toList();
 
@@ -207,7 +219,7 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 
 	private void buildNormally()
 	{
-		remainingBlocks
+		remainingBlocks.keySet()
 			.removeIf(pos -> !BlockUtils.getState(pos).isReplaceable());
 
 		if(remainingBlocks.isEmpty())
@@ -220,40 +232,49 @@ private void buildNormally()
 			return;
 
 		double rangeSq = range.getValueSq();
-		for(BlockPos pos : remainingBlocks)
+		for(Map.Entry<BlockPos, Item> entry : remainingBlocks.entrySet())
 		{
+			BlockPos pos = entry.getKey();
+			Item item = entry.getValue();
+			
 			BlockPlacingParams params = BlockPlacer.getBlockPlacingParams(pos);
-			if(params == null || params.distanceSq() > rangeSq)
-				continue;
-			if(checkLOS.isChecked() && !params.lineOfSight())
-				continue;
+			if(params == null || params.distanceSq() > rangeSq
+				|| checkLOS.isChecked() && !params.lineOfSight())
+				if(strictBuildOrder.isChecked())
+					return;
+				else
+					continue;
+				
+			if(useSavedBlocks.isChecked() && item != Items.AIR
+				&& !MC.player.getMainHandStack().isOf(item))
+			{
+				giveOrSelectItem(item);
+				return;
+			}
 
 			MC.itemUseCooldown = 4;
 			RotationUtils.getNeededRotations(params.hitVec())
 				.sendPlayerLookPacket();
 			InteractionSimulator.rightClickBlock(params.toHitResult());
-			break;
+			return;
 		}
 	}
 
-	private void buildInstantly()
+	private void giveOrSelectItem(Item item)
 	{
-		double rangeSq = range.getValueSq();
+		if(InventoryUtils.selectItem(item, 36, true))
+			return;
 
-		for(BlockPos pos : remainingBlocks)
-		{
-			if(!BlockUtils.getState(pos).isReplaceable())
-				continue;
-			
-			BlockPlacingParams params = BlockPlacer.getBlockPlacingParams(pos);
-			if(params == null || params.distanceSq() > rangeSq)
-				continue;
-			
-			InteractionSimulator.rightClickBlock(params.toHitResult(),
-				SwingHand.OFF);
-		}
+		if(!MC.player.isInCreativeMode())
+			return;
 
-		remainingBlocks.clear();
+		PlayerInventory inventory = MC.player.getInventory();
+		int slot = inventory.getEmptySlot();
+		if(slot < 0)
+			slot = inventory.getSelectedSlot();
+		
+		ItemStack stack = new ItemStack(item);
+		InventoryUtils.setCreativeStack(slot, stack);
 	}
 
 	private void loadSelectedTemplate()