Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2025-02-22 02:21:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

separate 1.14 and 1.15 branches, update 1.8 dependencies

Browse Source
This commit is contained in:
creeper123123321 2020-09-14 20:12:55 -03:00
parent 742124aed8
commit eb9ca5fb4c
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle.kts
View File

@ -67,12 +67,12 @@ dependencies {
// Use 1.8.9 Legacy Fabric https://github.com/Legacy-Fabric/fabric-example-mod/blob/master/gradle.properties
implementation("com.google.guava:guava:23.5-jre")
minecraft("com.mojang:minecraft:1.8.9")
mappings("net.fabricmc:yarn:1.8.9+build.202007011615:v2")
modCompile("net.fabricmc:fabric-loader-1.8.9:0.8.2+build.202004131640") {
mappings("net.fabricmc:yarn:1.8.9+build.202008241659:v2")
modCompile("net.fabricmc:fabric-loader-1.8.9:0.8.7+build.202008300717") {
exclude(module = "guava")
}
modImplementation("net.fabricmc.fabric-api:fabric-api:0.2.7-1.8.9")
modImplementation("net.fabricmc.fabric-api:fabric-api:0.7.3")
//modImplementation("io.github.cottonmc:cotton-client-commands:1.0.1+1.16-rc1")
//include("io.github.cottonmc:cotton-client-commands:1.0.1+1.16-rc1")
@ -97,12 +97,14 @@ curseforge {
}
when (branch) {
"mc-1.8" -> addGameVersion("1.8.9")
"mc-1.14-1.15" -> {
"mc-1.14" -> {
addGameVersion("1.14")
addGameVersion("1.14.1")
addGameVersion("1.14.2")
addGameVersion("1.14.3")
addGameVersion("1.14.4")
}
"mc-1.15" -> {
addGameVersion("1.15")
addGameVersion("1.15.1")
addGameVersion("1.15.2")

8
src/main/java/com/github/creeper123123321/viafabric/commands/NMSCommandImpl.java
View File

@ -41,12 +41,12 @@ public class NMSCommandImpl extends AbstractCommand {
}
@Override
public String getName() {
public String getCommandName() {
return "viaversion";
}
@Override
public List<String> method_5887() {
public List<String> getAliases() {
return Arrays.asList("vvfabric", "viaver");
}
@ -56,12 +56,12 @@ public class NMSCommandImpl extends AbstractCommand {
}
@Override
public void method_5885(CommandSource commandSource, String[] strings) {
public void execute(CommandSource commandSource, String[] strings) {
handler.onCommand(new NMSCommandSender(commandSource), strings);
}
@Override
public List<String> method_5886(CommandSource commandSource, String[] strings, BlockPos blockPos) {
public List<String> getAutoCompleteHints(CommandSource commandSource, String[] strings, BlockPos blockPos) {
return handler.onTabComplete(new NMSCommandSender(commandSource), strings);
}

2
src/main/java/com/github/creeper123123321/viafabric/commands/NMSCommandSender.java
View File

@ -44,7 +44,7 @@ public class NMSCommandSender implements ViaCommandSender {
@Override
public boolean hasPermission(String s) {
// https://gaming.stackexchange.com/questions/138602/what-does-op-permission-level-do
return source.method_6255(3, "viaversion.admin"); // the string seems to be the command
return source.canUseCommand(3, "viaversion.admin"); // the string seems to be the command
}
@Override

2
src/main/java/com/github/creeper123123321/viafabric/mixin/MixinClientConnection.java
View File

@ -52,7 +52,7 @@ public class MixinClientConnection {
// }
//}
@Redirect(method = "setCompressionThreshold", at = @At(
@Redirect(method = "setCompressionThreshold(I)V", at = @At(
value = "INVOKE",
target = "Lio/netty/channel/ChannelPipeline;addBefore(Ljava/lang/String;Ljava/lang/String;Lio/netty/channel/ChannelHandler;)Lio/netty/channel/ChannelPipeline;"
))

2
src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinConnectScreenThread.java
View File

@ -35,7 +35,7 @@ import java.net.UnknownHostException;
@Mixin(targets = "net/minecraft/client/gui/screen/ConnectScreen$1", priority = 2000) // don't know if it will work with MinerParty mod
public class MixinConnectScreenThread {
@Redirect(method = "run", at = @At(value = "INVOKE",
@Redirect(method = "run()V", at = @At(value = "INVOKE",
target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;"))
private InetAddress resolveViaFabricAddr(String address) throws UnknownHostException {
ViaFabricAddress viaAddr = new ViaFabricAddress().parse(address);

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

@ -65,7 +65,7 @@
"depends": {
"fabricloader": ">=0.4.0",
"fabric-resource-loader-v0": "*",
"minecraft": "<1.13",
"minecraft": "1.8.x",
"viaversion": ">3.0.1"
},
"conflicts": {