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

fix build

Browse Source
This commit is contained in:
creeper123123321 2021-05-02 12:26:15 -03:00
parent c09d6f0a74
commit 8c2ff4562c
28 changed files with 82 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OLD_LICENSE.txt
View File

@ -1,22 +0,0 @@
MIT License
Copyright (c) 2018-2021 creeper123123321 <https://creeper123123321.keybase.pub/>
Copyright (c) 2019-2021 contributors <https://github.com/ViaVersion/ViaFabric/graphs/contributors>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

15
README.md
View File

@ -9,19 +9,18 @@
Allows the connection to/from different Minecraft versions on your Minecraft client/server (LAN worlds too)
This mod can be installed on 1.8.9, 1.14.x, 1.15.x, 1.16.x and 1.17 snapshots (in separate branches) with Fabric Loader.
Check the Minecraft version in file name when downloading from CurseForge/GitHub Releases.
This mod can be installed on 1.8.9, 1.14.x, 1.15.x, 1.16.x and 1.17 snapshots with Fabric Loader.
Note: ViaVersion is designed for Vanilla Minecraft servers. It probably will not work with modded registry entries
or registry synchronization (fabric-registry-sync mod).
| Dependency | Download |
| --------------------------------------------- | ------------------------------------------------------------------- |
| (Bundled) ViaVersion | https://viaversion.com/ |
| (Bundled) Cotton Client Commands (MC 1.14-15) | https://www.curseforge.com/minecraft/mc-mods/cotton-client-commands |
| Fabric API (MC 1.14+) | https://www.curseforge.com/minecraft/mc-mods/fabric-api |
| Legacy Fabric API (MC 1.8.9) | https://www.curseforge.com/minecraft/mc-mods/legacy-fabric-api |
| Dependency | Download |
| ---------------------------------------------- | ------------------------------------------------------------------- |
| (Bundled) ViaVersion | https://viaversion.com/ |
| (Optional) Cotton Client Commands (MC 1.14-15) | https://www.curseforge.com/minecraft/mc-mods/cotton-client-commands |
| Fabric API (MC 1.14+) | https://www.curseforge.com/minecraft/mc-mods/fabric-api |
| Legacy Fabric API (MC 1.8.9) | https://www.curseforge.com/minecraft/mc-mods/legacy-fabric-api |
## ViaVersion

3
build.gradle
View File

