firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[AUTO] [no-orbit] [DEV] Fix some jenkins configs #10

Merged
orbit-brancher[bot] merged 3 commits from orbit-1717948181 into porting 2024-06-09 19:55:05 +02:00
Conversation 0 Commits 3 Files Changed 81 +166 -166
54 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9855e53204 - Show all commits

2
commit.sha
View File

@@ -1 +1 @@
55c6f60197e1b916ecb6b1e84747838c9e4c1c67 648441ec78fbc0cfadcd398a85f54f2723f4a081

6
patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -15,7 +15,7 @@
@@ -10,7 +10,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@ @@ -44,7 +44,7 @@
deleteDir() deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,

12
patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -11,9 +11,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -18,7 +19,7 @@
@@ -13,7 +14,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.SSS_WEBHOOK, discordSend webhookURL: env.SSS_WEBHOOK,
@@ -22,7 +22,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -29,14 +30,14 @@ @@ -34,14 +35,14 @@
stage("Build") { stage("Build") {
steps { steps {
@@ -39,12 +39,12 @@
} }
} }
} }
@@ -51,8 +52,8 @@ @@ -56,8 +57,8 @@
projectSlug: "craterlib", projectSlug: "craterlib",
projectName: "${projectName}", projectName: "${projectName}",
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
- modLoaders: "forge|neoforge|fabric|quilt", - modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.20.6", - minecraftVersions: "1.21",
+ modLoaders: "forge|fabric|quilt", + modLoaders: "forge|fabric|quilt",
+ minecraftVersions: "1.18.2", + minecraftVersions: "1.18.2",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,

14
patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -92,19 +92,19 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount)); int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) { for (Option<?> option : options) {
@@ -268,9 +269,9 @@ @@ -266,9 +267,9 @@
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) { protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
@@ -324,22 +325,22 @@ @@ -321,22 +322,22 @@
@Override @Override
public void onClose() { public void onClose() {
if (isEdited()) { if (isEdited()) {
@@ -133,7 +133,7 @@
} }
@Override @Override
@@ -378,15 +379,15 @@ @@ -375,15 +376,15 @@
} }
} }

4
patches/1.18.2/Fabric/build.gradle.patch
View File

@@ -4,8 +4,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}") - setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
+ setDisplayName("[FABRIC/QUILT 1.18.2] CraterLib - ${project.version}") + setDisplayName("[FABRIC/QUILT 1.18.2] CraterLib - ${project.version}")
+ setGameVersions("1.18.2") + setGameVersions("1.18.2")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")

2
patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch
View File

@@ -4,7 +4,7 @@
"depends": { "depends": {
"fabricloader": ">=0.15.0", "fabricloader": ">=0.15.0",
"fabric-api": "*", "fabric-api": "*",
- "minecraft": ">=1.20.6", - "minecraft": ">=1.21",
- "java": ">=21" - "java": ">=21"
+ "minecraft": "1.18.2", + "minecraft": "1.18.2",
+ "java": ">=17" + "java": ">=17"

6
patches/1.18.2/NeoForge/build.gradle.patch
View File

@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader neoforge_version - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -106,8 +106,8 @@
- setVersionType("release") - setVersionType("release")
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
- setProjectVersion("${minecraft_version}-${project.version}") - setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}") - setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")

4
patches/1.18.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
View File

@@ -22,13 +22,13 @@
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "neoforge" - modId = "neoforge"
- type="required" - type="required"
- versionRange = "[20.6,)" - versionRange = "[21.0,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"
- -
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "minecraft" - modId = "minecraft"
- type="required" - type="required"
- versionRange = "[1.20.6,1.21)" - versionRange = "[*,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"

8
patches/1.18.2/gradle.properties.patch
View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.20.6 -minecraft_version=1.21-pre4
+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.0 fabric_loader=0.15.11
-fabric_api=0.97.8+1.20.6 -fabric_api=0.100.0+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=41-beta -neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301
+forge_version=40.2.0 +forge_version=40.2.0
# Dependencies # Dependencies

