new math class

This commit is contained in:
FalsePattern committed 2022-07-30 20:26:34 +02:00
1 parent dc6af7ada7
commit 30ef2fc9c8
3 files changed
+630 -4

No files matched your search

@@ -21,6 +21,7 @@
package com.falsepattern.lib.compat;
import com.falsepattern.lib.StableAPI;
import com.falsepattern.lib.util.MathUtil;
import com.google.common.collect.AbstractIterator;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -52,7 +53,7 @@ public class BlockPos extends Vec3i {
*/
public static final BlockPos ORIGIN = new BlockPos(0, 0, 0);
private static final Logger LOGGER = LogManager.getLogger();
private static final int NUM_X_BITS = 1 + MathHelper.calculateLogBaseTwo(MathHelper.roundUpToPowerOfTwo(30000000));
private static final int NUM_X_BITS = 1 + MathUtil.log2(MathUtil.smallestEncompassingPowerOfTwo(30000000));
private static final int NUM_Z_BITS = NUM_X_BITS;
private static final int NUM_Y_BITS = 64 - NUM_X_BITS - NUM_Z_BITS;
private static final long Y_MASK = (1L << NUM_Y_BITS) - 1L;
@@ -431,7 +432,7 @@ public class BlockPos extends Vec3i {
}
public BlockPos.MutableBlockPos setPos(double x, double y, double z) {
return setPos(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z));
return setPos(MathUtil.floor(x), MathUtil.floor(y), MathUtil.floor(z));
}
public BlockPos.MutableBlockPos setPos(int x, int y, int z) {
@@ -483,7 +484,7 @@ public class BlockPos extends Vec3i {
}
public static BlockPos.PooledMutableBlockPos retain(double x, double y, double z) {
return retain(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z));
return retain(MathUtil.floor(x), MathUtil.floor(y), MathUtil.floor(z));
}
@SideOnly(Side.CLIENT)
@@ -22,6 +22,8 @@ package com.falsepattern.lib.compat;
import com.falsepattern.lib.StableAPI;
import javax.annotation.concurrent.Immutable;
import com.falsepattern.lib.util.MathUtil;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -54,7 +56,7 @@ public class Vec3i implements Comparable<Vec3i> {
* @param z the z
*/
public Vec3i(double x, double y, double z) {
this(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z));
this(MathUtil.floor(x), MathUtil.floor(y), MathUtil.floor(z));
}
public int compareTo(@NonNull Vec3i vec) {