add steam n rails to dev env

-their mod is broken L -also maybe fix compat with them in prod
rhysdh540 · Aug 26, 2023 · 7e1f7bf · 7e1f7bf
1 parent c7cc57a
commit 7e1f7bf
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 34 deletions.
diff --git a/1.20.1.properties b/1.20.1.properties
@@ -14,9 +14,8 @@ fabric_api=0.86.0
 # Forge - https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.html
 forge=47.1.43
 
-
 # Create
-create_fabric = 0.5.1-c-build.1152
+create_fabric = 0.5.1-d-build.1161
 create_forge = 0.5.1.d-9
 registrate = MC1.20-1.3.3
 flywheel_mc = 1.20
@@ -34,4 +33,8 @@ catalogue = 4590890
 # FerriteCore - https://www.curseforge.com/minecraft/mc-mods/ferritecore/files
 ferritecore = 4574361
 # Smooth Boot
-#smoothboot_forge = 3821513
+#smoothboot_forge = 3821513
+
+# Arch Mods
+#snr = 1.5.0
+snr_build = 551
diff --git a/build.gradle b/build.gradle
@@ -83,11 +83,24 @@ subprojects {
 
 	repositories {
 		mavenCentral()
-		maven { url = "https://maven.parchmentmc.org" }
-		maven { url = "https://maven.quiltmc.org/repository/release" }
+		maven { url "https://maven.parchmentmc.org" }
+		maven { url "https://maven.quiltmc.org/repository/release" }
+		maven { url 'https://maven.ithundxr.dev/releases' }
 		maven {
-			url = "https://maven.tterrag.com/"
-			content { includeGroup("com.jozufozu.flywheel") }
+			url "https://maven.tterrag.com/"
+			content {
+				includeGroup("com.jozufozu.flywheel")
+				includeGroup("com.tterrag.registrate")
+				includeGroup("com.simibubi.create")
+			}
+		}
+		maven { // modrinth
+			url "https://api.modrinth.com/maven"
+			content { includeGroup "maven.modrinth" }
+		}
+		maven { // curseforge
+			url "https://www.cursemaven.com"
+			content { includeGroup "curse.maven" }
 		}
 	}
 
@@ -176,14 +189,6 @@ allprojects {
     repositories {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } // manifold
         maven { url 'https://jitpack.io' } // idk a lot of stuff
-        maven { // modrinth
-            url "https://api.modrinth.com/maven"
-            content { includeGroup "maven.modrinth" }
-        }
-        maven { // curseforge
-            url "https://www.cursemaven.com"
-            content { includeGroup "curse.maven" }
-        }
     }
 
 	tasks.withType(JavaCompile).configureEach {

diff --git a/build.properties b/build.properties
@@ -1,8 +1,8 @@
 # DO NOT EDIT
 # Generated by the build script. Change mcVer property to change minecraft version.
 
-PRE_CURRENT_MC_1_19_2=
-MC_1_19_2=
+POST_MC_1_19_2=
 POST_CURRENT_MC_1_19_2=
-PRE_MC_1_20_1=
 PRE_CURRENT_MC_1_20_1=
+MC_1_20_1=
+POST_CURRENT_MC_1_20_1=
diff --git a/common/src/main/java/dev/rdh/createunlimited/mixin/TrackPlacementMixin.java b/common/src/main/java/dev/rdh/createunlimited/mixin/TrackPlacementMixin.java
@@ -32,7 +32,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(value = TrackPlacement.class, remap = false)
+@Mixin(value = TrackPlacement.class, remap = false, priority = 999) // inject before snr does
 @SuppressWarnings("unused")
 public class TrackPlacementMixin {
 	@Shadow public static PlacementInfo cached;

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -16,16 +16,15 @@ configurations {
 }
 
 repositories {
-	maven { url "https://api.modrinth.com/maven" } // LazyDFU
 	maven { url "https://maven.terraformersmc.com/releases/" } // Mod Menu
 	maven { url "https://mvn.devos.one/snapshots/" } // Create Fabric, Porting Lib, Forge Tags, Milk Lib, Registrate Fabric
-	maven { url "https://cursemaven.com" } // Forge Config API Port
 	maven { url "https://maven.cafeteria.dev/releases" } // Fake Player API
 	maven { url "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
-	maven { url "https://jitpack.io/" } // Mixin Extras, Fabric ASM
 }
 
 dependencies {
+	common(project(path: ":common", configuration: "namedElements")) { transitive false }
+	shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric}"
 
     modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api}+${rootProject.minecraft_version}"
@@ -35,8 +34,7 @@ dependencies {
 
 	modImplementation("com.simibubi.create:create-fabric-${rootProject.minecraft_version}:${rootProject.create_fabric}+mc${rootProject.minecraft_version}")
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+	modImplementation("com.railwayteam.railways:Steam_Rails-fabric-${minecraft_version}:${snr}+fabric-mc${minecraft_version}-build.${snr_build}") { transitive = false }
 }
 
 shadowJar {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -16,16 +16,7 @@ configurations {
 }
 
 repositories {
-	// mavens for Forge-exclusives
 	maven { url "https://maven.theillusivec4.top/" } // Curios
-	maven { // Create Forge and Registrate Forge
-		url "https://maven.tterrag.com/"
-		content {
-			includeGroup("com.tterrag.registrate")
-			includeGroup("com.simibubi.create")
-		}
-	}
-	maven { url "https://cursemaven.com" }
 }
 
 dependencies {
@@ -37,6 +28,8 @@ dependencies {
 	modImplementation("com.simibubi.create:create-${minecraft_version}:${create_forge}:slim") { transitive = false }
 	modImplementation "com.tterrag.registrate:Registrate:${registrate}"
 	modImplementation "com.jozufozu.flywheel:flywheel-forge-${flywheel_mc}:${flywheel}"
+
+	modImplementation("com.railwayteam.railways:Steam_Rails-forge-${minecraft_version}:${snr}+forge-mc${minecraft_version}-build.${snr_build}")
 }
 
 shadowJar {

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ forgix_version=1.2.6
 shadow_version=8.1.1
 
 # the mc version to compile against (see their respective property files for version-specific stuff)
-mcVer=1.19.2
+mcVer=1.20.1
 
 # which versions to put in the build.properties file
 mc_versions=1.19.2, 1.20.1