Skip to content

Commit b275496

Browse files
pupnewfsterpupnewfster
committed
Remove support for IFluidBlock in preparation of neoforged/NeoForge#1024 
1 parent 0c61eff commit b275496

File tree

5 files changed

+5
-38
lines changed

5 files changed

+5
-38
lines changed

‎src/main/java/mekanism/client/gui/item/GuiSeismicReader.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import net.minecraft.world.level.material.Fluids;
3535
import net.minecraft.world.phys.BlockHitResult;
3636
import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
37-
import net.neoforged.neoforge.fluids.IFluidBlock;
3837
import org.jetbrains.annotations.NotNull;
3938

4039
public class GuiSeismicReader extends GuiMekanism<SeismicReaderContainer> {
@@ -63,8 +62,6 @@ public GuiSeismicReader(SeismicReaderContainer container, Inventory inv, Compone
6362
Fluid fluid = Fluids.EMPTY;
6463
if (state.getBlock() instanceof LiquidBlock liquidBlock) {
6564
fluid = liquidBlock.fluid;
66-
} else if (state.getBlock() instanceof IFluidBlock fluidBlock) {
67-
fluid = fluidBlock.getFluid();
6865
} else if (state.getBlock() instanceof BubbleColumnBlock) {
6966
fluid = level.getFluidState(p).getType();
7067
}

‎src/main/java/mekanism/common/content/gear/ModuleContainer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ public <MODULE extends ICustomModule<MODULE>> ModuleContainer replaceModuleConfi
151151
}
152152
SequencedMap<ModuleData<?>, Module<?>> copiedModules = new LinkedHashMap<>(typedModules);
153153
copiedModules.put(type, replacedModule);
154-
//TODO - 1.20.5: Evaluate what we want it to return as
155154
return updateContainer(stack, copiedModules, null);
156155
}
157156

