Merge pull request #468 from hilburn/master

jakimfett · jakimfett · commit e10417330696 · 2014-11-18T21:37:26.000-08:00
A load of null checking for keys
diff --git a/src/main/java/minechem/MinechemRecipes.java b/src/main/java/minechem/MinechemRecipes.java
@@ -3140,11 +3140,7 @@ public boolean shouldCreateSynthesis(ItemStack item)
 	public boolean shouldCreateSynthesis(ItemBlock block)
 	{
 		// check if the block is an oreBlock
-		if (block.field_150939_a instanceof BlockOre)
-		{
-			return false;
-		}
-		return true;
+		return !(block.field_150939_a instanceof BlockOre);
 	}
 
 	private ArrayList<OreDictionaryHandler> oreDictionaryHandlers;
diff --git a/src/main/java/minechem/computercraft/ChemicalTurtlePeripheral.java b/src/main/java/minechem/computercraft/ChemicalTurtlePeripheral.java
@@ -832,7 +832,7 @@ public String[] getDetails() {
     }
 	
 	protected boolean addStackToKnown(ItemStack add) {
-		MapKey addString = DecomposerRecipe.getKey(add);
+		MapKey addString = MapKey.getKey(add);
 		for (MapKey key:known)
     	{
     		if (key.equals(addString)) return false;
@@ -847,7 +847,7 @@ private ArrayList<MapKey> stackListToKeys(List<ItemStack> stacks)
     	ArrayList<MapKey> result = new ArrayList<MapKey>();
     	for (ItemStack stack:stacks)
     		if (stack!=null)
-        		result.add(DecomposerRecipe.getKey(stack));
+        		result.add(MapKey.getKey(stack));
     	return result;
     }
     
@@ -925,8 +925,7 @@ private ItemStack getJournal(int slot)
     
     private boolean validateInteger(Integer input, int max)
     {
-    	if (input==null) return false;
-    	if (input>=max) return false;
+    	if (input==null || input>=max) return false;
     	return true;
     }
     
diff --git a/src/main/java/minechem/container/ContainerWithFakeSlots.java b/src/main/java/minechem/container/ContainerWithFakeSlots.java
@@ -73,8 +73,7 @@ private void addStackToSlot(ItemStack stackOnMouse, Slot slot, int amount)
 		ItemStack stackInSlot = slot.inventory.getStackInSlot(slot.slotNumber);
 		if (stackInSlot != null)
 		{
-			int newStackSize = Math.min(stackInSlot.stackSize + amount, slot.inventory.getInventoryStackLimit());
-			stackInSlot.stackSize = newStackSize;
+			stackInSlot.stackSize = Math.min(stackInSlot.stackSize + amount, slot.inventory.getInventoryStackLimit());
 		} else
 		{
 			ItemStack copyStack = stackOnMouse.copy();
diff --git a/src/main/java/minechem/gui/GuiContainerTabbed.java b/src/main/java/minechem/gui/GuiContainerTabbed.java
@@ -24,7 +24,7 @@ public abstract class GuiContainerTabbed extends GuiMinechemContainer implements
 
 	protected static enum SlotColor
 	{
-		BLUE, RED, YELLOW, ORANGE, GREEN, PURPLE;
+		BLUE, RED, YELLOW, ORANGE, GREEN, PURPLE
 	}
 
 	protected static enum SlotType
diff --git a/src/main/java/minechem/item/molecule/Molecule.java b/src/main/java/minechem/item/molecule/Molecule.java
@@ -19,8 +19,6 @@ public PotionChemical copy()
 		return new Molecule(molecule, amount);
 	}
 
-	;
-
     public Molecule(MoleculeEnum molecule)
 	{
 		super(1);
diff --git a/src/main/java/minechem/oredictionary/OreDictionaryDefaultHandler.java b/src/main/java/minechem/oredictionary/OreDictionaryDefaultHandler.java
@@ -57,11 +57,7 @@ public String[] parseOreName(String oreName)
 	@Override
 	public boolean canHandle(String oreName)
 	{
-		if (this.parseOreName(oreName) != null)
-		{
-			return true;
-		}
-		return false;
+		return this.parseOreName(oreName) != null;
 	}
 
 	@Override
@@ -161,11 +157,7 @@ private PotionChemical[] scaleFloor(PotionChemical[] composition, double factor)
 
 	private boolean haveSeen(OreDictionaryBaseOreEnum ore, EnumOrePrefix prefix)
 	{
-		if (this.seenOres.containsKey(ore) && this.seenOres.get(ore).contains(prefix))
-		{
-			return true;
-		}
-		return false;
+		return this.seenOres.containsKey(ore) && this.seenOres.get(ore).contains(prefix);
 	}
 
 	private void seen(OreDictionaryBaseOreEnum ore, EnumOrePrefix prefix)
diff --git a/src/main/java/minechem/oredictionary/OreDictionaryMineFactoryReloadedHandler.java b/src/main/java/minechem/oredictionary/OreDictionaryMineFactoryReloadedHandler.java
@@ -14,13 +14,7 @@ public class OreDictionaryMineFactoryReloadedHandler implements
 	@Override
 	public boolean canHandle(String oreName)
 	{
-		if (oreName.equals("itemRawRubber") || oreName.equals("itemRubber") || oreName.equals("fertilizerOrganic"))
-		{
-			return true;
-		} else
-		{
-			return false;
-		}
+		return oreName.equals("itemRawRubber") || oreName.equals("itemRubber") || oreName.equals("fertilizerOrganic");
 	}
 
 	@Override
diff --git a/src/main/java/minechem/potion/PotionMineral.java b/src/main/java/minechem/potion/PotionMineral.java
@@ -16,8 +16,6 @@ public PotionChemical copy()
 		return new PotionMineral(mineral, amount);
 	}
 
-	;
-
     public PotionMineral(PotionMineralEnum mineral)
 	{
 		super(1);
diff --git a/src/main/java/minechem/tileentity/blueprintprojector/BlueprintProjectorBlock.java b/src/main/java/minechem/tileentity/blueprintprojector/BlueprintProjectorBlock.java
@@ -54,8 +54,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer e
 	private ItemStack takeBlueprintFromProjector(BlueprintProjectorTileEntity projector)
 	{
 		MinechemBlueprint blueprint = projector.takeBlueprint();
-		ItemStack blueprintItem = ItemBlueprint.createItemStackFromBlueprint(blueprint);
-		return blueprintItem;
+		return ItemBlueprint.createItemStackFromBlueprint(blueprint);
 	}
 
 	@Override
diff --git a/src/main/java/minechem/tileentity/blueprintprojector/BlueprintProjectorGui.java b/src/main/java/minechem/tileentity/blueprintprojector/BlueprintProjectorGui.java
@@ -33,7 +33,7 @@ protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3)
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 
 		this.mc.renderEngine.bindTexture(Resources.Gui.PROJECTOR);
-		;
+
 		int x = (width - xSize) / 2;
 		int y = (height - ySize) / 2;
 		drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/minechem/tileentity/decomposer/DecomposerRecipe.java b/src/main/java/minechem/tileentity/decomposer/DecomposerRecipe.java
@@ -29,19 +29,14 @@ public static DecomposerRecipe add(DecomposerRecipe recipe)
 			{
 				return null;
 			}
-			recipes.put(getKey(recipe.input), recipe);
+			recipes.put(MapKey.getKey(recipe.input), recipe);
 		} else if (recipe instanceof DecomposerFluidRecipe && ((DecomposerFluidRecipe) recipe).inputFluid != null)
 		{
-			recipes.put(getKey(((DecomposerFluidRecipe) recipe).inputFluid), recipe);
+			recipes.put(MapKey.getKey(((DecomposerFluidRecipe) recipe).inputFluid), recipe);
 		}
 		return recipe;
 	}
 
