diff --git a/RebornCore/build.gradle b/RebornCore/build.gradle index de6033f4f..1b5f9bf90 100644 --- a/RebornCore/build.gradle +++ b/RebornCore/build.gradle @@ -17,7 +17,7 @@ curseforge { id = "237903" changelog = ENV.CHANGELOG ?: "No changelog provided" releaseType = ENV.RELEASE_CHANNEL ?: "release" - addGameVersion "1.19" + addGameVersion "1.19.1" addGameVersion "Fabric" mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) diff --git a/RebornCore/src/client/java/reborncore/client/ClientBoundPacketHandlers.java b/RebornCore/src/client/java/reborncore/client/ClientBoundPacketHandlers.java index f26b528ba..4a66a6756 100644 --- a/RebornCore/src/client/java/reborncore/client/ClientBoundPacketHandlers.java +++ b/RebornCore/src/client/java/reborncore/client/ClientBoundPacketHandlers.java @@ -147,8 +147,7 @@ public class ClientBoundPacketHandlers { client.execute(() -> { int deleteID = RebornCore.MOD_ID.hashCode() + messageId; - ChatHud chat = MinecraftClient.getInstance().inGameHud.getChatHud(); - chat.addMessage(text, deleteID); + MinecraftClient.getInstance().inGameHud.setOverlayMessage(text, false); }); }); diff --git a/RebornCore/src/client/java/reborncore/client/ClientChatUtils.java b/RebornCore/src/client/java/reborncore/client/ClientChatUtils.java index ed76ed998..321ef901a 100644 --- a/RebornCore/src/client/java/reborncore/client/ClientChatUtils.java +++ b/RebornCore/src/client/java/reborncore/client/ClientChatUtils.java @@ -25,19 +25,11 @@ package reborncore.client; import net.minecraft.client.MinecraftClient; -import net.minecraft.network.message.MessageSender; -import net.minecraft.network.message.MessageType; import net.minecraft.text.Text; -import net.minecraft.util.Util; -import net.minecraft.util.registry.Registry; public class ClientChatUtils { public static void addHudMessage(Text text) { - MinecraftClient.getInstance().inGameHud.onChatMessage(getSystemMessageType(), text, new MessageSender(Util.NIL_UUID, text)); - } - - private static MessageType getSystemMessageType() { - Registry registry = MinecraftClient.getInstance().world.getRegistryManager().get(Registry.MESSAGE_TYPE_KEY); - return registry.get(MessageType.SYSTEM); + final MinecraftClient client = MinecraftClient.getInstance(); + client.inGameHud.getChatHud().addMessage(text); } } diff --git a/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java b/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java index c18e98e65..1011bbeb3 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java +++ b/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java @@ -444,7 +444,7 @@ public class GuiBuilder { bufferBuilder.vertex(this.left, this.top, 0.0D).texture((float) this.left / 32.0F, (float) (this.top + (int) this.getScrollAmount()) / 32.0F).color(32, 32, 32, 255).next(); tessellator.draw(); - super.renderList(matrices, this.getRowLeft(), this.top, mouseX, mouseY, delta); + super.renderList(matrices, mouseX, mouseY, delta); } @Override diff --git a/RebornCore/src/main/resources/reborncore.accesswidener b/RebornCore/src/main/resources/reborncore.accesswidener index 50f68364c..178cae04f 100644 --- a/RebornCore/src/main/resources/reborncore.accesswidener +++ b/RebornCore/src/main/resources/reborncore.accesswidener @@ -16,7 +16,6 @@ accessible method net/minecraft/client/render/WorldRenderer drawShapeOu accessible method net/minecraft/world/gen/treedecorator/TreeDecoratorType (Lcom/mojang/serialization/Codec;)V -accessible method net/minecraft/client/gui/hud/ChatHud addMessage (Lnet/minecraft/text/Text;I)V accessible method net/minecraft/client/item/ModelPredicateProviderRegistry register (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/item/UnclampedModelPredicateProvider;)V accessible field net/minecraft/client/gui/screen/Screen selectables Ljava/util/List; accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft/fluid/FlowableFluid; diff --git a/build.gradle b/build.gradle index 4afc21454..094d935c8 100644 --- a/build.gradle +++ b/build.gradle @@ -253,7 +253,7 @@ def modCompat(Map args) { modCompat( name: "rei", - dependencies: [ + compile: [ "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" ], sourceSet: sourceSets.client, @@ -389,7 +389,7 @@ curseforge { id = "233564" changelog = ENV.CHANGELOG ?: "No changelog provided" releaseType = ENV.RELEASE_CHANNEL ?: "release" - addGameVersion "1.19" // Also update in RebornCore/build.gradle + addGameVersion "1.19.1" // Also update in RebornCore/build.gradle addGameVersion "Fabric" mainArtifact remapJar diff --git a/gradle.properties b/gradle.properties index 64843c99d..c96cf5fa4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,14 +2,14 @@ org.gradle.jvmargs=-Xmx2G # Mod properties -mod_version=5.3.2 +mod_version=5.3.3 # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.19 -yarn_version=1.19+build.4 +minecraft_version=1.19.1 +yarn_version=1.19.1+build.1 loader_version=0.14.8 -fapi_version=0.56.3+1.19 +fapi_version=0.58.4+1.19.1 # Dependencies energy_version=2.2.0 diff --git a/src/client/java/techreborn/client/gui/GuiManual.java b/src/client/java/techreborn/client/gui/GuiManual.java index cf64104cf..ab69aa92a 100644 --- a/src/client/java/techreborn/client/gui/GuiManual.java +++ b/src/client/java/techreborn/client/gui/GuiManual.java @@ -25,7 +25,7 @@ package techreborn.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.gui.screen.ConfirmChatLinkScreen; +import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; @@ -54,14 +54,14 @@ public class GuiManual extends Screen { int y = (height / 2) - guiHeight / 2; if (client == null) { return; } - addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 40, 60, 20, Text.translatable("techreborn.manual.wikibtn"), var1 -> client.setScreen(new ConfirmChatLinkScreen(t -> { + addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 40, 60, 20, Text.translatable("techreborn.manual.wikibtn"), var1 -> client.setScreen(new ConfirmLinkScreen(t -> { if (t) { Util.getOperatingSystem().open("http://wiki.techreborn.ovh"); } this.client.setScreen(this); }, "http://wiki.techreborn.ovh", false)))); - addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 90, 60, 20, Text.translatable("techreborn.manual.discordbtn"), var1 -> client.setScreen(new ConfirmChatLinkScreen(t -> { + addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 90, 60, 20, Text.translatable("techreborn.manual.discordbtn"), var1 -> client.setScreen(new ConfirmLinkScreen(t -> { if (t) { Util.getOperatingSystem().open("https://discord.gg/teamreborn"); } diff --git a/src/main/resources/techreborn.accesswidener b/src/main/resources/techreborn.accesswidener index 6edadbffd..c7f352beb 100644 --- a/src/main/resources/techreborn.accesswidener +++ b/src/main/resources/techreborn.accesswidener @@ -16,7 +16,6 @@ accessible method net/minecraft/client/render/WorldRenderer drawShapeOu accessible method net/minecraft/world/gen/treedecorator/TreeDecoratorType (Lcom/mojang/serialization/Codec;)V -accessible method net/minecraft/client/gui/hud/ChatHud addMessage (Lnet/minecraft/text/Text;I)V accessible method net/minecraft/client/item/ModelPredicateProviderRegistry register (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/item/UnclampedModelPredicateProvider;)V accessible field net/minecraft/client/gui/screen/Screen selectables Ljava/util/List; accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft/fluid/FlowableFluid;