one dot twenty one

imreallybadatnames · Jun 14, 2024 · 654af00 · 654af00
1 parent 4c17d66
commit 654af00
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/examples/revelationary_demo_datapack.zip b/examples/revelationary_demo_datapack.zip
diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@
 org.gradle.jvmargs = -Xmx2G
 
 # Fabric Properties
-minecraft_version=1.20.5
-yarn_mappings=1.20.5+build.1
-loader_version=0.15.10
+minecraft_version=1.21
+yarn_mappings=1.21+build.1
+loader_version=0.15.11
 
 # Mod Properties
-mod_version = 1.3.7+1.20.5
+mod_version = 1.3.7+1.21
 maven_group = de.dafuqs.revelationary
 archives_base_name = revelationary
 
 # https://fabricmc.net/develop/
-fabric_version=0.97.8+1.20.5
+fabric_version=0.100.1+1.21
 
-jade_version=lwgbRGaY
-wthit_version=11.1.2
+jade_version=pc7Loi6P
+wthit_version=12.0.0
diff --git a/src/main/java/de/dafuqs/revelationary/ClientAdvancements.java b/src/main/java/de/dafuqs/revelationary/ClientAdvancements.java
@@ -6,6 +6,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.advancement.AdvancementEntry;
 import net.minecraft.advancement.AdvancementProgress;
+import net.minecraft.advancement.PlacedAdvancement;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientAdvancementManager;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
@@ -47,10 +48,10 @@ public static boolean hasDone(Identifier identifier) {
 			ClientPlayNetworkHandler conn = MinecraftClient.getInstance().getNetworkHandler();
 			if (conn != null) {
 				ClientAdvancementManager cm = conn.getAdvancementHandler();
-				AdvancementEntry adv = cm.getManager().get(identifier).getAdvancementEntry();
+				PlacedAdvancement adv = cm.getManager().get(identifier);
 				if (adv != null) {
 					Map<AdvancementEntry, AdvancementProgress> progressMap = ((AccessorClientAdvancementManager) cm).getAdvancementProgresses();
-					AdvancementProgress progress = progressMap.get(adv);
+					AdvancementProgress progress = progressMap.get(adv.getAdvancementEntry());
 					return progress != null && progress.isDone();
 				}
 			}

diff --git a/src/main/java/de/dafuqs/revelationary/RevelationDataLoader.java b/src/main/java/de/dafuqs/revelationary/RevelationDataLoader.java
@@ -25,6 +25,6 @@ protected void apply(Map<Identifier, JsonElement> prepared, ResourceManager mana
 
 	@Override
 	public Identifier getFabricId() {
-		return new Identifier(Revelationary.MOD_ID, "revelations");
+		return Identifier.of(Revelationary.MOD_ID, "revelations");
 	}
 }
diff --git a/src/main/java/de/dafuqs/revelationary/RevelationRegistry.java b/src/main/java/de/dafuqs/revelationary/RevelationRegistry.java
@@ -256,7 +256,6 @@ public static boolean isVisibleTo(BlockState state, PlayerEntity player) {
 
 	public static Map<Identifier, List<BlockState>> getBlockStateEntries() {
 		// fighting invariance of java generic types
-        //noinspection unchecked
         return (Map<Identifier, List<BlockState>>) (Map<?, ?>) advToBlockStates;
 	}
 
@@ -364,7 +363,6 @@ public static BlockState getCloak(BlockState blockState) {
 
 	public static Map<Identifier, List<Item>> getItemEntries() {
 		// fighting invariance of java generic types
-		//noinspection unchecked
 		return (Map<Identifier, List<Item>>) (Map<?,?>) advToItems;
 	}
 

diff --git a/src/main/java/de/dafuqs/revelationary/RevelationaryNetworking.java b/src/main/java/de/dafuqs/revelationary/RevelationaryNetworking.java
@@ -8,7 +8,6 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.command.argument.BlockArgumentParser;
@@ -57,7 +56,7 @@ public record RevelationSync(Object2ObjectOpenHashMap<Identifier, ObjectArrayLis
                                  Object2ObjectOpenHashMap<Block, MutableText> cloakedBlockNameTranslations,
                                  Object2ObjectOpenHashMap<Item, MutableText> cloakedItemNameTranslations) implements CustomPayload {
 		public static final PacketCodec<RegistryByteBuf, RevelationSync> CODEC = CustomPayload.codecOf(RevelationSync::write, RevelationSync::read);
-		public static final CustomPayload.Id<RevelationSync> ID = new Id<>(new Identifier(Revelationary.MOD_ID, "revelation_sync"));
+		public static final CustomPayload.Id<RevelationSync> ID = new Id<>(Identifier.of(Revelationary.MOD_ID, "revelation_sync"));
 
 		private static void writeText(RegistryByteBuf buf, Text text) {
 			TextCodecs.REGISTRY_PACKET_CODEC.encode(buf, text);

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -32,7 +32,7 @@
   "depends": {
     "fabricloader": "*",
     "fabric": "*",
-    "minecraft": ">=1.20.5",
+    "minecraft": ">=1.21",
     "java": ">=21"
   },
   "suggests": {