diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index 7c9919b6b..c45adfb6c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -17,7 +17,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.fx.WispParticleData; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibMisc; public class SubTileManastar extends TileEntitySpecialFlower { @@ -46,7 +45,7 @@ public class SubTileManastar extends TileEntitySpecialFlower { } } else { int mana = 0; - for (Direction dir : MathHelper.HORIZONTALS) { + for (Direction dir : Direction.Plane.HORIZONTAL) { BlockPos pos = getEffectivePos().offset(dir); if (getWorld().isBlockLoaded(pos)) { TileEntity tile = getWorld().getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index eb7659d0f..4fce66788 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -43,7 +43,7 @@ public class TileSparkChanger extends TileSimpleInventory { ItemStack changeStack = itemHandler.getStackInSlot(0); List attachables = new ArrayList<>(); - for (Direction dir : MathHelper.HORIZONTALS) { + for (Direction dir : Direction.Plane.HORIZONTAL) { TileEntity tile = world.getTileEntity(pos.offset(dir)); if (tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 60337d78d..0b92815ed 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -19,7 +19,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -40,7 +39,7 @@ public class TileDistributor extends TileMod implements IManaReceiver, ITickable return; } validPools.clear(); - for (Direction dir : MathHelper.HORIZONTALS) { + for (Direction dir : Direction.Plane.HORIZONTAL) { BlockPos pos = this.pos.offset(dir); if (world.isBlockLoaded(pos)) { TileEntity tileAt = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 35e979679..046601c8b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -54,7 +54,6 @@ import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ItemManaTablet; @@ -299,7 +298,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt int bellowCount = 0; if (outputting) { - for (Direction dir : MathHelper.HORIZONTALS) { + for (Direction dir : Direction.Plane.HORIZONTAL) { TileEntity tile = world.getTileEntity(pos.offset(dir)); if (tile instanceof TileBellows && ((TileBellows) tile).getLinkedTile() == this) { bellowCount++; diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index 7ba422c6e..8ba12dec4 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.util.Direction; public final class MathHelper { - public static final Direction[] HORIZONTALS = { Direction.SOUTH, Direction.WEST, Direction.NORTH, Direction.EAST }; public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { return (float) Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2)); @@ -46,10 +45,4 @@ public final class MathHelper { return c1 & ~0xFFFFFF | r << 16 | g << 8 | b; } - private static final String[] ORDINAL_SUFFIXES = new String[] { "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th" }; - - public static String numberToOrdinal(int i) { - return i % 100 == 11 || i % 100 == 12 || i % 100 == 13 ? i + "th" : i + ORDINAL_SUFFIXES[i % 10]; - } - } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index b8c79df9f..f9baa6220 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -136,7 +136,7 @@ public class EntityPoolMinecart extends AbstractMinecartEntity { public void moveMinecartOnRail(BlockPos pos) { super.moveMinecartOnRail(pos); - for (Direction dir : vazkii.botania.common.core.helper.MathHelper.HORIZONTALS) { + for (Direction dir : Direction.Plane.HORIZONTAL) { BlockPos posP = pos.offset(dir); Block block = world.getBlockState(posP).getBlock(); if (block == ModBlocks.pump) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index dd1e69fc6..b2c26294c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -33,7 +33,6 @@ import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; @@ -108,7 +107,7 @@ public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProv if (ModTags.Blocks.TERRAFORMABLE.contains(state.getBlock())) { List airBlocks = new ArrayList<>(); - for (Direction dir : MathHelper.HORIZONTALS) { + for (Direction dir : Direction.Plane.HORIZONTAL) { BlockPos pos_ = pos.offset(dir); BlockState state_ = world.getBlockState(pos_); Block block_ = state_.getBlock();