This commit is contained in:
modmuss50 2022-07-27 18:30:16 +01:00
parent 4461b5d782
commit 3313f3165f
9 changed files with 14 additions and 25 deletions

View file

@ -17,7 +17,7 @@ curseforge {
id = "237903" id = "237903"
changelog = ENV.CHANGELOG ?: "No changelog provided" changelog = ENV.CHANGELOG ?: "No changelog provided"
releaseType = ENV.RELEASE_CHANNEL ?: "release" releaseType = ENV.RELEASE_CHANNEL ?: "release"
addGameVersion "1.19" addGameVersion "1.19.1"
addGameVersion "Fabric" addGameVersion "Fabric"
mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))

View file

@ -147,8 +147,7 @@ public class ClientBoundPacketHandlers {
client.execute(() -> { client.execute(() -> {
int deleteID = RebornCore.MOD_ID.hashCode() + messageId; int deleteID = RebornCore.MOD_ID.hashCode() + messageId;
ChatHud chat = MinecraftClient.getInstance().inGameHud.getChatHud(); MinecraftClient.getInstance().inGameHud.setOverlayMessage(text, false);
chat.addMessage(text, deleteID);
}); });
}); });

View file

@ -25,19 +25,11 @@
package reborncore.client; package reborncore.client;
import net.minecraft.client.MinecraftClient; 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.text.Text;
import net.minecraft.util.Util;
import net.minecraft.util.registry.Registry;
public class ClientChatUtils { public class ClientChatUtils {
public static void addHudMessage(Text text) { public static void addHudMessage(Text text) {
MinecraftClient.getInstance().inGameHud.onChatMessage(getSystemMessageType(), text, new MessageSender(Util.NIL_UUID, text)); final MinecraftClient client = MinecraftClient.getInstance();
} client.inGameHud.getChatHud().addMessage(text);
private static MessageType getSystemMessageType() {
Registry<MessageType> registry = MinecraftClient.getInstance().world.getRegistryManager().get(Registry.MESSAGE_TYPE_KEY);
return registry.get(MessageType.SYSTEM);
} }
} }

View file

@ -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(); 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(); tessellator.draw();
super.renderList(matrices, this.getRowLeft(), this.top, mouseX, mouseY, delta); super.renderList(matrices, mouseX, mouseY, delta);
} }
@Override @Override

View file

@ -16,7 +16,6 @@ accessible method net/minecraft/client/render/WorldRenderer drawShapeOu
accessible method net/minecraft/world/gen/treedecorator/TreeDecoratorType <init> (Lcom/mojang/serialization/Codec;)V accessible method net/minecraft/world/gen/treedecorator/TreeDecoratorType <init> (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 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/client/gui/screen/Screen selectables Ljava/util/List;
accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft/fluid/FlowableFluid; accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft/fluid/FlowableFluid;

View file

@ -253,7 +253,7 @@ def modCompat(Map args) {
modCompat( modCompat(
name: "rei", name: "rei",
dependencies: [ compile: [
"me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
], ],
sourceSet: sourceSets.client, sourceSet: sourceSets.client,
@ -389,7 +389,7 @@ curseforge {
id = "233564" id = "233564"
changelog = ENV.CHANGELOG ?: "No changelog provided" changelog = ENV.CHANGELOG ?: "No changelog provided"
releaseType = ENV.RELEASE_CHANNEL ?: "release" 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" addGameVersion "Fabric"
mainArtifact remapJar mainArtifact remapJar

View file

@ -2,14 +2,14 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
# Mod properties # Mod properties
mod_version=5.3.2 mod_version=5.3.3
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.19 minecraft_version=1.19.1
yarn_version=1.19+build.4 yarn_version=1.19.1+build.1
loader_version=0.14.8 loader_version=0.14.8
fapi_version=0.56.3+1.19 fapi_version=0.58.4+1.19.1
# Dependencies # Dependencies
energy_version=2.2.0 energy_version=2.2.0

View file

@ -25,7 +25,7 @@
package techreborn.client.gui; package techreborn.client.gui;
import com.mojang.blaze3d.systems.RenderSystem; 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.gui.screen.Screen;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@ -54,14 +54,14 @@ public class GuiManual extends Screen {
int y = (height / 2) - guiHeight / 2; int y = (height / 2) - guiHeight / 2;
if (client == null) { return; } 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) { if (t) {
Util.getOperatingSystem().open("http://wiki.techreborn.ovh"); Util.getOperatingSystem().open("http://wiki.techreborn.ovh");
} }
this.client.setScreen(this); this.client.setScreen(this);
}, "http://wiki.techreborn.ovh", false)))); }, "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) { if (t) {
Util.getOperatingSystem().open("https://discord.gg/teamreborn"); Util.getOperatingSystem().open("https://discord.gg/teamreborn");
} }

View file

@ -16,7 +16,6 @@ accessible method net/minecraft/client/render/WorldRenderer drawShapeOu
accessible method net/minecraft/world/gen/treedecorator/TreeDecoratorType <init> (Lcom/mojang/serialization/Codec;)V accessible method net/minecraft/world/gen/treedecorator/TreeDecoratorType <init> (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 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/client/gui/screen/Screen selectables Ljava/util/List;
accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft/fluid/FlowableFluid; accessible field net/minecraft/block/FluidBlock fluid Lnet/minecraft/fluid/FlowableFluid;