Merge remote-tracking branch 'origin/neoforge_1.21.4' into neoforge_1.21.8

Author: Goldenfield192

.github/workflows/build.yml

@@ -6,17 +6,26 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v5
             - run: |
                 ref=`echo ${github_ref} | sed -e 's,refs/heads/,,' | tr '/' '-'`
                 echo $ref
                 echo "::set-env name=ref::$ref"
               env:
                 github_ref: ${{ github.ref }}
                 ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+            - name: Set up JDK
+              uses: actions/setup-java@v5
+              with:
+                java-version: '21'
+                distribution: 'temurin'
             - name: keyscan
               run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa teamopenindustry.cc >> ~/.ssh/known_hosts
             - name: Gradle publish
               env:
                 MAVENCI_PASS: ${{ secrets.MAVENCI_PASS }}
               run: ./gradlew publish
+            - uses: actions/upload-artifact@v6
+              with:
+                name: TrackAPI-${{ env.ref }}
+                path: build/libs/TrackAPI-*

build.gradle

@@ -1,38 +1,42 @@
-import cam72cam.universalmodcore.Util;
-
 buildscript {
     repositories {
-//        maven { url = "https://maven.minecraftforge.net/" }
-        maven {
-            name "neoforgedReleases"
-            url "https://maven.neoforged.net/releases"
-        }
-        maven { url = "https://teamopenindustry.cc/maven" }
+        maven { url "https://maven.neoforged.net/releases" }
+        maven { url "https://plugins.gradle.org/" }
         mavenCentral()
         gradlePluginPortal()
     }
     dependencies {
-//        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath group: 'net.neoforged.gradle', name: 'userdev', version: '7.1.11'
-        classpath 'cam72cam.universalmodcore:UniversalModCoreGradle:0.1.3'
     }
 }
+
 apply plugin: 'net.neoforged.gradle.userdev'
-// Only edit below this line, the above code adds and enables the necessary things for NeoForge to be setup.
 apply plugin: 'eclipse'
-//apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(21) // Since 1.20.5
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-String baseVersion = "1.2"
+String baseVersion = "1.3"
 if (!"release".equalsIgnoreCase(System.getProperty("target"))) {
-    baseVersion += "-" + Util.GitRevision()
+    try {
+        baseVersion += "-" + 'git rev-parse --verify --short=7 HEAD'.execute().text.trim()
+    } catch (Exception ex) {
+        baseVersion += "-unknown"
+    }
 }
 version = "1.21.8-neoforge-" + baseVersion
 group = "trackapi" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "TrackAPI"
 
