Adapt to OnlyIn removal

NeoForge 21.7.3 has removed OnlyIn from production. This fixes the crash on startup when Architectury API is used on this version.

Author: cassiancc

gradle.properties

@@ -19,7 +19,7 @@ fabric_api_version=0.128.1+1.21.7
 mod_menu_version=15.0.0-beta.1
 
 forge_version=51.0.0
-neoforge_version=21.7.1-beta
+neoforge_version=21.7.3-beta
 
 # Set to empty if not snapshots
 neoforge_pr=

neoforge/src/main/java/dev/architectury/hooks/client/forge/ClientExtensionsRegistryImpl.java

@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-@EventBusSubscriber(modid = ArchitecturyConstants.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+@EventBusSubscriber(modid = ArchitecturyConstants.MOD_ID, value = Dist.CLIENT)
 public class ClientExtensionsRegistryImpl {
     private static final List<Consumer<@Nullable RegisterClientExtensionsEvent>> CALLBACKS = new ArrayList<>();
     private static boolean called = false;

neoforge/src/main/java/dev/architectury/networking/forge/NetworkManagerImpl.java

@@ -30,7 +30,6 @@
 import dev.architectury.utils.Env;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.Packet;
@@ -49,6 +48,9 @@
 import net.neoforged.neoforge.network.handling.IPayloadContext;
 import org.slf4j.Logger;
 
+import static dev.architectury.networking.forge.client.ClientNetworkManagerImpl.getClientPlayer;
+import static dev.architectury.networking.forge.client.ClientNetworkManagerImpl.getClientRegistryAccess;
+
 public class NetworkManagerImpl {
     private static final Logger LOGGER = LogUtils.getLogger();
 
@@ -134,24 +136,4 @@ public static boolean canPlayerReceive(ServerPlayer player, ResourceLocation id)
     public static Packet<ClientGamePacketListener> createAddEntityPacket(Entity entity, ServerEntity serverEntity) {
         return SpawnEntityPacket.create(entity, serverEntity);
     }
-    
-    @OnlyIn(Dist.CLIENT)
-    public static Player getClientPlayer() {
-        return Minecraft.getInstance().player;
-    }
-    
-    @OnlyIn(Dist.CLIENT)
-    public static RegistryAccess getClientRegistryAccess() {
-        if (Minecraft.getInstance().level != null) {
-            return Minecraft.getInstance().level.registryAccess();
-        } else if (Minecraft.getInstance().getConnection() != null) {
-            return Minecraft.getInstance().getConnection().registryAccess();
-        } else if (Minecraft.getInstance().gameMode != null) {
-            // Sometimes the packet is sent way too fast and is between the connection and the level, better safe than sorry
-            return Minecraft.getInstance().gameMode.connection.registryAccess();
-        }
-        
-        // Fail-safe
-        return RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY);
-    }
 }

neoforge/src/main/java/dev/architectury/networking/forge/client/ClientNetworkManagerImpl.java

@@ -0,0 +1,26 @@
+package dev.architectury.networking.forge.client;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.entity.player.Player;
+
+public class ClientNetworkManagerImpl {
+    public static Player getClientPlayer() {
+        return Minecraft.getInstance().player;
+    }
+    
+    public static RegistryAccess getClientRegistryAccess() {
+        if (Minecraft.getInstance().level != null) {
+            return Minecraft.getInstance().level.registryAccess();
+        } else if (Minecraft.getInstance().getConnection() != null) {
+            return Minecraft.getInstance().getConnection().registryAccess();
+        } else if (Minecraft.getInstance().gameMode != null) {
+            // Sometimes the packet is sent way too fast and is between the connection and the level, better safe than sorry
+            return Minecraft.getInstance().gameMode.connection.registryAccess();
+        }
+        
+        // Fail-safe
+        return RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY);
+    }
+}