Merge pull request #4 from intact/1.14.2

Update to 1.14.2

Author: Juuxel

project.gradle

@@ -1,12 +1,12 @@
 ext {
  projectName = "cotton-client-commands"
  group = "io.github.cottonmc"
- version = "0.3.1+1.14"
+ version = "0.3.1+1.14.2"
  snapshot = true
 
- minecraft = "1.14"
- mappings = "1.14+build.3"
- loader = "0.4.4+build.139"
+ minecraft = "1.14.2"
+ mappings = "1.14.2+build.1"
+ loader = "0.4.8+build.154"
  fabricMod = null
  silkMod = null
  jankson = null

src/main/java/io/github/cottonmc/clientcommands/Feedback.java

@@ -2,10 +2,10 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.ChatFormat;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.StringTextComponent;
-import net.minecraft.text.TextComponent;
-import net.minecraft.text.TextFormat;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 
 /**
  * Client-side replacements for ServerCommandSource.send[Feedback, Error]
@@ -19,7 +19,7 @@ private Feedback() {}
  *
  * @param textComponent the message
  */
- public static void sendFeedback(TextComponent textComponent) {
+ public static void sendFeedback(Component textComponent) {
  MinecraftClient.getInstance().player.addChatMessage(textComponent, false);
  }
 
@@ -28,9 +28,9 @@ public static void sendFeedback(TextComponent textComponent) {
  *
  * @param textComponent the message
  */
- public static void sendError(TextComponent textComponent) {
+ public static void sendError(Component textComponent) {
  MinecraftClient.getInstance().player.addChatMessage(
- new StringTextComponent("").append(textComponent).applyFormat(TextFormat.RED), false
+ new TextComponent("").append(textComponent).applyFormat(ChatFormat.RED), false
  );
  }
 }

src/main/java/io/github/cottonmc/clientcommands/mixin/NetworkHandlerMixin.java

@@ -5,7 +5,7 @@
 import io.github.cottonmc.clientcommands.ClientCommands;
 import io.github.cottonmc.clientcommands.impl.CommandCache;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Screen;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.packet.CommandTreeS2CPacket;
 import net.minecraft.network.ClientConnection;

src/main/java/io/github/cottonmc/clientcommands/mixin/PlayerMixin.java

@@ -2,14 +2,14 @@
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import io.github.cottonmc.clientcommands.impl.CommandCache;
+import net.minecraft.ChatFormat;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientCommandSource;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.command.CommandException;
-import net.minecraft.text.StringTextComponent;
-import net.minecraft.text.TextComponent;
-import net.minecraft.text.TextFormat;
-import net.minecraft.text.TranslatableTextComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -21,7 +21,7 @@
 public abstract class PlayerMixin {
  @Shadow @Final protected MinecraftClient client;
 
- @Shadow public abstract void addChatMessage(TextComponent textComponent_1, boolean boolean_1);
+ @Shadow public abstract void addChatMessage(Component textComponent_1, boolean boolean_1);
 
  @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
  private void onChatMessage(String msg, CallbackInfo info) {
@@ -37,13 +37,13 @@ private void onChatMessage(String msg, CallbackInfo info) {
  // Prevent sending the message
  cancel = true;
  } catch (CommandException e) {
- addChatMessage(e.getMessageComponent().applyFormat(TextFormat.RED), false);
+ addChatMessage(e.getMessageComponent().applyFormat(ChatFormat.RED), false);
  cancel = true;
  } catch (CommandSyntaxException e) {
- addChatMessage(new StringTextComponent(e.getMessage()).applyFormat(TextFormat.RED), false);
+ addChatMessage(new TextComponent(e.getMessage()).applyFormat(ChatFormat.RED), false);
  cancel = true;
  } catch (Exception e) {
- addChatMessage(new TranslatableTextComponent("command.failed").applyFormat(TextFormat.RED), false);
+ addChatMessage(new TranslatableComponent("command.failed").applyFormat(ChatFormat.RED), false);
  cancel = true;
  }
 

src/test/java/io/github/cottonmc/clientcommands/test/ExampleModCommands.java

@@ -4,15 +4,15 @@
 import io.github.cottonmc.clientcommands.ArgumentBuilders;
 import io.github.cottonmc.clientcommands.ClientCommandPlugin;
 import io.github.cottonmc.clientcommands.Feedback;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.server.command.CommandSource;
-import net.minecraft.text.StringTextComponent;
 
 public class ExampleModCommands implements ClientCommandPlugin {
  @Override
  public void registerCommands(CommandDispatcher<CommandSource> dispatcher) {
  dispatcher.register(ArgumentBuilders.literal("client-commands").executes(
  source -> {
- Feedback.sendFeedback(new StringTextComponent("Hello, world!"));
+ Feedback.sendFeedback(new TextComponent("Hello, world!"));
  return 1;
  }
  ));