mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-17 10:55:06 +00:00
spotless
This commit is contained in:
1 parent
4c997da3cf
commit
4538d04b30
4 files changed
+15
-19
No files matched your search
+3
-5
@@ -3,13 +3,10 @@ package com.glodblock.github.common.item;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
||||
import appeng.api.config.IncludeExclude;
|
||||
import appeng.core.localization.GuiText;
|
||||
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.StatCollector;
|
||||
|
||||
import com.glodblock.github.FluidCraft;
|
||||
import com.glodblock.github.api.FluidCraftAPI;
|
||||
@@ -26,6 +23,7 @@ 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.AEBaseItem;
|
||||
import appeng.items.contents.CellConfig;
|
||||
import appeng.items.contents.CellUpgrades;
|
||||
@@ -33,7 +31,7 @@ import appeng.util.Platform;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ItemDefectiveSingularityFluidStorageCell extends AEBaseItem
|
||||
implements IStorageFluidCell, IRegister<ItemDefectiveSingularityFluidStorageCell> {
|
||||
implements IStorageFluidCell, IRegister<ItemDefectiveSingularityFluidStorageCell> {
|
||||
|
||||
public ItemDefectiveSingularityFluidStorageCell() {
|
||||
super();
|
||||
@@ -82,7 +80,7 @@ public class ItemDefectiveSingularityFluidStorageCell extends AEBaseItem
|
||||
@Override
|
||||
public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) {
|
||||
return requestedAddition == null || requestedAddition.getFluid() == null
|
||||
|| FluidCraftAPI.instance().isBlacklistedInStorage(requestedAddition.getFluid().getClass());
|
||||
|| FluidCraftAPI.instance().isBlacklistedInStorage(requestedAddition.getFluid().getClass());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+8
-11
@@ -1,22 +1,17 @@
|
||||
package com.glodblock.github.common.storage;
|
||||
|
||||
import appeng.api.storage.data.IItemList;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import com.glodblock.github.util.Util;
|
||||
|
||||
import appeng.api.AEApi;
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.exceptions.AppEngException;
|
||||
import appeng.api.networking.security.BaseActionSource;
|
||||
import appeng.api.storage.ISaveProvider;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import appeng.api.storage.data.IItemList;
|
||||
|
||||
public class DefectiveSingularityCellInventory extends FluidCellInventory {
|
||||
|
||||
@@ -25,7 +20,9 @@ public class DefectiveSingularityCellInventory extends FluidCellInventory {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canHoldNewFluid() { return true; }
|
||||
public boolean canHoldNewFluid() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getTotalBytes() {
|
||||
|
||||
@@ -5,7 +5,6 @@ import java.util.List;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import com.glodblock.github.common.item.ItemDefectiveSingularityFluidStorageCell;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -14,6 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import com.glodblock.github.common.item.ItemBaseInfinityStorageCell;
|
||||
import com.glodblock.github.common.item.ItemDefectiveSingularityFluidStorageCell;
|
||||
import com.glodblock.github.crossmod.extracells.storage.ProxyFluidCellInventory;
|
||||
import com.glodblock.github.crossmod.extracells.storage.ProxyFluidStorageCell;
|
||||
|
||||
@@ -89,7 +89,7 @@ public class FluidCellInventory implements IFluidCellInventory {
|
||||
return new FluidCellInventoryHandler(new ProxyFluidCellInventory(o, container2));
|
||||
} else if (o.getItem() instanceof ItemDefectiveSingularityFluidStorageCell) {
|
||||
return new FluidCellInventoryHandler(new DefectiveSingularityCellInventory(o, container2));
|
||||
} else{
|
||||
} else {
|
||||
return new FluidCellInventoryHandler(new FluidCellInventory(o, container2));
|
||||
}
|
||||
} catch (final AppEngException e) {
|
||||
|
||||
@@ -141,7 +141,8 @@ public class ItemAndBlockHolder {
|
||||
16384,
|
||||
5,
|
||||
600000D).register();
|
||||
public static ItemDefectiveSingularityFluidStorageCell FLUID_VOID_CELL = new ItemDefectiveSingularityFluidStorageCell().register();
|
||||
public static ItemDefectiveSingularityFluidStorageCell FLUID_VOID_CELL = new ItemDefectiveSingularityFluidStorageCell()
|
||||
.register();
|
||||
public static ItemCreativeFluidStorageCell CREATIVE_CELL = new ItemCreativeFluidStorageCell().register();
|
||||
public static ItemInfinityWaterStorageCell INFINITY_WATER_CELL = new ItemInfinityWaterStorageCell().register();
|
||||
public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register();
|
||||
|
||||
Reference in new issue
Block a user