Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-11-27 00:45:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

compatibility with ML 1.2

Browse Source
This commit is contained in:
Indyuce 2021-12-21 19:34:51 +01:00
parent d60002a41f
commit a30851c7d2
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.Indyuce</groupId>
<artifactId>MMOCore</artifactId>
<version>1.8.2</version>
<version>1.8.3</version>
<name>MMOCore</name>
<description>Offer your players a brand new RPG experience!!</description>
@ -72,6 +72,11 @@
<repositories>
<repository>
<id>lumine</id>
<url>https://mvn.lumine.io/repository/maven/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
@ -82,11 +87,6 @@
<url>https://jitpack.io</url>
</repository>
<repository>
<id>lumine</id>
<url>https://mvn.lumine.io/repository/maven/</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@ -124,8 +124,8 @@
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib</artifactId>
<version>1.1.6</version>
<artifactId>MythicLib-dist</artifactId>
<version>1.2-0</version>
<scope>provided</scope>
</dependency>

2
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -76,7 +76,7 @@ public class MMOCore extends LuminePlugin {
public final PartyManager partyManager = new PartyManager();
public final QuestManager questManager = new QuestManager();
public final ProfessionManager professionManager = new ProfessionManager();
public final ExperienceManager experience = new ExperienceManager();
public final net.Indyuce.mmocore.manager.ExperienceManager experience = new net.Indyuce.mmocore.manager.ExperienceManager();
public final LootChestManager lootChests = new LootChestManager();
/*

2
src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java
View File

@ -21,7 +21,7 @@ public class PlayerActionBar extends BukkitRunnable {
public void reload(ConfigurationSection cfg) {
config = new ActionBarConfig(cfg);
digit = new DecimalFormat(config.digit, MythicLib.plugin.getMMOConfig().formatSymbols);
digit = MythicLib.plugin.getMMOConfig().newDecimalFormat(config.digit);
if(!initialized && config.enabled) {
runTaskTimer(MMOCore.plugin, 0, config.ticks);

2
src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java
View File

@ -154,7 +154,7 @@ public enum StatType {
FileConfiguration config = new ConfigFile("stats").getConfig();
for (StatType stat : values()) {
stat.defaultInfo = config.contains("default." + stat.name()) ? new LinearValue(config.getConfigurationSection("default." + stat.name())) : new LinearValue(0, 0);
stat.format = MythicLib.plugin.getMMOConfig().newFormat(config.contains("decimal-format." + stat.name()) ? config.getString("decimal-format." + stat.name()) : "0.#");
stat.format = MythicLib.plugin.getMMOConfig().newDecimalFormat(config.contains("decimal-format." + stat.name()) ? config.getString("decimal-format." + stat.name()) : "0.#");
}
}
}

6
src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicSkill.java
View File

@ -1,8 +1,10 @@
package net.Indyuce.mmocore.comp.mythicmobs;
import io.lumine.mythic.lib.api.player.EquipmentSlot;
import io.lumine.mythic.lib.api.stat.modifier.ModifierSource;
import io.lumine.mythic.lib.api.util.EnumUtils;
import io.lumine.mythic.lib.player.cooldown.CooldownInfo;
import io.lumine.mythic.lib.skill.metadata.TriggerMetadata;
import io.lumine.mythic.lib.skill.trigger.TriggerMetadata;
import io.lumine.mythic.lib.skill.trigger.PassiveSkill;
import io.lumine.mythic.lib.skill.trigger.TriggerType;
import io.lumine.mythic.lib.skill.trigger.TriggeredSkill;
@ -78,7 +80,7 @@ public class MythicSkill extends Skill implements TriggeredSkill {
Optional<TriggerType> passiveType = EnumUtils.getIfPresent(TriggerType.class, config.getString("passive-type").toUpperCase());
Validate.isTrue(passiveType.isPresent(), "Invalid passive skill type");
setPassive();
mythicLibSkill = new PassiveSkill("MMOCorePassiveSkill", passiveType.get(), this);
mythicLibSkill = new PassiveSkill("MMOCorePassiveSkill", passiveType.get(), this, EquipmentSlot.OTHER, ModifierSource.OTHER);
} else
mythicLibSkill = null;
}