Update to 1.21.11

.gitignore

@@ -30,4 +30,7 @@ bin/
 
 # fabric
 
-run/
+run/
+/commands
+/.claude
+CLAUDE.md

TODO.md

@@ -0,0 +1,9 @@
+# TODO
+
+- [x] Port `NewerNewChunks` from Trouser-Streak into the existing `New Chunks` module.
+    - Source: https://github.com/etianl/Trouser-Streak/blob/main/src/main/java/pwn/noobs/trouserstreak/modules/NewerNewChunks.java
+    - [x] Keep the current implementation as an **Old** mode.
+    - [x] Add the Trouser-Streak implementation as a **New** mode.
+    - [x] Reuse existing settings wherever possible instead of duplicating them.
+    - [x] Simplify the settings by removing unnecessary options and combining equivalent ones where appropriate.
+    - [x] Preserve all functionality from both implementations.

build.gradle

@@ -1,12 +1,11 @@
 plugins {
-	id "fabric-loom" version "1.1-SNAPSHOT"
+	id "net.fabricmc.fabric-loom-remap" version "1.17-SNAPSHOT"
 	id "maven-publish"
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
+base {
+	archivesName = project.archives_base_name
+}
 version = project.mod_version
 group = project.maven_group
 
@@ -44,20 +43,25 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	// Minecraft 1.20.5 (1.20.5-pre1) upwards uses Java 21.
+	it.options.release = 21
+	// ponytail: raised during the 1.21.11 port to see all errors per pass instead of the first 100; revert once green.
+	it.options.compilerArgs << "-Xmaxerrs" << "10000"
 }
 
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
 	from("LICENSE") {
-		rename { "${it}-${project.archivesBaseName}"}
+		rename { "${it}-${project.archives_base_name}"}
 	}
 }
 

gradle.properties

@@ -5,14 +5,14 @@ org.gradle.parallel=true
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 
-	minecraft_version=1.19.4
-	yarn_mappings=1.19.4+build.1
-	loader_version=0.14.17
+	minecraft_version=1.21.11
+	yarn_mappings=1.21.11+build.6
+	loader_version=0.19.3
 
 # Mod Properties
 	mod_version = 1.2.6
 	maven_group = org.bleachhack
 	archives_base_name = bleachhack
 
 # Fabric api
-	# fabric_version = 0.76.0+1.19.4
+	# fabric_version = 0.141.4+1.21.11

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/bleachhack/BleachHack.java

