diff --git a/commit.sha b/commit.sha index de60131..470bcde 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -cf3b89ea7f9aec62beb6505eb69e49007e23ebc0 \ No newline at end of file +fbcf545119efb04acdc43fda3d169185e37a9c4b \ No newline at end of file diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch index 9dbbb42..fd7496d 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.18.2"; +def JDK = "17" diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch index d438a5b..52b31c0 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ 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.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.18.2"; 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 6ff068f..92b31fa 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 @@ -23,7 +23,15 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; -@@ -50,7 +51,7 @@ +@@ -37,7 +38,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -51,7 +51,7 @@ private boolean dragging; public CraterConfigScreen(AbstractConfig config, Screen parent, Object subConfig) { @@ -32,7 +40,7 @@ this.parent = parent; this.config = config; if (subConfig != null) { -@@ -65,11 +66,11 @@ +@@ -66,11 +66,11 @@ } private static Component toText(Enum val) { @@ -46,7 +54,7 @@ } private void setupScreenFromConfig(Object object, Class clazz) { -@@ -95,7 +96,7 @@ +@@ -96,7 +96,7 @@ tooltipLang = field.getAnnotation(Tooltip.class).value(); } @@ -55,7 +63,7 @@ val, () -> val, (ret) -> { -@@ -159,7 +160,7 @@ +@@ -160,7 +160,7 @@ return new TextConfigOption<>(Objects::toString, BigDecimal::new); } if (value instanceof ResourceLocation) { @@ -64,7 +72,7 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -173,24 +174,24 @@ +@@ -174,24 +174,24 @@ ((List) children()).addAll(options); int buttonWidths = Math.min(200, (width - 50 - 12) / 3); @@ -76,7 +84,7 @@ @Override - public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { -- overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) { + overlayBackground(matrices, TOP, height - BOTTOM, 32); + @@ -101,7 +109,16 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -217,47 +218,49 @@ +@@ -199,7 +199,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -218,47 +218,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -183,21 +200,22 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -266,15 +269,16 @@ +@@ -267,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); -+ BufferBuilder buffer = tesselator.getBuilder(); -+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); +- //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()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); ++ RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + 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(); @@ -208,7 +226,7 @@ } public int scrollHeight() { -@@ -322,22 +326,22 @@ +@@ -323,22 +326,22 @@ @Override public void onClose() { if (isEdited()) { @@ -237,7 +255,7 @@ } @Override -@@ -376,15 +380,15 @@ +@@ -377,15 +380,15 @@ } } @@ -252,7 +270,7 @@ - list.add(Component.translatable(desc)); + list.add(new TranslatableComponent(desc)); } -- stack.renderComponentTooltip(font, list, mouseX, mouseY); +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); + renderComponentTooltip(stack, list, mouseX, mouseY); } } diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch index 39801b5..102e6f1 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -9,6 +9,15 @@ } public boolean isSinglePlayer() { +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { @@ -63,7 +63,7 @@ } diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch index eda0c3f..2f4ffc6 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -9,6 +9,15 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.players.UserBanListEntry; import net.minecraft.server.players.UserWhiteListEntry; +@@ -38,7 +40,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { @@ -46,7 +48,7 @@ } diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 406ddc7..2331f58 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import lombok.Getter; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; -@@ -13,13 +11,10 @@ +@@ -13,51 +11,36 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -24,7 +24,13 @@ public class ChatUtils { -@@ -32,32 +27,20 @@ + @Getter + private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) + ).build(); + + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.18.2/Fabric/build.gradle.patch b/patches/1.18.2/Fabric/build.gradle.patch index b6f6723..25f5ee6 100644 --- a/patches/1.18.2/Fabric/build.gradle.patch +++ b/patches/1.18.2/Fabric/build.gradle.patch @@ -14,8 +14,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.18.2] CraterLib - ${project.version}") + setGameVersions("1.18.2") setLoaders("fabric", "quilt") diff --git a/patches/1.18.2/NeoForge/build.gradle.patch b/patches/1.18.2/NeoForge/build.gradle.patch index 5eede2e..9016d9f 100644 --- a/patches/1.18.2/NeoForge/build.gradle.patch +++ b/patches/1.18.2/NeoForge/build.gradle.patch @@ -121,8 +121,8 @@ - setVersionType("release") - setChangelog(rootProject.file("changelog.md")) - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") diff --git a/patches/1.18.2/Paper/build.gradle.patch b/patches/1.18.2/Paper/build.gradle.patch index acc223f..554ddc0 100644 --- a/patches/1.18.2/Paper/build.gradle.patch +++ b/patches/1.18.2/Paper/build.gradle.patch @@ -71,8 +71,8 @@ - setVersionType("alpha") - setChangelog(rootProject.file("changelog.md")) - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") - setLoaders("paper") - setArtifact(reobfJar.outputJar) -} diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index d23fccf..6b06dad 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.18.2 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.76.0+1.18.2 diff --git a/patches/1.18.2/settings.gradle.patch b/patches/1.18.2/settings.gradle.patch index f76ef43..f4eada2 100644 --- a/patches/1.18.2/settings.gradle.patch +++ b/patches/1.18.2/settings.gradle.patch @@ -5,7 +5,7 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - +rootProject.name = 'CraterLib-1.18.2' diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch index 6574171..66ae956 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.19.2"; +def JDK = "17" diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch index 0d7e3af..b4b0ce1 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ 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.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.19.2"; 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 2b4ceba..dcd4e5f 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,7 +20,15 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; -@@ -159,7 +158,7 @@ +@@ -37,7 +36,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -160,7 +158,7 @@ return new TextConfigOption<>(Objects::toString, BigDecimal::new); } if (value instanceof ResourceLocation) { @@ -29,12 +37,12 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -178,19 +177,19 @@ +@@ -179,19 +177,19 @@ } @Override - public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { -- overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) { + overlayBackground(matrices, TOP, height - BOTTOM, 32); + @@ -59,7 +67,16 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -217,47 +216,49 @@ +@@ -199,7 +197,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -218,47 +216,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -141,21 +158,22 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -266,15 +267,16 @@ +@@ -267,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); -+ BufferBuilder buffer = tesselator.getBuilder(); -+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); +- //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()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); ++ RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + 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(); @@ -166,7 +184,7 @@ } public int scrollHeight() { -@@ -332,12 +334,12 @@ +@@ -333,12 +334,12 @@ } @Override @@ -181,7 +199,7 @@ } @Override -@@ -376,7 +378,7 @@ +@@ -377,7 +378,7 @@ } } @@ -190,11 +208,11 @@ if (mouseX > startX && mouseX < startX + sizeX) { if (mouseY > startY && mouseY < startY + sizeY) { List list = new ArrayList<>(); -@@ -384,7 +386,7 @@ +@@ -385,7 +386,7 @@ for (String desc : description) { list.add(Component.translatable(desc)); } -- stack.renderComponentTooltip(font, list, mouseX, mouseY); +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); + renderComponentTooltip(stack, list, mouseX, mouseY); } } diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch index 2cec32a..bf3f3bd 100644 --- a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -9,3 +9,12 @@ } public boolean isSinglePlayer() { +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index bf4b899..57fd310 100644 --- a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -20,7 +20,15 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; -@@ -32,24 +25,12 @@ +@@ -25,31 +18,19 @@ + + @Getter + private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) + ).build(); + + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.19.2/Fabric/build.gradle.patch b/patches/1.19.2/Fabric/build.gradle.patch index 555bcee..2d2d715 100644 --- a/patches/1.19.2/Fabric/build.gradle.patch +++ b/patches/1.19.2/Fabric/build.gradle.patch @@ -12,8 +12,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.19.2] CraterLib - ${project.version}") + setGameVersions("1.19.2") setLoaders("fabric", "quilt") diff --git a/patches/1.19.2/NeoForge/build.gradle.patch b/patches/1.19.2/NeoForge/build.gradle.patch index 5eede2e..9016d9f 100644 --- a/patches/1.19.2/NeoForge/build.gradle.patch +++ b/patches/1.19.2/NeoForge/build.gradle.patch @@ -121,8 +121,8 @@ - setVersionType("release") - setChangelog(rootProject.file("changelog.md")) - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") diff --git a/patches/1.19.2/Paper/build.gradle.patch b/patches/1.19.2/Paper/build.gradle.patch index acc223f..554ddc0 100644 --- a/patches/1.19.2/Paper/build.gradle.patch +++ b/patches/1.19.2/Paper/build.gradle.patch @@ -71,8 +71,8 @@ - setVersionType("alpha") - setChangelog(rootProject.file("changelog.md")) - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") - setLoaders("paper") - setArtifact(reobfJar.outputJar) -} diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index 5d174b3..36ae89c 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.19.2 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.76.0+1.19.2 diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch index 517a41b..f42bf4e 100644 --- a/patches/1.19.2/settings.gradle.patch +++ b/patches/1.19.2/settings.gradle.patch @@ -5,7 +5,7 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - +rootProject.name = 'CraterLib-1.19.2' diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch index 3d6bbb3..d80ae07 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.19.3"; +def JDK = "17" diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch index 918a76f..cdb457f 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ 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.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.19.3"; 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 ab48c4d..287694b 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,7 +8,15 @@ import net.minecraft.client.gui.screens.ConfirmScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.GameRenderer; -@@ -159,7 +158,7 @@ +@@ -37,7 +36,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -160,7 +158,7 @@ return new TextConfigOption<>(Objects::toString, BigDecimal::new); } if (value instanceof ResourceLocation) { @@ -17,12 +25,12 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -178,19 +177,19 @@ +@@ -179,19 +177,19 @@ } @Override - public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { -- overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) { + overlayBackground(matrices, TOP, height - BOTTOM, 32); + @@ -47,7 +55,16 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -217,47 +216,49 @@ +@@ -199,7 +197,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -218,47 +216,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -129,21 +146,22 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -266,15 +267,16 @@ +@@ -267,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); -+ BufferBuilder buffer = tesselator.getBuilder(); -+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); +- //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()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); ++ RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + 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(); @@ -154,7 +172,7 @@ } public int scrollHeight() { -@@ -332,12 +334,12 @@ +@@ -333,12 +334,12 @@ } @Override @@ -169,7 +187,7 @@ } @Override -@@ -376,7 +378,7 @@ +@@ -377,7 +378,7 @@ } } @@ -178,11 +196,11 @@ if (mouseX > startX && mouseX < startX + sizeX) { if (mouseY > startY && mouseY < startY + sizeY) { List list = new ArrayList<>(); -@@ -384,7 +386,7 @@ +@@ -385,7 +386,7 @@ for (String desc : description) { list.add(Component.translatable(desc)); } -- stack.renderComponentTooltip(font, list, mouseX, mouseY); +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); + renderComponentTooltip(stack, list, mouseX, mouseY); } } diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch index 2cec32a..bf3f3bd 100644 --- a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -9,3 +9,12 @@ } public boolean isSinglePlayer() { +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index fa0669d..3300529 100644 --- a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import lombok.Getter; -@@ -10,21 +10,16 @@ +@@ -10,46 +10,29 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.json.JSONOptions; @@ -28,11 +28,12 @@ @Getter - private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) + private static final GsonComponentSerializer adventureSerializer = (ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER) ? GsonComponentSerializer.builder().build() : GsonComponentSerializer.builder().options( - JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); -@@ -32,24 +27,12 @@ + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.19.3/Fabric/build.gradle.patch b/patches/1.19.3/Fabric/build.gradle.patch index aa4733d..fb995b1 100644 --- a/patches/1.19.3/Fabric/build.gradle.patch +++ b/patches/1.19.3/Fabric/build.gradle.patch @@ -12,8 +12,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.19.4] CraterLib - ${project.version}") + setGameVersions("1.19.4") setLoaders("fabric", "quilt") diff --git a/patches/1.19.3/NeoForge/build.gradle.patch b/patches/1.19.3/NeoForge/build.gradle.patch index 5eede2e..9016d9f 100644 --- a/patches/1.19.3/NeoForge/build.gradle.patch +++ b/patches/1.19.3/NeoForge/build.gradle.patch @@ -121,8 +121,8 @@ - setVersionType("release") - setChangelog(rootProject.file("changelog.md")) - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") diff --git a/patches/1.19.3/Paper/build.gradle.patch b/patches/1.19.3/Paper/build.gradle.patch index a432606..81d7885 100644 --- a/patches/1.19.3/Paper/build.gradle.patch +++ b/patches/1.19.3/Paper/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[Paper 1.19.4] CraterLib - ${project.version}") + setGameVersions("1.19.4") setLoaders("paper") diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index b2fc5f7..635d5b9 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.19.4 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.87.2+1.19.4 diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch index 856b17e..f808b27 100644 --- a/patches/1.19.3/settings.gradle.patch +++ b/patches/1.19.3/settings.gradle.patch @@ -5,7 +5,7 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - +rootProject.name = 'CraterLib-1.19.3' diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch index 56f9325..93ff910 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.20.2"; +def JDK = "17" diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch index f5d074f..9d70748 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ 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.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.20.2"; 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 85d4747..dc01248 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,6 +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 -@@ -159,7 +159,7 @@ +@@ -37,7 +37,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -160,7 +159,7 @@ return new TextConfigOption<>(Objects::toString, BigDecimal::new); } if (value instanceof ResourceLocation) { @@ -9,7 +17,25 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -217,47 +217,49 @@ +@@ -180,7 +179,7 @@ + + @Override + public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); ++ overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + renderScrollBar(); + + matrices.pose().pushPose(); +@@ -199,7 +198,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -218,47 +217,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -91,22 +117,23 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -266,15 +268,16 @@ +@@ -267,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); -+ BufferBuilder buffer = tesselator.getBuilder(); -+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); -+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); +- //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()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); ++ RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + 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(); @@ -116,3 +143,12 @@ } public int scrollHeight() { +@@ -385,7 +387,7 @@ + for (String desc : description) { + list.add(Component.translatable(desc)); + } +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); ++ stack.renderComponentTooltip(font, list, mouseX, mouseY); + } + } + } diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch new file mode 100644 index 0000000..c48cc36 --- /dev/null +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index fa0669d..3300529 100644 --- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import lombok.Getter; -@@ -10,21 +10,16 @@ +@@ -10,46 +10,29 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.json.JSONOptions; @@ -28,11 +28,12 @@ @Getter - private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) + private static final GsonComponentSerializer adventureSerializer = (ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER) ? GsonComponentSerializer.builder().build() : GsonComponentSerializer.builder().options( - JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); -@@ -32,24 +27,12 @@ + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.20.2/Fabric/build.gradle.patch b/patches/1.20.2/Fabric/build.gradle.patch index 8b5c731..21a9972 100644 --- a/patches/1.20.2/Fabric/build.gradle.patch +++ b/patches/1.20.2/Fabric/build.gradle.patch @@ -12,8 +12,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.20.2] CraterLib - ${project.version}") + setGameVersions("1.20.2") setLoaders("fabric", "quilt") diff --git a/patches/1.20.2/NeoForge/build.gradle.patch b/patches/1.20.2/NeoForge/build.gradle.patch index 5eede2e..9016d9f 100644 --- a/patches/1.20.2/NeoForge/build.gradle.patch +++ b/patches/1.20.2/NeoForge/build.gradle.patch @@ -121,8 +121,8 @@ - setVersionType("release") - setChangelog(rootProject.file("changelog.md")) - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") diff --git a/patches/1.20.2/Paper/build.gradle.patch b/patches/1.20.2/Paper/build.gradle.patch index 932edc3..a1cdc70 100644 --- a/patches/1.20.2/Paper/build.gradle.patch +++ b/patches/1.20.2/Paper/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[Paper 1.20.2] CraterLib - ${project.version}") + setGameVersions("1.20.2") setLoaders("paper") diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index 25f6929..0a57992 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.20.2 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.91.6+1.20.2 diff --git a/patches/1.20.2/settings.gradle.patch b/patches/1.20.2/settings.gradle.patch index 1c021b5..b8f8192 100644 --- a/patches/1.20.2/settings.gradle.patch +++ b/patches/1.20.2/settings.gradle.patch @@ -5,7 +5,7 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - +rootProject.name = 'CraterLib-1.20.2' diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch index bc84f8b..585ecca 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.20.4"; +def JDK = "17" diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch index 3a253b2..cf56377 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ 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.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.20.4"; 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 85d4747..dc01248 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,6 +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 -@@ -159,7 +159,7 @@ +@@ -37,7 +37,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -160,7 +159,7 @@ return new TextConfigOption<>(Objects::toString, BigDecimal::new); } if (value instanceof ResourceLocation) { @@ -9,7 +17,25 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -217,47 +217,49 @@ +@@ -180,7 +179,7 @@ + + @Override + public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); ++ overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + renderScrollBar(); + + matrices.pose().pushPose(); +@@ -199,7 +198,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -218,47 +217,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -91,22 +117,23 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -266,15 +268,16 @@ +@@ -267,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); -+ BufferBuilder buffer = tesselator.getBuilder(); -+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); -+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); +- //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()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShader(GameRenderer::getPositionTexColorShader); ++ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); ++ RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + 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(); @@ -116,3 +143,12 @@ } public int scrollHeight() { +@@ -385,7 +387,7 @@ + for (String desc : description) { + list.add(Component.translatable(desc)); + } +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); ++ stack.renderComponentTooltip(font, list, mouseX, mouseY); + } + } + } diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch new file mode 100644 index 0000000..c48cc36 --- /dev/null +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index bf4b899..57fd310 100644 --- a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -20,7 +20,15 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; -@@ -32,24 +25,12 @@ +@@ -25,31 +18,19 @@ + + @Getter + private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) + ).build(); + + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.20.4/Fabric/build.gradle.patch b/patches/1.20.4/Fabric/build.gradle.patch index b1f5283..33485c3 100644 --- a/patches/1.20.4/Fabric/build.gradle.patch +++ b/patches/1.20.4/Fabric/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.20.4] CraterLib - ${project.version}") + setGameVersions("1.20.4") setLoaders("fabric", "quilt") diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch index a045fb4..d1b965f 100644 --- a/patches/1.20.4/NeoForge/build.gradle.patch +++ b/patches/1.20.4/NeoForge/build.gradle.patch @@ -27,8 +27,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[NeoForge 1.20.4] CraterLib - ${project.version}") + setGameVersions("1.20.4") setLoaders("neoforge") diff --git a/patches/1.20.4/Paper/build.gradle.patch b/patches/1.20.4/Paper/build.gradle.patch index f7d5ba2..b95fd44 100644 --- a/patches/1.20.4/Paper/build.gradle.patch +++ b/patches/1.20.4/Paper/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[Paper 1.20.4] CraterLib - ${project.version}") + setGameVersions("1.20.4") setLoaders("paper") diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index cc9ed0d..11e6a1b 100644 --- a/patches/1.20.4/gradle.properties.patch +++ b/patches/1.20.4/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.20.4 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.97.0+1.20.4 diff --git a/patches/1.20.4/settings.gradle.patch b/patches/1.20.4/settings.gradle.patch index 80df0c3..d4a07c4 100644 --- a/patches/1.20.4/settings.gradle.patch +++ b/patches/1.20.4/settings.gradle.patch @@ -5,7 +5,7 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - +rootProject.name = 'CraterLib-1.20.4' diff --git a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch index d6f899a..0a15cc8 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ -def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.20"; +def JDK = "17" diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch index f64945d..e3dd94e 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch @@ -4,9 +4,9 @@ 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.6"; -def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def JDK = "17"; +def majorMc = "1.20"; 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 cf6f1a9..9861d70 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,6 +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 -@@ -159,7 +159,7 @@ +@@ -37,7 +37,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -160,7 +159,7 @@ return new TextConfigOption<>(Objects::toString, BigDecimal::new); } if (value instanceof ResourceLocation) { @@ -9,15 +17,17 @@ } if (isSubConfig) { return new SubConfigWidget<>(config, this, value); -@@ -180,6 +180,7 @@ +@@ -180,7 +179,8 @@ + @Override public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { - overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); ++ overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + renderScrollBar(); matrices.pose().pushPose(); -@@ -188,9 +189,8 @@ +@@ -189,9 +189,8 @@ overlayBackground(matrices.pose(), height - BOTTOM, height, 64); renderShadow(matrices.pose()); matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF); @@ -28,7 +38,16 @@ int y = (int) (TOP + 4 - Math.round(scrollerAmount)); for (Option option : options) { -@@ -217,47 +217,49 @@ +@@ -199,7 +198,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -218,47 +217,49 @@ int maxY = this.height - BOTTOM; //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); @@ -110,21 +129,22 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -266,15 +268,16 @@ +@@ -267,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); -+ BufferBuilder buffer = tesselator.getBuilder(); -+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); +- //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()); ++ BufferBuilder buffer = tesselator.getBuilder(); ++ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION); ++ RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + 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(); @@ -135,7 +155,7 @@ } public int scrollHeight() { -@@ -332,12 +335,12 @@ +@@ -333,12 +335,12 @@ } @Override @@ -150,3 +170,12 @@ } @Override +@@ -385,7 +387,7 @@ + for (String desc : description) { + list.add(Component.translatable(desc)); + } +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); ++ stack.renderComponentTooltip(font, list, mouseX, mouseY); + } + } + } diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch index 2cec32a..bf3f3bd 100644 --- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -9,3 +9,12 @@ } public boolean isSinglePlayer() { +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index fa0669d..3300529 100644 --- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import lombok.Getter; -@@ -10,21 +10,16 @@ +@@ -10,46 +10,29 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.json.JSONOptions; @@ -28,11 +28,12 @@ @Getter - private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) + private static final GsonComponentSerializer adventureSerializer = (ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER) ? GsonComponentSerializer.builder().build() : GsonComponentSerializer.builder().options( - JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); -@@ -32,24 +27,12 @@ + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.20/Fabric/build.gradle.patch b/patches/1.20/Fabric/build.gradle.patch index 44e109d..87a8de6 100644 --- a/patches/1.20/Fabric/build.gradle.patch +++ b/patches/1.20/Fabric/build.gradle.patch @@ -12,8 +12,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.20/1.20.1] CraterLib - ${project.version}") + setGameVersions("1.20", "1.20.1") setLoaders("fabric", "quilt") diff --git a/patches/1.20/NeoForge/build.gradle.patch b/patches/1.20/NeoForge/build.gradle.patch index 5eede2e..9016d9f 100644 --- a/patches/1.20/NeoForge/build.gradle.patch +++ b/patches/1.20/NeoForge/build.gradle.patch @@ -121,8 +121,8 @@ - setVersionType("release") - setChangelog(rootProject.file("changelog.md")) - setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") diff --git a/patches/1.20/Paper/build.gradle.patch b/patches/1.20/Paper/build.gradle.patch index 4cc567c..12b9ff7 100644 --- a/patches/1.20/Paper/build.gradle.patch +++ b/patches/1.20/Paper/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[Paper 1.20-1.20.1] CraterLib - ${project.version}") + setGameVersions("1.20", "1.20.1") setLoaders("paper") diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index b77f4a1..e299eb5 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.20 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.83.0+1.20 diff --git a/patches/1.20/settings.gradle.patch b/patches/1.20/settings.gradle.patch index 720cc43..2fabd8f 100644 --- a/patches/1.20/settings.gradle.patch +++ b/patches/1.20/settings.gradle.patch @@ -5,7 +5,7 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - +rootProject.name = 'CraterLib-1.20' diff --git a/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch index 01f0a9d..4edeb16 100644 --- a/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.21.2/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.21.2"; pipeline { diff --git a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch index 55c3a38..9b9b808 100644 --- a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21.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.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.21.2"; def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def supportedMc = "1.21.3|1.21.4"; +def reltype = "snapshot"; diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index 8f76854..b01b32b 100644 --- a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -1,6 +1,32 @@ --- 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 @@ +@@ -37,7 +37,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -180,7 +179,7 @@ + + @Override + public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); ++ overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + renderScrollBar(); + + matrices.pose().pushPose(); +@@ -199,7 +198,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -234,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); @@ -11,7 +37,7 @@ //RenderSystem.enableTexture(); } } -@@ -242,8 +242,8 @@ +@@ -243,8 +242,8 @@ private void renderShadow(PoseStack matrices) { Tesselator tesselator = Tesselator.getInstance(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); @@ -22,7 +48,7 @@ //RenderSystem.disableTexture(); //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); Matrix4f matrix = matrices.last().pose(); -@@ -255,9 +255,9 @@ +@@ -256,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); @@ -34,13 +60,14 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -268,13 +268,13 @@ +@@ -269,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.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); ++ 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); @@ -50,3 +77,12 @@ } public int scrollHeight() { +@@ -385,7 +384,7 @@ + for (String desc : description) { + list.add(Component.translatable(desc)); + } +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); ++ stack.renderComponentTooltip(font, list, mouseX, mouseY); + } + } + } diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch new file mode 100644 index 0000000..c48cc36 --- /dev/null +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch new file mode 100644 index 0000000..4f50ed7 --- /dev/null +++ b/patches/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +@@ -25,7 +25,7 @@ + + @Getter + private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) + ).build(); + + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); diff --git a/patches/1.21.2/Fabric/build.gradle.patch b/patches/1.21.2/Fabric/build.gradle.patch new file mode 100644 index 0000000..4bfc411 --- /dev/null +++ b/patches/1.21.2/Fabric/build.gradle.patch @@ -0,0 +1,13 @@ +--- a/Fabric/build.gradle ++++ b/Fabric/build.gradle +@@ -117,8 +117,8 @@ + setVersionType("release") + setChangelog(rootProject.file("changelog.md")) + setProjectVersion("${minecraft_version}-${project.version}") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") ++ setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") ++ setGameVersions("1.21.3", "1.21.4") + setLoaders("fabric", "quilt") + setArtifact(remapJar) + setCurseEnvironment("both") diff --git a/patches/1.21.2/NeoForge/build.gradle.patch b/patches/1.21.2/NeoForge/build.gradle.patch index ffec57e..a2023fa 100644 --- a/patches/1.21.2/NeoForge/build.gradle.patch +++ b/patches/1.21.2/NeoForge/build.gradle.patch @@ -14,3 +14,14 @@ mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") } } +@@ -118,8 +113,8 @@ + setVersionType("release") + setChangelog(rootProject.file("changelog.md")) + setProjectVersion("${minecraft_version}-${project.version}") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") ++ setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") ++ setGameVersions("1.21.3", "1.21.4") + setLoaders("neoforge") + setArtifact(remapJar) + setCurseEnvironment("both") diff --git a/patches/1.21.2/Paper/build.gradle.patch b/patches/1.21.2/Paper/build.gradle.patch index 7ad249d..f0d2cb2 100644 --- a/patches/1.21.2/Paper/build.gradle.patch +++ b/patches/1.21.2/Paper/build.gradle.patch @@ -26,9 +26,14 @@ publisher { apiKeys { nightbloom(System.getenv("PLATFORM_KEY")) -@@ -71,8 +71,9 @@ - setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") - setGameVersions("1.21.3") +@@ -68,11 +68,12 @@ + setVersionType("alpha") + setChangelog(rootProject.file("changelog.md")) + setProjectVersion("${minecraft_version}-${project.version}") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") ++ setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") ++ setGameVersions("1.21.3") setLoaders("paper") - setArtifact(reobfJar.outputJar) + setArtifact(shadowJar) diff --git a/patches/1.21.2/gradle.properties.patch b/patches/1.21.2/gradle.properties.patch index 3b4ece8..84ec5fd 100644 --- a/patches/1.21.2/gradle.properties.patch +++ b/patches/1.21.2/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.21.3 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.16.7 +fabric_api=0.107.3+1.21.3 diff --git a/patches/1.21.2/settings.gradle.patch b/patches/1.21.2/settings.gradle.patch index a399196..40d3a7b 100644 --- a/patches/1.21.2/settings.gradle.patch +++ b/patches/1.21.2/settings.gradle.patch @@ -1,9 +1,11 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -15,5 +15,4 @@ +@@ -14,6 +14,5 @@ + } rootProject.name = 'CraterLib' - include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - ++include("Common", "Fabric", "NeoForge") +include 'Paper' diff --git a/patches/1.21.5/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21.5/.jenkins/Jenkinsfile.deploy.patch index 1857ad5..6bbd8f8 100644 --- a/patches/1.21.5/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.21.5/.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.6"; ++def majorMc = "1.21.5"; + + pipeline { + agent { @@ -26,25 +26,33 @@ } stage("Prepare") { diff --git a/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch index 720bff5..a4584d2 100644 --- a/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch @@ -1,10 +1,13 @@ --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot -@@ -3,8 +3,8 @@ +@@ -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.6"; ++def majorMc = "1.21.5"; def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def supportedMc = "1.21.5"; +def reltype = "snapshot"; diff --git a/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch new file mode 100644 index 0000000..6e63592 --- /dev/null +++ b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -0,0 +1,46 @@ +--- 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 +@@ -37,7 +37,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -180,7 +179,7 @@ + + @Override + public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); ++ overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + renderScrollBar(); + + matrices.pose().pushPose(); +@@ -199,7 +198,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -270,7 +269,7 @@ + BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); + //RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + //RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); +- //RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); ++ 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); +@@ -385,7 +384,7 @@ + for (String desc : description) { + list.add(Component.translatable(desc)); + } +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); ++ stack.renderComponentTooltip(font, list, mouseX, mouseY); + } + } + } diff --git a/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch new file mode 100644 index 0000000..c48cc36 --- /dev/null +++ b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch new file mode 100644 index 0000000..4f50ed7 --- /dev/null +++ b/patches/1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +@@ -25,7 +25,7 @@ + + @Getter + private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) + ).build(); + + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); diff --git a/patches/1.21.5/Fabric/build.gradle.patch b/patches/1.21.5/Fabric/build.gradle.patch index aad9c27..cd6416e 100644 --- a/patches/1.21.5/Fabric/build.gradle.patch +++ b/patches/1.21.5/Fabric/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.21.5] CraterLib - ${project.version}") + setGameVersions("1.21.5") setLoaders("fabric", "quilt") diff --git a/patches/1.21.5/NeoForge/build.gradle.patch b/patches/1.21.5/NeoForge/build.gradle.patch index 69a5e4b..c940548 100644 --- a/patches/1.21.5/NeoForge/build.gradle.patch +++ b/patches/1.21.5/NeoForge/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[NeoForge 1.21.5] CraterLib - ${project.version}") + setGameVersions("1.21.5") setLoaders("neoforge") diff --git a/patches/1.21.5/Paper/build.gradle.patch b/patches/1.21.5/Paper/build.gradle.patch index a9b8781..b7a5486 100644 --- a/patches/1.21.5/Paper/build.gradle.patch +++ b/patches/1.21.5/Paper/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[Paper 1.21.5] CraterLib - ${project.version}") + setGameVersions("1.21.5") setLoaders("paper") diff --git a/patches/1.21.5/gradle.properties.patch b/patches/1.21.5/gradle.properties.patch new file mode 100644 index 0000000..6c16da3 --- /dev/null +++ b/patches/1.21.5/gradle.properties.patch @@ -0,0 +1,18 @@ +--- a/gradle.properties ++++ b/gradle.properties +@@ -10,12 +10,12 @@ + mod_name=CraterLib + + # Shared +-minecraft_version=25w17a ++minecraft_version=1.21.5 + project_group=com.hypherionmc.craterlib + + # Fabric +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 ++fabric_loader=0.16.10 ++fabric_api=0.119.5+1.21.5 + + # Forge + forge_version=50.0.6 diff --git a/patches/1.21.5/settings.gradle.patch b/patches/1.21.5/settings.gradle.patch new file mode 100644 index 0000000..2aed624 --- /dev/null +++ b/patches/1.21.5/settings.gradle.patch @@ -0,0 +1,10 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -14,6 +14,6 @@ + } + + rootProject.name = 'CraterLib' +-include("Common", "Fabric"/*, "NeoForge"*/) ++include("Common", "Fabric", "NeoForge") + //include 'Paper' + diff --git a/patches/1.21/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21/.jenkins/Jenkinsfile.deploy.patch index 7fb572b..44d2ae1 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.21/.jenkins/Jenkinsfile.deploy.patch @@ -2,7 +2,7 @@ +++ b/.jenkins/Jenkinsfile.deploy @@ -1,5 +1,5 @@ def JDK = "21" --def majorMc = "1.21.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.21"; pipeline { diff --git a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch index 9c3c6b2..b66161e 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21/.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.5"; +-def majorMc = "1.21.6"; +def majorMc = "1.21"; def modLoaders = "neoforge|fabric|quilt|paper"; --def supportedMc = "1.21.5-rc1"; +-def supportedMc = "25w17a"; -def reltype = "experimental"; +def supportedMc = "1.21|1.21.1"; +def reltype = "snapshot"; diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch index ebb3de1..4e88cd8 100644 --- a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch @@ -1,6 +1,32 @@ --- 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 -@@ -218,7 +218,7 @@ +@@ -37,7 +37,6 @@ + /** + * @author HypherionSA + */ +-@SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "2.1.3") + public class CraterConfigScreen extends Screen { + public static final float SCROLLBAR_BOTTOM_COLOR = .5f; +@@ -180,7 +179,7 @@ + + @Override + public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) { +- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); ++ overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32); + renderScrollBar(); + + matrices.pose().pushPose(); +@@ -199,7 +198,7 @@ + option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta); + renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0])); + y += height1; +- }*/ ++ } + } + + private void renderScrollBar() { +@@ -219,7 +218,7 @@ //RenderSystem.disableTexture(); Tesselator tesselator = Tesselator.getInstance(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); @@ -9,7 +35,7 @@ buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255); buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255); -@@ -233,8 +233,8 @@ +@@ -234,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); @@ -20,7 +46,7 @@ //RenderSystem.enableTexture(); } } -@@ -242,10 +242,10 @@ +@@ -243,10 +242,10 @@ private void renderShadow(PoseStack matrices) { Tesselator tesselator = Tesselator.getInstance(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); @@ -34,7 +60,7 @@ 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); -@@ -255,9 +255,9 @@ +@@ -256,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); @@ -46,15 +72,16 @@ } protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) { -@@ -267,14 +267,14 @@ +@@ -268,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.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader); + RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); ++ 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); @@ -64,3 +91,12 @@ } public int scrollHeight() { +@@ -385,7 +384,7 @@ + for (String desc : description) { + list.add(Component.translatable(desc)); + } +- //stack.renderComponentTooltip(font, list, mouseX, mouseY); ++ stack.renderComponentTooltip(font, list, mouseX, mouseY); + } + } + } diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch new file mode 100644 index 0000000..c48cc36 --- /dev/null +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java +@@ -55,7 +55,7 @@ + } + + public String getGameVersion() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public String getUserName() { diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch new file mode 100644 index 0000000..a6d343d --- /dev/null +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java +@@ -38,7 +38,7 @@ + } + + public String getName() { +- return SharedConstants.getCurrentVersion().name(); ++ return SharedConstants.getCurrentVersion().getName(); + } + + public boolean usesAuthentication() { diff --git a/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch new file mode 100644 index 0000000..4f50ed7 --- /dev/null +++ b/patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -0,0 +1,11 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +@@ -25,7 +25,7 @@ + + @Getter + private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( +- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()) ++ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) + ).build(); + + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); diff --git a/patches/1.21/Fabric/build.gradle.patch b/patches/1.21/Fabric/build.gradle.patch index 3599791..b84d63f 100644 --- a/patches/1.21/Fabric/build.gradle.patch +++ b/patches/1.21/Fabric/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[FABRIC/QUILT 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[FABRIC/QUILT 1.21.x] CraterLib - ${project.version}") + setGameVersions("1.21", "1.21.1") setLoaders("fabric", "quilt") diff --git a/patches/1.21/NeoForge/build.gradle.patch b/patches/1.21/NeoForge/build.gradle.patch index d688266..c28f6c8 100644 --- a/patches/1.21/NeoForge/build.gradle.patch +++ b/patches/1.21/NeoForge/build.gradle.patch @@ -18,8 +18,8 @@ setVersionType("release") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}") -- setGameVersions("1.21.3", "1.21.4") +- setDisplayName("[NeoForge 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}") + setGameVersions("1.21", "1.21.1") setLoaders("neoforge") diff --git a/patches/1.21/Paper/build.gradle.patch b/patches/1.21/Paper/build.gradle.patch index e85bbff..6c6d4b3 100644 --- a/patches/1.21/Paper/build.gradle.patch +++ b/patches/1.21/Paper/build.gradle.patch @@ -4,8 +4,8 @@ setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) setProjectVersion("${minecraft_version}-${project.version}") -- setDisplayName("[Paper 1.21.3] CraterLib - ${project.version}") -- setGameVersions("1.21.3") +- setDisplayName("[Paper 1.21.6] CraterLib - ${project.version}") +- setGameVersions("1.21.6") + setDisplayName("[Paper 1.21-1.21.1] CraterLib - ${project.version}") + setGameVersions("1.21", "1.21.1") setLoaders("paper") diff --git a/patches/1.21/gradle.properties.patch b/patches/1.21/gradle.properties.patch index a13ebbe..6c77068 100644 --- a/patches/1.21/gradle.properties.patch +++ b/patches/1.21/gradle.properties.patch @@ -4,13 +4,13 @@ mod_name=CraterLib # Shared --minecraft_version=1.21.5 +-minecraft_version=25w17a +minecraft_version=1.21 project_group=com.hypherionmc.craterlib # Fabric --fabric_loader=0.16.10 --fabric_api=0.119.5+1.21.5 +-fabric_loader=0.16.13 +-fabric_api=0.119.10+1.21.6 +fabric_loader=0.15.11 +fabric_api=0.100.1+1.21 diff --git a/patches/1.21/settings.gradle.patch b/patches/1.21/settings.gradle.patch index a399196..40d3a7b 100644 --- a/patches/1.21/settings.gradle.patch +++ b/patches/1.21/settings.gradle.patch @@ -1,9 +1,11 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -15,5 +15,4 @@ +@@ -14,6 +14,5 @@ + } rootProject.name = 'CraterLib' - include("Common", "Fabric", "NeoForge") +-include("Common", "Fabric"/*, "NeoForge"*/) -//include 'Paper' - ++include("Common", "Fabric", "NeoForge") +include 'Paper'