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

[PORT] Rebuild porting patches

Browse Source
This commit is contained in:
HypherionSA
2024-08-21 22:59:33 +02:00
parent 614fb0bc49
commit 0c321d9194
66 changed files with 265 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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 {

2
commit.sha
View File

@@ -1 +1 @@
0dbf07de46f6156b78fe826379cde3739981546f
fcc1c816e78367336b276a7665db255d84a70e0b

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

@@ -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"

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

@@ -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";

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

@@ -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);

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

@@ -4,8 +4,8 @@
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.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")

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

@@ -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"

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

@@ -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")

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

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

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

@@ -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

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

@@ -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")

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

@@ -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"

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

@@ -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";

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

@@ -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);

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

@@ -4,8 +4,8 @@
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.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")

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

@@ -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"

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

@@ -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")

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

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

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

@@ -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

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

@@ -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")

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

@@ -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"

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

@@ -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";

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

@@ -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);

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

@@ -4,8 +4,8 @@
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.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")

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

@@ -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"

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

@@ -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")

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

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

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

@@ -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

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

@@ -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")

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

@@ -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"

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

@@ -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";

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

@@ -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);

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

@@ -4,8 +4,8 @@
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.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")

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

@@ -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"

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

@@ -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")

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

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

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

@@ -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

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

@@ -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")

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

@@ -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"

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

@@ -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";

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

@@ -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);

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

@@ -4,8 +4,8 @@
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.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")

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

@@ -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"

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

@@ -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")

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

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

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

@@ -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

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

@@ -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")

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

@@ -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"

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

@@ -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";

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

@@ -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);

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

@@ -4,8 +4,8 @@
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[FABRIC/QUILT 1.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")

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

@@ -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"

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

@@ -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")

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

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

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

@@ -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

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

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

7
patches/1.21/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -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") {

11
patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -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 {

29
patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch Normal file
View File

@@ -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);

13
patches/1.21/Fabric/build.gradle.patch Normal file
View File

@@ -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")

14
patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch Normal file
View File

@@ -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"
}
}

13
patches/1.21/NeoForge/build.gradle.patch Normal file
View File

@@ -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")

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

@@ -4,7 +4,7 @@
[[dependencies.${ mod_id }]]
modId = "neoforge"
type="required"
- versionRange = "[21.0,)"
- versionRange = "[*,)"
+ versionRange = "[21.0.0-beta,)"
ordering = "NONE"
side = "BOTH"

16
patches/1.21/gradle.properties.patch
View File

@@ -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

8
patches/1.21/settings.gradle.patch Normal file
View File

@@ -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")

1
settings.gradle
View File

@@ -1,7 +1,6 @@
pluginManagement {
repositories {
gradlePluginPortal()
mavenLocal()
maven {
url "https://mcentral.firstdark.dev/releases"
}