Renamed mixin methods to follow convention.
This commit is contained in:
@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
|
|||||||
@Mixin(ArrayVoxelShape.class)
|
@Mixin(ArrayVoxelShape.class)
|
||||||
public interface ArrayVoxelShapeAccessor {
|
public interface ArrayVoxelShapeAccessor {
|
||||||
@Invoker("<init>")
|
@Invoker("<init>")
|
||||||
static ArrayVoxelShape newArrayVoxelShape(DiscreteVoxelShape pShape, DoubleList pXs, DoubleList pYs, DoubleList pZs) {
|
static ArrayVoxelShape wildflowers_backport$newArrayVoxelShape(DiscreteVoxelShape pShape, DoubleList pXs, DoubleList pYs, DoubleList pZs) {
|
||||||
throw new AssertionError();
|
throw new AssertionError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
|
|||||||
@Mixin(CubeVoxelShape.class)
|
@Mixin(CubeVoxelShape.class)
|
||||||
public interface CubeVoxelShapeAccessor {
|
public interface CubeVoxelShapeAccessor {
|
||||||
@Invoker("<init>")
|
@Invoker("<init>")
|
||||||
static CubeVoxelShape newCubeVoxelShape(DiscreteVoxelShape pShape) {
|
static CubeVoxelShape wildflowers_backport$newCubeVoxelShape(DiscreteVoxelShape pShape) {
|
||||||
throw new AssertionError();
|
throw new AssertionError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -29,7 +29,7 @@ public class ShapesUtils {
|
|||||||
} else {
|
} else {
|
||||||
DiscreteVoxelShape discreteVoxelShape = ((VoxelShapeAccessor) voxelShape).wildflowers_backport$getShape();
|
DiscreteVoxelShape discreteVoxelShape = ((VoxelShapeAccessor) voxelShape).wildflowers_backport$getShape();
|
||||||
if (voxelShape instanceof CubeVoxelShape && BLOCK_CENTER.equals(vec3)) {
|
if (voxelShape instanceof CubeVoxelShape && BLOCK_CENTER.equals(vec3)) {
|
||||||
return CubeVoxelShapeAccessor.newCubeVoxelShape(discreteVoxelShape);
|
return CubeVoxelShapeAccessor.wildflowers_backport$newCubeVoxelShape(discreteVoxelShape);
|
||||||
} else {
|
} else {
|
||||||
Direction.Axis direction$axis = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.X);
|
Direction.Axis direction$axis = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.X);
|
||||||
Direction.Axis direction$axis1 = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.Y);
|
Direction.Axis direction$axis1 = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.Y);
|
||||||
@ -46,7 +46,7 @@ public class ShapesUtils {
|
|||||||
boolean flag4 = DirectionAxisUtils.choose(direction$axis1, flag, flag1, flag2);
|
boolean flag4 = DirectionAxisUtils.choose(direction$axis1, flag, flag1, flag2);
|
||||||
boolean flag5 = DirectionAxisUtils.choose(direction$axis2, flag, flag1, flag2);
|
boolean flag5 = DirectionAxisUtils.choose(direction$axis2, flag, flag1, flag2);
|
||||||
|
|
||||||
return ArrayVoxelShapeAccessor.newArrayVoxelShape(
|
return ArrayVoxelShapeAccessor.wildflowers_backport$newArrayVoxelShape(
|
||||||
discreteVoxelShape,
|
discreteVoxelShape,
|
||||||
makeAxis(doubleList, flag3, vec3.get(direction$axis), vec3.x),
|
makeAxis(doubleList, flag3, vec3.get(direction$axis), vec3.x),
|
||||||
makeAxis(doubleList1, flag4, vec3.get(direction$axis1), vec3.y),
|
makeAxis(doubleList1, flag4, vec3.get(direction$axis1), vec3.y),
|
||||||
|
|||||||
Reference in New Issue
Block a user