Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-10-05 05:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

19w12b

Browse Source
This commit is contained in:
creeper123123321 2019-03-22 16:59:40 -03:00
parent 00a10647af
commit 61f473875e
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -43,17 +43,17 @@ configurations.getByName("compile").extendsFrom(shade)
dependencies {
// transitive = false, viabackwards-core because Guava is conflicting on runClient
shade("us.myles:viaversion:2.0.0-19w12a") { isTransitive = false }
shade("us.myles:viaversion:2.0.0-19w12b") { isTransitive = false }
shade("de.gerrygames:viarewind-core:1.4.0") { isTransitive = false }
shade("nl.matsv:viabackwards-core:3.0.0-19w11b") { isTransitive = false }
compileOnly("com.google.code.findbugs:jsr305:3.0.2")
minecraft("com.mojang:minecraft:19w12a")
mappings("net.fabricmc:yarn:19w12a.2")
minecraft("com.mojang:minecraft:19w12b")
mappings("net.fabricmc:yarn:19w12b.3")
modCompile("net.fabricmc:fabric-loader:0.3.7.109")
modCompile("net.fabricmc:fabric:0.2.4.113")
modCompile("net.fabricmc:fabric:0.2.5.114")
}
tasks.named<Jar>("jar") {

20
src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinMultiplayerScreen.java
View File

@ -29,6 +29,7 @@ import com.github.creeper123123321.viafabric.util.VersionFormatFilter;
import net.minecraft.client.gui.Screen;
import net.minecraft.client.gui.menu.MultiplayerScreen;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.text.TextComponent;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@ -49,16 +50,15 @@ public abstract class MixinMultiplayerScreen extends Screen {
private boolean validProtocol = true;
private boolean supportedProtocol;
protected MixinMultiplayerScreen(TextComponent textComponent_1, UnsupportedOperationException e) {
super(textComponent_1);
throw e;
}
@Inject(method = "method_2540", at = @At("TAIL"))
private void onInitWidgets(CallbackInfo ci) {
protocolVersion = new TextFieldWidget(fontRenderer, this.screenWidth / 2 + 88, 13, 65, 15);
protocolVersion.method_1890(new VersionFormatFilter());
int clientSideVersion = ((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion;
supportedProtocol = isSupported(clientSideVersion);
protocolVersion.setText(ProtocolVersion.isRegistered(clientSideVersion)
? ProtocolVersion.getProtocol(clientSideVersion).getName()
: Integer.toString(clientSideVersion));
protocolVersion.method_1868(getTextColor()); // Set editable color
protocolVersion.setChangedListener((text) -> {
protocolVersion.setSuggestion(null);
int newVersion = ((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion;
@ -89,11 +89,15 @@ public abstract class MixinMultiplayerScreen extends Screen {
protocolVersion.method_1868(getTextColor()); // Set editable color
((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion = newVersion;
});
int clientSideVersion = ((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion;
protocolVersion.setText(ProtocolVersion.isRegistered(clientSideVersion)
? ProtocolVersion.getProtocol(clientSideVersion).getName()
: Integer.toString(clientSideVersion));
this.listeners.add(protocolVersion);
}
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Screen;draw(IIF)V"), remap = false)
private void onDraw(int int_1, int int_2, float float_1, CallbackInfo ci) {
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Screen;render(IIF)V"), remap = false)
private void onRender(int int_1, int int_2, float float_1, CallbackInfo ci) {
protocolVersion.render(int_1, int_2, float_1);
}