Adapt to AE2 Stack Type API changes (#375)

Co-authored-by: Martin Robertz <[email protected]>
This commit is contained in:
Kogepan229andMartin Robertz authored and GitHub committed 2026-02-07 19:03:57 +00:00
1 parent f02e72e96a
commit dfabc1c62b
46 files changed
+225 -1364

No files matched your search

@@ -1,12 +1,16 @@
package com.glodblock.github.common.item;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import net.minecraft.item.ItemStack;
import org.jetbrains.annotations.NotNull;
import com.glodblock.github.common.storage.CellType;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.google.common.base.Optional;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEStackType;
import appeng.items.AEBaseCell;
import appeng.util.Platform;
@@ -24,8 +28,8 @@ public abstract class FCBaseItemCell extends AEBaseCell {
}
@Override
public StorageChannel getStorageChannel() {
return StorageChannel.FLUIDS;
public @NotNull IAEStackType<?> getStackType() {
return FLUID_STACK_TYPE;
}
public FCBaseItemCell(Optional subName) {
@@ -1,17 +1,24 @@
package com.glodblock.github.common.item;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import java.util.EnumSet;
import net.minecraft.item.ItemStack;
import org.jetbrains.annotations.NotNull;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.loader.IRegister;
import com.glodblock.github.util.NameConst;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.data.IAEStackType;
import appeng.core.features.AEFeature;
import appeng.items.AEBaseInfiniteCell;
import appeng.me.storage.CreativeCellInventory;
import appeng.me.storage.FluidCellInventoryHandler;
import cpw.mods.fml.common.registry.GameRegistry;
public class ItemCreativeFluidStorageCell extends AEBaseInfiniteCell
@@ -42,7 +49,12 @@ public class ItemCreativeFluidStorageCell extends AEBaseInfiniteCell
}
@Override
public StorageChannel getStorageChannel() {
return StorageChannel.FLUIDS;
public @NotNull IAEStackType<?> getStackType() {
return FLUID_STACK_TYPE;
}
@Override
public IMEInventoryHandler getCellInventory(ItemStack stack) {
return new FluidCellInventoryHandler(new CreativeCellInventory<>(stack));
}
}
@@ -3,9 +3,11 @@ package com.glodblock.github.common.item;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.client.textures.FCPartsTexture;
import com.glodblock.github.common.parts.PartFluidConversionMonitor;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.util.NameConst;
@@ -37,6 +39,11 @@ public class ItemFluidConversionMonitor extends FCBaseItem implements IPartItem
return this;
}
@Override
public IIcon getIconIndex(ItemStack p_77650_1_) {
return FCPartsTexture.PartTerminalBroad.getIcon();
}
public void registerIcons(IIconRegister _iconRegister) {}
@SideOnly(Side.CLIENT)
@@ -3,9 +3,11 @@ package com.glodblock.github.common.item;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.client.textures.FCPartsTexture;
import com.glodblock.github.common.parts.PartFluidStorageMonitor;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.util.NameConst;
@@ -37,6 +39,11 @@ public class ItemFluidStorageMonitor extends FCBaseItem implements IPartItem {
return this;
}
@Override
public IIcon getIconIndex(ItemStack p_77650_1_) {
return FCPartsTexture.PartTerminalBroad.getIcon();
}
public void registerIcons(IIconRegister _iconRegister) {}
@SideOnly(Side.CLIENT)
@@ -1,11 +1,13 @@
package com.glodblock.github.common.item;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.loader.IRegister;
import com.glodblock.github.util.NameConst;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEStackType;
import appeng.items.storage.ItemVoidStorageCell;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -25,7 +27,7 @@ public class ItemFluidVoidStorageCell extends ItemVoidStorageCell implements IRe
}
@Override
public StorageChannel getStorageChannel() {
return StorageChannel.FLUIDS;
public IAEStackType<?> getStackType() {
return FLUID_STACK_TYPE;
}
}
@@ -1,20 +1,26 @@
package com.glodblock.github.common.item;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import static com.glodblock.github.util.Util.FluidUtil.water_bucket;
import java.util.EnumSet;
import net.minecraft.item.ItemStack;
import org.jetbrains.annotations.NotNull;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.loader.IRegister;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.data.IAEStackType;
import appeng.core.features.AEFeature;
import appeng.items.AEBaseInfiniteCell;
import appeng.me.storage.CreativeCellInventory;
import appeng.me.storage.FluidCellInventoryHandler;
import appeng.tile.inventory.IAEStackInventory;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -62,7 +68,12 @@ public class ItemInfinityWaterStorageCell extends AEBaseInfiniteCell
}
@Override
public StorageChannel getStorageChannel() {
return StorageChannel.FLUIDS;
public @NotNull IAEStackType<?> getStackType() {
return FLUID_STACK_TYPE;
}
@Override
public IMEInventoryHandler getCellInventory(ItemStack stack) {
return new FluidCellInventoryHandler(new CreativeCellInventory<>(stack));
}
}
@@ -1,5 +1,7 @@
package com.glodblock.github.common.item;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import java.util.List;
import net.minecraft.client.gui.GuiScreen;
@@ -9,6 +11,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import org.jetbrains.annotations.NotNull;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.api.FluidCraftAPI;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
@@ -17,9 +21,9 @@ import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.RenderUtil;
import appeng.api.implementations.guiobjects.IGuiItemObject;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IAEStackType;
import appeng.items.AEBasePortableCell;
import appeng.items.contents.CellUpgrades;
import appeng.items.contents.PortableCellViewer;
@@ -79,12 +83,12 @@ public class ItemPortableFluidCell extends AEBasePortableCell implements IRegist
@Override
public IGuiItemObject getGuiObject(final ItemStack is, final World w, final EntityPlayer p, final int x,
final int y, final int z) {
return new PortableCellViewer<IAEFluidStack>(is, x, StorageChannel.FLUIDS);
return new PortableCellViewer<IAEFluidStack>(is, x, FLUID_STACK_TYPE);
}
@Override
public StorageChannel getStorageChannel() {
return StorageChannel.FLUIDS;
public @NotNull IAEStackType<?> getStackType() {
return FLUID_STACK_TYPE;
}
@Override
@@ -1,157 +1,28 @@
package com.glodblock.github.common.parts;
import java.util.Collections;
import java.util.List;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraft.nbt.NBTTagCompound;
import org.apache.commons.lang3.tuple.MutablePair;
import appeng.parts.reporting.PartConversionMonitor;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.util.Util;
import appeng.api.config.Actionable;
import appeng.api.networking.energy.IEnergySource;
import appeng.api.networking.security.PlayerSource;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEFluidStack;
import appeng.me.GridAccessException;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
public class PartFluidConversionMonitor extends PartFluidStorageMonitor {
public class PartFluidConversionMonitor extends PartConversionMonitor {
public PartFluidConversionMonitor(ItemStack is) {
super(is);
}
@Override
public boolean onPartShiftActivate(final EntityPlayer player, final Vec3 pos) {
if (Platform.isClient()) {
return true;
}
if (!this.getProxy().isActive()) {
return false;
}
if (!Platform.hasPermissions(this.getLocation(), player)) {
return false;
}
FluidStack fluidStack;
ItemStack item = player.getCurrentEquippedItem();
if (item != null && item.getItem() instanceof ItemFluidPacket) {
fluidStack = ItemFluidPacket.getFluidStack(item);
} else {
fluidStack = Util.FluidUtil.getFluidFromContainer(item);
}
if (this.getDisplayed() == null || fluidStack == null
|| fluidStack.getFluid() != ((IAEFluidStack) this.getDisplayed()).getFluid()) {
return false;
}
try {
if (!this.getProxy().isActive()) {
return false;
public void readFromNBT(NBTTagCompound data) {
// Migrate old tag
if (data.hasKey("configuredItem")) {
final NBTTagCompound myItem = data.getCompoundTag("configuredItem");
if (!myItem.hasNoTags() && !myItem.hasKey("StackType")) {
myItem.setString("StackType", FLUID_STACK_TYPE.getId());
}
final IEnergySource energy = this.getProxy().getEnergy();
final IMEMonitor<IAEFluidStack> cell = this.getProxy().getStorage().getFluidInventory();
final IAEFluidStack input = (IAEFluidStack) this.getDisplayed().copy().setStackSize(fluidStack.amount);
final IAEFluidStack failedToInsert = Platform
.poweredInsert(energy, cell, input, new PlayerSource(player, this));
if (failedToInsert != null && failedToInsert.getStackSize() == input.getStackSize()) {
return false;
} else if (failedToInsert == null || failedToInsert.getStackSize() != input.getStackSize()) {
if (item.getItem() instanceof ItemFluidPacket) {
if (failedToInsert != null) {
player.getCurrentEquippedItem()
.setTagCompound(ItemFluidPacket.newStack(failedToInsert).getTagCompound());
return true;
}
} else {
ItemStack tmp = item.copy();
tmp.stackSize = 1;
ItemStack tank = null;
if (failedToInsert == null) {
tank = Util.FluidUtil.clearFluid(tmp);
} else {
if (tmp.getItem() instanceof IFluidContainerItem) {
tank = Util.FluidUtil.setFluidContainerAmount(tmp, (int) failedToInsert.getStackSize());
} else if (FluidContainerRegistry.isContainer(tmp)) {
IAEFluidStack insertedFluid = input.copy();
insertedFluid.decStackSize(failedToInsert.getStackSize());
this.getProxy().getStorage().getFluidInventory()
.extractItems(insertedFluid, Actionable.MODULATE, new PlayerSource(player, this));
return false;
}
}
if (tank != null && !player.inventory.addItemStackToInventory(tank)) {
player.entityDropItem(tank, 0);
}
}
item.stackSize--;
if (item.stackSize <= 0) {
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
}
}
} catch (final GridAccessException ignored) {}
return true;
}
@Override
protected void extractItem(final EntityPlayer player) {
final IAEFluidStack input = (IAEFluidStack) this.getDisplayed();
ItemStack eq = player.getCurrentEquippedItem();
if (input != null && Util.FluidUtil.isFluidContainer(eq) && Util.FluidUtil.isEmpty(eq)) {
try {
if (!this.getProxy().isActive()) {
return;
}
final IEnergySource energy = this.getProxy().getEnergy();
final IMEMonitor<IAEFluidStack> cell = this.getProxy().getStorage().getFluidInventory();
ItemStack tank = eq.copy();
tank.stackSize = 1;
MutablePair<Integer, ItemStack> fillStack = Util.FluidUtil.fillStack(tank, input.getFluidStack());
input.setStackSize(fillStack.left);
final IAEFluidStack retrieved = Platform
.poweredExtraction(energy, cell, input, new PlayerSource(player, this));
if (retrieved != null) {
if (!player.inventory.addItemStackToInventory(fillStack.right)) {
player.entityDropItem(fillStack.right.copy(), 0);
}
eq.stackSize--;
if (eq.stackSize <= 0) {
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
}
final InventoryAdaptor adaptor = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN);
ItemStack newItems = adaptor.addItems(
Util.FluidUtil.setFluidContainerAmount(fillStack.right, (int) retrieved.getStackSize()));
if (newItems != null) {
final TileEntity te = this.getTile();
final List<ItemStack> list = Collections.singletonList(newItems);
Platform.spawnDrops(
player.worldObj,
te.xCoord + this.getSide().offsetX,
te.yCoord + this.getSide().offsetY,
te.zCoord + this.getSide().offsetZ,
list);
}
if (player.openContainer != null) {
player.openContainer.detectAndSendChanges();
}
}
} catch (final GridAccessException ignored) {}
}
super.readFromNBT(data);
}
}
@@ -1,5 +1,7 @@
package com.glodblock.github.common.parts;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
@@ -15,6 +17,7 @@ import appeng.api.storage.StorageName;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IAEStackType;
import appeng.me.GridAccessException;
import appeng.parts.automation.PartBaseExportBus;
import appeng.tile.inventory.IAEStackInventory;
@@ -72,11 +75,11 @@ public class PartFluidExportBus extends PartBaseExportBus<IAEFluidStack> {
}
@Override
protected void doFuzzy(IAEFluidStack aes, FuzzyMode fzMode, InventoryAdaptor destination, IEnergyGrid energy,
protected void doFuzzy(IAEFluidStack aes, FuzzyMode fzMode, IEnergyGrid energy,
IMEMonitor<IAEFluidStack> gridInv) {}
@Override
protected void doOreDict(InventoryAdaptor destination, IEnergyGrid energy, IMEMonitor<IAEFluidStack> gridInv) {}
protected void doOreDict(IEnergyGrid energy, IMEMonitor<IAEFluidStack> gridInv) {}
// legacy
@Override
@@ -91,4 +94,9 @@ public class PartFluidExportBus extends PartBaseExportBus<IAEFluidStack> {
}
}
}
@Override
public IAEStackType<IAEFluidStack> getStackType() {
return FLUID_STACK_TYPE;
}
}
@@ -1,16 +1,16 @@
package com.glodblock.github.common.parts;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import com.glodblock.github.client.textures.FCPartsTexture;
import com.glodblock.github.util.BlockPos;
import com.glodblock.github.util.Util;
import appeng.api.config.Actionable;
@@ -23,6 +23,7 @@ import appeng.api.storage.StorageName;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IAEStackType;
import appeng.me.GridAccessException;
import appeng.parts.automation.PartBaseImportBus;
import appeng.tile.inventory.IAEStackInventory;
@@ -42,18 +43,14 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
@Override
protected Object getTarget() {
TileEntity self = this.getHost().getTile();
return this.getTileEntity(self, (new BlockPos(self)).getOffSet(this.getSide()));
}
final TileEntity self = this.getHost().getTile();
final TileEntity target = this.getTileEntity(
self,
self.xCoord + this.getSide().offsetX,
self.yCoord + this.getSide().offsetY,
self.zCoord + this.getSide().offsetZ);
private TileEntity getTileEntity(final TileEntity self, final BlockPos pos) {
final World w = self.getWorldObj();
if (w.getChunkProvider().chunkExists(pos.getX() >> 4, pos.getZ() >> 4)) {
return w.getTileEntity(pos.getX(), pos.getY(), pos.getZ());
}
return null;
return target instanceof IFluidHandler handler ? handler : null;
}
@Override
@@ -91,6 +88,11 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
}
}
@Override
protected int getAdaptorFlags() {
return InventoryAdaptor.ALLOW_FLUIDS | InventoryAdaptor.FOR_EXTRACTS;
}
@Override
protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToImport,
final IMEMonitor<IAEFluidStack> inv, final IEnergySource energy, final FuzzyMode fzMode) {
@@ -173,7 +175,7 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
}
@Override
protected int getAdaptorFlags() {
return InventoryAdaptor.ALLOW_FLUIDS | InventoryAdaptor.FOR_EXTRACTS;
public IAEStackType<IAEFluidStack> getStackType() {
return FLUID_STACK_TYPE;
}
}
@@ -1,8 +1,10 @@
package com.glodblock.github.common.parts;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import net.minecraft.item.ItemStack;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEStackType;
import appeng.parts.misc.PartStorageBus;
public class PartFluidStorageBus extends PartStorageBus {
@@ -12,7 +14,7 @@ public class PartFluidStorageBus extends PartStorageBus {
}
@Override
public StorageChannel getStorageChannel() {
return StorageChannel.FLUIDS;
public IAEStackType<?> getStackType() {
return FLUID_STACK_TYPE;
}
}
@@ -1,36 +1,28 @@
package com.glodblock.github.common.parts;
import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import com.glodblock.github.common.parts.base.FCPartMonitor;
import appeng.parts.reporting.PartStorageMonitor;
import appeng.client.texture.CableBusTextures;
import appeng.helpers.Reflected;
public class PartFluidStorageMonitor extends PartStorageMonitor {
public class PartFluidStorageMonitor extends FCPartMonitor {
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartStorageMonitor_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartStorageMonitor_Dark;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartStorageMonitor_Colored;
private static final CableBusTextures FRONT_COLORED_ICON_LOCKED = CableBusTextures.PartStorageMonitor_Colored_Locked;
@Reflected
public PartFluidStorageMonitor(final ItemStack is) {
public PartFluidStorageMonitor(ItemStack is) {
super(is);
}
@Override
public CableBusTextures getFrontBright() {
return FRONT_BRIGHT_ICON;
}
public void readFromNBT(NBTTagCompound data) {
// Migrate old tag
if (data.hasKey("configuredItem")) {
final NBTTagCompound myItem = data.getCompoundTag("configuredItem");
if (!myItem.hasNoTags() && !myItem.hasKey("StackType")) {
myItem.setString("StackType", FLUID_STACK_TYPE.getId());
}
}
@Override
public CableBusTextures getFrontColored() {
return this.isLocked() ? FRONT_COLORED_ICON_LOCKED : FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark() {
return FRONT_DARK_ICON;
super.readFromNBT(data);
}
}
@@ -24,7 +24,6 @@ import appeng.api.config.SecurityPermissions;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
import appeng.api.config.SortOrder;
import appeng.api.config.TypeFilter;
import appeng.api.config.ViewItems;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.implementations.tiles.IViewCellStorage;
@@ -84,7 +83,6 @@ public abstract class FCPart extends AEBasePart
this.cm.registerSetting(Settings.SORT_BY, SortOrder.NAME);
this.cm.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
this.cm.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
this.cm.registerSetting(Settings.TYPE_FILTER, TypeFilter.ALL);
}
@MENetworkEventSubscribe
@@ -18,7 +18,6 @@ import org.jetbrains.annotations.Nullable;
import com.glodblock.github.common.Config;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.crossmod.thaumcraft.ThaumicEnergisticsCrafting;
import com.glodblock.github.util.ModAndClassUtil;
import com.google.common.collect.ImmutableSet;
import appeng.api.AEApi;
@@ -45,11 +44,10 @@ import appeng.api.networking.security.MachineSource;
import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.StorageName;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.core.AELog;
import appeng.me.GridAccessException;
import appeng.tile.TileEvent;
@@ -99,30 +97,35 @@ public class TileLevelMaintainer extends AENetworkTile
}
@Override
public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) {
@SuppressWarnings({ "unchecked", "rawtypes" })
public IAEStack<?> injectCraftedItems(ICraftingLink link, IAEStack<?> stack, Actionable mode) {
int idx = this.getRequestIndexByLink(link);
try {
if (getProxy().isActive()) {
final IEnergyGrid energy = getProxy().getEnergy();
final double power = Math
.ceil(ItemFluidDrop.isFluidStack(items) ? items.getStackSize() / 1000D : items.getStackSize());
if (energy.extractAEPower(power, mode, PowerMultiplier.CONFIG) > power - 0.01) {
if (ItemFluidDrop.isFluidStack(items)) {
IAEFluidStack notInjectedItems = getProxy().getStorage().getFluidInventory()
.injectItems(ItemFluidDrop.getAeFluidStack(items), mode, source);
if (notInjectedItems != null) {
items.setStackSize(notInjectedItems.getStackSize());
if (idx != -1) {
this.updateState(idx, LevelState.Export);
}
final double power = Math.ceil((double) stack.getStackSize() / stack.getAmountPerUnit());
return items;
} else {
return null;
}
if (energy.extractAEPower(power, mode, PowerMultiplier.CONFIG) > power - 0.01) {
IMEMonitor monitor = getProxy().getStorage().getMEMonitor(stack.getStackType());
if (monitor == null) return stack;
IAEStack<?> notInjected;
if (stack instanceof IAEItemStack ais && ItemFluidDrop.isFluidStack(ais)) {
notInjected = getProxy().getStorage().getFluidInventory()
.injectItems(ItemFluidDrop.getAeFluidStack(ais), mode, source);
} else {
return getProxy().getStorage().getItemInventory().injectItems(items, mode, source);
notInjected = monitor.injectItems(stack, mode, source);
}
if (notInjected != null) {
if (idx != -1) {
this.updateState(idx, LevelState.Export);
}
return notInjected;
} else {
return null;
}
}
}
@@ -130,7 +133,7 @@ public class TileLevelMaintainer extends AENetworkTile
AELog.debug(e);
}
return items;
return stack;
}
@Override
@@ -162,8 +165,6 @@ public class TileLevelMaintainer extends AENetworkTile
try {
final ICraftingGrid craftingGrid = getProxy().getCrafting();
final IGrid grid = getProxy().getGrid();
final IItemList<IAEItemStack> invItems = getProxy().getStorage().getItemInventory().getStorageList();
final IItemList<IAEFluidStack> invFluid = getProxy().getStorage().getFluidInventory().getStorageList();
// Check there are available crafting CPUs before doing any work.
// This hopefully stops level maintainers busy-looping calculating
@@ -196,32 +197,17 @@ public class TileLevelMaintainer extends AENetworkTile
continue;
}
IAEStack<?> aeItem = null;
IAEStack<?> craftItem = requests[i].stack.copy();
craftItem.setStackSize(batchSize);
IMEMonitor monitor = getProxy().getStorage().getMEMonitor(craftItem.getStackType());
if (monitor == null) continue;
if (craftItem instanceof IAEItemStack ais) {
if (ModAndClassUtil.ThE && ThaumicEnergisticsCrafting.isAspectStack(ais.getItemStack())) {
aeItem = ThaumicEnergisticsCrafting.convertAspectStack(ais);
} else {
aeItem = invItems.findPrecise(ais);
}
} else if (craftItem instanceof IAEFluidStack afs) {
aeItem = invFluid.findPrecise(afs);
}
IAEStack<?> stackInStorage = monitor.getStorageList().findPrecise(craftItem);
long stackSize = aeItem == null ? 0 : aeItem.getStackSize();
if (ModAndClassUtil.ThE) {
if (aeItem instanceof IAEItemStack ais
&& ThaumicEnergisticsCrafting.isAspectStack(ais.getItemStack())) {
stackSize = ThaumicEnergisticsCrafting.getEssentiaAmount(ais, grid);
}
}
long stackSize = stackInStorage == null ? 0 : stackInStorage.getStackSize();
boolean isDone = this.isDone(i);
boolean isCraftable = aeItem != null && aeItem.isCraftable();
boolean isCraftable = stackInStorage != null && stackInStorage.isCraftable();
boolean shouldCraft = isCraftable && stackSize < quantity;
if (isDone) {
@@ -240,11 +226,11 @@ public class TileLevelMaintainer extends AENetworkTile
continue;
}
if (craftingGrid.canEmitFor(aeItem)) {
if (craftingGrid.canEmitFor(stackInStorage)) {
continue;
}
if (craftingGrid.isRequesting(aeItem)) {
if (craftingGrid.isRequesting(stackInStorage)) {
continue;
}
@@ -289,7 +275,7 @@ public class TileLevelMaintainer extends AENetworkTile
// No jobs to submit, start calculating some item.
requests[itemToBeginIdx].job = craftingGrid
.beginCraftingJob(getWorldObj(), grid, source, itemToBegin, null);
.beginCraftingJob(this.worldObj, grid, source, itemToBegin, null);
this.updateState(itemToBeginIdx, LevelState.Craft);
// Try the next item next time.
@@ -644,6 +630,10 @@ public class TileLevelMaintainer extends AENetworkTile
if (stack == null) {
throw new IllegalArgumentException("ItemStack cannot be null!");
}
// Migrate old aspect stack
stack = ThaumicEnergisticsCrafting.convertItemAspectStack(stack);
quantity = tag.getLong(NBT_QUANTITY);
batchSize = tag.getLong(NBT_BATCH);
enable = tag.getBoolean(NBT_ENABLE);
@@ -660,6 +650,10 @@ public class TileLevelMaintainer extends AENetworkTile
public void loadFromNBT(NBTTagCompound tag) {
stack = Platform.readStackNBT(tag.getCompoundTag(NBT_STACK), true);
// Migrate old aspect stack
stack = ThaumicEnergisticsCrafting.convertItemAspectStack(stack);
quantity = tag.getLong(NBT_QUANTITY);
batchSize = tag.getLong(NBT_BATCH);
enable = tag.getBoolean(NBT_ENABLE);