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

Some more work on the CalcinationManager

Browse source
This commit is contained in:
pahimar 2013-12-21 22:03:32 -05:00
parent 10bb34ae47
commit 6dee38c4e1
5 changed files with 70 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -6,7 +6,6 @@ import com.pahimar.ee3.command.CommandHandler;
import com.pahimar.ee3.configuration.ConfigurationHandler;
import com.pahimar.ee3.creativetab.CreativeTabEE3;
import com.pahimar.ee3.handler.*;
import com.pahimar.ee3.helper.DebugHelper;
import com.pahimar.ee3.helper.FluidHelper;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.helper.VersionHelper;
@ -164,7 +163,6 @@ public class EquivalentExchange3
public void postInit(FMLPostInitializationEvent event)
{
// NOOP
DebugHelper.printEmcValueToStackMappings();
}
@EventHandler

4
src/main/java/com/pahimar/ee3/emc/EmcValue.java
View file

@ -259,13 +259,13 @@ public class EmcValue implements Comparable<EmcValue>, JsonDeserializer<EmcValue
for (EmcType emcType : EmcType.TYPES)
{
if (Float.compare(first[emcType.ordinal()], second[emcType.ordinal()]) != 0)
if (Float.compare(first[emcType.ordinal()], second[emcType.ordinal()]) != Compare.EQUALS)
{
return Float.compare(first[emcType.ordinal()], second[emcType.ordinal()]);
}
}
return 0;
return Compare.EQUALS;
}
else
{

2
src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
View file

@ -184,7 +184,7 @@ public class EmcValuesDefault
valueMap.put(new WrappedStack(Item.netherQuartz), new EmcValue(256));
/* Equivalent Exchange 3 */
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 0)), new EmcValue(0.001f));
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 0)), new EmcValue(1));
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 1)), new EmcValue(256));
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 2)), new EmcValue(2048));
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 3)), new EmcValue(8192));

10
src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
View file

@ -24,7 +24,7 @@ import java.util.List;
*/
public class ItemAlchemicalDust extends ItemEE
{
public static final String[] ALCHEMICAL_DUST_NAMES = {"Ash", "Minium", "Verdant", "Azure", "Amaranthine", "Iridescent"};
public static final String[] ALCHEMICAL_DUST_NAMES = {"Ash", "Verdant", "Azure", "Minium", "Amaranthine", "Iridescent"};
public static final EmcValue[] DEFAULT_EMC_VALUES = {
new EmcValue(1),
new EmcValue(256),
@ -91,19 +91,19 @@ public class ItemAlchemicalDust extends ItemEE
}
case 1:
{
return EnumChatFormatting.WHITE + super.getItemDisplayName(itemStack);
return EnumChatFormatting.GREEN + super.getItemDisplayName(itemStack);
}
case 2:
{
return EnumChatFormatting.GREEN + super.getItemDisplayName(itemStack);
return EnumChatFormatting.BLUE + super.getItemDisplayName(itemStack);
}
case 3:
{
return EnumChatFormatting.BLUE + super.getItemDisplayName(itemStack);
return EnumChatFormatting.RED + super.getItemDisplayName(itemStack);
}
case 4:
{
return EnumChatFormatting.DARK_PURPLE + super.getItemDisplayName(itemStack);
return EnumChatFormatting.LIGHT_PURPLE + super.getItemDisplayName(itemStack);
}
case 5:
{

69
src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java
View file

@ -2,6 +2,7 @@ package com.pahimar.ee3.recipe;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.emc.EmcValue;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.lib.Compare;
import net.minecraft.item.ItemStack;
@ -21,9 +22,9 @@ public class CalcinationManager
{
// Helper stacks
private static ItemStack ASH_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 0);
private static ItemStack MINIUM_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 1);
private static ItemStack VERDANT_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 2);
private static ItemStack AZURE_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 3);
private static ItemStack VERDANT_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 1);
private static ItemStack AZURE_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 2);
private static ItemStack MINIUM_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 3);
private static ItemStack AMARANTHINE_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 4);
private static ItemStack IRIDESCENT_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 5);
@ -36,19 +37,73 @@ public class CalcinationManager
EmcValue emcValue = EmcRegistry.getInstance().getEmcValue(itemStack);
EmcValue ashEmcValue = EmcRegistry.getInstance().getEmcValue(ASH_DUST_STACK);
EmcValue miniumEmcValue = EmcRegistry.getInstance().getEmcValue(MINIUM_DUST_STACK);
EmcValue verdantEmcValue = EmcRegistry.getInstance().getEmcValue(VERDANT_DUST_STACK);
EmcValue azureEmcValue = EmcRegistry.getInstance().getEmcValue(AZURE_DUST_STACK);
EmcValue miniumEmcValue = EmcRegistry.getInstance().getEmcValue(MINIUM_DUST_STACK);
EmcValue amarathineEmcValue = EmcRegistry.getInstance().getEmcValue(AMARANTHINE_DUST_STACK);
EmcValue iridescentEmcValue = EmcRegistry.getInstance().getEmcValue(IRIDESCENT_DUST_STACK);
if (emcValue != null)
{
if (Float.compare(emcValue.getValue(), ashEmcValue.getValue()) <= Compare.EQUALS)
if (emcValue.compareTo(ashEmcValue) < Compare.EQUALS)
{
LogHelper.debug("1");
}
else if (emcValue.equals(ashEmcValue))
{
LogHelper.debug("1");
calcinationResults.add(ASH_DUST_STACK.copy());
}
else if (emcValue.compareTo(ashEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(verdantEmcValue) == Compare.LESSER_THAN)
{
LogHelper.debug("1,2");
}
else if (emcValue.equals(verdantEmcValue))
{
LogHelper.debug("2");
calcinationResults.add(VERDANT_DUST_STACK.copy());
}
else if (emcValue.compareTo(verdantEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(azureEmcValue) == Compare.LESSER_THAN)
{
LogHelper.debug("2,3");
}
else if (emcValue.equals(azureEmcValue))
{
LogHelper.debug("3");
calcinationResults.add(AZURE_DUST_STACK.copy());
}
else if (emcValue.compareTo(azureEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(miniumEmcValue) == Compare.LESSER_THAN)
{
LogHelper.debug("3,4");
}
else if (emcValue.equals(miniumEmcValue))
{
LogHelper.debug("4");
calcinationResults.add(MINIUM_DUST_STACK.copy());
}
else if (emcValue.compareTo(miniumEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(amarathineEmcValue) == Compare.LESSER_THAN)
{
LogHelper.debug("4,5");
}
else if (emcValue.equals(amarathineEmcValue))
{
LogHelper.debug("5");
calcinationResults.add(AMARANTHINE_DUST_STACK.copy());
}
else if (emcValue.compareTo(amarathineEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(iridescentEmcValue) == Compare.LESSER_THAN)
{
LogHelper.debug("5,6");
}
else if (emcValue.equals(iridescentEmcValue))
{
LogHelper.debug("6");
calcinationResults.add(IRIDESCENT_DUST_STACK.copy());
}
else if (emcValue.compareTo(iridescentEmcValue) == Compare.GREATER_THAN)
{
LogHelper.debug("6");
calcinationResults.add(IRIDESCENT_DUST_STACK.copy());
}
else if
}
else
{