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

[DEV] Fix some jenkins configs (#10)

Browse Source 
* [no-orbit] [DEV] Fix some jenkins configs

* [DEV] Fix Patches and use correct MCFormatter versions for older MC versions

* [CHORE] Update readme and remove GitHub action

---------

Co-authored-by: fdd-orbit <orbit@firstdark.dev>
Co-authored-by: hypherionmc <hypherionmc@gmail.com>
This commit is contained in:
orbit-brancher[bot]
2024-06-09 19:55:05 +02:00
committed by GitHub
parent 2ba24a0feb
commit 68fea1db1e
81 changed files with 1058 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,9 +7,9 @@
- image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest"
alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
}
}
@@ -10,7 +10,7 @@
@@ -15,7 +15,7 @@
stage("Notify Discord") {
steps {
discordSend webhookURL: env.FDD_WH_ADMIN,
@@ -18,7 +18,7 @@
link: env.BUILD_URL,
result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -39,7 +39,7 @@
@@ -44,7 +44,7 @@
deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN,

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

@@ -11,9 +11,9 @@
- image "registry.firstdark.dev/java21:latest"
+ image "registry.firstdark.dev/java17:latest"
alwaysPull true
args '-v gradle-cache:/home/gradle/.gradle'
}
}
@@ -13,7 +14,7 @@
@@ -18,7 +19,7 @@
stage("Notify Discord") {
steps {
discordSend webhookURL: env.SSS_WEBHOOK,
@@ -22,7 +22,7 @@
link: env.BUILD_URL,
result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -29,14 +30,14 @@
@@ -34,14 +35,14 @@
stage("Build") {
steps {
@@ -39,12 +39,12 @@
}
}
}
@@ -51,8 +52,8 @@
@@ -56,8 +57,8 @@
projectSlug: "craterlib",
projectName: "${projectName}",
projectIcon: "${projectIcon}",
- modLoaders: "forge|neoforge|fabric|quilt",
- minecraftVersions: "1.20.6",
- modLoaders: "neoforge|fabric|quilt",
- minecraftVersions: "1.21",
+ modLoaders: "forge|fabric|quilt",
+ minecraftVersions: "1.20|1.20.1",
failWebhook: env.SSS_WEBHOOK,

5
patches/1.20/Common/gradle.properties.patch Normal file
View File

@@ -0,0 +1,5 @@
--- a/Common/gradle.properties
+++ /dev/null
@@ -1,2 +1,0 @@
-# We don't need the common jar to be remapped
-fabric.loom.dontRemap=true

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

@@ -1,5 +1,14 @@
--- 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
@@ -158,7 +158,7 @@
return new TextConfigOption<>(Objects::toString, BigDecimal::new);
}
if (value instanceof ResourceLocation) {
- return new TextConfigOption<>(Objects::toString, ResourceLocation::parse);
+ return new TextConfigOption<>(Objects::toString, ResourceLocation::new);
}
if (isSubConfig) {
return new SubConfigWidget<>(config, this, value);
@@ -179,6 +179,7 @@
@Override
public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
@@ -19,19 +28,106 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) {
@@ -268,9 +268,9 @@
@@ -216,23 +216,24 @@
int maxY = this.height - BOTTOM;
//RenderSystem.disableTexture();
Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+ BufferBuilder buffer = tesselator.getBuilder();
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);
- buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255);
- buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255);
-
- buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
- buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
- buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
- buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
- buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
- buffer.addVertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
- 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());
+ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+
+ buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex();
+ buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex();
+ buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex();
+ buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex();
+
+ buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
+ buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
+ buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
+ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
+ buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
+ buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
+ buffer.vertex((scrollbarPositionMaxX - 1), minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
+ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
+ tesselator.end();
RenderSystem.disableBlend();
//RenderSystem.enableTexture();
}
@@ -240,21 +241,22 @@
private void renderShadow(PoseStack matrices) {
Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+ BufferBuilder buffer = tesselator.getBuilder();
RenderSystem.enableBlend();
RenderSystem.blendFuncSeparate(770, 771, 0, 1);
//RenderSystem.disableTexture();
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);
- buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185);
- buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185);
- buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185);
- buffer.addVertex(matrix, width, height - BOTTOM, 0.0F).setUv(1, 1).setColor(0, 0, 0, 185);
- buffer.addVertex(matrix, width, height - BOTTOM - 4, 0.0F).setUv(1, 0).setColor(0, 0, 0, 0);
- buffer.addVertex(matrix, 0, height - BOTTOM - 4, 0.0F).setUv(0, 0).setColor(0, 0, 0, 0);
- BufferUploader.drawWithShader(buffer.buildOrThrow());
+ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+ buffer.vertex(matrix, 0, TOP + 4, 0.0F).uv(0, 1).color(0, 0, 0, 0).endVertex();
+ buffer.vertex(matrix, width, TOP + 4, 0.0F).uv(1, 1).color(0, 0, 0, 0).endVertex();
+ buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex();
+ buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex();
+ buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex();
+ buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex();
+ buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex();
+ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex();
+ tesselator.end();
//RenderSystem.enableTexture();
RenderSystem.disableBlend();
}
@@ -265,15 +267,16 @@
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder();
- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ BufferBuilder buffer = tesselator.getBuilder();
+ 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);
- buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
- buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
- buffer.addVertex(matrix, minX, minY, 0.0F).setUv(minX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
- BufferUploader.drawWithShader(buffer.buildOrThrow());
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
@@ -334,12 +334,12 @@
+ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+ buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
+ buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
+ buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex();
+ buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex();
+ tesselator.end();
}
public int scrollHeight() {
@@ -331,12 +334,12 @@
}
@Override

