mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Fluid API rework (#5983)
- Moved forge fluids into FluidAttributes companion object to the vanilla Fluid. By gigaherz - Redesigned the Fluid API to be closer to the Items API. By King Lemming Co-authored-by: King Lemming <[email protected]>
This commit is contained in:
1 parent
e784a7f606
commit
b7e1cc5f6b
48 files changed
+1077
-2193
No files matched your search
@@ -32,8 +32,6 @@ import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.event.ModelRegistryEvent;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
|
||||
@@ -63,7 +63,7 @@ import net.minecraftforge.event.entity.player.FillBucketEvent;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTank;
|
||||
import net.minecraftforge.fluids.FluidTankOld;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
import net.minecraftforge.fluids.IFluidBlock;
|
||||
import net.minecraftforge.fluids.UniversalBucket;
|
||||
@@ -136,7 +136,7 @@ public class DynBucketTest
|
||||
@net.minecraftforge.eventbus.api.SubscribeEvent
|
||||
public void registerRecipes(RegistryEvent.Register<IRecipe> event)
|
||||
{
|
||||
ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(ModelFluidTest.FLUID, Fluid.BUCKET_VOLUME));
|
||||
ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(ModelFluidTest.FLUID, FluidAttributes.BUCKET_VOLUME));
|
||||
GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "diamond_to_fluid"), null, filledBucket, Ingredient.fromItem(Items.DIAMOND));
|
||||
}
|
||||
|
||||
@@ -162,7 +162,7 @@ public class DynBucketTest
|
||||
if (state.getBlock() instanceof IFluidBlock)
|
||||
{
|
||||
Fluid fluid = ((IFluidBlock) state.getBlock()).getFluid();
|
||||
FluidStack fs = new FluidStack(fluid, Fluid.BUCKET_VOLUME);
|
||||
FluidStack fs = new FluidStack(fluid, FluidAttributes.BUCKET_VOLUME);
|
||||
|
||||
ItemStack bucket = event.getEmptyBucket();
|
||||
IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(bucket);
|
||||
@@ -331,7 +331,7 @@ public class DynBucketTest
|
||||
|
||||
public static class TileSimpleTank extends TileEntity
|
||||
{
|
||||
FluidTank tank = new FluidTank(4000);
|
||||
FluidTankOld tank = new FluidTankOld(4000);
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound tags)
|
||||
|
||||
@@ -213,7 +213,7 @@ public class FluidPlacementTest
|
||||
@Override
|
||||
public int fill(FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (container.getCount() != 1 || resource == null || resource.amount > Fluid.BUCKET_VOLUME || container
|
||||
if (container.getCount() != 1 || resource == null || resource.amount > FluidAttributes.BUCKET_VOLUME || container
|
||||
.getItem() instanceof ItemBucketMilk || getFluid() != null || !canFillFluidType(resource))
|
||||
{
|
||||
return 0;
|
||||
|
||||
@@ -0,0 +1,206 @@
|
||||
package net.minecraftforge.debug.fluid;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.FlowingFluidBlock;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.fluid.FlowingFluid;
|
||||
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.state.StateContainer;
|
||||
import net.minecraft.tags.FluidTags;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.IEnviromentBlockReader;
|
||||
import net.minecraft.world.IWorld;
|
||||
import net.minecraft.world.IWorldReader;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fluids.FluidAttributes;
|
||||
import net.minecraftforge.fml.ModLoadingContext;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
|
||||
@Mod("new_fluid_test")
|
||||
public class NewFluidTest
|
||||
{
|
||||
public static final ResourceLocation FLUID_STILL = new ResourceLocation("minecraft:block/brown_mushroom_block");
|
||||
public static final ResourceLocation FLUID_FLOWING = new ResourceLocation("minecraft:block/mushroom_stem");
|
||||
|
||||
@ObjectHolder("forge:test_fluid")
|
||||
public static FlowingFluid test_fluid;
|
||||
|
||||
@ObjectHolder("forge:test_fluid_flowing")
|
||||
public static Fluid test_fluid_flowing;
|
||||
|
||||
@ObjectHolder("forge:test_fluid_bucket")
|
||||
public static Item test_fluid_bucket;
|
||||
|
||||
@ObjectHolder("forge:test_fluid_block")
|
||||
public static Block test_fluid_block;
|
||||
|
||||
public NewFluidTest()
|
||||
{
|
||||
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
|
||||
modEventBus.addGenericListener(Block.class, this::registerBlocks);
|
||||
modEventBus.addGenericListener(Item.class, this::registerItems);
|
||||
modEventBus.addGenericListener(Fluid.class, this::registerFluids);
|
||||
}
|
||||
|
||||
public void registerBlocks(RegistryEvent.Register<Block> event)
|
||||
{
|
||||
(test_fluid = new MyFlowingFluid.Source()).setRegistryName("forge:test_fluid");
|
||||
test_fluid_flowing = new MyFlowingFluid.Flowing().setRegistryName("forge:test_fluid_flowing");
|
||||
|
||||
event.getRegistry().registerAll(
|
||||
new FlowingFluidBlock(test_fluid, Block.Properties.create(Material.WATER).doesNotBlockMovement().hardnessAndResistance(100.0F).noDrops())
|
||||
{}
|
||||
.setRegistryName("forge:test_fluid_block")
|
||||
);
|
||||
}
|
||||
|
||||
public void registerItems(RegistryEvent.Register<Item> event)
|
||||
{
|
||||
event.getRegistry().registerAll(
|
||||
new BucketItem(test_fluid, new Item.Properties().containerItem(Items.BUCKET).maxStackSize(1).group(ItemGroup.MISC)).setRegistryName("forge:test_fluid_bucket")
|
||||
);
|
||||
}
|
||||
|
||||
public void registerFluids(RegistryEvent.Register<Fluid> event)
|
||||
{
|
||||
event.getRegistry().registerAll(test_fluid, test_fluid_flowing);
|
||||
}
|
||||
|
||||
private static final FluidAttributes ATTRIBUTES = FluidAttributes.builder("test_fluid", FLUID_STILL, FLUID_FLOWING).build();
|
||||
|
||||
private static abstract class MyFlowingFluid extends FlowingFluid
|
||||
{
|
||||
@Override
|
||||
public Fluid getFlowingFluid()
|
||||
{
|
||||
return test_fluid_flowing;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Fluid getStillFluid()
|
||||
{
|
||||
return test_fluid;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean canSourcesMultiply()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void beforeReplacingBlock(IWorld worldIn, BlockPos pos, BlockState state)
|
||||
{
|
||||
// copied from the WaterFluid implementation
|
||||
TileEntity tileentity = state.getBlock().hasTileEntity() ? worldIn.getTileEntity(pos) : null;
|
||||
Block.spawnDrops(state, worldIn.getWorld(), pos, tileentity);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSlopeFindDistance(IWorldReader worldIn)
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getLevelDecreasePerBlock(IWorldReader worldIn)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockRenderLayer getRenderLayer()
|
||||
{
|
||||
return BlockRenderLayer.TRANSLUCENT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getFilledBucket()
|
||||
{
|
||||
return test_fluid_bucket;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean func_215665_a(IFluidState p_215665_1_, IBlockReader p_215665_2_, BlockPos p_215665_3_, Fluid p_215665_4_, Direction p_215665_5_)
|
||||
{
|
||||
return p_215665_5_ == Direction.DOWN && !p_215665_4_.isIn(FluidTags.WATER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTickRate(IWorldReader p_205569_1_)
|
||||
{
|
||||
return 5;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected float getExplosionResistance()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BlockState getBlockState(IFluidState state)
|
||||
{
|
||||
return test_fluid_block.getDefaultState().with(FlowingFluidBlock.LEVEL, getLevelFromState(state));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEquivalentTo(Fluid fluidIn) {
|
||||
return fluidIn == test_fluid || fluidIn == test_fluid_flowing;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidAttributes createAttributes(Fluid fluid)
|
||||
{
|
||||
return ATTRIBUTES;
|
||||
}
|
||||
|
||||
public static class Flowing extends MyFlowingFluid
|
||||
{
|
||||
{
|
||||
setDefaultState(getStateContainer().getBaseState().with(LEVEL_1_8, 7));
|
||||
}
|
||||
|
||||
protected void fillStateContainer(StateContainer.Builder<Fluid, IFluidState> builder) {
|
||||
super.fillStateContainer(builder);
|
||||
builder.add(LEVEL_1_8);
|
||||
}
|
||||
|
||||
public int getLevel(IFluidState p_207192_1_) {
|
||||
return p_207192_1_.get(LEVEL_1_8);
|
||||
}
|
||||
|
||||
public boolean isSource(IFluidState state) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static class Source extends MyFlowingFluid {
|
||||
public int getLevel(IFluidState p_207192_1_) {
|
||||
return 8;
|
||||
}
|
||||
|
||||
public boolean isSource(IFluidState state) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user