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

[PORT] Update for 25w10a

Browse Source
This commit is contained in:
HypherionSA
2025-03-09 15:13:22 +02:00
parent a91ebdaa7b
commit 801f92a223
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/Jenkinsfile.snapshot
View File

@@ -3,7 +3,7 @@ def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae59
def JDK = "21"; def JDK = "21";
def majorMc = "1.21.5"; def majorMc = "1.21.5";
def modLoaders = "neoforge|fabric|quilt|paper"; def modLoaders = "neoforge|fabric|quilt|paper";
def supportedMc = "25w06a"; def supportedMc = "25w10a";
def reltype = "experimental"; def reltype = "experimental";
pipeline { pipeline {

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

@@ -234,7 +234,7 @@ public class CraterConfigScreen extends Screen {
buffer.addVertex((scrollbarPositionMaxX - 1), minY, 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); buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
//BufferUploader.drawWithShader(buffer.buildOrThrow()); //BufferUploader.drawWithShader(buffer.buildOrThrow());
RenderSystem.disableBlend(); //RenderSystem.disableBlend();
//RenderSystem.enableTexture(); //RenderSystem.enableTexture();
} }
} }
@@ -242,7 +242,7 @@ public class CraterConfigScreen extends Screen {
private void renderShadow(PoseStack matrices) { private void renderShadow(PoseStack matrices) {
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.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);
@@ -257,7 +257,7 @@ public class CraterConfigScreen extends Screen {
buffer.addVertex(matrix, 0, height - BOTTOM - 4, 0.0F).setUv(0, 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()); //BufferUploader.drawWithShader(buffer.buildOrThrow());
//RenderSystem.enableTexture(); //RenderSystem.enableTexture();
RenderSystem.disableBlend(); //RenderSystem.disableBlend();
} }
protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) {
@@ -268,7 +268,7 @@ public class CraterConfigScreen extends Screen {
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);
buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 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);

8
Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java
View File

@@ -15,19 +15,19 @@ public class BridgedCompoundTag {
} }
public BridgedCompoundTag getCompound(String key) { public BridgedCompoundTag getCompound(String key) {
return BridgedCompoundTag.of(internal.getCompound(key)); return BridgedCompoundTag.of(internal.getCompound(key).orElse(new CompoundTag()));
} }
public Set<String> getAllKeys() { public Set<String> getAllKeys() {
return internal.getAllKeys(); return internal.keySet();
} }
public String getString(String key) { public String getString(String key) {
return internal.getString(key); return internal.getStringOr(key, "");
} }
public boolean getBoolean(String key) { public boolean getBoolean(String key) {
return internal.getBoolean(key); return internal.getBooleanOr(key, false);
} }
public void putString(String key, String value) { public void putString(String key, String value) {

4
gradle.properties
View File

@@ -10,12 +10,12 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=25w07a minecraft_version=25w10a
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.16.10 fabric_loader=0.16.10
fabric_api=0.116.0+1.21.5 fabric_api=0.118.4+1.21.5
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6