-	public static DecomposerRecipe get(String string)
-	{
-		return recipes.get(string);
-	}
-
 	public static DecomposerRecipe remove(String string)
 	{
 		if (recipes.containsKey(string))
@@ -53,9 +48,10 @@ public static DecomposerRecipe remove(String string)
 
 	public static DecomposerRecipe remove(ItemStack itemStack)
 	{
-		if (recipes.containsKey(getKey(itemStack)))
+		MapKey key = MapKey.getKey(itemStack);
+		if (key!=null&&recipes.containsKey(key))
 		{
-			return recipes.remove(getKey(itemStack));
+			return recipes.remove(key);
 		}
 		return null;
 	}
@@ -65,24 +61,16 @@ public static DecomposerRecipe remove(MapKey key)
 		return recipes.remove(key);
 	}
 
-	public static MapKey getKey(ItemStack itemStack)
-	{
-		return new MapKey(itemStack);
-	}
-
-	public static MapKey getKey(FluidStack fluidStack)
+	public static DecomposerRecipe get(ItemStack itemStack)
 	{
-		return new MapKey(fluidStack);
+		if (itemStack==null || itemStack.getItem()==null) return null;
+		return get(MapKey.getKey(itemStack));
 	}
 
-	public static DecomposerRecipe get(ItemStack item)
+	public static DecomposerRecipe get(FluidStack fluidStack)
 	{
-		return get(getKey(item));
-	}
-
-	public static DecomposerRecipe get(FluidStack item)
-	{
-		return get(getKey(item));
+		if (fluidStack==null) return null;
+		return get(MapKey.getKey(fluidStack));
 	}
 
 	public static DecomposerRecipe get(MapKey key)