@ -280,7 +280,6 @@ dependencies {
include("com.viaversion:viaversion:4.0.0-21w17a")
include("org.yaml:snakeyaml:1.28")
include("io.github.cottonmc:cotton-client-commands:1.0.0+1.15.2")
afterEvaluate {
subprojects.each {
@ -309,7 +308,7 @@ curseforge {
relations {
requiredDependency("fabric-api")
requiredDependency("legacy-fabric-api")
embeddedLibrary("cotton-client-commands")
optionalDependency("cotton-client-commands")
}
}

4
viafabric-mc114/src/main/resources/fabric.mod.json
View File

@ -39,7 +39,6 @@
]
},
"depends": {
"cotton-client-commands": "*",
"fabricloader": ">=0.4.0",
"fabric-resource-loader-v0": "*",
"minecraft": "1.14.x",
@ -49,7 +48,8 @@
"fabric-registry-sync-v0": "*"
},
"recommends": {
"fabric-command-api-v1": "*"
"fabric-command-api-v1": "*",
"cotton-client-commands": "*"
},
"icon": "assets/viafabric/textures/logo.png",
"mixins": [

7
viafabric-mc114/src/main/resources/mixins.viafabric.address.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc114.mixin.address",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc114.mixin.address.client.MixinConnectScreenThread",
"com.viaversion.fabric.mc114.mixin.address.client.MixinServerAddress",
"com.viaversion.fabric.mc114.mixin.address.client.MixinServerPinger"
"client.MixinConnectScreenThread",
"client.MixinServerAddress",
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1

5
viafabric-mc114/src/main/resources/mixins.viafabric.debug.json
View File

@ -1,11 +1,12 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc114.mixin.debug",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc114.mixin.debug.client.MixinClientConnectionAccessor",
"com.viaversion.fabric.mc114.mixin.debug.client.MixinDebugHud"
"client.MixinClientConnectionAccessor",
"client.MixinDebugHud"
],
"injectors": {
"defaultRequire": 0

3
viafabric-mc114/src/main/resources/mixins.viafabric.gui.json
View File

@ -1,10 +1,11 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc114.mixin.gui",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc114.mixin.gui.client.MixinMultiplayerScreen"
"client.MixinMultiplayerScreen"
],
"injectors": {
"defaultRequire": 0

7
viafabric-mc114/src/main/resources/mixins.viafabric.pipeline.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc114.mixin.pipeline",
"mixins": [
"com.viaversion.fabric.mc114.mixin.pipeline.MixinClientConnection",
"com.viaversion.fabric.mc114.mixin.pipeline.MixinServerNetworkIoChInit"
"MixinClientConnection",
"MixinServerNetworkIoChInit"
],
"client": [
"com.viaversion.fabric.mc114.mixin.pipeline.client.MixinClientConnectionChInit"
"client.MixinClientConnectionChInit"
],
"injectors": {
"defaultRequire": 1

1
viafabric-mc115/build.gradle.kts
View File

@ -7,4 +7,5 @@ dependencies {
modImplementation("net.fabricmc.fabric-api:fabric-api:0.19.0+build.325-1.15")
modImplementation("io.github.prospector:modmenu:1.10.2+build.32")
modImplementation("io.github.cottonmc:cotton-client-commands:1.0.0+1.15.2")
}

4
viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/platform/VRPlatform.java
View File

@ -132,7 +132,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
}
@Override
public PlatformTask runSync(Runnable runnable, Long ticks) {
public PlatformTask runSync(Runnable runnable, long ticks) {
// ViaVersion seems to not need to run delayed tasks on main thread
return new FutureTaskId(
ViaFabric.EVENT_LOOP
@ -142,7 +142,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
}
@Override
public PlatformTask runRepeatingSync(Runnable runnable, Long ticks) {
public PlatformTask runRepeatingSync(Runnable runnable, long ticks) {
// ViaVersion seems to not need to run repeating tasks on main thread
return new FutureTaskId(
ViaFabric.EVENT_LOOP

4
viafabric-mc115/src/main/resources/fabric.mod.json
View File

@ -39,7 +39,6 @@
]
},
"depends": {
"cotton-client-commands": "*",
"fabricloader": ">=0.4.0",
"fabric-resource-loader-v0": "*",
"minecraft": "1.15.x",
@ -49,7 +48,8 @@
"fabric-registry-sync-v0": "*"
},
"recommends": {
"fabric-command-api-v1": "*"
"fabric-command-api-v1": "*",
"cotton-client-commands": "*"
},
"icon": "assets/viafabric/textures/logo.png",
"mixins": [

7
viafabric-mc115/src/main/resources/mixins.viafabric.address.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc115.mixin.address",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc115.mixin.address.client.MixinConnectScreenThread",
"com.viaversion.fabric.mc115.mixin.address.client.MixinServerAddress",
"com.viaversion.fabric.mc115.mixin.address.client.MixinServerPinger"
"client.MixinConnectScreenThread",
"client.MixinServerAddress",
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1

5
viafabric-mc115/src/main/resources/mixins.viafabric.debug.json
View File

@ -1,11 +1,12 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc115.mixin.debug",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc115.mixin.debug.client.MixinClientConnectionAccessor",
"com.viaversion.fabric.mc115.mixin.debug.client.MixinDebugHud"
"client.MixinClientConnectionAccessor",
"client.MixinDebugHud"
],
"injectors": {
"defaultRequire": 0

3
viafabric-mc115/src/main/resources/mixins.viafabric.gui.json
View File

@ -1,10 +1,11 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc115.mixin.gui",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc115.mixin.gui.client.MixinMultiplayerScreen"
"client.MixinMultiplayerScreen"
],
"injectors": {
"defaultRequire": 0

7
viafabric-mc115/src/main/resources/mixins.viafabric.pipeline.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc115.mixin.pipeline",
"mixins": [
"com.viaversion.fabric.mc115.mixin.pipeline.MixinClientConnection",
"com.viaversion.fabric.mc115.mixin.pipeline.MixinServerNetworkIoChInit"
"MixinClientConnection",
"MixinServerNetworkIoChInit"
],
"client": [
"com.viaversion.fabric.mc115.mixin.pipeline.client.MixinClientConnectionChInit"
"client.MixinClientConnectionChInit"
],
"injectors": {
"defaultRequire": 1

4
viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/platform/VRPlatform.java
View File

@ -131,7 +131,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
}
@Override
public PlatformTask runSync(Runnable runnable, Long ticks) {
public PlatformTask runSync(Runnable runnable, long ticks) {
// ViaVersion seems to not need to run delayed tasks on main thread
return new FutureTaskId(
ViaFabric.EVENT_LOOP
@ -141,7 +141,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
}
@Override
public PlatformTask runRepeatingSync(Runnable runnable, Long ticks) {
public PlatformTask runRepeatingSync(Runnable runnable, long ticks) {
// ViaVersion seems to not need to run repeating tasks on main thread
return new FutureTaskId(
ViaFabric.EVENT_LOOP

7
viafabric-mc116/src/main/resources/mixins.viafabric.address.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc116.mixin.address",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc116.mixin.address.client.MixinConnectScreenThread",
"com.viaversion.fabric.mc116.mixin.address.client.MixinServerAddress",
"com.viaversion.fabric.mc116.mixin.address.client.MixinServerPinger"
"client.MixinConnectScreenThread",
"client.MixinServerAddress",
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1

5
viafabric-mc116/src/main/resources/mixins.viafabric.debug.json
View File

@ -1,11 +1,12 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc116.mixin.debug",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc116.mixin.debug.client.MixinClientConnectionAccessor",
"com.viaversion.fabric.mc116.mixin.debug.client.MixinDebugHud"
"client.MixinClientConnectionAccessor",
"client.MixinDebugHud"
],
"injectors": {
"defaultRequire": 0

3
viafabric-mc116/src/main/resources/mixins.viafabric.gui.json
View File

@ -1,10 +1,11 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc116.mixin.gui",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc116.mixin.gui.client.MixinMultiplayerScreen"
"client.MixinMultiplayerScreen"
],
"injectors": {
"defaultRequire": 0

7
viafabric-mc116/src/main/resources/mixins.viafabric.pipeline.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc116.mixin.pipeline",
"mixins": [
"com.viaversion.fabric.mc116.mixin.pipeline.MixinClientConnection",
"com.viaversion.fabric.mc116.mixin.pipeline.MixinServerNetworkIoChInit"
"MixinClientConnection",
"MixinServerNetworkIoChInit"
],
"client": [
"com.viaversion.fabric.mc116.mixin.pipeline.client.MixinClientConnectionChInit"
"client.MixinClientConnectionChInit"
],
"injectors": {
"defaultRequire": 1

7
viafabric-mc117/src/main/resources/mixins.viafabric.address.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc117.mixin.address",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc117.mixin.address.client.MixinConnectScreenThread",
"com.viaversion.fabric.mc117.mixin.address.client.MixinServerAddress",
"com.viaversion.fabric.mc117.mixin.address.client.MixinServerPinger"
"client.MixinConnectScreenThread",
"client.MixinServerAddress",
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1

5
viafabric-mc117/src/main/resources/mixins.viafabric.debug.json
View File

@ -1,11 +1,12 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc117.mixin.debug",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc117.mixin.debug.client.MixinClientConnectionAccessor",
"com.viaversion.fabric.mc117.mixin.debug.client.MixinDebugHud"
"client.MixinClientConnectionAccessor",
"client.MixinDebugHud"
],
"injectors": {
"defaultRequire": 0

3
viafabric-mc117/src/main/resources/mixins.viafabric.gui.json
View File

@ -1,10 +1,11 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc117.mixin.gui",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc117.mixin.gui.client.MixinMultiplayerScreen"
"client.MixinMultiplayerScreen"
],
"injectors": {
"defaultRequire": 0

7
viafabric-mc117/src/main/resources/mixins.viafabric.pipeline.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc117.mixin.pipeline",
"mixins": [
"com.viaversion.fabric.mc117.mixin.pipeline.MixinClientConnection",
"com.viaversion.fabric.mc117.mixin.pipeline.MixinServerNetworkIoChInit"
"MixinClientConnection",
"MixinServerNetworkIoChInit"
],
"client": [
"com.viaversion.fabric.mc117.mixin.pipeline.client.MixinClientConnectionChInit"
"client.MixinClientConnectionChInit"
],
"injectors": {
"defaultRequire": 1

7
viafabric-mc18/src/main/resources/mixins.viafabric.address.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc18.mixin.address",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc18.mixin.address.client.MixinConnectScreenThread",
"com.viaversion.fabric.mc18.mixin.address.client.MixinServerAddress",
"com.viaversion.fabric.mc18.mixin.address.client.MixinServerPinger"
"client.MixinConnectScreenThread",
"client.MixinServerAddress",
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1

5
viafabric-mc18/src/main/resources/mixins.viafabric.debug.json
View File

@ -1,11 +1,12 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc18.mixin.debug",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc18.mixin.debug.client.MixinClientConnectionAccessor",
"com.viaversion.fabric.mc18.mixin.debug.client.MixinDebugHud"
"client.MixinClientConnectionAccessor",
"client.MixinDebugHud"
],
"injectors": {
"defaultRequire": 0

3
viafabric-mc18/src/main/resources/mixins.viafabric.gui.json
View File

@ -1,10 +1,11 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc18.mixin.gui",
"mixins": [
],
"client": [
"com.viaversion.fabric.mc18.mixin.gui.client.MixinMultiplayerScreen"
"client.MixinMultiplayerScreen"
],
"injectors": {
"defaultRequire": 0

7
viafabric-mc18/src/main/resources/mixins.viafabric.pipeline.json
View File

@ -1,12 +1,13 @@
{
"required": true,
"compatibilityLevel": "JAVA_8",
"package": "com.viaversion.fabric.mc18.mixin.pipeline",
"mixins": [
"com.viaversion.fabric.mc18.mixin.pipeline.MixinClientConnection",
"com.viaversion.fabric.mc18.mixin.pipeline.MixinServerNetworkIoChInit"
"MixinClientConnection",
"MixinServerNetworkIoChInit"
],
"client": [
"com.viaversion.fabric.mc18.mixin.pipeline.client.MixinClientConnectionChInit"
"client.MixinClientConnectionChInit"
],
"injectors": {
"defaultRequire": 1