[DEV] Update Patches to match DEV branch

This commit is contained in:
2024-06-13 19:03:58 +02:00
parent 6e5d6e3a17
commit 6eaeeeb2c0
25 changed files with 52 additions and 97 deletions

View File

@@ -1 +1 @@
6b05af6c83d8766cad3894ab322fef69c3152bea ce16c08760cf548e5c6a3d698a4f4a3c31f7aca1

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ /dev/null +++ /dev/null
@@ -1,111 +1,0 @@ @@ -1,112 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
- -
-dependencies { -dependencies {
@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader neoforge_version
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -111,4 +111,5 @@
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")
- setIsManualRelease(true)
-} -}

View File

@@ -1,14 +1,6 @@
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -11,7 +11,6 @@ @@ -29,8 +29,8 @@
multiProject = true
enableMirrorMaven = true
enableReleasesMaven = true
- enableSnapshotsMaven = true
dopplerToken = System.getenv("DOPPLER_KEY")
@@ -30,8 +29,8 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.hypherionmc.modutils.modpublisher' apply plugin: 'com.hypherionmc.modutils.modpublisher'
@@ -19,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +58,7 @@ @@ -58,7 +58,7 @@
shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"

View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.21-pre4 -minecraft_version=1.21
+minecraft_version=1.18.2 +minecraft_version=1.18.2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.11 fabric_loader=0.15.11
-fabric_api=0.100.0+1.21 -fabric_api=0.100.1+1.21
+fabric_api=0.76.0+1.18.2 +fabric_api=0.76.0+1.18.2
# Forge # Forge
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 -neoforge_version=0.0-beta
+forge_version=40.2.0 +forge_version=40.2.0
# Dependencies # Dependencies

View File

@@ -1,6 +1,6 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -10,5 +10,5 @@ @@ -13,5 +13,5 @@
} }
} }

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ /dev/null +++ /dev/null
@@ -1,111 +1,0 @@ @@ -1,112 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
- -
-dependencies { -dependencies {
@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader neoforge_version
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -111,4 +111,5 @@
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")
- setIsManualRelease(true)
-} -}

View File

@@ -1,14 +1,6 @@
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -11,7 +11,6 @@ @@ -29,8 +29,8 @@
multiProject = true
enableMirrorMaven = true
enableReleasesMaven = true
- enableSnapshotsMaven = true
dopplerToken = System.getenv("DOPPLER_KEY")
@@ -30,8 +29,8 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.hypherionmc.modutils.modpublisher' apply plugin: 'com.hypherionmc.modutils.modpublisher'
@@ -19,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +58,7 @@ @@ -58,7 +58,7 @@
shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"

View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.21-pre4 -minecraft_version=1.21
+minecraft_version=1.19.2 +minecraft_version=1.19.2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.11 fabric_loader=0.15.11
-fabric_api=0.100.0+1.21 -fabric_api=0.100.1+1.21
+fabric_api=0.76.0+1.19.2 +fabric_api=0.76.0+1.19.2
# Forge # Forge
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 -neoforge_version=0.0-beta
+forge_version=43.2.0 +forge_version=43.2.0
# Dependencies # Dependencies

View File

@@ -1,6 +1,6 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -10,5 +10,5 @@ @@ -13,5 +13,5 @@
} }
} }

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ /dev/null +++ /dev/null
@@ -1,111 +1,0 @@ @@ -1,112 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
- -
-dependencies { -dependencies {
@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader neoforge_version
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -111,4 +111,5 @@
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")
- setIsManualRelease(true)
-} -}

View File

@@ -1,14 +1,6 @@
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -11,7 +11,6 @@ @@ -29,8 +29,8 @@
multiProject = true
enableMirrorMaven = true
enableReleasesMaven = true
- enableSnapshotsMaven = true
dopplerToken = System.getenv("DOPPLER_KEY")
@@ -30,8 +29,8 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.hypherionmc.modutils.modpublisher' apply plugin: 'com.hypherionmc.modutils.modpublisher'
@@ -19,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +58,7 @@ @@ -58,7 +58,7 @@
shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"

View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.21-pre4 -minecraft_version=1.21
+minecraft_version=1.19.3 +minecraft_version=1.19.3
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.11 fabric_loader=0.15.11
-fabric_api=0.100.0+1.21 -fabric_api=0.100.1+1.21
+fabric_api=0.76.1+1.19.3 +fabric_api=0.76.1+1.19.3
# Forge # Forge
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 -neoforge_version=0.0-beta
+forge_version=44.1.0 +forge_version=44.1.0
# Dependencies # Dependencies

View File

