Fixed #3520

MohistMC · Feb 11, 2025 · 8118631 · 8118631
1 parent be9e5d3
commit 8118631
Show file tree

Hide file tree

Showing 462 changed files with 1,966 additions and 2,188 deletions.
diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@
 [![](https://img.shields.io/github/stars/MohistMC/Mohist.svg?label=Stars&logo=github)](https://github.com/MohistMC/Mohist/stargazers)
 [![](https://img.shields.io/badge/Forge-1.20.1--47.3.29-brightgreen.svg?colorB=26303d&logo=Conda-Forge)](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.1.html)
 [![](https://img.shields.io/badge/NeoForge-1.20.1--47.1.106-brightgreen.svg?colorB=26303d)](https://neoforged.net/)
-[![](https://img.shields.io/badge/JDK-17.0.10-brightgreen.svg?colorB=469C00&logo=java)](https://www.azul.com/downloads/?version=java-17-lts#zulu)
-[![](https://img.shields.io/badge/Gradle-8.8-brightgreen.svg?colorB=469C00&logo=gradle)](https://docs.gradle.org/8.8/release-notes.html)
+[![](https://img.shields.io/badge/JDK-17.0.14-brightgreen.svg?colorB=469C00&logo=java)](https://www.azul.com/downloads/?version=java-17-lts#zulu)
+[![](https://img.shields.io/badge/Gradle-8.12.1-brightgreen.svg?colorB=469C00&logo=gradle)](https://docs.gradle.org/8.12.1/release-notes.html)
 [![](https://img.shields.io/bstats/servers/6762?label=bStats)](https://bstats.org/plugin/server-implementation/Mohist/6762)
 [![](https://badges.crowdin.net/mohist/localized.svg)](https://crowdin.com/project/mohist)
 [![](https://img.shields.io/discord/311256119005937665.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)](https://discord.gg/mohistmc)
@@ -32,7 +32,8 @@ Progress
 Getting Help
 ------
 
-  [MohistWiki](https://wiki.mohistmc.com/) (Here is everything you need related to Mohist)
+  [MohistWiki](https://mohistmc.com/mohist/docs) (Here is everything you need related to Mohist)  
+  [MohistWiki CN](https://mohistmc.cn/mohist/docs) (Here is everything you need related to Mohist)
 
 Upstream Projects
 ------
@@ -48,7 +49,6 @@ Upstream Projects
 
 Special Thanks To:
 -------------
-<a href="https://ci.codemc.io/"><img src="https://i.loli.net/2020/03/11/YNicj3PLkU5BZJT.png" width="172"></a>
 
 <a href="https://www.bisecthosting.com/mohistmc"><img src="https://www.bisecthosting.com/partners/custom-banners/118608b8-6e45-4301-b244-41934cdac6d1.png"></a>
 

diff --git a/forge/fmlcore/src/main/java/net/minecraftforge/fml/IExtensionPoint.java b/forge/fmlcore/src/main/java/net/minecraftforge/fml/IExtensionPoint.java
@@ -95,5 +95,24 @@ public interface IExtensionPoint<T extends Record>
     @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
     record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
         public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
+
+        /**
+         * Ignores any version information coming from the server - use for server only mods
+         */
+        public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
+
+        /**
+         * Ignores all information and provides no information
+         */
+        public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
+
+        /**
+         * An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
+         * instead of a {@link Supplier}.
+         * <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
+         */
+        public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+            this(() -> version, remoteVersionTest);
+        }
     }
 }
diff --git a/forge/fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java b/forge/fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -66,9 +67,9 @@ public ModContainer(IModInfo info)
                     () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
                         (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
             case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
-                    () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
             case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
-                    () -> new IExtensionPoint.DisplayTest(() -> "", (incoming, isNetwork) -> true);
+                    IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
             case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
             default -> // any other value throws an exception
                     throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
@@ -147,6 +148,22 @@ public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class
         extensionPoints.put(point, extension);
     }
 
+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
+    }
+
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
+    }
+
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
     public void addConfig(final ModConfig modConfig) {
        configs.put(modConfig.getType(), modConfig);
     }

diff --git a/forge/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java b/forge/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java
@@ -66,6 +66,44 @@ public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class
         getContainer().registerExtensionPoint(point, extension);
     }
 
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
+     */
+    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
+        getContainer().registerDisplayTest(() -> displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
+     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
+     */
+    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
+        getContainer().registerDisplayTest(displayTest);
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
+     */
+    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+    }
+
+    /**
+     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
+     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
+     * creates the DisplayTest instance for you using the provided parameters.</p>
+     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
+     */
+    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+    }
+
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
         if (spec.isEmpty())
         {

diff --git a/forge/fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java b/forge/fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java
@@ -22,15 +22,12 @@ public interface DrivenExecutor extends Executor {
         boolean driveOne();
 
         default void drive(Runnable ticker) {
-            boolean ranOne = false;
             if (!selfDriven()) {
                 ticker.run();
                 while (true) {
                     if (!driveOne()) break;
-                    ranOne = true;
                 }
-            }
-            if(!ranOne) {
+            } else {
                 // park for a bit so other threads can schedule
                 LockSupport.parkNanos(PARK_TIME);
             }

diff --git a/forge/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java b/forge/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java
@@ -51,8 +51,8 @@ public enum Status
         BETA(),
         BETA_OUTDATED(6, true);
 
-        final int sheetOffset;
-        final boolean draw, animated;
+        private final int sheetOffset;
+        private final boolean draw, animated;
 
         Status()
         {
@@ -91,6 +91,9 @@ public boolean isAnimated()
             return animated;
         }
 
+        public boolean isOutdated() {
+            return this == OUTDATED || this == BETA_OUTDATED;
+        }
     }
 
     public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
@@ -257,7 +260,7 @@ else if (lat != null)
                     LOGGER.warn("Failed to process update information", e);
                     status = FAILED;
                 }
-                results.put(mod, new CheckResult(status, target, changes, display_url));
+                RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
             }
         }.start();
     }
@@ -273,12 +276,12 @@ private static List<IModInfo> gatherMods()
         return ret;
     }
 
-    private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>();
+    private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
     private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
 
     public static CheckResult getResult(IModInfo mod)
     {
-        return results.getOrDefault(mod, PENDING_CHECK);
+        return RESULTS.getOrDefault(mod, PENDING_CHECK);
     }
 
 }
diff --git a/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java b/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java
@@ -41,6 +41,7 @@ public enum ConfigValue {
         EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"),
         EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
         EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
+        EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
         ;
 
         private final String entry;

diff --git a/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionSupportMatrix.java b/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionSupportMatrix.java
@@ -18,6 +18,13 @@
 public class VersionSupportMatrix {
     private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
     static {
+//        final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
+//        if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
+//            // 1.19.2 is Compatible with 1.19.1
+//            add("languageloader.javafml", "42");
+//            add("mod.minecraft",          "1.19.1");
+//            add("mod.forge",              "42.0.9");
+//        }
         if (FMLLoader.versionInfo().mcVersion().equals("1.20.1")) {
             add("mod.forge",              "47.1.79");
         }

diff --git a/...loader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java b/...loader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java
@@ -43,7 +43,7 @@ protected IModLocator.ModFileOrException createMod(String defaultType, Path... p
         var sj = SecureJar.from(
                 Manifest::new,
                 jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
-                null,
+                (root, p) -> true,
                 path
         );
 

diff --git a/...ader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/BackgroundScanHandler.java b/...ader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/BackgroundScanHandler.java
@@ -44,7 +44,6 @@ public BackgroundScanHandler(final List<ModFile> modFiles) {
         modContentScanner = Executors.newSingleThreadExecutor(r -> {
             final Thread thread = Executors.defaultThreadFactory().newThread(r);
             thread.setDaemon(true);
-            thread.setName("Background Scan Handler");
             return thread;
         });
         scannedFiles = new ArrayList<>();

diff --git a/...r/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ExplodedDirectoryLocator.java b/...r/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ExplodedDirectoryLocator.java
@@ -34,7 +34,7 @@ public List<IModLocator.ModFileOrException> scanMods() {
         explodedMods.forEach(explodedMod ->
                 ModJarMetadata.buildFile(this,
                         jar->jar.moduleDataProvider().findFile("/META-INF/mods.toml").isPresent(),
-                        null,
+                        (a,b) -> true,
                         explodedMod.paths().toArray(Path[]::new))
                 .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
         return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList();

diff --git a/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileParser.java b/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileParser.java
@@ -41,12 +41,7 @@ public static IModFileInfo modsTomlParser(final IModFile imodFile) {
         }
 
         final FileConfig fileConfig = FileConfig.builder(modsjson).build();
-        try {
-            fileConfig.load();
-        } catch (Exception e) {
-            LOGGER.error(LogMarkers.LOADING, "Failed to read mods.toml file from mod: {}", modFile.getFilePath(), e);
-            System.exit(0);
-        }
+        fileConfig.load();
         fileConfig.close();
         final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
         return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);

diff --git a/...e/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java b/...e/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java
@@ -31,7 +31,7 @@ static Optional<IModFile> buildFile(IModLocator locator, Predicate<SecureJar> ja
     // TODO: Remove helper functions to cleanup api
     @Deprecated(forRemoval = true, since="1.18")
     static IModFile buildFile(IModLocator locator, Path... files) {
-        return buildFile(locator, j->true, null, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
+        return buildFile(locator, j->true, (a,b) -> true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
     }
 
     // TODO: Remove helper functions to cleanup api

diff --git a/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java b/forge/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java
@@ -45,7 +45,7 @@ private void fileVisitor(final Path path, final ModFileScanData result) {
         try (InputStream in = Files.newInputStream(path)){
             ModClassVisitor mcv = new ModClassVisitor();
             ClassReader cr = new ClassReader(in);
-            cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG);
+            cr.accept(mcv, 0);
             mcv.buildData(result.getClasses(), result.getAnnotations());
         } catch (IOException | IllegalArgumentException e) {
             // mark path bad

diff --git a/...oader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java b/...oader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java
@@ -40,7 +40,7 @@ public LocatedPaths getMinecraftPaths() {
         var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
         var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());
 
-        return new LocatedPaths(mcstream.build().toList(), null, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
+        return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
     }
 
     protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);

diff --git a/...oader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java b/...oader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java
@@ -40,18 +40,12 @@ public LocatedPaths getMinecraftPaths() {
             }, mcextra
         );
         BiPredicate<String, String> filter = (path, base) -> true;
-        BiPredicate<String, String> nullFilter = filter;
 
         var mcstream = Stream.<Path>builder().add(mc).add(mcextra_filtered.getRootPath());
         var modstream = Stream.<List<Path>>builder();
 
         filter = processMCStream(vers, mcstream, filter, modstream);
 
-        // use this hack instead of setting filter to null initially for backwards compatibility if anything overrides
-        // processMCStream with a custom filter
-        if (filter == nullFilter)
-            filter = null;
-
         var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
         var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
         var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

diff --git a/src/main/java/net/minecraftforge/client/ChunkRenderTypeSet.java b/src/main/java/net/minecraftforge/client/ChunkRenderTypeSet.java
@@ -7,16 +7,15 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import net.minecraft.Util;
-import net.minecraft.client.renderer.RenderType;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import net.minecraft.Util;
+import net.minecraft.client.renderer.RenderType;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An immutable ordered set (not implementing {@link java.util.Set}) of chunk {@linkplain RenderType render types}.

diff --git a/src/main/java/net/minecraftforge/client/ClientCommandHandler.java b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java
@@ -13,6 +13,8 @@
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
+import java.util.IdentityHashMap;
+import java.util.Map;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
@@ -22,7 +24,11 @@
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.commands.synchronization.SuggestionProviders;
-import net.minecraft.network.chat.*;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentUtils;
+import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
 import net.minecraftforge.client.event.RegisterClientCommandsEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -31,9 +37,6 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.util.IdentityHashMap;
-import java.util.Map;
-
 public class ClientCommandHandler
 {
     private static final Logger LOGGER = LogManager.getLogger();