Skip to content

Commit 32c698e

Browse files
NikV2NikV2
committed
Better - Safer reloading
Removed reloading from the GUI Removed reload message
1 parent efe9b97 commit 32c698e

7 files changed

Lines changed: 84 additions & 91 deletions

File tree

‎src/main/java/me/nik/combatplus/commands/subcommands/Reload.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ public boolean canConsoleExecute() {
4444
@Override
4545
public void perform(CommandSender sender, String[] args) {
4646
if (args.length == 1) {
47-
sender.sendMessage(MsgType.RELOADING.getMessage());
48-
plugin.getServer().getPluginManager().disablePlugin(plugin);
49-
plugin.getServer().getPluginManager().enablePlugin(plugin);
47+
plugin.onDisable();
48+
plugin.onEnable();
5049
sender.sendMessage(MsgType.RELOADED.getMessage());
5150
}
5251
}

‎src/main/java/me/nik/combatplus/files/Lang.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public void addDefaults() {
4242
get().options().header("+----------------------------------------------------------------------------------------------+" + "\n" + "| |" + "\n" + "| Combat Plus |" + "\n" + "| |" + "\n" + "| Discord: https://discord.gg/m7j2Y9H |" + "\n" + "| |" + "\n" + "| Author: Nik |" + "\n" + "| |" + "\n" + "+----------------------------------------------------------------------------------------------+" + "\n");
4343
get().addDefault("prefix", "&f&l[&cCombat+&f&l]&f: ");
4444
get().addDefault("no_perm", "&cYou do not have permission to do that!");
45-
get().addDefault("reloading", "&fReloading the plugin...");
4645
get().addDefault("reloaded", "&fYou have successfully reloaded the plugin!");
4746
get().addDefault("update_reminder", "&6There is a new version available, Your version &a%current%&6 new version &a%new%");
4847
get().addDefault("golden_apple_cooldown", "&fYou cannot eat a Golden Apple yet, You must wait %seconds% seconds.");

‎src/main/java/me/nik/combatplus/gui/menus/CombatGui.java‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -83,79 +83,79 @@ protected void setMenuItems() {
8383
ItemStack back = makeItem(Material.BARRIER, 1, "&cBack", null);
8484

8585
inventory.setItem(49, back);
86-
ArrayList<String> oldPvpLore = new ArrayList<>();
86+
ArrayList<String> oldPvpLore = new ArrayList<>();
8787
oldPvpLore.add("");
8888
oldPvpLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.OLD_PVP.getKey()));
8989
oldPvpLore.add("");
90-
oldPvpLore.add("&fWould you like your server to use");
91-
oldPvpLore.add("&f1.8 PvP Combat?");
92-
ItemStack oldPvp = makeItem(Material.PAPER, 1, "&6Old PvP", oldPvpLore);
90+
oldPvpLore.add("&fWould you like your server to use");
91+
oldPvpLore.add("&f1.8 PvP Combat?");
92+
ItemStack oldPvp = makeItem(Material.PAPER, 1, "&6Old PvP", oldPvpLore);
9393

94-
ArrayList<String> oldWepDmgLore = new ArrayList<>();
94+
ArrayList<String> oldWepDmgLore = new ArrayList<>();
9595
oldWepDmgLore.add("");
9696
oldWepDmgLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.OLD_WEAPON_DAMAGE.getKey()));
9797
oldWepDmgLore.add("");
98-
oldWepDmgLore.add("&fWould you like Swords to Deal");
99-
oldWepDmgLore.add("&fDamage just like in 1.8?");
100-
ItemStack oldWepDmg = makeItem(Material.PAPER, 1, "&6Old Weapon Damage", oldWepDmgLore);
98+
oldWepDmgLore.add("&fWould you like Swords to Deal");
99+
oldWepDmgLore.add("&fDamage just like in 1.8?");
100+
ItemStack oldWepDmg = makeItem(Material.PAPER, 1, "&6Old Weapon Damage", oldWepDmgLore);
101101

