From aea07af3d5b888bca9a0991720ad55f43517298b Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Wed, 21 Aug 2024 22:46:50 +0200 Subject: [PATCH] [PORT] Update to 24w34a --- .jenkins/Jenkinsfile.deploy | 2 +- .jenkins/Jenkinsfile.snapshot | 4 ++-- .../craterlib/client/gui/config/CraterConfigScreen.java | 6 +++--- Fabric/build.gradle | 4 ++-- NeoForge/build.gradle | 4 ++-- gradle.properties | 6 +++--- settings.gradle | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy index a70af74..56e71cc 100644 --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ def JDK = "21" -def majorMc = "1.21"; +def majorMc = "1.21.2"; pipeline { agent { diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot index d530d93..176dd0b 100644 --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot @@ -1,9 +1,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"; pipeline { diff --git 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 index 4072ea9..01a7f94 100644 --- 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 @@ public class CraterConfigScreen extends Screen { //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); - 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); @@ -244,7 +244,7 @@ public class CraterConfigScreen extends Screen { 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 @@ public class CraterConfigScreen extends Screen { 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/Fabric/build.gradle b/Fabric/build.gradle index 0fd9480..8de4fb1 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -113,8 +113,8 @@ publisher { 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") setLoaders("fabric", "quilt") setArtifact(remapJar) setCurseEnvironment("both") diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle index f6ef5c7..8203464 100644 --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle @@ -106,8 +106,8 @@ publisher { 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/gradle.properties b/gradle.properties index 7e92dff..037d6c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,12 +10,12 @@ mod_id=craterlib mod_name=CraterLib # Shared -minecraft_version=1.21 +minecraft_version=24w34a 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 # Forge forge_version=50.0.6 diff --git a/settings.gradle b/settings.gradle index 07a31e6..1fd0229 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,4 +14,4 @@ pluginManagement { } rootProject.name = 'CraterLib' -include("Common", "Fabric", "NeoForge") \ No newline at end of file +include("Common", "Fabric", /*"NeoForge"*/) \ No newline at end of file