EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 14:46:46 +01:00
Code Issues Projects Releases Wiki Activity

remove reflection code from MultiConfigContainer

Browse Source
This commit is contained in:
nossr50 2019-02-26 20:49:45 -08:00
parent b3ed05eb09
commit ed8611585f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/config/collectionconfigs/MultiConfigContainer.java
View File

@ -5,7 +5,6 @@ import com.gmail.nossr50.config.Unload;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import java.io.File; import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -99,7 +98,14 @@ public class MultiConfigContainer<T> implements Unload {
mcMMO.p.getLogger().info("Reading from collection config - "+fileName); mcMMO.p.getLogger().info("Reading from collection config - "+fileName);
ConfigCollection configCollection = null; ConfigCollection configCollection = null;
try { if(collectionClassType == CollectionClassType.REPAIR)
{
configCollection = new RepairConfig(fileName, merge, copyDefaults);
} else {
configCollection = new SalvageConfig(fileName, merge, copyDefaults);
}
/*try {
//String parentFolderPath, String relativePath, boolean mergeNewKeys, boolean copyDefaults, boolean removeOldKeys //String parentFolderPath, String relativePath, boolean mergeNewKeys, boolean copyDefaults, boolean removeOldKeys
//String fileName, boolean merge, boolean copyDefaults //String fileName, boolean merge, boolean copyDefaults
configCollection = (ConfigCollection) getConfigClass(collectionClassType).getConstructor(String.class, Boolean.class, Boolean.class).newInstance(fileName, merge, copyDefaults); configCollection = (ConfigCollection) getConfigClass(collectionClassType).getConstructor(String.class, Boolean.class, Boolean.class).newInstance(fileName, merge, copyDefaults);
@ -111,7 +117,7 @@ public class MultiConfigContainer<T> implements Unload {
e.printStackTrace(); e.printStackTrace();
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
e.printStackTrace(); e.printStackTrace();
} }*/
//Add the collection loaded from this config //Add the collection loaded from this config
addCollection(configCollection.getLoadedCollection()); addCollection(configCollection.getLoadedCollection());