Importer now takes a Destruction Core, and Exporter a Construction Core, fixes #365
This commit is contained in:
@@ -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)
|
||||
|
@@ -51,6 +51,7 @@ public final class RefinedStorage {
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent e) {
|
||||
config = new RefinedStorageConfig(e.getSuggestedConfigurationFile());
|
||||
|
||||
PROXY.preInit(e);
|
||||
}
|
||||
|
||||
|
9
src/main/java/refinedstorage/RefinedStorageConfig.java
Normal file → Executable file
9
src/main/java/refinedstorage/RefinedStorageConfig.java
Normal file → Executable file
@@ -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<IConfigElement> getConfigElements()
|
||||
{
|
||||
public List<IConfigElement> getConfigElements() {
|
||||
List<IConfigElement> 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;
|
||||
}
|
||||
}
|
||||
|
@@ -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)
|
||||
);
|
||||
|
||||
|
Reference in New Issue
Block a user