[DEV] Rebuild porting patches

commit.sha

@@ -1 +1 @@
-3986f085401b233e650720350a165b476d839041
+801f92a223d43ec0f709a9c3f6ccfc3d9756c13e

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"
  

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}"

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"));
+     }
+ }

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();

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<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) {

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;"),

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 {

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

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")

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"
  

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}"

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"));
+     }
+ }

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();

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<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) {

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

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 {

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

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")

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"
  

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}"

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"));
+     }
+ }

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();

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<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) {

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

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 {

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

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'

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"
  

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}"

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"));
+     }
+ }

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();

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<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) {

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 {

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

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'

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"
  

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}"

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"));
+     }
+ }

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();

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<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) {

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 {

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

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'

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"
  

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}"

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"));
+     }
+ }

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();

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<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) {

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

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 {

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

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'

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") {

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}"

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"));
+     }
+ }

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() {

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<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) {

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
      )

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 {

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

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'
+ 

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 {

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}"

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"));
+     }
+ }

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() {

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<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) {

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
      )

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 {

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

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'
+