From 9855e532042b9bd7eac1014325d2d22e084495f3 Mon Sep 17 00:00:00 2001 From: fdd-orbit Date: Sun, 9 Jun 2024 15:49:42 +0000 Subject: [PATCH] [no-orbit] [DEV] Fix some jenkins configs --- commit.sha | 2 +- patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch | 6 +++--- .../1.18.2/.jenkins/Jenkinsfile.snapshot.patch | 12 ++++++------ .../gui/config/CraterConfigScreen.java.patch | 14 +++++++------- patches/1.18.2/Fabric/build.gradle.patch | 4 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.18.2/NeoForge/build.gradle.patch | 6 +++--- .../resources/META-INF/neoforge.mods.toml.patch | 4 ++-- patches/1.18.2/gradle.properties.patch | 8 ++++---- patches/1.18.2/settings.gradle.patch | 2 +- patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch | 6 +++--- .../1.19.2/.jenkins/Jenkinsfile.snapshot.patch | 12 ++++++------ .../gui/config/CraterConfigScreen.java.patch | 16 ++++++++-------- patches/1.19.2/Fabric/build.gradle.patch | 4 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.19.2/NeoForge/build.gradle.patch | 6 +++--- .../resources/META-INF/neoforge.mods.toml.patch | 4 ++-- patches/1.19.2/gradle.properties.patch | 8 ++++---- patches/1.19.2/settings.gradle.patch | 2 +- patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch | 6 +++--- .../1.19.3/.jenkins/Jenkinsfile.snapshot.patch | 10 +++++----- .../gui/config/CraterConfigScreen.java.patch | 16 ++++++++-------- patches/1.19.3/Fabric/build.gradle.patch | 4 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.19.3/NeoForge/build.gradle.patch | 6 +++--- .../resources/META-INF/neoforge.mods.toml.patch | 4 ++-- patches/1.19.3/gradle.properties.patch | 8 ++++---- patches/1.19.3/settings.gradle.patch | 2 +- patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch | 6 +++--- .../1.20.2/.jenkins/Jenkinsfile.snapshot.patch | 12 ++++++------ .../gui/config/CraterConfigScreen.java.patch | 8 ++++---- patches/1.20.2/Fabric/build.gradle.patch | 4 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.20.2/NeoForge/build.gradle.patch | 6 +++--- .../resources/META-INF/neoforge.mods.toml.patch | 4 ++-- patches/1.20.2/gradle.properties.patch | 8 ++++---- patches/1.20.2/settings.gradle.patch | 2 +- patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch | 6 +++--- .../1.20.4/.jenkins/Jenkinsfile.snapshot.patch | 10 +++++----- .../gui/config/CraterConfigScreen.java.patch | 8 ++++---- patches/1.20.4/Fabric/build.gradle.patch | 4 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.20.4/NeoForge/build.gradle.patch | 4 ++-- .../resources/META-INF/neoforge.mods.toml.patch | 4 ++-- patches/1.20.4/gradle.properties.patch | 8 ++++---- patches/1.20/.jenkins/Jenkinsfile.deploy.patch | 6 +++--- patches/1.20/.jenkins/Jenkinsfile.snapshot.patch | 12 ++++++------ .../gui/config/CraterConfigScreen.java.patch | 12 ++++++------ patches/1.20/Fabric/build.gradle.patch | 4 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.20/NeoForge/build.gradle.patch | 6 +++--- .../resources/META-INF/neoforge.mods.toml.patch | 4 ++-- patches/1.20/gradle.properties.patch | 8 ++++---- patches/1.20/settings.gradle.patch | 2 +- 54 files changed, 166 insertions(+), 166 deletions(-) diff --git a/commit.sha b/commit.sha index fcd447c..35b3f69 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -55c6f60197e1b916ecb6b1e84747838c9e4c1c67 \ No newline at end of file +648441ec78fbc0cfadcd398a85f54f2723f4a081 \ No newline at end of file diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch index 0876dbb..52d9953 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch @@ -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, diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch index e4a54ea..81daeba 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch @@ -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.18.2", failWebhook: env.SSS_WEBHOOK, diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index 1d21d7a..154adff 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -92,19 +92,19 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); 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) { 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(); -@@ -324,22 +325,22 @@ + 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); +@@ -321,22 +322,22 @@ @Override public void onClose() { if (isEdited()) { @@ -133,7 +133,7 @@ } @Override -@@ -378,15 +379,15 @@ +@@ -375,15 +376,15 @@ } } diff --git a/patches/1.18.2/Fabric/build.gradle.patch b/patches/1.18.2/Fabric/build.gradle.patch index 5b3e583..6d7af80 100644 --- a/patches/1.18.2/Fabric/build.gradle.patch +++ b/patches/1.18.2/Fabric/build.gradle.patch @@ -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.18.2] CraterLib - ${project.version}") + setGameVersions("1.18.2") setLoaders("fabric", "quilt") diff --git a/patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch index 33b8a1c..b011ce0 100644 --- a/patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch @@ -4,7 +4,7 @@ "depends": { "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.20.6", +- "minecraft": ">=1.21", - "java": ">=21" + "minecraft": "1.18.2", + "java": ">=17" diff --git a/patches/1.18.2/NeoForge/build.gradle.patch b/patches/1.18.2/NeoForge/build.gradle.patch index 6d6a100..1e3bedc 100644 --- a/patches/1.18.2/NeoForge/build.gradle.patch +++ b/patches/1.18.2/NeoForge/build.gradle.patch @@ -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") diff --git a/patches/1.18.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch b/patches/1.18.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch index 27e2e32..e811538 100644 --- a/patches/1.18.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch +++ b/patches/1.18.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch @@ -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" diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index 8212a3f..c4e1730 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.20.6 +-minecraft_version=1.21-pre4 +minecraft_version=1.18.2 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.76.0+1.18.2 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=41-beta +-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +forge_version=40.2.0 # Dependencies diff --git a/patches/1.18.2/settings.gradle.patch b/patches/1.18.2/settings.gradle.patch index 671df0b..b23adaa 100644 --- a/patches/1.18.2/settings.gradle.patch +++ b/patches/1.18.2/settings.gradle.patch @@ -4,5 +4,5 @@ } rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge", "Forge") +-include("Common", "Fabric", "NeoForge") +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch index 1b3669c..2090d87 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch @@ -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, diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch index 6f0b844..258fa84 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch @@ -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.19.2", failWebhook: env.SSS_WEBHOOK, diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index e181905..e46a0ed 100644 --- a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -50,19 +50,19 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); 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) { 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 +333,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 +330,12 @@ } @Override @@ -77,7 +77,7 @@ } @Override -@@ -378,7 +377,7 @@ +@@ -375,7 +374,7 @@ } } @@ -86,7 +86,7 @@ if (mouseX > startX && mouseX < startX + sizeX) { if (mouseY > startY && mouseY < startY + sizeY) { List list = new ArrayList<>(); -@@ -386,7 +385,7 @@ +@@ -383,7 +382,7 @@ for (String desc : description) { list.add(Component.translatable(desc)); } diff --git a/patches/1.19.2/Fabric/build.gradle.patch b/patches/1.19.2/Fabric/build.gradle.patch index 66a507f..7d6477c 100644 --- a/patches/1.19.2/Fabric/build.gradle.patch +++ b/patches/1.19.2/Fabric/build.gradle.patch @@ -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.19.2] CraterLib - ${project.version}") + setGameVersions("1.19.2") setLoaders("fabric", "quilt") diff --git a/patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch index 6fe1efb..dda5e73 100644 --- a/patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch @@ -4,7 +4,7 @@ "depends": { "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.20.6", +- "minecraft": ">=1.21", - "java": ">=21" + "minecraft": "1.19.2", + "java": ">=17" diff --git a/patches/1.19.2/NeoForge/build.gradle.patch b/patches/1.19.2/NeoForge/build.gradle.patch index 6d6a100..1e3bedc 100644 --- a/patches/1.19.2/NeoForge/build.gradle.patch +++ b/patches/1.19.2/NeoForge/build.gradle.patch @@ -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") diff --git a/patches/1.19.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch b/patches/1.19.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch index 27e2e32..e811538 100644 --- a/patches/1.19.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch +++ b/patches/1.19.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch @@ -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" diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index 5e22aa5..aef7987 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.20.6 +-minecraft_version=1.21-pre4 +minecraft_version=1.19.2 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.76.0+1.19.2 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=41-beta +-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +forge_version=43.2.0 # Dependencies diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch index 671df0b..b23adaa 100644 --- a/patches/1.19.2/settings.gradle.patch +++ b/patches/1.19.2/settings.gradle.patch @@ -4,5 +4,5 @@ } rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge", "Forge") +-include("Common", "Fabric", "NeoForge") +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch index 7f7d8d5..d630ab8 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch @@ -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, diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch index 84ee70b..d1666a7 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch @@ -7,7 +7,7 @@ pipeline { agent { -@@ -13,7 +14,7 @@ +@@ -18,7 +19,7 @@ stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, @@ -16,7 +16,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 { @@ -33,12 +33,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.19.3|1.19.4", failWebhook: env.SSS_WEBHOOK, diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index fa90832..6bddc3c 100644 --- a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -38,19 +38,19 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); 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) { 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 +333,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 +330,12 @@ } @Override @@ -65,7 +65,7 @@ } @Override -@@ -378,7 +377,7 @@ +@@ -375,7 +374,7 @@ } } @@ -74,7 +74,7 @@ if (mouseX > startX && mouseX < startX + sizeX) { if (mouseY > startY && mouseY < startY + sizeY) { List list = new ArrayList<>(); -@@ -386,7 +385,7 @@ +@@ -383,7 +382,7 @@ for (String desc : description) { list.add(Component.translatable(desc)); } diff --git a/patches/1.19.3/Fabric/build.gradle.patch b/patches/1.19.3/Fabric/build.gradle.patch index f118f53..b94d6ca 100644 --- a/patches/1.19.3/Fabric/build.gradle.patch +++ b/patches/1.19.3/Fabric/build.gradle.patch @@ -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.19.3/1.19.4] CraterLib - ${project.version}") + setGameVersions("1.19.3", "1.19.4") setLoaders("fabric", "quilt") diff --git a/patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch index 1eb998a..4cd15d4 100644 --- a/patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch @@ -4,7 +4,7 @@ "depends": { "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.20.6", +- "minecraft": ">=1.21", - "java": ">=21" + "minecraft": ">=1.19.3", + "java": ">=17" diff --git a/patches/1.19.3/NeoForge/build.gradle.patch b/patches/1.19.3/NeoForge/build.gradle.patch index 6d6a100..1e3bedc 100644 --- a/patches/1.19.3/NeoForge/build.gradle.patch +++ b/patches/1.19.3/NeoForge/build.gradle.patch @@ -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") diff --git a/patches/1.19.3/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch b/patches/1.19.3/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch index 27e2e32..e811538 100644 --- a/patches/1.19.3/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch +++ b/patches/1.19.3/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch @@ -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" diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index c1738bc..e2b51b2 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.20.6 +-minecraft_version=1.21-pre4 +minecraft_version=1.19.3 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.76.1+1.19.3 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=41-beta +-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +forge_version=44.1.0 # Dependencies diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch index 671df0b..b23adaa 100644 --- a/patches/1.19.3/settings.gradle.patch +++ b/patches/1.19.3/settings.gradle.patch @@ -4,5 +4,5 @@ } rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge", "Forge") +-include("Common", "Fabric", "NeoForge") +include("Common", "Fabric", "Forge") diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch index 10cd5cb..01197fa 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch @@ -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, diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch index 496d44d..530e015 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch @@ -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.2", failWebhook: env.SSS_WEBHOOK, diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index c0be618..74b189f 100644 --- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -1,11 +1,11 @@ --- 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 -@@ -269,7 +269,7 @@ +@@ -267,7 +267,7 @@ 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); - 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.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); diff --git a/patches/1.20.2/Fabric/build.gradle.patch b/patches/1.20.2/Fabric/build.gradle.patch index 7efc7bd..880fd91 100644 --- a/patches/1.20.2/Fabric/build.gradle.patch +++ b/patches/1.20.2/Fabric/build.gradle.patch @@ -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.2] CraterLib - ${project.version}") + setGameVersions("1.20.2") setLoaders("fabric", "quilt") diff --git a/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch index 4db55f6..a25540b 100644 --- a/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch @@ -4,7 +4,7 @@ "depends": { "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.20.6", +- "minecraft": ">=1.21", - "java": ">=21" + "minecraft": "1.20.2", + "java": ">=17" diff --git a/patches/1.20.2/NeoForge/build.gradle.patch b/patches/1.20.2/NeoForge/build.gradle.patch index 6d6a100..1e3bedc 100644 --- a/patches/1.20.2/NeoForge/build.gradle.patch +++ b/patches/1.20.2/NeoForge/build.gradle.patch @@ -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") diff --git a/patches/1.20.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch b/patches/1.20.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch index 27e2e32..e811538 100644 --- a/patches/1.20.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch +++ b/patches/1.20.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch @@ -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" diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index 848bd1d..61b49dd 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.20.6 +-minecraft_version=1.21-pre4 +minecraft_version=1.20.2 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.91.6+1.20.2 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=41-beta +-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +forge_version=48.1.0 # Dependencies diff --git a/patches/1.20.2/settings.gradle.patch b/patches/1.20.2/settings.gradle.patch index 671df0b..b23adaa 100644 --- a/patches/1.20.2/settings.gradle.patch +++ b/patches/1.20.2/settings.gradle.patch @@ -4,5 +4,5 @@ } rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge", "Forge") +-include("Common", "Fabric", "NeoForge") +include("Common", "Fabric", "Forge") diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch index 5f00d4e..7a533ff 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch @@ -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, diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch index 74025d1..49a4964 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch @@ -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' } - } -@@ -29,14 +30,14 @@ +@@ -34,14 +35,14 @@ stage("Build") { steps { @@ -30,11 +30,11 @@ } } } -@@ -52,7 +53,7 @@ +@@ -57,7 +58,7 @@ projectName: "${projectName}", projectIcon: "${projectIcon}", - modLoaders: "forge|neoforge|fabric|quilt", -- minecraftVersions: "1.20.6", + modLoaders: "neoforge|fabric|quilt", +- minecraftVersions: "1.21", + minecraftVersions: "1.20.4", failWebhook: env.SSS_WEBHOOK, publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index c0be618..74b189f 100644 --- a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -1,11 +1,11 @@ --- 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 -@@ -269,7 +269,7 @@ +@@ -267,7 +267,7 @@ 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); - 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.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); diff --git a/patches/1.20.4/Fabric/build.gradle.patch b/patches/1.20.4/Fabric/build.gradle.patch index 0272ed9..556c9df 100644 --- a/patches/1.20.4/Fabric/build.gradle.patch +++ b/patches/1.20.4/Fabric/build.gradle.patch @@ -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.4] CraterLib - ${project.version}") + setGameVersions("1.20.4") setLoaders("fabric", "quilt") diff --git a/patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch index c97c881..0a76fef 100644 --- a/patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch @@ -4,7 +4,7 @@ "depends": { "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.20.6", +- "minecraft": ">=1.21", - "java": ">=21" + "minecraft": "1.20.4", + "java": ">=17" diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch index c7770bd..710eff7 100644 --- a/patches/1.20.4/NeoForge/build.gradle.patch +++ b/patches/1.20.4/NeoForge/build.gradle.patch @@ -13,8 +13,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") + setDisplayName("[NeoForge 1.20.4] CraterLib - ${project.version}") + setGameVersions("1.20.4") setLoaders("neoforge") diff --git a/patches/1.20.4/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch b/patches/1.20.4/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch index 27e2e32..e811538 100644 --- a/patches/1.20.4/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch +++ b/patches/1.20.4/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch @@ -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" diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index 45ae265..5f9c4d7 100644 --- a/patches/1.20.4/gradle.properties.patch +++ b/patches/1.20.4/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.20.6 +-minecraft_version=1.21-pre4 +minecraft_version=1.20.4 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.97.0+1.20.4 # Forge @@ -18,7 +18,7 @@ +forge_version=49.0.49 # NeoForged --neoforge_version=41-beta +-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +neoforge_version=234 # Dependencies diff --git a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch index 22afbf1..7a3499f 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch @@ -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, diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch index 43c2357..f9f1fc3 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch @@ -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, diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index 14e51e6..9eac71b 100644 --- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -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 diff --git a/patches/1.20/Fabric/build.gradle.patch b/patches/1.20/Fabric/build.gradle.patch index 089c855..80cd28f 100644 --- a/patches/1.20/Fabric/build.gradle.patch +++ b/patches/1.20/Fabric/build.gradle.patch @@ -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") diff --git a/patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch index 822e86c..a4a9160 100644 --- a/patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch @@ -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" diff --git a/patches/1.20/NeoForge/build.gradle.patch b/patches/1.20/NeoForge/build.gradle.patch index 6d6a100..1e3bedc 100644 --- a/patches/1.20/NeoForge/build.gradle.patch +++ b/patches/1.20/NeoForge/build.gradle.patch @@ -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") diff --git a/patches/1.20/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch b/patches/1.20/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch index 27e2e32..e811538 100644 --- a/patches/1.20/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch +++ b/patches/1.20/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch @@ -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" diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index a3f51a3..cf84a38 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -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 diff --git a/patches/1.20/settings.gradle.patch b/patches/1.20/settings.gradle.patch index 671df0b..b23adaa 100644 --- a/patches/1.20/settings.gradle.patch +++ b/patches/1.20/settings.gradle.patch @@ -4,5 +4,5 @@ } rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge", "Forge") +-include("Common", "Fabric", "NeoForge") +include("Common", "Fabric", "Forge")