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

Added support for creating CustomWrappedStacks with encoded String

Browse source 
parameters
This commit is contained in:
pahimar 2013-11-07 20:37:44 -05:00
parent 8b3407c68a
commit 9e79ec2df7
3 changed files with 103 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/com/pahimar/ee3/core/helper/nbt/EncodedNBTHelper.java
View file

@ -284,7 +284,6 @@ public class EncodedNBTHelper {
* @param encodedRecipeInputs
* @return
*/
// TODO We could be doing more validation on the decoding, and should something fail we should return null
public static List<CustomWrappedStack> decodeRecipeInputs(NBTTagCompound encodedRecipeInputs) {
List<CustomWrappedStack> decodedRecipeInputs = new ArrayList<CustomWrappedStack>();
@ -301,6 +300,9 @@ public class EncodedNBTHelper {
if (decodedRecipeInput.getWrappedStack() != null) {
decodedRecipeInputs.add(decodedRecipeInput);
}
else {
return null;
}
}
}
}
@ -380,6 +382,9 @@ public class EncodedNBTHelper {
encodedRecipes.setCompoundTag(String.format(TEMPLATE_RECIPE_LIST_ENTRY, i), recipeListEntry);
i++;
}
else {
// Log the failure
}
}
if (encodedRecipes.hasNoTags()) {

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

@ -1,6 +1,8 @@
package com.pahimar.ee3.item;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
@ -9,6 +11,7 @@ import net.minecraftforge.oredict.OreDictionary;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.lib.Reference;
import com.pahimar.ee3.lib.Strings;
public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
@ -83,6 +86,56 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
energyStack = null;
}
else if (object instanceof String) {
String objectString = (String) object;
if (objectString.startsWith(Strings.NBT_ENCODED_ATTR_ORE_NAME + ":")) {
String possibleOreName = objectString.substring(Strings.NBT_ENCODED_ATTR_ORE_NAME.length() + 1);
OreStack possibleOreStack = new OreStack(possibleOreName);
if (possibleOreStack.oreId != -1) {
itemStack = null;
oreStack = possibleOreStack;
energyStack = null;
stackSize = possibleOreStack.stackSize;
}
else {
itemStack = null;
oreStack = null;
energyStack = null;
stackSize = -1;
}
}
else if (objectString.startsWith(Strings.NBT_ENCODED_ATTR_ENERGY_NAME + ":")) {
String possibleEnergyName = objectString.substring(Strings.NBT_ENCODED_ATTR_ENERGY_NAME.length() + 1);
if (possibleEnergyName.length() > 0) {
itemStack = null;
oreStack = null;
energyStack = new EnergyStack(possibleEnergyName);
stackSize = 1;
}
else {
itemStack = null;
oreStack = null;
energyStack = null;
stackSize = -1;
}
}
else {
itemStack = null;
oreStack = null;
energyStack = null;
stackSize = -1;
}
}
/*
* Or we are given an EnergyStack to wrap
*/
@ -243,8 +296,44 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
}
public static boolean canBeWrapped(Object object) {
return object instanceof CustomWrappedStack || object instanceof ItemStack || object instanceof OreStack || object instanceof EnergyStack || object instanceof Item || object instanceof Block;
// Simple case
if (object instanceof CustomWrappedStack || object instanceof ItemStack || object instanceof OreStack || object instanceof EnergyStack || object instanceof Item || object instanceof Block) {
return true;
}
// If it's a List, check to see if it could possibly be an OreStack
else if (object instanceof List) {
if (getOreStackFromList((List<?>) object) != null) {
return true;
}
}
// If it's a String, check to see if it could be the encoded name for a custom stack (OreStack, EnergyStack, etc)
else if (object instanceof String) {
String objectString = (String) object;
if (objectString.startsWith(Strings.NBT_ENCODED_ATTR_ORE_NAME + ":")) {
String possibleOreName = objectString.substring(Strings.NBT_ENCODED_ATTR_ORE_NAME.length() + 1);
List<String> oreNames = Arrays.asList(OreDictionary.getOreNames());
for (String oreName : oreNames) {
if (oreName.equalsIgnoreCase(possibleOreName)) {
return true;
}
}
}
else if (objectString.startsWith(Strings.NBT_ENCODED_ATTR_ENERGY_NAME + ":")) {
String possibleEnergyName = objectString.substring(Strings.NBT_ENCODED_ATTR_ENERGY_NAME.length() + 1);
if (possibleEnergyName.length() > 0) {
return true;
}
}
}
return false;
}
@Override
@ -307,7 +396,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
}
}
private OreStack getOreStackFromList(ArrayList<?> objectList) {
private static OreStack getOreStackFromList(List<?> objectList) {
for (Object listElement : objectList) {
if (listElement instanceof ItemStack) {

5
common/com/pahimar/ee3/item/OreStack.java
View file

@ -25,6 +25,11 @@ public class OreStack implements Comparable<OreStack> {
this.oreName = oreDictionaryName;
}
}
if (this.oreName == null) {
this.oreId = -1;
this.oreName = OreDictionary.getOreName(oreId);
}
}
}
else {