Bump minecraft version to 1.20.5 & bump neoforge to 20.5.0-beta

MinecraftFreecam · Apr 24, 2024 · c8647a3 · c8647a3
1 parent fb614f6
commit c8647a3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/common/src/main/java/net/xolt/freecam/util/FreeCamera.java b/common/src/main/java/net/xolt/freecam/util/FreeCamera.java
@@ -37,8 +37,8 @@ public class FreeCamera extends LocalPlayer {
                     null,
                     MC.getCurrentServer(),
                     MC.screen,
-                    Collections.emptyMap(), //TODO cookies
-                    MC.gui.getChat().storeState(), //TODO state
+                    Collections.emptyMap(),
+                    MC.gui.getChat().storeState(),
                     false)) {
         @Override
         public void send(Packet<?> packet) {

diff --git a/gradle.properties b/gradle.properties
@@ -26,21 +26,21 @@ release_type=release
 # https://maven.parchmentmc.org/org/parchmentmc/data
 # Forge dependencies use maven's version range spec:
 # https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
-minecraft_version=1.20.5-rc1
+minecraft_version=1.20.5
 parchment_version=1.20.4-2024.02.25
 supported_mc_versions=
 
 fabric_loader_version=0.15.10
-fabric_api_version=0.97.3+1.20.5
+fabric_api_version=0.97.6+1.20.5
 fabric_loader_req=>=0.12.11
 fabric_mc_req=>1.20.4
 fabric_supported_mc_versions=
 
-neoforge_version=20.5.0-alpha.1.20.5-rc1.20240419.231322
-neoforge_pr=794
+neoforge_version=20.5.0-beta
+neoforge_pr=
 neoforge_mc_req=[1.20.5,)
 neoforge_loader_req=[1,)
-neoforge_req=[20.5.0-alpha.1.20.5-rc1,)
+neoforge_req=[20.5.0-beta,)
 neoforge_supported_mc_versions=
 
 # Other dependencies

diff --git a/metadata/build.gradle b/metadata/build.gradle
@@ -67,7 +67,7 @@ platforms.each { platform -> variants.each { variant ->
             expand inputs.properties + overrides
         }
 
-        filesMatching("META-INF/mods.toml") {
+        filesMatching("META-INF/neoforge.mods.toml") {
             expand inputs.properties + overrides
         }
     }
@@ -78,4 +78,4 @@ platforms.each { platform -> variants.each { variant ->
     // Export the artifact so that other projects can use it
     configurations.register(name)
     artifacts.add(name, task)
-}}
+}}
diff --git a/metadata/src/neoforge/META-INF/mods.toml → .../src/neoforge/META-INF/neoforge.mods.toml b/metadata/src/neoforge/META-INF/mods.toml → .../src/neoforge/META-INF/neoforge.mods.toml
diff --git a/neoforge/src/main/java/net/xolt/freecam/forge/FreecamForge.java b/neoforge/src/main/java/net/xolt/freecam/forge/FreecamForge.java
@@ -7,7 +7,7 @@
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.common.Mod.EventBusSubscriber.Bus;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
@@ -17,7 +17,7 @@
 import net.xolt.freecam.config.ModConfig;
 
 @Mod(Freecam.MOD_ID)
-@Mod.EventBusSubscriber(bus = Bus.MOD, value = Dist.CLIENT)
+@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 @SuppressWarnings("unused")
 public class FreecamForge {
 
@@ -36,7 +36,7 @@ public static void registerKeymappings(RegisterKeyMappingsEvent event) {
         ModBindings.forEach(event::register);
     }
 
-    @Mod.EventBusSubscriber(bus = Bus.FORGE, value = Dist.CLIENT)
+    @EventBusSubscriber(bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT)
     public static class GlobalEventHandler {
         @SubscribeEvent(priority = EventPriority.HIGH)
         public static void onTick(TickEvent.ClientTickEvent event) {