update Botania integration for MC1.18.2

build.gradle

@@ -104,14 +104,12 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:${jei_version}")
 
-    /*
     compileOnly fg.deobf([
             group: "vazkii.botania",
             name: "Botania",
             version: "${project.botania}",
             classifier: "api"
     ])
-    */
 }
 
 jar {

gradle.properties

@@ -10,9 +10,9 @@ mcp_channel=official
 mcp_mappings=1.18.2
 
 # Source: https://maven.blamejared.com/vazkii/botania/Botania/
-# botania=1.16.2-405
+botania=1.18.2-430-SNAPSHOT
 # Source: https://dvs1.progwml6.com/files/maven/mezz/jei/
 jei_version=jei-1.18.2:9.5.0.132
 
 version_major=2
-version_minor=6
+version_minor=7

src/main/java/thetadev/constructionwand/containers/ContainerRegistrar.java

@@ -1,6 +1,8 @@
 package thetadev.constructionwand.containers;
 
+import net.minecraftforge.fml.ModList;
 import thetadev.constructionwand.ConstructionWand;
+import thetadev.constructionwand.containers.handlers.HandlerBotania;
 import thetadev.constructionwand.containers.handlers.HandlerBundle;
 import thetadev.constructionwand.containers.handlers.HandlerCapability;
 import thetadev.constructionwand.containers.handlers.HandlerShulkerbox;
@@ -12,13 +14,9 @@ public static void register() {
         ConstructionWand.instance.containerManager.register(new HandlerShulkerbox());
         ConstructionWand.instance.containerManager.register(new HandlerBundle());
 
-        /*
-        TODO: Reenable this when Botania gets ported to 1.17
-
         if(ModList.get().isLoaded("botania")) {
             ConstructionWand.instance.containerManager.register(new HandlerBotania());
             ConstructionWand.LOGGER.info("Botania integration added");
         }
-        */
     }
 }

src/main/java/thetadev/constructionwand/containers/handlers/HandlerBotania.java

@@ -1,36 +1,41 @@
-/*
-TODO: Reenable this when Botania gets ported to 1.17
-
 package thetadev.constructionwand.containers.handlers;
 
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
 import thetadev.constructionwand.api.IContainerHandler;
+import vazkii.botania.api.BotaniaForgeCapabilities;
 import vazkii.botania.api.item.IBlockProvider;
 
+import java.util.Optional;
+
 public class HandlerBotania implements IContainerHandler
 {
     @Override
     public boolean matches(Player player, ItemStack itemStack, ItemStack inventoryStack) {
-        return inventoryStack != null && inventoryStack.getCount() == 1 && inventoryStack.getItem() instanceof IBlockProvider;
+        return inventoryStack != null && inventoryStack.getCapability(BotaniaForgeCapabilities.BLOCK_PROVIDER).isPresent();
     }
 
     @Override
     public int countItems(Player player, ItemStack itemStack, ItemStack inventoryStack) {
-        IBlockProvider prov = (IBlockProvider) inventoryStack.getItem();
-        int provCount = prov.getBlockCount(player, itemStack, inventoryStack, Block.byItem(itemStack.getItem()));
+        Optional<IBlockProvider> provOptional = inventoryStack.getCapability(BotaniaForgeCapabilities.BLOCK_PROVIDER).resolve();
+        if(provOptional.isEmpty()) return 0;
+
+        IBlockProvider prov = provOptional.get();
+        int provCount = prov.getBlockCount(player, inventoryStack, Block.byItem(itemStack.getItem()));
         if(provCount == -1)
             return Integer.MAX_VALUE;
         return provCount;
     }
 
     @Override
     public int useItems(Player player, ItemStack itemStack, ItemStack inventoryStack, int count) {
-        IBlockProvider prov = (IBlockProvider) inventoryStack.getItem();
-        if(prov.provideBlock(player, itemStack, inventoryStack, Block.byItem(itemStack.getItem()), true))
+        Optional<IBlockProvider> provOptional = inventoryStack.getCapability(BotaniaForgeCapabilities.BLOCK_PROVIDER).resolve();
+        if(provOptional.isEmpty()) return 0;
+
+        IBlockProvider prov = provOptional.get();
+        if(prov.provideBlock(player, inventoryStack, Block.byItem(itemStack.getItem()), true))
             return 0;
         return count;
     }
-}
-*/
+}