diff --git a/common/net/minecraftforge/common/Configuration.java b/common/net/minecraftforge/common/Configuration.java index 9e16816ee5..839b0322c4 100644 --- a/common/net/minecraftforge/common/Configuration.java +++ b/common/net/minecraftforge/common/Configuration.java @@ -43,13 +43,6 @@ public class Configuration public Map> categories = new TreeMap>(); - //TO-DO 1.4 - Remove these, categories are dynamically added when needed, so no need to add default categories. - @Deprecated - public TreeMap blockProperties = new TreeMap(); - @Deprecated - public TreeMap itemProperties = new TreeMap(); - @Deprecated - public TreeMap generalProperties = new TreeMap(); private Map customCategoryComments = Maps.newHashMap(); private boolean caseSensitiveCustomCategories; public String defaultEncoding = DEFAULT_ENCODING; @@ -66,10 +59,6 @@ public class Configuration public Configuration(File file) { this.file = file; - //TO-DO 1.4 - Remove these, categories are dynamically added when needed, so no need to add default categories. - categories.put(CATEGORY_GENERAL, generalProperties); - categories.put(CATEGORY_BLOCK, blockProperties); - categories.put(CATEGORY_ITEM, itemProperties); } public Configuration(File file, boolean caseSensitiveCustomCategories) @@ -450,32 +439,6 @@ public class Configuration } } - //=====================Deprecated stuff, remove in 1.4============================================= - @Deprecated - public Property getOrCreateIntProperty(String key, String category, int defaultValue) - { - return get(category, key, defaultValue); - } - - @Deprecated - public Property getOrCreateProperty(String key, String category, String defaultValue) - { - return get(category, key, defaultValue); - } - - @Deprecated - public Property getOrCreateBooleanProperty(String key, String category, boolean defaultValue) - { - return get(category, key, defaultValue); - } - - @Deprecated - public Property getOrCreateBlockIdProperty(String key, int defaultID) - { - return getBlock(CATEGORY_BLOCK, key, defaultID); - } - //======================End deprecated stuff======================================================= - public static class UnicodeInputStreamReader extends Reader { private final InputStreamReader input;