+configurations {
+    minecraftLibrary
+    implementation.extendsFrom minecraftLibrary
+}
+
+java {
+    withSourcesJar()
+}
+
 runs {
     // applies to all the run configs below
     configureEach {
@@ -48,6 +52,10 @@ runs {
         // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
         systemProperty 'forge.logging.console.level', 'debug'
 
+        dependencies {
+            runtime project.configurations.minecraftLibrary
+        }
+
         modSource project.sourceSets.main
     }
 
@@ -77,44 +85,24 @@ runs {
     }
 }
 
-
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-
     implementation 'net.neoforged:neoforge:21.8.52'
-
-    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
-
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
+    minecraftLibrary "org.apache.maven.wagon:wagon-ssh:3.5.3"
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
     manifest {
         attributes([
-                "Specification-Title"     : "trackapi",
-                "Specification-Vendor"    : "trackapi",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : "${version}",
-                "Implementation-Vendor"   : "trackapi",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+            "Specification-Title": "trackapi",
+            "Specification-Vendor": "trackapi",
+            "Specification-Version": "1", // We are version 1 of ourselves
+            "Implementation-Title": project.name,
+            "Implementation-Version": "${version}",
+            "Implementation-Vendor" :"trackapi",
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
 }
@@ -123,6 +111,8 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             artifact jar
+            artifact sourcesJar
+            artifactId archivesBaseName
         }
     }
     repositories {
@@ -136,47 +126,12 @@ publishing {
     }
 }
 
-
-/*
-// Example configuration to allow publishing using the maven-publish task
-// we define a custom artifact that is sourced from the reobfJar output task
-// and then declare that to be published
-// Note you'll need to add a repository here
-def reobfFile = file("$buildDir/reobfJar/output.jar")
-def reobfArtifact = artifacts.add('default', reobfFile) {
-    type 'jar'
-    builtBy 'reobfJar'
-}
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact reobfArtifact
-        }
-    }
-    repositories {
-        maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
-        }
+task ('showBuildInfo') {
+    doLast {
+        System.out.println("Build Uploaded to Maven at: ")
+        System.out.println("https://teamopenindustry.cc/maven/trackapi/TrackAPI/${version}/TrackAPI-${version}.jar")
     }
 }
 
-task deployJar(type: Jar)
+publish.finalizedBy showBuildInfo
 
-configurations {
-    deployerJars
-}
-
-dependencies {
-    deployerJars "org.apache.maven.wagon:wagon-ssh:2.9"
-}
-
-uploadArchives {
-    tasks.uploadArchives.dependsOn build
-    repositories.mavenDeployer {
-        configuration = configurations.deployerJars
-        repository(url: "scp://teamopenindustry.cc/var/www/html/maven/") {
-            authentication(userName: "mavenci", privateKey: "publish_key")
-        }
-    }
-}
-*/

src/main/java/trackapi/TrackAPI.java

@@ -6,5 +6,5 @@
 public class TrackAPI
 {
     public static final String MODID = "trackapi";
-    public static final String VERSION = "1.2";
+    public static final String VERSION = "1.3";
 }

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

@@ -2,17 +2,24 @@
 
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.vehicle.Minecart;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BaseRailBlock;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import trackapi.lib.Gauges;
-import trackapi.lib.ITrack;
+import trackapi.lib.ITrackV2;
+import trackapi.lib.PathingData;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class MinecraftRail implements ITrack {
+/**
+ * Wrapper for vanilla rail
+ */
+public class MinecraftRail implements ITrackV2 {
 	private static Map<RailShape, Vec3> vectors = new HashMap<>();
 	private static Map<RailShape, Vec3> centers = new HashMap<>();
 	static {
@@ -46,8 +53,8 @@ public class MinecraftRail implements ITrack {
 	}
 
 
-	private RailShape direction;
-	private BlockPos pos;
+	private final RailShape direction;
+	private final BlockPos pos;
 
 	public MinecraftRail(Level world, BlockPos pos) {
 		this.pos = pos;
@@ -57,33 +64,37 @@ public MinecraftRail(Level world, BlockPos pos) {
 	}
 
 	@Override
-	public double getTrackGauge() {
-		return Gauges.MINECRAFT;
+	public double[] getTrackGauges() {
+		return new double[]{Gauges.MINECRAFT};
 	}
 
 	@Override
-	public Vec3 getNextPosition(Vec3 currentPosition, Vec3 motion) {
-		Vec3 trackMovement = vectors.get(direction);
+	public<D extends PathingData> void getNextPosition(D inputData, Vec3 motion, double gauge) {
+		Vec3 currentPosition = inputData.getPos();
+
+        Vec3 trackMovement = vectors.get(direction);
 		Vec3 trackCenter = centers.get(direction);
 
-		Vec3 posRelativeToCenter = currentPosition.vectorTo(Vec3.atLowerCornerOf(pos).add(trackCenter));
+		Vec3 pos = Vec3.atLowerCornerOf(this.pos).add(trackCenter);
+		Vec3 posRelativeToCenter = currentPosition.subtract(pos);
 		double distanceToCenter = posRelativeToCenter.length();
 
 		// Determine if trackMovement should be positive or negative as relative to block center
 		boolean trackPosMotionInverted = posRelativeToCenter.distanceTo(trackMovement) < posRelativeToCenter.scale(-1).distanceTo(trackMovement);
 
 		boolean trackMotionInverted = motion.distanceTo(trackMovement) > motion.scale(-1).distanceTo(trackMovement);
 
-		Vec3 newPosition = Vec3.atLowerCornerOf(pos).add(trackCenter);
-		//Correct new pos to track alignment
-		newPosition = newPosition.add(trackMovement.scale(trackPosMotionInverted ? -distanceToCenter : distanceToCenter));
-		// Move new pos along track alignment
-		newPosition = newPosition.add(trackMovement.scale(trackMotionInverted ? -motion.length() : motion.length()));
-		return newPosition;
+		Vec3 newPosition = pos;
+		double factor =
+				//Correct new pos to track alignment
+				(trackPosMotionInverted ? -distanceToCenter : distanceToCenter)
+				//And Move new pos along track alignment
+				+ (trackMotionInverted ? -motion.length() : motion.length());
+		newPosition = newPosition.add(trackMovement.scale(factor));
+		inputData.setPos(newPosition).setRoll(0d);
 	}
 
 	public static boolean isRail(Level world, BlockPos pos) {
 		return BaseRailBlock.isRail(world, pos);
 	}
-	
 }

src/main/java/trackapi/lib/Gauges.java

@@ -1,13 +1,46 @@
 package trackapi.lib;
 
+/**
+ * Some gauge constants in meters
+ */
 public class Gauges {
 	/**
-	 * US Standard Gauge in meters
+	 * Minecraft Gauge
+	 */
+	public static final double MINECRAFT = 0.632;
+
+	/**
+	 * 2 Foot 6 Inches Narrow Gauge
+	 */
+	public static final double TWO_FOOT_SIX_INCHES = 0.762;
+
+	/**
+	 * 3 Foot Narrow Gauge
+	 */
+	public static final double THREE_FOOT = 0.9144;
+
+	/**
+	 * Meter Gauge
+	 */
+	public static final double METER = 1.000;
+
+	/**
+	 * Cape gauge
+	 */
+	public static final double CAPE = 1.067;
+
+	/**
+	 * US Standard Gauge
 	 */
 	public static final double STANDARD = 1.435;
 
 	/**
-	 * Minecraft Gauge in meters
+	 * Russian Standard Gauge
 	 */
-	public static final double MINECRAFT = 0.632;
+	public static final double RU_STANDARD = 1.524;
+
+	/**
+	 * Brunel Gauge
+	 */
+	public static final double BRUNEL = 2.140;
 }

src/main/java/trackapi/lib/ITrack.java

@@ -7,20 +7,16 @@ public interface ITrack {
 	/**
 	 * The distance between the rails measured in meters
 	 * 
-	 * @see Gauges#STANDARD
-	 * @see Gauges#MINECRAFT
+	 * @see Gauges
 	 */
-	public double getTrackGauge();
+	double getTrackGauge();
 
 	/**
-	 * Used by rolling stock to look up their next position.
+	 * Used by rolling stocks to look up their next position.
 	 * 
-	 * @param rotationYaw - Current entity rotation in degrees
-	 * @param bogieYaw - Current bogey rotation in degrees (set to rotationYaw if unused)
-	 * @param distance - Distanced traveled in meters
-	 * @param currentPosition - Current entity or bogey position
-	 * @param motion
-	 * @return The new position of the entity or bogey
+	 * @param currentPosition Current position of entity or bogey
+	 * @param motion Current velocity of entity or bogey
+	 * @return Next found position on the track
 	 */
-	public Vec3 getNextPosition(Vec3 currentPosition, Vec3 motion);
+	Vec3 getNextPosition(Vec3 currentPosition, Vec3 motion);
 }