Port to 1.21

Signed-off-by: ErdbeerbaerLP <[email protected]>

Author: ErdbeerbaerLP

build.gradle

@@ -14,7 +14,7 @@ plugins {
     id 'idea'
     id "com.modrinth.minotaur" version "2.+"
     id 'com.github.johnrengelman.shadow' version '8.1.1+'
-    id 'net.neoforged.gradle.userdev' version '7.0.109'
+    id 'net.neoforged.gradle.userdev' version '7.0.142'
 
 }
 apply plugin: 'eclipse'
@@ -82,7 +82,7 @@ dependencies {
     }
 
     // =========  NeoForge =============
-    implementation "net.neoforged:neoforge:20.6.48-beta"
+    implementation "net.neoforged:neoforge:21.0.0-beta"
 
     //Dynmap-API
     compileOnly('com.github.webbukkit:DynmapCoreAPI:2.5')

gradle.properties

@@ -2,9 +2,9 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-changelog=Port to 1.20.6
-releaseType = RELEASE
-mcVersion = 1.20.6
+changelog=Port to 1.21, barely tested!
+releaseType = BETA
+mcVersion = 1.21
 
 
 neogradle.subsystems.parchment.minecraftVersion=1.20.6

src/main/java/de/erdbeerbaerlp/dcintegration/forge/mixin/MixinNetHandlerPlayServer.java

@@ -1,6 +1,7 @@
 package de.erdbeerbaerlp.dcintegration.forge.mixin;
 
 import de.erdbeerbaerlp.dcintegration.forge.DiscordIntegrationMod;
+import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
@@ -19,8 +20,8 @@ public class MixinNetHandlerPlayServer {
     public ServerPlayer player;
 
     @Inject(method = "onDisconnect", at = @At("HEAD"))
-    private void onDisconnect(final Component textComponent, CallbackInfo ci) {
-        if (textComponent.equals(Component.translatable("disconnect.timeout")))
+    private void onDisconnect(final DisconnectionDetails d, CallbackInfo ci) {
+        if (d.reason().equals(Component.translatable("disconnect.timeout")))
             DiscordIntegrationMod.timeouts.add(this.player.getUUID());
     }
 }

src/main/java/de/erdbeerbaerlp/dcintegration/forge/util/ForgeMessageUtils.java

@@ -75,7 +75,7 @@ public static MessageEmbed genItemStackEmbedIfAvailable(final Component componen
                             if (hoverEvent.getAsJsonObject("contents").has("tag")) {
                                 final JsonObject item = hoverEvent.getAsJsonObject("contents").getAsJsonObject();
                                 try {
-                                    final ItemStack is = new ItemStack(itemreg.get(new ResourceLocation(item.get("id").getAsString())));
+                                    final ItemStack is = new ItemStack(itemreg.get(ResourceLocation.parse(item.get("id").getAsString())));
                                     ItemStack.parse(ServerLifecycleHooks.getCurrentServer().registryAccess(), NbtTagArgument.nbtTag().parse(new StringReader(item.getAsString())));
                                     final DataComponentMap itemTag = is.getComponents();
                                     final EmbedBuilder b = new EmbedBuilder();
@@ -94,7 +94,7 @@ public static MessageEmbed genItemStackEmbedIfAvailable(final Component componen
                                         final ItemEnchantments e = itemTag.get(DataComponents.ENCHANTMENTS);
                                         if (((ShowInTooltipAccessor) e).discordIntegrationFabric$showsInTooltip())
                                             for (Object2IntMap.Entry<Holder<Enchantment>> ench : e.entrySet()) {
-                                                tooltip.append(ChatFormatting.stripFormatting(ench.getKey().value().getFullname(e.getLevel(ench.getKey().value())).getString())).append("\n");
+                                                tooltip.append(ChatFormatting.stripFormatting(ench.getKey().value().getFullname(ench.getKey(),e.getLevel(ench.getKey())).getString())).append("\n");
                                             }
                                     }
                                     if(itemTag.has(DataComponents.LORE)) {

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

@@ -24,7 +24,7 @@ displayTest="IGNORE_SERVER_VERSION"
 [[dependencies.dcintegration]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.6,]"
+versionRange = "[1.21,]"
 ordering = "NONE"
 side = "SERVER"
 [[dependencies.dcintegration]]