Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-23 04:47:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

You can now choose with certainty which RPG Provider plugin you want to use.

Browse Source 
(RPG Provider is, which plugin tells MMOItems what class / level players are, like MCMMO power level or MMOCore or whichever).

Add to your config:
```
preferred-rpg-provider: <plugin>
```

If you misspell the name, you'll get this list telling you all RPG Providers supported:

```cs
[MMOItems RPG Provider] These are the supported ones:
[MMOItems RPG Provider]  + MMOCore
[MMOItems RPG Provider]  + Heroes
[MMOItems RPG Provider]  + SkillAPI
[MMOItems RPG Provider]  + RPGPlayerLeveling
[MMOItems RPG Provider]  + RacesAndClasses
[MMOItems RPG Provider]  + BattleLevels
[MMOItems RPG Provider]  + mcMMO
[MMOItems RPG Provider]  + McRPG
[MMOItems RPG Provider]  + Skills
[MMOItems RPG Provider]  + SkillsPro
```
This commit is contained in:
Gunging 2021-03-29 17:44:32 -05:00
parent 623bcf3200
commit 4dc91ff3e0
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/net/Indyuce/mmoitems/MMOItems.java
View File

@ -1,5 +1,7 @@
package net.Indyuce.mmoitems;
import io.lumine.mythic.lib.api.util.ui.FriendlyFeedbackCategory;
import io.lumine.mythic.lib.api.util.ui.FriendlyFeedbackMessage;
import io.lumine.mythic.lib.api.util.ui.FriendlyFeedbackProvider;
import io.lumine.mythic.lib.version.SpigotPlugin;
import io.lumine.mythic.utils.plugin.LuminePlugin;
@ -44,6 +46,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nullable;
@ -519,17 +522,46 @@ public class MMOItems extends LuminePlugin {
if (rpgPlugin != null)
return;
String preferred = MMOItems.plugin.getConfig().getString("preferred-rpg-provider", null);
if (preferred != null) {
try {
RPGHandler.PluginEnum preferredRPG = RPGHandler.PluginEnum.valueOf(preferred.toUpperCase());
// Found the plugin?
if (Bukkit.getPluginManager().getPlugin(preferredRPG.getName()) != null) {
// Load that one
setRPG(preferredRPG.load());
// Mention it
print(null, "Using $s{0}$b as RPGPlayer provider", "RPG Provider", preferredRPG.getName());
return;
} else {
print(null, "Preferred RPGPlayer provider $r{0}$b is not installed!", "RPG Provider", preferred); }
} catch (IllegalArgumentException ignored) {
// Log error
FriendlyFeedbackProvider ffp = new FriendlyFeedbackProvider(FFPMMOItems.get());
ffp.activatePrefix(true, "RPG Provider");
ffp.log(FriendlyFeedbackCategory.ERROR, "Invalid RPG Provider '$u{0}$b' --- These are the supported ones:", preferred);
for (RPGHandler.PluginEnum pgrep : RPGHandler.PluginEnum.values()) { ffp.log(FriendlyFeedbackCategory.ERROR, " $r+ $b{0}", pgrep.getName()); }
ffp.sendTo(FriendlyFeedbackCategory.ERROR, getConsole());
}
}
// For each supported plugin
for (RPGHandler.PluginEnum plugin : RPGHandler.PluginEnum.values()) {
for (RPGHandler.PluginEnum pluginEnum : RPGHandler.PluginEnum.values()) {
// Found the plugin?
if (Bukkit.getPluginManager().getPlugin(plugin.getName()) != null) {
if (Bukkit.getPluginManager().getPlugin(pluginEnum.getName()) != null) {
// Load that one
setRPG(plugin.load());
setRPG(pluginEnum.load());
// Mention it
print(Level.INFO, "Using $s{0}$b as RPGPlayer provider", plugin.getName());
print(null, "Using $s{0}$b as RPGPlayer provider", "RPG Provider", pluginEnum.getName());
return;
}
}
@ -683,9 +715,13 @@ public class MMOItems extends LuminePlugin {
*
* @author Gunging
*/
public static void print(@NotNull Level level, @Nullable String message, @NotNull String... replaces) {
public static void print(@Nullable Level level, @Nullable String message, @Nullable String prefix, @NotNull String... replaces) {
if (message == null) { message = "< null >"; }
MMOItems.plugin.getLogger().log(level, FriendlyFeedbackProvider.quickForConsole(FFPMMOItems.get(), message, replaces));
if (level != null) { MMOItems.plugin.getLogger().log(level, FriendlyFeedbackProvider.quickForConsole(FFPMMOItems.get(), message, replaces));
} else {
FriendlyFeedbackMessage p = new FriendlyFeedbackMessage("", prefix);
FriendlyFeedbackMessage r = FriendlyFeedbackProvider.generateMessage(p, message, replaces);
getConsole().sendMessage(r.forConsole(FFPMMOItems.get())); }
}
/**

2
src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/Weapon.java
View File

@ -40,7 +40,7 @@ public class Weapon extends UseItem {
boolean asCanUse = playerData.getRPG().canUse(getNBTItem(), true);
boolean asFlagAllowed = true; FlagPlugin fg = MMOItems.plugin.getFlags(); if (fg != null) { asFlagAllowed = fg.isFlagAllowed(getPlayer(), CustomFlag.MI_WEAPONS); }
else { MMOItems.print(Level.WARNING, "$fFlag plugin not found"); }
else { MMOItems.print(Level.WARNING, "$fFlag plugin not found", null); }
return asCanUse || asFlagAllowed;
}