add 1.21.6 1.21.7

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.36,6.2)'
     id 'org.spongepowered.mixin' version '0.7+'
 }
 
@@ -25,7 +25,7 @@ minecraft {
         configureEach {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
+            property 'forge.logging.console.level', 'info'
         }
         client {
             property 'forge.enabledGameTestNamespaces', mod_id
@@ -45,11 +45,30 @@ minecraft {
 }
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 repositories {
+    maven {
+        name = 'Forge'
+        url = 'https://maven.minecraftforge.net'
+    }
+    maven {
+        name = 'Minecraft libraries'
+        url = 'https://libraries.minecraft.net'
+    }
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = 'Sponge'
+                url = 'https://repo.spongepowered.org/repository/maven-public'
+            }
+        }
+        filter {
+            includeGroupAndSubgroups('org.spongepowered')
+        }
+    }
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
+    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.10'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 }
 

gradle.properties

@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=1024m
 systemProp.file.encoding=UTF-8
-minecraft_version=1.21
+minecraft_version=1.21.6
-minecraft_version_range=[1.21,1.21.6)
+minecraft_version_range=[1.21.6,1.21.7]
-forge_version=51.0.0
+forge_version=56.0.9
 forge_version_range=[50,)
 loader_version_range=[50,)
 mapping_channel=official
-mapping_version=1.21
+mapping_version=1.21.6
 mod_id=enchantmentdoesnotconflict
 mod_name=EnchantmentDoNotConflictForge
 mod_license=Apache License 2.0

settings.gradle

@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
 }
 
 rootProject.name= "${mod_id}-Forge-${minecraft_version}-${mod_version}"

src/main/java/com/mingliqiye/minecraft/enchantment/conflict/EnchantmentDoNotConflictForge.java

@@ -6,8 +6,9 @@ import com.mojang.logging.LogUtils;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.bus.BusGroup;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.bus.EventBus;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -18,12 +19,12 @@ public class EnchantmentDoNotConflictForge {
     public static final String MODID = "enchantmentdoesnotconflict";
     private static final Logger LOGGER = LogUtils.getLogger();
 
-    public EnchantmentDoNotConflictForge() {
+    public EnchantmentDoNotConflictForge(FMLJavaModLoadingContext context) {
-        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+        BusGroup modBusGroup = context.getModBusGroup();
-        modEventBus.addListener(this::commonSetup);
+        PlayerEvent.BUS.addListener(this::onPlayerLogin);
-        MinecraftForge.EVENT_BUS.addListener(this::onPlayerLogin);
+        FMLCommonSetupEvent.getBus(modBusGroup).addListener(this::commonSetup);
     }
-
+    @SubscribeEvent
     public void commonSetup(FMLCommonSetupEvent event) {
         event.enqueueWork(() -> {
             ChannelHander.register();
@@ -33,8 +34,8 @@ public class EnchantmentDoNotConflictForge {
     }
 
     @SubscribeEvent
-    public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) {
+    public void onPlayerLogin(PlayerEvent event) {
-        if (event.getEntity() instanceof ServerPlayer player) {
+        if (event instanceof PlayerEvent.PlayerLoggedInEvent && event.getEntity() instanceof ServerPlayer player) {
             ChannelHander.sendConfig(player);
             LOGGER.debug("Sent config to player: {}", player.getName().getString());
         }