Skip to content

Commit

Permalink
updated antimatter
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Nov 14, 2024
1 parent 18d1826 commit 3684658
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion AntimatterAPI
Submodule AntimatterAPI updated 6 files
+1 −1 common/src/main/java/muramasa/antimatter/blockentity/BlockEntityTank.java
+1 −1 common/src/main/java/muramasa/antimatter/blockentity/multi/BlockEntityHatch.java
+2 −2 common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityFluidPipe.java
+2 −3 common/src/main/java/muramasa/antimatter/capability/FluidHandler.java
+10 −5 common/src/main/java/muramasa/antimatter/capability/machine/MachineFluidHandler.java
+3 −3 common/src/main/java/muramasa/antimatter/capability/pipe/PipeFluidHandler.java
6 changes: 3 additions & 3 deletions common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeTank.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class BlockEntityLargeTank extends BlockEntityMaterialBasicMultiMachine<B
MultiblockTankMachine tankMachine;
public BlockEntityLargeTank(MultiblockTankMachine type, BlockPos pos, BlockState state) {
super(type, pos, state);
this.fluidHandler.set(() -> new LargeTankFluidHandler(this, type.getCapacity(), 10000, 1, 0));
this.fluidHandler.set(() -> new LargeTankFluidHandler(this, type.getCapacity(), 1, 0));
this.tankMachine = type;
}

Expand Down Expand Up @@ -65,8 +65,8 @@ public List<String> getInfo(boolean simple) {

public static class LargeTankFluidHandler extends MachineFluidHandler<BlockEntityLargeTank> {

public LargeTankFluidHandler(BlockEntityLargeTank tile, int capacity, int pressure, int inputCount, int outputCount) {
super(tile, capacity, pressure, inputCount, outputCount);
public LargeTankFluidHandler(BlockEntityLargeTank tile, int capacity, int inputCount, int outputCount) {
super(tile, capacity, inputCount, outputCount);
}

@Nullable
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class BlockEntityLongDistancePipeEndpoint extends BlockEntityBasicMultiMa
public BlockEntityLongDistancePipeEndpoint(Machine<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
if (type.has(MachineFlag.FLUID)){
this.fluidHandler.set(() -> new MachineFluidHandler<>(this, 0, 0, 0, 0){
this.fluidHandler.set(() -> new MachineFluidHandler<>(this, 0, 0, 0){
@Override
public boolean canInput(Direction direction) {
return direction == tile.getFacing();
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityCoalBoiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public void deserialize(CompoundTag nbt) {
public static class CoalBoilerFluidHandler extends MachineFluidHandler<BlockEntityCoalBoiler> {

public CoalBoilerFluidHandler(BlockEntityCoalBoiler tile) {
super(tile, 16000, 1000 * (250 + tile.getMachineTier().getIntegerId()));
super(tile);
tanks.put(FluidDirection.INPUT, FluidTanks.create(tile, SlotType.FL_IN, b -> {
b.tank(16000);
return b;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityHull.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
public class BlockEntityHull extends BlockEntityMachine<BlockEntityHull> {
public BlockEntityHull(Machine<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
fluidHandler.set(() -> new MachineFluidHandler<>(this, 1000 + (1000 * getMachineTier().getIntegerId()), 2000){
fluidHandler.set(() -> new MachineFluidHandler<>(this, 1000 + (1000 * getMachineTier().getIntegerId())){
@Override
public FluidHolder[] getOutputs() {
return getInputs();
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInputHatch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class BlockEntityInputHatch extends BlockEntityHatch<BlockEntityInputHatch> {
public BlockEntityInputHatch(HatchMachine type, BlockPos pos, BlockState state) {
super(type, pos, state);
fluidHandler.set(() -> new MachineFluidHandler<>(this, 8000 * (getMachineTier().getIntegerId() + 1), 1000 * (250 + getMachineTier().getIntegerId())){
fluidHandler.set(() -> new MachineFluidHandler<>(this, 8000 * (getMachineTier().getIntegerId() + 1)){
@Override
public boolean canInput(Direction direction) {
return super.canInput(direction) && direction == coverHandler.map(MachineCoverHandler::getOutputFacing).orElse(null);
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityLavaBoiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void deserialize(CompoundTag nbt) {

public static class LavaBoilerFluidHandler extends MachineFluidHandler<BlockEntityLavaBoiler> {
public LavaBoilerFluidHandler(BlockEntityLavaBoiler tile) {
super(tile, 16000, 1000 * (250 + tile.getMachineTier().getIntegerId()));
super(tile);
tanks.put(FluidDirection.INPUT, FluidTanks.create(tile, SlotType.FL_IN, b -> {
b.tank(p -> p.getFluid() == Fluids.WATER || p.getFluid() == DistilledWater.getLiquid(), 16000)
.tank(p -> p.getFluid() == Fluids.LAVA, 16000);
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityNuclearReactorCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class BlockEntityNuclearReactorCore extends BlockEntitySecondaryOutput<Bl

public BlockEntityNuclearReactorCore(Machine<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
this.fluidHandler.set(() -> new MachineFluidHandler<>(this, 64000, 1000, 1, 1));
this.fluidHandler.set(() -> new MachineFluidHandler<>(this, 64000, 1, 1));
this.itemHandler.set(() -> new MachineItemHandler<>(this){
@Override
protected TrackedItemHandler<BlockEntityNuclearReactorCore> createTrackedHandler(SlotType<?> type, BlockEntityNuclearReactorCore tile) {
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityPump.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class BlockEntityPump extends BlockEntityMachine<BlockEntityPump> {
public List<Fluid> mPumpedFluids = new ArrayList<>();
public BlockEntityPump(Machine<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
this.fluidHandler.set(() -> new MachineFluidHandler<>(this, 8000 * (this.getMachineTier().getIntegerId()), 1000, 0, 1));
this.fluidHandler.set(() -> new MachineFluidHandler<>(this, 8000 * (this.getMachineTier().getIntegerId()), 0, 1));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySolarBoiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public void deserialize(CompoundTag nbt) {

public static class LavaBoilerFluidHandler extends MachineFluidHandler<BlockEntitySolarBoiler> {
public LavaBoilerFluidHandler(BlockEntitySolarBoiler tile) {
super(tile, 16000, 1000 * (250 + tile.getMachineTier().getIntegerId()));
super(tile);
tanks.put(FluidDirection.INPUT, FluidTanks.create(tile, SlotType.FL_IN, b -> {
b.tank(p -> p.getFluid() == Fluids.WATER || p.getFluid() == DistilledWater.getLiquid(), 16000);
return b;
Expand Down

0 comments on commit 3684658

Please sign in to comment.