Skip to content

Commit 30ef2fc

Browse files
committed
new math class
1 parent dc6af7a commit 30ef2fc

File tree

3 files changed

+630
-4
lines changed

3 files changed

+630
-4
lines changed

src/main/java/com/falsepattern/lib/compat/BlockPos.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package com.falsepattern.lib.compat;
2222

2323
import com.falsepattern.lib.StableAPI;
24+
import com.falsepattern.lib.util.MathUtil;
2425
import com.google.common.collect.AbstractIterator;
2526
import cpw.mods.fml.relauncher.Side;
2627
import cpw.mods.fml.relauncher.SideOnly;
@@ -52,7 +53,7 @@ public class BlockPos extends Vec3i {
5253
*/
5354
public static final BlockPos ORIGIN = new BlockPos(0, 0, 0);
5455
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));
5657
private static final int NUM_Z_BITS = NUM_X_BITS;
5758
private static final int NUM_Y_BITS = 64 - NUM_X_BITS - NUM_Z_BITS;
5859
private static final long Y_MASK = (1L << NUM_Y_BITS) - 1L;
@@ -431,7 +432,7 @@ public BlockPos.MutableBlockPos setPos(@NonNull Entity entity) {
431432
}
432433

433434
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));
435436
}
436437

437438
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) {
483484
}
484485

485486
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));
487488
}
488489

489490
@SideOnly(Side.CLIENT)

src/main/java/com/falsepattern/lib/compat/Vec3i.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
import com.falsepattern.lib.StableAPI;
2424
import javax.annotation.concurrent.Immutable;
25+
26+
import com.falsepattern.lib.util.MathUtil;
2527
import lombok.AllArgsConstructor;
2628
import lombok.EqualsAndHashCode;
2729
import lombok.Getter;
@@ -54,7 +56,7 @@ public class Vec3i implements Comparable<Vec3i> {
5456
* @param z the z
5557
*/
5658
public Vec3i(double x, double y, double z) {
57-
this(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z));
59+
this(MathUtil.floor(x), MathUtil.floor(y), MathUtil.floor(z));
5860
}
5961

6062
public int compareTo(@NonNull Vec3i vec) {

0 commit comments

Comments
 (0)