Add a GUI builder for the existing ReplaceBlocks field

.github/workflows/release.yml

@@ -194,4 +194,4 @@ jobs:
         uses: AButler/upload-release-assets@v3.0
         with:
           files: build/jpackage/*.${{ matrix.type }}
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -39,6 +39,8 @@
 
 The wiki can be found [here](https://github.com/Querz/mcaselector/wiki).
 
+Fork documentation: [ReplaceBlocks Builder, syntax, compatibility, and safety](docs/REPLACE_BLOCKS.md).
+
 ## Video Tutorials
 For people who prefer watching a video to understand how the MCA Selector works, there some very good tutorials on 
 YouTube explaining the basics:

build.gradle

@@ -114,8 +114,9 @@ shadowJar {
 	)
 	from 'LICENSE'
 }
-
+// Allow a user-local JDK view to provide JavaFX jmods without modifying the installed JDK.
 runtime {
+	javaHome = project.findProperty('runtime.jdkHome') ?: System.getenv('JAVA_HOME')
 	options = ['--strip-debug', '--compress', 'zip-6', '--no-header-files', '--no-man-pages']
 	modules = [
 		'java.base',
@@ -195,4 +196,4 @@ static minCss(i, o) throws IOException {
 	catch (Exception ex) {
 		ex.printStackTrace()
 	}
-}
+}

docs/REPLACE_BLOCKS.md

@@ -0,0 +1,43 @@
+# ReplaceBlocks
+
+ReplaceBlocks changes matching blocks in selected chunks. It is destructive: close Minecraft, make a backup, and test unfamiliar rules on a copied world first.
+
+## Builder and advanced text
+
+The Builder generates the same text format used by the existing advanced field. Builder rules can be edited as text, and valid advanced rules can be reopened in the Builder when their controls are representable. Advanced state or tile SNBT that has no dedicated control is preserved as fallback text.
+
+Common source forms:
+
+- `literal(minecraft:stone)` matches that block ID exactly.
+- `regex(minecraft:.*_log)` intentionally uses a Java regular expression.
+- `{Name:"minecraft:stone",Properties:{...}}` is an exact stored block-state match.
+- `props({Name:"minecraft:oak_stairs",Properties:{facing:"north"}})` matches the named block and only the listed properties.
+- `tile(source)` and `no_tile(source)` require or exclude a block entity at the source position.
+- `y(-64..64, source)` restricts the source Y coordinate; either bound may be omitted.
+- `biome(minecraft:plains;minecraft:forest, source)` restricts modern 1.18+ biome cells.
+
+Targets may be a block ID, block-state SNBT, or a target followed by block-entity SNBT, for example `minecraft:barrel;{id:"minecraft:barrel"}`. Multiple rules are comma-separated.
+
+Legacy bare or quoted sources remain Java regular expressions for compatibility. Prefer `literal(...)` or `regex(...)` in new rules so intent is explicit.
+
+## Catalogue compatibility
+
+The Builder bundles block-state catalogues for Java 1.18.2, 1.20.6, 1.21.9, 1.21.11, and 26.2. The newest catalogue is selected by default; selection remains manual. Catalogues supply suggestions and property values only, and the displayed Java/DataVersion label identifies the active catalogue.
+
+An empty Builder switches catalogue immediately. A non-empty Builder asks first: Cancel keeps the old catalogue and all current work, while Confirm selects the new catalogue and fully resets fields, properties, Extra NBT, Y/biome filters, rules, selections, generated text, validation, and open popups.
+
+A syntactically valid future or modded resource ID remains accepted even when it is absent from the active catalogue; the Builder shows a non-blocking warning and provides no property suggestions for it. Target warnings are stronger because an unsupported target ID can produce a world that Minecraft cannot load as intended.
+
+Built-in and custom presets remain versionless ReplaceBlocks text. Switching catalogue clears the current preset selection and Builder content but never deletes saved presets. Applying a custom preset still appends valid rules; an exact source or target ID outside the active catalogue produces a non-blocking advisory, while regex sources are not guessed.
+
+The catalogue is not world-version detection and does not guarantee that an ID exists in the target world. MCA Selector does not rename or migrate block IDs between Minecraft versions. Verify renamed/removed IDs yourself.
+
+## Preview and execution safety
+
+Preview is non-mutating. It reports affected chunks/sections, per-rule matches, overlaps, block-entity changes, unsupported chunks, and errors. Preview counts are the recommended check before execution, but they do not replace a backup.
+
+Replacing air can complete missing sections and greatly increase world size. Replacing blocks that carry block entities can remove or rewrite their data. Modern execution invalidates affected lighting and heightmaps; existing adjacent chunks may also be marked for relighting.
+
+Tile, Y, and biome conditions fail closed on unsupported pre-1.18 formats. If a ReplaceBlocks-only operation fails in any chunk, MCA Selector aborts saving that region and logs the failing chunk coordinate. Mixed legacy field changes preserve the historical per-chunk behavior.
+
+After a risky change, load only a copied world in the intended Minecraft version, save/reload it, and inspect the game log for chunk, palette, block-entity, lighting, or heightmap errors.

src/main/java/net/querz/mcaselector/Main.java

@@ -26,6 +26,7 @@ public static void main(String[] args) throws ExecutionException, InterruptedExc
 
 		Logging.setLogDir(Config.BASE_LOG_DIR);
 		Logging.updateThreadContext();
+		Logging.installUncaughtExceptionHandler();
 		Logger LOGGER = LogManager.getLogger(Main.class);
 
 		VersionHandler.init();

src/main/java/net/querz/mcaselector/changer/Field.java

@@ -62,4 +62,13 @@ public boolean parseNewValue(String s) {
 	public abstract void change(ChunkData root);
 
 	public abstract void force(ChunkData root);
+
+	public boolean applyWithResult(ChunkData root, boolean force) {
+		if (force) {
+			force(root);
+		} else {
+			change(root);
+		}
+		return true;
+	}
 }

src/main/java/net/querz/mcaselector/changer/fields/ReplaceBlocksField.java

@@ -5,199 +5,88 @@
 import net.querz.mcaselector.io.mca.ChunkData;
 import net.querz.mcaselector.version.ChunkFilter;
 import net.querz.mcaselector.version.VersionHandler;
-import net.querz.mcaselector.version.mapping.registry.BlockRegistry;
-import net.querz.nbt.CompoundTag;
-import net.querz.nbt.io.snbt.ParseException;
-import net.querz.nbt.io.snbt.SNBTParser;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class ReplaceBlocksField extends Field<Map<String, ChunkFilter.BlockReplaceData>> {
+public class ReplaceBlocksField extends Field<Map<ChunkFilter.BlockReplaceSource, ChunkFilter.BlockReplaceData>> {
 
 	public ReplaceBlocksField() {
 		super(FieldType.REPLACE_BLOCKS);
 	}
 
 	@Override
-	public boolean parseNewValue(String s) {
-
-		// format: <from=to>[,<from=to>,...]
-		// from format: minecraft:<block-name>
-		//              <block-name>
-		//              '<custom-block-name-with-namespace>'
-		// to format:   minecraft:<block-name>
-		//              <block-name>
-		//              '<custom-block-name-with-namespace>'
-		//              <snbt-string-block-state>
-		//              <to>;<snbt-string-tile-entity>
-
-		Map<String, ChunkFilter.BlockReplaceData> newValue = new HashMap<>();
-
-		String trimmed = s.trim();
-
-		while (!trimmed.isEmpty()) {
-			String[] fromTo = trimmed.split("=", 2);
-			if (fromTo.length != 2) {
-				return super.parseNewValue(s);
-			}
-
-			String from = fromTo[0].trim();
-			if (from.startsWith("'") && from.endsWith("'") && from.length() > 2) {
-				from = from.substring(1, from.length() - 1);
-			} else if (!from.startsWith("minecraft:")) {
-				from = "minecraft:" + from;
-				if (!BlockRegistry.isValidName(from)) {
-					return super.parseNewValue(s);
-				}
-			}
-
-			String to = fromTo[1].trim();
-			int read = 0;
-			CompoundTag toState = null;
-			String toName = null;
-			if (to.startsWith("{")) {
-				// block state
-				try {
-					SNBTParser parser = new SNBTParser(to);
-					toState = (CompoundTag) parser.parse(true);
-					read += parser.getReadChars() - 1;
-				} catch (ParseException ex) {
-					return super.parseNewValue(s);
-				}
-			} else if (to.startsWith("'")) {
-				// quoted
-				int i = 1;
-				while (i < to.length() && to.charAt(i) != '\'') {
-					i++;
-				}
-				toName = to.substring(1, Math.max(i, to.length()));
-				if (!toName.endsWith("'")) {
-					return super.parseNewValue(s);
-				}
-				toName = toName.substring(0, toName.length() - 1);
-				if (toName.isEmpty()) {
-					return super.parseNewValue(s);
-				}
-				read += i + 1;
-			} else {
-				// minecraft block
-				// read everything until , or ;
-				int i = 0;
-				while (i < to.length()) {
-					if (to.charAt(i) == ',' || to.charAt(i) == ';') {
-						break;
-					}
-					i++;
-				}
-				toName = to.substring(0, i);
-				if (!toName.startsWith("minecraft:")) {
-					toName = "minecraft:" + toName;
-				}
-				if (!BlockRegistry.isValidName(toName)) {
-					return super.parseNewValue(s);
-				}
-				read += i;
-			}
-
-			to = to.substring(read).trim();
-
-			CompoundTag toTile = null;
-			if (to.startsWith(";")) {
-				to = to.substring(1).trim();
-				if (to.isEmpty()) {
-					return super.parseNewValue(s);
-				}
-				try {
-					SNBTParser parser = new SNBTParser(to);
-					toTile = (CompoundTag) parser.parse(true);
-					int readTile = parser.getReadChars();
-					to = to.substring(readTile - 1);
-				} catch (ParseException ex) {
-					return super.parseNewValue(s);
-				}
-			}
-
-			ChunkFilter.BlockReplaceData data;
-			if (toName != null && toTile != null) {
-				data = new ChunkFilter.BlockReplaceData(toName, toTile);
-			} else if (toName != null) {
-				data = new ChunkFilter.BlockReplaceData(toName);
-			} else if (toState != null && toTile != null) {
-				data = new ChunkFilter.BlockReplaceData(toState, toTile);
-			} else if (toState != null) {
-				data = new ChunkFilter.BlockReplaceData(toState);
-			} else {
-				return super.parseNewValue(s);
-			}
-			newValue.put(from, data);
-
-			to = to.trim();
-
-			if (to.startsWith(",")) {
-				trimmed = to.substring(1).trim();
-			} else if (!to.isEmpty()) {
-				return super.parseNewValue(s);
-			} else {
-				break;
-			}
+	public boolean parseNewValue(String value) {
+		ReplaceBlocksParser.Result result = ReplaceBlocksParser.parse(value);
+		if (!(result instanceof ReplaceBlocksParser.Success success)) {
+			return super.parseNewValue(value);
 		}
-
-		if (newValue.isEmpty()) {
-			return super.parseNewValue(s);
+		Map<ChunkFilter.BlockReplaceSource, ChunkFilter.BlockReplaceData> replacements = new LinkedHashMap<>();
+		for (ReplaceBlocksParser.ParsedRule rule : success.rules()) {
+			replacements.put(rule.source(), rule.target());
 		}
-
-		setNewValue(newValue);
+		if (replacements.isEmpty()) {
+			return super.parseNewValue(value);
+		}
+		setNewValue(replacements);
 		return true;
 	}
 
 	@Override
-	public Map<String, ChunkFilter.BlockReplaceData> getOldValue(ChunkData data) {
+	public Map<ChunkFilter.BlockReplaceSource, ChunkFilter.BlockReplaceData> getOldValue(ChunkData data) {
 		return null;
 	}
 
 	@Override
 	public void change(ChunkData data) {
-		VersionHandler.getImpl(data, ChunkFilter.Blocks.class).replaceBlocks(data, getNewValue());
+		applyReplacement(data);
+	}
+
+	private boolean applyReplacement(ChunkData data) {
+		if (!VersionHandler.getImpl(data, ChunkFilter.Blocks.class).replaceBlocks(data, getNewValue())) {
+			return false;
+		}
+		VersionHandler.getImpl(data, ChunkFilter.LightPopulated.class).setLightPopulated(data, (byte) 0);
 		ChunkFilter.Heightmap heightmap = VersionHandler.getImpl(data, ChunkFilter.Heightmap.class);
 		heightmap.worldSurface(data);
 		heightmap.oceanFloor(data);
 		heightmap.motionBlocking(data);
 		heightmap.motionBlockingNoLeaves(data);
+		return true;
 	}
 
 	@Override
 	public void force(ChunkData data) {
-		change(data);
+		applyReplacement(data);
+	}
+
+	@Override
+	public boolean applyWithResult(ChunkData data, boolean force) {
+		return applyReplacement(data);
 	}
 
 	@Override
 	public String toString() {
-		return getType().toString() + " = \"" + valueToString() + "\"";
+		return getType().toString() + " = \"" + escapeString(valueToString()) + "\"";
 	}
 
 	@Override
 	public String valueToString() {
 		StringBuilder sb = new StringBuilder();
 		boolean first = true;
-		for (Map.Entry<String, ChunkFilter.BlockReplaceData> entry : getNewValue().entrySet()) {
+		for (Map.Entry<ChunkFilter.BlockReplaceSource, ChunkFilter.BlockReplaceData> entry : getNewValue().entrySet()) {
 			if (first) {
 				first = false;
 			} else {
 				sb.append(", ");
 			}
-			String from = entry.getKey();
-			if (!from.startsWith("minecraft:")) {
-				sb.append("'").append(from).append("'");
-			} else {
-				sb.append(entry.getKey());
-			}
+			sb.append(entry.getKey());
 			sb.append("=");
-			sb.append(escapeString(entry.getValue().toString()));
+			sb.append(entry.getValue());
 		}
 		return sb.toString();
 	}
 
-	private String escapeString(String s) {
-		return s.replace("\\", "\\\\").replace("\"", "\\\"");
+	private String escapeString(String value) {
+		return value.replace("\\", "\\\\").replace("\"", "\\\"");
 	}
 }