Skip to content

Rework Show Quest Command #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WaitingIdly merged 1 commit into from
Mar 21, 2026
Merged

Rework Show Quest Command #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/betterquesting/client/gui2/GuiQuestLines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import betterquesting.client.gui2.editors.GuiQuestEditor;
import betterquesting.client.gui2.editors.GuiQuestLinesEditor;
import betterquesting.client.gui2.editors.designer.GuiDesigner;
import betterquesting.commands.client.QuestCommandShow;
import betterquesting.handlers.ConfigHandler;
import betterquesting.network.handlers.NetQuestAction;
import betterquesting.questing.QuestDatabase;
Expand Down Expand Up @@ -346,7 +347,7 @@ public boolean onMouseClick(int mx, int my, int click) {
}
if (questExistsUnderMouse) {
Runnable questSharer = () -> {
mc.player.sendChatMessage("betterquesting.msg.share_quest:" + cvQuest.getButtonAt(mx, my).getStoredValue().getID());
QuestCommandShow.sendTrigger(mc.player, cvQuest.getButtonAt(mx, my).getStoredValue().getID());
mc.displayGuiScreen(null);
};
popup.addButton(QuestTranslation.translate("betterquesting.btn.share_quest"), null, questSharer);
Expand Down
43 changes: 13 additions & 30 deletions src/main/java/betterquesting/commands/client/QuestCommandShow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@
import betterquesting.api.questing.IQuest;
import betterquesting.api2.cache.QuestCache;
import betterquesting.api2.storage.DBEntry;
import betterquesting.client.gui2.GuiQuest;
import betterquesting.client.gui2.GuiQuestLines;
import betterquesting.commands.QuestCommandBase;
import betterquesting.questing.QuestDatabase;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.server.permission.DefaultPermissionLevel;

import java.util.Collections;
Expand All @@ -26,16 +20,11 @@

public class QuestCommandShow extends QuestCommandBase {

public static boolean sentViaClick = false;
private static int questId = -1;
public static final String PREFIX = "betterquesting.msg.share_quest:";
public static final String VIEW = "betterquesting.msg.view_quest:";

@SubscribeEvent
public void onOpenGui(GuiOpenEvent event) {
if (questId != -1) {
event.setGui(new GuiQuest(new GuiQuestLines(null), questId));
MinecraftForge.EVENT_BUS.unregister(this);
questId = -1;
}
public static void sendTrigger(EntityPlayerSP player, int id) {
player.sendChatMessage(PREFIX + id);
}

@Override
Expand All @@ -45,24 +34,18 @@ public String getCommand() {

@Override
public void runCommand(MinecraftServer server, CommandBase command, ICommandSender sender, String[] args) throws CommandException {
if (sender instanceof EntityPlayerSP && args.length == 2) {
if (sender instanceof EntityPlayerSP player && args.length == 2) {
try {
questId = Integer.parseInt(args[1]);
if (sentViaClick) {
sentViaClick = false;
Minecraft.getMinecraft().addScheduledTask(() -> Minecraft.getMinecraft().displayGuiScreen(new GuiQuest(new GuiQuestLines(null), questId)));
int questId = Integer.parseInt(args[1]);
IQuest quest = QuestDatabase.INSTANCE.getValue(questId);
if (quest == null) {
sender.sendMessage(new TextComponentTranslation("betterquesting.msg.share_quest_invalid", String.valueOf(questId)));
} else {
IQuest quest = QuestDatabase.INSTANCE.getValue(questId);
if (quest != null) {
EntityPlayerSP player = (EntityPlayerSP) sender;
if (QuestCache.isQuestShown(quest, QuestingAPI.getQuestingUUID(player), player)) {
MinecraftForge.EVENT_BUS.register(this);
return;
} else {
sender.sendMessage(new TextComponentTranslation("betterquesting.msg.share_quest_hover_text_failure"));
}
if (QuestCache.isQuestShown(quest, QuestingAPI.getQuestingUUID(player), player)) {
sendTrigger(player, questId);
} else {
sender.sendMessage(new TextComponentTranslation("betterquesting.msg.share_quest_hover_text_failure"));
}
sender.sendMessage(new TextComponentTranslation("betterquesting.msg.share_quest_invalid", String.valueOf(questId)));
}
} catch (NumberFormatException e) {
sender.sendMessage(new TextComponentTranslation("betterquesting.msg.share_quest_invalid", args[1]));
Expand Down
22 changes: 18 additions & 4 deletions src/main/java/betterquesting/handlers/EventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import betterquesting.api2.utils.QuestTranslation;
import betterquesting.client.BQ_Keybindings;
import betterquesting.client.gui2.GuiHome;
import betterquesting.client.gui2.GuiQuest;
import betterquesting.client.gui2.GuiQuestLines;
import betterquesting.client.themes.ThemeRegistry;
import betterquesting.commands.client.QuestCommandShow;
Expand Down Expand Up @@ -54,6 +55,7 @@
import net.minecraft.util.text.event.ClickEvent;
import net.minecraft.util.text.event.HoverEvent;
import net.minecraft.world.GameType;
import net.minecraftforge.client.event.ClientChatEvent;
import net.minecraftforge.client.event.ClientChatReceivedEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
Expand Down Expand Up @@ -120,9 +122,9 @@ public void onKey(InputEvent.KeyInputEvent event) {
public void onClientChatReceived(ClientChatReceivedEvent event) {
if (event.getMessage() != null) {
String text = event.getMessage().getFormattedText();
int index = text.indexOf("betterquesting.msg.share_quest:");
int index = text.indexOf(QuestCommandShow.PREFIX);
if (index != -1) {
int lastIndex = index + "betterquesting.msg.share_quest:".length();
int lastIndex = index + QuestCommandShow.PREFIX.length();
int endIndex = lastIndex;
int questId = 0;
for (int i = lastIndex; i < text.length(); i++) {
Expand All @@ -144,9 +146,8 @@ public void onClientChatReceived(ClientChatReceivedEvent event) {
Style newMessageStyle;
EntityPlayerSP player = Minecraft.getMinecraft().player;
if (QuestCache.isQuestShown(quest, QuestingAPI.getQuestingUUID(player), player)) {
QuestCommandShow.sentViaClick = true;
newMessageStyle = newMessage.getStyle()
.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/bq_client show " + questId))
.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, QuestCommandShow.VIEW + questId))
.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentTranslation("betterquesting.msg.share_quest_hover_text_success")));
} else {
newMessageStyle = newMessage.getStyle()
Expand All @@ -157,6 +158,19 @@ public void onClientChatReceived(ClientChatReceivedEvent event) {
}
}

@SideOnly(Side.CLIENT)
@SubscribeEvent
public void onClientChatEvent(ClientChatEvent event) {
if (event.getOriginalMessage().startsWith(QuestCommandShow.VIEW)) {
try {
int questId = Integer.parseInt(event.getOriginalMessage().substring(QuestCommandShow.VIEW.length()));
Minecraft.getMinecraft().addScheduledTask(() -> Minecraft.getMinecraft().displayGuiScreen(new GuiQuest(new GuiQuestLines(null), questId)));
event.setCanceled(true);
} catch (NumberFormatException ignored) {
}
}
}

@SubscribeEvent
public void onCapabilityPlayer(AttachCapabilitiesEvent<Entity> event) {
if (!(event.getObject() instanceof EntityPlayer)) return;
Expand Down