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

Fix casting, remove unused mod configs

Browse Source
This commit is contained in:
nossr50
2019-05-10 11:20:16 -07:00
parent 48a3621ac6
commit 7ad0a61c53
60 changed files with 64 additions and 8926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/main/java/com/gmail/nossr50/config/ConfigManager.java
View File

@@ -116,25 +116,26 @@ public final class ConfigManager {
private SerializedConfigLoader<ConfigAdmin> configAdmin;
private SerializedConfigLoader<ConfigMobs> configMobs;
private SerializedConfigLoader<ConfigExperience> configExperience;
private SerializedConfigLoader<ConfigAcrobatics> configAcrobatics;
private SerializedConfigLoader<ConfigAlchemy> configAlchemy;
private SerializedConfigLoader<ConfigArchery> configArchery;
private SerializedConfigLoader<ConfigAxes> configAxes;
private SerializedConfigLoader<ConfigExcavation> configExcavation;
private SerializedConfigLoader<ConfigFishing> configFishing;
private SerializedConfigLoader<ConfigHerbalism> configHerbalism;
private SerializedConfigLoader<ConfigMining> configMining;
private SerializedConfigLoader<ConfigRepair> configRepair;
private SerializedConfigLoader<ConfigSwords> configSwords;
private SerializedConfigLoader<ConfigTaming> configTaming;
private SerializedConfigLoader<ConfigUnarmed> configUnarmed;
private SerializedConfigLoader<ConfigWoodcutting> configWoodcutting;
private SerializedConfigLoader<ConfigSmelting> configSmelting;
private SerializedConfigLoader<ConfigSalvage> configSalvage;
private SerializedConfigLoader<ConfigNameRegisterDefaults> configDefaultExamples;
private HashMap<PrimarySkillType, SerializedConfigLoader> skillConfigLoaders;
private ConfigAcrobatics configAcrobatics;
private ConfigAlchemy configAlchemy;
private ConfigArchery configArchery;
private ConfigAxes configAxes;
private ConfigExcavation configExcavation;
private ConfigFishing configFishing;
private ConfigHerbalism configHerbalism;
private ConfigMining configMining;
private ConfigRepair configRepair;
private ConfigSwords configSwords;
private ConfigTaming configTaming;
private ConfigUnarmed configUnarmed;
private ConfigWoodcutting configWoodcutting;
private ConfigSmelting configSmelting;
private ConfigSalvage configSalvage;
private HashMap<PrimarySkillType, SerializedConfigLoader<?>> skillConfigLoaders;
//Data
private SerializedConfigLoader<ConfigPartyData> partyData;
@@ -260,21 +261,21 @@ public final class ConfigManager {
registerSkillConfig(PrimarySkillType.SMELTING, ConfigSmelting.class);
//Setup Typed refs
configAcrobatics = (SerializedConfigLoader<ConfigAcrobatics>) skillConfigLoaders.get(PrimarySkillType.ACROBATICS).getConfig();
configAlchemy = (SerializedConfigLoader<ConfigAlchemy>) skillConfigLoaders.get(PrimarySkillType.ALCHEMY).getConfig();
configSalvage = (SerializedConfigLoader<ConfigSalvage>) skillConfigLoaders.get(PrimarySkillType.SALVAGE).getConfig();
configArchery = (SerializedConfigLoader<ConfigArchery>) skillConfigLoaders.get(PrimarySkillType.ARCHERY).getConfig();
configAxes = (SerializedConfigLoader<ConfigAxes>) skillConfigLoaders.get(PrimarySkillType.AXES).getConfig();
configExcavation = (SerializedConfigLoader<ConfigExcavation>) skillConfigLoaders.get(PrimarySkillType.EXCAVATION).getConfig();
configFishing = (SerializedConfigLoader<ConfigFishing>) skillConfigLoaders.get(PrimarySkillType.FISHING).getConfig();
configHerbalism = (SerializedConfigLoader<ConfigHerbalism>) skillConfigLoaders.get(PrimarySkillType.HERBALISM).getConfig();
configMining = (SerializedConfigLoader<ConfigMining>) skillConfigLoaders.get(PrimarySkillType.MINING).getConfig();
configRepair = (SerializedConfigLoader<ConfigRepair>) skillConfigLoaders.get(PrimarySkillType.REPAIR).getConfig();
configSwords = (SerializedConfigLoader<ConfigSwords>) skillConfigLoaders.get(PrimarySkillType.SWORDS).getConfig();
configTaming = (SerializedConfigLoader<ConfigTaming>) skillConfigLoaders.get(PrimarySkillType.TAMING).getConfig();
configUnarmed = (SerializedConfigLoader<ConfigUnarmed>) skillConfigLoaders.get(PrimarySkillType.UNARMED).getConfig();
configWoodcutting = (SerializedConfigLoader<ConfigWoodcutting>) skillConfigLoaders.get(PrimarySkillType.WOODCUTTING).getConfig();
configSmelting = (SerializedConfigLoader<ConfigSmelting>) skillConfigLoaders.get(PrimarySkillType.SMELTING).getConfig();
configAcrobatics = (ConfigAcrobatics) skillConfigLoaders.get(PrimarySkillType.ACROBATICS).getConfig();
configAlchemy = (ConfigAlchemy) skillConfigLoaders.get(PrimarySkillType.ALCHEMY).getConfig();
configSalvage = (ConfigSalvage) skillConfigLoaders.get(PrimarySkillType.SALVAGE).getConfig();
configArchery = (ConfigArchery) skillConfigLoaders.get(PrimarySkillType.ARCHERY).getConfig();
configAxes = (ConfigAxes) skillConfigLoaders.get(PrimarySkillType.AXES).getConfig();
configExcavation = (ConfigExcavation) skillConfigLoaders.get(PrimarySkillType.EXCAVATION).getConfig();
configFishing = (ConfigFishing) skillConfigLoaders.get(PrimarySkillType.FISHING).getConfig();
configHerbalism = (ConfigHerbalism) skillConfigLoaders.get(PrimarySkillType.HERBALISM).getConfig();
configMining = (ConfigMining) skillConfigLoaders.get(PrimarySkillType.MINING).getConfig();
configRepair = (ConfigRepair) skillConfigLoaders.get(PrimarySkillType.REPAIR).getConfig();
configSwords = (ConfigSwords) skillConfigLoaders.get(PrimarySkillType.SWORDS).getConfig();
configTaming = (ConfigTaming) skillConfigLoaders.get(PrimarySkillType.TAMING).getConfig();
configUnarmed = (ConfigUnarmed) skillConfigLoaders.get(PrimarySkillType.UNARMED).getConfig();
configWoodcutting = (ConfigWoodcutting) skillConfigLoaders.get(PrimarySkillType.WOODCUTTING).getConfig();
configSmelting = (ConfigSmelting) skillConfigLoaders.get(PrimarySkillType.SMELTING).getConfig();
}
private void registerCustomTypeSerializers() {
@@ -588,63 +589,63 @@ public final class ConfigManager {
}
public ConfigAcrobatics getConfigAcrobatics() {
return configAcrobatics.getConfig();
return configAcrobatics;
}
public ConfigAlchemy getConfigAlchemy() {
return configAlchemy.getConfig();
return configAlchemy;
}
public ConfigArchery getConfigArchery() {
return configArchery.getConfig();
return configArchery;
}
public ConfigAxes getConfigAxes() {
return configAxes.getConfig();
return configAxes;
}
public ConfigExcavation getConfigExcavation() {
return configExcavation.getConfig();
return configExcavation;
}
public ConfigFishing getConfigFishing() {
return configFishing.getConfig();
return configFishing;
}
public ConfigHerbalism getConfigHerbalism() {
return configHerbalism.getConfig();
return configHerbalism;
}
public ConfigMining getConfigMining() {
return configMining.getConfig();
return configMining;
}
public ConfigRepair getConfigRepair() {
return configRepair.getConfig();
return configRepair;
}
public ConfigSwords getConfigSwords() {
return configSwords.getConfig();
return configSwords;
}
public ConfigTaming getConfigTaming() {
return configTaming.getConfig();
return configTaming;
}
public ConfigUnarmed getConfigUnarmed() {
return configUnarmed.getConfig();
return configUnarmed;
}
public ConfigWoodcutting getConfigWoodcutting() {
return configWoodcutting.getConfig();
return configWoodcutting;
}
public ConfigSmelting getConfigSmelting() {
return configSmelting.getConfig();
return configSmelting;
}
public ConfigSalvage getConfigSalvage() {
return configSalvage.getConfig();
return configSalvage;
}
public BonusDropManager getBonusDropManager() {

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

@@ -21,11 +21,10 @@ public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> {
CustomXPPerk customXPPerk = new CustomXPPerk(perkName);
//See if any children nodes match skills by name
for(ConfigurationNode configurationNode : value.getChildrenList())
{
for (ConfigurationNode configurationNode : value.getChildrenList()) {
try {
PrimarySkillType primarySkillType = matchIgnoreCase(configurationNode.getValue(TypeToken.of(String.class)));
if(primarySkillType.isChildSkill())
if (primarySkillType.isChildSkill())
continue; //Child skills gross
float boostValue = configurationNode.getNode("XP-Multiplier").getValue(TypeToken.of(Float.class));
@@ -47,12 +46,11 @@ public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> {
value.getNode("name").setValue(name);
for(PrimarySkillType primarySkillType : PrimarySkillType.values())
{
for (PrimarySkillType primarySkillType : PrimarySkillType.values()) {
float xpMultValue = obj.getXPMultiplierValue(primarySkillType);
//Ignore default values
if(xpMultValue == 1.0F)
if (xpMultValue == 1.0F)
continue;
//Set value
@@ -60,11 +58,9 @@ public class CustomXPPerkSerializer implements TypeSerializer<CustomXPPerk> {
}
}
private PrimarySkillType matchIgnoreCase(String string) throws InvalidSkillException
{
for(PrimarySkillType primarySkillType : PrimarySkillType.values())
{
if(string.equalsIgnoreCase(primarySkillType.toString()))
private PrimarySkillType matchIgnoreCase(String string) throws InvalidSkillException {
for (PrimarySkillType primarySkillType : PrimarySkillType.values()) {
if (string.equalsIgnoreCase(primarySkillType.toString()))
return primarySkillType;
}

2
src/main/java/com/gmail/nossr50/config/hocon/SerializedConfigLoader.java
View File

@@ -105,7 +105,7 @@ public class SerializedConfigLoader<T> {
try {
this.configMapper = ObjectMapper.forClass(clazz).bindToNew();
} catch (ObjectMappingException e) {
if(e.getMessage() != null)
if (e.getMessage() != null)
System.out.println(e.getMessage());
e.printStackTrace();

1
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperience.java
View File

@@ -6,7 +6,6 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@ConfigSerializable
public class ConfigExperience {

3
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkillMultiplier.java
View File

@@ -3,10 +3,11 @@ package com.gmail.nossr50.config.hocon.experience;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
import static com.gmail.nossr50.datatypes.skills.PrimarySkillType.*;
import java.util.HashMap;
import static com.gmail.nossr50.datatypes.skills.PrimarySkillType.*;
@ConfigSerializable
public class ConfigExperienceSkillMultiplier {

5
src/main/java/com/gmail/nossr50/listeners/BlockListener.java
View File

@@ -29,7 +29,10 @@ import com.gmail.nossr50.util.sounds.SoundManager;
import com.gmail.nossr50.util.sounds.SoundType;
import com.gmail.nossr50.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils;
import org.bukkit.*;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Tag;
import org.bukkit.block.*;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;