102-
ArrayList<String> oldToolDmgLore = new ArrayList<>();
102+
ArrayList<String> oldToolDmgLore = new ArrayList<>();
103103
oldToolDmgLore.add("");
104104
oldToolDmgLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.OLD_TOOL_DAMAGE.getKey()));
105105
oldToolDmgLore.add("");
106-
oldToolDmgLore.add("&fWould you like Tools to Deal");
107-
oldToolDmgLore.add("&fDamage just like in 1.8?");
108-
ItemStack oldToolDmg = makeItem(Material.PAPER, 1, "&6Old Tool Damage", oldToolDmgLore);
106+
oldToolDmgLore.add("&fWould you like Tools to Deal");
107+
oldToolDmgLore.add("&fDamage just like in 1.8?");
108+
ItemStack oldToolDmg = makeItem(Material.PAPER, 1, "&6Old Tool Damage", oldToolDmgLore);
109109

110-
ArrayList<String> oldSharpLore = new ArrayList<>();
110+
ArrayList<String> oldSharpLore = new ArrayList<>();
111111
oldSharpLore.add("");
112112
oldSharpLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.OLD_SHARPNESS.getKey()));
113113
oldSharpLore.add("");
114-
oldSharpLore.add("&fWould you like Sharpness");
115-
oldSharpLore.add("&fTo work just like in 1.8?");
116-
ItemStack oldSharp = makeItem(Material.PAPER, 1, "&6Old Sharpness", oldSharpLore);
114+
oldSharpLore.add("&fWould you like Sharpness");
115+
oldSharpLore.add("&fTo work just like in 1.8?");
116+
ItemStack oldSharp = makeItem(Material.PAPER, 1, "&6Old Sharpness", oldSharpLore);
117117

118-
ArrayList<String> disableSweepLore = new ArrayList<>();
118+
ArrayList<String> disableSweepLore = new ArrayList<>();
119119
disableSweepLore.add("");
120120
disableSweepLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.DISABLE_SWEEP_ENABLED.getKey()));
121121
disableSweepLore.add("");
122-
disableSweepLore.add("&fWould you like to Disable");
123-
disableSweepLore.add("&fSweep Attacks?");
124-
ItemStack disableSweep = makeItem(Material.PAPER, 1, "&6Disable Sweep Attacks", disableSweepLore);
122+
disableSweepLore.add("&fWould you like to Disable");
123+
disableSweepLore.add("&fSweep Attacks?");
124+
ItemStack disableSweep = makeItem(Material.PAPER, 1, "&6Disable Sweep Attacks", disableSweepLore);
125125

126-
ArrayList<String> disableBoostLore = new ArrayList<>();
126+
ArrayList<String> disableBoostLore = new ArrayList<>();
127127
disableBoostLore.add("");
128128
disableBoostLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.DISABLE_ARROW_BOOST.getKey()));
129129
disableBoostLore.add("");
130-
disableBoostLore.add("&fWould you like to Prevent");
131-
disableBoostLore.add("&fPlayers from Boosting themselves?");
132-
ItemStack disableBoost = makeItem(Material.PAPER, 1, "&6Disable Arrow Boost", disableBoostLore);
130+
disableBoostLore.add("&fWould you like to Prevent");
131+
disableBoostLore.add("&fPlayers from Boosting themselves?");
132+
ItemStack disableBoost = makeItem(Material.PAPER, 1, "&6Disable Arrow Boost", disableBoostLore);
133133

