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

Better protection of parsing values from json

Browse source
This commit is contained in:
Pahimar 2016-05-20 23:05:57 -04:00
parent c6d02aee9d
commit 28080229f7
3 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/pahimar/ee3/knowledge/PlayerKnowledgeRegistry.java
View file

@ -117,7 +117,7 @@ public class PlayerKnowledgeRegistry {
// Load template knowledge
if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
// FIXME Priority Number 2
}
}

39
src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java
View file

@ -37,16 +37,47 @@ public class EnergyValueMapSerializer implements JsonSerializer<Map<WrappedStack
JsonObject jsonValueMapping = jsonElement.getAsJsonObject();
WrappedStack wrappedStack = null;
EnergyValue energyValue = new EnergyValue(jsonValueMapping.get(ENERGY_VALUE).getAsNumber());
EnergyValue energyValue = null;
if (jsonValueMapping.get(ENERGY_VALUE).isJsonPrimitive()) {
try {
energyValue = new EnergyValue(((JsonPrimitive) jsonValueMapping.get(ENERGY_VALUE)).getAsNumber());
}
catch (NumberFormatException e) {
// TODO Logging
}
}
if (jsonValueMapping.has(TYPE_ITEM_STACK)) {
wrappedStack = WrappedStack.wrap(context.deserialize(jsonValueMapping.get(TYPE_ITEM_STACK), ItemStack.class));
try {
ItemStack itemStack = context.deserialize(jsonValueMapping.get(TYPE_ITEM_STACK), ItemStack.class);
wrappedStack = WrappedStack.wrap(itemStack);
}
catch (JsonParseException e) {
// TODO Logging
}
}
else if (jsonValueMapping.has(TYPE_ORE_STACK)) {
wrappedStack = WrappedStack.wrap(context.deserialize(jsonValueMapping.get(TYPE_ORE_STACK), OreStack.class));
try {
OreStack oreStack = context.deserialize(jsonValueMapping.get(TYPE_ORE_STACK), OreStack.class);
wrappedStack = WrappedStack.wrap(oreStack);
}
catch (JsonParseException e) {
// TODO Logging
}
}
else if (jsonValueMapping.has(TYPE_FLUID_STACK)) {
wrappedStack = WrappedStack.wrap(context.deserialize(jsonValueMapping.get(TYPE_FLUID_STACK), FluidStack.class));
try {
FluidStack fluidStack = context.deserialize(jsonValueMapping.get(TYPE_FLUID_STACK), FluidStack.class);
wrappedStack = WrappedStack.wrap(fluidStack);
}
catch (JsonParseException e) {
// TODO Logging
}
}
if (wrappedStack != null && energyValue != null) {

2
src/main/java/com/pahimar/ee3/util/serialize/PlayerKnowledgeSerializer.java
View file

@ -11,7 +11,7 @@ public class PlayerKnowledgeSerializer implements JsonSerializer<PlayerKnowledge
@Override
public PlayerKnowledge deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
// TODO Pick up here
// FIXME Priority Number 1
return null;
}