Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactoring names for the EmcValue containing classes, and first steps

Browse source 
towards IMC methods for passing EmcValues for use before/after pre/post
auto assignment of EmcValues
This commit is contained in:
pahimar 2013-10-28 15:43:45 -04:00
parent 8ce41f6919
commit 02ab42d1a4
5 changed files with 54 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/com/pahimar/ee3/core/handler/InterModCommsHandler.java
View file

@ -32,8 +32,11 @@ public class InterModCommsHandler {
else if (imcMessage.key.equalsIgnoreCase(InterModComms.REMOVE_BLACKLIST_ENTRY)) {
processRemoveBlackListMessage(imcMessage);
}
else if (imcMessage.key.equalsIgnoreCase(InterModComms.SET_EMC_VALUE)) {
processSetEmcValueMessage(imcMessage);
else if (imcMessage.key.equalsIgnoreCase(InterModComms.ASSIGN_EMC_VALUE_PRE)) {
processPreAssignEmcValueMessage(imcMessage);
}
else if (imcMessage.key.equalsIgnoreCase(InterModComms.ASSIGN_EMC_VALUE_POST)) {
processPostAssignEmcValueMessage(imcMessage);
}
}
else {
@ -91,7 +94,12 @@ public class InterModCommsHandler {
}
}
private static void processSetEmcValueMessage(IMCMessage imcMessage) {
private static void processPreAssignEmcValueMessage(IMCMessage imcMessage) {
// TODO Set an EMC Value via IMC
}
private static void processPostAssignEmcValueMessage(IMCMessage imcMessage) {
// TODO Set an EMC Value via IMC
}

2
common/com/pahimar/ee3/emc/EmcRegistry.java
View file

@ -42,7 +42,7 @@ public class EmcRegistry {
ImmutableSortedMap.Builder<CustomWrappedStack, EmcValue> stackMappingsBuilder = ImmutableSortedMap.naturalOrder();
ImmutableSortedMap.Builder<EmcValue, List<CustomWrappedStack>> valueMappingsBuilder = ImmutableSortedMap.naturalOrder();
Map<CustomWrappedStack, EmcValue> defaultValues = EmcDefaultValues.getDefaultValueMap();
Map<CustomWrappedStack, EmcValue> defaultValues = EmcValuesDefault.getDefaultValueMap();
// Handle the stack mappings
stackMappingsBuilder.putAll(defaultValues);

8
common/com/pahimar/ee3/emc/EmcDefaultValues.java → common/com/pahimar/ee3/emc/EmcValuesDefault.java
View file

@ -12,12 +12,12 @@ import net.minecraftforge.oredict.OreDictionary;
import com.pahimar.ee3.item.CustomWrappedStack;
import com.pahimar.ee3.item.OreStack;
public class EmcDefaultValues {
public class EmcValuesDefault {
private static EmcDefaultValues emcDefaultValues = null;
private static EmcValuesDefault emcDefaultValues = null;
private Map<CustomWrappedStack, EmcValue> valueMap;
private EmcDefaultValues() {
private EmcValuesDefault() {
valueMap = new HashMap<CustomWrappedStack, EmcValue>();
}
@ -25,7 +25,7 @@ public class EmcDefaultValues {
private static void lazyInit() {
if (emcDefaultValues == null) {
emcDefaultValues = new EmcDefaultValues();
emcDefaultValues = new EmcValuesDefault();
emcDefaultValues.init();
}
}

36
common/com/pahimar/ee3/emc/EmcValuesIMC.java Normal file
View file

@ -0,0 +1,36 @@
package com.pahimar.ee3.emc;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.item.CustomWrappedStack;
/**
* Equivalent-Exchange-3
*
* EmcIMCValues
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
public class EmcValuesIMC {
private static Multimap<CustomWrappedStack, EmcValue> preAssignedValueMap = HashMultimap.create();
private static Multimap<CustomWrappedStack, EmcValue> postAssignedValueMap = HashMultimap.create();
public static Multimap<CustomWrappedStack, EmcValue> getPreAssignedValues() {
return preAssignedValueMap;
}
public static Multimap<CustomWrappedStack, EmcValue> getPostAssignedValues() {
return postAssignedValueMap;
}
public static void addPreAssignedValued(CustomWrappedStack wrappedStack, EmcValue emcValue) {
}
public static void addPostAssignedValued(CustomWrappedStack wrappedStack, EmcValue emcValue) {
}
}

3
common/com/pahimar/ee3/lib/InterModComms.java
View file

@ -10,5 +10,6 @@ public class InterModComms {
public static final String REMOVE_BLACKLIST_ENTRY = "remove-blacklist-entry";
// Interacting with the EMC value mappings
public static final String SET_EMC_VALUE = "set-emc-value";
public static final String ASSIGN_EMC_VALUE_PRE = "assign-emc-value-pre";
public static final String ASSIGN_EMC_VALUE_POST = "assign-emc-value-post";
}