134-
ArrayList<String> oldRegenLore = new ArrayList<>();
134+
ArrayList<String> oldRegenLore = new ArrayList<>();
135135
oldRegenLore.add("");
136136
oldRegenLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.OLD_REGEN.getKey()));
137137
oldRegenLore.add("");
138-
oldRegenLore.add("&fWould you like Regeneration");
139-
oldRegenLore.add("&fTo work just like in 1.8?");
140-
ItemStack oldRegen = makeItem(Material.PAPER, 1, "&6Old Player Regen", oldRegenLore);
138+
oldRegenLore.add("&fWould you like Regeneration");
139+
oldRegenLore.add("&fTo work just like in 1.8?");
140+
ItemStack oldRegen = makeItem(Material.PAPER, 1, "&6Old Player Regen", oldRegenLore);
141141

142-
ArrayList<String> blockLore = new ArrayList<>();
142+
ArrayList<String> blockLore = new ArrayList<>();
143143
blockLore.add("");
144144
blockLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.SWORD_BLOCKING_ENABLED.getKey()));
145145
blockLore.add("");
146-
blockLore.add("&fGives Resistance While");
147-
blockLore.add("&fRight Clicking With a Sword");
148-
blockLore.add("");
149-
blockLore.add("&7More options in the Config.yml");
150-
ItemStack block = makeItem(Material.PAPER, 1, "&6Sword Blocking", blockLore);
151-
152-
inventory.setItem(10, block);
153-
inventory.setItem(12, oldPvp);
154-
inventory.setItem(14, oldWepDmg);
155-
inventory.setItem(16, oldToolDmg);
156-
inventory.setItem(28, oldSharp);
157-
inventory.setItem(30, disableSweep);
158-
inventory.setItem(32, disableBoost);
159-
inventory.setItem(34, oldRegen);
146+
blockLore.add("&fGives Resistance While");
147+
blockLore.add("&fRight Clicking With a Sword");
148+
blockLore.add("");
149+
blockLore.add("&7More options in the Config.yml");
150+
ItemStack block = makeItem(Material.PAPER, 1, "&6Sword Blocking", blockLore);
151+
152+
inventory.setItem(10, block);
153+
inventory.setItem(12, oldPvp);
154+
inventory.setItem(14, oldWepDmg);
155+
inventory.setItem(16, oldToolDmg);
156+
inventory.setItem(28, oldSharp);
157+
inventory.setItem(30, disableSweep);
158+
inventory.setItem(32, disableBoost);
159+
inventory.setItem(34, oldRegen);
160160
}
161161
}

‎src/main/java/me/nik/combatplus/gui/menus/GeneralGui.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -90,51 +90,51 @@ protected void setMenuItems() {
9090

9191
inventory.setItem(49, back);
9292
inventory.setItem(53, next);
93-
ArrayList<String> gappleLore = new ArrayList<>();
93+
ArrayList<String> gappleLore = new ArrayList<>();
9494
gappleLore.add("");
9595
gappleLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.COOLDOWN_GOLDEN_APPLE_ENABLED.getKey()));
9696
gappleLore.add("");
97-
gappleLore.add("&fWould you like a Cooldown");
98-
gappleLore.add("&fBetween eating Golden Apples?");
99-
gappleLore.add("");
100-
gappleLore.add("&7More options in the Config.yml");
101-
ItemStack gapple = makeItem(Material.PAPER, 1, "&6Golden Apple Cooldown", gappleLore);
97+
gappleLore.add("&fWould you like a Cooldown");
98+
gappleLore.add("&fBetween eating Golden Apples?");
99+
gappleLore.add("");
100+
gappleLore.add("&7More options in the Config.yml");
101+
ItemStack gapple = makeItem(Material.PAPER, 1, "&6Golden Apple Cooldown", gappleLore);
102102

