diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c292583..a3a8e417e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 1.0.5 - Fixed crafting a complex item causes the process to flow off the Crafting Monitor's GUI (raoulvdberge) - Fixed shift clicking from Grid when player inventory is full throwing items in the world (raoulvdberge) +- Importer now takes a Destruction Core, and Exporter a Construction Core (raoulvdberge) - Added support for ore dictionary substitutions in Crafting Patterns (raoulvdberge) - Added Disk Manipulator (way2muchnoise) - Added ingame config (way2muchnoise) diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index 72ae546fc..79cfcaa02 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -51,6 +51,7 @@ public final class RefinedStorage { @EventHandler public void preInit(FMLPreInitializationEvent e) { config = new RefinedStorageConfig(e.getSuggestedConfigurationFile()); + PROXY.preInit(e); } diff --git a/src/main/java/refinedstorage/RefinedStorageConfig.java b/src/main/java/refinedstorage/RefinedStorageConfig.java old mode 100644 new mode 100755 index d4ad6043a..284c378ce --- a/src/main/java/refinedstorage/RefinedStorageConfig.java +++ b/src/main/java/refinedstorage/RefinedStorageConfig.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.List; public final class RefinedStorageConfig { - private Configuration config; //region Energy @@ -87,7 +86,9 @@ public final class RefinedStorageConfig { public RefinedStorageConfig(File configFile) { config = new Configuration(configFile); + MinecraftForge.EVENT_BUS.register(this); + loadConfig(); } @@ -169,17 +170,17 @@ public final class RefinedStorageConfig { } } - @SuppressWarnings("unchecked") - public List getConfigElements() - { + public List getConfigElements() { List list = new ArrayList<>(); + list.addAll(new ConfigElement(config.getCategory(ENERGY)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(CONTROLLER)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(UPGRADES)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(WIRELESS_TRANSMITTER)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(WIRELESS_GRID)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(MISC)).getChildElements()); + return list; } } diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 936b3d0ac..928687e7c 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -327,14 +327,14 @@ public class CommonProxy { // Importer GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), new ItemStack(RefinedStorageBlocks.CABLE), - new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) ); // Exporter GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), new ItemStack(RefinedStorageBlocks.CABLE), - new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) );