- migrated to mojmap

- switched to neoforge
- updated most components to neoforge specific handling

TODO: networking and mod compat

Author: DaFuqs

build.gradle

@@ -71,21 +71,10 @@ neoForge {
 }
 
 dependencies {
-	// jetbrains annotations @Nullabe @NotNull
-	/*implementation 'org.jetbrains:annotations:23.1.0'
-
-	// fabric
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// dependencies
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-
 	// mod compat
-	modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
-	modCompileOnly "maven.modrinth:jade:${project.jade_version}"
-	modCompileOnly "mcp.mobius.waila:wthit-api:fabric-${project.wthit_version}"*/
+	compileOnly "me.shedaniel:RoughlyEnoughItems-api-neoforge:${project.rei_version}"
+	// implementation "maven.modrinth:jade:${project.jade_version}"
+	// implementation "mcp.mobius.waila:wthit-api:neo-${project.wthit_version}"
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -1,25 +1,21 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs = -Xmx2G
 
-# Fabric Properties
+# MC Properties
 minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-loader_version=0.16.9
+
+# Neoforge / Mapping Properties
+parchment_minecraft_version=1.21.1
+parchment_mappings_version=2024.11.17
+neoforge_version=21.1.186
+neoforge_version_range=[21.1.186,21.2.0)
 
 # Mod Properties
 mod_version=1.3.9+1.21.1
 maven_group=de.dafuqs
-archives_base_name = revelationary
-
-# https://fabricmc.net/develop/
-fabric_api_version=0.107.0+1.21.1
+archives_base_name=revelationary
 
-jade_version=vHRyi3EF
-wthit_version=12.4.1
-rei_version=16.0.788
-
-
-parchment_minecraft_version=1.21.1
-parchment_mappings_version=2024.11.17
-neoforge_version=21.1.186
-neoforge_version_range=[21.1.186,21.2.0)
+# Dependencies
+jade_version=2P7THd8J
+wthit_version=12.5.4
+rei_version=16.0.799

src/main/java/de/dafuqs/revelationary/ClientAdvancements.java

@@ -2,29 +2,27 @@
 
 import de.dafuqs.revelationary.api.advancements.*;
 import de.dafuqs.revelationary.mixin.client.*;
-import net.fabricmc.api.*;
-import net.minecraft.advancement.*;
+import net.minecraft.advancements.*;
 import net.minecraft.client.*;
-import net.minecraft.client.network.*;
-import net.minecraft.network.packet.s2c.play.*;
-import net.minecraft.util.*;
+import net.minecraft.client.multiplayer.*;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.resources.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
 
-@Environment(EnvType.CLIENT)
 public class ClientAdvancements {
 	protected static boolean receivedFirstAdvancementPacket = false;
 	public static List<ClientAdvancementPacketCallback> callbacks = new ArrayList<>();
 
-	public static void onClientPacket(@NotNull AdvancementUpdateS2CPacket packet) {
+	public static void onClientPacket(@NotNull ClientboundUpdateAdvancementsPacket packet) {
 		boolean hadPacketBefore = receivedFirstAdvancementPacket;
 		receivedFirstAdvancementPacket = true;
-		boolean isReset = packet.shouldClearCurrent();
+		boolean isReset = packet.shouldReset();
 		boolean isFirstPacket = !hadPacketBefore || isReset;
 
-		Set<Identifier> doneAdvancements = getDoneAdvancements(packet);
-		Set<Identifier> removedAdvancements = packet.getAdvancementIdsToRemove();
+		Set<ResourceLocation> doneAdvancements = getDoneAdvancements(packet);
+		Set<ResourceLocation> removedAdvancements = packet.getRemoved();
 
 		ClientRevelationHolder.processRemovedAdvancements(removedAdvancements);
 		ClientRevelationHolder.processNewAdvancements(doneAdvancements, isFirstPacket);
@@ -34,31 +32,31 @@ public static void onClientPacket(@NotNull AdvancementUpdateS2CPacket packet) {
 		}
 	}
 
-	public static boolean hasDone(Identifier identifier) {
+	public static boolean hasDone(ResourceLocation identifier) {
 		// If we never received the initial packet: assume false
 		if (!receivedFirstAdvancementPacket) {
 			return false;
 		}
 
 		if (identifier != null) {
-			ClientPlayNetworkHandler conn = MinecraftClient.getInstance().getNetworkHandler();
+			ClientPacketListener conn = Minecraft.getInstance().getConnection();
 			if (conn != null) {
-				ClientAdvancementManager cm = conn.getAdvancementHandler();
-				PlacedAdvancement adv = cm.getManager().get(identifier);
+				net.minecraft.client.multiplayer.ClientAdvancements cm = conn.getAdvancements();
+				AdvancementNode adv = cm.getTree().get(identifier);
 				if (adv != null) {
-					Map<AdvancementEntry, AdvancementProgress> progressMap = ((AccessorClientAdvancementManager) cm).getAdvancementProgresses();
-					AdvancementProgress progress = progressMap.get(adv.getAdvancementEntry());
+					Map<AdvancementHolder, AdvancementProgress> progressMap = ((AccessorClientAdvancementManager) cm).getProgress();
+					AdvancementProgress progress = progressMap.get(adv.holder());
 					return progress != null && progress.isDone();
 				}
 			}
 		}
 		return false;
 	}
 
-	public static @NotNull Set<Identifier> getDoneAdvancements(@NotNull AdvancementUpdateS2CPacket packet) {
-		Set<Identifier> doneAdvancements = new HashSet<>();
+	public static @NotNull Set<ResourceLocation> getDoneAdvancements(@NotNull ClientboundUpdateAdvancementsPacket packet) {
+		Set<ResourceLocation> doneAdvancements = new HashSet<>();
 
-		for (Map.Entry<Identifier, AdvancementProgress> progressedAdvancement : packet.getAdvancementsToProgress().entrySet()) {
+		for (Map.Entry<ResourceLocation, AdvancementProgress> progressedAdvancement : packet.getProgress().entrySet()) {
 			if (progressedAdvancement.getValue().isDone()) {
 				doneAdvancements.add(progressedAdvancement.getKey());
 			}

src/main/java/de/dafuqs/revelationary/ClientRevelationHolder.java

@@ -1,37 +1,29 @@
 package de.dafuqs.revelationary;
 
-import de.dafuqs.revelationary.api.revelations.RevealingCallback;
-import de.dafuqs.revelationary.api.revelations.RevelationAware;
-import de.dafuqs.revelationary.api.revelations.WorldRendererAccessor;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.item.Item;
-import net.minecraft.util.Identifier;
-import org.jetbrains.annotations.NotNull;
+import de.dafuqs.revelationary.api.revelations.*;
+import net.minecraft.client.*;
+import net.minecraft.client.renderer.*;
+import net.minecraft.resources.*;
+import net.minecraft.world.item.*;
+import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.state.*;
+import org.jetbrains.annotations.*;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
-@Environment(EnvType.CLIENT)
 public class ClientRevelationHolder {
 
 	public static List<RevealingCallback> callbacks = new ArrayList<>();
 
 	private static final Set<BlockState> activeBlockStateSwaps = new HashSet<>();
 	private static final Set<Item> activeItemSwaps = new HashSet<>();
 
-	public static void processNewAdvancements(Set<Identifier> doneAdvancements, boolean isJoinPacket) {
+	public static void processNewAdvancements(Set<ResourceLocation> doneAdvancements, boolean isJoinPacket) {
 		if (!doneAdvancements.isEmpty()) {
 			Set<Item> revealedItems = new HashSet<>();
 			Set<BlockState> revealedBlockStates = new HashSet<>();
 			Set<Block> revealedBlocks = new HashSet<>();
-			for (Identifier doneAdvancement : doneAdvancements) {
+			for (ResourceLocation doneAdvancement : doneAdvancements) {
 				revealedItems.addAll(RevelationRegistry.getRevealedItems(doneAdvancement));
 				revealedBlockStates.addAll(RevelationRegistry.getRevealedBlockStates(doneAdvancement));
 				for (BlockState state : revealedBlockStates) {
@@ -72,12 +64,12 @@ public static void processNewAdvancements(Set<Identifier> doneAdvancements, bool
 		}
 	}
 
-	public static void processRemovedAdvancements(@NotNull Set<Identifier> removedAdvancements) {
+	public static void processRemovedAdvancements(@NotNull Set<ResourceLocation> removedAdvancements) {
 		if (!removedAdvancements.isEmpty()) {
 			List<Item> concealedItems = new ArrayList<>();
 			List<BlockState> concealedBlockStates = new ArrayList<>();
 			List<Block> concealedBlocks = new ArrayList<>();
-			for (Identifier removedAdvancement : removedAdvancements) {
+			for (ResourceLocation removedAdvancement : removedAdvancements) {
 				concealedItems.addAll(RevelationRegistry.getRevealedItems(removedAdvancement));
 				concealedBlockStates.addAll(RevelationRegistry.getRevealedBlockStates(removedAdvancement));
 				for (BlockState state : concealedBlockStates) {
@@ -115,7 +107,7 @@ public static void processRemovedAdvancements(@NotNull Set<Identifier> removedAd
 
 	// rerender chunks to show newly swapped blocks
 	static void rebuildAllChunks() {
-		WorldRenderer renderer = MinecraftClient.getInstance().worldRenderer;
+		LevelRenderer renderer = Minecraft.getInstance().levelRenderer;
 		((WorldRendererAccessor) renderer).revelationary$rebuildAllChunks();
 	}
 
@@ -135,7 +127,7 @@ public static void uncloak(BlockState blockState) {
 	}
 
 	public static boolean isCloaked(Block block) {
-		return activeBlockStateSwaps.contains(block.getDefaultState());
+		return activeBlockStateSwaps.contains(block.defaultBlockState());
 	}
 
 	public static boolean isCloaked(BlockState blockState) {