From 4e955884893c22702e5c044c4c6e4bc91911f0d7 Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Sun, 9 Jun 2024 19:51:41 +0200 Subject: [PATCH] [DEV] Fix Patches and use correct MCFormatter versions for older MC versions --- patches/1.18.2/Common/gradle.properties.patch | 5 + .../gui/config/CraterConfigScreen.java.patch | 110 +++++++++++++++-- .../resources/ResourceIdentifier.java.patch | 16 +++ patches/1.18.2/README.md.patch | 11 ++ patches/1.18.2/gradle.properties.patch | 8 +- patches/1.18.2/orbit.json.patch | 7 ++ patches/1.19.2/Common/gradle.properties.patch | 5 + .../gui/config/CraterConfigScreen.java.patch | 112 ++++++++++++++++-- .../resources/ResourceIdentifier.java.patch | 16 +++ patches/1.19.2/README.md.patch | 11 ++ patches/1.19.2/gradle.properties.patch | 8 +- patches/1.19.2/orbit.json.patch | 7 ++ patches/1.19.3/Common/gradle.properties.patch | 5 + .../gui/config/CraterConfigScreen.java.patch | 112 ++++++++++++++++-- .../resources/ResourceIdentifier.java.patch | 16 +++ patches/1.19.3/README.md.patch | 11 ++ patches/1.19.3/gradle.properties.patch | 8 +- patches/1.19.3/orbit.json.patch | 7 ++ patches/1.20.2/Common/gradle.properties.patch | 5 + .../gui/config/CraterConfigScreen.java.patch | 106 ++++++++++++++++- .../resources/ResourceIdentifier.java.patch | 16 +++ patches/1.20.2/README.md.patch | 11 ++ patches/1.20.2/gradle.properties.patch | 8 +- patches/1.20.2/orbit.json.patch | 7 ++ patches/1.20.4/Common/gradle.properties.patch | 5 + .../gui/config/CraterConfigScreen.java.patch | 106 ++++++++++++++++- .../resources/ResourceIdentifier.java.patch | 16 +++ patches/1.20.4/NeoForge/build.gradle.patch | 9 ++ patches/1.20.4/README.md.patch | 11 ++ patches/1.20.4/gradle.properties.patch | 9 +- patches/1.20.4/orbit.json.patch | 7 ++ patches/1.20.4/settings.gradle.patch | 8 ++ patches/1.20/Common/gradle.properties.patch | 5 + .../gui/config/CraterConfigScreen.java.patch | 108 ++++++++++++++++- .../resources/ResourceIdentifier.java.patch | 16 +++ patches/1.20/README.md.patch | 11 ++ patches/1.20/gradle.properties.patch | 8 +- patches/1.20/orbit.json.patch | 7 ++ 38 files changed, 911 insertions(+), 43 deletions(-) create mode 100644 patches/1.18.2/Common/gradle.properties.patch create mode 100644 patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch create mode 100644 patches/1.18.2/README.md.patch create mode 100644 patches/1.18.2/orbit.json.patch create mode 100644 patches/1.19.2/Common/gradle.properties.patch create mode 100644 patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch create mode 100644 patches/1.19.2/README.md.patch create mode 100644 patches/1.19.2/orbit.json.patch create mode 100644 patches/1.19.3/Common/gradle.properties.patch create mode 100644 patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch create mode 100644 patches/1.19.3/README.md.patch create mode 100644 patches/1.19.3/orbit.json.patch create mode 100644 patches/1.20.2/Common/gradle.properties.patch create mode 100644 patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch create mode 100644 patches/1.20.2/README.md.patch create mode 100644 patches/1.20.2/orbit.json.patch create mode 100644 patches/1.20.4/Common/gradle.properties.patch create mode 100644 patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch create mode 100644 patches/1.20.4/README.md.patch create mode 100644 patches/1.20.4/orbit.json.patch create mode 100644 patches/1.20.4/settings.gradle.patch create mode 100644 patches/1.20/Common/gradle.properties.patch create mode 100644 patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch create mode 100644 patches/1.20/README.md.patch create mode 100644 patches/1.20/orbit.json.patch diff --git a/patches/1.18.2/Common/gradle.properties.patch b/patches/1.18.2/Common/gradle.properties.patch new file mode 100644 index 0000000..cd35d4f --- /dev/null +++ b/patches/1.18.2/Common/gradle.properties.patch @@ -0,0 +1,5 @@ +--- a/Common/gradle.properties ++++ /dev/null +@@ -1,2 +1,0 @@ +-# We don't need the common jar to be remapped +-fabric.loom.dontRemap=true 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 154adff..4f8722e 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 @@ -55,6 +55,15 @@ val, () -> val, (ret) -> { +@@ -158,7 +159,7 @@ + return new TextConfigOption<>(Objects::toString, BigDecimal::new); + } + if (value instanceof ResourceLocation) { +- return new TextConfigOption<>(Objects::toString, ResourceLocation::parse); ++ return new TextConfigOption<>(Objects::toString, ResourceLocation::new); + } + if (isSubConfig) { + return new SubConfigWidget<>(config, this, value); @@ -172,24 +173,24 @@ ((List) children()).addAll(options); @@ -92,19 +101,106 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -266,9 +267,9 @@ +@@ -216,23 +217,24 @@ + int maxY = this.height - BOTTOM; + //RenderSystem.disableTexture(); + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); +- +- buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255); +- +- buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); +- 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()); ++ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ ++ buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ ++ buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ 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.enableTexture(); + } +@@ -240,21 +242,22 @@ + + private void renderShadow(PoseStack matrices) { + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 0, 1); + //RenderSystem.disableTexture(); + 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); +- buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185); +- 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()); ++ 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(); ++ buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex(); ++ tesselator.end(); + //RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + } +@@ -265,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); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); +- 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()); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); -@@ -321,22 +322,22 @@ ++ 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(); ++ buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ tesselator.end(); + } + + public int scrollHeight() { +@@ -321,22 +325,22 @@ @Override public void onClose() { if (isEdited()) { @@ -133,7 +229,7 @@ } @Override -@@ -375,15 +376,15 @@ +@@ -375,15 +379,15 @@ } } diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch new file mode 100644 index 0000000..b8e086e --- /dev/null +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch @@ -0,0 +1,16 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java +@@ -7,11 +7,11 @@ + private final ResourceLocation internal; + + public ResourceIdentifier(String namespace, String path) { +- this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path); ++ this.internal = new ResourceLocation(namespace, path); + } + + public ResourceIdentifier(String path) { +- this.internal = ResourceLocation.withDefaultNamespace(path); ++ this.internal = new ResourceLocation(path); + } + + public String getNamespace() { diff --git a/patches/1.18.2/README.md.patch b/patches/1.18.2/README.md.patch new file mode 100644 index 0000000..e51d5b3 --- /dev/null +++ b/patches/1.18.2/README.md.patch @@ -0,0 +1,11 @@ +--- a/README.md ++++ b/README.md +@@ -15,7 +15,7 @@ + | < 1.18.2 | ❌ | + | 1.18.2-1.20.2 | ✳️ | + | 1.20.4 | ✳️ | +-| 1.20.6 | 🚧 | ++| 1.21 | 🚧 | + + - ❌ - Not Supported; no bug fixes or new features. + - 🚧 - Work in Progress; not ready for release. diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index c4e1730..59ae860 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -22,7 +22,7 @@ # Dependencies moon_config=1.0.9 -@@ -30,11 +27,10 @@ +@@ -30,16 +27,15 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -38,3 +38,9 @@ # Publishing curse_id=867099 + modrinth_id=Nn8Wasaq +-release_type=port ++release_type=release + + # Gradle + org.gradle.jvmargs=-Xmx3G diff --git a/patches/1.18.2/orbit.json.patch b/patches/1.18.2/orbit.json.patch new file mode 100644 index 0000000..4f0263d --- /dev/null +++ b/patches/1.18.2/orbit.json.patch @@ -0,0 +1,7 @@ +--- a/orbit.json ++++ /dev/null +@@ -1,4 +1,0 @@ +-{ +- "action": "port", +- "devBranch": "porting" +-} diff --git a/patches/1.19.2/Common/gradle.properties.patch b/patches/1.19.2/Common/gradle.properties.patch new file mode 100644 index 0000000..cd35d4f --- /dev/null +++ b/patches/1.19.2/Common/gradle.properties.patch @@ -0,0 +1,5 @@ +--- a/Common/gradle.properties ++++ /dev/null +@@ -1,2 +1,0 @@ +-# We don't need the common jar to be remapped +-fabric.loom.dontRemap=true 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 e46a0ed..e93a5e3 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 @@ -20,6 +20,15 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; +@@ -158,7 +157,7 @@ + return new TextConfigOption<>(Objects::toString, BigDecimal::new); + } + if (value instanceof ResourceLocation) { +- return new TextConfigOption<>(Objects::toString, ResourceLocation::parse); ++ return new TextConfigOption<>(Objects::toString, ResourceLocation::new); + } + if (isSubConfig) { + return new SubConfigWidget<>(config, this, value); @@ -177,19 +176,19 @@ } @@ -50,19 +59,106 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -266,9 +265,9 @@ +@@ -216,23 +215,24 @@ + int maxY = this.height - BOTTOM; + //RenderSystem.disableTexture(); + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); +- +- buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255); +- +- buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); +- 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()); ++ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ ++ buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ ++ buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ 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.enableTexture(); + } +@@ -240,21 +240,22 @@ + + private void renderShadow(PoseStack matrices) { + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 0, 1); + //RenderSystem.disableTexture(); + 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); +- buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185); +- 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()); ++ 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(); ++ buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex(); ++ tesselator.end(); + //RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + } +@@ -265,15 +266,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); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); +- 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()); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); -@@ -331,12 +330,12 @@ ++ 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(); ++ buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ tesselator.end(); + } + + public int scrollHeight() { +@@ -331,12 +333,12 @@ } @Override @@ -77,7 +173,7 @@ } @Override -@@ -375,7 +374,7 @@ +@@ -375,7 +377,7 @@ } } @@ -86,7 +182,7 @@ if (mouseX > startX && mouseX < startX + sizeX) { if (mouseY > startY && mouseY < startY + sizeY) { List list = new ArrayList<>(); -@@ -383,7 +382,7 @@ +@@ -383,7 +385,7 @@ for (String desc : description) { list.add(Component.translatable(desc)); } diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch new file mode 100644 index 0000000..b8e086e --- /dev/null +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch @@ -0,0 +1,16 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java +@@ -7,11 +7,11 @@ + private final ResourceLocation internal; + + public ResourceIdentifier(String namespace, String path) { +- this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path); ++ this.internal = new ResourceLocation(namespace, path); + } + + public ResourceIdentifier(String path) { +- this.internal = ResourceLocation.withDefaultNamespace(path); ++ this.internal = new ResourceLocation(path); + } + + public String getNamespace() { diff --git a/patches/1.19.2/README.md.patch b/patches/1.19.2/README.md.patch new file mode 100644 index 0000000..e51d5b3 --- /dev/null +++ b/patches/1.19.2/README.md.patch @@ -0,0 +1,11 @@ +--- a/README.md ++++ b/README.md +@@ -15,7 +15,7 @@ + | < 1.18.2 | ❌ | + | 1.18.2-1.20.2 | ✳️ | + | 1.20.4 | ✳️ | +-| 1.20.6 | 🚧 | ++| 1.21 | 🚧 | + + - ❌ - Not Supported; no bug fixes or new features. + - 🚧 - Work in Progress; not ready for release. diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index aef7987..853ee9a 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -22,7 +22,7 @@ # Dependencies moon_config=1.0.9 -@@ -30,11 +27,10 @@ +@@ -30,16 +27,15 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -38,3 +38,9 @@ # Publishing curse_id=867099 + modrinth_id=Nn8Wasaq +-release_type=port ++release_type=release + + # Gradle + org.gradle.jvmargs=-Xmx3G diff --git a/patches/1.19.2/orbit.json.patch b/patches/1.19.2/orbit.json.patch new file mode 100644 index 0000000..4f0263d --- /dev/null +++ b/patches/1.19.2/orbit.json.patch @@ -0,0 +1,7 @@ +--- a/orbit.json ++++ /dev/null +@@ -1,4 +1,0 @@ +-{ +- "action": "port", +- "devBranch": "porting" +-} diff --git a/patches/1.19.3/Common/gradle.properties.patch b/patches/1.19.3/Common/gradle.properties.patch new file mode 100644 index 0000000..cd35d4f --- /dev/null +++ b/patches/1.19.3/Common/gradle.properties.patch @@ -0,0 +1,5 @@ +--- a/Common/gradle.properties ++++ /dev/null +@@ -1,2 +1,0 @@ +-# We don't need the common jar to be remapped +-fabric.loom.dontRemap=true 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 6bddc3c..e9ec1ff 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 @@ -8,6 +8,15 @@ import net.minecraft.client.gui.screens.ConfirmScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.GameRenderer; +@@ -158,7 +157,7 @@ + return new TextConfigOption<>(Objects::toString, BigDecimal::new); + } + if (value instanceof ResourceLocation) { +- return new TextConfigOption<>(Objects::toString, ResourceLocation::parse); ++ return new TextConfigOption<>(Objects::toString, ResourceLocation::new); + } + if (isSubConfig) { + return new SubConfigWidget<>(config, this, value); @@ -177,19 +176,19 @@ } @@ -38,19 +47,106 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -266,9 +265,9 @@ +@@ -216,23 +215,24 @@ + int maxY = this.height - BOTTOM; + //RenderSystem.disableTexture(); + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); +- +- buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255); +- +- buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); +- 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()); ++ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ ++ buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ ++ buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ 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.enableTexture(); + } +@@ -240,21 +240,22 @@ + + private void renderShadow(PoseStack matrices) { + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 0, 1); + //RenderSystem.disableTexture(); + 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); +- buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185); +- 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()); ++ 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(); ++ buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex(); ++ tesselator.end(); + //RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + } +@@ -265,15 +266,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); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); +- 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()); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); -@@ -331,12 +330,12 @@ ++ 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(); ++ buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ tesselator.end(); + } + + public int scrollHeight() { +@@ -331,12 +333,12 @@ } @Override @@ -65,7 +161,7 @@ } @Override -@@ -375,7 +374,7 @@ +@@ -375,7 +377,7 @@ } } @@ -74,7 +170,7 @@ if (mouseX > startX && mouseX < startX + sizeX) { if (mouseY > startY && mouseY < startY + sizeY) { List list = new ArrayList<>(); -@@ -383,7 +382,7 @@ +@@ -383,7 +385,7 @@ for (String desc : description) { list.add(Component.translatable(desc)); } diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch new file mode 100644 index 0000000..b8e086e --- /dev/null +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch @@ -0,0 +1,16 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java +@@ -7,11 +7,11 @@ + private final ResourceLocation internal; + + public ResourceIdentifier(String namespace, String path) { +- this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path); ++ this.internal = new ResourceLocation(namespace, path); + } + + public ResourceIdentifier(String path) { +- this.internal = ResourceLocation.withDefaultNamespace(path); ++ this.internal = new ResourceLocation(path); + } + + public String getNamespace() { diff --git a/patches/1.19.3/README.md.patch b/patches/1.19.3/README.md.patch new file mode 100644 index 0000000..e51d5b3 --- /dev/null +++ b/patches/1.19.3/README.md.patch @@ -0,0 +1,11 @@ +--- a/README.md ++++ b/README.md +@@ -15,7 +15,7 @@ + | < 1.18.2 | ❌ | + | 1.18.2-1.20.2 | ✳️ | + | 1.20.4 | ✳️ | +-| 1.20.6 | 🚧 | ++| 1.21 | 🚧 | + + - ❌ - Not Supported; no bug fixes or new features. + - 🚧 - Work in Progress; not ready for release. diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index e2b51b2..3ea5b65 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -22,7 +22,7 @@ # Dependencies moon_config=1.0.9 -@@ -30,11 +27,10 @@ +@@ -30,16 +27,15 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -38,3 +38,9 @@ # Publishing curse_id=867099 + modrinth_id=Nn8Wasaq +-release_type=port ++release_type=release + + # Gradle + org.gradle.jvmargs=-Xmx3G diff --git a/patches/1.19.3/orbit.json.patch b/patches/1.19.3/orbit.json.patch new file mode 100644 index 0000000..4f0263d --- /dev/null +++ b/patches/1.19.3/orbit.json.patch @@ -0,0 +1,7 @@ +--- a/orbit.json ++++ /dev/null +@@ -1,4 +1,0 @@ +-{ +- "action": "port", +- "devBranch": "porting" +-} diff --git a/patches/1.20.2/Common/gradle.properties.patch b/patches/1.20.2/Common/gradle.properties.patch new file mode 100644 index 0000000..cd35d4f --- /dev/null +++ b/patches/1.20.2/Common/gradle.properties.patch @@ -0,0 +1,5 @@ +--- a/Common/gradle.properties ++++ /dev/null +@@ -1,2 +1,0 @@ +-# We don't need the common jar to be remapped +-fabric.loom.dontRemap=true 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 74b189f..ed53a54 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 @@ -1,11 +1,109 @@ --- 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 -@@ -267,7 +267,7 @@ +@@ -158,7 +158,7 @@ + return new TextConfigOption<>(Objects::toString, BigDecimal::new); + } + if (value instanceof ResourceLocation) { +- return new TextConfigOption<>(Objects::toString, ResourceLocation::parse); ++ return new TextConfigOption<>(Objects::toString, ResourceLocation::new); + } + if (isSubConfig) { + return new SubConfigWidget<>(config, this, value); +@@ -216,23 +216,24 @@ + int maxY = this.height - BOTTOM; + //RenderSystem.disableTexture(); + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); +- +- buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255); +- +- buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); +- 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()); ++ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ ++ buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ ++ buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ 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.enableTexture(); + } +@@ -240,21 +241,22 @@ + + private void renderShadow(PoseStack matrices) { Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 0, 1); + //RenderSystem.disableTexture(); + 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); +- buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185); +- 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()); ++ 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(); ++ buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex(); ++ tesselator.end(); + //RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + } +@@ -265,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); ++ BufferBuilder buffer = tesselator.getBuilder(); RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); 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, 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()); ++ 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(); ++ buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ tesselator.end(); + } + + public int scrollHeight() { diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch new file mode 100644 index 0000000..b8e086e --- /dev/null +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch @@ -0,0 +1,16 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java +@@ -7,11 +7,11 @@ + private final ResourceLocation internal; + + public ResourceIdentifier(String namespace, String path) { +- this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path); ++ this.internal = new ResourceLocation(namespace, path); + } + + public ResourceIdentifier(String path) { +- this.internal = ResourceLocation.withDefaultNamespace(path); ++ this.internal = new ResourceLocation(path); + } + + public String getNamespace() { diff --git a/patches/1.20.2/README.md.patch b/patches/1.20.2/README.md.patch new file mode 100644 index 0000000..e51d5b3 --- /dev/null +++ b/patches/1.20.2/README.md.patch @@ -0,0 +1,11 @@ +--- a/README.md ++++ b/README.md +@@ -15,7 +15,7 @@ + | < 1.18.2 | ❌ | + | 1.18.2-1.20.2 | ✳️ | + | 1.20.4 | ✳️ | +-| 1.20.6 | 🚧 | ++| 1.21 | 🚧 | + + - ❌ - Not Supported; no bug fixes or new features. + - 🚧 - Work in Progress; not ready for release. diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index 61b49dd..230ac83 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -22,7 +22,7 @@ # Dependencies moon_config=1.0.9 -@@ -30,11 +27,10 @@ +@@ -30,16 +27,15 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -38,3 +38,9 @@ # Publishing curse_id=867099 + modrinth_id=Nn8Wasaq +-release_type=port ++release_type=release + + # Gradle + org.gradle.jvmargs=-Xmx3G diff --git a/patches/1.20.2/orbit.json.patch b/patches/1.20.2/orbit.json.patch new file mode 100644 index 0000000..4f0263d --- /dev/null +++ b/patches/1.20.2/orbit.json.patch @@ -0,0 +1,7 @@ +--- a/orbit.json ++++ /dev/null +@@ -1,4 +1,0 @@ +-{ +- "action": "port", +- "devBranch": "porting" +-} diff --git a/patches/1.20.4/Common/gradle.properties.patch b/patches/1.20.4/Common/gradle.properties.patch new file mode 100644 index 0000000..cd35d4f --- /dev/null +++ b/patches/1.20.4/Common/gradle.properties.patch @@ -0,0 +1,5 @@ +--- a/Common/gradle.properties ++++ /dev/null +@@ -1,2 +1,0 @@ +-# We don't need the common jar to be remapped +-fabric.loom.dontRemap=true 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 74b189f..ed53a54 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 @@ -1,11 +1,109 @@ --- 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 -@@ -267,7 +267,7 @@ +@@ -158,7 +158,7 @@ + return new TextConfigOption<>(Objects::toString, BigDecimal::new); + } + if (value instanceof ResourceLocation) { +- return new TextConfigOption<>(Objects::toString, ResourceLocation::parse); ++ return new TextConfigOption<>(Objects::toString, ResourceLocation::new); + } + if (isSubConfig) { + return new SubConfigWidget<>(config, this, value); +@@ -216,23 +216,24 @@ + int maxY = this.height - BOTTOM; + //RenderSystem.disableTexture(); + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); +- +- buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255); +- +- buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); +- 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()); ++ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ ++ buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ ++ buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ 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.enableTexture(); + } +@@ -240,21 +241,22 @@ + + private void renderShadow(PoseStack matrices) { Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 0, 1); + //RenderSystem.disableTexture(); + 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); +- buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185); +- 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()); ++ 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(); ++ buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex(); ++ tesselator.end(); + //RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + } +@@ -265,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); ++ BufferBuilder buffer = tesselator.getBuilder(); RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); + RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); 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, 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()); ++ 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(); ++ buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ tesselator.end(); + } + + public int scrollHeight() { diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch new file mode 100644 index 0000000..b8e086e --- /dev/null +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch @@ -0,0 +1,16 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java +@@ -7,11 +7,11 @@ + private final ResourceLocation internal; + + public ResourceIdentifier(String namespace, String path) { +- this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path); ++ this.internal = new ResourceLocation(namespace, path); + } + + public ResourceIdentifier(String path) { +- this.internal = ResourceLocation.withDefaultNamespace(path); ++ this.internal = new ResourceLocation(path); + } + + public String getNamespace() { diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch index 710eff7..b8e3cf4 100644 --- a/patches/1.20.4/NeoForge/build.gradle.patch +++ b/patches/1.20.4/NeoForge/build.gradle.patch @@ -1,5 +1,14 @@ --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle +@@ -31,7 +31,7 @@ + + unimined.minecraft { + neoForged { +- loader "net.neoforged:neoforge:${neoforge_version}:universal" ++ loader neoforge_version + mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") + } + } @@ -50,7 +50,7 @@ from project(":Common").sourceSets.main.resources def buildProps = project.properties.clone() diff --git a/patches/1.20.4/README.md.patch b/patches/1.20.4/README.md.patch new file mode 100644 index 0000000..e51d5b3 --- /dev/null +++ b/patches/1.20.4/README.md.patch @@ -0,0 +1,11 @@ +--- a/README.md ++++ b/README.md +@@ -15,7 +15,7 @@ + | < 1.18.2 | ❌ | + | 1.18.2-1.20.2 | ✳️ | + | 1.20.4 | ✳️ | +-| 1.20.6 | 🚧 | ++| 1.21 | 🚧 | + + - ❌ - Not Supported; no bug fixes or new features. + - 🚧 - Work in Progress; not ready for release. diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index 5f9c4d7..2b3ee5a 100644 --- a/patches/1.20.4/gradle.properties.patch +++ b/patches/1.20.4/gradle.properties.patch @@ -23,7 +23,7 @@ # Dependencies moon_config=1.0.9 -@@ -31,9 +31,9 @@ +@@ -31,15 +31,15 @@ # Mod Dependencies fabrictailor=2.3.1 @@ -36,3 +36,10 @@ vanishmod_neo=puxrKAMr # Publishing + curse_id=867099 + modrinth_id=Nn8Wasaq +-release_type=port ++release_type=release + + # Gradle + org.gradle.jvmargs=-Xmx3G diff --git a/patches/1.20.4/orbit.json.patch b/patches/1.20.4/orbit.json.patch new file mode 100644 index 0000000..4f0263d --- /dev/null +++ b/patches/1.20.4/orbit.json.patch @@ -0,0 +1,7 @@ +--- a/orbit.json ++++ /dev/null +@@ -1,4 +1,0 @@ +-{ +- "action": "port", +- "devBranch": "porting" +-} diff --git a/patches/1.20.4/settings.gradle.patch b/patches/1.20.4/settings.gradle.patch new file mode 100644 index 0000000..6ee7e7a --- /dev/null +++ b/patches/1.20.4/settings.gradle.patch @@ -0,0 +1,8 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -11,4 +11,4 @@ + } + + rootProject.name = 'CraterLib' +-include("Common", "Fabric", "NeoForge") ++include("Common", "Fabric", "Forge", "NeoForge") diff --git a/patches/1.20/Common/gradle.properties.patch b/patches/1.20/Common/gradle.properties.patch new file mode 100644 index 0000000..cd35d4f --- /dev/null +++ b/patches/1.20/Common/gradle.properties.patch @@ -0,0 +1,5 @@ +--- a/Common/gradle.properties ++++ /dev/null +@@ -1,2 +1,0 @@ +-# We don't need the common jar to be remapped +-fabric.loom.dontRemap=true 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 9eac71b..6f3651a 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 @@ -1,5 +1,14 @@ --- 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 +@@ -158,7 +158,7 @@ + return new TextConfigOption<>(Objects::toString, BigDecimal::new); + } + if (value instanceof ResourceLocation) { +- return new TextConfigOption<>(Objects::toString, ResourceLocation::parse); ++ return new TextConfigOption<>(Objects::toString, ResourceLocation::new); + } + if (isSubConfig) { + return new SubConfigWidget<>(config, this, value); @@ -179,6 +179,7 @@ @Override public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { @@ -19,19 +28,106 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -266,9 +266,9 @@ +@@ -216,23 +216,24 @@ + int maxY = this.height - BOTTOM; + //RenderSystem.disableTexture(); + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); +- +- buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255); +- buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255); +- +- buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1); +- buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1); +- 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()); ++ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); ++ ++ buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); ++ ++ buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); ++ buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); ++ 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.enableTexture(); + } +@@ -240,21 +241,22 @@ + + private void renderShadow(PoseStack matrices) { + Tesselator tesselator = Tesselator.getInstance(); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); ++ BufferBuilder buffer = tesselator.getBuilder(); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 0, 1); + //RenderSystem.disableTexture(); + 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); +- buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185); +- buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185); +- 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()); ++ 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(); ++ buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex(); ++ buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex(); ++ buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex(); ++ tesselator.end(); + //RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + } +@@ -265,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); +- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); +- 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()); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - 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); -@@ -331,12 +331,12 @@ ++ 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(); ++ buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); ++ tesselator.end(); + } + + public int scrollHeight() { +@@ -331,12 +334,12 @@ } @Override diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch new file mode 100644 index 0000000..b8e086e --- /dev/null +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch @@ -0,0 +1,16 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java +@@ -7,11 +7,11 @@ + private final ResourceLocation internal; + + public ResourceIdentifier(String namespace, String path) { +- this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path); ++ this.internal = new ResourceLocation(namespace, path); + } + + public ResourceIdentifier(String path) { +- this.internal = ResourceLocation.withDefaultNamespace(path); ++ this.internal = new ResourceLocation(path); + } + + public String getNamespace() { diff --git a/patches/1.20/README.md.patch b/patches/1.20/README.md.patch new file mode 100644 index 0000000..e51d5b3 --- /dev/null +++ b/patches/1.20/README.md.patch @@ -0,0 +1,11 @@ +--- a/README.md ++++ b/README.md +@@ -15,7 +15,7 @@ + | < 1.18.2 | ❌ | + | 1.18.2-1.20.2 | ✳️ | + | 1.20.4 | ✳️ | +-| 1.20.6 | 🚧 | ++| 1.21 | 🚧 | + + - ❌ - Not Supported; no bug fixes or new features. + - 🚧 - Work in Progress; not ready for release. diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index cf84a38..44ab41f 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -22,7 +22,7 @@ # Dependencies moon_config=1.0.9 -@@ -30,11 +27,10 @@ +@@ -30,16 +27,15 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -38,3 +38,9 @@ # Publishing curse_id=867099 + modrinth_id=Nn8Wasaq +-release_type=port ++release_type=release + + # Gradle + org.gradle.jvmargs=-Xmx3G diff --git a/patches/1.20/orbit.json.patch b/patches/1.20/orbit.json.patch new file mode 100644 index 0000000..4f0263d --- /dev/null +++ b/patches/1.20/orbit.json.patch @@ -0,0 +1,7 @@ +--- a/orbit.json ++++ /dev/null +@@ -1,4 +1,0 @@ +-{ +- "action": "port", +- "devBranch": "porting" +-}