16
patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch Normal file
View File

@@ -0,0 +1,16 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java
@@ -7,11 +7,11 @@
private final ResourceLocation internal;
public ResourceIdentifier(String namespace, String path) {
- this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path);
+ this.internal = new ResourceLocation(namespace, path);
}
public ResourceIdentifier(String path) {
- this.internal = ResourceLocation.withDefaultNamespace(path);
+ this.internal = new ResourceLocation(path);
}
public String getNamespace() {

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.20.6] CraterLib - ${project.version}")
- setGameVersions("1.20.6")
- setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.21")
+ setDisplayName("[FABRIC/QUILT 1.20/1.20.1] CraterLib - ${project.version}")
+ setGameVersions("1.20", "1.20.1")
setLoaders("fabric", "quilt")

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

@@ -4,7 +4,7 @@
"depends": {
"fabricloader": ">=0.15.0",
"fabric-api": "*",
- "minecraft": ">=1.20.6",
- "minecraft": ">=1.21",
- "java": ">=21"
+ "minecraft": ">=1.20",
+ "java": ">=17"

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

@@ -34,7 +34,7 @@
-
-unimined.minecraft {
- neoForged {
- loader neoforge_version
- loader "net.neoforged:neoforge:${neoforge_version}:universal"
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- }
-}
@@ -106,8 +106,8 @@
- setVersionType("release")
- setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
- setProjectVersion("${minecraft_version}-${project.version}")
- setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}")
- setGameVersions("1.20.6")
- setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
- setGameVersions("1.21")
- setLoaders("neoforge")
- setArtifact(remapJar)
- setCurseEnvironment("both")

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

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

11
patches/1.20/README.md.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
| < 1.18.2 | ❌ |
| 1.18.2-1.20.2 | ✳️ |
| 1.20.4 | ✳️ |
-| 1.20.6 | 🚧 |
+| 1.21 | 🚧 |
- ❌ - Not Supported; no bug fixes or new features.
- 🚧 - Work in Progress; not ready for release.

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

@@ -4,25 +4,25 @@
mod_name=CraterLib
# Shared
-minecraft_version=1.20.6
-minecraft_version=1.21-pre4
+minecraft_version=1.20
project_group=com.hypherionmc.craterlib
# Fabric
fabric_loader=0.15.0
-fabric_api=0.97.8+1.20.6
fabric_loader=0.15.11
-fabric_api=0.100.0+1.21
+fabric_api=0.83.0+1.20
# Forge
-forge_version=50.0.6
-
-# NeoForged
-neoforge_version=41-beta
-neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301
+forge_version=46.0.14
# Dependencies
moon_config=1.0.9
@@ -30,11 +27,10 @@
@@ -30,16 +27,15 @@
discord_formatter=2.0.0
# Mod Dependencies
@@ -38,3 +38,9 @@
# Publishing
curse_id=867099
modrinth_id=Nn8Wasaq
-release_type=port
+release_type=release
# Gradle
org.gradle.jvmargs=-Xmx3G

7
patches/1.20/orbit.json.patch Normal file
View File

@@ -0,0 +1,7 @@
--- a/orbit.json
+++ /dev/null
@@ -1,4 +1,0 @@
-{
- "action": "port",
- "devBranch": "porting"
-}

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

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