From 2db8e30b1d2151fdde5d08a6c06aef55f0c397d2 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Fri, 27 Jan 2017 11:32:28 +0300 Subject: License, readme and stuff --- ihl/nei_integration/MachineRecipeHandler.java | 55 +++++++++++++++------------ 1 file changed, 31 insertions(+), 24 deletions(-) (limited to 'ihl/nei_integration/MachineRecipeHandler.java') diff --git a/ihl/nei_integration/MachineRecipeHandler.java b/ihl/nei_integration/MachineRecipeHandler.java index aa5a30b..82b541a 100644 --- a/ihl/nei_integration/MachineRecipeHandler.java +++ b/ihl/nei_integration/MachineRecipeHandler.java @@ -61,6 +61,13 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler { MachineRecipeHandler.CachedIORecipe recipe = (CachedIORecipe) this.arecipes.get(recipeNumber); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + for(PositionedStack stack:recipe.ingredients) + { + if(stack.item.stackSize==0) + { + GuiDraw.fontRenderer.drawStringWithShadow("0.001", stack.relx+3, stack.rely+9, 16777215); + } + } if(recipe.output instanceof IHLPositionedStack) { IHLPositionedStack rOutput = (IHLPositionedStack) recipe.output; @@ -112,12 +119,12 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler { if (outputId.equals(this.getRecipeId())) { - Iterator i$ = this.getRecipeList().entrySet().iterator(); + Iterator> i$ = this.getRecipeList().entrySet().iterator(); while (i$.hasNext()) { - Entry entry = (Entry)i$.next(); - this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients())); + Entry entry = i$.next(); + this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients())); } } else @@ -129,7 +136,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler @Override public void loadCraftingRecipes(ItemStack result) { - Iterator i$ = this.getRecipeList().entrySet().iterator(); + Iterator> i$ = this.getRecipeList().entrySet().iterator(); FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(result); if(fluidStack==null && result.getItem() instanceof IFluidContainerItem) { @@ -152,11 +159,11 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler { while (i$.hasNext()) { - Entry entry = (Entry)i$.next(); - Iterator i$1 = ((UniversalRecipeOutput)entry.getValue()).getFluidOutputs().iterator(); + Entry entry = i$.next(); + Iterator i$1 = ((UniversalRecipeOutput)entry.getValue()).getFluidOutputs().iterator(); while (i$1.hasNext()) { - FluidStack output = (FluidStack)i$1.next(); + FluidStack output = i$1.next(); if (output!=null && output.getFluid()==fluidStack.getFluid()) { this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients())); @@ -169,8 +176,8 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler { while (i$.hasNext()) { - Entry entry = (Entry)i$.next(); - Iterator i$1 = ((UniversalRecipeOutput)entry.getValue()).getItemOutputs().iterator(); + Entry entry = i$.next(); + Iterator i$1 = (entry.getValue()).getItemOutputs().iterator(); while (i$1.hasNext()) { @@ -178,7 +185,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler if (NEIServerUtils.areStacksSameTypeCrafting(output.itemStack, result) || IHLUtils.isItemsHaveSameOreDictionaryEntry(output.itemStack, result)) { - this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients())); + this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients())); break; } } @@ -195,7 +202,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler @Override public void loadUsageRecipes(ItemStack ingredient) { - Iterator i$ = this.getRecipeList().entrySet().iterator(); + Iterator> i$ = this.getRecipeList().entrySet().iterator(); FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(ingredient); if(fluidStack==null && ingredient.getItem() instanceof IFluidContainerItem) { @@ -219,10 +226,10 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler { while (i$.hasNext()) { - Entry entry = (Entry)i$.next(); + Entry entry = i$.next(); if (((UniversalRecipeInput)entry.getKey()).containFluidStack(fluidStack)) { - this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients())); + this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients())); } } } @@ -230,10 +237,10 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler { while (i$.hasNext()) { - Entry entry = (Entry)i$.next(); + Entry entry = i$.next(); if (((UniversalRecipeInput)entry.getKey()).containItemStack(ingredient)) { - this.arecipes.add(new MachineRecipeHandler.CachedIORecipe((UniversalRecipeInput)entry.getKey(), (UniversalRecipeOutput)entry.getValue(),getAdditionalIngredients())); + this.arecipes.add(new MachineRecipeHandler.CachedIORecipe(entry.getKey(), entry.getValue(),getAdditionalIngredients())); } } } @@ -266,9 +273,9 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler public class CachedIORecipe extends CachedRecipe { - private final List ingredients = new ArrayList(); + private final List ingredients = new ArrayList(); public PositionedStack output; - public final List otherStacks = new ArrayList(); + public final List otherStacks = new ArrayList(); public boolean specialConditions=false; @Override @@ -307,16 +314,16 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler else { specialConditions=output1.specialConditions; - ArrayList> items = new ArrayList(); - ArrayList> fluidItems = new ArrayList(); + ArrayList> items = new ArrayList>(); + ArrayList> fluidItems = new ArrayList>(); if(input.getFluidInputs()!=null && !input.getFluidInputs().isEmpty()) { - Iterator i = input.getFluidInputs().iterator(); + Iterator i = input.getFluidInputs().iterator(); while (i.hasNext()) { IRecipeInputFluid fstackRI = (IRecipeInputFluid)i.next(); List fstackList = fstackRI.getInputs(); - List fContainers = new ArrayList(); + List fContainers = new ArrayList(); for(FluidStack fstack:fstackList) { ItemStack stack = Ic2Items.FluidCell.copy(); @@ -333,12 +340,12 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler if(input.getItemInputs()!=null && !input.getItemInputs().isEmpty()) { - Iterator i = input.getItemInputs().iterator(); + Iterator i = input.getItemInputs().iterator(); while (i.hasNext()) { IRecipeInput rInput = (IRecipeInput)i.next(); Iterator rInputsi = rInput.getInputs().iterator(); - List itemInputs = new ArrayList(); + List itemInputs = new ArrayList(); while(rInputsi.hasNext()) { ItemStack stack = rInputsi.next().copy(); @@ -407,7 +414,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler x = MachineRecipeHandler.this.getFluidOutputPosX()[0]; y = MachineRecipeHandler.this.getFluidOutputPosY()[0]; } - Iterator i = output1.getFluidOutputs().iterator(); + Iterator i = output1.getFluidOutputs().iterator(); if(skipOneFluidOutput) { i.next(); -- cgit v1.2.3