Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Fix some issues with the CustomXPPerkSerializer

Browse Source
This commit is contained in:
nossr50 2019-06-04 20:00:25 -07:00
parent ffe27326e3
commit 32fa6cee96
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializerPartyFeature.java
View File

@ -1,5 +1,6 @@
package com.gmail.nossr50.config.hocon.serializers; package com.gmail.nossr50.config.hocon.serializers;
import com.gmail.nossr50.config.hocon.HOCONUtil;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.ConfigurationNode;
import ninja.leaping.configurate.objectmapping.ObjectMappingException; import ninja.leaping.configurate.objectmapping.ObjectMappingException;

45
src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomXPPerkSerializer.java
View File

@ -12,30 +12,24 @@ import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.HashMap;
import java.util.Map;
public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> { public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> {
private static final String PERK_NAME = "perk-name";
private static final String XP_BOOST_NODE_ROOT = "XP-Boosts";
@Nullable @Nullable
@Override @Override
public CustomXPPerk deserialize(@NonNull TypeToken<?> type, @NonNull ConfigurationNode value) throws ObjectMappingException { public CustomXPPerk deserialize(@NonNull TypeToken<?> type, @NonNull ConfigurationNode value) throws ObjectMappingException {
String perkName = value.getNode("name").getValue(TypeToken.of(String.class)); String perkName = value.getNode(PERK_NAME).getValue(TypeToken.of(String.class));
Map<PrimarySkillType, Float> map = value.getNode(XP_BOOST_NODE_ROOT).getValue(new TypeToken<Map<PrimarySkillType, Float>>(){});
HashMap<PrimarySkillType, Float> xpBoostHashMap = new HashMap<>(map);
CustomXPPerk customXPPerk = new CustomXPPerk(perkName); CustomXPPerk customXPPerk = new CustomXPPerk(perkName);
customXPPerk.setCustomXPMultiplierMap(xpBoostHashMap);
//See if any children nodes match skills by name
for (ConfigurationNode configurationNode : value.getChildrenList()) {
try {
PrimarySkillType primarySkillType = matchIgnoreCase(configurationNode.getValue(TypeToken.of(String.class)));
if (primarySkillType.isChildSkill())
continue; //Child skills gross
Float boostValue = configurationNode.getNode("XP-Multiplier").getValue(TypeToken.of(Float.class));
customXPPerk.setCustomXPValue(primarySkillType, boostValue);
} catch (InvalidSkillException e) {
mcMMO.p.getLogger().info("Custom XP perk has a skill defined that was not found, did you misspell it?");
e.printStackTrace();
} catch (ObjectMappingException e) {
e.printStackTrace();
}
}
return customXPPerk; return customXPPerk;
} }
@ -44,7 +38,9 @@ public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> {
public void serialize(@NonNull TypeToken<?> type, @Nullable CustomXPPerk obj, @NonNull ConfigurationNode value) throws ObjectMappingException { public void serialize(@NonNull TypeToken<?> type, @Nullable CustomXPPerk obj, @NonNull ConfigurationNode value) throws ObjectMappingException {
String name = obj.getPerkName(); String name = obj.getPerkName();
value.getNode("name").setValue(name); HashMap<PrimarySkillType, Float> xpBoostMap = new HashMap<>();
value.getNode(PERK_NAME).setValue(name);
for (PrimarySkillType primarySkillType : PrimarySkillType.values()) { for (PrimarySkillType primarySkillType : PrimarySkillType.values()) {
float xpMultValue = obj.getXPMultiplierValue(primarySkillType); float xpMultValue = obj.getXPMultiplierValue(primarySkillType);
@ -53,9 +49,10 @@ public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> {
if (xpMultValue == 1.0F) if (xpMultValue == 1.0F)
continue; continue;
//Set value xpBoostMap.put(primarySkillType, obj.getXPMultiplierValue(primarySkillType));
value.getNode("name").getNode(StringUtils.getCapitalized(primarySkillType.toString())).setValue(xpMultValue);
} }
value.getNode(XP_BOOST_NODE_ROOT).setValue(xpBoostMap);
} }
private PrimarySkillType matchIgnoreCase(String string) throws InvalidSkillException { private PrimarySkillType matchIgnoreCase(String string) throws InvalidSkillException {
@ -66,10 +63,4 @@ public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> {
throw new InvalidSkillException(string); throw new InvalidSkillException(string);
} }
/*
CustomXPPerk customXPPerk = new CustomXPPerk("examplecustomxpperk");
customXPPerk.setCustomXPValue(PrimarySkillType.MINING, 13.37f);
customXPPerk.setCustomXPValue(PrimarySkillType.WOODCUTTING, 4.0f);
*/
} }

8
src/main/java/com/gmail/nossr50/datatypes/experience/CustomXPPerk.java
View File

@ -47,6 +47,14 @@ public class CustomXPPerk {
return perkName; return perkName;
} }
/**
* Set the custom XP multiplier map for this perk (this will override all values currently held)
* @param customXPMultiplierMap new custom xp multiplier map
*/
public void setCustomXPMultiplierMap(HashMap<PrimarySkillType, Float> customXPMultiplierMap) {
this.customXPMultiplierMap = customXPMultiplierMap;
}
/** /**
* Get the address of this custom XP perk permission * Get the address of this custom XP perk permission
* This is the fully qualified name for this permission * This is the fully qualified name for this permission