mirror of
https://github.com/ViaVersion/ViaFabric.git
synced 2025-02-21 02:11:21 +01:00
Updates from main
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc> Co-authored-by: Kichura <68134602+kichura@users.noreply.github.com>
This commit is contained in:
parent
d7def6a754
commit
6bf8c2aa53
@ -10,7 +10,7 @@
|
||||
|
||||
Allows the connection to/from different Minecraft versions on your Minecraft client/server (LAN worlds too)
|
||||
|
||||
This mod can be installed on 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.1, 1.20.4, 1.20.6, 1.21.1 with Fabric Loader.
|
||||
This mod can be installed on 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.1, 1.20.4, 1.20.6, 1.21.4 with Fabric Loader.
|
||||
|
||||
The `legacy` branch also supports Legacy Fabric 1.8.9 and 1.12.2 versions.
|
||||
|
||||
@ -55,7 +55,7 @@ registry synchronization (fabric-registry-sync mod).
|
||||
| | 1.8.x | 1.9.x | 1.10-1.20.x | 1.21.x |
|
||||
|-----------------------|-------|-------|-------------|--------|
|
||||
| 1.14.4-1.20.6 clients | ✓ | ✓ | ✓ | ⟲ | ⟲ ⟲ | ⟲ | ⟲ | ⟲ | ⟲ |
|
||||
| 1.21.1 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
|
||||
| 1.21.4 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
|
||||
|
||||
✓ = [ViaVersion](https://viaversion.com) ⟲ = [ViaBackwards](https://viaversion.com/backwards) ⏪
|
||||
= [ViaRewind](https://viaversion.com/rewind)
|
||||
|
13
build.gradle
13
build.gradle
@ -9,20 +9,20 @@ import java.util.stream.IntStream
|
||||
plugins {
|
||||
id "java"
|
||||
id "maven-publish"
|
||||
id "org.ajoberstar.grgit" version "5.2.2"
|
||||
id "org.ajoberstar.grgit" version "5.3.0"
|
||||
id "com.matthewprenger.cursegradle" version "1.4.0" // This repository is archived on GH
|
||||
id "com.modrinth.minotaur" version "2.8.7"
|
||||
id "fabric-loom" version "1.8-SNAPSHOT" apply false
|
||||
id "legacy-looming" version "1.8-SNAPSHOT" apply false // Version = fabric-loom
|
||||
id "fabric-loom" version "1.9-SNAPSHOT" apply false
|
||||
id "legacy-looming" version "1.9-SNAPSHOT" apply false // Version = fabric-loom
|
||||
id "com.github.ben-manes.versions" version "0.51.0"
|
||||
id "xyz.wagyourtail.jvmdowngrader" version "0.7.1"
|
||||
id "xyz.wagyourtail.jvmdowngrader" version "1.2.1"
|
||||
}
|
||||
|
||||
def ENV = System.getenv()
|
||||
|
||||
group = "com.viaversion.fabric"
|
||||
description = "Client-side and server-side ViaVersion implementation for Fabric"
|
||||
version = "0.4.16+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch()
|
||||
version = "0.4.17+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch()
|
||||
logger.lifecycle("Building ViaFabric: $version")
|
||||
|
||||
def getBranch() {
|
||||
@ -68,6 +68,7 @@ allprojects {
|
||||
maven { url = "https://maven.fabricmc.net/" }
|
||||
maven { url = "https://maven.legacyfabric.net/" }
|
||||
maven { url = "https://maven.terraformersmc.com/releases/" }
|
||||
maven { url = "https://maven.nucleoid.xyz/" }
|
||||
maven { url = "https://jitpack.io/" }
|
||||
}
|
||||
|
||||
@ -190,7 +191,7 @@ processResources {
|
||||
List<String> mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(","))
|
||||
.map({ it -> it.trim() })
|
||||
.collect(Collectors.toList())
|
||||
List<String> javaVersions = IntStream.rangeClosed(8, 22)
|
||||
List<String> javaVersions = IntStream.rangeClosed(8, 24)
|
||||
.mapToObj { n -> (String) "Java $n" }
|
||||
.collect(Collectors.toList())
|
||||
String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits"
|
||||
|
@ -1,10 +1,10 @@
|
||||
# suppress inspection "UnusedProperty" for whole file
|
||||
org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication
|
||||
|
||||
loader_version=0.16.7
|
||||
viaver_version=5.1.1
|
||||
viaback_version=5.1.1
|
||||
viarewind_version=4.0.3
|
||||
loader_version=0.16.9
|
||||
viaver_version=5.2.0
|
||||
viaback_version=5.2.0
|
||||
viarewind_version=4.0.4
|
||||
|
||||
publish_mc_versions=1.12.2, 1.8.9
|
||||
# example: 1.19.1-rc1. Can be a blank value
|
||||
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,7 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
2
gradlew
vendored
2
gradlew
vendored
@ -203,7 +203,7 @@ fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
|
2
gradlew.bat
vendored
2
gradlew.bat
vendored
@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME%
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
@ -3,5 +3,5 @@
|
||||
before_install:
|
||||
- curl -s "https://get.sdkman.io" | bash
|
||||
- source ~/.sdkman/bin/sdkman-init.sh
|
||||
- sdk install java 21.0.3-tem
|
||||
- sdk use java 21.0.3-tem
|
||||
- sdk install java 21.0.5-tem
|
||||
- sdk use java 21.0.5-tem
|
||||
|
@ -13,5 +13,5 @@ include("viafabric-mc189")
|
||||
include("viafabric-mc1122")
|
||||
|
||||
plugins {
|
||||
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
|
||||
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user