Skip to content

Commit 8ec3fde

Browse files
committed
Move Gauges to seperate file
1 parent 53ec308 commit 8ec3fde

4 files changed

Lines changed: 17 additions & 22 deletions

File tree

src/main/java/trackapi/compat/MinecraftRail.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import net.minecraft.util.math.BlockPos;
77
import net.minecraft.util.math.Vec3d;
88
import net.minecraft.world.World;
9+
import trackapi.lib.Gauges;
910
import trackapi.lib.ITrackTile;
10-
import trackapi.lib.Util;
1111

1212
public class MinecraftRail implements ITrackTile {
1313

@@ -23,15 +23,7 @@ public MinecraftRail(World world, BlockPos pos) {
2323

2424
@Override
2525
public double getTrackGauge() {
26-
return Util.MINECRAFT_GAUGE;
27-
}
28-
29-
@Override
30-
public double getTrackSlope() {
31-
return direction == EnumRailDirection.ASCENDING_EAST ||
32-
direction == EnumRailDirection.ASCENDING_WEST ||
33-
direction == EnumRailDirection.ASCENDING_NORTH ||
34-
direction == EnumRailDirection.ASCENDING_SOUTH ? 1 : 0;
26+
return Gauges.MINECRAFT;
3527
}
3628

3729
@Override
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package trackapi.lib;
2+
3+
public class Gauges {
4+
/**
5+
* US Standard Gauge in meters
6+
*/
7+
public static final double STANDARD = 1.435;
8+
9+
/**
10+
* Minecraft Gauge in meters
11+
*/
12+
public static final double MINECRAFT = 0.632;
13+
}

src/main/java/trackapi/lib/ITrackTile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ public interface ITrackTile {
77
/**
88
* The distance between the rails measured in meters
99
*
10-
* @see Util#STANDARD_GAUGE
11-
* @see Util#MINECRAFT_GAUGE
10+
* @see Gauges#STANDARD
11+
* @see Gauges#MINECRAFT
1212
*/
1313
public double getTrackGauge();
1414

src/main/java/trackapi/lib/Util.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
import trackapi.compat.MinecraftRail;
99

1010
public class Util {
11-
/**
12-
* US Standard Gauge in meters
13-
*/
14-
public static final double STANDARD_GAUGE = 1.435;
15-
16-
/**
17-
* Minecraft Gauge in meters
18-
*/
19-
public static final double MINECRAFT_GAUGE = 0.632;
20-
2111
private static ITrackTile getInternalTileEntity(World world, Vec3d pos, boolean acceptMinecraftRails) {
2212
BlockPos bp = new BlockPos(MathHelper.floor(pos.x), MathHelper.floor(pos.y), MathHelper.floor(pos.z));
2313
TileEntity te = world.getTileEntity(bp);

0 commit comments

Comments
 (0)