firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[DEV] Rebuild porting patches

Browse Source
This commit is contained in:
HypherionSA
2025-04-28 13:49:31 +02:00
parent fe00eabdff
commit 799a0fecc7
100 changed files with 789 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
+++ b/.jenkins/Jenkinsfile.deploy
@@ -1,5 +1,5 @@
def JDK = "21"
-def majorMc = "1.21.5";
-def majorMc = "1.21.6";
+def majorMc = "1.21";
pipeline {

4
patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -4,10 +4,10 @@
def projectName = "CraterLib";
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
def JDK = "21";
-def majorMc = "1.21.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";

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

@@ -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);
}
}
}

11
patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch Normal file
View File

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

11
patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch Normal file
View File

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

11
patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch Normal file
View File

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

4
patches/1.21/Fabric/build.gradle.patch
View File

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

4
patches/1.21/NeoForge/build.gradle.patch
View File

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

4
patches/1.21/Paper/build.gradle.patch
View File

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

6
patches/1.21/gradle.properties.patch
View File

@@ -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

6
patches/1.21/settings.gradle.patch
View File

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