1.21.11

Author: Novampr

fabric/src/main/resources/fabric.mod.json

@@ -23,7 +23,7 @@
     "floodgate.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.15.10",
+    "fabricloader": ">=0.18.2",
     "fabric-api": "*",
     "minecraft": ">=$minecraft_version"
   }

gradle/libs.versions.toml

@@ -4,11 +4,11 @@ blossom = "1.2.0"
 indra = "3.1.3"
 shadow = "8.1.1"
 architectury-plugin = "3.4-SNAPSHOT"
-architectury-loom = "1.11-SNAPSHOT"
-minecraft-version = "1.21.9"
+architectury-loom = "1.13-SNAPSHOT"
+minecraft-version = "1.21.11"
 minotaur = "2.+"
 guice = "6.0.0"
-cloud = "2.0.0-beta.11"
+cloud = "2.0.0-beta.15"
 lombok = "8.6"
 bstats = "3.0.2"
 configutils = "1.0-SNAPSHOT"
@@ -17,12 +17,12 @@ asm = "5.2"
 floodgate = "core-repackage-2.2.3-SNAPSHOT"
 
 # fabric
-fabric-loader = "0.17.2"
-fabric-api = "0.133.14+1.21.9"
-fabric-permissions-api = "0.4.1"
+fabric-loader = "0.18.2"
+fabric-api = "0.139.5+1.21.11"
+fabric-permissions-api = "0.6.1"
 
 # neoforge
-neoforge-version = "21.9.14-beta"
+neoforge-version = "21.11.0-beta"
 
 [libraries]
 floodgate-core = { group = "org.geysermc.floodgate", name = "core", version.ref = "floodgate" }

mod/src/main/java/org/geysermc/floodgate/mod/pluginmessage/payloads/FormPayload.java

@@ -4,12 +4,12 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public record FormPayload(byte[] data) implements CustomPacketPayload {
     public static final StreamCodec<FriendlyByteBuf, FormPayload> STREAM_CODEC = CustomPacketPayload.codec(FormPayload::write, FormPayload::new);
-    public static final CustomPacketPayload.Type<FormPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:form"));
+    public static final CustomPacketPayload.Type<FormPayload> TYPE = new Type<>(Identifier.parse("floodgate:form"));
 
     private FormPayload(FriendlyByteBuf friendlyByteBuf) {
         this(ByteBufUtil.getBytes(friendlyByteBuf));

mod/src/main/java/org/geysermc/floodgate/mod/pluginmessage/payloads/PacketPayload.java

@@ -4,12 +4,12 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public record PacketPayload(byte[] data) implements CustomPacketPayload {
     public static final StreamCodec<FriendlyByteBuf, PacketPayload> STREAM_CODEC = CustomPacketPayload.codec(PacketPayload::write, PacketPayload::new);
-    public static final CustomPacketPayload.Type<PacketPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:packet"));
+    public static final CustomPacketPayload.Type<PacketPayload> TYPE = new Type<>(Identifier.parse("floodgate:packet"));
 
     private PacketPayload(FriendlyByteBuf friendlyByteBuf) {
         this(ByteBufUtil.getBytes(friendlyByteBuf));

mod/src/main/java/org/geysermc/floodgate/mod/pluginmessage/payloads/SkinPayload.java

@@ -4,12 +4,12 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public record SkinPayload(byte[] data) implements CustomPacketPayload {
     public static final StreamCodec<FriendlyByteBuf, SkinPayload> STREAM_CODEC = CustomPacketPayload.codec(SkinPayload::write, SkinPayload::new);
-    public static final CustomPacketPayload.Type<SkinPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:skin"));
+    public static final CustomPacketPayload.Type<SkinPayload> TYPE = new Type<>(Identifier.parse("floodgate:skin"));
 
     private SkinPayload(FriendlyByteBuf friendlyByteBuf) {
         this(ByteBufUtil.getBytes(friendlyByteBuf));

mod/src/main/java/org/geysermc/floodgate/mod/pluginmessage/payloads/TransferPayload.java

@@ -4,12 +4,12 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public record TransferPayload(byte[] data) implements CustomPacketPayload {
     public static final StreamCodec<FriendlyByteBuf, TransferPayload> STREAM_CODEC = CustomPacketPayload.codec(TransferPayload::write, TransferPayload::new);
-    public static final CustomPacketPayload.Type<TransferPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:transfer"));
+    public static final CustomPacketPayload.Type<TransferPayload> TYPE = new Type<>(Identifier.parse("floodgate:transfer"));
 
     private TransferPayload(FriendlyByteBuf friendlyByteBuf) {
         this(ByteBufUtil.getBytes(friendlyByteBuf));

neoforge/src/main/java/org/geysermc/floodgate/mod/util/neoforge/ModMixinConfigPluginImpl.java

@@ -1,10 +1,10 @@
 package org.geysermc.floodgate.mod.util.neoforge;
 
-import net.neoforged.fml.loading.LoadingModList;
+import net.neoforged.fml.loading.FMLLoader;
 
 public class ModMixinConfigPluginImpl {
     public static boolean isGeyserLoaded() {
-        return LoadingModList.get().getModFileById("geyser_neoforge") != null;
+        return FMLLoader.getCurrent().getLoadingModList().getModFileById("geyser_neoforge") != null;
     }
 
     public static boolean applyProxyFix() {

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -14,7 +14,7 @@ config = "floodgate.mixins.json"
 [[dependencies.floodgate]]
 modId="neoforge"
 type="required"
-versionRange="[21.9.14-beta,)"
+versionRange="[21.11.0-beta,)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.floodgate]]