@@ -79,7 +79,7 @@ public void onInitialize() {
 		BleachFileHelper.readFriends();
 
 		if (Option.GENERAL_CHECK_FOR_UPDATES.getValue()) {
-			updateJson = BleachOnlineMang.getResourceAsync("update/" + SharedConstants.getGameVersion().getName().replace(' ', '_') + ".json", BodyHandlers.ofString())
+			updateJson = BleachOnlineMang.getResourceAsync("update/" + SharedConstants.getGameVersion().name().replace(' ', '_') + ".json", BodyHandlers.ofString())
 					.thenApply(s -> BleachJsonHelper.parseOrNull(s, JsonObject.class));
 		}
 

src/main/java/org/bleachhack/command/CommandManager.java

@@ -114,7 +114,7 @@ public static void callCommand(String input) {
 
 					BleachLogger.info(
 							text.styled(style -> style
-									.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, c.getHelpTooltip()))));
+									.withHoverEvent(new HoverEvent.ShowText(c.getHelpTooltip()))));
 				} catch (Exception e) {
 					e.printStackTrace();
 

src/main/java/org/bleachhack/command/CommandSuggestor.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 import org.bleachhack.BleachHack;
 import org.bleachhack.event.events.EventKeyPress;
@@ -14,10 +15,10 @@
 import org.lwjgl.glfw.GLFW;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.network.PlayerListEntry;
 
 public class CommandSuggestor {
 
@@ -61,7 +62,9 @@ public void onDrawOverlay(EventRenderInGameHud event) {
 				curText = text;
 
 				if (text.startsWith(Command.getPrefix())) {
-					suggestions.addAll(CommandManager.getSuggestionProvider().getSuggestions(text.substring(Command.getPrefix().length()).split(" ", -1)));
+					String[] typed = text.substring(Command.getPrefix().length()).split(" ", -1);
+					suggestions.addAll(CommandManager.getSuggestionProvider().getSuggestions(typed));
+					addOnlinePlayerSuggestions(typed);
 				}
 
 				selected = 0;
@@ -80,9 +83,6 @@ public void onDrawOverlay(EventRenderInGameHud event) {
 			}
 
 			if (!suggestions.isEmpty()) {
-				event.getMatrix().push();
-				event.getMatrix().translate(0, 0, 200);
-
 				int length = suggestions.stream()
 						.map(s -> MinecraftClient.getInstance().textRenderer.getWidth(s))
 						.min(Comparator.reverseOrder()).orElse(0);
@@ -93,14 +93,12 @@ public void onDrawOverlay(EventRenderInGameHud event) {
 				for (int i = scroll; i < suggestions.size() && i < scroll + 10; i++) {
 					String suggestion = suggestions.get(i);
 
-					DrawableHelper.fill(event.getMatrix(), startX, startY, startX + length + 2, startY + 12, 0xd0000000);
-					MinecraftClient.getInstance().textRenderer.drawWithShadow(
-							event.getMatrix(), suggestion, startX + 1, startY + 2, i == selected ? 0xffff00: 0xb0b0b0);
+					event.getMatrix().fill(startX, startY, startX + length + 2, startY + 12, 0xd0000000);
+					event.getMatrix().drawTextWithShadow(MinecraftClient.getInstance().textRenderer,
+							suggestion, startX + 1, startY + 2, i == selected ? 0xffff00: 0xb0b0b0);
 
 					startY += 12;
 				}
-
-				event.getMatrix().pop();
 			}
 		}
 	}
@@ -137,6 +135,28 @@ public void onKeyPressChat(EventKeyPress.InChat event) {
 		}
 	}
 
+	// "$friends add <user>"/"$friend add <user>" - CommandSuggestionProvider only knows the
+	// "<user>" placeholder from the syntax string, so swap it for real, currently-online names.
+	private void addOnlinePlayerSuggestions(String[] typed) {
+		if (typed.length != 3 || !typed[1].equalsIgnoreCase("add")
+				|| !(typed[0].equalsIgnoreCase("friends") || typed[0].equalsIgnoreCase("friend"))
+				|| MinecraftClient.getInstance().getNetworkHandler() == null) {
+			return;
+		}
+
+		suggestions.removeIf(s -> s.matches("^<.*>$"));
+
+		String prefix = typed[2].toLowerCase(Locale.ENGLISH);
+		for (PlayerListEntry entry : MinecraftClient.getInstance().getNetworkHandler().getPlayerList()) {
+			String name = entry.getProfile().name();
+			if (name.toLowerCase(Locale.ENGLISH).startsWith(prefix)) {
+				suggestions.add(name);
+			}
+		}
+
+		suggestions.sort(String.CASE_INSENSITIVE_ORDER);
+	}
+
 	private void updateScroll() {
 		if (scroll > selected) {
 			scroll = Math.max(selected, 0);

src/main/java/org/bleachhack/command/commands/CmdClickGui.java

@@ -23,7 +23,7 @@
 public class CmdClickGui extends Command {
 
 	public CmdClickGui() {
-		super("clickgui", "Modify the clickgui windows.", "clickgui reset [open/closed] | clickgui length <length>", CommandCategory.MODULES);
+		super("clickgui", "Modify the clickgui windows, or change any other setting by name (e.g. \"$clickgui scale 150\").", "clickgui reset [open/closed] | clickgui length <length> | clickgui <setting> <value>", CommandCategory.MODULES);
 	}
 
 	@Override
@@ -71,7 +71,9 @@ public void onCommand(String alias, String[] args) throws Exception {
 
 			BleachLogger.info("Set the clickgui length to: " + args[1]);
 		} else {
-			throw new CmdSyntaxException();
+			// "reset" and "length" above are this command's own subcommands, anything else falls
+			// through to the generic module-settings handler (e.g. "clickgui scale 150").
+			CmdModuleSettings.applyArgs(ModuleManager.getModule(ClickGui.class), args);
 		}
 	}
 

src/main/java/org/bleachhack/command/commands/CmdEnchant.java

@@ -12,7 +12,12 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.minecraft.registry.Registries;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ItemEnchantmentsComponent;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.entry.RegistryEntry;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.bleachhack.command.Command;
@@ -23,8 +28,6 @@
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtList;
 
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Style;
@@ -33,7 +36,9 @@
 
 public class CmdEnchant extends Command {
 
-	private static final Map<String[], Enchantment> enchantments = new LinkedHashMap<>();
+	// 1.21.11 made enchantments a fully data-driven registry (RegistryKey<Enchantment>, resolved
+	// through the world's DynamicRegistryManager) instead of a fixed static Registries.ENCHANTMENT.
+	private static final Map<String[], RegistryKey<Enchantment>> enchantments = new LinkedHashMap<>();
 
 	static {
 		enchantments.put(new String[] { "aqua_affinity", "aqua" }, Enchantments.AQUA_AFFINITY);
@@ -70,7 +75,7 @@ public class CmdEnchant extends Command {
 		enchantments.put(new String[] { "sharpness", "sharp" }, Enchantments.SHARPNESS);
 		enchantments.put(new String[] { "silk_touch", "silk" }, Enchantments.SILK_TOUCH);
 		enchantments.put(new String[] { "smite" }, Enchantments.SMITE);
-		enchantments.put(new String[] { "sweeping_edge", "sweep" }, Enchantments.SWEEPING);
+		enchantments.put(new String[] { "sweeping_edge", "sweep" }, Enchantments.SWEEPING_EDGE);
 		enchantments.put(new String[] { "thorns" }, Enchantments.THORNS);
 		enchantments.put(new String[] { "soul_speed", "soul" }, Enchantments.SOUL_SPEED);
 		enchantments.put(new String[] { "unbreaking" }, Enchantments.UNBREAKING);
@@ -105,44 +110,40 @@ public void onCommand(String alias, String[] args) throws Exception {
 		}
 
 		int level = args.length == 1 ? 1 : Integer.parseInt(args[1]);
-		ItemStack item = mc.player.getInventory().getMainHandStack();
+		ItemStack item = mc.player.getMainHandStack();
+		Registry<Enchantment> registry = mc.world.getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT);
 
 		if (args[0].equalsIgnoreCase("all")) {
-			for (Enchantment e : Registries.ENCHANTMENT) {
-				enchant(item, e, level);
-			}
-
+			registry.streamEntries().forEach(e -> enchant(item, e, level));
 			return;
 		}
 
 		int i = NumberUtils.toInt(args[0], -1);
 
 		if (i != -1) {
-			enchant(item, Enchantment.byRawId(i), level);
+			enchant(item, registry.getEntry(i).orElse(null), level);
 		} else {
 			enchant(item, enchantments.entrySet().stream()
 					.filter(e -> ArrayUtils.contains(e.getKey(), args[0]))
 					.map(Entry::getValue)
+					.map(registry::getOptional)
+					.filter(java.util.Optional::isPresent)
+					.map(java.util.Optional::get)
 					.findFirst().orElse(null), level);
 		}
 	}
 
-	public void enchant(ItemStack item, Enchantment e, int level) {
+	public void enchant(ItemStack item, RegistryEntry<Enchantment> e, int level) {
 		if (e == null) {
 			throw new CmdSyntaxException("Invalid enchantment!");
 		}
 
-		if (item.getNbt() == null)
-			item.setNbt(new NbtCompound());
-		if (!item.getNbt().contains("Enchantments", 9)) {
-			item.getNbt().put("Enchantments", new NbtList());
-		}
-
-		NbtList listnbt = item.getNbt().getList("Enchantments", 10);
-		NbtCompound compoundnbt = new NbtCompound();
-		compoundnbt.putString("id", String.valueOf(Registries.ENCHANTMENT.getId(e)));
-		compoundnbt.putInt("lvl", level);
-		listnbt.add(compoundnbt);
+		// 1.19.4 stored enchantments as a raw "Enchantments" NBT list; ItemStack has no NBT access at
+		// all anymore - enchantments are a DataComponentTypes.ENCHANTMENTS component now.
+		ItemEnchantmentsComponent current = item.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
+		ItemEnchantmentsComponent.Builder builder = new ItemEnchantmentsComponent.Builder(current);
+		builder.set(e, level);
+		item.set(DataComponentTypes.ENCHANTMENTS, builder.build());
 	}
 
 }

src/main/java/org/bleachhack/command/commands/CmdEntityMenu.java

@@ -22,12 +22,18 @@
 public class CmdEntityMenu extends Command {
 
 	public CmdEntityMenu() {
-		super("entitymenu", "Opens the gui to manage the things which appear on the entitymenu interaction screen.", "entitymenu", CommandCategory.MODULES,
+		super("entitymenu", "Opens the gui to manage the things which appear on the entitymenu interaction screen, or change a setting (e.g. \"$entitymenu playersonly true\", \"$entitymenu reset\").",
+				"entitymenu | entitymenu reset | entitymenu <setting> <value>", CommandCategory.MODULES,
 				"playermenu", "interactionmenu");
 	}
 
 	@Override
 	public void onCommand(String alias, String[] args) throws Exception {
+		if (args.length > 0) {
+			CmdModuleSettings.applyArgs(ModuleManager.getModule(EntityMenu.class), args);
+			return;
+		}
+
 		MutablePairList<String, String> interactions = ModuleManager.getModule(EntityMenu.class).interactions;
 
 		BleachQueue.add(() -> mc.setScreen(new EntityMenuEditScreen(interactions)));

src/main/java/org/bleachhack/command/commands/CmdEntityStats.java

@@ -60,14 +60,15 @@ public static double round(double value, int places) {
 	}
 
 	public static double getSpeed(AbstractHorseEntity horse) {
-		return round(20 * horse.getAttributeValue(EntityAttributes.GENERIC_MOVEMENT_SPEED), 2);
+		return round(20 * horse.getAttributeValue(EntityAttributes.MOVEMENT_SPEED), 2);
 	}
 
 	public static double getSpeedLiving(LivingEntity entity) {
 		return round(43.17 * entity.getMovementSpeed(), 2);
 	}
 
 	public static double getJumpHeight(AbstractHorseEntity horse) {
-		return round(-0.1817584952 * Math.pow(horse.getJumpStrength(), 3) + 3.689713992 * Math.pow(horse.getJumpStrength(), 2) + 2.128599134 * horse.getJumpStrength() - 0.343930367, 3);
+		double jumpStrength = horse.getAttributeValue(EntityAttributes.JUMP_STRENGTH);
+		return round(-0.1817584952 * Math.pow(jumpStrength, 3) + 3.689713992 * Math.pow(jumpStrength, 2) + 2.128599134 * jumpStrength - 0.343930367, 3);
 	}
 }

src/main/java/org/bleachhack/command/commands/CmdFriends.java

@@ -22,8 +22,6 @@
 import org.bleachhack.util.BleachLogger;
 import org.bleachhack.util.io.BleachFileHelper;
 
-import java.util.Locale;
-
 public class CmdFriends extends Command {
 
 	public CmdFriends() {
@@ -49,7 +47,7 @@ public void onCommand(String alias, String[] args) throws Exception {
 				throw new CmdSyntaxException("No username selected");
 			}
 
-			BleachHack.friendMang.remove(args[1].toLowerCase(Locale.ENGLISH));
+			BleachHack.friendMang.remove(args[1]);
 			BleachLogger.info("Removed \"" + args[1] + "\" from the friend list");
 		} else if (args[0].equalsIgnoreCase("list")) {
 			if (BleachHack.friendMang.getFriends().isEmpty()) {
@@ -70,13 +68,13 @@ public void onCommand(String alias, String[] args) throws Exception {
 									.withColor(BleachLogger.INFO_COLOR)))
 					.append(Text.literal("\u00a7c[Del]")
 							.styled(style -> style
-									.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal("Remove " + f + " from your friendlist")))
-									.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, getPrefix() + "friends remove " + f))))
+									.withHoverEvent(new HoverEvent.ShowText(Text.literal("Remove " + f + " from your friendlist")))
+									.withClickEvent(new ClickEvent.RunCommand(getPrefix() + "friends remove " + f))))
 					.append("   ")
 					.append(Text.literal("\u00a73[NameMC]")
 							.styled(style -> style
-									.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal("Open NameMC page of " + f)))
-									.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://namemc.com/profile/" + f))));
+									.withHoverEvent(new HoverEvent.ShowText(Text.literal("Open NameMC page of " + f)))
+									.withClickEvent(new ClickEvent.OpenUrl(java.net.URI.create("https://namemc.com/profile/" + f)))));
 				}
 
 				BleachLogger.info(text);