Port RenderRegions, primarily update debug renderer & use codecs

Author: Ampflower

build.gradle

@@ -35,18 +35,18 @@ dependencies {
 	modImplementation variantOf(libs.nettyIoUringNative) { classifier "linux-x86_64" }
 	modImplementation libs.zstd
 
-//	modImplementation(libs.worldeditCore) {
-//		exclude group: "it.unimi.dsi"
-//		exclude group: "com.google.code.gson"
-//		exclude group: "com.google.guava"
-//		exclude group: "org.apache.logging.log4j"
-//	}
-//	modImplementation(libs.worldeditFabric) {
-//		exclude group: "it.unimi.dsi"
-//		exclude group: "com.google.code.gson"
-//		exclude group: "com.google.guava"
-//		exclude group: "org.apache.logging.log4j"
-//	}
+	modImplementation(libs.worldeditCore) {
+		exclude group: "it.unimi.dsi"
+		exclude group: "com.google.code.gson"
+		exclude group: "com.google.guava"
+		exclude group: "org.apache.logging.log4j"
+	}
+	modImplementation(libs.worldeditFabric) {
+		exclude group: "it.unimi.dsi"
+		exclude group: "com.google.code.gson"
+		exclude group: "com.google.guava"
+		exclude group: "org.apache.logging.log4j"
+	}
 
 	modImplementation "dev.gegy:player-roles-api:1.6.15"
 

gradle.properties

@@ -17,7 +17,7 @@ authors=jaskarth, unascribed
 contributors=Patbox, IThundxr
 license=AGPL-3.0-or-later
 # Mod Version
-baseVersion=0.8.6
+baseVersion=0.8.7
 # Branch Metadata
 branch=toybox-1.21.7
 tagBranch=toybox-1.21.7

libs.versions.toml

@@ -12,8 +12,8 @@ zstd = "1.5.5-5"
 sodium = "mc1.21-0.5.9"
 flywheel = "1.0.4-27"
 vanillin = "1.1.3-27"
-worldeditCore = "7.3.3"
-worldeditFabric = "7.4.0-SNAPSHOT"
+worldeditCore = "7.3.16"
+worldeditFabric = "7.3.16"
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }
@@ -32,4 +32,4 @@ sodium = { group = "maven.modrinth", name = "sodium", version.ref = "sodium" }
 flywheel = { group = "dev.engine-room.flywheel", name = "flywheel-fabric-1.21.1", version.ref = "flywheel" }
 vanillin = { group = "dev.engine-room.vanillin", name = "vanillin-fabric-1.21.1", version.ref = "vanillin" }
 worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldeditCore" }
-worldeditFabric = { group = "com.sk89q.worldedit", name = "worldedit-fabric-mc1.21", version.ref = "worldeditFabric" }
+worldeditFabric = { group = "com.sk89q.worldedit", name = "worldedit-fabric-mc1.21.7", version.ref = "worldeditFabric" }

src/main/java/net/modfest/fireblanket/Fireblanket.java

@@ -34,10 +34,15 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.GameRules;
-import net.modfest.fireblanket.command.*;
+import net.modfest.fireblanket.command.CmdFindReplaceCommand;
+import net.modfest.fireblanket.command.DumpCommand;
+import net.modfest.fireblanket.command.ItemBanCommand;
+import net.modfest.fireblanket.command.RegionCommand;
+import net.modfest.fireblanket.command.StareCommand;
 import net.modfest.fireblanket.compat.PolyMcCompat;
 import net.modfest.fireblanket.compat.roles.PlayerRolesCompat;
 import net.modfest.fireblanket.config.ConfigSpecs;
+import net.modfest.fireblanket.config.EntityFilters;
 import net.modfest.fireblanket.config.FireblanketConfig;
 import net.modfest.fireblanket.mixin.accessor.ClientConnectionAccessor;
 import net.modfest.fireblanket.mixin.accessor.ServerChunkManagerAccessor;
@@ -52,11 +57,9 @@
 import net.modfest.fireblanket.world.render_regions.RegionSyncRequest;
 import net.modfest.fireblanket.world.render_regions.RenderRegions;
 import net.modfest.fireblanket.world.render_regions.RenderRegionsState;
-import net.modfest.fireblanket.config.EntityFilters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.LockSupport;
 import java.util.function.Consumer;
