mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Updated ForgeDev MCP Mapping Version (#6532)
This commit is contained in:
1 parent
aca45340bf
commit
2ce4f5ece5
83 files changed
+392
-379
No files matched your search
@@ -900,7 +900,7 @@ public interface IForgeBlock
|
||||
*/
|
||||
default boolean isStickyBlock(BlockState state)
|
||||
{
|
||||
return state.getBlock() == Blocks.SLIME_BLOCK || state.getBlock() == Blocks.field_226907_mc_;
|
||||
return state.getBlock() == Blocks.SLIME_BLOCK || state.getBlock() == Blocks.HONEY_BLOCK;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -911,8 +911,8 @@ public interface IForgeBlock
|
||||
*/
|
||||
default boolean canStickTo(BlockState state, BlockState other)
|
||||
{
|
||||
if (state.getBlock() == Blocks.field_226907_mc_ && other.getBlock() == Blocks.SLIME_BLOCK) return false;
|
||||
if (state.getBlock() == Blocks.SLIME_BLOCK && other.getBlock() == Blocks.field_226907_mc_) return false;
|
||||
if (state.getBlock() == Blocks.HONEY_BLOCK && other.getBlock() == Blocks.SLIME_BLOCK) return false;
|
||||
if (state.getBlock() == Blocks.SLIME_BLOCK && other.getBlock() == Blocks.HONEY_BLOCK) return false;
|
||||
return state.isStickyBlock() || other.isStickyBlock();
|
||||
}
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@ public interface IForgeDimension
|
||||
*/
|
||||
default SleepResult canSleepAt(net.minecraft.entity.player.PlayerEntity player, BlockPos pos)
|
||||
{
|
||||
return (getDimension().canRespawnHere() && getWorld().func_226691_t_(pos) != Biomes.NETHER) ? SleepResult.ALLOW : SleepResult.BED_EXPLODES;
|
||||
return (getDimension().canRespawnHere() && getWorld().getBiome(pos) != Biomes.NETHER) ? SleepResult.ALLOW : SleepResult.BED_EXPLODES;
|
||||
}
|
||||
|
||||
enum SleepResult
|
||||
@@ -221,7 +221,7 @@ public interface IForgeDimension
|
||||
|
||||
default boolean isHighHumidity(BlockPos pos)
|
||||
{
|
||||
return getWorld().func_226691_t_(pos).isHighHumidity();
|
||||
return getWorld().getBiome(pos).isHighHumidity();
|
||||
}
|
||||
|
||||
default int getHeight()
|
||||
|
||||
@@ -52,9 +52,9 @@ public interface IForgeEntityMinecart
|
||||
*/
|
||||
default BlockPos getCurrentRailPosition()
|
||||
{
|
||||
int x = MathHelper.floor(getMinecart().func_226277_ct_());
|
||||
int y = MathHelper.floor(getMinecart().func_226278_cu_());
|
||||
int z = MathHelper.floor(getMinecart().func_226281_cx_());
|
||||
int x = MathHelper.floor(getMinecart().getPosX());
|
||||
int y = MathHelper.floor(getMinecart().getPosY());
|
||||
int z = MathHelper.floor(getMinecart().getPosZ());
|
||||
BlockPos pos = new BlockPos(x, y - 1, z);
|
||||
if (getMinecart().world.getBlockState(pos).isIn(BlockTags.RAILS)) pos = pos.down();
|
||||
return pos;
|
||||
|
||||
@@ -56,7 +56,7 @@ public interface IForgeFluid
|
||||
*/
|
||||
default boolean isEntityInside(IFluidState state, IWorldReader world, BlockPos pos, Entity entity, double yToTest, Tag<Fluid> tag, boolean testingHead)
|
||||
{
|
||||
return state.isTagged(tag) && yToTest < (double)(pos.getY() + state.func_215679_a(world, pos) + 0.11111111F);
|
||||
return state.isTagged(tag) && yToTest < (double)(pos.getY() + state.getActualHeight(world, pos) + 0.11111111F);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -50,7 +50,7 @@ public interface IForgeFluidState
|
||||
*/
|
||||
default boolean isEntityInside(IWorldReader world, BlockPos pos, Entity entity, double yToTest, Tag<Fluid> tag, boolean testingHead)
|
||||
{
|
||||
// return ifluidstate.isTagged(p_213290_1_) && d0 < (double)((float)blockpos.getY() + ifluidstate.func_215679_a(this.world, blockpos) + 0.11111111F);
|
||||
// return ifluidstate.isTagged(p_213290_1_) && d0 < (double)((float)blockpos.getY() + ifluidstate.getActualHeight(this.world, blockpos) + 0.11111111F);
|
||||
return getFluidState().getFluid().isEntityInside(getFluidState(), world, pos, entity, yToTest, tag, testingHead);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user