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

Merge pull request #8 from Gerrygames/master

Browse Source 
1.14.1
This commit is contained in:
creeper123123321 2019-05-13 15:04:23 -03:00 committed by GitHub
commit 28a01c0c69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle.kts
View File

@ -46,8 +46,8 @@ tasks.named<ProcessResources>("processResources") {
dependencies {
// transitive = false because Guava is conflicting on runClient
compile("us.myles:viaversion:2.1.0-1.14.1-pre2") { isTransitive = false }
include("us.myles:viaversion:2.1.0-1.14.1-pre2")
compile("us.myles:viaversion:2.1.0") { isTransitive = false }
include("us.myles:viaversion:2.1.0")
compile("de.gerrygames:viarewind-all:1.4.0") { isTransitive = false }
include("de.gerrygames:viarewind-all:1.4.0")
compile("nl.matsv:viabackwards-all:3.0.0-SNAPSHOT") { isTransitive = false }
@ -55,9 +55,9 @@ dependencies {
compileOnly("com.google.code.findbugs:jsr305:3.0.2")
minecraft("com.mojang:minecraft:1.14")
mappings("net.fabricmc:yarn:1.14+build.8")
modCompile("net.fabricmc:fabric-loader:0.4.6+build.143")
minecraft("com.mojang:minecraft:1.14.1")
mappings("net.fabricmc:yarn:1.14.1+build.1")
modCompile("net.fabricmc:fabric-loader:0.4.7+build.147")
modCompile("net.fabricmc:fabric:0.2.7+build.127")

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

@ -29,9 +29,9 @@ import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientCommandSource;
import net.minecraft.entity.Entity;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.command.CommandSource;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.TextComponent;
import us.myles.ViaVersion.api.command.ViaCommandSender;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;

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

@ -35,8 +35,8 @@ import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.RecipeBookButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.text.TextComponent;
import net.minecraft.text.TranslatableTextComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
@ -101,7 +101,7 @@ public abstract class MixinMultiplayerScreen extends Screen {
}
}
supportedProtocol = isSupported(newVersion);
protocolVersion.method_1868(getTextColor()); // Set editable color
protocolVersion.setEditableColor(getTextColor());
((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion = newVersion;
});
int clientSideVersion = ((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion;
@ -129,8 +129,8 @@ public abstract class MixinMultiplayerScreen extends Screen {
}
}
},
new TranslatableTextComponent("gui.enable_client_side.question"),
new TranslatableTextComponent("gui.enable_client_side.warning"),
new TranslatableComponent("gui.enable_client_side.question"),
new TranslatableComponent("gui.enable_client_side.warning"),
I18n.translate("gui.enable_client_side.enable"),
I18n.translate("gui.cancel")
)),

4
src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java
View File

@ -36,10 +36,10 @@ import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.ModContainer;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.Entity;
import net.minecraft.network.chat.ChatMessageType;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.ChatMessageType;
import net.minecraft.text.TextComponent;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.ViaAPI;