From 770f214dcf0d56c1767eeb4efa68487b94f164e0 Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Sun, 9 Mar 2025 15:14:41 +0200 Subject: [PATCH] [DEV] Rebuild porting patches --- commit.sha | 2 +- .../1.18.2/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 8 +-- .../server/CraterCommandEvent.java.patch | 8 +++ .../gui/config/CraterConfigScreen.java.patch | 26 ++++++---- .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ ...rverGamePacketListenerImplMixin.java.patch | 2 +- patches/1.18.2/build.gradle.patch | 2 +- patches/1.18.2/gradle.properties.patch | 8 +-- patches/1.18.2/settings.gradle.patch | 4 +- .../1.19.2/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 8 +-- .../server/CraterCommandEvent.java.patch | 10 ++++ .../gui/config/CraterConfigScreen.java.patch | 26 ++++++---- .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ ...rverGamePacketListenerImplMixin.java.patch | 2 +- patches/1.19.2/build.gradle.patch | 2 +- patches/1.19.2/gradle.properties.patch | 8 +-- patches/1.19.2/settings.gradle.patch | 4 +- .../1.19.3/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 8 +-- .../server/CraterCommandEvent.java.patch | 10 ++++ .../gui/config/CraterConfigScreen.java.patch | 26 ++++++---- .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ ...rverGamePacketListenerImplMixin.java.patch | 2 +- patches/1.19.3/build.gradle.patch | 2 +- patches/1.19.3/gradle.properties.patch | 8 +-- patches/1.19.3/settings.gradle.patch | 7 +-- .../1.20.2/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 8 +-- .../server/CraterCommandEvent.java.patch | 10 ++++ .../gui/config/CraterConfigScreen.java.patch | 26 ++++++---- .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ patches/1.20.2/build.gradle.patch | 2 +- patches/1.20.2/gradle.properties.patch | 8 +-- patches/1.20.2/settings.gradle.patch | 7 +-- .../1.20.4/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../.jenkins/Jenkinsfile.snapshot.patch | 8 +-- .../server/CraterCommandEvent.java.patch | 10 ++++ .../gui/config/CraterConfigScreen.java.patch | 26 ++++++---- .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ patches/1.20.4/build.gradle.patch | 2 +- patches/1.20.4/gradle.properties.patch | 8 +-- patches/1.20.4/settings.gradle.patch | 7 +-- .../1.20/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../1.20/.jenkins/Jenkinsfile.snapshot.patch | 8 +-- .../server/CraterCommandEvent.java.patch | 10 ++++ .../gui/config/CraterConfigScreen.java.patch | 26 ++++++---- .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ ...rverGamePacketListenerImplMixin.java.patch | 2 +- patches/1.20/build.gradle.patch | 2 +- patches/1.20/gradle.properties.patch | 8 +-- patches/1.20/settings.gradle.patch | 7 +-- .../1.21.2/.jenkins/Jenkinsfile.deploy.patch | 7 +++ .../.jenkins/Jenkinsfile.snapshot.patch | 15 ++++-- .../server/CraterCommandEvent.java.patch | 10 ++++ .../gui/config/CraterConfigScreen.java.patch | 52 +++++++++++++++++++ .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ ...rverGamePacketListenerImplMixin.java.patch | 4 +- patches/1.21.2/build.gradle.patch | 2 +- patches/1.21.2/gradle.properties.patch | 18 ++++++- patches/1.21.2/settings.gradle.patch | 11 ++++ .../1.21/.jenkins/Jenkinsfile.deploy.patch | 2 +- .../1.21/.jenkins/Jenkinsfile.snapshot.patch | 8 +-- .../server/CraterCommandEvent.java.patch | 10 ++++ .../gui/config/CraterConfigScreen.java.patch | 47 +++++++++++++++-- .../nojang/nbt/BridgedCompoundTag.java.patch | 26 ++++++++++ ...rverGamePacketListenerImplMixin.java.patch | 4 +- patches/1.21/build.gradle.patch | 2 +- patches/1.21/gradle.properties.patch | 8 +-- patches/1.21/settings.gradle.patch | 11 ++++ 71 files changed, 632 insertions(+), 167 deletions(-) create mode 100644 patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch create mode 100644 patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch create mode 100644 patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch create mode 100644 patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch create mode 100644 patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch create mode 100644 patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch create mode 100644 patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch create mode 100644 patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch create mode 100644 patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch create mode 100644 patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch create mode 100644 patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch create mode 100644 patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch create mode 100644 patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch create mode 100644 patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch rename patches/{1.20.2 => 1.21.2}/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch (78%) create mode 100644 patches/1.21.2/settings.gradle.patch create mode 100644 patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch create mode 100644 patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch rename patches/{1.20.4 => 1.21}/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch (78%) create mode 100644 patches/1.21/settings.gradle.patch diff --git a/commit.sha b/commit.sha index a78cc61..2d5c211 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -3986f085401b233e650720350a165b476d839041 \ No newline at end of file +801f92a223d43ec0f709a9c3f6ccfc3d9756c13e \ No newline at end of file diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch index fc7f04d..9dbbb42 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch @@ -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.18.2"; +def JDK = "17" diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch index 73a8945..b3a646b 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch @@ -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.18.2"; +def modLoaders = "forge|fabric|quilt"; @@ -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}" diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch index 5df64e4..7ed1c00 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -9,3 +9,11 @@ if (p != null) return BridgedPlayer.of(p); +@@ -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")); + } + } diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index 173da1d..6ff068f 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -101,7 +101,7 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -217,23 +218,24 @@ +@@ -217,47 +218,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -121,7 +121,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); @@ -140,17 +141,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 +243,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); @@ -163,7 +166,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(); @@ -175,15 +178,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 +269,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); @@ -191,7 +197,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(); diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch index 01c6e16..214fc49 100644 --- a/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch +++ b/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch @@ -17,7 +17,7 @@ public ServerPlayer player; @Inject( -- method = "lambda$handleChat$5", +- method = "lambda$handleChat$6", - at = @At("HEAD"), + method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/TextFilter$FilteredText;getFiltered()Ljava/lang/String;"), diff --git a/patches/1.18.2/build.gradle.patch b/patches/1.18.2/build.gradle.patch index b3b53cb..2c2af8d 100644 --- a/patches/1.18.2/build.gradle.patch +++ b/patches/1.18.2/build.gradle.patch @@ -7,7 +7,7 @@ -var relType = project.properties["releaseType"] ?: "${release_type}" - -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index c352866..4679e0a 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.3 +-minecraft_version=25w10a +minecraft_version=1.18.2 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.76.0+1.18.2 @@ -52,7 +52,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq --release_type=port +-release_type=experimental +release_type=release # Gradle diff --git a/patches/1.18.2/settings.gradle.patch b/patches/1.18.2/settings.gradle.patch index e3a189b..f4eada2 100644 --- a/patches/1.18.2/settings.gradle.patch +++ b/patches/1.18.2/settings.gradle.patch @@ -5,8 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") --include 'Paper' +-include("Common", "Fabric"/*, "NeoForge"*/) +-//include 'Paper' - +rootProject.name = 'CraterLib-1.18.2' +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch index 498cfeb..6574171 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch @@ -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.19.2"; +def JDK = "17" diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch index f3ef26e..0d47909 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch @@ -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.19.2"; +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}" diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch new file mode 100644 index 0000000..e1d206d --- /dev/null +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -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")); + } + } diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index a1d82df..2b4ceba 100644 --- a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -59,7 +59,7 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -217,23 +216,24 @@ +@@ -217,47 +216,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -79,7 +79,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); @@ -98,17 +99,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 +241,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); @@ -121,7 +124,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(); @@ -133,15 +136,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 +267,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); @@ -149,7 +155,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(); diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch index f078d8c..acf806e 100644 --- a/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch +++ b/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch @@ -24,7 +24,7 @@ public ServerPlayer player; @Inject( -- method = "lambda$handleChat$5", +- method = "lambda$handleChat$6", + method = "lambda$handleChat$9", at = @At("HEAD"), cancellable = true diff --git a/patches/1.19.2/build.gradle.patch b/patches/1.19.2/build.gradle.patch index 6dd59ab..b4c8491 100644 --- a/patches/1.19.2/build.gradle.patch +++ b/patches/1.19.2/build.gradle.patch @@ -7,7 +7,7 @@ -var relType = project.properties["releaseType"] ?: "${release_type}" - -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index abcced5..930159a 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.3 +-minecraft_version=25w10a +minecraft_version=1.19.2 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.76.0+1.19.2 @@ -52,7 +52,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq --release_type=port +-release_type=experimental +release_type=release # Gradle diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch index 8e6b747..f42bf4e 100644 --- a/patches/1.19.2/settings.gradle.patch +++ b/patches/1.19.2/settings.gradle.patch @@ -5,8 +5,8 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") --include 'Paper' +-include("Common", "Fabric"/*, "NeoForge"*/) +-//include 'Paper' - +rootProject.name = 'CraterLib-1.19.2' +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch index 32164b2..3d6bbb3 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch @@ -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.19.3"; +def JDK = "17" diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch index 9d71957..1c8a0ab 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch @@ -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.19.3"; +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}" diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch new file mode 100644 index 0000000..e1d206d --- /dev/null +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -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")); + } + } diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index 6a88d1a..ab48c4d 100644 --- a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -47,7 +47,7 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -217,23 +216,24 @@ +@@ -217,47 +216,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -67,7 +67,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); @@ -86,17 +87,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 +241,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); @@ -109,7 +112,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(); @@ -121,15 +124,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 +267,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); @@ -137,7 +143,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(); diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch index b3e764e..f7d64e5 100644 --- a/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch +++ b/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch @@ -15,7 +15,7 @@ public ServerPlayer player; @Inject( -- method = "lambda$handleChat$5", +- method = "lambda$handleChat$6", + method = "lambda$handleChat$9", at = @At("HEAD"), cancellable = true diff --git a/patches/1.19.3/build.gradle.patch b/patches/1.19.3/build.gradle.patch index 6dd59ab..b4c8491 100644 --- a/patches/1.19.3/build.gradle.patch +++ b/patches/1.19.3/build.gradle.patch @@ -7,7 +7,7 @@ -var relType = project.properties["releaseType"] ?: "${release_type}" - -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index b7464e9..eb56e26 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.3 +-minecraft_version=25w10a +minecraft_version=1.19.4 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.87.2+1.19.4 @@ -52,7 +52,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq --release_type=port +-release_type=experimental +release_type=release # Gradle diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch index 3e9a96f..f808b27 100644 --- a/patches/1.19.3/settings.gradle.patch +++ b/patches/1.19.3/settings.gradle.patch @@ -5,8 +5,9 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) +-//include 'Paper' +- +rootProject.name = 'CraterLib-1.19.3' +include("Common", "Fabric", "Forge") - include 'Paper' -- ++include 'Paper' diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch index 64eb6f1..56f9325 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch @@ -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.2"; +def JDK = "17" diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch index 5e8cb81..eaedf4c 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch @@ -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.2"; +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}" diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch new file mode 100644 index 0000000..e1d206d --- /dev/null +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -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")); + } + } diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index 00fa070..85d4747 100644 --- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -9,7 +9,7 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -217,23 +217,24 @@ +@@ -217,47 +217,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -29,7 +29,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); @@ -48,17 +49,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); @@ -71,7 +74,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(); @@ -83,15 +86,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.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); @@ -100,7 +106,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()); + 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(); + buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.20.2/build.gradle.patch b/patches/1.20.2/build.gradle.patch index 6dd59ab..b4c8491 100644 --- a/patches/1.20.2/build.gradle.patch +++ b/patches/1.20.2/build.gradle.patch @@ -7,7 +7,7 @@ -var relType = project.properties["releaseType"] ?: "${release_type}" - -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index 9b80aee..01b38a6 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.3 +-minecraft_version=25w10a +minecraft_version=1.20.2 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.91.6+1.20.2 @@ -52,7 +52,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq --release_type=port +-release_type=experimental +release_type=release # Gradle diff --git a/patches/1.20.2/settings.gradle.patch b/patches/1.20.2/settings.gradle.patch index a20d780..b8f8192 100644 --- a/patches/1.20.2/settings.gradle.patch +++ b/patches/1.20.2/settings.gradle.patch @@ -5,8 +5,9 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) +-//include 'Paper' +- +rootProject.name = 'CraterLib-1.20.2' +include("Common", "Fabric", "Forge") - include 'Paper' -- ++include 'Paper' diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch index a369b00..bc84f8b 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch @@ -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.4"; +def JDK = "17" diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch index db6901b..8a25f8c 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch @@ -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.4"; +def modLoaders = "neoforge|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}" diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch new file mode 100644 index 0000000..e1d206d --- /dev/null +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -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")); + } + } diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index 00fa070..85d4747 100644 --- a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -9,7 +9,7 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -217,23 +217,24 @@ +@@ -217,47 +217,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -29,7 +29,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); @@ -48,17 +49,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); @@ -71,7 +74,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(); @@ -83,15 +86,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.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); @@ -100,7 +106,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()); + 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(); + buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.20.4/build.gradle.patch b/patches/1.20.4/build.gradle.patch index e17aa38..d448962 100644 --- a/patches/1.20.4/build.gradle.patch +++ b/patches/1.20.4/build.gradle.patch @@ -7,7 +7,7 @@ -var relType = project.properties["releaseType"] ?: "${release_type}" - -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index a2ef59f..d28ae00 100644 --- a/patches/1.20.4/gradle.properties.patch +++ b/patches/1.20.4/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.3 +-minecraft_version=25w10a +minecraft_version=1.20.4 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.97.0+1.20.4 @@ -52,7 +52,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq --release_type=port +-release_type=experimental +release_type=release # Gradle diff --git a/patches/1.20.4/settings.gradle.patch b/patches/1.20.4/settings.gradle.patch index f0c94af..d4a07c4 100644 --- a/patches/1.20.4/settings.gradle.patch +++ b/patches/1.20.4/settings.gradle.patch @@ -5,8 +5,9 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) +-//include 'Paper' +- +rootProject.name = 'CraterLib-1.20.4' +include("Common", "Fabric", "Forge", "NeoForge") - include 'Paper' -- ++include 'Paper' diff --git a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch index 111205d..d6f899a 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch @@ -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" diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch index bb85fcb..01d12cd 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch @@ -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}" diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch new file mode 100644 index 0000000..e1d206d --- /dev/null +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -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")); + } + } diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index e21d705..cf6f1a9 100644 --- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -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(); diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch index f9bf802..a017661 100644 --- a/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch +++ b/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch @@ -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 diff --git a/patches/1.20/build.gradle.patch b/patches/1.20/build.gradle.patch index 7f73098..564eeb6 100644 --- a/patches/1.20/build.gradle.patch +++ b/patches/1.20/build.gradle.patch @@ -7,7 +7,7 @@ -var relType = project.properties["releaseType"] ?: "${release_type}" - -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index 7ff761e..a538243 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -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 diff --git a/patches/1.20/settings.gradle.patch b/patches/1.20/settings.gradle.patch index 77df3fd..2fabd8f 100644 --- a/patches/1.20/settings.gradle.patch +++ b/patches/1.20/settings.gradle.patch @@ -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' diff --git a/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch index 1857ad5..01f0a9d 100644 --- a/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch @@ -1,5 +1,12 @@ --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy +@@ -1,5 +1,5 @@ + def JDK = "21" +-def majorMc = "1.21.5"; ++def majorMc = "1.21.2"; + + pipeline { + agent { @@ -26,25 +26,33 @@ } stage("Prepare") { diff --git a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch index 1e37335..1930f63 100644 --- a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch @@ -1,10 +1,15 @@ --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot -@@ -4,7 +4,7 @@ - def majorMc = "1.21.2"; +@@ -1,10 +1,10 @@ + def projectName = "CraterLib"; + def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; + def JDK = "21"; +-def majorMc = "1.21.5"; ++def majorMc = "1.21.2"; def modLoaders = "neoforge|fabric|quilt|paper"; - def supportedMc = "1.21.3|1.21.4"; --def reltype = "port"; +-def supportedMc = "25w10a"; +-def reltype = "experimental"; ++def supportedMc = "1.21.3|1.21.4"; +def reltype = "snapshot"; pipeline { @@ -46,7 +51,7 @@ - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", -- type: "snapshot", +- type: "experimental", - dependsOn: "", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch new file mode 100644 index 0000000..e1d206d --- /dev/null +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -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")); + } + } diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch new file mode 100644 index 0000000..8f76854 --- /dev/null +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -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() { diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch similarity index 78% rename from patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch rename to patches/1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch index 1678ae9..cb66b53 100644 --- a/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch +++ b/patches/1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch @@ -4,8 +4,8 @@ public ServerPlayer player; @Inject( -- method = "lambda$handleChat$5", -+ method = "lambda$handleChat$6", +- method = "lambda$handleChat$6", ++ method = "lambda$handleChat$5", at = @At("HEAD"), cancellable = true ) diff --git a/patches/1.21.2/build.gradle.patch b/patches/1.21.2/build.gradle.patch index b1d15b2..2717099 100644 --- a/patches/1.21.2/build.gradle.patch +++ b/patches/1.21.2/build.gradle.patch @@ -5,7 +5,7 @@ var relType = project.properties["releaseType"] ?: "${release_type}" -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.21.2/gradle.properties.patch b/patches/1.21.2/gradle.properties.patch index 316e7fb..26c2d2b 100644 --- a/patches/1.21.2/gradle.properties.patch +++ b/patches/1.21.2/gradle.properties.patch @@ -1,5 +1,21 @@ --- a/gradle.properties +++ b/gradle.properties +@@ -10,12 +10,12 @@ + mod_name=CraterLib + + # Shared +-minecraft_version=25w10a ++minecraft_version=1.21.3 + project_group=com.hypherionmc.craterlib + + # Fabric +-fabric_loader=0.16.10 +-fabric_api=0.118.4+1.21.5 ++fabric_loader=0.16.7 ++fabric_api=0.107.3+1.21.3 + + # Forge + forge_version=50.0.6 @@ -39,13 +39,13 @@ vanishmod_neo=puxrKAMr ftb_essentials=2101.1.0 @@ -12,7 +28,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq --release_type=port +-release_type=experimental +release_type=release # Gradle diff --git a/patches/1.21.2/settings.gradle.patch b/patches/1.21.2/settings.gradle.patch new file mode 100644 index 0000000..e9d2acd --- /dev/null +++ b/patches/1.21.2/settings.gradle.patch @@ -0,0 +1,11 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -14,6 +14,6 @@ + } + + rootProject.name = 'CraterLib' +-include("Common", "Fabric"/*, "NeoForge"*/) +-//include 'Paper' ++include("Common", "Fabric", "NeoForge") ++include 'Paper' + diff --git a/patches/1.21/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21/.jenkins/Jenkinsfile.deploy.patch index 7252a8a..7fb572b 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.21/.jenkins/Jenkinsfile.deploy.patch @@ -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.21"; pipeline { diff --git a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch index c1f58bb..4ec6a9a 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch @@ -4,11 +4,11 @@ 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 majorMc = "1.21"; def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.3|1.21.4"; --def reltype = "port"; +-def supportedMc = "25w10a"; +-def reltype = "experimental"; +def supportedMc = "1.21|1.21.1"; +def reltype = "snapshot"; @@ -51,7 +51,7 @@ - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", -- type: "snapshot", +- type: "experimental", - dependsOn: "", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch new file mode 100644 index 0000000..e1d206d --- /dev/null +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java.patch @@ -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")); + } + } diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index b514a03..ebb3de1 100644 --- a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -9,21 +9,58 @@ buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); -@@ -245,7 +245,7 @@ - RenderSystem.enableBlend(); - RenderSystem.blendFuncSeparate(770, 771, 0, 1); +@@ -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,10 +242,10 @@ + 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); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); 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); -@@ -267,7 +267,7 @@ +@@ -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) { +@@ -267,14 +267,14 @@ 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.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() { diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch new file mode 100644 index 0000000..8427207 --- /dev/null +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/nbt/BridgedCompoundTag.java.patch @@ -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 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) { diff --git a/patches/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch similarity index 78% rename from patches/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch rename to patches/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch index 1678ae9..cb66b53 100644 --- a/patches/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch +++ b/patches/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch @@ -4,8 +4,8 @@ public ServerPlayer player; @Inject( -- method = "lambda$handleChat$5", -+ method = "lambda$handleChat$6", +- method = "lambda$handleChat$6", ++ method = "lambda$handleChat$5", at = @At("HEAD"), cancellable = true ) diff --git a/patches/1.21/build.gradle.patch b/patches/1.21/build.gradle.patch index 263568c..00b21e2 100644 --- a/patches/1.21/build.gradle.patch +++ b/patches/1.21/build.gradle.patch @@ -7,7 +7,7 @@ -var relType = project.properties["releaseType"] ?: "${release_type}" - -ext { -- isPort = (relType == 'port') +- isPort = (relType == 'experimental') -} - orion.setup { diff --git a/patches/1.21/gradle.properties.patch b/patches/1.21/gradle.properties.patch index 3a3eef1..ffd30eb 100644 --- a/patches/1.21/gradle.properties.patch +++ b/patches/1.21/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.3 +-minecraft_version=25w10a +minecraft_version=1.21 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.100.1+1.21 @@ -37,7 +37,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq --release_type=port +-release_type=experimental +release_type=release # Gradle diff --git a/patches/1.21/settings.gradle.patch b/patches/1.21/settings.gradle.patch new file mode 100644 index 0000000..e9d2acd --- /dev/null +++ b/patches/1.21/settings.gradle.patch @@ -0,0 +1,11 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -14,6 +14,6 @@ + } + + rootProject.name = 'CraterLib' +-include("Common", "Fabric"/*, "NeoForge"*/) +-//include 'Paper' ++include("Common", "Fabric", "NeoForge") ++include 'Paper' +