build: 1.21.6-pre4

Author: ishland

ScalableLux

@@ -1 +1 @@
-tag-500aa212376459b9ef71a760501ef6fde16bccd1
+tag-317717f67e03cad45edb85f78bca3464aa385038

current-upstream

@@ -5,7 +5,7 @@ Subject: [PATCH] Port to NeoForge
 
 
 diff --git a/build.gradle b/build.gradle
-index 22e31b9..a9fa0e4 100644
+index 22e31b9..710d09e 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -1,5 +1,5 @@
@@ -15,7 +15,7 @@ index 22e31b9..a9fa0e4 100644
      id 'maven-publish'
      id 'com.github.johnrengelman.shadow' version '8.1.1'
  }
-@@ -28,15 +28,19 @@ def getGitCommit = { ->
+@@ -28,15 +28,27 @@ def getGitCommit = { ->
  }
 
  archivesBaseName = project.archives_base_name
@@ -25,6 +25,14 @@ index 22e31b9..a9fa0e4 100644
 
 +repositories {
 +    maven { url "https://maven.neoforged.net/releases/" }
++    maven {
++        name = 'Maven for PR #2297' // https://github.com/neoforged/NeoForge/pull/2297
++        url = 'https://prmaven.neoforged.net/NeoForge/pr2297'
++        content {
++            includeModule('net.neoforged', 'neoforge')
++            includeModule('net.neoforged', 'testframework')
++        }
++    }
 +}
 +
  dependencies {
@@ -37,7 +45,7 @@ index 22e31b9..a9fa0e4 100644
 
      // Fabric API. This is technically optional, but you probably want it anyway.
      //modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-@@ -47,14 +51,14 @@ dependencies {
+@@ -47,14 +59,14 @@ dependencies {
      shadowInclude("com.ishland.flowsched:flowsched") {
          transitive false
      }
@@ -55,7 +63,7 @@ index 22e31b9..a9fa0e4 100644
      }
  }
 
-@@ -78,8 +82,8 @@ java {
+@@ -78,8 +90,8 @@ java {
      // If you remove this line, sources will not be generated.
      withSourcesJar()
 
@@ -66,7 +74,7 @@ index 22e31b9..a9fa0e4 100644
  }
  jar {
      from "LICENSE"
-@@ -96,6 +100,7 @@ remapJar {
+@@ -96,6 +108,7 @@ remapJar {
      input = shadowJar.archiveFile
      archiveFileName = shadowJar.archiveFileName.get().replaceAll("-dev\\.jar\$", ".jar")
      addNestedDependencies = true
@@ -75,7 +83,7 @@ index 22e31b9..a9fa0e4 100644
  }
 
 diff --git a/gradle.properties b/gradle.properties
-index 090de06..b594779 100644
+index d9ac978..5864c4e 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -1,10 +1,11 @@
@@ -85,12 +93,12 @@ index 090de06..b594779 100644
 +loom.platform=neoforge
  # Fabric Properties
  # check these on https://modmuss50.me/fabric.html
--minecraft_version=1.21.5-rc2
--loader_version=0.16.10
-+minecraft_version=1.21.5
-+forge_version=21.5.14-beta
+-minecraft_version=1.21.6-rc1
+-loader_version=0.16.14
++minecraft_version=1.21.6-pre4
++forge_version=21.5.0-alpha.1.21.6-pre4.20250611.162051
  # Mod Properties
- mod_version=0.1.3+beta.1
+ mod_version=0.1.4
  maven_group=ca.spottedleaf.starlight
 diff --git a/settings.gradle b/settings.gradle
 index 72ebf6e..a2bc74d 100644
@@ -137,7 +145,7 @@ index 8594799..0ec28f9 100644
 +
  }
 diff --git a/src/main/java/ca/spottedleaf/starlight/common/config/Config.java b/src/main/java/ca/spottedleaf/starlight/common/config/Config.java
-index ae29dcf..8889a18 100644
+index 6397f4d..61c0489 100644
 --- a/src/main/java/ca/spottedleaf/starlight/common/config/Config.java
 +++ b/src/main/java/ca/spottedleaf/starlight/common/config/Config.java
 @@ -1,9 +1,7 @@
@@ -160,7 +168,7 @@ index ae29dcf..8889a18 100644
          if (Files.isRegularFile(path)) {
              try (InputStream in = Files.newInputStream(path, StandardOpenOption.CREATE)) {
                  properties.load(in);
-@@ -69,26 +67,26 @@ public class Config {
+@@ -73,26 +71,26 @@ public class Config {
 
      private static boolean getBoolean(Properties properties, Properties newProperties, String key, boolean def) {
          boolean boolean0 = getBoolean0(properties, newProperties, key, def);

patches/main/0002-Port-to-NeoForge.patch

@@ -8,7 +8,7 @@ basedir=$(pwd -P)
 cd - || exit
 
 upstreamDir="ScalableLux"
-upstreamBranch="ver/1.21.5"
+upstreamBranch="ver/1.21.6"
 
 function bashColor() {
   if [ "$2" ]; then