From e9bd8e51ccf03c53d35f37b69776cc2b28ca6669 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Nov 2017 12:23:24 -0600 Subject: [PATCH] Remove corporea DSU integration because MFR isn't here --- .../core/handler/InternalMethodHandler.java | 7 +- .../corporea/WrappedDeepStorage.java | 135 ------------------ 2 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 0510de46d..719f5d024 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -54,7 +54,6 @@ import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; -import vazkii.botania.common.integration.corporea.WrappedDeepStorage; import vazkii.botania.common.integration.corporea.WrappedIInventory; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -270,10 +269,8 @@ public class InternalMethodHandler extends DummyMethodHandler { for(InvWithLocation inv : inventories) { ICorporeaSpark spark = CorporeaHelper.getSparkForInventory(inv); IWrappedInventory wrapped = null; - // try DeepStorageUnit - if(wrapped == null) { - wrapped = WrappedDeepStorage.wrap(inv, spark); - } + // try integrations + // last chance - this will always work if(wrapped == null) { wrapped = WrappedIInventory.wrap(inv, spark); diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java deleted file mode 100644 index af5bff654..000000000 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ /dev/null @@ -1,135 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - */ -package vazkii.botania.common.integration.corporea; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.wrapper.InvWrapper; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; -import vazkii.botania.api.corporea.CorporeaRequest; -import vazkii.botania.api.corporea.ICorporeaSpark; -import vazkii.botania.api.corporea.IWrappedInventory; -import vazkii.botania.api.corporea.InvWithLocation; -import vazkii.botania.common.Botania; - -import java.util.ArrayList; -import java.util.List; - -/** - * Wrapper for StorageDrawers compatibility. - * - */ -public class WrappedDeepStorage extends WrappedInventoryBase { - - private static boolean checkedInterface = false; - private static boolean deepStoragePresent = false; - - private final IDeepStorageUnit invRaw; - - private WrappedDeepStorage(IDeepStorageUnit inv, ICorporeaSpark spark) { - invRaw = inv; - this.spark = spark; - } - - @Override - public InvWithLocation getWrappedObject() { - return new InvWithLocation(new InvWrapper((IInventory) invRaw), spark.getSparkInventory().world, spark.getSparkInventory().pos); - } - - @Override - public List countItems(CorporeaRequest request) { - return iterateOverStacks(request, false); - } - - @Override - public List extractItems(CorporeaRequest request) { - return iterateOverStacks(request, true); - } - - private List iterateOverStacks(CorporeaRequest request, boolean doit) { - List stacks = new ArrayList(); - boolean removedAny = false; - - ItemStack prototype = invRaw.getStoredItemType(); - if(prototype == null) { - // for the case of barrel without contents set - return stacks; - } - int storedCount = prototype.getCount(); - - // WARNING: this code is very similar in all implementations of - // IWrappedInventory - keep it synch - // this code is also near duplicate to WrappedStorageDrawers - keep it - // synchronized - if(isMatchingItemStack(request.matcher, request.checkNBT, prototype)) { - int rem = Math.min(storedCount, request.count == -1 ? storedCount : request.count); - - if(rem > 0) { - ItemStack copy = prototype.copy(); - copy.setCount(rem); - if(doit) { - stacks.addAll(breakDownBigStack(copy)); - } else { - stacks.add(copy); - } - } - - request.foundItems += storedCount; - request.extractedItems += rem; - - if(doit && rem > 0) { - decreaseStoredCount(invRaw, rem); - - removedAny = true; - if(spark != null) - spark.onItemExtracted(prototype); - } - if(request.count != -1) - request.count -= rem; - } - if(removedAny) { - // inv.markDirtyIfNeeded(); - } - return stacks; - } - - private void decreaseStoredCount(IDeepStorageUnit inventory, int rem) { - inventory.setStoredItemCount(inventory.getStoredItemType().getCount() - rem); - } - - /** - * Creates {@link WrappedDeepStorage} if specified inv can be wrapped. - * - * @return wrapped inventory or null if it has incompatible type. - */ - public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { - if(isDeepStorageNeeded() && inv.handler instanceof InvWrapper && ((InvWrapper) inv.handler).getInv() instanceof IDeepStorageUnit) { - return new WrappedDeepStorage((IDeepStorageUnit) ((InvWrapper) inv.handler).getInv(), spark); - } else return null; - } - - /** - * This method checks for presence of Deep Storage API in the pack - if some - * other mod provides IDeepStorageUnit, support for Deep Storage will be - * used. This way we don't have to ship IDeepStorageUnit in Botania jar. - */ - private static boolean isDeepStorageNeeded() { - if(!checkedInterface) { - try { - deepStoragePresent = Class.forName("powercrystals.minefactoryreloaded.api.IDeepStorageUnit") != null; - } catch (ClassNotFoundException e) { - deepStoragePresent = false; - } - checkedInterface = true; - Botania.LOGGER.info("Corporea support for Deep Storage: %b", deepStoragePresent); - } - return deepStoragePresent; - } -}