Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-12-19 15:57:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
FlorianMichael 2024-02-14 02:30:09 +01:00
commit 2971cdedeb
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -13,14 +13,14 @@ plugins {
id "com.matthewprenger.cursegradle" version "1.4.0" id "com.matthewprenger.cursegradle" version "1.4.0"
id "com.modrinth.minotaur" version "2.8.7" id "com.modrinth.minotaur" version "2.8.7"
id "fabric-loom" version "1.5-SNAPSHOT" apply false id "fabric-loom" version "1.5-SNAPSHOT" apply false
id "com.github.ben-manes.versions" version "0.50.0" id "com.github.ben-manes.versions" version "0.51.0"
} }
def ENV = System.getenv() def ENV = System.getenv()
group = "com.viaversion.fabric" group = "com.viaversion.fabric"
description = "Client-side and server-side ViaVersion implementation for Fabric" description = "Client-side and server-side ViaVersion implementation for Fabric"
version = "0.4.12+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch() version = "0.4.13+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch()
logger.lifecycle("Building ViaFabric: $version") logger.lifecycle("Building ViaFabric: $version")
def getBranch() { def getBranch() {
@ -166,7 +166,7 @@ processResources {
List<String> mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(",")) List<String> mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(","))
.map({ it -> it.trim() }) .map({ it -> it.trim() })
.collect(Collectors.toList()) .collect(Collectors.toList())
List<String> javaVersions = IntStream.rangeClosed(8, 18) List<String> javaVersions = IntStream.rangeClosed(8, 17)
.mapToObj { n -> (String) "Java $n" } .mapToObj { n -> (String) "Java $n" }
.collect(Collectors.toList()) .collect(Collectors.toList())
String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits" String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits"

2
gradle.properties
View File

@ -5,7 +5,7 @@ loader_version=0.15.6
viaver_version=4.10.0-24w06a-SNAPSHOT viaver_version=4.10.0-24w06a-SNAPSHOT
yaml_version=2.2 yaml_version=2.2
publish_mc_versions=1.20.4, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9 publish_mc_versions=1.20.4, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.12.2, 1.8.9
# example: 1.19.1-rc1. Can be a blank value # example: 1.19.1-rc1. Can be a blank value
modrinth_mc_snapshot= modrinth_mc_snapshot=
# example: 1.19-Snapshot. Can be a blank value # example: 1.19-Snapshot. Can be a blank value

2
src/main/resources/fabric.mod.json
View File

@ -13,7 +13,7 @@
}, },
"depends": { "depends": {
"fabricloader": ">=0.14.0", "fabricloader": ">=0.14.0",
"minecraft": ["1.8.9", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", ">=1.20.3"], "minecraft": ["1.8.9", "1.12.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", ">=1.20.3"],
"viaversion": ">=4.9.1" "viaversion": ">=4.9.1"
}, },
"breaks": { "breaks": {

6
viafabric-mc112/src/main/resources/mixins.viafabric112.pipeline.json
View File

@ -4,12 +4,12 @@
"package": "com.viaversion.fabric.mc112.mixin.pipeline", "package": "com.viaversion.fabric.mc112.mixin.pipeline",
"mixins": [ "mixins": [
"MixinClientConnection", "MixinClientConnection",
"MixinServerNetworkIoChInit", "MixinServerNetworkIoChInit"
"client.MixinHandshakeC2SPacket"
], ],
"client": [ "client": [
"client.MixinClientConnection", "client.MixinClientConnection",
"client.MixinClientConnectionChInit" "client.MixinClientConnectionChInit",
"client.MixinHandshakeC2SPacket"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1

2
viafabric-mc18/build.gradle.kts
View File

@ -1,6 +1,6 @@
dependencies { dependencies {
minecraft("com.mojang:minecraft:1.8.9") minecraft("com.mojang:minecraft:1.8.9")
mappings("net.legacyfabric:yarn:1.8.9+build.532:v2") mappings("net.legacyfabric:yarn:1.8.9+build.535:v2")
modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.1+1.8.9") modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.1+1.8.9")
modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") { modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") {