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

2
patches/1.20/.jenkins/Jenkinsfile.deploy.patch
View File

@@ -2,7 +2,7 @@
+++ b/.jenkins/Jenkinsfile.deploy
@@ -1,5 +1,5 @@
-def JDK = "21"
-def majorMc = "1.21.2";
-def majorMc = "1.21.5";
+def majorMc = "1.20";
+def JDK = "17"

8
patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -4,10 +4,10 @@
def projectName = "CraterLib";
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
-def JDK = "21";
-def majorMc = "1.21.2";
-def majorMc = "1.21.5";
-def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "1.21.3|1.21.4";
-def reltype = "port";
-def supportedMc = "25w10a";
-def reltype = "experimental";
+def JDK = "17";
+def majorMc = "1.20";
+def modLoaders = "forge|fabric|quilt|paper";
@@ -53,7 +53,7 @@
- projectIcon: "${projectIcon}",
- modLoaders: "${modLoaders}",
- minecraftVersions: "${supportedMc}",
- type: "snapshot",
- type: "experimental",
- dependsOn: "",
- failWebhook: env.SSS_WEBHOOK,
- publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"

10
patches/1.20/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"));
}
}

26
patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -28,7 +28,7 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) {
@@ -217,23 +217,24 @@
@@ -217,47 +217,49 @@
int maxY = this.height - BOTTOM;
//RenderSystem.disableTexture();
Tesselator tesselator = Tesselator.getInstance();
@@ -48,7 +48,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());
- //BufferUploader.drawWithShader(buffer.buildOrThrow());
- //RenderSystem.disableBlend();
+ BufferBuilder buffer = tesselator.getBuilder();
+ RenderSystem.setShader(GameRenderer::getPositionColorShader);
+ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
@@ -67,17 +68,19 @@
+ buffer.vertex((scrollbarPositionMaxX - 1), minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
+ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
+ tesselator.end();
RenderSystem.disableBlend();
+ RenderSystem.disableBlend();
//RenderSystem.enableTexture();
}
@@ -241,21 +242,22 @@
}
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);
+ BufferBuilder buffer = tesselator.getBuilder();
RenderSystem.enableBlend();
RenderSystem.blendFuncSeparate(770, 771, 0, 1);
+ RenderSystem.enableBlend();
+ RenderSystem.blendFuncSeparate(770, 771, 0, 1);
//RenderSystem.disableTexture();
- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
@@ -90,7 +93,7 @@
- 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());
+ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+ buffer.vertex(matrix, 0, TOP + 4, 0.0F).uv(0, 1).color(0, 0, 0, 0).endVertex();
+ buffer.vertex(matrix, width, TOP + 4, 0.0F).uv(1, 1).color(0, 0, 0, 0).endVertex();
@@ -102,15 +105,18 @@
+ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex();
+ tesselator.end();
//RenderSystem.enableTexture();
RenderSystem.disableBlend();
- //RenderSystem.disableBlend();
+ RenderSystem.disableBlend();
}
protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) {
@@ -266,15 +268,16 @@
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.setShaderTexture(0, Screen.MENU_BACKGROUND);
- //RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ BufferBuilder buffer = tesselator.getBuilder();
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
@@ -118,7 +124,7 @@
- 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());
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+ buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();

26
patches/1.20/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) {

2
patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
View File

@@ -13,7 +13,7 @@
public ServerPlayer player;
@Inject(
- method = "lambda$handleChat$5",
- method = "lambda$handleChat$6",
+ method = "lambda$handleChat$8",
at = @At("HEAD"),
cancellable = true

2
patches/1.20/build.gradle.patch
View File

@@ -7,7 +7,7 @@
-var relType = project.properties["releaseType"] ?: "${release_type}"
-
-ext {
- isPort = (relType == 'port')
- isPort = (relType == 'experimental')
-}
-
orion.setup {

8
patches/1.20/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib
# Shared
-minecraft_version=1.21.3
-minecraft_version=25w10a
+minecraft_version=1.20
project_group=com.hypherionmc.craterlib
# Fabric
-fabric_loader=0.16.7
-fabric_api=0.107.3+1.21.3
-fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5
+fabric_loader=0.15.11
+fabric_api=0.83.0+1.20
@@ -52,7 +52,7 @@
# Publishing
curse_id=867099
modrinth_id=Nn8Wasaq
-release_type=port
-release_type=experimental
+release_type=release
# Gradle

7
patches/1.20/settings.gradle.patch
View File

@@ -5,8 +5,9 @@
}
-rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge")
-include("Common", "Fabric"/*, "NeoForge"*/)
-//include 'Paper'
-
+rootProject.name = 'CraterLib-1.20'
+include("Common", "Fabric", "Forge")
include 'Paper'
-
+include 'Paper'