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

[no-orbit] [DEV] Fix some jenkins configs

Browse Source
This commit is contained in:
fdd-orbit
2024-06-09 15:49:42 +00:00
parent 2ba24a0feb
commit 9855e53204
54 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest"
alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
}
}
@@ -10,7 +10,7 @@
@@ -15,7 +15,7 @@
stage("Notify Discord") {
steps {
discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL,
result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@
@@ -44,7 +44,7 @@
deleteDir()
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/java17:latest"
alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
}
}
@@ -13,7 +14,7 @@
@@ -18,7 +19,7 @@
stage("Notify Discord") {
steps {
discordSend webhookURL: env.SSS_WEBHOOK,
@@ -22,7 +22,7 @@
link: env.BUILD_URL,
result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -29,14 +30,14 @@
@@ -34,14 +35,14 @@
stage("Build") {
steps {
@@ -39,12 +39,12 @@
}
}
}
@@ -51,8 +52,8 @@
@@ -56,8 +57,8 @@
projectSlug: "craterlib",
projectName: "${projectName}",
projectIcon: "${projectIcon}",
- modLoaders: "forge|neoforge|fabric|quilt",
- minecraftVersions: "1.20.6",
- modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.21",
+ modLoaders: "forge|fabric|quilt",
+ minecraftVersions: "1.20|1.20.1",
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));
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) {
Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder();
BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
@@ -334,12 +334,12 @@
buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
@@ -331,12 +331,12 @@
}
@Override

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

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

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

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

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

@@ -34,7 +34,7 @@
-
-unimined.minecraft {
- neoForged {
- loader neoforge_version
- loader "net.neoforged:neoforge:${neoforge_version}:universal"
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- }
-}
@@ -106,8 +106,8 @@
- setVersionType("release")
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
- setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}")
- setGameVersions("1.20.6")
- setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.21")
- setLoaders("neoforge")
- setArtifact(remapJar)
- 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 }]]
- modId = "neoforge"
- type="required"
- versionRange = "[20.6,)"
- versionRange = "[21.0,)"
- ordering = "NONE"
- side = "BOTH"
-
-[[dependencies.${ mod_id }]]
- modId = "minecraft"
- type="required"
- versionRange = "[1.20.6,1.21)"
- versionRange = "[*,)"
- ordering = "NONE"
- side = "BOTH"

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

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

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

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