Fix invalid Lists import

CyclopsMC · Jun 22, 2024 · ff3d810 · ff3d810
1 parent 9444311
commit ff3d810
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/org/cyclops/cyclopscore/codec/ListCodecStrict.java b/src/main/java/org/cyclops/cyclopscore/codec/ListCodecStrict.java
@@ -1,14 +1,14 @@
 package org.cyclops.cyclopscore.codec;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.util.Unit;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.Lifecycle;
 import com.mojang.serialization.ListBuilder;
-import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import java.util.List;

diff --git a/src/main/java/org/cyclops/cyclopscore/helper/CraftingHelpers.java b/src/main/java/org/cyclops/cyclopscore/helper/CraftingHelpers.java
@@ -23,7 +23,6 @@
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.bus.api.EventPriority;
-import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.client.event.RecipesUpdatedEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.server.ServerLifecycleHooks;
@@ -43,11 +42,12 @@ public class CraftingHelpers {
     private static RecipeManager CLIENT_RECIPE_MANAGER;
 
     public static void load() {
-        NeoForge.EVENT_BUS.register(CraftingHelpers.class);
+        if (MinecraftHelpers.isClientSide()) {
+            NeoForge.EVENT_BUS.addListener(EventPriority.HIGHEST, CraftingHelpers::onRecipesLoaded);
+        }
     }
 
     @OnlyIn(Dist.CLIENT)
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
     public static void onRecipesLoaded(RecipesUpdatedEvent event) {
         CLIENT_RECIPE_MANAGER = event.getRecipeManager();
     }

diff --git a/src/main/java/org/cyclops/cyclopscore/item/ItemInformationProvider.java b/src/main/java/org/cyclops/cyclopscore/item/ItemInformationProvider.java
@@ -5,10 +5,10 @@
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent;
 import org.cyclops.cyclopscore.helper.L10NHelpers;
+import org.cyclops.cyclopscore.helper.MinecraftHelpers;
 
 import java.util.Set;
 
@@ -21,15 +21,16 @@ public class ItemInformationProvider {
     private static final Set<Item> ITEMS_INFO = Sets.newIdentityHashSet();
 
     static {
-        NeoForge.EVENT_BUS.register(ItemInformationProvider.class);
+        if (MinecraftHelpers.isClientSide()) {
+            NeoForge.EVENT_BUS.addListener(ItemInformationProvider::onTooltip);
+        }
     }
 
     public static void registerItem(Item item) {
         ITEMS_INFO.add(item);
     }
 
     @OnlyIn(Dist.CLIENT)
-    @SubscribeEvent
     public static void onTooltip(ItemTooltipEvent event) {
         ItemStack itemStack = event.getItemStack();
         if (ITEMS_INFO.contains(itemStack.getItem())) {

diff --git a/src/main/java/org/cyclops/cyclopscore/recipe/ItemStackFromIngredient.java b/src/main/java/org/cyclops/cyclopscore/recipe/ItemStackFromIngredient.java
@@ -1,11 +1,11 @@
 package org.cyclops.cyclopscore.recipe;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
-import org.apache.commons.compress.utils.Lists;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;