From 1dd669348e9eb10ae48e94705d823799160b6eb7 Mon Sep 17 00:00:00 2001 From: Temm Date: Mon, 21 Oct 2024 21:37:39 +0200 Subject: [PATCH] feat: add thaumcraft integration to search for essentia (#24) * feat: add thaumcraft integration to search for essentia * feat: expand thaumcraft integration to search by container * expand wildcard import --- dependencies.gradle | 5 ++ src/main/java/com/gtnh/findit/FindIt.java | 5 ++ .../findit/handler/ThaumcraftProvider.java | 54 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 src/main/java/com/gtnh/findit/handler/ThaumcraftProvider.java diff --git a/dependencies.gradle b/dependencies.gradle index 0f8c38e..8e2d971 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,9 +10,14 @@ dependencies { compileOnly('com.github.GTNewHorizons:AdventureBackpack2:1.2.2-GTNH:dev') compileOnly("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") compileOnly("com.github.GTNewHorizons:Minecraft-Backpack-Mod:2.4.3-GTNH:dev") + compileOnly("curse.maven:thaumcraft-nei-plugin-225095:2241913") + compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") // For testing in dev environment. // runtimeOnlyNonPublishable('com.github.GTNewHorizons:StorageDrawers:1.13.5-GTNH') // runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.8.1") + // runtimeOnlyNonPublishable('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') + // runtimeOnlyNonPublishable("com.github.GTNewHorizons:Baubles:1.0.4:dev") + // runtimeOnlyNonPublishable('curse.maven:thaumcraft-nei-plugin-225095:2241913') } diff --git a/src/main/java/com/gtnh/findit/FindIt.java b/src/main/java/com/gtnh/findit/FindIt.java index 5d5f276..90dbae1 100644 --- a/src/main/java/com/gtnh/findit/FindIt.java +++ b/src/main/java/com/gtnh/findit/FindIt.java @@ -10,6 +10,7 @@ import com.gtnh.findit.handler.DraconicEvolutionProvider; import com.gtnh.findit.handler.ForestryStackFilterProvider; import com.gtnh.findit.handler.MinecraftProvider; import com.gtnh.findit.handler.ProjectRedExplorationProvider; +import com.gtnh.findit.handler.ThaumcraftProvider; import com.gtnh.findit.service.blockfinder.BlockFindService; import com.gtnh.findit.service.blockfinder.ClientBlockFindService; import com.gtnh.findit.service.cooldown.SearchCooldownService; @@ -85,6 +86,10 @@ public class FindIt { this.pluginsList.add(new BackpackProvider()); } + if (Loader.isModLoaded("thaumcraftneiplugin") && Loader.isModLoaded("Thaumcraft")) { + this.pluginsList.add(new ThaumcraftProvider()); + } + this.pluginsList.add(new MinecraftProvider()); } diff --git a/src/main/java/com/gtnh/findit/handler/ThaumcraftProvider.java b/src/main/java/com/gtnh/findit/handler/ThaumcraftProvider.java new file mode 100644 index 0000000..24ee20d --- /dev/null +++ b/src/main/java/com/gtnh/findit/handler/ThaumcraftProvider.java @@ -0,0 +1,54 @@ +package com.gtnh.findit.handler; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import com.djgiannuzz.thaumcraftneiplugin.items.ItemAspect; +import com.gtnh.findit.IStackFilter; +import com.gtnh.findit.IStackFilter.IStackFilterProvider; +import com.gtnh.findit.service.itemfinder.FindItemRequest; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IAspectContainer; +import thaumcraft.api.aspects.IEssentiaContainerItem; + +public class ThaumcraftProvider implements IStackFilterProvider { + + static class AspectStackFilter implements IStackFilter { + + AspectList filterAspects; + + AspectStackFilter(AspectList filterAspects) { + this.filterAspects = filterAspects; + } + + @Override + public boolean matches(FindItemRequest request) { + ItemStack stack = request.getStackToFind(); + Item item = stack.getItem(); + if (!(item instanceof ItemAspect || item instanceof IEssentiaContainerItem)) return false; + + AspectList stackAspects = ItemAspect.getAspects(stack); + if (stackAspects.size() != 1) return false; + + Aspect stackAspect = stackAspects.getAspects()[0]; + + return filterAspects.getAmount(stackAspect) > 0; + } + } + + @Override + public IStackFilter getFilter(EntityPlayer player, TileEntity tileEntity) { + if (!(tileEntity instanceof IAspectContainer aspectContainer)) return null; + return new AspectStackFilter(aspectContainer.getAspects()); + } + + @Override + public IStackFilter getFilter(EntityPlayer player, ItemStack stack) { + if (!(stack.getItem() instanceof IEssentiaContainerItem containerItem)) return null; + return new AspectStackFilter(containerItem.getAspects(stack)); + } +}