|
21 | 21 | package com.falsepattern.lib.compat; |
22 | 22 |
|
23 | 23 | import com.falsepattern.lib.StableAPI; |
| 24 | +import com.falsepattern.lib.util.MathUtil; |
24 | 25 | import com.google.common.collect.AbstractIterator; |
25 | 26 | import cpw.mods.fml.relauncher.Side; |
26 | 27 | import cpw.mods.fml.relauncher.SideOnly; |
@@ -52,7 +53,7 @@ public class BlockPos extends Vec3i { |
52 | 53 | */ |
53 | 54 | public static final BlockPos ORIGIN = new BlockPos(0, 0, 0); |
54 | 55 | private static final Logger LOGGER = LogManager.getLogger(); |
55 | | - private static final int NUM_X_BITS = 1 + MathHelper.calculateLogBaseTwo(MathHelper.roundUpToPowerOfTwo(30000000)); |
| 56 | + private static final int NUM_X_BITS = 1 + MathUtil.log2(MathUtil.smallestEncompassingPowerOfTwo(30000000)); |
56 | 57 | private static final int NUM_Z_BITS = NUM_X_BITS; |
57 | 58 | private static final int NUM_Y_BITS = 64 - NUM_X_BITS - NUM_Z_BITS; |
58 | 59 | private static final long Y_MASK = (1L << NUM_Y_BITS) - 1L; |
@@ -431,7 +432,7 @@ public BlockPos.MutableBlockPos setPos(@NonNull Entity entity) { |
431 | 432 | } |
432 | 433 |
|
433 | 434 | public BlockPos.MutableBlockPos setPos(double x, double y, double z) { |
434 | | - return setPos(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z)); |
| 435 | + return setPos(MathUtil.floor(x), MathUtil.floor(y), MathUtil.floor(z)); |
435 | 436 | } |
436 | 437 |
|
437 | 438 | public BlockPos.MutableBlockPos setPos(int x, int y, int z) { |
@@ -483,7 +484,7 @@ public static BlockPos.PooledMutableBlockPos retain(int x, int y, int z) { |
483 | 484 | } |
484 | 485 |
|
485 | 486 | public static BlockPos.PooledMutableBlockPos retain(double x, double y, double z) { |
486 | | - return retain(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z)); |
| 487 | + return retain(MathUtil.floor(x), MathUtil.floor(y), MathUtil.floor(z)); |
487 | 488 | } |
488 | 489 |
|
489 | 490 | @SideOnly(Side.CLIENT) |
|
0 commit comments