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

Remove mixin class name workaround, update dependencies

Browse Source
This commit is contained in:
creeper123123321 2019-04-21 09:23:17 -03:00
parent 3f75d71e4d
commit 16b01076d1
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -50,11 +50,11 @@ dependencies {
compileOnly("com.google.code.findbugs:jsr305:3.0.2") compileOnly("com.google.code.findbugs:jsr305:3.0.2")
minecraft("com.mojang:minecraft:1.14 Pre-Release 5") minecraft("com.mojang:minecraft:1.14 Pre-Release 5")
mappings("net.fabricmc:yarn:1.14 Pre-Release 5+build.2") mappings("net.fabricmc:yarn:1.14 Pre-Release 5+build.4")
modCompile("net.fabricmc:fabric-loader:0.4.1+build.126") modCompile("net.fabricmc:fabric-loader:0.4.2+build.131")
modCompile("net.fabricmc:fabric:0.2.7+build.123") modCompile("net.fabricmc:fabric:0.2.7+build.126")
include("net.fabricmc:fabric:0.2.7+build.123") include("net.fabricmc:fabric:0.2.7+build.126")
} }
minecraft { minecraft {

5
src/main/java/com/github/creeper123123321/viafabric/mixin/MixinServerNetworkIoChInit.java
View File

@ -37,10 +37,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.protocol.ProtocolPipeline; import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
@Mixin(targets = { @Mixin(targets = "net.minecraft.server.ServerNetworkIo$1")
"net.minecraft.server.ServerNetworkIo$1",
"net/minecraft/class_3242$1" // Workaround
})
public class MixinServerNetworkIoChInit { public class MixinServerNetworkIoChInit {
@Inject(method = "initChannel(Lio/netty/channel/Channel;)V", at = @At(value = "TAIL"), remap = false) @Inject(method = "initChannel(Lio/netty/channel/Channel;)V", at = @At(value = "TAIL"), remap = false)
private void onInitChannel(Channel channel, CallbackInfo ci) { private void onInitChannel(Channel channel, CallbackInfo ci) {

5
src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinClientConnectionChInit.java
View File

@ -39,10 +39,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.protocol.ProtocolPipeline; import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
@Mixin(targets = { @Mixin(targets = "net.minecraft.network.ClientConnection$1")
"net.minecraft.network.ClientConnection$1",
"net/minecraft/class_2535$1" // Workaround
})
public class MixinClientConnectionChInit { public class MixinClientConnectionChInit {
@Inject(method = "initChannel(Lio/netty/channel/Channel;)V", at = @At(value = "TAIL"), remap = false) @Inject(method = "initChannel(Lio/netty/channel/Channel;)V", at = @At(value = "TAIL"), remap = false)
private void onInitChannel(Channel channel, CallbackInfo ci) { private void onInitChannel(Channel channel, CallbackInfo ci) {