add portable fluid cell

This commit is contained in:
GlodBlock committed 2023-01-28 23:15:33 +08:00
1 parent fc9893ac32
commit 80340dbd75
29 files changed
+523 -98

No files matched your search

@@ -14,6 +14,7 @@ public class Config {
public static boolean fluidIOBus;
public static boolean removeRecipe;
public static boolean blacklistEssentiaGas;
public static double portableCellBattery;
public static void run() {
loadCategory();
@@ -43,6 +44,8 @@ public class Config {
"Fluid Craft for AE2",
true,
"Blacklist Essentia Gas from Thaumic Energistics, so they won't be stored in Fluid Storage Cells.");
portableCellBattery = Config.get("Fluid Craft for AE2", "Portable Fluid Cell Battery Capacity", 20000D)
.getDouble();
if (Config.hasChanged()) Config.save();
}
@@ -6,6 +6,7 @@ import com.glodblock.github.common.item.FCBaseItemBlock;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.common.tile.TileFluidDiscretizer;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.RenderUtil;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -40,7 +41,7 @@ public class BlockFluidDiscretizer extends FCBaseBlock {
final boolean advancedToolTips) {
if (isShiftKeyDown()) {
toolTip.addAll(this.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_FLUID_DISCRETIZER_DESC)));
toolTip.addAll(RenderUtil.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_FLUID_DISCRETIZER_DESC)));
} else {
toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
}
@@ -9,6 +9,7 @@ import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.util.BlockPos;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.RenderUtil;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -65,7 +66,8 @@ public class BlockFluidPacketDecoder extends FCBaseBlock {
final List<String> toolTip,
final boolean advancedToolTips) {
if (isShiftKeyDown()) {
toolTip.addAll(this.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_FLUID_PACKET_DECODER_DESC)));
toolTip.addAll(
RenderUtil.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_FLUID_PACKET_DECODER_DESC)));
} else {
toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
}
@@ -13,6 +13,7 @@ import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.util.BlockPos;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.RenderUtil;
import com.glodblock.github.util.Util;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
@@ -83,7 +84,7 @@ public class BlockLevelMaintainer extends FCBaseBlock {
if (isShiftKeyDown() && isCtrlKeyDown()) {
toolTip.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_WHO_AM_I));
} else if (isShiftKeyDown()) {
toolTip.addAll(this.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_DESC)));
toolTip.addAll(RenderUtil.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_DESC)));
} else {
toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
}
@@ -9,7 +9,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import java.util.EnumSet;
import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -47,11 +46,6 @@ public abstract class FCBaseBlock extends AEBaseTileBlock implements IRegister<F
final List<String> toolTip,
final boolean advancedToolTips) {}
@SuppressWarnings("unchecked")
protected final List<String> listFormattedStringToWidth(String str) {
return Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(str, 150);
}
public void addCheckedInformation(
ItemStack itemStack, EntityPlayer player, List<String> toolTip, boolean advancedToolTips) {
this.addInformation(itemStack, player, toolTip, advancedToolTips);
@@ -260,14 +260,6 @@ public class ItemBasicFluidStorageCell extends AEBaseItem
Platform.openNbtData(is).setString("FuzzyMode", fzMode.name());
}
public String getOreFilter(ItemStack is) {
return Platform.openNbtData(is).getString("OreFilter");
}
public void setOreFilter(ItemStack is, String filter) {
Platform.openNbtData(is).setString("OreFilter", filter);
}
@Override
public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) {
this.disassembleDrive(stack, world, player);
@@ -0,0 +1,183 @@
package com.glodblock.github.common.item;
import appeng.api.AEApi;
import appeng.api.config.FuzzyMode;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEFluidStack;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
import appeng.items.contents.CellConfig;
import appeng.items.contents.CellUpgrades;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.util.Platform;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.common.Config;
import com.glodblock.github.common.storage.IFluidCellInventory;
import com.glodblock.github.common.storage.IFluidCellInventoryHandler;
import com.glodblock.github.common.storage.IStorageFluidCell;
import com.glodblock.github.common.tabs.FluidCraftingTabs;
import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.inventory.item.IItemInventory;
import com.glodblock.github.inventory.item.PortableFluidCellInventory;
import com.glodblock.github.loader.IRegister;
import com.glodblock.github.util.BlockPos;
import com.glodblock.github.util.ModAndClassUtil;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.RenderUtil;
import com.google.common.base.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.EnumSet;
import java.util.List;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public class ItemPortableFluidCell extends AEBasePoweredItem
implements IStorageFluidCell, IItemInventory, IRegister<ItemPortableFluidCell> {
public ItemPortableFluidCell() {
super(Config.portableCellBattery, Optional.absent());
setUnlocalizedName(NameConst.ITEM_FLUID_PORTABLE_CELL);
setTextureName(FluidCraft.resource(NameConst.ITEM_FLUID_PORTABLE_CELL).toString());
this.setFeature(EnumSet.of(AEFeature.PortableCell, AEFeature.StorageCells, AEFeature.PoweredTools));
}
@Override
public ItemStack onItemRightClick(final ItemStack item, final World w, final EntityPlayer player) {
InventoryHandler.openGui(
player,
w,
new BlockPos(player.inventory.currentItem, 0, 0),
ForgeDirection.UNKNOWN,
GuiType.PORTABLE_FLUID_CELL);
return item;
}
@SideOnly(Side.CLIENT)
@Override
public boolean isFull3D() {
return false;
}
@SideOnly(Side.CLIENT)
@Override
public void addCheckedInformation(
final ItemStack stack, final EntityPlayer player, final List<String> lines, final boolean displayMoreInfo) {
super.addCheckedInformation(stack, player, lines, displayMoreInfo);
final IMEInventoryHandler<?> inventory =
AEApi.instance().registries().cell().getCellInventory(stack, null, StorageChannel.FLUIDS);
if (inventory instanceof IFluidCellInventoryHandler) {
final IFluidCellInventoryHandler handler = (IFluidCellInventoryHandler) inventory;
final IFluidCellInventory cellInventory = handler.getCellInv();
if (cellInventory != null) {
lines.add(EnumChatFormatting.WHITE + String.valueOf(cellInventory.getUsedBytes())
+ EnumChatFormatting.GRAY + " " + GuiText.Of.getLocal() + " "
+ EnumChatFormatting.DARK_GREEN + cellInventory.getTotalBytes() + " "
+ EnumChatFormatting.GRAY + GuiText.BytesUsed.getLocal());
lines.add(EnumChatFormatting.WHITE + String.valueOf(cellInventory.getStoredFluidTypes())
+ EnumChatFormatting.GRAY + " " + GuiText.Of.getLocal() + " "
+ EnumChatFormatting.DARK_GREEN + cellInventory.getTotalFluidTypes() + " "
+ EnumChatFormatting.GRAY + GuiText.Types.getLocal());
}
}
if (GuiScreen.isShiftKeyDown()) {
lines.addAll(RenderUtil.listFormattedStringToWidth(
StatCollector.translateToLocalFormatted(NameConst.TT_CELL_PORTABLE)));
} else {
lines.add(StatCollector.translateToLocal(NameConst.TT_SHIFT_FOR_MORE));
}
}
@Override
public int getBytes(final ItemStack cellItem) {
return 256;
}
@Override
public int getBytesPerType(final ItemStack cellItem) {
return 8;
}
@Override
public int getTotalTypes(final ItemStack cellItem) {
return 5;
}
@Override
public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) {
if (Config.blacklistEssentiaGas && ModAndClassUtil.ThE && requestedAddition != null) {
return ModAndClassUtil.essentiaGas.isInstance(requestedAddition.getFluid());
}
return false;
}
@Override
public boolean storableInStorageCell() {
return false;
}
@Override
public boolean isStorageCell(final ItemStack i) {
return true;
}
@Override
public double getIdleDrain() {
return 0.5;
}
@Override
public boolean isEditable(final ItemStack is) {
return true;
}
@Override
public IInventory getUpgradesInventory(final ItemStack is) {
return new CellUpgrades(is, 0);
}
@Override
public IInventory getConfigInventory(final ItemStack is) {
return new CellConfig(is);
}
@Override
public FuzzyMode getFuzzyMode(final ItemStack is) {
final String fz = Platform.openNbtData(is).getString("FuzzyMode");
try {
return FuzzyMode.valueOf(fz);
} catch (final Throwable t) {
return FuzzyMode.IGNORE_ALL;
}
}
@Override
public void setFuzzyMode(final ItemStack is, final FuzzyMode fzMode) {
Platform.openNbtData(is).setString("FuzzyMode", fzMode.name());
}
@Override
public ItemPortableFluidCell register() {
GameRegistry.registerItem(this, NameConst.ITEM_FLUID_PORTABLE_CELL, FluidCraft.MODID);
setCreativeTab(FluidCraftingTabs.INSTANCE);
return this;
}
@Override
public Object getInventory(ItemStack stack, World world, int x, int y, int z) {
return new PortableFluidCellInventory(stack, x);
}
public ItemStack stack() {
return new ItemStack(this, 1);
}
}
@@ -268,7 +268,7 @@ public class PartFluidInterface extends PartInterface implements IDualHost {
this.getHost().getTile().getWorldObj(),
new BlockPos(this.getHost().getTile()),
Objects.requireNonNull(this.getSide()),
GuiType.DUAL_INTERFACE_PART);
GuiType.DUAL_INTERFACE);
}
return true;
}
@@ -1,16 +1,15 @@
package com.glodblock.github.common.storage;
import appeng.api.implementations.tiles.IChestOrDrive;
import appeng.api.implementations.tiles.IMEChest;
import appeng.api.networking.security.PlayerSource;
import appeng.api.storage.*;
import appeng.client.texture.ExtraBlockTextures;
import com.glodblock.github.util.ModAndClassUtil;
import extracells.network.GuiHandler;
import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.util.BlockPos;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
public class FluidCellHandler implements ICellHandler {
@@ -52,17 +51,11 @@ public class FluidCellHandler implements ICellHandler {
final IMEInventoryHandler inv,
final ItemStack is,
final StorageChannel chan) {
if (ModAndClassUtil.EC2) {
if (chan == StorageChannel.FLUIDS) {
IStorageMonitorable monitorable = null;
if (chest != null) {
monitorable =
((IMEChest) chest).getMonitorable(ForgeDirection.UNKNOWN, new PlayerSource(player, chest));
}
if (monitorable != null) {
GuiHandler.launchGui(
GuiHandler.getGuiId(0), player, new Object[] {monitorable.getFluidInventory()});
}
if (chan == StorageChannel.FLUIDS) {
if (chest instanceof TileEntity) {
TileEntity te = (TileEntity) chest;
InventoryHandler.openGui(
player, te.getWorldObj(), new BlockPos(te), chest.getUp(), GuiType.FLUID_TERMINAL);
}
}
}
@@ -31,7 +31,7 @@ public class FluidCellInventory implements IFluidCellInventory {
private static String[] fluidSlotCount;
private final ItemStack cellItem;
private final ISaveProvider container;
private final int MAX_TYPE = 1;
private final int MAX_TYPE = 63;
private long storedFluidCount;
private short storedFluids;
private IItemList<IAEFluidStack> cellFluids;
@@ -137,7 +137,7 @@ public class FluidCellInventory implements IFluidCellInventory {
@Override
public long getTotalFluidTypes() {
return MAX_TYPE;
return this.cellType.getTotalTypes(this.cellItem);
}
@Override