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