InventoryChangedEvent -> InventoryChangedCallback

Gaming32 · Apr 19, 2024 · b9c3789 · b9c3789
1 parent 1680e28
commit b9c3789
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 18 deletions.
diff --git a/...32/bingo/event/InventoryChangedEvent.java → ...bingo/event/InventoryChangedCallback.java b/...32/bingo/event/InventoryChangedEvent.java → ...bingo/event/InventoryChangedCallback.java
@@ -1,12 +1,13 @@
 package io.github.gaming32.bingo.event;
 
-import dev.architectury.event.Event;
-import dev.architectury.event.EventFactory;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Inventory;
 
-public interface InventoryChangedEvent {
-    Event<InventoryChangedEvent> EVENT = EventFactory.createLoop();
+import java.util.ArrayList;
+import java.util.List;
+
+public interface InventoryChangedCallback {
+    List<InventoryChangedCallback> HANDLERS = new ArrayList<>();
 
     void inventoryChanged(ServerPlayer player, Inventory inventory);
 }
diff --git a/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinServerPlayer_2.java b/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinServerPlayer_2.java
@@ -1,6 +1,6 @@
 package io.github.gaming32.bingo.mixin.common;
 
-import io.github.gaming32.bingo.event.InventoryChangedEvent;
+import io.github.gaming32.bingo.event.InventoryChangedCallback;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
@@ -25,6 +25,8 @@ public class MixinServerPlayer_2 {
         )
     )
     private void onInventoryChanged(AbstractContainerMenu containerToSend, int dataSlotIndex, ItemStack stack, CallbackInfo ci) {
-        InventoryChangedEvent.EVENT.invoker().inventoryChanged(this$0, this$0.getInventory());
+        for (final InventoryChangedCallback handler : InventoryChangedCallback.HANDLERS) {
+            handler.inventoryChanged(this$0, this$0.getInventory());
+        }
     }
 }