2
patches/1.18.2/settings.gradle.patch
View File

@@ -4,5 +4,5 @@
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge", "Forge") -include("Common", "Fabric", "NeoForge")
+include("Common", "Fabric", "Forge") +include("Common", "Fabric", "Forge")

6
patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -15,7 +15,7 @@
@@ -10,7 +10,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@ @@ -44,7 +44,7 @@
deleteDir() deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,

12
patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -11,9 +11,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -18,7 +19,7 @@
@@ -13,7 +14,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.SSS_WEBHOOK, discordSend webhookURL: env.SSS_WEBHOOK,
@@ -22,7 +22,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -29,14 +30,14 @@ @@ -34,14 +35,14 @@
stage("Build") { stage("Build") {
steps { steps {
@@ -39,12 +39,12 @@
} }
} }
} }
@@ -51,8 +52,8 @@ @@ -56,8 +57,8 @@
projectSlug: "craterlib", projectSlug: "craterlib",
projectName: "${projectName}", projectName: "${projectName}",
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
- modLoaders: "forge|neoforge|fabric|quilt", - modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.20.6", - minecraftVersions: "1.21",
+ modLoaders: "forge|fabric|quilt", + modLoaders: "forge|fabric|quilt",
+ minecraftVersions: "1.19.2", + minecraftVersions: "1.19.2",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,

