Skip to content

Update: #19

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

Open
cobrex1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update: #19

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
5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>groupId</groupId>
<artifactId>MorphRedeem</artifactId>
<version>1.3.1</version>
<version>1.3.2-SNAPSHOT1</version>
<build>
<finalName>MorphRedeem-${project.version}</finalName>
<resources>
Expand All @@ -19,6 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
Expand Down Expand Up @@ -50,7 +51,7 @@
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<url>https://repo.extendedclip.com/content/releases/</url>
</repository>
<repository>
<id>neetgames</id>
Expand All @@ -74,13 +75,13 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.6</version>
<version>2.12.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>4.1.0</version>
<version>5.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/morphie/mr/CommandsTabCompleter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
if (args.length == 1) {
return StringUtil.copyPartialMatches(args[0], Arrays.asList(
"help", "credits", "send", "add", "remove", "reset", "set", "reload", "acrobatics", "archery", "alchemy", "archery",
"axes", "crossbows", "excavation", "fishing", "herbalism", "mace", "mining", "repair", "swords", "taming", "tridents",
"axes", "crossbows", "excavation", "fishing", "herbalism", "mace", "mining", "repair", "spears", "swords", "taming", "tridents",
"unarmed", "woodcutting"), new ArrayList<>());

} else if (args.length == 2) {
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/dev/morphie/mr/events/menus/RedeemMenuEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,22 @@ public void onInventoryClick(InventoryClickEvent event) {
player.sendMessage(new StringUtils().addColor(this.plugin.getMessage("ErrorPrefix") + this.plugin.getMessage("CreditInProgressMessage").replace("%SKILL%", skill).replace("%CREDITS%", credits)));
}
}
} else if (DisplayName.equals(new StringUtils().addColor(this.plugin.getMessage("Menu.Spears.Name")))) {
event.setCancelled(true);
if (skillDisable == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Spears")) {
event.setCancelled(true);
player.sendMessage(new StringUtils().addColor(this.plugin.getMessage("ErrorPrefix") + this.plugin.getMessage("SkillDisabledMessage")));
} else {
if (!(plugin.addCredits.containsKey(player))) {
player.sendMessage(new StringUtils().addColor(this.plugin.getMessage("Prefix") + this.plugin.getMessage("CreditAssignmentMessage").replace("%CREDITS%", credits)));
plugin.addCredits.put(player, "Spears");
player.closeInventory();
} else {
String skill = plugin.addCredits.get(player);
player.closeInventory();
player.sendMessage(new StringUtils().addColor(this.plugin.getMessage("ErrorPrefix") + this.plugin.getMessage("CreditInProgressMessage").replace("%SKILL%", skill).replace("%CREDITS%", credits)));
}
}
} else if (DisplayName.equals(new StringUtils().addColor(this.plugin.getMessage("Menu.Swords.Name")))) {
event.setCancelled(true);
if (skillDisable == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Swords")) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/morphie/mr/files/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ private void addDefaults(FileConfiguration cfg) {
cfg.addDefault("Menu.Mining.Lore", list);
cfg.addDefault("Menu.Repair.Name", "&9&lRepair&8&l:");
cfg.addDefault("Menu.Repair.Lore", list);
cfg.addDefault("Menu.Spears.Name", "&9&lSpears&8&l:");
cfg.addDefault("Menu.Spears.Lore", list);
cfg.addDefault("Menu.Swords.Name", "&9&lSwords&8&l:");
cfg.addDefault("Menu.Swords.Lore", list);
cfg.addDefault("Menu.Taming.Name", "&9&lTaming&8&l:");
Expand Down
57 changes: 40 additions & 17 deletions src/main/java/dev/morphie/mr/menus/RedeemMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,34 @@ public void openGUIRedeem(Player player) {
.replace("%SKILLXP_NEEDED%", "" + new McMMOMethods().getSkillXPNeeded(player, "Repair")));
}
}

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Repair")) {
Redeem.setItem(28, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Repair.Name"), Repair, false));

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Repair")) {
Redeem.setItem(28, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Repair.Name"), Repair, false));
} else {
Redeem.setItem(28, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Repair.ItemName"), 1, this.plugin.getMessage("Menu.Repair.Name"), Repair, false));
}

ArrayList<String> Spears = new ArrayList();
for (String s : plugin.getMessageList("Menu.Spears.Lore")) {
if (new McMMOMethods().getSkillCap ("Spears") != 2147483647) {
Spears.add(new StringUtils().addColor(s)
.replace("%SKILLLEVEL%", "" + new McMMOMethods().getSkillLevel(player, "Spears"))
.replace("%LEVELCAP%", "" + + new McMMOMethods().getSkillCap("Spears"))
.replace("%SKILLXP%", "" + new McMMOMethods().getSkillXP(player, "Spears"))
.replace("%SKILLXP_NEEDED%", "" + new McMMOMethods().getSkillXPNeeded(player, "Spears")));
} else {
Spears.add(new StringUtils().addColor(s)
.replace("%SKILLLEVEL%", "" + new McMMOMethods().getSkillLevel(player, "Spears"))
.replace("%LEVELCAP%", "" + new StringUtils().addColor(plugin.getMessage("NoSkillCap")))
.replace("%SKILLXP%", "" + new McMMOMethods().getSkillXP(player, "Spears"))
.replace("%SKILLXP_NEEDED%", "" + new McMMOMethods().getSkillXPNeeded(player, "Spears")));
}
}

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Spears")) {
Redeem.setItem(29, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Spears.Name"), Spears, false));
} else {
Redeem.setItem(28, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Repair.ItemName"), 1, this.plugin.getMessage("Menu.Repair.Name"), Repair, false));
Redeem.setItem(29, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Spears.ItemName"), 1, this.plugin.getMessage("Menu.Spears.Name"), Spears, false));
}

ArrayList<String> Swords = new ArrayList();
Expand All @@ -302,9 +325,9 @@ public void openGUIRedeem(Player player) {
}

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Swords")) {
Redeem.setItem(29, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Swords.Name"), Swords, false));
Redeem.setItem(30, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Swords.Name"), Swords, false));
} else {
Redeem.setItem(29, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Swords.ItemName"), 1, this.plugin.getMessage("Menu.Swords.Name"), Swords, false));
Redeem.setItem(30, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Swords.ItemName"), 1, this.plugin.getMessage("Menu.Swords.Name"), Swords, false));
}

ArrayList<String> Taming = new ArrayList();
Expand All @@ -325,9 +348,9 @@ public void openGUIRedeem(Player player) {
}

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Taming")) {
Redeem.setItem(30, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Taming.Name"), Taming, false));
Redeem.setItem(31, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Taming.Name"), Taming, false));
} else {
Redeem.setItem(30, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Taming.ItemName"), 1, this.plugin.getMessage("Menu.Taming.Name"), Taming, false));
Redeem.setItem(31, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Taming.ItemName"), 1, this.plugin.getMessage("Menu.Taming.Name"), Taming, false));
}

ArrayList<String> Tridents = new ArrayList();
Expand All @@ -348,9 +371,9 @@ public void openGUIRedeem(Player player) {
}

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Tridents")) {
Redeem.setItem(31, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Tridents.Name"), Tridents, false));
Redeem.setItem(32, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Tridents.Name"), Tridents, false));
} else {
Redeem.setItem(31, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Tridents.ItemName"), 1, this.plugin.getMessage("Menu.Tridents.Name"), Tridents, false));
Redeem.setItem(32, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Tridents.ItemName"), 1, this.plugin.getMessage("Menu.Tridents.Name"), Tridents, false));
}

ArrayList<String> Unarmed = new ArrayList();
Expand All @@ -371,9 +394,9 @@ public void openGUIRedeem(Player player) {
}

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Unarmed")) {
Redeem.setItem(32, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Unarmed.Name"), Unarmed, false));
Redeem.setItem(38, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Unarmed.Name"), Unarmed, false));
} else {
Redeem.setItem(32, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Unarmed.ItemName"), 1, this.plugin.getMessage("Menu.Unarmed.Name"), Unarmed, false));
Redeem.setItem(38, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Unarmed.ItemName"), 1, this.plugin.getMessage("Menu.Unarmed.Name"), Unarmed, false));
}

ArrayList<String> Woodcutting = new ArrayList();
Expand All @@ -394,9 +417,9 @@ public void openGUIRedeem(Player player) {
}

if (skillDisable == true && replaceItem == true && this.plugin.getConfig().getStringList("Settings.DisabledSkills.SkillsToDisable").contains("Woodcutting")) {
Redeem.setItem(39, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Woodcutting.Name"), Woodcutting, false));
Redeem.setItem(40, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.DisabledSkills.ReplaceGUIItem.ItemName"), 1, this.plugin.getMessage("Menu.Woodcutting.Name"), Woodcutting, false));
} else {
Redeem.setItem(39, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Woodcutting.ItemName"), 1, this.plugin.getMessage("Menu.Woodcutting.Name"), Woodcutting, false));
Redeem.setItem(40, this.plugin.createInventoryItem(this.plugin.getConfig().getString("Settings.GUI.Woodcutting.ItemName"), 1, this.plugin.getMessage("Menu.Woodcutting.Name"), Woodcutting, false));
}

ArrayList<String> mcMMOCredits = new ArrayList();
Expand Down Expand Up @@ -470,9 +493,9 @@ public void openGUIRedeem(Player player) {
Redeem.setItem(5, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
Redeem.setItem(7, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
Redeem.setItem(37, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
Redeem.setItem(38, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
// Redeem.setItem(39, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
Redeem.setItem(40, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
// Redeem.setItem(38, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
Redeem.setItem(39, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
// Redeem.setItem(40, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
Redeem.setItem(41, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));
Redeem.setItem(43, this.plugin.createInventoryItem("BLACK_STAINED_GLASS_PANE", 1, " ", null, false));

Expand Down
28 changes: 15 additions & 13 deletions src/main/java/dev/morphie/mr/util/CreditConversion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,30 @@ public void ApplyCredit(String TYPE, Player player, int CREDITS, String SKILL) {
if (ExperienceAPI.getLevel(player, SKILL) + CREDITS >= cap) {
String message = this.plugin.getMessage("SkillCapReached");
if (message.contains("%SKILL%")) {
message = message.replaceAll("%SKILL%", SKILL);
message = message.replace("%SKILL%", SKILL);
}
if (message.contains("%CAP%")) {
message = message.replaceAll("%CAP%", "" + cap);
message = message.replace("%CAP%", "" + cap);
}
if (message.contains("%LEVEL%")) {
message = message.replaceAll("%LEVEL%", "" + (ExperienceAPI.getLevel(player, SKILL) + CREDITS));
message = message.replace("%LEVEL%", "" + (ExperienceAPI.getLevel(player, SKILL) + CREDITS));
}
player.sendMessage(new StringUtils().addColor(this.plugin.getMessage("ErrorPrefix") + message));
} else {
new DataManager(this.plugin).updateData(uuid, +CREDITS, "Credits_Spent", "add");
new DataManager(this.plugin).updateData(uuid, -CREDITS, "Credits", "remove");

ExperienceAPI.addLevel(player, SKILL, CREDITS);
String message = this.plugin.getMessage("CreditAssignmentSuccess");
if (message.contains("%SKILL%")) {
message = message.replaceAll("%SKILL%", SKILL);
}
if (message.contains("%CREDITS%")) {
message = message.replaceAll("%CREDITS%", "" + CREDITS);
}
player.sendMessage(new StringUtils().addColor(this.plugin.getMessage("Prefix") + message));
Bukkit.getScheduler().runTask(this.plugin, () -> {
ExperienceAPI.addLevel(player, SKILL, CREDITS);
String message = this.plugin.getMessage("CreditAssignmentSuccess");
if (message.contains("%SKILL%")) {
message = message.replace("%SKILL%", SKILL);
}
if (message.contains("%CREDITS%")) {
message = message.replace("%CREDITS%", "" + CREDITS);
}
player.sendMessage(new StringUtils().addColor(this.plugin.getMessage("Prefix") + message)
);
});
}
} else if (TYPE.equals("EXPERIENCE")) {
int xp = this.plugin.getConfig().getInt("Settings.mcMMOSkillXP.XPpercredit");
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ Settings:
ItemName: DIAMOND_PICKAXE
Repair:
ItemName: ANVIL
Spears:
ItemName: DIAMOND_SPEAR
Swords:
ItemName: DIAMOND_SWORD
Taming:
Expand Down
2 changes: 2 additions & 0 deletions target/classes/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ Settings:
ItemName: DIAMOND_PICKAXE
Repair:
ItemName: ANVIL
Spears:
ItemName: DIAMOND_SPEAR
Swords:
ItemName: DIAMOND_SWORD
Taming:
Expand Down
2 changes: 1 addition & 1 deletion target/classes/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MorphRedeem
version: 1.3.1
version: 1.3.2-SNAPSHOT1
main: dev.morphie.mr.MorphRedeem
author: Morphie
api-version: 1.13
Expand Down
2 changes: 1 addition & 1 deletion target/maven-archiver/pom.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
artifactId=MorphRedeem
groupId=groupId
version=1.3.1
version=1.3.2-SNAPSHOT1
Loading