mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 05:02:18 +00:00
Updated to latest mappings. Exc is broken, some anonymous classes didn't map to srg names.
This commit is contained in:
1 parent
52e877bdd0
commit
4650ee2789
61 files changed
+400
-311
No files matched your search
@@ -212,7 +212,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
return displacements.get(state.getBlock());
|
||||
}
|
||||
|
||||
Material material = state.func_185904_a();
|
||||
Material material = state.getMaterial();
|
||||
if (material.blocksMovement() || material == Material.portal)
|
||||
{
|
||||
return false;
|
||||
@@ -261,7 +261,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
return false;
|
||||
}
|
||||
|
||||
Material material = state.func_185904_a();
|
||||
Material material = state.getMaterial();
|
||||
if (material.blocksMovement() || material == Material.portal)
|
||||
{
|
||||
return false;
|
||||
@@ -380,7 +380,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
*/
|
||||
|
||||
@Override
|
||||
public int func_185484_c(IBlockState state, IBlockAccess world, BlockPos pos)
|
||||
public int getPackedLightmapCoords(IBlockState state, IBlockAccess world, BlockPos pos)
|
||||
{
|
||||
int lightThis = world.getCombinedLight(pos, 0);
|
||||
int lightUp = world.getCombinedLight(pos.up(), 0);
|
||||
@@ -403,7 +403,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
|
||||
{
|
||||
IBlockState neighbor = world.getBlockState(pos.offset(side));
|
||||
if (neighbor.func_185904_a() == state.func_185904_a())
|
||||
if (neighbor.getMaterial() == state.getMaterial())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -487,7 +487,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
public static double getFlowDirection(IBlockAccess world, BlockPos pos)
|
||||
{
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
if (!state.func_185904_a().isLiquid())
|
||||
if (!state.getMaterial().isLiquid())
|
||||
{
|
||||
return -1000.0;
|
||||
}
|
||||
@@ -554,7 +554,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
IBlockState up = world.getBlockState(pos.down(densityDir));
|
||||
if (here.getBlock() == this)
|
||||
{
|
||||
if (up.func_185904_a().isLiquid() || up.getBlock() instanceof IFluidBlock)
|
||||
if (up.getMaterial().isLiquid() || up.getBlock() instanceof IFluidBlock)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@@ -564,7 +564,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
return 0.875F;
|
||||
}
|
||||
}
|
||||
return !here.func_185904_a().isSolid() && up.getBlock() == this ? 1 : this.getQuantaPercentage(world, pos) * 0.875F;
|
||||
return !here.getMaterial().isSolid() && up.getBlock() == this ? 1 : this.getQuantaPercentage(world, pos) * 0.875F;
|
||||
}
|
||||
|
||||
public Vec3d getFlowVector(IBlockAccess world, BlockPos pos)
|
||||
@@ -589,7 +589,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
|
||||
int otherDecay = quantaPerBlock - getQuantaValue(world, pos2);
|
||||
if (otherDecay >= quantaPerBlock)
|
||||
{
|
||||
if (!world.getBlockState(pos2).func_185904_a().blocksMovement())
|
||||
if (!world.getBlockState(pos2).getMaterial().blocksMovement())
|
||||
{
|
||||
otherDecay = quantaPerBlock - getQuantaValue(world, pos2.down());
|
||||
if (otherDecay >= 0)
|
||||
|
||||
@@ -289,7 +289,7 @@ public class BlockFluidClassic extends BlockFluidBase
|
||||
return displacements.get(state.getBlock());
|
||||
}
|
||||
|
||||
Material material = state.func_185904_a();
|
||||
Material material = state.getMaterial();
|
||||
if (material.blocksMovement() ||
|
||||
material == Material.water ||
|
||||
material == Material.lava ||
|
||||
|
||||
@@ -404,7 +404,7 @@ public class FluidUtil
|
||||
{
|
||||
if (world != null && pos != null)
|
||||
{
|
||||
world.func_184148_a(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.field_187638_cR, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
|
||||
world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem
|
||||
&& !player.capabilities.isCreativeMode)
|
||||
{
|
||||
// success!
|
||||
player.triggerAchievement(StatList.func_188057_b(this));
|
||||
player.addStat(StatList.func_188057_b(this));
|
||||
|
||||
itemstack.stackSize--;
|
||||
ItemStack emptyStack = empty != null ? empty.copy() : new ItemStack(this);
|
||||
@@ -162,7 +162,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem
|
||||
return false;
|
||||
}
|
||||
|
||||
Material material = worldIn.getBlockState(pos).func_185904_a();
|
||||
Material material = worldIn.getBlockState(pos).getMaterial();
|
||||
boolean isSolid = material.isSolid();
|
||||
|
||||
// can only place in air or non-solid blocks
|
||||
@@ -177,7 +177,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem
|
||||
int i = pos.getX();
|
||||
int j = pos.getY();
|
||||
int k = pos.getZ();
|
||||
worldIn.func_184133_a(null, pos, SoundEvents.field_187646_bt, SoundCategory.BLOCKS, 0.5F,
|
||||
worldIn.playSound(null, pos, SoundEvents.block_fire_extinguish, SoundCategory.BLOCKS, 0.5F,
|
||||
2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F);
|
||||
|
||||
for (int l = 0; l < 8; ++l)
|
||||
|
||||
Reference in new issue
Block a user