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

19w08b

Browse Source
This commit is contained in:
creeper123123321 2019-02-23 12:11:03 -03:00
parent 9bde889f70
commit 3d05905c93
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -32,15 +32,15 @@ processResources {
dependencies { dependencies {
compile "us.myles:viaversion:2.0.0-19w06a" compile "us.myles:viaversion:2.0.0-19w08b"
compile "de.gerrygames:viarewind-all:1.4.0" compile "de.gerrygames:viarewind-all:1.4.0"
minecraft "com.mojang:minecraft:19w06a" minecraft "com.mojang:minecraft:19w08b"
mappings "net.fabricmc:yarn:19w06a.3" mappings "net.fabricmc:yarn:19w08b.6"
modCompile "net.fabricmc:fabric-loader:0.3.5.106" modCompile "net.fabricmc:fabric-loader:0.3.7.109"
modCompile "net.fabricmc:fabric:0.2.0.89" modCompile "net.fabricmc:fabric:0.2.3.104"
modCompile "io.github.cottonmc:client-commands:0.1.0+19w05a-SNAPSHOT" modCompile "io.github.cottonmc:client-commands:0.1.0+19w05a-SNAPSHOT"
} }

4
src/main/java/com/github/creeper123123321/viafabric/gui/multiplayer/SaveProtocolButton.java
View File

@ -35,8 +35,8 @@ import us.myles.ViaVersion.protocols.base.VersionProvider;
public class SaveProtocolButton extends ButtonWidget { public class SaveProtocolButton extends ButtonWidget {
private TextFieldWidget textField; private TextFieldWidget textField;
public SaveProtocolButton(int id, int x, int y, int width, int height, String text, TextFieldWidget tf) { public SaveProtocolButton(int x, int y, int width, int height, String text, TextFieldWidget tf) {
super(id, x, y, width, height, text); super(x, y, width, height, text);
textField = tf; textField = tf;
} }

11
src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinMultiplayerGui.java
View File

@ -27,7 +27,7 @@ package com.github.creeper123123321.viafabric.mixin.client;
import com.github.creeper123123321.viafabric.gui.multiplayer.SaveProtocolButton; import com.github.creeper123123321.viafabric.gui.multiplayer.SaveProtocolButton;
import com.github.creeper123123321.viafabric.providers.VRVersionProvider; import com.github.creeper123123321.viafabric.providers.VRVersionProvider;
import com.github.creeper123123321.viafabric.util.VersionFormatFilter; import com.github.creeper123123321.viafabric.util.VersionFormatFilter;
import net.minecraft.client.gui.GuiEventListener; import net.minecraft.client.gui.InputListener;
import net.minecraft.client.gui.Screen; import net.minecraft.client.gui.Screen;
import net.minecraft.client.gui.menu.MultiplayerScreen; import net.minecraft.client.gui.menu.MultiplayerScreen;
import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.TextFieldWidget;
@ -38,7 +38,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
import us.myles.ViaVersion.api.protocol.ProtocolVersion; import us.myles.ViaVersion.api.protocol.ProtocolVersion;
import us.myles.ViaVersion.protocols.base.VersionProvider; import us.myles.ViaVersion.protocols.base.VersionProvider;
@ -48,21 +47,21 @@ public abstract class MixinMultiplayerGui extends Screen {
@Inject(method = "onInitialized", at = @At("TAIL")) @Inject(method = "onInitialized", at = @At("TAIL"))
private void onOnInitialized(CallbackInfo ci) { private void onOnInitialized(CallbackInfo ci) {
protocolVersion = new TextFieldWidget(1235, fontRenderer, this.width / 2 + 55, 8, 45, 20); protocolVersion = new TextFieldWidget(fontRenderer, this.width / 2 + 55, 8, 45, 20);
int clientSideVersion = ((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion; int clientSideVersion = ((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion;
protocolVersion.setText(ProtocolVersion.isRegistered(clientSideVersion) protocolVersion.setText(ProtocolVersion.isRegistered(clientSideVersion)
? ProtocolVersion.getProtocol(clientSideVersion).getName() ? ProtocolVersion.getProtocol(clientSideVersion).getName()
: Integer.toString(clientSideVersion)); : Integer.toString(clientSideVersion));
protocolVersion.method_1890(new VersionFormatFilter()); protocolVersion.method_1890(new VersionFormatFilter());
this.listeners.add(protocolVersion); this.listeners.add(protocolVersion);
addButton(new SaveProtocolButton(6356, width / 2 + 100, 8, 50, 20, addButton(new SaveProtocolButton(width / 2 + 100, 8, 50, 20,
I18n.translate("selectWorld.edit.save"), protocolVersion)); I18n.translate("selectWorld.edit.save"), protocolVersion));
} }
@Inject(method = "draw", at = @At("TAIL")) @Inject(method = "draw", at = @At("TAIL"))
private void onDraw(int p_1, int p_2, float p_3, CallbackInfo ci) { private void onDraw(int p_1, int p_2, float p_3, CallbackInfo ci) {
drawStringCentered(fontRenderer, "Protocol Version:", this.width / 2, 12, 0xFFFFFF); drawStringCentered(fontRenderer, "Protocol Version:", this.width / 2, 12, 0xFFFFFF);
protocolVersion.render(p_1, p_2, p_3); protocolVersion.draw(p_1, p_2, p_3);
} }
@Inject(method = "update", at = @At("TAIL")) @Inject(method = "update", at = @At("TAIL"))
@ -71,7 +70,7 @@ public abstract class MixinMultiplayerGui extends Screen {
} }
@Inject(method = "getFocused", at = @At("HEAD"), cancellable = true, remap = false) @Inject(method = "getFocused", at = @At("HEAD"), cancellable = true, remap = false)
private void onGetFocused(CallbackInfoReturnable<GuiEventListener> cir) { private void onGetFocused(CallbackInfoReturnable<InputListener> cir) {
if (protocolVersion.isFocused()) { if (protocolVersion.isFocused()) {
cir.setReturnValue(protocolVersion); cir.setReturnValue(protocolVersion);
} }