add contents display on cells and fix pattern terminal encode overflow

This commit is contained in:
GlodBlock committed 2022-12-03 13:58:00 +08:00
1 parent a805df0e9e
commit c087930016
8 files changed
+35 -1

No files matched your search

@@ -327,6 +327,7 @@ public class FCBasePartContainer extends FCBaseMonitorContain implements IAEAppE
if( i != null )
{
i.writeToNBT( c );
c.setInteger( "Count", i.stackSize );
}
return c;
@@ -290,6 +290,7 @@ public class FCBasePartContainerEx extends FCBaseMonitorContain implements IAEAp
if( i != null )
{
i.writeToNBT( c );
c.setInteger( "Count", i.stackSize );
}
return c;
@@ -17,6 +17,7 @@ import appeng.items.contents.CellConfig;
import appeng.items.contents.CellUpgrades;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.ReadableNumberConverter;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.common.Config;
import com.glodblock.github.common.storage.CellType;
@@ -52,8 +53,10 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu
private final int totalBytes;
private final int perType;
private final double idleDrain;
private final ReadableNumberConverter format = ReadableNumberConverter.INSTANCE;
private final static HashMap<Integer, IIcon> icon = new HashMap<>();
@SuppressWarnings("Guava")
public ItemBasicFluidStorageCell( final CellType whichCell, final int kilobytes )
{
super( Optional.of( kilobytes + "k" ) );
@@ -137,6 +140,17 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu
lines.add( cellInventory.getStoredFluidTypes() + " " + GuiText.Of.getLocal() + ' ' + cellInventory.getTotalFluidTypes() + ' ' + GuiText.Types.getLocal() );
if (GuiScreen.isShiftKeyDown()) {
if (cellInventory.getStoredFluidTypes() > 0) {
lines.add(StatCollector.translateToLocal(NameConst.TT_CELL_CONTENTS));
for (IAEFluidStack fluid : cellInventory.getContents()) {
if (fluid != null) {
lines.add(String.format(" %s x%smB", fluid.getFluidStack().getLocalizedName(), format.toWideReadableForm(fluid.getStackSize())));
}
}
}
}
if( handler.isPreformatted() )
{
final String list = (handler.getIncludeExcludeMode() == IncludeExclude.WHITELIST ? GuiText.Included : GuiText.Excluded).getLocal();
@@ -18,6 +18,9 @@ import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
import java.util.List;
public class FluidCellInventory implements IFluidCellInventory {
private static final String FLUID_TYPE_TAG = "ft";
@@ -465,10 +468,18 @@ public class FluidCellInventory implements IFluidCellInventory {
{
out.add( i );
}
return out;
}
@Override
public List<IAEFluidStack> getContents() {
List<IAEFluidStack> ret = new ArrayList<>();
for (IAEFluidStack fluid : this.getCellItems()) {
ret.add(fluid);
}
return ret;
}
@Override
public StorageChannel getChannel() {
return StorageChannel.FLUIDS;
@@ -5,6 +5,8 @@ import appeng.api.storage.data.IAEFluidStack;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import java.util.List;
public interface IFluidCellInventory extends IMEInventory<IAEFluidStack>
{
@@ -71,4 +73,6 @@ public interface IFluidCellInventory extends IMEInventory<IAEFluidStack>
long getStoredFluidTypes();
long getTotalFluidTypes();
List<IAEFluidStack> getContents();
}
@@ -34,6 +34,7 @@ public class NameConst {
public static final String TT_DUMP_TANK = TT_KEY + "dump_tank";
public static final String TT_REQUEST_SIZE = TT_KEY + "request_size";
public static final String TT_BATCH_SIZE = TT_KEY + "batch_size";
public static final String TT_CELL_CONTENTS = TT_KEY + "cell_contents";
public static final String WAILA_KEY = FluidCraft.MODID + ".waila.";
public static final String WAILA_ENABLE = WAILA_KEY + "enable";