@@ -157,13 +145,6 @@ public ArrayList<PotionChemical> getOutput()
 		return result;
 	}
 
-	public static PotionChemical getPotionKey(PotionChemical potion)
-	{
-		PotionChemical key = potion.copy();
-		key.amount = 1;
-		return key;
-	}
-
 	public ArrayList<PotionChemical> getOutputRaw()
 	{
 		ArrayList<PotionChemical> result = new ArrayList<PotionChemical>();
diff --git a/src/main/java/minechem/tileentity/decomposer/DecomposerRecipeHandler.java b/src/main/java/minechem/tileentity/decomposer/DecomposerRecipeHandler.java
@@ -65,8 +65,7 @@ public ArrayList<ItemStack> getRecipeOutputForInput(ItemStack input)
 		DecomposerRecipe recipe = getRecipe(input);
 		if (recipe != null)
 		{
-			ArrayList<ItemStack> stacks = MinechemUtil.convertChemicalsIntoItemStacks(recipe.getOutput());
-			return stacks;
+			return MinechemUtil.convertChemicalsIntoItemStacks(recipe.getOutput());
 		}
 		return null;
 	}
@@ -76,9 +75,7 @@ public ArrayList<ItemStack> getRecipeOutputForFluidInput(FluidStack input)
 		DecomposerFluidRecipe fluidRecipe = (DecomposerFluidRecipe) DecomposerRecipe.get(input);
 		if (fluidRecipe != null)
 		{
-
-			ArrayList<ItemStack> stacks = MinechemUtil.convertChemicalsIntoItemStacks(fluidRecipe.getOutput());
-			return stacks;
+			return MinechemUtil.convertChemicalsIntoItemStacks(fluidRecipe.getOutput());
 		}
 		return null;
 	}
diff --git a/src/main/java/minechem/tileentity/decomposer/DecomposerRecipeSuper.java b/src/main/java/minechem/tileentity/decomposer/DecomposerRecipeSuper.java
@@ -51,11 +51,12 @@ public DecomposerRecipeSuper(ItemStack input, ItemStack[] components, int level)
 
 	private void addDecompRecipe(DecomposerRecipe decompRecipe, double d)
 	{
-		MapKey key = DecomposerRecipe.getKey(decompRecipe.input);
-		Double current = recipes.put(key, d);
-		if (current != null)
-		{
-			recipes.put(key, d + current);
+		MapKey key = MapKey.getKey(decompRecipe.input);
+		if (key!=null) {
+			Double current = recipes.put(key, d);
+			if (current != null) {
+				recipes.put(key, d + current);
+			}
 		}
 	}
 
@@ -146,11 +147,7 @@ public ArrayList<PotionChemical> getGuaranteedOutput()
 	@Override
 	public boolean isNull()
 	{
-		if (super.getOutput() == null && this.recipes == null)
-		{
-			return true;
-		}
-		return false;
+		return (super.getOutput() == null || this.recipes == null);
 	}
 
 	@Override
diff --git a/src/main/java/minechem/tileentity/decomposer/DecomposerTileEntity.java b/src/main/java/minechem/tileentity/decomposer/DecomposerTileEntity.java
@@ -177,11 +177,7 @@ else if (tank != null)
 
 	private boolean energyToDecompose()
 	{
-		if (this.getEnergyStored() >= Settings.costDecomposition || !Settings.powerUseEnabled)
-		{
-			return true;
-		}
-		return false;
+		return this.getEnergyStored() >= Settings.costDecomposition || !Settings.powerUseEnabled;
 	}
 
 	@Override
@@ -210,8 +206,7 @@ public boolean canInsertItem(int i, ItemStack itemstack, int j)
 			return false;
 		} else
 		{
-			boolean hasRecipe = DecomposerRecipeHandler.instance.getRecipe(itemstack) != null;
-			return hasRecipe;
+			return DecomposerRecipeHandler.instance.getRecipe(itemstack) != null;
 		}
 	}
 
