Skip to content

Commit 8e30dd6

Browse files
committed
Some cleanup
1 parent c5eccc7 commit 8e30dd6

File tree

3 files changed

+29
-44
lines changed

3 files changed

+29
-44
lines changed

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import dan200.computercraft.shared.util.NBTUtil;
2424
import de.srendi.advancedperipherals.AdvancedPeripherals;
2525
import de.srendi.advancedperipherals.common.addons.APAddons;
26-
import de.srendi.advancedperipherals.common.addons.mekanism.MekanismCapabilities;
2726
import de.srendi.advancedperipherals.common.util.LuaConverter;
2827
import de.srendi.advancedperipherals.common.util.Pair;
2928
import de.srendi.advancedperipherals.common.util.inventory.FluidFilter;
@@ -35,11 +34,6 @@
3534
import me.ramidzkh.mekae2.ae2.MekanismKey;
3635
import me.ramidzkh.mekae2.ae2.MekanismKeyType;
3736
import me.ramidzkh.mekae2.item.ChemicalStorageCell;
38-
import mekanism.api.chemical.IChemicalHandler;
39-
import mekanism.api.chemical.gas.IGasHandler;
40-
import mekanism.api.chemical.infuse.IInfusionHandler;
41-
import mekanism.api.chemical.pigment.IPigmentHandler;
42-
import mekanism.api.chemical.slurry.ISlurryHandler;
4337
import mekanism.common.tile.TileEntityChemicalTank;
4438
import net.minecraft.core.BlockPos;
4539
import net.minecraft.nbt.CompoundTag;
@@ -746,7 +740,7 @@ public static long getUsedChemicalStorage(IGridNode node) {
746740
for (int i = 0; i < inventory.size(); i++) {
747741
ItemStack stack = inventory.getStackInSlot(i);
748742

749-
if (stack.getItem() instanceof ChemicalStorageCell ) {
743+
if (stack.getItem() instanceof ChemicalStorageCell) {
750744
BasicCellInventory cellInventory = BasicCellHandler.INSTANCE.getCellInventory(stack, null);
751745

752746
used = cellInventory.getUsedBytes() / MekanismKeyType.TYPE.getAmountPerByte();
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package de.srendi.advancedperipherals.common.addons.mekanism;
22

33
import mekanism.api.chemical.gas.IGasHandler;
4-
import mekanism.api.chemical.infuse.IInfusionHandler;
5-
import mekanism.api.chemical.pigment.IPigmentHandler;
6-
import mekanism.api.chemical.slurry.ISlurryHandler;
74
import net.minecraftforge.common.capabilities.Capability;
85
import net.minecraftforge.common.capabilities.CapabilityToken;
96

@@ -13,12 +10,6 @@ public class MekanismCapabilities {
1310

1411
public static final Capability<IGasHandler> GAS_HANDLER = get(new CapabilityToken<>() {
1512
});
16-
public static final Capability<ISlurryHandler> SLURRY_HANDLER = get(new CapabilityToken<>() {
17-
});
18-
public static final Capability<IPigmentHandler> PIGMENT_HANDLER = get(new CapabilityToken<>() {
19-
});
20-
public static final Capability<IInfusionHandler> INFUSION_HANDLER = get(new CapabilityToken<>() {
21-
});
2213

2314

2415
}

src/main/java/de/srendi/advancedperipherals/common/util/inventory/IStorageSystemPeripheral.java

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,94 +29,94 @@ public interface IStorageSystemPeripheral {
2929

3030
MethodResult listFluids();
3131

32-
32+
3333
MethodResult listCraftableItems();
3434

35-
35+
3636
MethodResult listCraftableFluids();
3737

3838
MethodResult listCells();
3939

40-
40+
4141
MethodResult importItem(IComputerAccess computer, IArguments arguments) throws LuaException;
4242

43-
43+
4444
MethodResult exportItem(IComputerAccess computer, IArguments arguments) throws LuaException;
4545

46-
46+
4747
MethodResult importFluid(IComputerAccess computer, IArguments arguments) throws LuaException;
4848

49-
49+
5050
MethodResult exportFluid(IComputerAccess computer, IArguments arguments) throws LuaException;
5151

52-
52+
5353
MethodResult getFilteredPatterns(IArguments arguments) throws LuaException;
5454

55-
55+
5656
MethodResult getPatterns();
5757

58-
58+
5959
MethodResult getStoredEnergy();
6060

61-
61+
6262
MethodResult getEnergyCapacity();
6363

64-
64+
6565
MethodResult getEnergyUsage();
6666

6767
MethodResult getAvgPowerInjection();
6868

6969
MethodResult getTotalExternItemStorage();
7070

71-
71+
7272
MethodResult getTotalExternFluidStorage();
7373

74-
74+
7575
MethodResult getTotalItemStorage();
7676

77-
77+
7878
MethodResult getTotalFluidStorage();
7979

80-
80+
8181
MethodResult getUsedExternItemStorage();
8282

83-
83+
8484
MethodResult getUsedExternFluidStorage();
8585

86-
86+
8787
MethodResult getUsedItemStorage();
8888

89-
89+
9090
MethodResult getUsedFluidStorage();
9191

92-
92+
9393
MethodResult getAvailableExternItemStorage();
9494

95-
95+
9696
MethodResult getAvailableExternFluidStorage();
9797

98-
98+
9999
MethodResult getAvailableItemStorage();
100100

101-
101+
102102
MethodResult getAvailableFluidStorage();
103103

104-
104+
105105
MethodResult craftItem(IComputerAccess computer, IArguments arguments) throws LuaException;
106106

107-
107+
108108
MethodResult craftFluid(IComputerAccess computer, IArguments arguments) throws LuaException;
109109

110-
110+
111111
MethodResult isItemCraftable(IArguments arguments) throws LuaException;
112112

113-
113+
114114
MethodResult isItemCrafting(IArguments arguments) throws LuaException;
115115

116-
116+
117117
MethodResult isFluidCraftable(IArguments arguments) throws LuaException;
118118

119-
119+
120120
MethodResult isFluidCrafting(IArguments arguments) throws LuaException;
121121

122122
}

0 commit comments

Comments
 (0)