mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Updated StorageDrawers Integration.
- StorageDrawers now has support for Capabilities, so Botania no longers needs a special wrapper for Drawers.
This commit is contained in:
1 parent
2338c39868
commit
c4f4b5ffaa
7 files changed
-311
No files matched your search
@@ -103,7 +103,6 @@ public class Botania {
|
||||
public static boolean bloodMagicLoaded = false;
|
||||
public static boolean coloredLightsLoaded = false;
|
||||
public static boolean etFuturumLoaded = false;
|
||||
public static boolean storageDrawersLoaded = false;
|
||||
|
||||
@Instance(LibMisc.MOD_ID)
|
||||
public static Botania instance;
|
||||
@@ -122,7 +121,6 @@ public class Botania {
|
||||
bloodMagicLoaded = Loader.isModLoaded("bloodmagic"); // Psh, noob
|
||||
coloredLightsLoaded = Loader.isModLoaded("easycoloredlights");
|
||||
etFuturumLoaded = Loader.isModLoaded("etfuturum");
|
||||
storageDrawersLoaded = Loader.isModLoaded("storagedrawers");
|
||||
|
||||
BotaniaAPI.internalHandler = new InternalMethodHandler();
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.wrapper.InvWrapper;
|
||||
import vazkii.botania.api.BotaniaAPIClient;
|
||||
import vazkii.botania.api.corporea.CorporeaHelper;
|
||||
import vazkii.botania.api.corporea.ICorporeaSpark;
|
||||
@@ -56,13 +55,11 @@ import vazkii.botania.client.core.handler.BossBarHandler;
|
||||
import vazkii.botania.client.core.handler.HUDHandler;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.BlockModFlower;
|
||||
import vazkii.botania.common.block.BlockSpecialFlower;
|
||||
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.integration.corporea.WrappedStorageDrawers;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
|
||||
import vazkii.botania.common.item.relic.ItemLokiRing;
|
||||
@@ -274,10 +271,6 @@ public class InternalMethodHandler extends DummyMethodHandler {
|
||||
for(InvWithLocation inv : inventories) {
|
||||
ICorporeaSpark spark = CorporeaHelper.getSparkForInventory(inv);
|
||||
IWrappedInventory wrapped = null;
|
||||
// try StorageDrawers integration
|
||||
if(Botania.storageDrawersLoaded) {
|
||||
wrapped = WrappedStorageDrawers.wrap(inv, spark);
|
||||
}
|
||||
// try DeepStorageUnit
|
||||
if(wrapped == null) {
|
||||
wrapped = WrappedDeepStorage.wrap(inv, spark);
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
/**
|
||||
* This class was created by <Vindex>. 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 java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
|
||||
import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.items.wrapper.InvWrapper;
|
||||
import vazkii.botania.api.corporea.CorporeaRequest;
|
||||
import vazkii.botania.api.corporea.ICorporeaSpark;
|
||||
import vazkii.botania.api.corporea.IWrappedInventory;
|
||||
import vazkii.botania.api.corporea.InvWithLocation;
|
||||
|
||||
/**
|
||||
* Wrapper for StorageDrawers compatibility.
|
||||
*
|
||||
*/
|
||||
public class WrappedStorageDrawers extends WrappedInventoryBase {
|
||||
|
||||
private final IDrawerGroup invRaw;
|
||||
|
||||
private WrappedStorageDrawers(IDrawerGroup 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<ItemStack> countItems(CorporeaRequest request) {
|
||||
return iterateOverStacks(request, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> extractItems(CorporeaRequest request) {
|
||||
return iterateOverStacks(request, true);
|
||||
}
|
||||
|
||||
private List<ItemStack> iterateOverStacks(CorporeaRequest request, boolean doit) {
|
||||
List<ItemStack> stacks = new ArrayList<ItemStack>();
|
||||
boolean removedAny = false;
|
||||
|
||||
for(int i = 0; i < invRaw.getDrawerCount(); i++) {
|
||||
IDrawer drawer = invRaw.getDrawer(i);
|
||||
if(drawer == null) {
|
||||
continue;
|
||||
}
|
||||
ItemStack prototype = drawer.getStoredItemPrototype();
|
||||
int storedCount = drawer.getStoredItemCount();
|
||||
|
||||
// WARNING: this code is very similar in all implementations of
|
||||
// IWrappedInventory - keep it synch
|
||||
// also this code is near duplicate to WrappedDeepStorage - 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(drawer, rem);
|
||||
|
||||
removedAny = true;
|
||||
if(spark != null)
|
||||
spark.onItemExtracted(prototype);
|
||||
}
|
||||
if(request.count != -1)
|
||||
request.count -= rem;
|
||||
}
|
||||
}
|
||||
if(removedAny) {
|
||||
invRaw.markDirtyIfNeeded();
|
||||
}
|
||||
return stacks;
|
||||
}
|
||||
|
||||
private void decreaseStoredCount(IDrawer drawer, int rem) {
|
||||
drawer.setStoredItemCount(drawer.getStoredItemCount() - rem);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates {@link WrappedStorageDrawers} 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(inv.world.getTileEntity(inv.pos) instanceof IDrawerGroup) {
|
||||
return new WrappedStorageDrawers((IDrawerGroup) inv.world.getTileEntity(inv.pos), spark);
|
||||
} else return null;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user