diff --git a/common/src/main/java/io/github/gaming32/bingo/triggers/DifferentColoredShieldsTrigger.java b/common/src/main/java/io/github/gaming32/bingo/triggers/DifferentColoredShieldsTrigger.java
@@ -2,7 +2,7 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.gaming32.bingo.event.InventoryChangedEvent;
+import io.github.gaming32.bingo.event.InventoryChangedCallback;
 import io.github.gaming32.bingo.triggers.progress.SimpleProgressibleCriterionTrigger;
 import net.minecraft.advancements.Criterion;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -23,7 +23,7 @@
 
 public class DifferentColoredShieldsTrigger extends SimpleProgressibleCriterionTrigger<DifferentColoredShieldsTrigger.TriggerInstance> {
     static {
-        InventoryChangedEvent.EVENT.register((player, inventory) -> BingoTriggers.DIFFERENT_COLORED_SHIELDS.get().trigger(player, inventory));
+        InventoryChangedCallback.HANDLERS.add((player, inventory) -> BingoTriggers.DIFFERENT_COLORED_SHIELDS.get().trigger(player, inventory));
     }
 
     @NotNull

diff --git a/common/src/main/java/io/github/gaming32/bingo/triggers/DifferentPotionsTrigger.java b/common/src/main/java/io/github/gaming32/bingo/triggers/DifferentPotionsTrigger.java
@@ -2,7 +2,7 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.gaming32.bingo.event.InventoryChangedEvent;
+import io.github.gaming32.bingo.event.InventoryChangedCallback;
 import io.github.gaming32.bingo.triggers.progress.SimpleProgressibleCriterionTrigger;
 import net.minecraft.advancements.Criterion;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -23,7 +23,7 @@
 
 public class DifferentPotionsTrigger extends SimpleProgressibleCriterionTrigger<DifferentPotionsTrigger.TriggerInstance> {
     static {
-        InventoryChangedEvent.EVENT.register((player, inventory) -> BingoTriggers.DIFFERENT_POTIONS.get().trigger(player, inventory));
+        InventoryChangedCallback.HANDLERS.add((player, inventory) -> BingoTriggers.DIFFERENT_POTIONS.get().trigger(player, inventory));
     }
 
     @NotNull

diff --git a/common/src/main/java/io/github/gaming32/bingo/triggers/HasSomeFoodItemsTrigger.java b/common/src/main/java/io/github/gaming32/bingo/triggers/HasSomeFoodItemsTrigger.java
@@ -3,7 +3,7 @@
 import com.google.common.collect.Sets;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.gaming32.bingo.event.InventoryChangedEvent;
+import io.github.gaming32.bingo.event.InventoryChangedCallback;
 import io.github.gaming32.bingo.triggers.progress.SimpleProgressibleCriterionTrigger;
 import net.minecraft.advancements.Criterion;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -33,7 +33,7 @@
 
 public class HasSomeFoodItemsTrigger extends SimpleProgressibleCriterionTrigger<HasSomeFoodItemsTrigger.TriggerInstance> {
     static {
-        InventoryChangedEvent.EVENT.register((player, inventory) -> BingoTriggers.HAS_SOME_FOOD_ITEMS.get().trigger(player, inventory));
+        InventoryChangedCallback.HANDLERS.add((player, inventory) -> BingoTriggers.HAS_SOME_FOOD_ITEMS.get().trigger(player, inventory));
     }
 
     @NotNull

diff --git a/common/src/main/java/io/github/gaming32/bingo/triggers/HasSomeItemsFromTagTrigger.java b/common/src/main/java/io/github/gaming32/bingo/triggers/HasSomeItemsFromTagTrigger.java
@@ -3,7 +3,7 @@
 import com.google.common.collect.Sets;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.gaming32.bingo.event.InventoryChangedEvent;
+import io.github.gaming32.bingo.event.InventoryChangedCallback;
 import io.github.gaming32.bingo.triggers.progress.SimpleProgressibleCriterionTrigger;
 import io.github.gaming32.bingo.util.BingoCodecs;
 import net.minecraft.advancements.Criterion;
@@ -25,7 +25,7 @@
 
 public class HasSomeItemsFromTagTrigger extends SimpleProgressibleCriterionTrigger<HasSomeItemsFromTagTrigger.TriggerInstance> {
     static {
-        InventoryChangedEvent.EVENT.register((player, inventory) -> BingoTriggers.HAS_SOME_ITEMS_FROM_TAG.get().trigger(player, inventory));
+        InventoryChangedCallback.HANDLERS.add((player, inventory) -> BingoTriggers.HAS_SOME_ITEMS_FROM_TAG.get().trigger(player, inventory));
     }
 
     @NotNull

diff --git a/common/src/main/java/io/github/gaming32/bingo/triggers/TotalCountInventoryChangeTrigger.java b/common/src/main/java/io/github/gaming32/bingo/triggers/TotalCountInventoryChangeTrigger.java
@@ -2,7 +2,7 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.gaming32.bingo.event.InventoryChangedEvent;
+import io.github.gaming32.bingo.event.InventoryChangedCallback;
 import io.github.gaming32.bingo.triggers.progress.SimpleProgressibleCriterionTrigger;
 import net.minecraft.advancements.Criterion;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -22,7 +22,7 @@
 
 public class TotalCountInventoryChangeTrigger extends SimpleProgressibleCriterionTrigger<TotalCountInventoryChangeTrigger.TriggerInstance> {
     static {
-        InventoryChangedEvent.EVENT.register((player, inventory) -> BingoTriggers.TOTAL_COUNT_INVENTORY_CHANGED.get().trigger(player, inventory));
+        InventoryChangedCallback.HANDLERS.add((player, inventory) -> BingoTriggers.TOTAL_COUNT_INVENTORY_CHANGED.get().trigger(player, inventory));
     }
 
     @NotNull

diff --git a/common/src/main/java/io/github/gaming32/bingo/triggers/WearDifferentColoredArmorTrigger.java b/common/src/main/java/io/github/gaming32/bingo/triggers/WearDifferentColoredArmorTrigger.java
@@ -2,7 +2,7 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.gaming32.bingo.event.InventoryChangedEvent;
+import io.github.gaming32.bingo.event.InventoryChangedCallback;
 import io.github.gaming32.bingo.triggers.progress.SimpleProgressibleCriterionTrigger;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
@@ -21,7 +21,7 @@
 
 public class WearDifferentColoredArmorTrigger extends SimpleProgressibleCriterionTrigger<WearDifferentColoredArmorTrigger.TriggerInstance> {
     static {
-        InventoryChangedEvent.EVENT.register((player, inventory) -> BingoTriggers.WEAR_DIFFERENT_COLORED_ARMOR.get().trigger(player, inventory));
+        InventoryChangedCallback.HANDLERS.add((player, inventory) -> BingoTriggers.WEAR_DIFFERENT_COLORED_ARMOR.get().trigger(player, inventory));
     }
 
     @NotNull