Port: 1.21.8

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
 }
 architectury {
 	minecraft = rootProject.minecraft_version

common/src/main/java/gjum/minecraft/civ/snitchmod/common/SnitchMod.java

@@ -1,6 +1,7 @@
 package gjum.minecraft.civ.snitchmod.common;
 
 import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.blaze3d.vertex.PoseStack;
 import gjum.minecraft.civ.snitchmod.common.model.Direction;
 import gjum.minecraft.civ.snitchmod.common.model.JalistEntry;
 import gjum.minecraft.civ.snitchmod.common.model.Snitch;
@@ -313,8 +314,8 @@ public void handleWindowItems(List<ItemStack> stacks) {
 		}
 	}
 
-	public void handleRenderBlockOverlay(Matrix4f matrix) {
-		Renderer.renderOverlays(matrix);
+	public void handleRenderBlockOverlay(PoseStack poseStack) {
+		Renderer.renderOverlays(poseStack);
 	}
 
 	public Stream<Snitch> streamNearbySnitches(Vec3 playerPos, int distance) {

common/src/main/java/gjum/minecraft/civ/snitchmod/common/mixins/MixinClientPacketListener.java

@@ -33,7 +33,7 @@ protected void onHandleContainerContent(ClientboundContainerSetContentPacket pac
 			return; // continue method normally
 		}
 		try {
-			getMod().handleWindowItems(packetIn.getItems());
+			getMod().handleWindowItems(packetIn.items());
 		} catch (Throwable e) {
 			e.printStackTrace();
 		}

common/src/main/java/gjum/minecraft/civ/snitchmod/common/model/SnitchAlert.java

@@ -63,9 +63,9 @@ public static SnitchAlert fromChat(
 
 		String group = null;
 		final HoverEvent hoverEvent = message.getSiblings().get(0).getStyle().getHoverEvent();
-		if (hoverEvent != null && hoverEvent.getAction() == HoverEvent.Action.SHOW_TEXT) {
+		if (hoverEvent != null && hoverEvent.action() == HoverEvent.Action.SHOW_TEXT) {
 			@SuppressWarnings("ConstantConditions")
-			String hoverText = hoverEvent.getValue(HoverEvent.Action.SHOW_TEXT).getString().replaceAll("§.", "");
+			String hoverText = ((HoverEvent.ShowText)hoverEvent).value().getString().replaceAll("§.", "");
 
 			Matcher hoverMatch = hoverPattern.matcher(hoverText);
 			if (hoverMatch.matches()) {

common/src/main/java/gjum/minecraft/civ/snitchmod/common/model/SnitchRename.java

@@ -57,10 +57,10 @@ public SnitchRename(
 		String snitchOldName = textMatch.group(2);
 
 		final HoverEvent hoverEvent = message.getSiblings().get(0).getStyle().getHoverEvent();
-		if (hoverEvent == null || hoverEvent.getAction() != HoverEvent.Action.SHOW_TEXT) return null;
+		if (hoverEvent == null || hoverEvent.action() != HoverEvent.Action.SHOW_TEXT) return null;
 
 		@SuppressWarnings("ConstantConditions")
-		String hoverText = hoverEvent.getValue(HoverEvent.Action.SHOW_TEXT).getString().replaceAll("§.", "");
+		String hoverText = ((HoverEvent.ShowText)hoverEvent).value().getString().replaceAll("§.", "");
 
 		Matcher hoverMatch = hoverPattern.matcher(hoverText);
 		if (!hoverMatch.matches()) return null;

fabric/src/main/java/gjum/minecraft/civ/snitchmod/fabric/FabricSnitchMod.java

@@ -22,9 +22,9 @@ public void onInitializeClient() {
 				e.printStackTrace();
 			}
 		});
-		WorldRenderEvents.AFTER_TRANSLUCENT.register(((context) -> {
+		WorldRenderEvents.LAST.register(((context) -> {
 			try {
-				handleRenderBlockOverlay(context.matrixStack().last().pose());
+				handleRenderBlockOverlay(context.matrixStack());
 			} catch (Exception e) {
 				e.printStackTrace();
 			}

forge/src/main/java/gjum/minecraft/civ/snitchmod/forge/ForgeSnitchMod.java

@@ -4,24 +4,24 @@
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 @Mod("snitchmod")
 public class ForgeSnitchMod extends SnitchMod {
 	public ForgeSnitchMod(FMLJavaModLoadingContext fmlJavaModLoadingContext) {
-		fmlJavaModLoadingContext.getModEventBus().addListener(this::registerKeyMappings);
 		MinecraftForge.EVENT_BUS.register(this);
 	}
 
-	public void registerKeyMappings(RegisterKeyMappingsEvent event) {
-		event.register(openGuiKey);
-		event.register(toggleOverlayKey);
-		event.register(togglePlacementKey);
-		event.register(previewSnitchFieldKey);
-		event.register(toggleSnitchGoneStatusKey);
-	}
+    @SubscribeEvent
+    public static void onRegisterKeyMappings(RegisterKeyMappingsEvent event) {
+        event.register(openGuiKey);
+        event.register(toggleOverlayKey);
+        event.register(togglePlacementKey);
+        event.register(previewSnitchFieldKey);
+        event.register(toggleSnitchGoneStatusKey);
+    }
 
 	@SubscribeEvent
 	public void onClientTick(TickEvent.ClientTickEvent event) {

forge/src/main/java/gjum/minecraft/civ/snitchmod/forge/mixins/LevelRenderMixin.java

@@ -12,10 +12,10 @@
 
 @Mixin(LevelRenderer.class)
 public abstract class LevelRenderMixin { // REMINDER: Forge sucks
-    @Inject(method = "renderSectionLayer", at = @At("RETURN"))
+    /*@Inject(method = "renderSectionLayer", at = @At("RETURN"))
     private void onRenderLevelLast(RenderType arg, double d, double e, double f, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
         if (arg == RenderType.translucent()) {
             ForgeSnitchMod.getMod().handleRenderBlockOverlay(new PoseStack().last().pose());
         }
-    }
+    }*/
 }

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx2048M
 maven_group=gjum.minecraft.snitchmod
 archives_base_name=snitchmod
 
-mod_version=1.4.6-mc1.21.3
+mod_version=1.4.7-mc1.21.8
 
-minecraft_version=1.21.3
+minecraft_version=1.21.8
 enabled_platforms=fabric,forge,neoforge
 
 # https://fabricmc.net/versions.html
-fabric_loader_version=0.16.9
-fabric_api_version=0.112.1+1.21.3
+fabric_loader_version=0.17.3
+fabric_api_version=0.136.0+1.21.8
 
-forge_version=53.0.25
+forge_version=58.1.0
 
-neoforge_version=21.3.58
+neoforge_version=21.8.49

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/src/main/java/gjum/minecraft/civ/snitchmod/neoforge/NeoForgeSnitchMod.java

@@ -25,10 +25,8 @@ public void registerKeyMappings(RegisterKeyMappingsEvent event) {
     }
 
     @SubscribeEvent
-    public void onRenderLevelLast(RenderLevelStageEvent event) {
-        if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_TRIPWIRE_BLOCKS) {
-            handleRenderBlockOverlay(event.getPoseStack().last().pose());
-        }
+    public void onAfterTripwire(RenderLevelStageEvent.AfterTripwireBlocks event) {
+        handleRenderBlockOverlay(event.getPoseStack());
     }
 
     @SubscribeEvent