Fluid rework derp fixes. (#6098)

* Fix nulls returning from non-null methods, and null-check of non-nullable values.
* Fix missed computation of the isEmpty flag in FluidStack
* Cleanup getAmount/isEmpty calls.
* Remove redundant suppliers. That info is readily available from the vanilla Fluid / FluidState.
This commit is contained in:
David Quintana authored and GitHub committed 2019-08-29 21:09:42 +02:00
1 parent bae2ee0420
commit d9f6659f2c
12 files changed
+55 -80

No files matched your search

@@ -29,10 +29,7 @@ import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids;
import net.minecraft.fluid.IFluidState;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.BucketItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.Items;
import net.minecraft.item.*;
import net.minecraft.state.StateContainer;
import net.minecraft.tags.FluidTags;
import net.minecraft.tileentity.TileEntity;
@@ -47,10 +44,13 @@ import net.minecraft.world.IWorldReader;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.ObjectHolder;
import org.apache.commons.lang3.Validate;
@Mod("new_fluid_test")
public class NewFluidTest
@@ -77,6 +77,7 @@ public class NewFluidTest
modEventBus.addGenericListener(Block.class, this::registerBlocks);
modEventBus.addGenericListener(Item.class, this::registerItems);
modEventBus.addGenericListener(Fluid.class, this::registerFluids);
modEventBus.addListener(this::loadComplete);
}
public void registerBlocks(RegistryEvent.Register<Block> event)
@@ -103,6 +104,16 @@ public class NewFluidTest
event.getRegistry().registerAll(test_fluid, test_fluid_flowing);
}
public void loadComplete(FMLLoadCompleteEvent event)
{
// some sanity checks
BlockState state = Fluids.WATER.getDefaultState().getBlockState();
BlockState state2 = Fluids.WATER.getAttributes().getBlock(null,null,Fluids.WATER.getDefaultState());
Validate.isTrue(state.getBlock() == Blocks.WATER && state2 == state);
ItemStack stack = Fluids.WATER.getAttributes().getBucket(new FluidStack(Fluids.WATER, 1));
Validate.isTrue(stack.getItem() == Fluids.WATER.getFilledBucket());
}
private static final FluidAttributes ATTRIBUTES = FluidAttributes.builder("test_fluid", FLUID_STILL, FLUID_FLOWING).build();
private static abstract class MyFlowingFluid extends FlowingFluid
@@ -187,7 +198,7 @@ public class NewFluidTest
}
@Override
public FluidAttributes createAttributes(Fluid fluid)
protected FluidAttributes createAttributes(Fluid fluid)
{
return ATTRIBUTES;
}