dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Importer now takes a Destruction Core, and Exporter a Construction Core, fixes #365

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-09-18 23:47:59 +02:00
parent af8c25dcfa
commit c00762b16e
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@
### 1.0.5 ### 1.0.5
- Fixed crafting a complex item causes the process to flow off the Crafting Monitor's GUI (raoulvdberge) - 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) - 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 support for ore dictionary substitutions in Crafting Patterns (raoulvdberge)
- Added Disk Manipulator (way2muchnoise) - Added Disk Manipulator (way2muchnoise)
- Added ingame config (way2muchnoise) - Added ingame config (way2muchnoise)

1
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -51,6 +51,7 @@ public final class RefinedStorage {
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
config = new RefinedStorageConfig(e.getSuggestedConfigurationFile()); config = new RefinedStorageConfig(e.getSuggestedConfigurationFile());
PROXY.preInit(e); PROXY.preInit(e);
} }

9
src/main/java/refinedstorage/RefinedStorageConfig.java Normal file → Executable file
View File

@@ -12,7 +12,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public final class RefinedStorageConfig { public final class RefinedStorageConfig {
private Configuration config; private Configuration config;
//region Energy //region Energy
@@ -87,7 +86,9 @@ public final class RefinedStorageConfig {
public RefinedStorageConfig(File configFile) { public RefinedStorageConfig(File configFile) {
config = new Configuration(configFile); config = new Configuration(configFile);
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
loadConfig(); loadConfig();
} }
@@ -169,17 +170,17 @@ public final class RefinedStorageConfig {
} }
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public List<IConfigElement> getConfigElements() public List<IConfigElement> getConfigElements() {
{
List<IConfigElement> list = new ArrayList<>(); List<IConfigElement> list = new ArrayList<>();
list.addAll(new ConfigElement(config.getCategory(ENERGY)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(ENERGY)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(CONTROLLER)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(CONTROLLER)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(UPGRADES)).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_TRANSMITTER)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(WIRELESS_GRID)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(WIRELESS_GRID)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(MISC)).getChildElements()); list.addAll(new ConfigElement(config.getCategory(MISC)).getChildElements());
return list; return list;
} }
} }

4
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -327,14 +327,14 @@ public class CommonProxy {
// Importer // Importer
GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER),
new ItemStack(RefinedStorageBlocks.CABLE), 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) new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
); );
// Exporter // Exporter
GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER),
new ItemStack(RefinedStorageBlocks.CABLE), 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) new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
); );