Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-03-12 14:49:37 +01:00
Code Issues Projects Releases Wiki Activity

Q button as alternative for 1.18 servers for job leave

Browse Source
This commit is contained in:
Zrips 2022-01-19 15:08:42 +02:00
parent 0811283201
commit 4b1e877368
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
View File

@ -23,6 +23,7 @@ import net.Zrips.CMILib.CMILib;
import net.Zrips.CMILib.GUI.CMIGui;
import net.Zrips.CMILib.GUI.CMIGuiButton;
import net.Zrips.CMILib.GUI.GUIManager.GUIClickType;
import net.Zrips.CMILib.Version.Version;
public class GuiManager {
@ -140,8 +141,12 @@ public class GuiManager {
lore.add("");
lore.add(Jobs.getLanguage().getMessage("command.info.gui.leftClick"));
if (jPlayer.isInJob(job))
lore.add(Jobs.getLanguage().getMessage("command.info.gui.middleClick"));
if (jPlayer.isInJob(job)) {
if (Version.isCurrentEqualOrHigher(Version.v1_18_R1))
lore.add(Jobs.getLanguage().getMessage("command.info.gui.qClick"));
else
lore.add(Jobs.getLanguage().getMessage("command.info.gui.middleClick"));
}
lore.add(Jobs.getLanguage().getMessage("command.info.gui.rightClick"));
ItemStack guiItem = job.getGuiItem();
@ -174,6 +179,7 @@ public class GuiManager {
}
break;
case MiddleMouse:
case Q:
Jobs.getCommandManager().onCommand(player, null, "jobs", new String[] { "leave", job.getName() });
openJobsBrowseGUI(player);
break;

2
src/main/java/com/gamingmesh/jobs/commands/list/leave.java
View File

@ -53,7 +53,7 @@ public class leave implements Cmd {
JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(pSender);
if (Jobs.getPlayerManager().leaveJob(jPlayer, job))
pSender.sendMessage(Jobs.getLanguage().getMessage("command.leave.success", "%jobname%", job.getDisplayName()));
pSender.sendMessage(Jobs.getLanguage().getMessage("command.leave.success", "%jobname%", job.getDisplayName(), "[jobname]", job.getDisplayName()));
else
pSender.sendMessage(Jobs.getLanguage().getMessage("general.error.job"));

3
src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
View File

@ -357,6 +357,7 @@ public class LanguageManager {
c.get("command.info.gui.actions", "&eValid actions are:");
c.get("command.info.gui.leftClick", "&eLeft Click for more info");
c.get("command.info.gui.middleClick", "&eMiddle Click to leave this job");
c.get("command.info.gui.qClick", "&eQ key to leave this job");
c.get("command.info.gui.rightClick", "&eRight Click to join job");
c.get("command.info.gui.leftSlots", "&eLeft slots:&f ");
c.get("command.info.gui.working", "&2&nAlready working");
@ -430,7 +431,7 @@ public class LanguageManager {
c.get("command.leave.help.info", "Leave the selected job.");
c.get("command.leave.help.args", "[oldplayerjob]");
Jobs.getGCManager().getCommandArgs().put("leave", Arrays.asList("[oldplayerjob]"));
c.get("command.leave.success", "You have left the job %jobname%.");
c.get("command.leave.success", "&2You have left the job &7[jobname].");
c.get("command.leave.confirmationNeed", "&cAre you sure you want to leave from&e [jobname]&c job? Type the command again within&6 [time] seconds &cto confirm!");
c.get("command.leaveall.help.info", "Leave all your jobs.");