From 0c321d9194afcca93089f1ad6dc5866c81dd494f Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Wed, 21 Aug 2024 22:59:33 +0200 Subject: [PATCH] [PORT] Rebuild porting patches --- build.gradle | 2 +- commit.sha | 2 +- .../1.18.2/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 4 +-- .../gui/config/CraterConfigScreen.java.patch | 10 ++++--- patches/1.18.2/Fabric/build.gradle.patch | 4 +-- .../src/main/resources/fabric.mod.json.patch | 9 ++++-- patches/1.18.2/NeoForge/build.gradle.patch | 4 +-- .../META-INF/neoforge.mods.toml.patch | 2 +- patches/1.18.2/gradle.properties.patch | 7 +++-- patches/1.18.2/settings.gradle.patch | 2 +- .../1.19.2/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 4 +-- .../gui/config/CraterConfigScreen.java.patch | 10 ++++--- patches/1.19.2/Fabric/build.gradle.patch | 4 +-- .../src/main/resources/fabric.mod.json.patch | 9 ++++-- patches/1.19.2/NeoForge/build.gradle.patch | 4 +-- .../META-INF/neoforge.mods.toml.patch | 2 +- patches/1.19.2/gradle.properties.patch | 7 +++-- patches/1.19.2/settings.gradle.patch | 2 +- .../1.19.3/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 4 +-- .../gui/config/CraterConfigScreen.java.patch | 10 ++++--- patches/1.19.3/Fabric/build.gradle.patch | 4 +-- .../src/main/resources/fabric.mod.json.patch | 9 ++++-- patches/1.19.3/NeoForge/build.gradle.patch | 4 +-- .../META-INF/neoforge.mods.toml.patch | 2 +- patches/1.19.3/gradle.properties.patch | 7 +++-- patches/1.19.3/settings.gradle.patch | 2 +- .../1.20.2/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 4 +-- .../gui/config/CraterConfigScreen.java.patch | 13 +++++---- patches/1.20.2/Fabric/build.gradle.patch | 4 +-- .../src/main/resources/fabric.mod.json.patch | 9 ++++-- patches/1.20.2/NeoForge/build.gradle.patch | 4 +-- .../META-INF/neoforge.mods.toml.patch | 2 +- patches/1.20.2/gradle.properties.patch | 7 +++-- patches/1.20.2/settings.gradle.patch | 2 +- .../1.20.4/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 4 +-- .../gui/config/CraterConfigScreen.java.patch | 13 +++++---- patches/1.20.4/Fabric/build.gradle.patch | 4 +-- .../src/main/resources/fabric.mod.json.patch | 9 ++++-- patches/1.20.4/NeoForge/build.gradle.patch | 4 +-- .../META-INF/neoforge.mods.toml.patch | 2 +- patches/1.20.4/gradle.properties.patch | 7 +++-- patches/1.20.4/settings.gradle.patch | 2 +- .../1.20/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../1.20/.jenkins/Jenkinsfile.snapshot.patch | 4 +-- .../gui/config/CraterConfigScreen.java.patch | 10 ++++--- patches/1.20/Fabric/build.gradle.patch | 4 +-- .../src/main/resources/fabric.mod.json.patch | 9 ++++-- patches/1.20/NeoForge/build.gradle.patch | 4 +-- .../META-INF/neoforge.mods.toml.patch | 2 +- patches/1.20/gradle.properties.patch | 7 +++-- patches/1.20/settings.gradle.patch | 2 +- .../1.21/.jenkins/Jenkinsfile.deploy.patch | 7 +++++ .../1.21/.jenkins/Jenkinsfile.snapshot.patch | 11 +++++-- .../gui/config/CraterConfigScreen.java.patch | 29 +++++++++++++++++++ patches/1.21/Fabric/build.gradle.patch | 13 +++++++++ .../src/main/resources/fabric.mod.json.patch | 14 +++++++++ patches/1.21/NeoForge/build.gradle.patch | 13 +++++++++ .../META-INF/neoforge.mods.toml.patch | 2 +- patches/1.21/gradle.properties.patch | 16 ++++++++++ patches/1.21/settings.gradle.patch | 8 +++++ settings.gradle | 1 - 66 files changed, 265 insertions(+), 123 deletions(-) create mode 100644 patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch create mode 100644 patches/1.21/Fabric/build.gradle.patch create mode 100644 patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch create mode 100644 patches/1.21/NeoForge/build.gradle.patch create mode 100644 patches/1.21/settings.gradle.patch diff --git a/build.gradle b/build.gradle index 6bb811c..567001e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import codechicken.diffpatch.util.PatchMode plugins { id 'java' - id "com.hypherionmc.modutils.orion.porting" version "1.0.18" + id "com.hypherionmc.modutils.orion.porting" version "1.0.20" } orionporting { diff --git a/commit.sha b/commit.sha index 646d8ca..adacd87 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -0dbf07de46f6156b78fe826379cde3739981546f \ No newline at end of file +fcc1c816e78367336b276a7665db255d84a70e0b \ 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 b3bd51d..fc7f04d 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21"; +-def majorMc = "1.21.2"; +def majorMc = "1.18.2"; +def JDK = "17" diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch index 4c6053c..821081d 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; -def JDK = "21"; --def majorMc = "1.21"; +-def majorMc = "1.21.2"; -def modLoaders = "neoforge|fabric|quilt"; --def supportedMc = "1.21|1.21.1"; +-def supportedMc = "1.21.2"; -def reltype = "port"; +def JDK = "17"; +def majorMc = "1.18.2"; 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 fcd7323..2cd013d 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 @@ -106,8 +106,7 @@ //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); +- //RenderSystem.setShader(RenderSystem.getShader()); - - buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); - buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); @@ -123,6 +122,8 @@ - buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - BufferUploader.drawWithShader(buffer.buildOrThrow()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionColorShader); + buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); + + buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); @@ -151,7 +152,8 @@ RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(770, 771, 0, 1); //RenderSystem.disableTexture(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); - buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); - buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0); @@ -180,7 +182,7 @@ 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.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); -- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); + BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); diff --git a/patches/1.18.2/Fabric/build.gradle.patch b/patches/1.18.2/Fabric/build.gradle.patch index 19cd43d..c5f089d 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.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") + 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 b011ce0..6b828aa 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 @@ -1,10 +1,13 @@ --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json -@@ -33,7 +33,7 @@ +@@ -31,9 +31,9 @@ + "${mod_id}.fabric.mixins.json" + ], "depends": { - "fabricloader": ">=0.15.0", +- "fabricloader": ">=0.16.2", ++ "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.21", +- "minecraft": ">=1.21.2", - "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 2ee2c57..cee3b9f 100644 --- a/patches/1.18.2/NeoForge/build.gradle.patch +++ b/patches/1.18.2/NeoForge/build.gradle.patch @@ -109,8 +109,8 @@ - setVersionType("release") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[NeoForge 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") - 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 e811538..2c9b585 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,7 +22,7 @@ -[[dependencies.${ mod_id }]] - modId = "neoforge" - type="required" -- versionRange = "[21.0,)" +- versionRange = "[*,)" - ordering = "NONE" - side = "BOTH" - diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index 826ab92..d01bdf0 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -4,13 +4,14 @@ mod_name=CraterLib # Shared --minecraft_version=1.21 +-minecraft_version=24w34a +minecraft_version=1.18.2 project_group=com.hypherionmc.craterlib # Fabric - fabric_loader=0.15.11 --fabric_api=0.100.1+1.21 +-fabric_loader=0.16.2 +-fabric_api=0.102.3+1.21.2 ++fabric_loader=0.15.11 +fabric_api=0.76.0+1.18.2 # Forge diff --git a/patches/1.18.2/settings.gradle.patch b/patches/1.18.2/settings.gradle.patch index 7ac621f..d77ae4f 100644 --- a/patches/1.18.2/settings.gradle.patch +++ b/patches/1.18.2/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric", /*"NeoForge"*/) +rootProject.name = 'CraterLib-1.18.2' +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 107078d..498cfeb 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21"; +-def majorMc = "1.21.2"; +def majorMc = "1.19.2"; +def JDK = "17" diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch index 2c388f3..971ad46 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; -def JDK = "21"; --def majorMc = "1.21"; +-def majorMc = "1.21.2"; -def modLoaders = "neoforge|fabric|quilt"; --def supportedMc = "1.21|1.21.1"; +-def supportedMc = "1.21.2"; -def reltype = "port"; +def JDK = "17"; +def majorMc = "1.19.2"; 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 e93a5e3..88b3741 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 @@ -64,8 +64,7 @@ //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); +- //RenderSystem.setShader(RenderSystem.getShader()); - - buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); - buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); @@ -81,6 +80,8 @@ - buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - BufferUploader.drawWithShader(buffer.buildOrThrow()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionColorShader); + buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); + + buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); @@ -109,7 +110,8 @@ RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(770, 771, 0, 1); //RenderSystem.disableTexture(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); - buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); - buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0); @@ -138,7 +140,7 @@ 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.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); -- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); + BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); diff --git a/patches/1.19.2/Fabric/build.gradle.patch b/patches/1.19.2/Fabric/build.gradle.patch index 6d35248..593d6b1 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.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") + 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 dda5e73..eff1b81 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 @@ -1,10 +1,13 @@ --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json -@@ -33,7 +33,7 @@ +@@ -31,9 +31,9 @@ + "${mod_id}.fabric.mixins.json" + ], "depends": { - "fabricloader": ">=0.15.0", +- "fabricloader": ">=0.16.2", ++ "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.21", +- "minecraft": ">=1.21.2", - "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 2ee2c57..cee3b9f 100644 --- a/patches/1.19.2/NeoForge/build.gradle.patch +++ b/patches/1.19.2/NeoForge/build.gradle.patch @@ -109,8 +109,8 @@ - setVersionType("release") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[NeoForge 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") - 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 e811538..2c9b585 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,7 +22,7 @@ -[[dependencies.${ mod_id }]] - modId = "neoforge" - type="required" -- versionRange = "[21.0,)" +- versionRange = "[*,)" - ordering = "NONE" - side = "BOTH" - diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index 7432adc..e06f239 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -4,13 +4,14 @@ mod_name=CraterLib # Shared --minecraft_version=1.21 +-minecraft_version=24w34a +minecraft_version=1.19.2 project_group=com.hypherionmc.craterlib # Fabric - fabric_loader=0.15.11 --fabric_api=0.100.1+1.21 +-fabric_loader=0.16.2 +-fabric_api=0.102.3+1.21.2 ++fabric_loader=0.15.11 +fabric_api=0.76.0+1.19.2 # Forge diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch index 76a8416..e705df1 100644 --- a/patches/1.19.2/settings.gradle.patch +++ b/patches/1.19.2/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric", /*"NeoForge"*/) +rootProject.name = 'CraterLib-1.19.2' +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 69cd139..32164b2 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21"; +-def majorMc = "1.21.2"; +def majorMc = "1.19.3"; +def JDK = "17" diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch index 29cfe6e..a8ce476 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; -def JDK = "21"; --def majorMc = "1.21"; +-def majorMc = "1.21.2"; -def modLoaders = "neoforge|fabric|quilt"; --def supportedMc = "1.21|1.21.1"; +-def supportedMc = "1.21.2"; -def reltype = "port"; +def JDK = "17"; +def majorMc = "1.19.3"; 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 e9ec1ff..a70df59 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 @@ -52,8 +52,7 @@ //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); +- //RenderSystem.setShader(RenderSystem.getShader()); - - buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); - buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); @@ -69,6 +68,8 @@ - buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - BufferUploader.drawWithShader(buffer.buildOrThrow()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionColorShader); + buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); + + buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); @@ -97,7 +98,8 @@ RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(770, 771, 0, 1); //RenderSystem.disableTexture(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); - buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); - buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0); @@ -126,7 +128,7 @@ 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.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); -- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); + BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); diff --git a/patches/1.19.3/Fabric/build.gradle.patch b/patches/1.19.3/Fabric/build.gradle.patch index 2f95c6e..6a5f4b0 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.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") + setDisplayName("[FABRIC/QUILT 1.19.4] CraterLib - ${project.version}") + setGameVersions("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 7c75111..b249bea 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 @@ -1,10 +1,13 @@ --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json -@@ -33,7 +33,7 @@ +@@ -31,9 +31,9 @@ + "${mod_id}.fabric.mixins.json" + ], "depends": { - "fabricloader": ">=0.15.0", +- "fabricloader": ">=0.16.2", ++ "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.21", +- "minecraft": ">=1.21.2", - "java": ">=21" + "minecraft": ">=1.19.4", + "java": ">=17" diff --git a/patches/1.19.3/NeoForge/build.gradle.patch b/patches/1.19.3/NeoForge/build.gradle.patch index 2ee2c57..cee3b9f 100644 --- a/patches/1.19.3/NeoForge/build.gradle.patch +++ b/patches/1.19.3/NeoForge/build.gradle.patch @@ -109,8 +109,8 @@ - setVersionType("release") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[NeoForge 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") - 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 e811538..2c9b585 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,7 +22,7 @@ -[[dependencies.${ mod_id }]] - modId = "neoforge" - type="required" -- versionRange = "[21.0,)" +- versionRange = "[*,)" - ordering = "NONE" - side = "BOTH" - diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index c5f3e52..eba16ae 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -4,13 +4,14 @@ mod_name=CraterLib # Shared --minecraft_version=1.21 +-minecraft_version=24w34a +minecraft_version=1.19.4 project_group=com.hypherionmc.craterlib # Fabric - fabric_loader=0.15.11 --fabric_api=0.100.1+1.21 +-fabric_loader=0.16.2 +-fabric_api=0.102.3+1.21.2 ++fabric_loader=0.15.11 +fabric_api=0.87.2+1.19.4 # Forge diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch index 0ddbb30..e052803 100644 --- a/patches/1.19.3/settings.gradle.patch +++ b/patches/1.19.3/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric", /*"NeoForge"*/) +rootProject.name = 'CraterLib-1.19.3' +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 8945b6a..64eb6f1 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21"; +-def majorMc = "1.21.2"; +def majorMc = "1.20.2"; +def JDK = "17" diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch index a0f8ec2..fa52e2f 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; -def JDK = "21"; --def majorMc = "1.21"; +-def majorMc = "1.21.2"; -def modLoaders = "neoforge|fabric|quilt"; --def supportedMc = "1.21|1.21.1"; +-def supportedMc = "1.21.2"; -def reltype = "port"; +def JDK = "17"; +def majorMc = "1.20.2"; 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 ed53a54..ab4e4da 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 @@ -14,8 +14,7 @@ //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); +- //RenderSystem.setShader(RenderSystem.getShader()); - - buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); - buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); @@ -31,6 +30,8 @@ - buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - BufferUploader.drawWithShader(buffer.buildOrThrow()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionColorShader); + buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); + + buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); @@ -59,7 +60,8 @@ RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(770, 771, 0, 1); //RenderSystem.disableTexture(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); - buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); - buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0); @@ -88,9 +90,10 @@ 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.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); - buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 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 8951b6c..d202323 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.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") + 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 a25540b..5d65ce0 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 @@ -1,10 +1,13 @@ --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json -@@ -33,7 +33,7 @@ +@@ -31,9 +31,9 @@ + "${mod_id}.fabric.mixins.json" + ], "depends": { - "fabricloader": ">=0.15.0", +- "fabricloader": ">=0.16.2", ++ "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.21", +- "minecraft": ">=1.21.2", - "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 2ee2c57..cee3b9f 100644 --- a/patches/1.20.2/NeoForge/build.gradle.patch +++ b/patches/1.20.2/NeoForge/build.gradle.patch @@ -109,8 +109,8 @@ - setVersionType("release") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[NeoForge 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") - 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 e811538..2c9b585 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,7 +22,7 @@ -[[dependencies.${ mod_id }]] - modId = "neoforge" - type="required" -- versionRange = "[21.0,)" +- versionRange = "[*,)" - ordering = "NONE" - side = "BOTH" - diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index edfeb60..4dc02f0 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -4,13 +4,14 @@ mod_name=CraterLib # Shared --minecraft_version=1.21 +-minecraft_version=24w34a +minecraft_version=1.20.2 project_group=com.hypherionmc.craterlib # Fabric - fabric_loader=0.15.11 --fabric_api=0.100.1+1.21 +-fabric_loader=0.16.2 +-fabric_api=0.102.3+1.21.2 ++fabric_loader=0.15.11 +fabric_api=0.91.6+1.20.2 # Forge diff --git a/patches/1.20.2/settings.gradle.patch b/patches/1.20.2/settings.gradle.patch index c9134fa..c1c0c77 100644 --- a/patches/1.20.2/settings.gradle.patch +++ b/patches/1.20.2/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric", /*"NeoForge"*/) +rootProject.name = 'CraterLib-1.20.2' +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 f7722b7..a369b00 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21"; +-def majorMc = "1.21.2"; +def majorMc = "1.20.4"; +def JDK = "17" diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch index 4480a99..251bad0 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; -def JDK = "21"; --def majorMc = "1.21"; +-def majorMc = "1.21.2"; -def modLoaders = "neoforge|fabric|quilt"; --def supportedMc = "1.21|1.21.1"; +-def supportedMc = "1.21.2"; -def reltype = "port"; +def JDK = "17"; +def majorMc = "1.20.4"; 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 ed53a54..ab4e4da 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 @@ -14,8 +14,7 @@ //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); +- //RenderSystem.setShader(RenderSystem.getShader()); - - buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); - buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); @@ -31,6 +30,8 @@ - buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - BufferUploader.drawWithShader(buffer.buildOrThrow()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionColorShader); + buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); + + buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); @@ -59,7 +60,8 @@ RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(770, 771, 0, 1); //RenderSystem.disableTexture(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); - buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); - buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0); @@ -88,9 +90,10 @@ 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.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); - buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 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 3d01528..c6d385e 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.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") + 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 0a76fef..3bb0177 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 @@ -1,10 +1,13 @@ --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json -@@ -33,7 +33,7 @@ +@@ -31,9 +31,9 @@ + "${mod_id}.fabric.mixins.json" + ], "depends": { - "fabricloader": ">=0.15.0", +- "fabricloader": ">=0.16.2", ++ "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.21", +- "minecraft": ">=1.21.2", - "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 ab54863..21641e9 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.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[NeoForge 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") + 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 e811538..2c9b585 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,7 +22,7 @@ -[[dependencies.${ mod_id }]] - modId = "neoforge" - type="required" -- versionRange = "[21.0,)" +- versionRange = "[*,)" - ordering = "NONE" - side = "BOTH" - diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index ffbe875..39a378c 100644 --- a/patches/1.20.4/gradle.properties.patch +++ b/patches/1.20.4/gradle.properties.patch @@ -4,13 +4,14 @@ mod_name=CraterLib # Shared --minecraft_version=1.21 +-minecraft_version=24w34a +minecraft_version=1.20.4 project_group=com.hypherionmc.craterlib # Fabric - fabric_loader=0.15.11 --fabric_api=0.100.1+1.21 +-fabric_loader=0.16.2 +-fabric_api=0.102.3+1.21.2 ++fabric_loader=0.15.11 +fabric_api=0.97.0+1.20.4 # Forge diff --git a/patches/1.20.4/settings.gradle.patch b/patches/1.20.4/settings.gradle.patch index 793539a..a154c00 100644 --- a/patches/1.20.4/settings.gradle.patch +++ b/patches/1.20.4/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric", /*"NeoForge"*/) +rootProject.name = 'CraterLib-1.20.4' +include("Common", "Fabric", "Forge", "NeoForge") diff --git a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch index 4b44148..111205d 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21"; +-def majorMc = "1.21.2"; +def majorMc = "1.20"; +def JDK = "17" diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch index 9ac7e31..98ab31a 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; -def JDK = "21"; --def majorMc = "1.21"; +-def majorMc = "1.21.2"; -def modLoaders = "neoforge|fabric|quilt"; --def supportedMc = "1.21|1.21.1"; +-def supportedMc = "1.21.2"; -def reltype = "port"; +def JDK = "17"; +def majorMc = "1.20"; 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 6f3651a..a83dd5a 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 @@ -33,8 +33,7 @@ //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); -+ BufferBuilder buffer = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); +- //RenderSystem.setShader(RenderSystem.getShader()); - - buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); - buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); @@ -50,6 +49,8 @@ - buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); - BufferUploader.drawWithShader(buffer.buildOrThrow()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionColorShader); + buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); + + buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); @@ -78,7 +79,8 @@ RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(770, 771, 0, 1); //RenderSystem.disableTexture(); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); - buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); - buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0); @@ -107,7 +109,7 @@ 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.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); -- RenderSystem.setShader(GameRenderer::getPositionTexColorShader); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); + BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); diff --git a/patches/1.20/Fabric/build.gradle.patch b/patches/1.20/Fabric/build.gradle.patch index 8fec041..a2a3cc0 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.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") + 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 a4a9160..c504f78 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 @@ -1,10 +1,13 @@ --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json -@@ -33,7 +33,7 @@ +@@ -31,9 +31,9 @@ + "${mod_id}.fabric.mixins.json" + ], "depends": { - "fabricloader": ">=0.15.0", +- "fabricloader": ">=0.16.2", ++ "fabricloader": ">=0.15.0", "fabric-api": "*", -- "minecraft": ">=1.21", +- "minecraft": ">=1.21.2", - "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 2ee2c57..cee3b9f 100644 --- a/patches/1.20/NeoForge/build.gradle.patch +++ b/patches/1.20/NeoForge/build.gradle.patch @@ -109,8 +109,8 @@ - setVersionType("release") - setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") -- setGameVersions("1.21", "1.21.1") +- setDisplayName("[NeoForge 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") - 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 e811538..2c9b585 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,7 +22,7 @@ -[[dependencies.${ mod_id }]] - modId = "neoforge" - type="required" -- versionRange = "[21.0,)" +- versionRange = "[*,)" - ordering = "NONE" - side = "BOTH" - diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index 641b992..19eb0ee 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -4,13 +4,14 @@ mod_name=CraterLib # Shared --minecraft_version=1.21 +-minecraft_version=24w34a +minecraft_version=1.20 project_group=com.hypherionmc.craterlib # Fabric - fabric_loader=0.15.11 --fabric_api=0.100.1+1.21 +-fabric_loader=0.16.2 +-fabric_api=0.102.3+1.21.2 ++fabric_loader=0.15.11 +fabric_api=0.83.0+1.20 # Forge diff --git a/patches/1.20/settings.gradle.patch b/patches/1.20/settings.gradle.patch index c57b5d0..d5c13e0 100644 --- a/patches/1.20/settings.gradle.patch +++ b/patches/1.20/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric", /*"NeoForge"*/) +rootProject.name = 'CraterLib-1.20' +include("Common", "Fabric", "Forge") diff --git a/patches/1.21/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21/.jenkins/Jenkinsfile.deploy.patch index 1857ad5..7252a8a 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.21/.jenkins/Jenkinsfile.deploy.patch @@ -1,5 +1,12 @@ --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy +@@ -1,5 +1,5 @@ + def JDK = "21" +-def majorMc = "1.21.2"; ++def majorMc = "1.21"; + + pipeline { + agent { @@ -26,25 +26,33 @@ } stage("Prepare") { diff --git a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch index c82758c..a6a23ba 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch @@ -1,10 +1,15 @@ --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot -@@ -4,7 +4,7 @@ - def majorMc = "1.21"; +@@ -1,10 +1,10 @@ + def projectName = "CraterLib"; + def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; + def JDK = "21"; +-def majorMc = "1.21.2"; ++def majorMc = "1.21"; def modLoaders = "neoforge|fabric|quilt"; - def supportedMc = "1.21|1.21.1"; +-def supportedMc = "1.21.2"; -def reltype = "port"; ++def supportedMc = "1.21|1.21.1"; +def reltype = "snapshot"; pipeline { diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch new file mode 100644 index 0000000..118af03 --- /dev/null +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -0,0 +1,29 @@ +--- 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 +@@ -217,7 +217,7 @@ + //RenderSystem.disableTexture(); + Tesselator tesselator = Tesselator.getInstance(); + BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); +- //RenderSystem.setShader(RenderSystem.getShader()); ++ RenderSystem.setShader(GameRenderer::getPositionColorShader); + + buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); + buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); +@@ -244,7 +244,7 @@ + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 0, 1); + //RenderSystem.disableTexture(); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + Matrix4f matrix = matrices.last().pose(); + buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); + buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0); +@@ -266,7 +266,7 @@ + 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.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); +- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha); diff --git a/patches/1.21/Fabric/build.gradle.patch b/patches/1.21/Fabric/build.gradle.patch new file mode 100644 index 0000000..c3541d1 --- /dev/null +++ b/patches/1.21/Fabric/build.gradle.patch @@ -0,0 +1,13 @@ +--- a/Fabric/build.gradle ++++ b/Fabric/build.gradle +@@ -113,8 +113,8 @@ + setVersionType("release") + setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") + setProjectVersion("${minecraft_version}-${project.version}") +- setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") ++ setDisplayName("[FABRIC/QUILT 1.21.x] CraterLib - ${project.version}") ++ setGameVersions("1.21", "1.21.1") + setLoaders("fabric", "quilt") + setArtifact(remapJar) + setCurseEnvironment("both") diff --git a/patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch new file mode 100644 index 0000000..f2b278e --- /dev/null +++ b/patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch @@ -0,0 +1,14 @@ +--- a/Fabric/src/main/resources/fabric.mod.json ++++ b/Fabric/src/main/resources/fabric.mod.json +@@ -31,9 +31,9 @@ + "${mod_id}.fabric.mixins.json" + ], + "depends": { +- "fabricloader": ">=0.16.2", ++ "fabricloader": ">=0.15.0", + "fabric-api": "*", +- "minecraft": ">=1.21.2", ++ "minecraft": ">=1.21", + "java": ">=21" + } + } diff --git a/patches/1.21/NeoForge/build.gradle.patch b/patches/1.21/NeoForge/build.gradle.patch new file mode 100644 index 0000000..f530d58 --- /dev/null +++ b/patches/1.21/NeoForge/build.gradle.patch @@ -0,0 +1,13 @@ +--- a/NeoForge/build.gradle ++++ b/NeoForge/build.gradle +@@ -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.21.2] CraterLib - ${project.version}") +- setGameVersions("1.21.2") ++ setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") ++ setGameVersions("1.21", "1.21.1") + setLoaders("neoforge") + setArtifact(remapJar) + setCurseEnvironment("both") diff --git a/patches/1.21/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch b/patches/1.21/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch index 3c5d8a1..cab69e0 100644 --- a/patches/1.21/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch +++ b/patches/1.21/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch @@ -4,7 +4,7 @@ [[dependencies.${ mod_id }]] modId = "neoforge" type="required" -- versionRange = "[21.0,)" +- versionRange = "[*,)" + versionRange = "[21.0.0-beta,)" ordering = "NONE" side = "BOTH" diff --git a/patches/1.21/gradle.properties.patch b/patches/1.21/gradle.properties.patch index 4222d1d..5ac9078 100644 --- a/patches/1.21/gradle.properties.patch +++ b/patches/1.21/gradle.properties.patch @@ -1,5 +1,21 @@ --- a/gradle.properties +++ b/gradle.properties +@@ -10,12 +10,12 @@ + mod_name=CraterLib + + # Shared +-minecraft_version=24w34a ++minecraft_version=1.21 + project_group=com.hypherionmc.craterlib + + # Fabric +-fabric_loader=0.16.2 +-fabric_api=0.102.3+1.21.2 ++fabric_loader=0.15.11 ++fabric_api=0.100.1+1.21 + + # Forge + forge_version=50.0.6 @@ -40,7 +40,7 @@ # Publishing curse_id=867099 diff --git a/patches/1.21/settings.gradle.patch b/patches/1.21/settings.gradle.patch new file mode 100644 index 0000000..a3ad260 --- /dev/null +++ b/patches/1.21/settings.gradle.patch @@ -0,0 +1,8 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -14,4 +14,4 @@ + } + + rootProject.name = 'CraterLib' +-include("Common", "Fabric", /*"NeoForge"*/) ++include("Common", "Fabric", "NeoForge") diff --git a/settings.gradle b/settings.gradle index 48380b4..e76050d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ pluginManagement { repositories { gradlePluginPortal() - mavenLocal() maven { url "https://mcentral.firstdark.dev/releases" }