From 00f64817e17f69db1ba797c9a1120bf23f1bfcf0 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Sun, 27 Oct 2024 12:43:54 -0500
Subject: [PATCH] Minor code improvements

---
 .../main/java/io/github/gaming32/bingo/Bingo.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/io/github/gaming32/bingo/Bingo.java b/common/src/main/java/io/github/gaming32/bingo/Bingo.java
index 9f8efbb3..d7bf9df1 100644
--- a/common/src/main/java/io/github/gaming32/bingo/Bingo.java
+++ b/common/src/main/java/io/github/gaming32/bingo/Bingo.java
@@ -3,7 +3,6 @@
 import com.demonwav.mcdev.annotations.Translatable;
 import com.mojang.logging.LogUtils;
 import io.github.gaming32.bingo.conditions.BingoConditions;
-import io.github.gaming32.bingo.conditions.BingoContextKeySets;
 import io.github.gaming32.bingo.data.BingoDifficulty;
 import io.github.gaming32.bingo.data.BingoGoal;
 import io.github.gaming32.bingo.data.BingoRegistries;
@@ -45,7 +44,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -74,6 +72,12 @@ public static void init() {
     private static void registerEventHandlers() {
         Event.REGISTER_COMMANDS.register(BingoCommand::register);
 
+        Event.REGISTER_CONFIGURATION_TASKS.register(registrar -> {
+            if (registrar.canSend(ProtocolVersionPayload.TYPE)) {
+                registrar.addTask(ProtocolVersionConfigurationTask.INSTANCE);
+            }
+        });
+
         Event.PLAYER_JOIN.register(player -> {
             if (activeGame != null) {
                 activeGame.addPlayer(player);
@@ -155,7 +159,6 @@ private static void registerEventHandlers() {
 
     private static void initializeRegistries() {
         BingoConditions.load();
-        BingoContextKeySets.load();
         GoalIconType.load();
         BingoSubType.load();
         ProgressTrackerType.load();
@@ -178,12 +181,6 @@ private static void registerDataReloadListeners() {
     }
 
     private static void registerPayloadHandlers() {
-        Event.REGISTER_CONFIGURATION_TASKS.register(registrar -> {
-            if (registrar.canSend(ProtocolVersionPayload.TYPE)) {
-                registrar.addTask(ProtocolVersionConfigurationTask.INSTANCE);
-            }
-        });
-
         BingoNetworking.instance().onRegister(registrar -> {
             registrar.register(ConnectionProtocol.CONFIGURATION, null, ProtocolVersionPayload.TYPE, ProtocolVersionPayload.CODEC, (payload, context) -> {
                 switch (context.flow()) {