Skip to content

Commit 9e43f21

Browse files
HempfestHempfest
committed
* Removed Config.java and replaced with FileManager
1 parent 244cd40 commit 9e43f21

File tree

8 files changed

+262
-50
lines changed

8 files changed

+262
-50
lines changed

‎src/main/java/com/github/sanctum/labyrinth/data/FileManager.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,16 @@ synchronized public void saveConfig() {
203203
}
204204
}
205205

206+
/**
207+
* Save the configuration to its backing file then immediately reload changes.
208+
*
209+
* @throws IllegalStateException if an error is encountered while saving
210+
*/
211+
synchronized public void refreshConfig() {
212+
saveConfig();
213+
reload();
214+
}
215+
206216
@Override
207217
public boolean equals(Object o) {
208218
if (this == o) return true;

‎src/main/java/com/github/sanctum/labyrinth/formatting/component/NewComponent.java

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
package com.github.sanctum.labyrinth.formatting.component;
2+
3+
import com.github.sanctum.labyrinth.formatting.string.ColoredString;
4+
import net.md_5.bungee.api.chat.ClickEvent;
5+
import net.md_5.bungee.api.chat.HoverEvent;
6+
import net.md_5.bungee.api.chat.TextComponent;
7+
import org.bukkit.ChatColor;
8+
9+
public class NewComponent {
10+
11+
private static String color(String text) {
12+
return ChatColor.translateAlternateColorCodes('&', text);
13+
}
14+
15+
public TextComponent textHoverable(String normalText, String hoverText, String hoverTextMessage) {
16+
TextComponent text = new ColoredString(normalText, ColoredString.ColorType.MC_COMPONENT).toComponent();
17+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
18+
text.addExtra(hover);
19+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(color(hoverTextMessage)))));
20+
return text;
21+
}
22+
23+
public TextComponent textHoverable(String normalText, String hoverText, String normalText2, String hoverTextMessage) {
24+
TextComponent text = new ColoredString(normalText, ColoredString.ColorType.MC_COMPONENT).toComponent();
25+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
26+
TextComponent text2 = new ColoredString(normalText2, ColoredString.ColorType.MC_COMPONENT).toComponent();
27+
text.addExtra(hover);
28+
text.addExtra(text2);
29+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(color(hoverTextMessage)))));
30+
return text;
31+
}
32+
33+
public TextComponent textHoverable(String normalText, String hoverText, String normalText2, String hoverText2, String hoverTextMessage, String hoverText2Message) {
34+
TextComponent text = new ColoredString(normalText, ColoredString.ColorType.MC_COMPONENT).toComponent();
35+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
36+
TextComponent text2 = new ColoredString(normalText2, ColoredString.ColorType.MC_COMPONENT).toComponent();
37+
TextComponent hover2 = new ColoredString(hoverText2, ColoredString.ColorType.MC_COMPONENT).toComponent();
38+
text.addExtra(hover);
39+
text.addExtra(text2);
40+
text.addExtra(hover2);
41+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(color(hoverTextMessage)))));
42+
hover2.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(color(hoverText2Message)))));
43+
return text;
44+
}
45+
// *
46+
//
47+
// SEND TEXT THE PLAYER CAN BE SUGGESTED TO EXECUTE COMMANDS WITH
48+
//
49+
50+
public TextComponent textSuggestable(String normalText, String hoverText, String hoverTextMessage, String commandName) {
51+
TextComponent text = new ColoredString(normalText, ColoredString.ColorType.MC_COMPONENT).toComponent();
52+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
53+
text.addExtra(hover);
54+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(color(hoverTextMessage)))));
55+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + commandName));
56+
return text;
57+
}
58+
// *
59+
//
60+
// SEND TEXT THE PLAYER CAN RUN COMMANDS WITH
61+
//
62+
63+
public TextComponent textRunnable(String normalText, String hoverText, String hoverTextMessage, String commandName) {
64+
TextComponent text = new ColoredString(normalText, ColoredString.ColorType.MC_COMPONENT).toComponent();
65+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
66+
text.addExtra(hover);
67+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(new ColoredString(hoverTextMessage, ColoredString.ColorType.HEX).toString()))));
68+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
69+
return text;
70+
}
71+
72+
public TextComponent textRunnable(String normalText, String hoverText, String normalText2, String hoverTextMessage, String commandName) {
73+
TextComponent text = new ColoredString(normalText, ColoredString.ColorType.MC_COMPONENT).toComponent();
74+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
75+
TextComponent text2 = new ColoredString(normalText2, ColoredString.ColorType.MC_COMPONENT).toComponent();
76+
text.addExtra(hover);
77+
text.addExtra(text2);
78+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(new ColoredString(hoverTextMessage, ColoredString.ColorType.HEX).toString()))));
79+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
80+
return text;
81+
}
82+
83+
public TextComponent textRunnable(String normalText, String hoverText, String normalText2, String hoverText2, String hoverTextMessage, String hoverText2Message, String commandName, String commandName2) {
84+
TextComponent text = new ColoredString(normalText, ColoredString.ColorType.MC_COMPONENT).toComponent();
85+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
86+
TextComponent text2 = new ColoredString(normalText2, ColoredString.ColorType.MC_COMPONENT).toComponent();
87+
TextComponent hover2 = new ColoredString(hoverText2, ColoredString.ColorType.MC_COMPONENT).toComponent();
88+
text.addExtra(hover);
89+
text.addExtra(text2);
90+
text.addExtra(hover2);
91+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(new ColoredString(hoverTextMessage, ColoredString.ColorType.HEX).toString()))));
92+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
93+
hover2.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(new ColoredString(hoverText2Message, ColoredString.ColorType.HEX).toString()))));
94+
hover2.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName2));
95+
return text;
96+
}
97+
98+
public TextComponent textRunnable(String hoverText, String hoverText2, String hoverTextBody3, String hoverTextMessage, String hoverText2Message, String hoverMessage3, String commandName, String commandName2, String commandName3) {
99+
TextComponent hover = new ColoredString(hoverText, ColoredString.ColorType.MC_COMPONENT).toComponent();
100+
TextComponent hover2 = new ColoredString(hoverText2, ColoredString.ColorType.MC_COMPONENT).toComponent();
101+
TextComponent hover3 = new ColoredString(hoverTextBody3, ColoredString.ColorType.MC_COMPONENT).toComponent();
102+
hover.addExtra(hover2);
103+
hover.addExtra(hover3);
104+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(new ColoredString(hoverTextMessage, ColoredString.ColorType.HEX).toString()))));
105+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
106+
hover2.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(new ColoredString(hoverText2Message, ColoredString.ColorType.HEX).toString()))));
107+
hover2.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName2));
108+
hover3.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, (new net.md_5.bungee.api.chat.hover.content.Text(new ColoredString(hoverMessage3, ColoredString.ColorType.HEX).toString()))));
109+
hover3.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName3));
110+
return hover;
111+
}
112+
113+
114+
115+
}

