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

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