From 35ce000a80eb593eef2cf19bef3b4f900a773018 Mon Sep 17 00:00:00 2001 From: FX - PR0CESS Date: Wed, 6 Jul 2022 19:23:12 -0400 Subject: [PATCH] Update to 1.19-pre3 Push to v1.3 --- gradle.properties | 6 +++--- .../helpers/ExtendedChatAbuseReport.java | 2 +- .../helpers/FabricatedAbuseReportSender.java | 2 +- .../fabricatedchatreports/mixin/ChatAbuseReportMixin.java | 2 +- .../fabricatedchatreports/mixin/ChatReportScreenMixin.java | 6 +++--- .../mixin/ChatSelectionScreenAccessor.java | 2 +- .../ca/fxco/fabricatedchatreports/mixin/MinecraftMixin.java | 2 +- .../screens/ContextModifyingScreen.java | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index e596f28..8d74617 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.19.1-pre2 -yarn_mappings=1.19.1-pre2+build.2 +minecraft_version=1.19.1-pre3 +yarn_mappings=1.19.1-pre3+build.1 loader_version=0.14.8 # Mod Properties -mod_version=1.2 +mod_version=1.3 maven_group=ca.fxco archives_base_name=FabricatedChatReports diff --git a/src/main/java/ca/fxco/fabricatedchatreports/helpers/ExtendedChatAbuseReport.java b/src/main/java/ca/fxco/fabricatedchatreports/helpers/ExtendedChatAbuseReport.java index 6e6fc5d..c8b9d73 100644 --- a/src/main/java/ca/fxco/fabricatedchatreports/helpers/ExtendedChatAbuseReport.java +++ b/src/main/java/ca/fxco/fabricatedchatreports/helpers/ExtendedChatAbuseReport.java @@ -3,5 +3,5 @@ import net.minecraft.client.report.AbuseReportContext; public interface ExtendedChatAbuseReport { - public String getIndexJson(AbuseReportContext reporter, int index); + String getIndexJson(AbuseReportContext reporter, int index); } diff --git a/src/main/java/ca/fxco/fabricatedchatreports/helpers/FabricatedAbuseReportSender.java b/src/main/java/ca/fxco/fabricatedchatreports/helpers/FabricatedAbuseReportSender.java index f1c5cd6..1c80197 100644 --- a/src/main/java/ca/fxco/fabricatedchatreports/helpers/FabricatedAbuseReportSender.java +++ b/src/main/java/ca/fxco/fabricatedchatreports/helpers/FabricatedAbuseReportSender.java @@ -10,7 +10,7 @@ import com.mojang.datafixers.util.Unit; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.network.abusereport.AbuseReportSender; +import net.minecraft.client.report.AbuseReportSender; import net.minecraft.client.report.ReporterEnvironment; import net.minecraft.text.Text; import net.minecraft.util.Util; diff --git a/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatAbuseReportMixin.java b/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatAbuseReportMixin.java index eff5d45..ff77a43 100644 --- a/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatAbuseReportMixin.java +++ b/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatAbuseReportMixin.java @@ -3,8 +3,8 @@ import ca.fxco.fabricatedchatreports.helpers.ExtendedChatAbuseReport; import com.mojang.authlib.minecraft.client.ObjectMapper; import com.mojang.authlib.minecraft.report.ReportChatMessage; -import net.minecraft.client.network.abusereport.ChatAbuseReport; import net.minecraft.client.report.AbuseReportContext; +import net.minecraft.client.report.ChatAbuseReport; import net.minecraft.client.report.ReceivedMessage; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatReportScreenMixin.java b/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatReportScreenMixin.java index f36f7cd..fb08b26 100644 --- a/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatReportScreenMixin.java +++ b/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatReportScreenMixin.java @@ -2,10 +2,10 @@ import ca.fxco.fabricatedchatreports.screens.ModifyReportScreen; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.abusereport.ChatReportScreen; +import net.minecraft.client.gui.screen.report.ChatReportScreen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.network.abusereport.ChatAbuseReport; import net.minecraft.client.report.AbuseReportContext; +import net.minecraft.client.report.ChatAbuseReport; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; @@ -45,7 +45,7 @@ protected ChatReportScreenMixin(Text component) { method = "init", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/screen/abusereport/ChatReportScreen;onChange()V", + target = "Lnet/minecraft/client/gui/screen/report/ChatReportScreen;onChange()V", shift = At.Shift.BEFORE ) ) diff --git a/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatSelectionScreenAccessor.java b/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatSelectionScreenAccessor.java index ebda3f7..73198bd 100644 --- a/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatSelectionScreenAccessor.java +++ b/src/main/java/ca/fxco/fabricatedchatreports/mixin/ChatSelectionScreenAccessor.java @@ -1,8 +1,8 @@ package ca.fxco.fabricatedchatreports.mixin; import net.minecraft.client.gui.screen.report.ChatSelectionScreen; -import net.minecraft.client.network.abusereport.ChatAbuseReport; import net.minecraft.client.report.AbuseReportContext; +import net.minecraft.client.report.ChatAbuseReport; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/src/main/java/ca/fxco/fabricatedchatreports/mixin/MinecraftMixin.java b/src/main/java/ca/fxco/fabricatedchatreports/mixin/MinecraftMixin.java index 520fc20..d09d105 100644 --- a/src/main/java/ca/fxco/fabricatedchatreports/mixin/MinecraftMixin.java +++ b/src/main/java/ca/fxco/fabricatedchatreports/mixin/MinecraftMixin.java @@ -3,8 +3,8 @@ import ca.fxco.fabricatedchatreports.helpers.FabricatedAbuseReportSender; import com.mojang.authlib.minecraft.UserApiService; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.abusereport.AbuseReportSender; import net.minecraft.client.report.AbuseReportContext; +import net.minecraft.client.report.AbuseReportSender; import net.minecraft.client.report.ChatLogImpl; import net.minecraft.client.report.ReporterEnvironment; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/ca/fxco/fabricatedchatreports/screens/ContextModifyingScreen.java b/src/main/java/ca/fxco/fabricatedchatreports/screens/ContextModifyingScreen.java index 9ad2191..b9f9337 100644 --- a/src/main/java/ca/fxco/fabricatedchatreports/screens/ContextModifyingScreen.java +++ b/src/main/java/ca/fxco/fabricatedchatreports/screens/ContextModifyingScreen.java @@ -412,7 +412,7 @@ private MessageSignature signMessage(ChatMessageSigner messageSigner, Text compo } catch (Exception var4) { FabricatedChatReports.LOGGER.error("Failed to sign chat message: '{}'", component.getString(), var4); } - return MessageSignature.none(); + return MessageSignature.none(messageSigner.sender()); } private void reSignMessage() {