Cleaned up the Event, adding a DataComponentsMap getter for the event…

…, and passing it thru.
MinecraftForge · May 8, 2024 · cedf346 · cedf346
1 parent 8a5fe1f
commit cedf346
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -1265,7 +1265,7 @@ public static StreamCodec<RegistryFriendlyByteBuf, Ingredient> ingredientStreamC
     public static DataComponentMap gatherItemComponents(Item item, DataComponentMap dataComponents) {
         return DataComponentMap.builder()
                 .addAll(dataComponents)
-                .addAll(ForgeEventFactory.gatherItemComponents(item).getDataComponentMap())
+                .addAll(ForgeEventFactory.gatherItemComponentsEvent(item, dataComponents).getDataComponentMap())
                 .build();
     }
 }
diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
@@ -13,6 +13,7 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 
+import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.world.item.Item;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -1062,7 +1063,7 @@ public static void onPlayerTradeWithVillager(Player player, MerchantOffer offer,
         post(new TradeWithVillagerEvent(player, offer, villager));
     }
 
-    public static GatherComponentsEvent.GatherItemComponentsEvent gatherItemComponentsEvent(Item item) {
-        return fire(new GatherComponentsEvent.GatherItemComponentsEvent(item));
+    public static GatherComponentsEvent.GatherItemComponentsEvent gatherItemComponentsEvent(Item item, DataComponentMap dataComponents) {
+        return fire(new GatherComponentsEvent.GatherItemComponentsEvent(item, dataComponents));
     }
 }
diff --git a/src/main/java/net/minecraftforge/event/GatherComponentsEvent.java b/src/main/java/net/minecraftforge/event/GatherComponentsEvent.java
@@ -27,13 +27,19 @@ public DataComponentMap getDataComponentMap() {
 
     public static class GatherItemComponentsEvent extends GatherComponentsEvent {
         private final Item item;
+        private final DataComponentMap dataComponents;
 
-        public GatherItemComponentsEvent(Item item) {
+        public GatherItemComponentsEvent(Item item, DataComponentMap dataComponents) {
             this.item = item;
+            this.dataComponents = dataComponents;
         }
 
         public Item getItem() {
             return item;
         }
+
+        public DataComponentMap getDataComponentMap() {
+            return dataComponents;
+        }
     }
 }