Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-02-07 12:11:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restores the CRAFT_PERMISSION stat for crafting recipes.

Browse Source 
Requires most up-to-date MythicLib
This commit is contained in:
Gunging 2022-01-30 20:02:00 -06:00
parent 4689465b6d
commit 3f1458285a
10 changed files with 144 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -141,7 +141,7 @@
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib-dist</artifactId>
<version>1.3-R21-SNAPSHOT</version>
<version>1.3-R22-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

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

@ -97,7 +97,7 @@ public class MMOItems extends LuminePlugin {
private VaultSupport vaultSupport;
private RPGHandler rpgPlugin;
private static final int MYTHICLIB_COMPATIBILITY_INDEX = 4;
private static final int MYTHICLIB_COMPATIBILITY_INDEX = 5;
public MMOItems() { plugin = this; }
@ -122,7 +122,7 @@ public class MMOItems extends LuminePlugin {
saveDefaultConfig();
configManager = new ConfigManager();
/**
/*
* Stat manager must be initialized before MMOCore compatibility
* initializes so that MMOCore can register its stats
*/

8
src/main/java/net/Indyuce/mmoitems/api/item/build/LoreBuilder.java
View File

@ -157,7 +157,13 @@ public class LoreBuilder {
if (match == null)
continue;
String result = MythicLib.plugin.getMMOConfig().decimals.format(new EvaluatedFormula(match).evaluate());
String result;
try {
result = MythicLib.plugin.getMMOConfig().decimals.format(new EvaluatedFormula(match).evaluate());
} catch (RuntimeException ignored) {
result = "FORMULA_INVALID";
}
lore.set(index, string.replaceAll("MATH\\%[^%]*\\%", result));
}

8
src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsCompatibility.java
View File

@ -4,8 +4,11 @@ import io.lumine.xikage.mythicmobs.MythicMobs;
import io.lumine.xikage.mythicmobs.api.bukkit.events.MythicReloadedEvent;
import io.lumine.xikage.mythicmobs.mobs.MythicMob;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.item.mmoitem.MMOItem;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.comp.mythicmobs.stat.FactionDamage;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
@ -35,6 +38,11 @@ public class MythicMobsCompatibility implements Listener {
// Update skills
MMOItems.plugin.getSkills().initialize(true);
// Reload the abilities of online players...
for (Player p : Bukkit.getOnlinePlayers()) {
PlayerData data = PlayerData.get(p);
data.updateInventory(); }
}
private Set<String> getFactions() {

13
src/main/java/net/Indyuce/mmoitems/gui/edition/recipe/registry/RMGRR_Shaped.java
View File

@ -9,6 +9,7 @@ import io.lumine.mythic.lib.api.crafting.recipes.ShapedRecipe;
import io.lumine.mythic.lib.api.crafting.uimanager.ProvidedUIFilter;
import io.lumine.mythic.lib.api.util.Ref;
import io.lumine.mythic.lib.api.util.ui.FriendlyFeedbackProvider;
import net.Indyuce.mmoitems.ItemStats;
import net.Indyuce.mmoitems.api.crafting.MMOItemUIFilter;
import net.Indyuce.mmoitems.api.item.template.MMOItemTemplate;
import net.Indyuce.mmoitems.api.util.message.FFPMMOItems;
@ -18,6 +19,8 @@ import net.Indyuce.mmoitems.gui.edition.recipe.rba.RBA_AmountOutput;
import net.Indyuce.mmoitems.gui.edition.recipe.rba.RBA_HideFromBook;
import net.Indyuce.mmoitems.gui.edition.recipe.recipes.RMG_Shaped;
import net.Indyuce.mmoitems.gui.edition.recipe.recipes.RecipeMakerGUI;
import net.Indyuce.mmoitems.stat.data.StringData;
import net.Indyuce.mmoitems.stat.data.random.RandomStatData;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.configuration.ConfigurationSection;
@ -65,6 +68,16 @@ public class RMGRR_Shaped implements RecipeRegistry {
// That's our blueprint :)
MythicRecipeBlueprint ret = new MythicRecipeBlueprint(input, outputRecipe, nk);
// Required permission?
RandomStatData perm = template.getBaseItemData().get(ItemStats.CRAFT_PERMISSION);
if (perm instanceof StringData) {
// Ah yes
String permission = ((StringData) perm).getString();
// Finally
if (permission != null) { ret.addRequiredPermission(permission); } }
// Enable it
ret.deploy(MythicRecipeStation.WORKBENCH, namespace);

13
src/main/java/net/Indyuce/mmoitems/gui/edition/recipe/registry/RMGRR_Shapeless.java
View File

@ -10,6 +10,7 @@ import io.lumine.mythic.lib.api.crafting.recipes.ShapelessRecipe;
import io.lumine.mythic.lib.api.crafting.uimanager.ProvidedUIFilter;
import io.lumine.mythic.lib.api.util.Ref;
import io.lumine.mythic.lib.api.util.ui.FriendlyFeedbackProvider;
import net.Indyuce.mmoitems.ItemStats;
import net.Indyuce.mmoitems.api.crafting.MMOItemUIFilter;
import net.Indyuce.mmoitems.api.item.template.MMOItemTemplate;
import net.Indyuce.mmoitems.api.util.message.FFPMMOItems;
@ -18,6 +19,8 @@ import net.Indyuce.mmoitems.gui.edition.recipe.rba.RBA_AmountOutput;
import net.Indyuce.mmoitems.gui.edition.recipe.rba.RBA_HideFromBook;
import net.Indyuce.mmoitems.gui.edition.recipe.recipes.RMG_Shapeless;
import net.Indyuce.mmoitems.gui.edition.recipe.recipes.RecipeMakerGUI;
import net.Indyuce.mmoitems.stat.data.StringData;
import net.Indyuce.mmoitems.stat.data.random.RandomStatData;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.configuration.ConfigurationSection;
@ -87,6 +90,16 @@ public class RMGRR_Shapeless implements RecipeRegistry {
// That's our blueprint :)
MythicRecipeBlueprint ret = new MythicRecipeBlueprint(input, outputRecipe, nk);
// Required permission?
RandomStatData perm = template.getBaseItemData().get(ItemStats.CRAFT_PERMISSION);
if (perm instanceof StringData) {
// Ah yes
String permission = ((StringData) perm).getString();
// Finally
if (permission != null) { ret.addRequiredPermission(permission); } }
// Enable it
ret.deploy(MythicRecipeStation.WORKBENCH, namespace);

15
src/main/java/net/Indyuce/mmoitems/gui/edition/recipe/registry/RMGRR_SuperShaped.java
View File

@ -9,6 +9,8 @@ import io.lumine.mythic.lib.api.crafting.recipes.ShapedRecipe;
import io.lumine.mythic.lib.api.crafting.uimanager.ProvidedUIFilter;
import io.lumine.mythic.lib.api.util.Ref;
import io.lumine.mythic.lib.api.util.ui.FriendlyFeedbackProvider;
import net.Indyuce.mmoitems.ItemStats;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.MMOItemUIFilter;
import net.Indyuce.mmoitems.api.item.template.MMOItemTemplate;
import net.Indyuce.mmoitems.api.util.message.FFPMMOItems;
@ -18,6 +20,9 @@ import net.Indyuce.mmoitems.gui.edition.recipe.rba.RBA_AmountOutput;
import net.Indyuce.mmoitems.gui.edition.recipe.rba.RBA_HideFromBook;
import net.Indyuce.mmoitems.gui.edition.recipe.recipes.RMG_SuperShaped;
import net.Indyuce.mmoitems.gui.edition.recipe.recipes.RecipeMakerGUI;
import net.Indyuce.mmoitems.stat.data.StringData;
import net.Indyuce.mmoitems.stat.data.random.RandomStatData;
import net.Indyuce.mmoitems.stat.data.type.StatData;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.configuration.ConfigurationSection;
@ -65,6 +70,16 @@ public class RMGRR_SuperShaped implements RecipeRegistry {
// That's our blueprint :)
MythicRecipeBlueprint ret = new MythicRecipeBlueprint(input, outputRecipe, nk);
// Required permission?
RandomStatData perm = template.getBaseItemData().get(ItemStats.CRAFT_PERMISSION);
if (perm instanceof StringData) {
// Ah yes
String permission = ((StringData) perm).getString();
// Finally
if (permission != null) { ret.addRequiredPermission(permission); } }
// Enable it
ret.deploy(MythicRecipeStation.WORKBENCH, null);

101
src/main/java/net/Indyuce/mmoitems/manager/SkillManager.java
View File

@ -7,6 +7,9 @@ import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.ConfigFile;
import net.Indyuce.mmoitems.skill.RegisteredSkill;
import org.apache.commons.lang.Validate;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@ -18,59 +21,94 @@ import java.util.Map;
import java.util.Objects;
import java.util.logging.Level;
@SuppressWarnings("unused")
/**
* A HUB for skills for them to be readily available within the plugin
*/
public class SkillManager {
private final Map<String, RegisteredSkill> skills = new HashMap<>();
public RegisteredSkill getSkill(String id) {
return skills.get(id);
}
/**
* The list of skills currently loaded.
*/
@NotNull private final HashMap<String, RegisteredSkill> skills = new HashMap<>();
public RegisteredSkill getSkillOrThrow(String id) {
/**
* @param id Internal name of the skill you want to fetch.
*
* @return If a skill is loaded with this name, that skill.
*/
@Nullable public RegisteredSkill getSkill(@Nullable String id) { return skills.get(id); }
/**
* @param id The internal name of the skill you want to fetch.
*
* @return The skill that is loaded with this name; NullPointerException if not loaded.
*/
@Contract("null -> fail")
@NotNull public RegisteredSkill getSkillOrThrow(@Nullable String id) {
return Objects.requireNonNull(skills.get(id), "Could not find skill with ID '" + id + "'");
}
public void registerSkill(RegisteredSkill skill) {
Validate.notNull(skill);
/**
* @param skill Skill to load
*/
public void registerSkill(@Nullable RegisteredSkill skill) {
if (skill == null) { return; }
this.skills.put(skill.getHandler().getId(), skill);
// Include skill
skills.put(skill.getHandler().getId(), skill);
}
public boolean hasSkill(String id) {
return skills.containsKey(id);
}
/**
* @param id Internal name of the skill you want to fetch.
*
* @return If a skill of this name is loaded by the plugin.
*/
public boolean hasSkill(@Nullable String id) { return skills.get(id) != null; }
/**
* @return Collection of all registered skills. It has the same number
* of elements as MythicLib's skill handler registry.
*/
public Collection<RegisteredSkill> getAll() {
return skills.values();
}
@NotNull public Collection<RegisteredSkill> getAll() { return skills.values(); }
/**
* Will load skills from MythicLib as well as generate their configuration
* files in plugins/MMOItems/skills ~ for default values and translation.
*
* @param clearBefore If the previously-loaded skills should get cleared.
*/
@SuppressWarnings("ResultOfMethodCallIgnored")
public void initialize(boolean clearBefore) {
if (clearBefore)
skills.clear();
// Clear loaded skills
if (clearBefore) { skills.clear(); }
// Check for default files
File skillFolder = new File(MMOItems.plugin.getDataFolder() + "/skill");
if (!skillFolder.exists())
// Create folder and files
if (!skillFolder.exists()) {
try {
// Create folder
skillFolder.mkdir();
// Copy example skills
for (SkillHandler handler : MythicLib.plugin.getSkills().getHandlers()) {
InputStream res = MMOItems.plugin.getResource("default/skill/" + handler.getLowerCaseId() + ".yml");
if (res != null)
Files.copy(res, new File(MMOItems.plugin.getDataFolder() + "/skill/" + handler.getLowerCaseId() + ".yml").getAbsoluteFile().toPath());
}
} catch (IOException exception) {
MMOItems.plugin.getLogger().log(Level.WARNING, "Could not save default ability configs: " + exception.getMessage());
}
if (res != null) { Files.copy(res, new File(MMOItems.plugin.getDataFolder() + "/skill/" + handler.getLowerCaseId() + ".yml").getAbsoluteFile().toPath()); } }
// Should not happen
} catch (IOException exception) { MMOItems.plugin.getLogger().log(Level.WARNING, "Could not save default ability configs: " + exception.getMessage()); }
}
// Copy mythiclib skills
for (SkillHandler handler : MythicLib.plugin.getSkills().getHandlers()) {
// Check if config file exists
/*
* Generate skill configuration files
*/
ConfigFile config = new ConfigFile("/skill", handler.getLowerCaseId());
if (!config.exists()) {
config.getConfig().set("name", MMOUtils.caseOnWords(handler.getId().replace("_", " ").replace("-", " ").toLowerCase()));
@ -81,11 +119,16 @@ public class SkillManager {
config.save();
}
/*
* Load skill to the plugin
*/
try {
this.skills.put(handler.getId(), new RegisteredSkill(handler, config.getConfig()));
} catch (RuntimeException exception) {
MMOItems.plugin.getLogger().log(Level.WARNING, "Could not load skill '" + handler.getId() + "': " + exception.getMessage());
}
// Attempt to register
skills.put(handler.getId(), new RegisteredSkill(handler, config.getConfig()));
// Fail
} catch (RuntimeException exception) { MMOItems.plugin.getLogger().log(Level.WARNING, "Could not load skill '" + handler.getId() + "': " + exception.getMessage()); }
}
}
}

19
src/main/java/net/Indyuce/mmoitems/skill/RegisteredSkill.java
View File

@ -5,6 +5,7 @@ import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.ability.Ability;
import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
@ -12,12 +13,12 @@ import java.util.Map;
import java.util.Objects;
public class RegisteredSkill {
private final SkillHandler<?> handler;
private final String name;
private final Map<String, String> modifierNames = new HashMap<>();
private final Map<String, Double> modifierDefaultValues = new HashMap<>();
@NotNull private final SkillHandler<?> handler;
@NotNull private final String name;
@NotNull private final Map<String, String> modifierNames = new HashMap<>();
@NotNull private final Map<String, Double> modifierDefaultValues = new HashMap<>();
public RegisteredSkill(SkillHandler<?> handler, ConfigurationSection config) {
public RegisteredSkill(@NotNull SkillHandler<?> handler, @NotNull ConfigurationSection config) {
this.handler = handler;
this.name = Objects.requireNonNull(config.getString("name"), "Could not fill skill name");
@ -29,7 +30,7 @@ public class RegisteredSkill {
}
@Deprecated
public RegisteredSkill(Ability ability) {
public RegisteredSkill(@NotNull Ability ability) {
this.handler = ability;
this.name = MMOItems.plugin.getLanguage().getAbilityName(ability);
@ -40,16 +41,16 @@ public class RegisteredSkill {
}
@Deprecated
public RegisteredSkill(SkillHandler handler, String name) {
public RegisteredSkill(@NotNull SkillHandler handler, @NotNull String name) {
this.handler = handler;
this.name = name;
}
public SkillHandler<?> getHandler() {
@NotNull public SkillHandler<?> getHandler() {
return handler;
}
public String getName() {
@NotNull public String getName() {
return name;
}

3
src/main/java/net/Indyuce/mmoitems/stat/data/AbilityData.java
View File

@ -18,6 +18,7 @@ import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.text.DecimalFormat;
import java.util.HashMap;
@ -142,8 +143,10 @@ public class AbilityData extends Skill {
meta.getCaster().getData().getCooldownMap().applyCooldown(this, cooldown);
}
@Nullable
@Override
public SkillHandler getHandler() {
if (ability == null) { return null; }
return ability.getHandler();
}