Skip to content

Commit

Permalink
1.3.2 final
Browse files Browse the repository at this point in the history
  • Loading branch information
MrSpring committed Nov 24, 2014
1 parent 8a9d328 commit 0639af0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/main/java/dk/mrspring/kitchen/ModInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class ModInfo
// The name of the Mod
public static final String name = "Kitchen";
// The version of the Mod
public static final String version = "1.3.1";
public static final String version = "1.3.2";

public static String toTexture(String name)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ public class TileEntityPan extends TileEntity
*/
public boolean rightClicked(ItemStack clicked)
{
System.out.println("Clicked!");
if (clicked != null)
{
System.out.println("... is not null!");
if (this.cookTime >= 400 && clicked.getItem() == KitchenItems.jam_jar)
{
this.finishItem(clicked);
Expand All @@ -47,7 +45,6 @@ public boolean rightClicked(ItemStack clicked)
}
} else
{
System.out.println("... is null!");
if (this.cookTime >= 400)
{
this.finishItem(null);
Expand Down Expand Up @@ -94,7 +91,6 @@ public boolean rightClicked(ItemStack clicked)

private void finishItem(ItemStack clicked)
{
System.out.println("Trying to finish item...");
if (this.cookTime >= 400)
{
ItemStack result;
Expand All @@ -106,9 +102,6 @@ private void finishItem(ItemStack clicked)
{
result = this.ingredient.getItemResult();
}

System.out.println("Cook Time is above 400, result is: "+result.getDisplayName());

this.cookTime = 0;
this.ingredient = Ingredient.getIngredient("empty");

Expand All @@ -124,13 +117,11 @@ private void finishItem(ItemStack clicked)
*/
private boolean setIngredient(ItemStack clicked)
{
System.out.println("Setting ingredient");
if (this.ingredient == Ingredient.getIngredient("empty") && this.cookTime == 0)
{
Ingredient ingredientFromItem = KitchenItems.valueOf(clicked.getItem());
if (ingredientFromItem != null)
{
System.out.println("Setting ingredient to: "+ingredientFromItem.getName());
this.ingredient = ingredientFromItem;
return true;
} else return false;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"modid": "kitchen",
"name": "The Kitchen Mod",
"description": "The Kitchen Mod allows you to make fully customizable modular sandwiches. With each layer you put in it, the more it heals your hunger. And you might be lucky to uncover on of the special cominations.",
"version": "1.3.0",
"version": "1.3.2",
"mcversion": "1.7.10",
"url": "http://www.mrspring.dk/mods/kitchen/",
"updateUrl": "",
Expand Down

0 comments on commit 0639af0

Please sign in to comment.