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
This commit is contained in:
Temm authored and GitHub committed 2024-10-21 21:37:39 +02:00
1 parent 2eabe09ad0
commit 1dd669348e
3 files changed
+64

No files matched your search

+5
View File
@@ -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')
}
@@ -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());
}
@@ -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));
}
}