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

[PORT] Update for 25w06a

Browse Source
This commit is contained in:
HypherionSA
2025-02-11 17:44:54 +02:00
parent 3986f08540
commit f33363fc2d
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/Jenkinsfile.deploy
View File

@@ -1,5 +1,5 @@
def JDK = "21" def JDK = "21"
def majorMc = "1.21.2"; def majorMc = "1.21.5";
pipeline { pipeline {
agent { agent {

8
.jenkins/Jenkinsfile.snapshot
View File

@@ -1,10 +1,10 @@
def projectName = "CraterLib"; def projectName = "CraterLib";
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
def JDK = "21"; def JDK = "21";
def majorMc = "1.21.2"; def majorMc = "1.21.5";
def modLoaders = "neoforge|fabric|quilt|paper"; def modLoaders = "neoforge|fabric|quilt|paper";
def supportedMc = "1.21.3|1.21.4"; def supportedMc = "25w06a";
def reltype = "port"; def reltype = "experimental";
pipeline { pipeline {
agent { agent {
@@ -63,7 +63,7 @@ pipeline {
projectIcon: "${projectIcon}", projectIcon: "${projectIcon}",
modLoaders: "${modLoaders}", modLoaders: "${modLoaders}",
minecraftVersions: "${supportedMc}", minecraftVersions: "${supportedMc}",
type: "snapshot", type: "experimental",
dependsOn: "", dependsOn: "",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"

2
Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
View File

@@ -53,6 +53,6 @@ public class CraterCommandEvent extends CraterEvent {
} }
public Component getMessage() { public Component getMessage() {
return ChatUtils.mojangToAdventure(ComponentArgument.getComponent(parseResults.getContext().build(parseResults.getReader().getString()), "message")); return ChatUtils.mojangToAdventure(ComponentArgument.getRawComponent(parseResults.getContext().build(parseResults.getReader().getString()), "message"));
} }
} }

6
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
View File

@@ -233,7 +233,7 @@ public class CraterConfigScreen extends Screen {
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 + 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((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); buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
BufferUploader.drawWithShader(buffer.buildOrThrow()); //BufferUploader.drawWithShader(buffer.buildOrThrow());
RenderSystem.disableBlend(); RenderSystem.disableBlend();
//RenderSystem.enableTexture(); //RenderSystem.enableTexture();
} }
@@ -255,7 +255,7 @@ public class CraterConfigScreen extends Screen {
buffer.addVertex(matrix, width, height - BOTTOM, 0.0F).setUv(1, 1).setColor(0, 0, 0, 185); buffer.addVertex(matrix, width, height - BOTTOM, 0.0F).setUv(1, 1).setColor(0, 0, 0, 185);
buffer.addVertex(matrix, width, height - BOTTOM - 4, 0.0F).setUv(1, 0).setColor(0, 0, 0, 0); buffer.addVertex(matrix, 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); buffer.addVertex(matrix, 0, height - BOTTOM - 4, 0.0F).setUv(0, 0).setColor(0, 0, 0, 0);
BufferUploader.drawWithShader(buffer.buildOrThrow()); //BufferUploader.drawWithShader(buffer.buildOrThrow());
//RenderSystem.enableTexture(); //RenderSystem.enableTexture();
RenderSystem.disableBlend(); RenderSystem.disableBlend();
} }
@@ -274,7 +274,7 @@ public class CraterConfigScreen extends Screen {
buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 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, 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); buffer.addVertex(matrix, minX, minY, 0.0F).setUv(minX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
BufferUploader.drawWithShader(buffer.buildOrThrow()); //BufferUploader.drawWithShader(buffer.buildOrThrow());
} }
public int scrollHeight() { public int scrollHeight() {

2
Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
View File

@@ -22,7 +22,7 @@ public class ServerGamePacketListenerImplMixin {
public ServerPlayer player; public ServerPlayer player;
@Inject( @Inject(
method = "lambda$handleChat$5", method = "lambda$handleChat$6",
at = @At("HEAD"), at = @At("HEAD"),
cancellable = true cancellable = true
) )

2
build.gradle
View File

@@ -11,7 +11,7 @@ plugins {
var relType = project.properties["releaseType"] ?: "${release_type}" var relType = project.properties["releaseType"] ?: "${release_type}"
ext { ext {
isPort = (relType == 'port') isPort = (relType == 'experimental')
} }
orion.setup { orion.setup {

8
gradle.properties
View File

@@ -10,12 +10,12 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=1.21.3 minecraft_version=25w06a
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.16.7 fabric_loader=0.16.10
fabric_api=0.107.3+1.21.3 fabric_api=0.116.0+1.21.5
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6
@@ -45,7 +45,7 @@ creative_core=6113754
# Publishing # Publishing
curse_id=867099 curse_id=867099
modrinth_id=Nn8Wasaq modrinth_id=Nn8Wasaq
release_type=port release_type=experimental
# Gradle # Gradle
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G

4
settings.gradle
View File

@@ -14,6 +14,6 @@ pluginManagement {
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
include("Common", "Fabric", "NeoForge") include("Common", "Fabric"/*, "NeoForge"*/)
include 'Paper' //include 'Paper'