103-
ArrayList<String> gappleELore = new ArrayList<>();
103+
ArrayList<String> gappleELore = new ArrayList<>();
104104
gappleELore.add("");
105105
gappleELore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.COOLDOWN_ENCHANTED_APPLE_ENABLED.getKey()));
106106
gappleELore.add("");
107-
gappleELore.add("&fWould you like a Cooldown");
108-
gappleELore.add("&fBetween eating Enchanted Golden Apples?");
109-
gappleELore.add("");
110-
gappleELore.add("&7More options in the Config.yml");
111-
ItemStack gappleE = makeItem(Material.PAPER, 1, "&6Enchanted Golden Apple Cooldown", gappleELore);
107+
gappleELore.add("&fWould you like a Cooldown");
108+
gappleELore.add("&fBetween eating Enchanted Golden Apples?");
109+
gappleELore.add("");
110+
gappleELore.add("&7More options in the Config.yml");
111+
ItemStack gappleE = makeItem(Material.PAPER, 1, "&6Enchanted Golden Apple Cooldown", gappleELore);
112112

113-
ArrayList<String> disItemsLore = new ArrayList<>();
113+
ArrayList<String> disItemsLore = new ArrayList<>();
114114
disItemsLore.add("");
115115
disItemsLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.DISABLED_ITEMS_ENABLED.getKey()));
116116
disItemsLore.add("");
117-
disItemsLore.add("&fWould you like to Disable specific");
118-
disItemsLore.add("&fItems from being Crafted?");
119-
disItemsLore.add("");
120-
disItemsLore.add("&7More options in the Config.yml");
121-
ItemStack disItems = makeItem(Material.PAPER, 1, "&6Disabled Items", disItemsLore);
117+
disItemsLore.add("&fWould you like to Disable specific");
118+
disItemsLore.add("&fItems from being Crafted?");
119+
disItemsLore.add("");
120+
disItemsLore.add("&7More options in the Config.yml");
121+
ItemStack disItems = makeItem(Material.PAPER, 1, "&6Disabled Items", disItemsLore);
122122

123-
ArrayList<String> offhLore = new ArrayList<>();
123+
ArrayList<String> offhLore = new ArrayList<>();
124124
offhLore.add("");
125125
offhLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.DISABLE_OFFHAND_ENABLED.getKey()));
126126
offhLore.add("");
127-
offhLore.add("&fWould you like to Prevent");
128-
offhLore.add("&fPlayers from using the Offhand?");
129-
ItemStack offh = makeItem(Material.PAPER, 1, "&6Disable Offhand", offhLore);
127+
offhLore.add("&fWould you like to Prevent");
128+
offhLore.add("&fPlayers from using the Offhand?");
129+
ItemStack offh = makeItem(Material.PAPER, 1, "&6Disable Offhand", offhLore);
130130

131-
ArrayList<String> projLore = new ArrayList<>();
131+
ArrayList<String> projLore = new ArrayList<>();
132132
projLore.add("");
133133
projLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.FIX_PROJECTILES.getKey()));
134134
projLore.add("");
135-
projLore.add("&fFixes a Bug with Projectiles");
136-
projLore.add("&fNot always going straight");
137-
ItemStack proj = makeItem(Material.PAPER, 1, "&6Projectile Fixer", projLore);
135+
projLore.add("&fFixes a Bug with Projectiles");
136+
projLore.add("&fNot always going straight");
137+
ItemStack proj = makeItem(Material.PAPER, 1, "&6Projectile Fixer", projLore);
138138

139139
ArrayList<String> healthLore = new ArrayList<>();
140140
healthLore.add("");

‎src/main/java/me/nik/combatplus/gui/menus/GeneralTwoGui.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,25 @@ protected void setMenuItems() {
5353
ItemStack pp = makeItem(Material.BOOK, 1, "&ePrevious Page 2/2", null);
5454

5555
inventory.setItem(45, pp);
56-
ArrayList<String> egaLore = new ArrayList<>();
56+
ArrayList<String> egaLore = new ArrayList<>();
5757
egaLore.add("");
5858
egaLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.ENCHANTED_APPLE_CRAFTING.getKey()));
5959
egaLore.add("");
60-
egaLore.add("&fMakes Enchanted Golden Apples");
61-
egaLore.add("&fAble to be Crafted");
62-
ItemStack ega = makeItem(Material.PAPER, 1, "&6Enchanted Golden Apple Crafting", egaLore);
60+
egaLore.add("&fMakes Enchanted Golden Apples");
61+
egaLore.add("&fAble to be Crafted");
62+
ItemStack ega = makeItem(Material.PAPER, 1, "&6Enchanted Golden Apple Crafting", egaLore);
6363

