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

[PORT] Update to 24w34a

Browse Source
This commit is contained in:
HypherionSA
2024-08-21 22:46:50 +02:00
parent 0dbf07de46
commit aea07af3d5
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/Jenkinsfile.deploy
View File

@@ -1,5 +1,5 @@
def JDK = "21" def JDK = "21"
def majorMc = "1.21"; def majorMc = "1.21.2";
pipeline { pipeline {
agent { agent {

4
.jenkins/Jenkinsfile.snapshot
View File

@@ -1,9 +1,9 @@
def projectName = "CraterLib"; def projectName = "CraterLib";
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
def JDK = "21"; def JDK = "21";
def majorMc = "1.21"; def majorMc = "1.21.2";
def modLoaders = "neoforge|fabric|quilt"; def modLoaders = "neoforge|fabric|quilt";
def supportedMc = "1.21|1.21.1"; def supportedMc = "1.21.2";
def reltype = "port"; def reltype = "port";
pipeline { pipeline {

6
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
View File

@@ -217,7 +217,7 @@ public class CraterConfigScreen extends Screen {
//RenderSystem.disableTexture(); //RenderSystem.disableTexture();
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); 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(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255);
buffer.addVertex(scrollbarPositionMaxX, 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.enableBlend();
RenderSystem.blendFuncSeparate(770, 771, 0, 1); RenderSystem.blendFuncSeparate(770, 771, 0, 1);
//RenderSystem.disableTexture(); //RenderSystem.disableTexture();
RenderSystem.setShader(GameRenderer::getPositionTexColorShader); //RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
Matrix4f matrix = matrices.last().pose(); Matrix4f matrix = matrices.last().pose();
buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0); 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 + 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) { 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(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); 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.setShaderTexture(0, Screen.MENU_BACKGROUND);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); 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, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);

4
Fabric/build.gradle
View File

@@ -113,8 +113,8 @@ publisher {
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[FABRIC/QUILT 1.21.x] CraterLib - ${project.version}") setDisplayName("[FABRIC/QUILT 1.21.2] CraterLib - ${project.version}")
setGameVersions("1.21", "1.21.1") setGameVersions("1.21.2")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")
setArtifact(remapJar) setArtifact(remapJar)
setCurseEnvironment("both") setCurseEnvironment("both")

4
NeoForge/build.gradle
View File

@@ -106,8 +106,8 @@ publisher {
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") setDisplayName("[NeoForge 1.21.2] CraterLib - ${project.version}")
setGameVersions("1.21", "1.21.1") setGameVersions("1.21.2")
setLoaders("neoforge") setLoaders("neoforge")
setArtifact(remapJar) setArtifact(remapJar)
setCurseEnvironment("both") setCurseEnvironment("both")

6
gradle.properties
View File

@@ -10,12 +10,12 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=1.21 minecraft_version=24w34a
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.11 fabric_loader=0.16.2
fabric_api=0.100.1+1.21 fabric_api=0.102.3+1.21.2
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6

2
settings.gradle
View File

@@ -14,4 +14,4 @@ pluginManagement {
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
include("Common", "Fabric", "NeoForge") include("Common", "Fabric", /*"NeoForge"*/)