add entity interaction to IInteractionItem (#169)

* add entity interaction to IInteractionItem * add ability for addons to register their own recipes through our system
GregTechCEu · Jul 15, 2023 · 5839a07 · 5839a07
1 parent 4c58273
commit 5839a07
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java b/common/src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java
@@ -1,6 +1,9 @@
 package com.gregtechceu.gtceu.api.addon;
 
 import com.gregtechceu.gtceu.api.addon.events.MaterialCasingCollectionEvent;
+import net.minecraft.data.recipes.FinishedRecipe;
+
+import java.util.function.Consumer;
 
 public interface IGTAddon {
 
@@ -42,6 +45,10 @@ default void registerVeinGenerators() {
 
     }
 
+    default void initializeRecipes(Consumer<FinishedRecipe> provider) {
+
+    }
+
     default void collectMaterialCasings(MaterialCasingCollectionEvent event) {
 
     }

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/ComponentItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/ComponentItem.java
@@ -163,6 +163,19 @@ public InteractionResult onItemUseFirst(ItemStack itemStack, UseOnContext contex
         return InteractionResult.PASS;
     }
 
+    @Override
+    public InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity interactionTarget, InteractionHand usedHand) {
+        for (IItemComponent component : components) {
+            if (component instanceof IInteractionItem interactionItem) {
+                var result = interactionItem.interactLivingEntity(stack, player, interactionTarget, usedHand);
+                if (result != InteractionResult.PASS) {
+                    return result;
+                }
+            }
+        }
+        return InteractionResult.PASS;
+    }
+
     @Override
     public String getDescriptionId(ItemStack stack) {
         for (IItemComponent component : components) {

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/component/IInteractionItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/component/IInteractionItem.java
@@ -41,4 +41,8 @@ default ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity liv
     default InteractionResult onItemUseFirst(ItemStack itemStack, UseOnContext context) {
         return InteractionResult.PASS;
     }
+
+    default InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity interactionTarget, InteractionHand usedHand) {
+        return InteractionResult.PASS;
+    }
 }
diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java
@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.common.data;
 
 import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.addon.AddonFinder;
 import com.gregtechceu.gtceu.data.recipe.MaterialInfoLoader;
 import com.gregtechceu.gtceu.data.recipe.configurable.RecipeAddition;
 import com.gregtechceu.gtceu.data.recipe.configurable.RecipeRemoval;
@@ -65,6 +66,8 @@ public static void recipeAddition(Consumer<FinishedRecipe> consumer) {
         if (GTCEu.isCreateLoaded()) {
             CreateRecipeLoader.init(consumer);
         }
+
+        AddonFinder.getAddons().forEach(addon -> addon.initializeRecipes(consumer));
     }
 
     /*