Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21.4 #274

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8c7b99a
Bump org.jetbrains.kotlin.jvm from 2.0.21 to 2.1.0
dependabot[bot] Nov 28, 2024
e78b092
Bump org.jetbrains.kotlin.kapt from 2.0.21 to 2.1.0
dependabot[bot] Nov 28, 2024
94dad7b
Bump io.lettuce:lettuce-core from 6.5.0.RELEASE to 6.5.1.RELEASE
dependabot[bot] Dec 2, 2024
77b5f2c
Bump io.fabric8:kubernetes-httpclient-okhttp from 6.13.4 to 7.0.0
dependabot[bot] Dec 4, 2024
10b1fdc
Merge remote-tracking branch 'origin/dependabot/gradle/org.jetbrains.…
jimchen5209 Dec 4, 2024
6c7078e
Merge remote-tracking branch 'origin/dependabot/gradle/org.jetbrains.…
jimchen5209 Dec 4, 2024
8bed22e
Merge remote-tracking branch 'origin/dependabot/gradle/io.lettuce-let…
jimchen5209 Dec 4, 2024
a9c4477
Merge remote-tracking branch 'origin/dependabot/gradle/io.fabric8-kub…
jimchen5209 Dec 4, 2024
b32df66
build: bump kubernetes client to 7.0.0
jimchen5209 Dec 4, 2024
7b64c79
build: bump galaxy lib to bcf8f61
jimchen5209 Dec 4, 2024
7bab939
feat: bump minecraft version 1.21.4
jimchen5209 Dec 4, 2024
a01484d
build: bump gradle to 8.11.1
jimchen5209 Dec 4, 2024
97d1cd9
Bump io.fabric8:kubernetes-httpclient-okhttp from 6.13.4 to 7.0.1
dependabot[bot] Dec 18, 2024
7e1f186
Bump io.fabric8:kubernetes-client from 6.13.4 to 7.0.1
dependabot[bot] Dec 18, 2024
952815c
Merge remote-tracking branch 'origin/dependabot/gradle/io.fabric8-kub…
jimchen5209 Dec 25, 2024
2d6700e
Merge remote-tracking branch 'origin/dependabot/gradle/io.fabric8-kub…
jimchen5209 Dec 25, 2024
0b5ad85
build: update velocity
jimchen5209 Dec 25, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /app
COPY --chown=1000 --link docker /app

# Download Velocity
ADD --chown=1000 --checksum=sha256:845cb2c1891544ad9e432883d7ddf059284d9d178b97be4977e5f805746c9edd --link https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/450/downloads/velocity-3.4.0-SNAPSHOT-450.jar /app/velocity.jar
ADD --chown=1000 --checksum=sha256:0ed9a02dcb102b3a665ce9615691df32e919a0e7e986d86e932d52adf1bd3119 --link https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/458/downloads/velocity-3.4.0-SNAPSHOT-458.jar /app/velocity.jar

# Run Server
EXPOSE 25565
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'org.jetbrains.kotlin.jvm' version '2.0.21'
id "org.jetbrains.kotlin.kapt" version "2.0.21"
id 'org.jetbrains.kotlin.jvm' version '2.1.0'
id "org.jetbrains.kotlin.kapt" version "2.1.0"
id 'com.gradleup.shadow' version '8.3.5'
}

Expand All @@ -25,12 +25,12 @@ repositories {
dependencies {
kapt 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT'
compileOnly 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT'
implementation 'io.fabric8:kubernetes-client:6.13.4'
implementation 'io.fabric8:kubernetes-httpclient-okhttp:6.13.4'
implementation 'io.fabric8:kubernetes-client:7.0.1'
implementation 'io.fabric8:kubernetes-httpclient-okhttp:7.0.1'
implementation 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0'
implementation 'io.lettuce:lettuce-core:6.5.0.RELEASE'
implementation 'io.lettuce:lettuce-core:6.5.1.RELEASE'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactive' // lettuce need this
implementation 'one.oktw:galaxy-lib:c328418'
implementation 'one.oktw:galaxy-lib:bcf8f61'
}

compileKotlin {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package one.oktw.galaxy.proxy.config.model

data class ProxyConfig(
val ProtocolVersion: Int = 768 // default Minecraft 1.21.3
val ProtocolVersion: Int = 769 // default Minecraft 1.21.4
)
2 changes: 1 addition & 1 deletion src/main/resources/config/proxy.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ProtocolVersion": 768
"ProtocolVersion": 769
}
Loading