‎src/main/java/mekanism/common/item/block/machine/ItemBlockFluidTank.java

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import net.minecraft.world.item.context.UseOnContext;
5555
import net.minecraft.world.level.ClipContext;
5656
import net.minecraft.world.level.Level;
57-
import net.minecraft.world.level.block.Block;
5857
import net.minecraft.world.level.block.Blocks;
5958
import net.minecraft.world.level.block.BucketPickup;
6059
import net.minecraft.world.level.block.DispenserBlock;
@@ -71,8 +70,6 @@
7170
import net.neoforged.neoforge.common.SoundActions;
7271
import net.neoforged.neoforge.fluids.FluidStack;
7372
import net.neoforged.neoforge.fluids.FluidType;
74-
import net.neoforged.neoforge.fluids.IFluidBlock;
75-
import net.neoforged.neoforge.fluids.capability.IFluidHandler.FluidAction;
7673
import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem;
7774
import org.jetbrains.annotations.NotNull;
7875
import org.jetbrains.annotations.Nullable;
@@ -199,16 +196,7 @@ public InteractionResultHolder<ItemStack> use(@NotNull Level world, Player playe
199196
// only allow collecting from non-empty sources
200197
Fluid fluid = fluidState.getType();
201198
FluidStack fluidStack = new FluidStack(fluid, FluidType.BUCKET_VOLUME);
202-
Block block = blockState.getBlock();
203-
if (block instanceof IFluidBlock fluidBlock) {
204-
fluidStack = fluidBlock.drain(world, pos, FluidAction.SIMULATE);
205-
if (!validFluid(fluidTank, fluidStack)) {
206-
//If the fluid is not valid, pass on doing anything
207-
return InteractionResultHolder.pass(stack);
208-
}
209-
//Actually drain it
210-
fluidStack = fluidBlock.drain(world, pos, FluidAction.EXECUTE);
211-
} else if (block instanceof BucketPickup bucketPickup && validFluid(fluidTank, fluidStack)) {
199+
if (blockState.getBlock() instanceof BucketPickup bucketPickup && validFluid(fluidTank, fluidStack)) {
212200
//If it can be picked up by a bucket, and we actually want to pick it up, do so to update the fluid type we are doing
213201
// otherwise we assume the type from the fluid state is correct
214202
ItemStack pickedUpStack = bucketPickup.pickupBlock(player, world, pos, blockState);
@@ -341,16 +329,7 @@ public ItemStack execute(@NotNull BlockSource source, @NotNull ItemStack stack)
341329
// only allow collecting from non-empty sources
342330
Fluid fluid = fluidState.getType();
343331
FluidStack fluidStack = new FluidStack(fluid, FluidType.BUCKET_VOLUME);
344-
Block block = blockState.getBlock();
345-
if (block instanceof IFluidBlock fluidBlock) {
346-
fluidStack = fluidBlock.drain(world, pos, FluidAction.SIMULATE);
347-
if (!validFluid(fluidTank, fluidStack)) {
348-
//If the fluid is not valid, then eject the stack similar to how vanilla does for buckets
349-
return super.execute(source, stack);
350-
}
351-
//Actually drain it
352-
fluidStack = fluidBlock.drain(world, pos, FluidAction.EXECUTE);
353-
} else if (block instanceof BucketPickup bucketPickup && validFluid(fluidTank, fluidStack)) {
332+
if (blockState.getBlock() instanceof BucketPickup bucketPickup && validFluid(fluidTank, fluidStack)) {
354333
//If it can be picked up by a bucket, and we actually want to pick it up, do so to update the fluid type we are doing
355334
// otherwise we assume the type from the fluid state is correct
356335
ItemStack pickedUpStack = bucketPickup.pickupBlock(null, world, pos, blockState);

‎src/main/java/mekanism/common/tile/machine/TileEntityElectricPump.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import mekanism.api.AutomationType;
1111
import mekanism.api.IConfigurable;
1212
import mekanism.api.IContentsListener;
13-
import mekanism.api.SerializationConstants;
1413
import mekanism.api.RelativeSide;
14+
import mekanism.api.SerializationConstants;
1515
import mekanism.api.Upgrade;
1616
import mekanism.api.math.FloatingLong;
1717
import mekanism.common.Mekanism;
@@ -69,7 +69,6 @@
6969
import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
7070
import net.neoforged.neoforge.fluids.FluidStack;
7171
import net.neoforged.neoforge.fluids.FluidType;
72-
import net.neoforged.neoforge.fluids.IFluidBlock;
7372
import net.neoforged.neoforge.fluids.capability.IFluidHandler;
7473
import org.jetbrains.annotations.NotNull;
7574
import org.jetbrains.annotations.Nullable;
@@ -228,13 +227,7 @@ private boolean suck(BlockPos pos, boolean hasFilter, boolean addRecurring) {
228227
//Just in case someone does weird things and has a fluid state that is empty and a source
229228
// only allow collecting from non-empty sources
230229
Block block = blockState.getBlock();
231-
if (block instanceof IFluidBlock fluidBlock) {
232-
if (validFluid(fluidBlock.drain(level, pos, FluidAction.SIMULATE))) {
233-
//Actually drain it
234-
suck(fluidBlock.drain(level, pos, FluidAction.EXECUTE), pos, addRecurring);
235-
return true;
236-
}
237-
} else if (block instanceof BucketPickup bucketPickup) {
230+
if (block instanceof BucketPickup bucketPickup) {
238231
Fluid sourceFluid = fluidState.getType();
239232
FluidStack fluidStack = getOutput(sourceFluid, hasFilter);
240233
if (validFluid(fluidStack)) {

‎src/main/java/mekanism/common/util/MekanismUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
import net.neoforged.neoforge.common.UsernameCache;
8989
import net.neoforged.neoforge.fluids.FluidStack;
9090
import net.neoforged.neoforge.fluids.FluidType;
91-
import net.neoforged.neoforge.fluids.IFluidBlock;
9291
import net.neoforged.neoforge.items.IItemHandler;
9392
import net.neoforged.neoforge.items.ItemHandlerHelper;
9493
import net.neoforged.neoforge.server.ServerLifecycleHooks;
@@ -369,7 +368,7 @@ public static boolean lighterThanAirGas(FluidStack stack) {
369368

370369
public static boolean isLiquidBlock(Block block) {
371370
//Treat bubble columns as liquids
372-
return block instanceof LiquidBlock || block instanceof BubbleColumnBlock || block instanceof IFluidBlock;
371+
return block instanceof LiquidBlock || block instanceof BubbleColumnBlock;
373372
}
374373

375374
/**

0 commit comments

Comments
 (0)