diff --git a/src/main/java/minechem/tileentity/prefab/TileEntityProxy.java b/src/main/java/minechem/tileentity/prefab/TileEntityProxy.java
@@ -235,25 +235,15 @@ public int[] getAccessibleSlotsFromSide(int var1)
 	public boolean canInsertItem(int slot, ItemStack itemstack, int side)
 	{
 		// Cannot insert items into reactor with automation disabled.
-		if (Settings.AllowAutomation && isItemValidForSlot(slot, itemstack))
-		{
-			return true;
-		} else
-		{
-			return false;
-		}
+		return Settings.AllowAutomation && isItemValidForSlot(slot, itemstack);
 	}
 
 	@Override
 	public boolean canExtractItem(int slot, ItemStack itemstack, int side)
 	{
 		// Cannot extract items from reactor with automation disabled.
 		// Can only extract from the bottom.
-		if (Settings.AllowAutomation && side == 0 && slot == 2)
-		{
-			return true;
-		}
-		return false;
+		return Settings.AllowAutomation && side == 0 && slot == 2;
 	}
 
 	@Override
diff --git a/src/main/java/minechem/tileentity/synthesis/SynthesisModel.java b/src/main/java/minechem/tileentity/synthesis/SynthesisModel.java
@@ -172,8 +172,7 @@ private void armVertical(float timer, float start, float end, float yStart, floa
 		{
 			float time = end - start;
 			float verticalTimer = timer - start;
-			float newY = MinechemUtil.translateValue(verticalTimer, 0.0F, time, yStart, yEnd);
-			bottomarm.rotationPointY = newY;
+			bottomarm.rotationPointY = MinechemUtil.translateValue(verticalTimer, 0.0F, time, yStart, yEnd);
 		}
 	}
 
diff --git a/src/main/java/minechem/tileentity/synthesis/SynthesisRecipe.java b/src/main/java/minechem/tileentity/synthesis/SynthesisRecipe.java
@@ -2,9 +2,7 @@
 
 import minechem.Settings;
 import minechem.potion.PotionChemical;
-import minechem.utils.LogHelper;
 import minechem.utils.MapKey;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
@@ -30,7 +28,8 @@ public static SynthesisRecipe add(SynthesisRecipe recipe)
 			{
 				return null;
 			}
-			recipes.put(new MapKey(recipe.output), recipe);
+			MapKey key = MapKey.getKey(recipe.output);
+			if (key!=null) recipes.put(key, recipe);
 		}
 
 		return recipe;
@@ -50,7 +49,7 @@ public static void remove(ItemStack itemStack)
 
 		for (SynthesisRecipe recipe : recipes)
 		{
-			SynthesisRecipe.recipes.remove(getKey(recipe.output));
+			SynthesisRecipe.recipes.remove(MapKey.getKey(recipe.output));
 		}
 	}
 
@@ -87,11 +86,6 @@ public static ArrayList<SynthesisRecipe> search(ItemStack itemStack)
 
 	}
 