16
patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -50,19 +50,19 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount)); int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) { for (Option<?> option : options) {
@@ -268,9 +267,9 @@ @@ -266,9 +265,9 @@
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) { protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
@@ -334,12 +333,12 @@ @@ -331,12 +330,12 @@
} }
@Override @Override
@@ -77,7 +77,7 @@
} }
@Override @Override
@@ -378,7 +377,7 @@ @@ -375,7 +374,7 @@
} }
} }
@@ -86,7 +86,7 @@
if (mouseX > startX && mouseX < startX + sizeX) { if (mouseX > startX && mouseX < startX + sizeX) {
if (mouseY > startY && mouseY < startY + sizeY) { if (mouseY > startY && mouseY < startY + sizeY) {
List<Component> list = new ArrayList<>(); List<Component> list = new ArrayList<>();
@@ -386,7 +385,7 @@ @@ -383,7 +382,7 @@
for (String desc : description) { for (String desc : description) {
list.add(Component.translatable(desc)); list.add(Component.translatable(desc));
} }

4
patches/1.19.2/Fabric/build.gradle.patch
View File

@@ -4,8 +4,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}") - setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
+ setDisplayName("[FABRIC/QUILT 1.19.2] CraterLib - ${project.version}") + setDisplayName("[FABRIC/QUILT 1.19.2] CraterLib - ${project.version}")
+ setGameVersions("1.19.2") + setGameVersions("1.19.2")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")

2
patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch
View File

@@ -4,7 +4,7 @@
"depends": { "depends": {
"fabricloader": ">=0.15.0", "fabricloader": ">=0.15.0",
"fabric-api": "*", "fabric-api": "*",
- "minecraft": ">=1.20.6", - "minecraft": ">=1.21",
- "java": ">=21" - "java": ">=21"
+ "minecraft": "1.19.2", + "minecraft": "1.19.2",
+ "java": ">=17" + "java": ">=17"

6
patches/1.19.2/NeoForge/build.gradle.patch
View File

@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader neoforge_version - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -106,8 +106,8 @@
- setVersionType("release") - setVersionType("release")
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
- setProjectVersion("${minecraft_version}-${project.version}") - setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}") - setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")

4
patches/1.19.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
View File

@@ -22,13 +22,13 @@
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "neoforge" - modId = "neoforge"
- type="required" - type="required"
- versionRange = "[20.6,)" - versionRange = "[21.0,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"
- -
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "minecraft" - modId = "minecraft"
- type="required" - type="required"
- versionRange = "[1.20.6,1.21)" - versionRange = "[*,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"

8
patches/1.19.2/gradle.properties.patch
View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.20.6 -minecraft_version=1.21-pre4
+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.0 fabric_loader=0.15.11
-fabric_api=0.97.8+1.20.6 -fabric_api=0.100.0+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=41-beta -neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301
+forge_version=43.2.0 +forge_version=43.2.0
# Dependencies # Dependencies

2
patches/1.19.2/settings.gradle.patch
View File

@@ -4,5 +4,5 @@
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge", "Forge") -include("Common", "Fabric", "NeoForge")
+include("Common", "Fabric", "Forge") +include("Common", "Fabric", "Forge")

6
patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -15,7 +15,7 @@
@@ -10,7 +10,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@ @@ -44,7 +44,7 @@
deleteDir() deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,

10
patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -7,7 +7,7 @@
pipeline { pipeline {
agent { agent {
@@ -13,7 +14,7 @@ @@ -18,7 +19,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.SSS_WEBHOOK, discordSend webhookURL: env.SSS_WEBHOOK,
@@ -16,7 +16,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -29,14 +30,14 @@ @@ -34,14 +35,14 @@
stage("Build") { stage("Build") {
steps { steps {
@@ -33,12 +33,12 @@
} }
} }
} }
@@ -51,8 +52,8 @@ @@ -56,8 +57,8 @@
projectSlug: "craterlib", projectSlug: "craterlib",
projectName: "${projectName}", projectName: "${projectName}",
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
- modLoaders: "forge|neoforge|fabric|quilt", - modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.20.6", - minecraftVersions: "1.21",
+ modLoaders: "forge|fabric|quilt", + modLoaders: "forge|fabric|quilt",
+ minecraftVersions: "1.19.3|1.19.4", + minecraftVersions: "1.19.3|1.19.4",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,

16
patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -38,19 +38,19 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount)); int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) { for (Option<?> option : options) {
@@ -268,9 +267,9 @@ @@ -266,9 +265,9 @@
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) { protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
@@ -334,12 +333,12 @@ @@ -331,12 +330,12 @@
} }
@Override @Override
@@ -65,7 +65,7 @@
} }
@Override @Override
@@ -378,7 +377,7 @@ @@ -375,7 +374,7 @@
} }
} }
@@ -74,7 +74,7 @@
if (mouseX > startX && mouseX < startX + sizeX) { if (mouseX > startX && mouseX < startX + sizeX) {
if (mouseY > startY && mouseY < startY + sizeY) { if (mouseY > startY && mouseY < startY + sizeY) {
List<Component> list = new ArrayList<>(); List<Component> list = new ArrayList<>();
@@ -386,7 +385,7 @@ @@ -383,7 +382,7 @@
for (String desc : description) { for (String desc : description) {
list.add(Component.translatable(desc)); list.add(Component.translatable(desc));
} }

4
patches/1.19.3/Fabric/build.gradle.patch
View File

@@ -4,8 +4,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}") - setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
+ setDisplayName("[FABRIC/QUILT 1.19.3/1.19.4] CraterLib - ${project.version}") + setDisplayName("[FABRIC/QUILT 1.19.3/1.19.4] CraterLib - ${project.version}")
+ setGameVersions("1.19.3", "1.19.4") + setGameVersions("1.19.3", "1.19.4")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")

2
patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch
View File

@@ -4,7 +4,7 @@
"depends": { "depends": {
"fabricloader": ">=0.15.0", "fabricloader": ">=0.15.0",
"fabric-api": "*", "fabric-api": "*",
- "minecraft": ">=1.20.6", - "minecraft": ">=1.21",
- "java": ">=21" - "java": ">=21"
+ "minecraft": ">=1.19.3", + "minecraft": ">=1.19.3",
+ "java": ">=17" + "java": ">=17"

6
patches/1.19.3/NeoForge/build.gradle.patch
View File

@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader neoforge_version - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -106,8 +106,8 @@
- setVersionType("release") - setVersionType("release")
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
- setProjectVersion("${minecraft_version}-${project.version}") - setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}") - setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")

4
patches/1.19.3/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
View File

@@ -22,13 +22,13 @@
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "neoforge" - modId = "neoforge"
- type="required" - type="required"
- versionRange = "[20.6,)" - versionRange = "[21.0,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"
- -
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "minecraft" - modId = "minecraft"
- type="required" - type="required"
- versionRange = "[1.20.6,1.21)" - versionRange = "[*,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"

8
patches/1.19.3/gradle.properties.patch
View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.20.6 -minecraft_version=1.21-pre4
+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.0 fabric_loader=0.15.11
-fabric_api=0.97.8+1.20.6 -fabric_api=0.100.0+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=41-beta -neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301
+forge_version=44.1.0 +forge_version=44.1.0
# Dependencies # Dependencies

2
patches/1.19.3/settings.gradle.patch
View File

@@ -4,5 +4,5 @@
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge", "Forge") -include("Common", "Fabric", "NeoForge")
+include("Common", "Fabric", "Forge") +include("Common", "Fabric", "Forge")

6
patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -15,7 +15,7 @@
@@ -10,7 +10,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@ @@ -44,7 +44,7 @@
deleteDir() deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,

12
patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -11,9 +11,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -18,7 +19,7 @@
@@ -13,7 +14,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.SSS_WEBHOOK, discordSend webhookURL: env.SSS_WEBHOOK,
@@ -22,7 +22,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -29,14 +30,14 @@ @@ -34,14 +35,14 @@
stage("Build") { stage("Build") {
steps { steps {
@@ -39,12 +39,12 @@
} }
} }
} }
@@ -51,8 +52,8 @@ @@ -56,8 +57,8 @@
projectSlug: "craterlib", projectSlug: "craterlib",
projectName: "${projectName}", projectName: "${projectName}",
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
- modLoaders: "forge|neoforge|fabric|quilt", - modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.20.6", - minecraftVersions: "1.21",
+ modLoaders: "forge|fabric|quilt", + modLoaders: "forge|fabric|quilt",
+ minecraftVersions: "1.20.2", + minecraftVersions: "1.20.2",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,

8
patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -1,11 +1,11 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
@@ -269,7 +269,7 @@ @@ -267,7 +267,7 @@
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
RenderSystem.setShader(GameRenderer::getPositionTexColorShader); RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);

