EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Reworked the relationship between SubSkill and Locale keys

Browse Source
This commit is contained in:
nossr50
2019-01-04 07:58:39 -08:00
parent 6dc75760d0
commit 01a7aa4d12
60 changed files with 2118 additions and 2322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/gmail/nossr50/util/SkillTextComponentFactory.java
View File

@ -2,6 +2,7 @@ package com.gmail.nossr50.util;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
import com.gmail.nossr50.datatypes.skills.PrimarySkill;
import com.gmail.nossr50.datatypes.skills.SubSkill;
import com.gmail.nossr50.datatypes.skills.SubSkillFlags;
import com.gmail.nossr50.locale.LocaleLoader;
@ -15,6 +16,7 @@ import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.entity.Player;
import java.util.HashMap;
import java.util.List;
public class SkillTextComponentFactory {
public static HashMap<SubSkill, TextComponent> subSkillTextComponents;
@ -25,7 +27,7 @@ public class SkillTextComponentFactory {
//This is a nested map because each JSON component for a different rank is going to be a bit different.
public static HashMap<Integer, HashMap<SubSkill, BaseComponent[]>> hoverComponentOuterMap;
public static TextComponent getSubSkillTextComponent(Player player, SubSkill subSkill, int localeKeyName, int localeKeyDescription)
public static TextComponent getSubSkillTextComponent(Player player, SubSkill subSkill)
{
//Init our maps
if (subSkillTextComponents == null)
@ -39,7 +41,7 @@ public class SkillTextComponentFactory {
PlayerProfile playerProfile = UserManager.getPlayer(player).getProfile();
//Get skill name & description from our locale file
String skillName = LocaleLoader.getString(subSkill.getLocalKeyRoot()+localeKeyName);
String skillName = subSkill.getLocaleName();
if(subSkillTextComponents.get(subSkill) == null)
{
@ -48,7 +50,7 @@ public class SkillTextComponentFactory {
textComponent.setColor(ChatColor.DARK_AQUA);
//Hover Event
textComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, getBaseComponent(player, subSkill, localeKeyName, localeKeyDescription)));
textComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, getBaseComponent(player, subSkill)));
//Insertion
textComponent.setInsertion(skillName);
@ -60,7 +62,7 @@ public class SkillTextComponentFactory {
}
}
private static BaseComponent[] getBaseComponent(Player player, SubSkill subSkill, int localeKeyName, int localeKeyDescription)
private static BaseComponent[] getBaseComponent(Player player, SubSkill subSkill)
{
//If the player hasn't unlocked this skill yet we use a different JSON template
if(subSkill.getNumRanks() > 0 && RankUtils.getRank(player, subSkill) == 0)
@ -69,7 +71,7 @@ public class SkillTextComponentFactory {
if(lockedComponentMap.get(subSkill) != null)
return lockedComponentMap.get(subSkill);
BaseComponent[] newComponents = getSubSkillHoverEventJSON(subSkill, player, localeKeyName, localeKeyDescription);
BaseComponent[] newComponents = getSubSkillHoverEventJSON(subSkill, player);
lockedComponentMap.put(subSkill, newComponents);
return lockedComponentMap.get(subSkill);
}
@ -84,7 +86,7 @@ public class SkillTextComponentFactory {
HashMap<SubSkill, BaseComponent[]> innerMap = hoverComponentOuterMap.get(curRank);
if(innerMap.get(subSkill) == null)
innerMap.put(subSkill, getSubSkillHoverEventJSON(subSkill, player, localeKeyName, localeKeyDescription));
innerMap.put(subSkill, getSubSkillHoverEventJSON(subSkill, player));
return innerMap.get(subSkill);
}
@ -100,10 +102,10 @@ public class SkillTextComponentFactory {
return (flag1 & subSkill.getFlags()) == flag1;
}
private static BaseComponent[] getSubSkillHoverEventJSON(SubSkill subSkill, Player player, int localeKeyName, int localeKeyDescription)
private static BaseComponent[] getSubSkillHoverEventJSON(SubSkill subSkill, Player player)
{
String skillName = LocaleLoader.getString(subSkill.getLocalKeyRoot()+localeKeyName);
String skillDescription = LocaleLoader.getString(subSkill.getLocalKeyRoot()+localeKeyDescription);
String skillName = subSkill.getLocaleName();
String skillDescription = subSkill.getLocaleDescription();
/*
* Hover Event BaseComponent color table
@ -180,6 +182,19 @@ public class SkillTextComponentFactory {
componentBuilder.append("\n");
}
public static void getSubSkillTextComponents(Player player, List<TextComponent> textComponents, PrimarySkill parentSkill) {
for(SubSkill subSkill : SubSkill.values())
{
if(subSkill.getParentSkill() == parentSkill)
{
if(Permissions.isSubSkillEnabled(player, subSkill))
{
textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, subSkill));
}
}
}
}
}

2
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@ -271,7 +271,7 @@ public class SkillUtils {
return AdvancedConfig.getInstance().getImpactChance();
case AXES_GREATER_IMPACT:
return AdvancedConfig.getInstance().getGreaterImpactChance();
case TAMING_FAST_FOOD:
case TAMING_FAST_FOOD_SERVICE:
return AdvancedConfig.getInstance().getFastFoodChance();
default:
return 100.0D;