diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot index 42a23e1..f7d330c 100644 --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot @@ -3,7 +3,7 @@ def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae59 def JDK = "21"; def majorMc = "1.21.5"; def modLoaders = "neoforge|fabric|quilt|paper"; -def supportedMc = "25w06a"; +def supportedMc = "25w10a"; def reltype = "experimental"; 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 8486a84..439f94e 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 @@ -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(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); //BufferUploader.drawWithShader(buffer.buildOrThrow()); - RenderSystem.disableBlend(); + //RenderSystem.disableBlend(); //RenderSystem.enableTexture(); } } @@ -242,7 +242,7 @@ public class CraterConfigScreen extends Screen { private void renderShadow(PoseStack matrices) { Tesselator tesselator = Tesselator.getInstance(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - RenderSystem.enableBlend(); + //RenderSystem.enableBlend(); //RenderSystem.blendFuncSeparate(770, 771, 0, 1); //RenderSystem.disableTexture(); //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); //BufferUploader.drawWithShader(buffer.buildOrThrow()); //RenderSystem.enableTexture(); - RenderSystem.disableBlend(); + //RenderSystem.disableBlend(); } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { @@ -268,7 +268,7 @@ public class CraterConfigScreen extends Screen { Tesselator tesselator = Tesselator.getInstance(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); //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); 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); diff --git a/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java b/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java index 17a2d04..f80dba6 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java @@ -15,19 +15,19 @@ public class BridgedCompoundTag { } public BridgedCompoundTag getCompound(String key) { - return BridgedCompoundTag.of(internal.getCompound(key)); + return BridgedCompoundTag.of(internal.getCompound(key).orElse(new CompoundTag())); } public Set getAllKeys() { - return internal.getAllKeys(); + return internal.keySet(); } public String getString(String key) { - return internal.getString(key); + return internal.getStringOr(key, ""); } public boolean getBoolean(String key) { - return internal.getBoolean(key); + return internal.getBooleanOr(key, false); } public void putString(String key, String value) { diff --git a/gradle.properties b/gradle.properties index 22414dd..5d57105 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,12 +10,12 @@ mod_id=craterlib mod_name=CraterLib # Shared -minecraft_version=25w07a +minecraft_version=25w10a project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.16.10 -fabric_api=0.116.0+1.21.5 +fabric_api=0.118.4+1.21.5 # Forge forge_version=50.0.6