4
patches/1.20.2/Fabric/build.gradle.patch
View File

@@ -4,8 +4,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}") - setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
+ setDisplayName("[FABRIC/QUILT 1.20.2] CraterLib - ${project.version}") + setDisplayName("[FABRIC/QUILT 1.20.2] CraterLib - ${project.version}")
+ setGameVersions("1.20.2") + setGameVersions("1.20.2")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")

2
patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch
View File

@@ -4,7 +4,7 @@
"depends": { "depends": {
"fabricloader": ">=0.15.0", "fabricloader": ">=0.15.0",
"fabric-api": "*", "fabric-api": "*",
- "minecraft": ">=1.20.6", - "minecraft": ">=1.21",
- "java": ">=21" - "java": ">=21"
+ "minecraft": "1.20.2", + "minecraft": "1.20.2",
+ "java": ">=17" + "java": ">=17"

6
patches/1.20.2/NeoForge/build.gradle.patch
View File

@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader neoforge_version - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -106,8 +106,8 @@
- setVersionType("release") - setVersionType("release")
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
- setProjectVersion("${minecraft_version}-${project.version}") - setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}") - setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")

4
patches/1.20.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
View File

@@ -22,13 +22,13 @@
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "neoforge" - modId = "neoforge"
- type="required" - type="required"
- versionRange = "[20.6,)" - versionRange = "[21.0,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"
- -
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "minecraft" - modId = "minecraft"
- type="required" - type="required"
- versionRange = "[1.20.6,1.21)" - versionRange = "[*,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"

