Merge remote-tracking branch 'architectury/1.18.2' into 1.19

# Conflicts:
#	fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java
#	gradle.properties
This commit is contained in:
shedaniel
2022-05-05 16:10:08 +08:00
4 changed files with 149 additions and 13 deletions

View File

@@ -29,6 +29,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.FluidState;
import org.jetbrains.annotations.Nullable;
@@ -148,4 +149,86 @@ public class FluidStackHooks {
public static int getColor(Fluid fluid) {
throw new AssertionError();
}
/**
* Returns the luminosity of the fluid.
*
* @param fluid the fluid
* @param level the level, can be {@code null}
* @param pos the block position, can be {@code null}
* @return the luminosity of the fluid, this ranges from 0 to 15
*/
@ExpectPlatform
public static int getLuminosity(FluidStack fluid, @Nullable Level level, @Nullable BlockPos pos) {
throw new AssertionError();
}
/**
* Returns the luminosity of the fluid.
*
* @param fluid the fluid
* @param level the level, can be {@code null}
* @param pos the block position, can be {@code null}
* @return the luminosity of the fluid, this ranges from 0 to 15
*/
@ExpectPlatform
public static int getLuminosity(Fluid fluid, @Nullable Level level, @Nullable BlockPos pos) {
throw new AssertionError();
}
/**
* Returns the temperature of the fluid.
* The temperature is in kelvin, for example, 300 kelvin is equal to room temperature.
*
* @param fluid the fluid
* @param level the level, can be {@code null}
* @param pos the block position, can be {@code null}
* @return the temperature of the fluid
*/
@ExpectPlatform
public static int getTemperature(FluidStack fluid, @Nullable Level level, @Nullable BlockPos pos) {
throw new AssertionError();
}
/**
* Returns the temperature of the fluid.
* The temperature is in kelvin, for example, 300 kelvin is equal to room temperature.
*
* @param fluid the fluid
* @param level the level, can be {@code null}
* @param pos the block position, can be {@code null}
* @return the temperature of the fluid
*/
@ExpectPlatform
public static int getTemperature(Fluid fluid, @Nullable Level level, @Nullable BlockPos pos) {
throw new AssertionError();
}
/**
* Returns the viscosity of the fluid. A lower viscosity means that the fluid will flow faster.
* The default value is 1000 for water.
*
* @param fluid the fluid
* @param level the level, can be {@code null}
* @param pos the block position, can be {@code null}
* @return the viscosity of the fluid
*/
@ExpectPlatform
public static int getViscosity(FluidStack fluid, @Nullable Level level, @Nullable BlockPos pos) {
throw new AssertionError();
}
/**
* Returns the viscosity of the fluid. A lower viscosity means that the fluid will flow faster.
* The default value is 1000 for water.
*
* @param fluid the fluid
* @param level the level, can be {@code null}
* @param pos the block position, can be {@code null}
* @return the viscosity of the fluid
*/
@ExpectPlatform
public static int getViscosity(Fluid fluid, @Nullable Level level, @Nullable BlockPos pos) {
throw new AssertionError();
}
}