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

Rework how the IMC handler works a bit, add in FluidStack support for

Browse source 
CustomWrappedStack, and a few other things
This commit is contained in:
pahimar 2013-11-19 22:17:31 -05:00
parent b556c05099
commit 6f16e3296b
4 changed files with 88 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package com.pahimar.ee3.core.handler;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.lib.InterModComms;
import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
@ -8,33 +7,34 @@ import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
public class InterModCommsHandler {
// TODO Revisit logging levels and the use of String.format for logging messages
// TODO Add more IMC functions (has-emc, get-emc) with return messages
// TODO Logging
public static void processIMCMessages(IMCEvent event) {
for (IMCMessage imcMessage : event.getMessages()) {
if (imcMessage.getMessageType() == String.class) {
String requestedOperation = imcMessage.key;
if (imcMessage.key.equalsIgnoreCase(InterModComms.ADD_RECIPE)) {
processAddRecipeMessage(imcMessage);
}
else if (imcMessage.key.equalsIgnoreCase(InterModComms.ADD_BLACKLIST_ENTRY)) {
processAddBlackListMessage(imcMessage);
}
else if (imcMessage.key.equalsIgnoreCase(InterModComms.REMOVE_BLACKLIST_ENTRY)) {
processRemoveBlackListMessage(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);
}
if (requestedOperation.equalsIgnoreCase(InterModComms.RECIPE_ADD)) {
processAddRecipeMessage(imcMessage);
}
else {
LogHelper.severe("[IMC] Mod '" + imcMessage.getSender() + "' sent a message with key '" + imcMessage.key + "' with an invalid argument type (received " + imcMessage.getMessageType().getSimpleName() + ", expected String)");
else if (requestedOperation.equalsIgnoreCase(InterModComms.BLACKLIST_ADD_ENTRY)) {
processAddBlackListMessage(imcMessage);
}
else if (requestedOperation.equalsIgnoreCase(InterModComms.BLACKLIST_REMOVE_ENTRY)) {
processRemoveBlackListMessage(imcMessage);
}
else if (requestedOperation.equalsIgnoreCase(InterModComms.EMC_ASSIGN_VALUE_PRE)) {
processPreAssignEmcValueMessage(imcMessage);
}
else if (requestedOperation.equalsIgnoreCase(InterModComms.EMC_ASSIGN_VALUE_POST)) {
processPostAssignEmcValueMessage(imcMessage);
}
else if (requestedOperation.equalsIgnoreCase(InterModComms.EMC_HAS_VALUE)) {
processHasEmcValueMessage(imcMessage);
}
else if (requestedOperation.equalsIgnoreCase(InterModComms.EMC_GET_VALUE)) {
processGetEmcValueMessage(imcMessage);
}
}
}
@ -63,4 +63,14 @@ public class InterModCommsHandler {
// TODO
}
private static void processHasEmcValueMessage(IMCMessage imcMessage) {
// TODO
}
private static void processGetEmcValueMessage(IMCMessage imcMessage) {
// TODO
}
}

8
common/com/pahimar/ee3/emc/EmcValue.java
View file

@ -27,7 +27,9 @@ import com.google.gson.JsonSyntaxException;
*/
public class EmcValue implements Comparable<EmcValue> {
private static final Gson gson = (new GsonBuilder()).registerTypeAdapter(EmcValue.class, new EmcValue().new EmcValueJsonSerializer()).create();
// Gson serializer for serializing to/deserializing from json
private static final Gson gsonSerializer = (new GsonBuilder()).registerTypeAdapter(EmcValue.class, new EmcValue().new EmcValueJsonSerializer()).create();
public final float[] components;
public EmcValue() {
@ -171,7 +173,7 @@ public class EmcValue implements Comparable<EmcValue> {
public static EmcValue createFromJson(String jsonEmcValue) {
try {
return (EmcValue) gson.fromJson(jsonEmcValue, EmcValue.class);
return (EmcValue) gsonSerializer.fromJson(jsonEmcValue, EmcValue.class);
}
catch (JsonSyntaxException exception) {
// TODO Log something regarding the failed parse
@ -186,7 +188,7 @@ public class EmcValue implements Comparable<EmcValue> {
* @return Json serialized String of this EmcValue
*/
public String toJson() {
return gson.toJson(this);
return gsonSerializer.toJson(this);
}
private static List<EmcComponent> collateComponents(List<EmcComponent> uncollatedComponents) {

66
common/com/pahimar/ee3/item/CustomWrappedStack.java
View file

@ -8,6 +8,8 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import com.google.gson.Gson;
@ -25,12 +27,14 @@ import com.pahimar.ee3.lib.Strings;
public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
private static final Gson gson = (new GsonBuilder()).registerTypeAdapter(CustomWrappedStack.class, new CustomWrappedStack(null).new CustomWrappedStackJsonSerializer()).create();
// Gson serializer for serializing to/deserializing from json
private static final Gson gsonSerializer = (new GsonBuilder()).registerTypeAdapter(CustomWrappedStack.class, new CustomWrappedStack(null).new CustomWrappedStackJsonSerializer()).create();
private int stackSize;
private final ItemStack itemStack;
private final OreStack oreStack;
private final EnergyStack energyStack;
private final FluidStack fluidStack;
/**
* Creates a new CustomWrappedStack object which wraps the given input.
@ -54,6 +58,9 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
else if (object instanceof Block) {
object = new ItemStack((Block) object);
}
else if (object instanceof Fluid) {
object = new FluidStack((Fluid) object, 1);
}
/*
* We are given an ItemStack to wrap
@ -65,6 +72,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
this.itemStack = itemStack.copy();
oreStack = null;
energyStack = null;
fluidStack = null;
stackSize = this.itemStack.stackSize;
this.itemStack.stackSize = 1;
}
@ -76,6 +84,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = (OreStack) object;
energyStack = null;
fluidStack = null;
stackSize = oreStack.stackSize;
oreStack.stackSize = 1;
}
@ -97,6 +106,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
}
energyStack = null;
fluidStack = null;
}
else if (object instanceof String) {
@ -112,6 +122,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = possibleOreStack;
energyStack = null;
fluidStack = null;
stackSize = possibleOreStack.stackSize;
}
else {
@ -119,6 +130,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = null;
energyStack = null;
fluidStack = null;
stackSize = -1;
}
}
@ -131,6 +143,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = null;
energyStack = new EnergyStack(possibleEnergyName);
fluidStack = null;
stackSize = 1;
}
else {
@ -138,6 +151,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = null;
energyStack = null;
fluidStack = null;
stackSize = -1;
}
}
@ -145,6 +159,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = null;
energyStack = null;
fluidStack = null;
stackSize = -1;
}
}
@ -155,15 +170,25 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = null;
energyStack = (EnergyStack) object;
fluidStack = null;
stackSize = energyStack.stackSize;
energyStack.stackSize = 1;
}
else if (object instanceof FluidStack) {
itemStack = null;
oreStack = null;
energyStack = null;
fluidStack = (FluidStack) object;
stackSize = fluidStack.amount;
fluidStack.amount = 1;
}
else if (object instanceof CustomWrappedStack) {
CustomWrappedStack wrappedStack = (CustomWrappedStack) object;
itemStack = wrappedStack.itemStack;
oreStack = wrappedStack.oreStack;
energyStack = wrappedStack.energyStack;
fluidStack = wrappedStack.fluidStack;
stackSize = wrappedStack.stackSize;
}
/*
@ -173,6 +198,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
itemStack = null;
oreStack = null;
energyStack = null;
fluidStack = null;
stackSize = -1;
}
}
@ -214,6 +240,8 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
return oreStack;
else if (energyStack != null)
return energyStack;
else if (fluidStack != null)
return fluidStack;
return null;
}
@ -259,6 +287,9 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
else if (energyStack != null) {
stringBuilder.append(String.format("%dxenergyStack.%s", stackSize, energyStack.energyName));
}
else if (fluidStack != null) {
stringBuilder.append(String.format("%dxfluidStack.%s", stackSize, fluidStack.getFluid().getName()));
}
else {
stringBuilder.append("null");
}
@ -266,23 +297,6 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
return stringBuilder.toString();
}
public String encodeAsPropertyKey() {
StringBuilder stringBuilder = new StringBuilder();
if (itemStack != null) {
stringBuilder.append(String.format("%sxitemStack[%s:%s:%s:%s]", stackSize, itemStack.itemID, itemStack.getItemDamage(), itemStack.getUnlocalizedName(), itemStack.getItem().getClass().getCanonicalName()));
}
else if (oreStack != null) {
stringBuilder.append(String.format("%dxoreDictionary.%s", stackSize, oreStack.oreName));
}
else if (energyStack != null) {
stringBuilder.append(String.format("%dxenergyStack.%s", stackSize, energyStack.energyName));
}
return stringBuilder.toString();
}
@Override
public int hashCode() {
@ -304,6 +318,9 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
hashCode = 37 * hashCode + energyStack.energyName.hashCode();
}
}
else if (fluidStack != null) {
// TODO FluidStack hash
}
return hashCode;
}
@ -311,7 +328,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
public static boolean canBeWrapped(Object object) {
// Simple case
if (object instanceof CustomWrappedStack || object instanceof ItemStack || object instanceof OreStack || object instanceof EnergyStack || object instanceof Item || object instanceof Block) {
if (object instanceof CustomWrappedStack || object instanceof ItemStack || object instanceof OreStack || object instanceof EnergyStack || object instanceof FluidStack || object instanceof Item || object instanceof Block || object instanceof Fluid) {
return true;
}
// If it's a List, check to see if it could possibly be an OreStack
@ -321,6 +338,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
}
}
// If it's a String, check to see if it could be the encoded name for a custom stack (OreStack, EnergyStack, etc)
// TODO Revisit this now that we aren't using NBTTagCompounds to encode objects
else if (object instanceof String) {
String objectString = (String) object;
@ -401,6 +419,10 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
else
return 1;
}
else if (this.getWrappedStack() instanceof FluidStack) {
// TODO Finish this
return 0;
}
else {
if (customWrappedStack.getWrappedStack() != null)
return -1;
@ -436,12 +458,12 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
public static CustomWrappedStack createFromJson(String jsonCustomWrappedStack) {
try {
return (CustomWrappedStack) gson.fromJson(jsonCustomWrappedStack, CustomWrappedStack.class);
return (CustomWrappedStack) gsonSerializer.fromJson(jsonCustomWrappedStack, CustomWrappedStack.class);
}
catch (JsonSyntaxException exception) {
// TODO Log something regarding the failed parse
}
return null;
}
@ -452,7 +474,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
*/
public String toJson() {
return gson.toJson(this);
return gsonSerializer.toJson(this);
}
public class CustomWrappedStackJsonSerializer

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

@ -3,20 +3,15 @@ package com.pahimar.ee3.lib;
public class InterModComms {
// Interacting with the Recipe Registry
public static final String ADD_RECIPE = "add-recipe";
public static final String RECIPE_ADD = "recipe-add";
// Interacting with the EMC BlackList
public static final String ADD_BLACKLIST_ENTRY = "add-blacklist-entry";
public static final String REMOVE_BLACKLIST_ENTRY = "remove-blacklist-entry";
public static final String BLACKLIST_ADD_ENTRY = "blacklist-add-entry";
public static final String BLACKLIST_REMOVE_ENTRY = "blacklist-remove-entry";
// Interacting with the EMC value mappings
public static final String ASSIGN_EMC_VALUE_PRE = "assign-emc-value-pre";
public static final String ASSIGN_EMC_VALUE_POST = "assign-emc-value-post";
public static final String STACK_VALUE_MAPPING_TAG_NAME = "stackValueMap";
public static final String COUNT_TAG_NAME = "count";
public static final String STACK_VALUE_MAPPING_TEMPLATE = "stackValueMapping_%s";
public static final String STACK_TAG_NAME = "stack";
public static final String EMC_VALUE_TAG_NAME = "emcValue";
public static final String EMC_VALUE_COMPONENT_ORDINAL_TEMPLATE = "componentOrdinal_%s";
public static final String EMC_ASSIGN_VALUE_PRE = "emc-assign-value-pre";
public static final String EMC_ASSIGN_VALUE_POST = "emc-assign-value-post";
public static final String EMC_HAS_VALUE = "emc-has-value";
public static final String EMC_GET_VALUE = "emc-get-value";
}