Skip to content

support latest version(mythiclib1.6,mmoitems6.9.4) #4

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
meteorOSS wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support latest version(mythiclib1.6,mmoitems6.9.4) #4

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
12 changes: 7 additions & 5 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>eu.asangarin</groupId>
<artifactId>MMOMana</artifactId>
<version>1.3</version>
<version>1.3.1-update</version>
<packaging>jar</packaging>
<name>MMOMana</name>

Expand Down Expand Up @@ -80,14 +80,16 @@
<dependency>
<groupId>net.Indyuce</groupId>
<artifactId>MMOItems</artifactId>
<version>6.5.4</version>
<scope>provided</scope>
<version>6.9.4</version>
<scope>system</scope>
<systemPath>${basedir}/src/lib/MMOItems-6.9.4.jar</systemPath>
</dependency>
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib</artifactId>
<version>1.0.6</version>
<scope>provided</scope>
<version>1.6</version>
<scope>system</scope>
<systemPath>${basedir}/src/lib/MythicLib-1.6.1.jar</systemPath>
</dependency>
<dependency>
<groupId>me.clip</groupId>
Expand Down
21 changes: 20 additions & 1 deletion src/main/java/eu/asangarin/mana/MMOMana.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package eu.asangarin.mana;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;

import eu.asangarin.mana.api.ResourceData;
Expand All @@ -8,6 +11,7 @@
import eu.asangarin.mana.comp.PAPIPlaceholders;
import eu.asangarin.mana.manager.PlayerDataManager;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.comp.rpg.RPGHandler;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

Expand Down Expand Up @@ -41,7 +45,21 @@ public void onEnable() {
Bukkit.getPluginManager().disablePlugin(this);
return;
}
MMOItems.plugin.setRPG(new DefaultHook());

// MMOItems.plugin.setRPG(new DefaultHook());

try {
MMOItems instance = MMOItems.plugin;
Field rpgPluginsField = MMOItems.class.getDeclaredField("rpgPlugins");
rpgPluginsField.setAccessible(true);
List<RPGHandler> newRpgPlugins = new ArrayList<>();
newRpgPlugins.add(new DefaultHook());
rpgPluginsField.set(instance, newRpgPlugins);

} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
}


Bukkit.getOnlinePlayers().forEach(this.dataManager::setup);
if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
Expand All @@ -58,6 +76,7 @@ public void onEnable() {
}
}
}, 100L, config.refreshRate);

Bukkit.getScheduler().runTaskTimerAsynchronously(this, () -> dataManager.getLoaded().removeIf(data -> !data.toMMOLib().isOnline()), 600000L, 600000L);
}
}
8 changes: 4 additions & 4 deletions src/main/java/eu/asangarin/mana/api/ResourceData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public class ResourceData {

public ResourceData(MMOPlayerData data) {
this.data = data;
data.getStatMap().getInstance("MAX_MANA").addModifier("manaAndStamina", new StatModifier(ResourceData.StatType.MAX_MANA.getBase()));
data.getStatMap().getInstance("MAX_STAMINA").addModifier("manaAndStamina", new StatModifier(ResourceData.StatType.MAX_STAMINA.getBase()));
data.getStatMap().getInstance("MANA_REGENERATION").addModifier("manaAndStamina", new StatModifier(ResourceData.StatType.MANA_REGENERATION.getBase()));
data.getStatMap().getInstance("STAMINA_REGENERATION").addModifier("manaAndStamina", new StatModifier(ResourceData.StatType.STAMINA_REGENERATION.getBase()));
new StatModifier("manaAndStamina","MAX_MANA", StatType.MAX_MANA.getBase()).register(data);
new StatModifier("manaAndStamina","MAX_STAMINA", StatType.MAX_STAMINA.getBase()).register(data);
new StatModifier("manaAndStamina","MANA_REGENERATION", StatType.MANA_REGENERATION.getBase()).register(data);
new StatModifier("manaAndStamina","STAMINA_REGENERATION", StatType.STAMINA_REGENERATION.getBase()).register(data);
this.mana = MMOMana.plugin.config.loginManaRatio / 100.0D * this.getStat(ResourceData.StatType.MAX_MANA);
this.stamina = MMOMana.plugin.config.loginStaminaRatio / 100.0D * this.getStat(ResourceData.StatType.MAX_STAMINA);
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/eu/asangarin/mana/manager/PlayerDataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public void setup(Player player) {
if (!this.map.containsKey(player.getUniqueId())) {
this.map.put(player.getUniqueId(), new ResourceData(MMOPlayerData.get(player)));
}

}

public ResourceData get(OfflinePlayer player) {
Expand Down