64-
ArrayList<String> frkLore = new ArrayList<>();
64+
ArrayList<String> frkLore = new ArrayList<>();
6565
frkLore.add("");
6666
frkLore.add("&7Currently set to: &a" + getConfigValue(Config.Setting.FISHING_ROD_ENABLED.getKey()));
6767
frkLore.add("");
68-
frkLore.add("&fMakes Fishing Rods Knockback");
69-
frkLore.add("&fPlayers just like in 1.8");
70-
frkLore.add("");
71-
frkLore.add("&7More options in the Config.yml");
72-
ItemStack frk = makeItem(Material.PAPER, 1, "&6Fishing Rod Knockback", frkLore);
68+
frkLore.add("&fMakes Fishing Rods Knockback");
69+
frkLore.add("&fPlayers just like in 1.8");
70+
frkLore.add("");
71+
frkLore.add("&7More options in the Config.yml");
72+
ItemStack frk = makeItem(Material.PAPER, 1, "&6Fishing Rod Knockback", frkLore);
7373

74-
inventory.setItem(10, ega);
75-
inventory.setItem(12, frk);
74+
inventory.setItem(10, ega);
75+
inventory.setItem(12, frk);
7676
}
7777
}

‎src/main/java/me/nik/combatplus/gui/menus/MainGui.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ public void handleMenu(InventoryClickEvent e) {
4848
break;
4949
case 31:
5050
p.closeInventory();
51-
p.sendMessage(MsgType.RELOADING.getMessage());
52-
plugin.getServer().getPluginManager().disablePlugin(plugin);
53-
plugin.getServer().getPluginManager().enablePlugin(plugin);
54-
p.sendMessage(MsgType.RELOADED.getMessage());
5551
break;
5652
}
5753
}
@@ -62,7 +58,7 @@ public void setMenuItems() {
6258
ItemStack combatSettings = makeItem(Material.DIAMOND_CHESTPLATE, 1, "&eCombat Settings", null);
6359
ItemStack generalSettings = makeItem(Material.NAME_TAG, 1, "&aGeneral Settings", null);
6460
ItemStack support = makeItem(Material.DIAMOND, 1, "&bLooking for Support?", null);
65-
ItemStack close = makeItem(Material.BARRIER, 1, "&cReload and Exit", null);
61+
ItemStack close = makeItem(Material.BARRIER, 1, "&cExit", null);
6662

6763
inventory.setItem(31, close);
6864
inventory.setItem(16, support);

‎src/main/java/me/nik/combatplus/managers/MsgType.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
public enum MsgType {
77
PREFIX(Messenger.format(CombatPlus.getInstance().getLang().get().getString("prefix"))),
88
NO_PERMISSION(PREFIX.getMessage() + Messenger.format(CombatPlus.getInstance().getLang().get().getString("no_perm"))),
9-
RELOADING(PREFIX.getMessage() + Messenger.format(CombatPlus.getInstance().getLang().get().getString("reloading"))),
109
RELOADED(PREFIX.getMessage() + Messenger.format(CombatPlus.getInstance().getLang().get().getString("reloaded"))),
1110
UPDATE_REMINDER(PREFIX.getMessage() + Messenger.format(CombatPlus.getInstance().getLang().get().getString("update_reminder"))),
1211
GOLDEN_APPLE_COOLDOWN(PREFIX.getMessage() + Messenger.format(CombatPlus.getInstance().getLang().get().getString("golden_apple_cooldown"))),

0 commit comments

Comments
 (0)