@@ -95,7 +98,7 @@ public void onInitialize() {
 			LiteralArgumentBuilder<ServerCommandSource> base = CommandManager.literal("fireblanket");
 
 			DumpCommand.init(base, access);
-//			RegionCommand.init(base, access);
+			RegionCommand.init(base, access);
 			CmdFindReplaceCommand.init(base, access);
 			StareCommand.init(base, access);
 			ItemBanCommand.init(base, access);
@@ -200,7 +203,7 @@ public void onInitialize() {
 				int max = (int) Math.ceil(radius / 16);
 				int count = (max - min) * (max - min);
 				ChunkTicketManager mgr = ((ServerChunkManagerAccessor) world.getChunkManager()).fireblanket$getTicketManager();
-				LOGGER.info("Forcing " + count + " chunks to stay loaded (but not ticking)...");
+				LOGGER.info("Forcing {} chunks to stay loaded (but not ticking)...", count);
 				int done = 0;
 				long lastReport = System.nanoTime();
 				Stopwatch sw = Stopwatch.createStarted();
@@ -214,11 +217,11 @@ public void onInitialize() {
 						done++;
 						if (System.nanoTime() - lastReport > 1_000_000_000) {
 							lastReport = System.nanoTime();
-							LOGGER.info(done + "/" + count + " loaded (" + ((done * 100) / count) + "%)...");
+							LOGGER.info("{}/{} loaded ({}%)...", done, count, (done * 100) / count);
 						}
 					}
 				}
-				LOGGER.info("Done after " + sw);
+				LOGGER.info("Done after {}", sw);
 			}
 		});
 
@@ -232,14 +235,14 @@ public void onInitialize() {
 	}
 
 	public static void fullRegionSync(ServerWorld world, Consumer<Packet<?>> sender) {
-//		RenderRegions regions = RenderRegionsState.get(world).getRegions();
-//		RegionSyncRequest req;
-//		if (regions.getRegionsByName().isEmpty()) {
-//			req = new RegionSyncRequest.Reset(true);
-//		} else {
-//			req = regions.toPacket();
-//		}
-//		sender.accept(ServerPlayNetworking.createS2CPacket(req));
+		RenderRegions regions = RenderRegionsState.get(world).getRegions();
+		RegionSyncRequest req;
+		if (regions.getRegionsByName().isEmpty()) {
+			req = new RegionSyncRequest.Reset(true);
+		} else {
+			req = regions.toPacket();
+		}
+		sender.accept(ServerPlayNetworking.createS2CPacket(req));
 	}
 
 	public static LinkedBlocQueue<QueuedPacket> getNextQueue() {

src/main/java/net/modfest/fireblanket/FireblanketClient.java

@@ -14,6 +14,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.util.math.Vec3d;
+import net.modfest.fireblanket.client.command.ClientRegionCommand;
 import net.modfest.fireblanket.client.command.CountParticleTypesCommand;
 import net.modfest.fireblanket.client.command.StackTracerCommand;
 import net.modfest.fireblanket.client.command.TickTimeCommand;
@@ -46,7 +47,7 @@ public void onInitializeClient() {
 //				EntityMaskCommand.init(mask, access);
 //				base.then(mask);
 //			}
-//			ClientRegionCommand.init(base, access);
+			ClientRegionCommand.init(base, access);
 			WireframeCommand.init(base, access);
 			TickTimeCommand.init(base, access);
 			CountParticleTypesCommand.init(base, access);

src/main/java/net/modfest/fireblanket/client/command/ClientRegionCommand.java

@@ -10,25 +10,25 @@
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class ClientRegionCommand {
-//	public static void init(LiteralArgumentBuilder<FabricClientCommandSource> base, CommandRegistryAccess access) {
-//		base.then(literal("region")
-//			.then(literal("visualize")
-//				.executes(cl -> {
-//					MinecraftClient.getInstance().submit(() -> RenderRegionRenderer.shouldRenderBox = !RenderRegionRenderer.shouldRenderBox);
-//					return 0;
-//				})
-//			)
-//			.then(literal("toggle")
-//				.executes(cl -> {
-//					if (RenderRegionRenderer.useRegionRenderer) {
-//						cl.getSource().sendFeedback(Text.literal("Disabling render region rendering."));
-//					} else {
-//						cl.getSource().sendFeedback(Text.literal("Enabling render region rendering."));
-//					}
-//					MinecraftClient.getInstance().submit(() -> RenderRegionRenderer.useRegionRenderer = !RenderRegionRenderer.useRegionRenderer);
-//					return 0;
-//				})
-//			)
-//		);
-//	}
+	public static void init(LiteralArgumentBuilder<FabricClientCommandSource> base, CommandRegistryAccess access) {
+		base.then(literal("region")
+			.then(literal("visualize")
+				.executes(cl -> {
+					MinecraftClient.getInstance().submit(() -> RenderRegionRenderer.shouldRenderBox = !RenderRegionRenderer.shouldRenderBox);
+					return 0;
+				})
+			)
+			.then(literal("toggle")
+				.executes(cl -> {
+					if (RenderRegionRenderer.useRegionRenderer) {
+						cl.getSource().sendFeedback(Text.literal("Disabling render region rendering."));
+					} else {
+						cl.getSource().sendFeedback(Text.literal("Enabling render region rendering."));
+					}
+					MinecraftClient.getInstance().submit(() -> RenderRegionRenderer.useRegionRenderer = !RenderRegionRenderer.useRegionRenderer);
+					return 0;
+				})
+			)
+		);
+	}
 }