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.19.3/.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.19.3";
+def JDK = "17"

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

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

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

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

9
patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch
View File

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

11
patches/1.19.3/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() {

7
patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
View File

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

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

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

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

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

4
patches/1.19.3/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.19.4] CraterLib - ${project.version}")
+ setGameVersions("1.19.4")
setLoaders("paper")

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

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

2
patches/1.19.3/settings.gradle.patch
View File

@@ -5,7 +5,7 @@
}
-rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge")
-include("Common", "Fabric"/*, "NeoForge"*/)
-//include 'Paper'
-
+rootProject.name = 'CraterLib-1.19.3'