upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-12 16:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46 from GTNewHorizons/fixs-spotless-fixes

Browse Source 
Spotless apply for branch fixs for #44
This commit is contained in:
Yang Xizhi authored and GitHub committed 2022-12-06 00:41:13 +08:00
2 parents 31d5e89144 c2e91139b2
commit 3cd9aef9a1
5 files changed
+22 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainer.java
+3 -4
View File
@@ -385,10 +385,9 @@ public class FCBasePartContainer extends FCBaseMonitorContain
private NBTBase createItemTag(final ItemStack i) {
final NBTTagCompound c = new NBTTagCompound();
if( i != null )
{
i.writeToNBT( c );
c.setInteger( "Count", i.stackSize );
if (i != null) {
i.writeToNBT(c);
c.setInteger("Count", i.stackSize);
}
return c;
src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java
+3 -4
View File
@@ -355,10 +355,9 @@ public class FCBasePartContainerEx extends FCBaseMonitorContain
private NBTBase createItemTag(final ItemStack i) {
final NBTTagCompound c = new NBTTagCompound();
if( i != null )
{
i.writeToNBT( c );
c.setInteger( "Count", i.stackSize );
if (i != null) {
i.writeToNBT(c);
c.setInteger("Count", i.stackSize);
}
return c;
src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java
+12 -8
View File
@@ -52,12 +52,11 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu
private final int perType;
private final double idleDrain;
private final ReadableNumberConverter format = ReadableNumberConverter.INSTANCE;
private final static HashMap<Integer, IIcon> icon = new HashMap<>();
private static final HashMap<Integer, IIcon> icon = new HashMap<>();
@SuppressWarnings("Guava")
public ItemBasicFluidStorageCell( final CellType whichCell, final int kilobytes )
{
super( Optional.of( kilobytes + "k" ) );
public ItemBasicFluidStorageCell(final CellType whichCell, final int kilobytes) {
super(Optional.of(kilobytes + "k"));
setUnlocalizedName(NameConst.ITEM_FLUID_STORAGE + kilobytes);
this.setFeature(EnumSet.of(AEFeature.StorageCells));
this.setMaxStackSize(1);
@@ -146,15 +145,20 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu
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())));
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();
if (handler.isPreformatted()) {
final String list = (handler.getIncludeExcludeMode() == IncludeExclude.WHITELIST
? GuiText.Included
: GuiText.Excluded)
.getLocal();
lines.add(GuiText.Partitioned.getLocal() + " - " + list + ' ' + GuiText.Precise.getLocal());
if (GuiScreen.isShiftKeyDown()) {
src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
+2 -3
View File
@@ -11,6 +11,8 @@ import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IItemList;
import appeng.util.Platform;
import appeng.util.item.AEFluidStack;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -18,9 +20,6 @@ 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";
src/main/java/com/glodblock/github/common/storage/IFluidCellInventory.java
+2 -4
View File
@@ -2,13 +2,11 @@ package com.glodblock.github.common.storage;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.data.IAEFluidStack;
import java.util.List;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import java.util.List;
public interface IFluidCellInventory extends IMEInventory<IAEFluidStack>
{
public interface IFluidCellInventory extends IMEInventory<IAEFluidStack> {
/**
* @return the item stack of this storage cell.