Sort pure crystals to have higher priority.

This commit is contained in:
AlgorithmX2
2014-09-16 23:23:19 -05:00
parent 3c8c773e2f
commit f233d5aefc
2 changed files with 25 additions and 2 deletions
@@ -1,9 +1,11 @@
package appeng.integration.modules.NEIHelpers; package appeng.integration.modules.NEIHelpers;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import appeng.client.gui.implementations.GuiCraftingTerm; import appeng.client.gui.implementations.GuiCraftingTerm;
@@ -12,6 +14,7 @@ import appeng.container.slot.SlotCraftingMatrix;
import appeng.container.slot.SlotFakeCraftingMatrix; import appeng.container.slot.SlotFakeCraftingMatrix;
import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketNEIRecipe; import appeng.core.sync.packets.PacketNEIRecipe;
import appeng.util.Platform;
import codechicken.nei.PositionedStack; import codechicken.nei.PositionedStack;
import codechicken.nei.api.IOverlayHandler; import codechicken.nei.api.IOverlayHandler;
import codechicken.nei.recipe.IRecipeHandler; import codechicken.nei.recipe.IRecipeHandler;
@@ -19,7 +22,8 @@ import codechicken.nei.recipe.IRecipeHandler;
public class NEICraftingHandler implements IOverlayHandler public class NEICraftingHandler implements IOverlayHandler
{ {
public NEICraftingHandler(int x, int y) { public NEICraftingHandler(int x, int y)
{
offsetx = x; offsetx = x;
offsety = y; offsety = y;
} }
@@ -66,12 +70,24 @@ public class NEICraftingHandler implements IOverlayHandler
if ( ctSlot.getSlotIndex() == col + row * 3 ) if ( ctSlot.getSlotIndex() == col + row * 3 )
{ {
NBTTagList ilist = new NBTTagList(); NBTTagList ilist = new NBTTagList();
List<ItemStack> list = new LinkedList();
// prefer pure crystals.
for (int x = 0; x < pstack.items.length; x++) for (int x = 0; x < pstack.items.length; x++)
{
if ( Platform.isRecipePrioritized( pstack.items[x] ) )
list.add( 0, pstack.items[x] );
else
list.add( pstack.items[x] );
}
for (ItemStack is : list)
{ {
NBTTagCompound inbt = new NBTTagCompound(); NBTTagCompound inbt = new NBTTagCompound();
pstack.items[x].writeToNBT( inbt ); is.writeToNBT( inbt );
ilist.appendTag( inbt ); ilist.appendTag( inbt );
} }
recipe.setTag( "#" + ctSlot.getSlotIndex(), ilist ); recipe.setTag( "#" + ctSlot.getSlotIndex(), ilist );
break; break;
} }
+7
View File
@@ -1802,4 +1802,11 @@ public class Platform
assert player.worldObj.isRemote : "Valid only on client"; assert player.worldObj.isRemote : "Valid only on client";
return (float) (player.posY + player.getEyeHeight() - player.getDefaultEyeHeight()); return (float) (player.posY + player.getEyeHeight() - player.getDefaultEyeHeight());
} }
public static boolean isRecipePrioritized(ItemStack what)
{
return AEApi.instance().materials().materialPureifiedCertusQuartzCrystal.sameAsStack( what )
|| AEApi.instance().materials().materialPureifiedFluixCrystal.sameAsStack( what )
|| AEApi.instance().materials().materialPureifiedNetherQuartzCrystal.sameAsStack( what );
}
} }