Skip to content

Commit 9c7123b

Browse files
authored
Merge pull request #1 from GT-Reimagined/item-fluid-removal
Item fluid api removal
2 parents 5a162d4 + a1fa56a commit 9c7123b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1
-3610
lines changed

common/src/main/java/tesseract/FluidPlatformUtils.java

-192
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
package tesseract;
22

3-
import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler;
4-
import net.minecraft.core.BlockPos;
53
import net.minecraft.core.Direction;
64
import net.minecraft.world.item.ItemStack;
7-
import net.minecraft.world.level.Level;
85
import net.minecraft.world.level.block.entity.BlockEntity;
9-
import tesseract.api.fluid.IFluidNode;
106
import tesseract.api.gt.IEnergyHandler;
117
import tesseract.api.gt.IEnergyHandlerItem;
128
import tesseract.api.heat.IHeatHandler;
13-
import tesseract.api.item.IItemNode;
14-
import tesseract.api.item.PlatformItemHandler;
159

1610
import java.util.Optional;
1711
import java.util.ServiceLoader;
@@ -28,16 +22,4 @@ public interface TesseractCapUtils {
2822

2923

3024
Optional<IHeatHandler> getHeatHandler(BlockEntity entity, Direction side);
31-
32-
33-
Optional<PlatformItemHandler> getItemHandler(BlockEntity entity, Direction side);
34-
35-
36-
Optional<PlatformFluidHandler> getFluidHandler(Level level, BlockPos pos, Direction side);
37-
38-
39-
IFluidNode getFluidNode(Level level, long pos, Direction capSide, Runnable capCallback);
40-
41-
42-
IItemNode getItemNode(Level level, long pos, Direction capSide, Runnable capCallback);
4325
}

common/src/main/java/tesseract/TesseractGraphWrappers.java

-11
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,21 @@
11
package tesseract;
22

33
import tesseract.api.GraphWrapper;
4-
import tesseract.api.fluid.FluidTransaction;
5-
import tesseract.api.fluid.IFluidNode;
6-
import tesseract.api.fluid.IFluidPipe;
74
import tesseract.api.gt.GTTransaction;
85
import tesseract.api.gt.IGTCable;
96
import tesseract.api.gt.IGTNode;
107
import tesseract.api.heat.HeatController;
118
import tesseract.api.heat.HeatTransaction;
129
import tesseract.api.heat.IHeatNode;
1310
import tesseract.api.heat.IHeatPipe;
14-
import tesseract.api.item.IItemNode;
15-
import tesseract.api.item.IItemPipe;
16-
import tesseract.api.item.ItemController;
17-
import tesseract.api.item.ItemTransaction;
1811
import tesseract.api.rf.IRFCable;
1912
import tesseract.api.rf.IRFNode;
2013
import tesseract.api.rf.RFController;
2114
import tesseract.api.rf.RFTransaction;
2215
import tesseract.controller.Energy;
23-
import tesseract.controller.Fluid;
24-
import tesseract.graph.INode;
2516

2617
public class TesseractGraphWrappers {
2718
public static final GraphWrapper<HeatTransaction, IHeatPipe, IHeatNode> HEAT_CONTROLLER = new GraphWrapper<>(HeatController::new, IHeatNode.GETTER);
28-
public static final GraphWrapper<FluidTransaction, IFluidPipe, IFluidNode> FLUID = new GraphWrapper<>(Fluid::new, IFluidNode.GETTER);
29-
public static final GraphWrapper<ItemTransaction, IItemPipe, IItemNode> ITEM = new GraphWrapper<>(ItemController::new, IItemNode.GETTER);
3019

3120
public static final GraphWrapper<RFTransaction, IRFCable, IRFNode> RF = new GraphWrapper<>(RFController::new, IRFNode.GETTER);
3221
public static long dropletMultiplier = TesseractPlatformUtils.INSTANCE.isForge() ? 1L : 81L;

0 commit comments

Comments
 (0)