Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
matrix:
# Use these Java versions
java: [
21, # Current Java LTS & minimum supported by Minecraft
25, # Required by Minecraft 26.x
]
# and run on both Linux and Windows
os: [ubuntu-24.04]
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
GITHUB_EVENT_RAW_PATH: ${{ github.event_path }}
continue-on-error: true
- name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
if: ${{ runner.os == 'Linux' && matrix.java == '25' }} # Only upload artifacts built from latest java on one OS
uses: actions/upload-artifact@v4
with:
name: Artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checkMappings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
matrix:
# Use these Java versions
java: [
21, # Current Java LTS & minimum supported by Minecraft
25, # Required by Minecraft 26.x
]
# and run on both Linux and Windows
os: [ubuntu-24.04]
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pipeline {
}
stage('Build') {
tools {
jdk "OpenJDK 21"
jdk "OpenJDK 25"
}
steps {
withMaven(
Expand Down
16 changes: 14 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
plugins {
id 'fabric-loom' version '1.13-SNAPSHOT' apply false
id 'fabric-loom' version '1.17.21' apply false
id 'com.gradleup.shadow' version '9.2.1' apply false
id 'dev.yumi.gradle.licenser' version '2.1.1' apply false
id 'dev.yumi.gradle.licenser' version '4.0.0' apply false
id 'com.modrinth.minotaur' version '2.+' apply false
id 'io.github.themrmilchmann.curseforge-publish' version '0.8.0' apply false
}

ext.remapJarTaskType = net.fabricmc.loom.task.RemapJarTask
ext.curseforgeAlpha = io.github.themrmilchmann.gradle.publish.curseforge.ReleaseType.ALPHA
ext.curseforgeMarkdown = io.github.themrmilchmann.gradle.publish.curseforge.ChangelogFormat.MARKDOWN

subprojects {
apply plugin: 'java'
apply plugin: 'java-library'
Expand All @@ -18,8 +22,10 @@ subprojects {
}

version = project.mod_version + "." + getVersionSuffix()
if (project.name == 'fabric-26') version += '.mc26'

license {
include '**/*.java'
rule(rootProject.file('HEADER.txt'))
}

Expand Down Expand Up @@ -62,6 +68,12 @@ subprojects {
versionType = "alpha" // This is the default -- can also be `beta` or `alpha`
// uploadFile = remapShadowJar // With Loom, this MUST be set to `remapJar` instead of `jar`!
gameVersions = ["1.18", "1.18.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"]
def modernVersions = ['26.1', '26.1.1', '26.1.2', '26.2', '26.3']
if (project.name == 'fabric-26') {
gameVersions = modernVersions
} else if (project.name != 'fabric') {
gameVersions.addAll(modernVersions)
}
// loaders = ["fabric"]
changelog = com.ishland.buildscript.ParseGItHubActionChangelog.getChangelog()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
compressedFrameData.release();
if (payload != null) payload.release();
}
return;
} else if (compressedFrameData.getPacketId() == compressedPacketId && compressedFrameData.getReliability().isReliable && compressedFrameData.getReliability().isOrdered && !compressedFrameData.getReliability().isSequenced && inflaters[compressedFrameData.getOrderChannel()] != null) {
final int orderChannel = compressedFrameData.getOrderChannel();
final Inflater inflater = inflaters[orderChannel];
Expand Down
Loading