‎src/main/java/com/github/sanctum/labyrinth/formatting/component/OldComponent.java

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
package com.github.sanctum.labyrinth.formatting.component;
2+
3+
4+
import net.md_5.bungee.api.chat.ClickEvent;
5+
import net.md_5.bungee.api.chat.ComponentBuilder;
6+
import net.md_5.bungee.api.chat.HoverEvent;
7+
import net.md_5.bungee.api.chat.TextComponent;
8+
import org.bukkit.ChatColor;
9+
10+
public class OldComponent {
11+
12+
private String color(String text) {
13+
return ChatColor.translateAlternateColorCodes('&', text);
14+
}
15+
16+
public TextComponent textHoverable(String normalText, String hoverText, String hoverTextMessage) {
17+
TextComponent text = new TextComponent(color(normalText));
18+
TextComponent hover = new TextComponent(color(hoverText));
19+
text.addExtra(hover);
20+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
21+
return text;
22+
}
23+
24+
public TextComponent textHoverable(String normalText, String hoverText, String normalText2, String hoverTextMessage) {
25+
TextComponent text = new TextComponent(color(normalText));
26+
TextComponent hover = new TextComponent(color(hoverText));
27+
TextComponent text2 = new TextComponent(color(normalText2));
28+
text.addExtra(hover);
29+
text.addExtra(text2);
30+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
31+
return text;
32+
}
33+
34+
public TextComponent textHoverable(String normalText, String hoverText, String normalText2, String hoverText2, String hoverTextMessage, String hoverText2Message) {
35+
TextComponent text = new TextComponent(color(normalText));
36+
TextComponent hover = new TextComponent(color(hoverText));
37+
TextComponent text2 = new TextComponent(color(normalText2));
38+
TextComponent hover2 = new TextComponent(color(hoverText2));
39+
text.addExtra(hover);
40+
text.addExtra(text2);
41+
text.addExtra(hover2);
42+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
43+
hover2.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverText2Message)).create()));
44+
return text;
45+
}
46+
47+
public TextComponent textSuggestable(String normalText, String hoverText, String hoverTextMessage, String commandName) {
48+
TextComponent text = new TextComponent(color(normalText));
49+
TextComponent hover = new TextComponent(color(hoverText));
50+
text.addExtra(hover);
51+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
52+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + commandName));
53+
return text;
54+
}
55+
56+
public TextComponent textRunnable(String normalText, String hoverText, String hoverTextMessage, String commandName) {
57+
TextComponent text = new TextComponent(color(normalText));
58+
TextComponent hover = new TextComponent(color(hoverText));
59+
text.addExtra(hover);
60+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
61+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
62+
return text;
63+
}
64+
65+
public TextComponent textRunnable(String normalText, String hoverText, String normalText2, String hoverTextMessage, String commandName) {
66+
TextComponent text = new TextComponent(color(normalText));
67+
TextComponent hover = new TextComponent(color(hoverText));
68+
TextComponent text2 = new TextComponent(color(normalText2));
69+
text.addExtra(hover);
70+
text.addExtra(text2);
71+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
72+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
73+
return text;
74+
}
75+
76+
public TextComponent textRunnable(String normalText, String hoverText, String normalText2, String hoverText2, String hoverTextMessage, String hoverText2Message, String commandName, String commandName2) {
77+
TextComponent text = new TextComponent(color(normalText));
78+
TextComponent hover = new TextComponent(color(hoverText));
79+
TextComponent text2 = new TextComponent(color(normalText2));
80+
TextComponent hover2 = new TextComponent(color(hoverText2));
81+
text.addExtra(hover);
82+
text.addExtra(text2);
83+
text.addExtra(hover2);
84+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
85+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
86+
hover2.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverText2Message)).create()));
87+
hover2.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName2));
88+
return text;
89+
}
90+
91+
public TextComponent textRunnable(String hoverText, String hoverText2, String hoverTextBody3, String hoverTextMessage, String hoverText2Message, String hoverMessage3, String commandName, String commandName2, String commandName3) {
92+
TextComponent hover = new TextComponent(color(hoverText));
93+
TextComponent hover2 = new TextComponent(color(hoverText2));
94+
TextComponent hover3 = new TextComponent(color(hoverTextBody3));
95+
hover.addExtra(hover2);
96+
hover.addExtra(hover3);
97+
hover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverTextMessage)).create()));
98+
hover.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName));
99+
hover2.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverText2Message)).create()));
100+
hover2.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName2));
101+
hover3.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(color(hoverMessage3)).create()));
102+
hover3.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + commandName3));
103+
return hover;
104+
}
105+
106+
107+
}

‎src/main/java/com/github/sanctum/labyrinth/formatting/component/Text.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import net.md_5.bungee.api.chat.TextComponent;
77
import org.bukkit.ChatColor;
88

9+
/**
10+
* @deprecated Replaced by {@link NewComponent}
11+
*/
912
public class Text {
1013

1114
private static String color(String text) {

‎src/main/java/com/github/sanctum/labyrinth/formatting/component/Text_R2.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import net.md_5.bungee.api.chat.TextComponent;
88
import org.bukkit.ChatColor;
99

10+
/**
11+
* @deprecated Replaced by {@link OldComponent}
12+
*/
1013
public class Text_R2 {
1114

1215
private static String color(String text) {

‎src/main/java/com/github/sanctum/labyrinth/gui/Menu.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.List;
1818

1919
/**
20-
* @deprecated Fully replaced by functional menu builder.
20+
* @deprecated Fully replaced by {@link com.github.sanctum.labyrinth.gui.menuman.Menu}
2121
*/
2222
@Deprecated
2323
public abstract class Menu implements InventoryHolder {

0 commit comments

Comments
 (0)