Skip to content

Commit

Permalink
Merge pull request #268 from OKTW-Network/1.21.3
Browse files Browse the repository at this point in the history
1.21.3
  • Loading branch information
james58899 authored Nov 26, 2024
2 parents d72a9eb + 48b1424 commit 354100a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
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 --link https://api.papermc.io/v2/projects/velocity/versions/3.3.0-SNAPSHOT/builds/414/downloads/velocity-3.3.0-SNAPSHOT-414.jar /app/velocity.jar
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

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

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

group 'one.oktw'
Expand All @@ -23,14 +23,14 @@ repositories {
}

dependencies {
kapt 'com.velocitypowered:velocity-api:3.3.0-SNAPSHOT'
compileOnly 'com.velocitypowered:velocity-api:3.3.0-SNAPSHOT'
implementation 'io.fabric8:kubernetes-client:6.13.3'
implementation 'io.fabric8:kubernetes-httpclient-okhttp:6.13.3'
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 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0'
implementation 'io.lettuce:lettuce-core:6.4.0.RELEASE'
implementation 'io.lettuce:lettuce-core:6.5.0.RELEASE'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactive' // lettuce need this
implementation 'one.oktw:galaxy-lib:7376fcdf'
implementation 'one.oktw:galaxy-lib:c328418'
}

compileKotlin {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-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 = 498 // default Minecraft 1.14.4
val ProtocolVersion: Int = 768 // default Minecraft 1.21.3
)
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": 767
"ProtocolVersion": 768
}

0 comments on commit 354100a

Please sign in to comment.