8
patches/1.20.2/gradle.properties.patch
View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.20.6 -minecraft_version=1.21-pre4
+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.0 fabric_loader=0.15.11
-fabric_api=0.97.8+1.20.6 -fabric_api=0.100.0+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=41-beta -neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301
+forge_version=48.1.0 +forge_version=48.1.0
# Dependencies # Dependencies

2
patches/1.20.2/settings.gradle.patch
View File

@@ -4,5 +4,5 @@
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge", "Forge") -include("Common", "Fabric", "NeoForge")
+include("Common", "Fabric", "Forge") +include("Common", "Fabric", "Forge")

6
patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -15,7 +15,7 @@
@@ -10,7 +10,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@ @@ -44,7 +44,7 @@
deleteDir() deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,

10
patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -11,9 +11,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -34,14 +35,14 @@
@@ -29,14 +30,14 @@
stage("Build") { stage("Build") {
steps { steps {
@@ -30,11 +30,11 @@
} }
} }
} }
@@ -52,7 +53,7 @@ @@ -57,7 +58,7 @@
projectName: "${projectName}", projectName: "${projectName}",
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
modLoaders: "forge|neoforge|fabric|quilt", modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.20.6", - minecraftVersions: "1.21",
+ minecraftVersions: "1.20.4", + minecraftVersions: "1.20.4",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"

8
patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -1,11 +1,11 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
@@ -269,7 +269,7 @@ @@ -267,7 +267,7 @@
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
RenderSystem.setShader(GameRenderer::getPositionTexColorShader); RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);

4
patches/1.20.4/Fabric/build.gradle.patch
View File

@@ -4,8 +4,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}") - setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
+ setDisplayName("[FABRIC/QUILT 1.20.4] CraterLib - ${project.version}") + setDisplayName("[FABRIC/QUILT 1.20.4] CraterLib - ${project.version}")
+ setGameVersions("1.20.4") + setGameVersions("1.20.4")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")

2
patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch
View File

@@ -4,7 +4,7 @@
"depends": { "depends": {
"fabricloader": ">=0.15.0", "fabricloader": ">=0.15.0",
"fabric-api": "*", "fabric-api": "*",
- "minecraft": ">=1.20.6", - "minecraft": ">=1.21",
- "java": ">=21" - "java": ">=21"
+ "minecraft": "1.20.4", + "minecraft": "1.20.4",
+ "java": ">=17" + "java": ">=17"

4
patches/1.20.4/NeoForge/build.gradle.patch
View File

@@ -13,8 +13,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}") - setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
+ setDisplayName("[NeoForge 1.20.4] CraterLib - ${project.version}") + setDisplayName("[NeoForge 1.20.4] CraterLib - ${project.version}")
+ setGameVersions("1.20.4") + setGameVersions("1.20.4")
setLoaders("neoforge") setLoaders("neoforge")

4
patches/1.20.4/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
View File

@@ -22,13 +22,13 @@
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "neoforge" - modId = "neoforge"
- type="required" - type="required"
- versionRange = "[20.6,)" - versionRange = "[21.0,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"
- -
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "minecraft" - modId = "minecraft"
- type="required" - type="required"
- versionRange = "[1.20.6,1.21)" - versionRange = "[*,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"

8
patches/1.20.4/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.20.6 -minecraft_version=1.21-pre4
+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.0 fabric_loader=0.15.11
-fabric_api=0.97.8+1.20.6 -fabric_api=0.100.0+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=41-beta -neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301
+neoforge_version=234 +neoforge_version=234
# Dependencies # Dependencies

6
patches/1.20/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -15,7 +15,7 @@
@@ -10,7 +10,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@ @@ -44,7 +44,7 @@
deleteDir() deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,

12
patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -11,9 +11,9 @@
- image "registry.firstdark.dev/java21:latest" - image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest" + image "registry.firstdark.dev/java17:latest"
alwaysPull true alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
} }
} @@ -18,7 +19,7 @@
@@ -13,7 +14,7 @@
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.SSS_WEBHOOK, discordSend webhookURL: env.SSS_WEBHOOK,
@@ -22,7 +22,7 @@
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -29,14 +30,14 @@ @@ -34,14 +35,14 @@
stage("Build") { stage("Build") {
steps { steps {
@@ -39,12 +39,12 @@
} }
} }
} }
@@ -51,8 +52,8 @@ @@ -56,8 +57,8 @@
projectSlug: "craterlib", projectSlug: "craterlib",
projectName: "${projectName}", projectName: "${projectName}",
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
- modLoaders: "forge|neoforge|fabric|quilt", - modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.20.6", - minecraftVersions: "1.21",
+ modLoaders: "forge|fabric|quilt", + modLoaders: "forge|fabric|quilt",
+ minecraftVersions: "1.20|1.20.1", + minecraftVersions: "1.20|1.20.1",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,

