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

[DEV] Rebuild porting patches

Browse Source
This commit is contained in:
HypherionSA
2025-03-09 15:14:41 +02:00
parent c328a07345
commit 770f214dcf
71 changed files with 632 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch Normal file
View File

@@ -0,0 +1,10 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
@@ -53,6 +53,6 @@
}
public Component getMessage() {
- return ChatUtils.mojangToAdventure(ComponentArgument.getRawComponent(parseResults.getContext().build(parseResults.getReader().getString()), "message"));
+ return ChatUtils.mojangToAdventure(ComponentArgument.getComponent(parseResults.getContext().build(parseResults.getReader().getString()), "message"));
}
}

52
patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch Normal file
View File

@@ -0,0 +1,52 @@
--- 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
@@ -233,8 +233,8 @@
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());
- //RenderSystem.disableBlend();
+ BufferUploader.drawWithShader(buffer.buildOrThrow());
+ RenderSystem.disableBlend();
//RenderSystem.enableTexture();
}
}
@@ -242,8 +242,8 @@
private void renderShadow(PoseStack matrices) {
Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- //RenderSystem.enableBlend();
- //RenderSystem.blendFuncSeparate(770, 771, 0, 1);
+ RenderSystem.enableBlend();
+ RenderSystem.blendFuncSeparate(770, 771, 0, 1);
//RenderSystem.disableTexture();
//RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
Matrix4f matrix = matrices.last().pose();
@@ -255,9 +255,9 @@
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());
+ BufferUploader.drawWithShader(buffer.buildOrThrow());
//RenderSystem.enableTexture();
- //RenderSystem.disableBlend();
+ RenderSystem.disableBlend();
}
protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) {
@@ -268,13 +268,13 @@
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);
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());
+ BufferUploader.drawWithShader(buffer.buildOrThrow());
}
public int scrollHeight() {

26
patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch Normal file
View File

@@ -0,0 +1,26 @@
--- 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 BridgedCompoundTag getCompound(String key) {
- return BridgedCompoundTag.of(internal.getCompound(key).orElse(new CompoundTag()));
+ return BridgedCompoundTag.of(internal.getCompound(key));
}
public Set<String> getAllKeys() {
- return internal.keySet();
+ return internal.getAllKeys();
}
public String getString(String key) {
- return internal.getStringOr(key, "");
+ return internal.getString(key);
}
public boolean getBoolean(String key) {
- return internal.getBooleanOr(key, false);
+ return internal.getBoolean(key);
}
public void putString(String key, String value) {