dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move energy item capacity to a constant

Browse Source
This commit is contained in:
raoulvdberge
2017-05-12 00:38:59 +02:00
parent 50671435a8
commit 594150d56f
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/raoulvdberge/refinedstorage/item/CapabilityProviderEnergy.java
View File

@@ -28,7 +28,7 @@ public class CapabilityProviderEnergy implements ICapabilityProvider {
@Override @Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) { public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityEnergy.ENERGY) { if (capability == CapabilityEnergy.ENERGY) {
return CapabilityEnergy.ENERGY.cast(new ItemEnergyForge(stack, 3200)); return CapabilityEnergy.ENERGY.cast(new ItemEnergyForge(stack, ItemEnergyItem.CAPACITY));
} }
if (IntegrationTesla.isLoaded()) { if (IntegrationTesla.isLoaded()) {

2
src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java
View File

@@ -23,7 +23,7 @@ public abstract class ItemBlockEnergyItem extends ItemBlockBase {
public ItemBlockEnergyItem(Block block, Direction direction) { public ItemBlockEnergyItem(Block block, Direction direction) {
super(block, direction, true); super(block, direction, true);
setMaxDamage(3200); setMaxDamage(ItemEnergyItem.CAPACITY);
setMaxStackSize(1); setMaxStackSize(1);
} }

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java
View File

@@ -15,13 +15,15 @@ import net.minecraftforge.energy.IEnergyStorage;
import java.util.List; import java.util.List;
public abstract class ItemEnergyItem extends ItemBase { public abstract class ItemEnergyItem extends ItemBase {
public static final int CAPACITY = 3200;
public static final int TYPE_NORMAL = 0; public static final int TYPE_NORMAL = 0;
public static final int TYPE_CREATIVE = 1; public static final int TYPE_CREATIVE = 1;
public ItemEnergyItem(String name) { public ItemEnergyItem(String name) {
super(name); super(name);
setMaxDamage(3200); setMaxDamage(CAPACITY);
setMaxStackSize(1); setMaxStackSize(1);
setHasSubtypes(true); setHasSubtypes(true);
} }

3
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
View File

@@ -20,6 +20,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerTile; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerTile;
import com.raoulvdberge.refinedstorage.item.ItemBlockPortableGrid; import com.raoulvdberge.refinedstorage.item.ItemBlockPortableGrid;
import com.raoulvdberge.refinedstorage.item.ItemEnergyItem;
import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid; import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid;
import com.raoulvdberge.refinedstorage.item.filter.Filter; import com.raoulvdberge.refinedstorage.item.filter.Filter;
import com.raoulvdberge.refinedstorage.item.filter.FilterTab; import com.raoulvdberge.refinedstorage.item.filter.FilterTab;
@@ -146,7 +147,7 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
private static final String NBT_ENERGY = "Energy"; private static final String NBT_ENERGY = "Energy";
private EnergyForge energyStorage = new EnergyForge(3200); private EnergyForge energyStorage = new EnergyForge(ItemEnergyItem.CAPACITY);
private PortableGridType type; private PortableGridType type;
private RedstoneMode redstoneMode = RedstoneMode.IGNORE; private RedstoneMode redstoneMode = RedstoneMode.IGNORE;