12
patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -19,19 +19,19 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount)); int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) { for (Option<?> option : options) {
@@ -268,9 +268,9 @@ @@ -266,9 +266,9 @@
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) { protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
@@ -334,12 +334,12 @@ @@ -331,12 +331,12 @@
} }
@Override @Override

4
patches/1.20/Fabric/build.gradle.patch
View File

@@ -4,8 +4,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}") - setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
+ setDisplayName("[FABRIC/QUILT 1.20/1.20.1] CraterLib - ${project.version}") + setDisplayName("[FABRIC/QUILT 1.20/1.20.1] CraterLib - ${project.version}")
+ setGameVersions("1.20", "1.20.1") + setGameVersions("1.20", "1.20.1")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")

2
patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch
View File

@@ -4,7 +4,7 @@
"depends": { "depends": {
"fabricloader": ">=0.15.0", "fabricloader": ">=0.15.0",
"fabric-api": "*", "fabric-api": "*",
- "minecraft": ">=1.20.6", - "minecraft": ">=1.21",
- "java": ">=21" - "java": ">=21"
+ "minecraft": ">=1.20", + "minecraft": ">=1.20",
+ "java": ">=17" + "java": ">=17"

6
patches/1.20/NeoForge/build.gradle.patch
View File

@@ -34,7 +34,7 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- loader neoforge_version - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }
-} -}
@@ -106,8 +106,8 @@
- setVersionType("release") - setVersionType("release")
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
- setProjectVersion("${minecraft_version}-${project.version}") - setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}") - setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.20.6") - setGameVersions("1.21")
- setLoaders("neoforge") - setLoaders("neoforge")
- setArtifact(remapJar) - setArtifact(remapJar)
- setCurseEnvironment("both") - setCurseEnvironment("both")

4
patches/1.20/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
View File

@@ -22,13 +22,13 @@
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "neoforge" - modId = "neoforge"
- type="required" - type="required"
- versionRange = "[20.6,)" - versionRange = "[21.0,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"
- -
-[[dependencies.${ mod_id }]] -[[dependencies.${ mod_id }]]
- modId = "minecraft" - modId = "minecraft"
- type="required" - type="required"
- versionRange = "[1.20.6,1.21)" - versionRange = "[*,)"
- ordering = "NONE" - ordering = "NONE"
- side = "BOTH" - side = "BOTH"

8
patches/1.20/gradle.properties.patch
View File

@@ -4,20 +4,20 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=1.20.6 -minecraft_version=1.21-pre4
+minecraft_version=1.20 +minecraft_version=1.20
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.0 fabric_loader=0.15.11
-fabric_api=0.97.8+1.20.6 -fabric_api=0.100.0+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=41-beta -neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301
+forge_version=46.0.14 +forge_version=46.0.14
# Dependencies # Dependencies

2
patches/1.20/settings.gradle.patch
View File

@@ -4,5 +4,5 @@
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge", "Forge") -include("Common", "Fabric", "NeoForge")
+include("Common", "Fabric", "Forge") +include("Common", "Fabric", "Forge")