@@ -1,6 +1,6 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -10,5 +10,5 @@ @@ -13,5 +13,5 @@
} }
} }

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ /dev/null +++ /dev/null
@@ -1,111 +1,0 @@ @@ -1,112 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
- -
-dependencies { -dependencies {
@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader neoforge_version
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -111,4 +111,5 @@
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")
- setIsManualRelease(true)
-} -}

View File

@@ -1,14 +1,6 @@
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -11,7 +11,6 @@ @@ -29,8 +29,8 @@
multiProject = true
enableMirrorMaven = true
enableReleasesMaven = true
- enableSnapshotsMaven = true
dopplerToken = System.getenv("DOPPLER_KEY")
@@ -30,8 +29,8 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.hypherionmc.modutils.modpublisher' apply plugin: 'com.hypherionmc.modutils.modpublisher'
@@ -19,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +58,7 @@ @@ -58,7 +58,7 @@
shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"

View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.21-pre4 -minecraft_version=1.21
+minecraft_version=1.20.2 +minecraft_version=1.20.2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.11 fabric_loader=0.15.11
-fabric_api=0.100.0+1.21 -fabric_api=0.100.1+1.21
+fabric_api=0.91.6+1.20.2 +fabric_api=0.91.6+1.20.2
# Forge # Forge
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 -neoforge_version=0.0-beta
+forge_version=48.1.0 +forge_version=48.1.0
# Dependencies # Dependencies

View File

@@ -1,6 +1,6 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -10,5 +10,5 @@ @@ -13,5 +13,5 @@
} }
} }

View File

@@ -1,14 +1,5 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle +++ b/NeoForge/build.gradle
@@ -31,7 +31,7 @@
unimined.minecraft {
neoForged {
- loader "net.neoforged:neoforge:${neoforge_version}:universal"
+ loader neoforge_version
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
}
}
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
from project(":Common").sourceSets.main.resources from project(":Common").sourceSets.main.resources
def buildProps = project.properties.clone() def buildProps = project.properties.clone()

View File

@@ -1,14 +1,6 @@
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -11,7 +11,6 @@ @@ -29,8 +29,8 @@
multiProject = true
enableMirrorMaven = true
enableReleasesMaven = true
- enableSnapshotsMaven = true
dopplerToken = System.getenv("DOPPLER_KEY")
@@ -30,8 +29,8 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.hypherionmc.modutils.modpublisher' apply plugin: 'com.hypherionmc.modutils.modpublisher'

View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.21-pre4 -minecraft_version=1.21
+minecraft_version=1.20.4 +minecraft_version=1.20.4
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.11 fabric_loader=0.15.11
-fabric_api=0.100.0+1.21 -fabric_api=0.100.1+1.21
+fabric_api=0.97.0+1.20.4 +fabric_api=0.97.0+1.20.4
# Forge # Forge
@@ -18,7 +18,7 @@
+forge_version=49.0.49 +forge_version=49.0.49
# NeoForged # NeoForged
-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 -neoforge_version=0.0-beta
+neoforge_version=234 +neoforge_version=234
# Dependencies # Dependencies

View File

@@ -1,6 +1,6 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -10,5 +10,5 @@ @@ -13,5 +13,5 @@
} }
} }

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ /dev/null +++ /dev/null
@@ -1,111 +1,0 @@ @@ -1,112 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
- -
-dependencies { -dependencies {
@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader neoforge_version
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -111,4 +111,5 @@
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")
- setIsManualRelease(true)
-} -}

View File

@@ -1,15 +1,14 @@
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -11,8 +11,6 @@ @@ -11,7 +11,6 @@
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- enableSnapshotsMaven = true
- -
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")
versioning { versioning {
@@ -30,8 +28,8 @@ @@ -29,8 +28,8 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.hypherionmc.modutils.modpublisher' apply plugin: 'com.hypherionmc.modutils.modpublisher'
@@ -20,7 +19,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +57,7 @@ @@ -58,7 +57,7 @@
shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"

View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.21-pre4 -minecraft_version=1.21
+minecraft_version=1.20 +minecraft_version=1.20
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.11 fabric_loader=0.15.11
-fabric_api=0.100.0+1.21 -fabric_api=0.100.1+1.21
+fabric_api=0.83.0+1.20 +fabric_api=0.83.0+1.20
# Forge # Forge
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 -neoforge_version=0.0-beta
+forge_version=46.0.14 +forge_version=46.0.14
# Dependencies # Dependencies

View File

@@ -1,6 +1,6 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -10,5 +10,5 @@ @@ -13,5 +13,5 @@
} }
} }