-	public static MapKey getKey(ItemStack itemStack)
-	{
-		return new MapKey(itemStack);
-	}
-
     public SynthesisRecipe(ItemStack output, boolean isShaped, int energyCost, PotionChemical... recipe)
     {
         this.output = output;
@@ -138,7 +132,7 @@ public PotionChemical[] getShapedRecipe()
 
 	public PotionChemical[] getShapelessRecipe()
 	{
-		return this.unshapedRecipe.toArray(new PotionChemical[0]);
+		return this.unshapedRecipe.toArray(new PotionChemical[unshapedRecipe.size()]);
 	}
 
 	public int getIngredientCount()
diff --git a/src/main/java/minechem/tileentity/synthesis/SynthesisRecipeHandler.java b/src/main/java/minechem/tileentity/synthesis/SynthesisRecipeHandler.java
@@ -2,6 +2,7 @@
 
 import minechem.potion.PotionChemical;
 import minechem.utils.Compare;
+import minechem.utils.MapKey;
 import minechem.utils.MinechemUtil;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -21,7 +22,9 @@ public SynthesisRecipeHandler()
 
 	public SynthesisRecipe getRecipeFromOutput(ItemStack output)
 	{
-		return SynthesisRecipe.recipes.get(SynthesisRecipe.getKey(output));
+		MapKey key = MapKey.getKey(output);
+		if (key==null) return null;
+		return SynthesisRecipe.recipes.get(key);
 	}
 
 	public SynthesisRecipe getRecipeFromInput(ItemStack[] input)
diff --git a/src/main/java/minechem/tileentity/synthesis/SynthesisTileEntity.java b/src/main/java/minechem/tileentity/synthesis/SynthesisTileEntity.java
diff --git a/src/main/java/minechem/utils/InputHelper.java b/src/main/java/minechem/utils/InputHelper.java
diff --git a/src/main/java/minechem/utils/MapKey.java b/src/main/java/minechem/utils/MapKey.java
diff --git a/src/main/java/minechem/utils/Recipe.java b/src/main/java/minechem/utils/Recipe.java

Original file line number	Diff line number	Diff line change
`@@ -3140,11 +3140,7 @@ public boolean shouldCreateSynthesis(ItemStack item)`
`3140`	`3140`	`public boolean shouldCreateSynthesis(ItemBlock block)`
`3141`	`3141`	`{`
`3142`	`3142`	`// check if the block is an oreBlock`
`3143`		`- if (block.field_150939_a instanceof BlockOre)`
`3144`		`- {`
`3145`		`- return false;`
`3146`		`- }`
`3147`		`- return true;`
	`3143`	`+ return !(block.field_150939_a instanceof BlockOre);`
`3148`	`3144`	`}`
`3149`	`3145`
`3150`	`3146`	`private ArrayList<OreDictionaryHandler> oreDictionaryHandlers;`
Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ public String[] getDetails() {`
`832`	`832`	`}`
`833`	`833`
`834`	`834`	`protected boolean addStackToKnown(ItemStack add) {`
`835`		`- MapKey addString = DecomposerRecipe.getKey(add);`
	`835`	`+ MapKey addString = MapKey.getKey(add);`
`836`	`836`	`for (MapKey key:known)`
`837`	`837`	`{`
`838`	`838`	`if (key.equals(addString)) return false;`
`@@ -847,7 +847,7 @@ private ArrayList<MapKey> stackListToKeys(List<ItemStack> stacks)`
`847`	`847`	`ArrayList<MapKey> result = new ArrayList<MapKey>();`
`848`	`848`	`for (ItemStack stack:stacks)`
`849`	`849`	`if (stack!=null)`
`850`		`- result.add(DecomposerRecipe.getKey(stack));`
	`850`	`+ result.add(MapKey.getKey(stack));`
`851`	`851`	`return result;`
`852`	`852`	`}`
`853`	`853`
`@@ -925,8 +925,7 @@ private ItemStack getJournal(int slot)`
`925`	`925`
`926`	`926`	`private boolean validateInteger(Integer input, int max)`
`927`	`927`	`{`
`928`		`- if (input==null) return false;`
`929`		`- if (input>=max) return false;`
	`928`	`+ if (input==null \|\| input>=max) return false;`
`930`	`929`	`return true;`
`931`	`930`	`}`
`932`	`931`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,7 @@ private void addStackToSlot(ItemStack stackOnMouse, Slot slot, int amount)`
`73`	`73`	`ItemStack stackInSlot = slot.inventory.getStackInSlot(slot.slotNumber);`
`74`	`74`	`if (stackInSlot != null)`
`75`	`75`	`{`
`76`		`- int newStackSize = Math.min(stackInSlot.stackSize + amount, slot.inventory.getInventoryStackLimit());`
`77`		`- stackInSlot.stackSize = newStackSize;`
	`76`	`+ stackInSlot.stackSize = Math.min(stackInSlot.stackSize + amount, slot.inventory.getInventoryStackLimit());`
`78`	`77`	`} else`
`79`	`78`	`{`
`80`	`79`	`ItemStack copyStack = stackOnMouse.copy();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public abstract class GuiContainerTabbed extends GuiMinechemContainer implements`
`24`	`24`
`25`	`25`	`protected static enum SlotColor`
`26`	`26`	`{`
`27`		`- BLUE, RED, YELLOW, ORANGE, GREEN, PURPLE;`
	`27`	`+ BLUE, RED, YELLOW, ORANGE, GREEN, PURPLE`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`protected static enum SlotType`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ public PotionChemical copy()`
`19`	`19`	`return new Molecule(molecule, amount);`
`20`	`20`	`}`
`21`	`21`
`22`		`- ;`
`23`		`-`
`24`	`22`	`public Molecule(MoleculeEnum molecule)`
`25`	`23`	`{`
`26`	`24`	`super(1);`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,7 @@ public String[] parseOreName(String oreName)`
`57`	`57`	`@Override`
`58`	`58`	`public boolean canHandle(String oreName)`
`59`	`59`	`{`
`60`		`- if (this.parseOreName(oreName) != null)`
`61`		`- {`
`62`		`- return true;`
`63`		`- }`
`64`		`- return false;`
	`60`	`+ return this.parseOreName(oreName) != null;`
`65`	`61`	`}`
`66`	`62`
`67`	`63`	`@Override`
`@@ -161,11 +157,7 @@ private PotionChemical[] scaleFloor(PotionChemical[] composition, double factor)`
`161`	`157`
`162`	`158`	`private boolean haveSeen(OreDictionaryBaseOreEnum ore, EnumOrePrefix prefix)`
`163`	`159`	`{`
`164`		`- if (this.seenOres.containsKey(ore) && this.seenOres.get(ore).contains(prefix))`
`165`		`- {`
`166`		`- return true;`
`167`		`- }`
`168`		`- return false;`
	`160`	`+ return this.seenOres.containsKey(ore) && this.seenOres.get(ore).contains(prefix);`
`169`	`161`	`}`
`170`	`162`
`171`	`163`	`private void seen(OreDictionaryBaseOreEnum ore, EnumOrePrefix prefix)`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,7 @@ public class OreDictionaryMineFactoryReloadedHandler implements`
`14`	`14`	`@Override`
`15`	`15`	`public boolean canHandle(String oreName)`
`16`	`16`	`{`
`17`		`- if (oreName.equals("itemRawRubber") \|\| oreName.equals("itemRubber") \|\| oreName.equals("fertilizerOrganic"))`
`18`		`- {`
`19`		`- return true;`
`20`		`- } else`
`21`		`- {`
`22`		`- return false;`
`23`		`- }`
	`17`	`+ return oreName.equals("itemRawRubber") \|\| oreName.equals("itemRubber") \|\| oreName.equals("fertilizerOrganic");`
`24`	`18`	`}`
`25`	`19`
`26`	`20`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public PotionChemical copy()`
`16`	`16`	`return new PotionMineral(mineral, amount);`
`17`	`17`	`}`
`18`	`18`
`19`		`- ;`
`20`		`-`
`21`	`19`	`public PotionMineral(PotionMineralEnum mineral)`
`22`	`20`	`{`
`23`	`21`	`super(1);`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer e`
`54`	`54`	`private ItemStack takeBlueprintFromProjector(BlueprintProjectorTileEntity projector)`
`55`	`55`	`{`
`56`	`56`	`MinechemBlueprint blueprint = projector.takeBlueprint();`
`57`		`- ItemStack blueprintItem = ItemBlueprint.createItemStackFromBlueprint(blueprint);`
`58`		`- return blueprintItem;`
	`57`	`+ return ItemBlueprint.createItemStackFromBlueprint(blueprint);`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -29,19 +29,14 @@ public static DecomposerRecipe add(DecomposerRecipe recipe)`
`29`	`29`	`{`
`30`	`30`	`return null;`
`31`	`31`	`}`
`32`		`- recipes.put(getKey(recipe.input), recipe);`
	`32`	`+ recipes.put(MapKey.getKey(recipe.input), recipe);`
`33`	`33`	`} else if (recipe instanceof DecomposerFluidRecipe && ((DecomposerFluidRecipe) recipe).inputFluid != null)`
`34`	`34`	`{`
`35`		`- recipes.put(getKey(((DecomposerFluidRecipe) recipe).inputFluid), recipe);`
	`35`	`+ recipes.put(MapKey.getKey(((DecomposerFluidRecipe) recipe).inputFluid), recipe);`
`36`	`36`	`}`
`37`	`37`	`return recipe;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public static DecomposerRecipe get(String string)`
`41`		`- {`
`42`		`- return recipes.get(string);`
`43`		`- }`
`44`		`-`
`45`	`40`	`public static DecomposerRecipe remove(String string)`
`46`	`41`	`{`
`47`	`42`	`if (recipes.containsKey(string))`
`@@ -53,9 +48,10 @@ public static DecomposerRecipe remove(String string)`
`53`	`48`
`54`	`49`	`public static DecomposerRecipe remove(ItemStack itemStack)`
`55`	`50`	`{`
`56`		`- if (recipes.containsKey(getKey(itemStack)))`
	`51`	`+ MapKey key = MapKey.getKey(itemStack);`
	`52`	`+ if (key!=null&&recipes.containsKey(key))`
`57`	`53`	`{`
`58`		`- return recipes.remove(getKey(itemStack));`
	`54`	`+ return recipes.remove(key);`
`59`	`55`	`}`
`60`	`56`	`return null;`
`61`	`57`	`}`
`@@ -65,24 +61,16 @@ public static DecomposerRecipe remove(MapKey key)`
`65`	`61`	`return recipes.remove(key);`
`66`	`62`	`}`
`67`	`63`
`68`		`- public static MapKey getKey(ItemStack itemStack)`
`69`		`- {`
`70`		`- return new MapKey(itemStack);`
`71`		`- }`
`72`		`-`
`73`		`- public static MapKey getKey(FluidStack fluidStack)`
	`64`	`+ public static DecomposerRecipe get(ItemStack itemStack)`
`74`	`65`	`{`
`75`		`- return new MapKey(fluidStack);`
	`66`	`+ if (itemStack==null \|\| itemStack.getItem()==null) return null;`
	`67`	`+ return get(MapKey.getKey(itemStack));`
`76`	`68`	`}`
`77`	`69`
`78`		`- public static DecomposerRecipe get(ItemStack item)`
	`70`	`+ public static DecomposerRecipe get(FluidStack fluidStack)`
`79`	`71`	`{`
`80`		`- return get(getKey(item));`
`81`		`- }`
`82`		`-`
`83`		`- public static DecomposerRecipe get(FluidStack item)`
`84`		`- {`
`85`		`- return get(getKey(item));`
	`72`	`+ if (fluidStack==null) return null;`
	`73`	`+ return get(MapKey.getKey(fluidStack));`
`86`	`74`	`}`
`87`	`75`
`88`	`76`	`public static DecomposerRecipe get(MapKey key)`
`@@ -157,13 +145,6 @@ public ArrayList<PotionChemical> getOutput()`
`157`	`145`	`return result;`
`158`	`146`	`}`
`159`	`147`
`160`		`- public static PotionChemical getPotionKey(PotionChemical potion)`
`161`		`- {`
`162`		`- PotionChemical key = potion.copy();`
`163`		`- key.amount = 1;`
`164`		`- return key;`
`165`		`- }`
`166`		`-`
`167`	`148`	`public ArrayList<PotionChemical> getOutputRaw()`
`168`	`149`	`{`
`169`	`150`	`ArrayList<PotionChemical> result = new ArrayList<PotionChemical>();`