1.21.2 release

KyoriPowered · Oct 23, 2024 · 70793bb · 70793bb
1 parent f58efd3
commit 70793bb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,16 +8,16 @@ ansi = "1.1.0"
 autoService = "1.1.1"
 checkstyle = "10.18.2"
 examination = "1.3.0"
-fabricApi = "0.106.0+1.21.2"
+fabricApi = "0.106.1+1.21.2"
 fabricLoader = "0.16.7"
 indra = "3.1.3"
 junit = "5.11.2"
-minecraft = "1.21.2-rc1"
+minecraft = "1.21.2"
 parchment = "1.21:2024.07.28"
 vineflower = "1.10.1"
 spotless = "6.25.0"
-neoforge = "21.0.167"
-neoform = "1.21.2-rc1-20241017.134216"
+neoforge = "21.2.0-beta"
+neoform = "1.21.2-20241022.151510"
 
 [libraries]
 adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" }
@@ -33,7 +33,7 @@ adventure-textSerializerAnsi = { module = "net.kyori:adventure-text-serializer-a
 ansi = { module = "net.kyori:ansi", version.ref = "ansi" }
 examination-api = { module = "net.kyori:examination-api", version.ref = "examination" }
 examination-string = { module = "net.kyori:examination-string", version.ref = "examination" }
-jetbrainsAnnotations = "org.jetbrains:annotations:25.0.0"
+jetbrainsAnnotations = "org.jetbrains:annotations:26.0.0"
 option = { module = "net.kyori:option", version = "1.0.0" }
 
 # mod-shared

diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -47,13 +47,13 @@ config="adventure-platform-neoforge.mixins.json"
 [[dependencies.adventure_platform_neoforge]]
 modId="neoforge"
 type="required"
-versionRange="[21.0.0-beta,)"
+versionRange="[21.2.0-beta,)"
 ordering="NONE"
 side="BOTH"
 
 [[dependencies.adventure_platform_neoforge]]
 modId="minecraft"
 type="required"
-versionRange="[1.21,1.21.1)"
+versionRange="[1.21.2,1.22)"
 ordering="NONE"
 side="BOTH"
diff --git a/...er/src/main/java/net/kyori/adventure/platform/tester/neoforge/mixin/TitleScreenMixin.java b/...er/src/main/java/net/kyori/adventure/platform/tester/neoforge/mixin/TitleScreenMixin.java
@@ -34,15 +34,16 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(TitleScreen.class)
 abstract class TitleScreenMixin extends Screen {
   protected TitleScreenMixin(final Component title) {
     super(title);
   }
 
-  @Inject(method = "createNormalMenuOptions(II)V", at = @At("HEAD"))
-  void addMenuOptions(final int y, final int rowHeight, final CallbackInfo ci) {
+  @Inject(method = "createNormalMenuOptions(II)I", at = @At("HEAD"))
+  void addMenuOptions(final int y, final int rowHeight, final CallbackInfoReturnable<Integer> cir) {
     final Component nativeText = MinecraftClientAudiences.of().asNative(
       net.kyori.adventure.text.Component.translatable("menu.singleplayer", TextColor.color(0x9A40D2))
     );

diff --git a/neoforge/tester/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/tester/src/main/resources/META-INF/neoforge.mods.toml
@@ -38,14 +38,14 @@ config="adventure-platform-neoforge-tester.mixins.json"
 [[dependencies.adventure_platform_neoforge_tester]]
 modId="neoforge"
 type="required"
-versionRange="[21.0.0-beta,)"
+versionRange="[21.2.0-beta,)"
 ordering="NONE"
 side="BOTH"
 
 [[dependencies.adventure_platform_neoforge_tester]]
 modId="minecraft"
 type="required"
-versionRange="[1.21,1.21.1)"
+versionRange="[1.21.2,1.22)"
 ordering="NONE"
 side="BOTH"
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -62,8 +62,8 @@ includeAndRename("fabric")
 includeAndRename("adventure-platform-fabric:mod-shared-repack", "mod-shared-fabric-repack")
 
 // NeoForge
-/*
+
 includeAndRename("neoforge")
 includeAndRename("adventure-platform-neoforge:tester", "neoforge-tester")
 includeAndRename("adventure-platform-neoforge:services", "neoforge-services")
- */
+