EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 21:24:43 +02:00
Code Issues Projects Releases Wiki Activity

mod configs are taking a break

Browse Source
This commit is contained in:
nossr50
2019-02-18 12:16:10 -08:00
parent 63aebd0454
commit e7d8e51722
25 changed files with 141 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,12 +3,17 @@ package com.gmail.nossr50.config;
import com.gmail.nossr50.config.collectionconfigs.CollectionClassType;
import com.gmail.nossr50.config.collectionconfigs.MultiConfigContainer;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.config.mods.ArmorConfigManager;
import com.gmail.nossr50.config.mods.BlockConfigManager;
import com.gmail.nossr50.config.mods.EntityConfigManager;
import com.gmail.nossr50.config.mods.ToolConfigManager;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
import com.gmail.nossr50.config.treasure.TreasureConfig;
import com.gmail.nossr50.skills.repair.repairables.Repairable;
import com.gmail.nossr50.skills.repair.repairables.SimpleRepairableManager;
import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
import com.gmail.nossr50.skills.salvage.salvageables.SimpleSalvageableManager;
import com.gmail.nossr50.util.ModManager;
import java.util.ArrayList;
@ -41,6 +46,17 @@ public final class ConfigManager {
private SimpleRepairableManager simpleRepairableManager;
private SimpleSalvageableManager simpleSalvageableManager;
/* MOD MANAGERS */
//TODO: Add these back when modded servers become a thing again
private ModManager modManager;
/*private ToolConfigManager toolConfigManager;
private ArmorConfigManager armorConfigManager;
private BlockConfigManager blockConfigManager;
private EntityConfigManager entityConfigManager;*/
/* CONFIG INSTANCES */
private MainConfig mainConfig;
@ -52,6 +68,8 @@ public final class ConfigManager {
private SoundConfig soundConfig;
private RankConfig rankConfig;
/* CONFIG ERRORS */
private ArrayList<String> configErrors; //Collect errors to whine about to server admins

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

@ -8,6 +8,7 @@ import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.StringUtils;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.EntityType;
@ -587,23 +588,6 @@ public class MainConfig extends ConfigValidated {
return getIntValue("Hardcore.Vampirism.Level_Threshold", 0);
}
/* SMP Mods */
public boolean getToolModsEnabled() {
return getBooleanValue("Mods.Tool_Mods_Enabled", false);
}
public boolean getArmorModsEnabled() {
return getBooleanValue("Mods.Armor_Mods_Enabled", false);
}
public boolean getBlockModsEnabled() {
return getBooleanValue("Mods.Block_Mods_Enabled", false);
}
public boolean getEntityModsEnabled() {
return getBooleanValue("Mods.Entity_Mods_Enabled", false);
}
/* Items */
public int getChimaeraUseCost() {
return getIntValue("Items.Chimaera_Wing.Use_Cost", 1);

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

@ -1,7 +1,6 @@
package com.gmail.nossr50.config.experience;
import com.gmail.nossr50.config.ConfigValidated;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.datatypes.experience.FormulaType;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;

11
src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java
View File

@ -1,13 +1,8 @@
package com.gmail.nossr50.config.mods;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.ModManager;
import java.io.File;
import java.util.regex.Pattern;
public class ArmorConfigManager {
public ArmorConfigManager() {
//TODO: Commented out until modded servers appear again
/*public ArmorConfigManager() {
Pattern middlePattern = Pattern.compile("armor\\.(?:.+)\\.yml");
Pattern startPattern = Pattern.compile("(?:.+)\\.armor\\.yml");
//File dataFolder = new File(McmmoCore.getModDataFolderPath());
@ -32,5 +27,5 @@ public class ArmorConfigManager {
modManager.registerCustomArmor(new CustomArmorConfig(fileName));
}
}
}*/
}

11
src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java
View File

@ -1,13 +1,8 @@
package com.gmail.nossr50.config.mods;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.ModManager;
import java.io.File;
import java.util.regex.Pattern;
public class BlockConfigManager {
public BlockConfigManager() {
//TODO: Commented out until modded servers appear again
/*public BlockConfigManager() {
Pattern middlePattern = Pattern.compile("blocks\\.(?:.+)\\.yml");
Pattern startPattern = Pattern.compile("(?:.+)\\.blocks\\.yml");
//File dataFolder = new File(McmmoCore.getModDataFolderPath());
@ -32,5 +27,5 @@ public class BlockConfigManager {
modManager.registerCustomBlocks(new CustomBlockConfig(fileName));
}
}
}*/
}

5
src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java
View File

@ -18,7 +18,8 @@ import java.util.List;
import java.util.Set;
public class CustomToolConfig extends Config {
public List<Material> customAxes = new ArrayList<Material>();
//TODO: Disabled until modded servers come back
/*public List<Material> customAxes = new ArrayList<Material>();
public List<Material> customBows = new ArrayList<Material>();
public List<Material> customHoes = new ArrayList<Material>();
public List<Material> customPickaxes = new ArrayList<Material>();
@ -113,5 +114,5 @@ public class CustomToolConfig extends Config {
materialList.add(toolMaterial);
customToolMap.put(toolMaterial, tool);
}
}
}*/
}

11
src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java
View File

@ -1,14 +1,9 @@
package com.gmail.nossr50.config.mods;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.ModManager;
import java.io.File;
import java.util.regex.Pattern;
public class EntityConfigManager {
public EntityConfigManager(mcMMO plugin) {
//TODO: Commented out until modded servers appear again
/*public EntityConfigManager(mcMMO plugin) {
Pattern middlePattern = Pattern.compile("entities\\.(?:.+)\\.yml");
Pattern startPattern = Pattern.compile("(?:.+)\\.entities\\.yml");
File dataFolder = new File(mcMMO.getModDirectory());
@ -32,5 +27,5 @@ public class EntityConfigManager {
modManager.registerCustomEntities(new CustomEntityConfig(fileName));
}
}
}*/
}

11
src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java
View File

@ -1,14 +1,9 @@
package com.gmail.nossr50.config.mods;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.ModManager;
import java.io.File;
import java.util.regex.Pattern;
public class ToolConfigManager {
public ToolConfigManager(mcMMO plugin) {
//TODO: Commented out until modded servers appear again
/*public ToolConfigManager(mcMMO plugin) {
Pattern middlePattern = Pattern.compile("tools\\.(?:.+)\\.yml");
Pattern startPattern = Pattern.compile("(?:.+)\\.tools\\.yml");
File dataFolder = new File(mcMMO.getModDirectory());
@ -32,5 +27,5 @@ public class ToolConfigManager {
modManager.registerCustomTools(new CustomToolConfig(fileName));
}
}
}*/
}

1
src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
View File

@ -1,6 +1,5 @@
package com.gmail.nossr50.config.treasure;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.ConfigCollection;
import com.gmail.nossr50.datatypes.treasure.*;
import com.gmail.nossr50.mcMMO;