Skip to content

Commit

Permalink
Add strawberry + chocolate, add chocolate coated strawberry, pre-rele…
Browse files Browse the repository at this point in the history
…ase 1.0.0-rc.2
  • Loading branch information
Stefan Wimmer committed Jul 16, 2016
1 parent 96827f6 commit 22722f4
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
version = "1.0.0-rc.1"
version = "1.0.0-rc.2"
group = "io.teammion.morefood"
archivesBaseName = "morefood"

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "morefood",
"version": "1.0.0-rc.1",
"version": "1.0.0-rc.2",
"description": "This Minecraft Mod will add additional food to Mincraft to provide a healthy variety.",
"scripts": {
"setup": "./setup.sh",
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/teammion/morefood/Items.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public class Items extends net.minecraft.init.Items
public static final ItemFood SANDWICH_CHICKEN = new ItemFood("sandwich_chicken", 5);
public static final ItemFood SANDWICH_FISH = new ItemFood("sandwich_fish", 5);
public static final ItemFood STRAWBERRY = new ItemStrawberry();
public static final Item STRAWBERRY_CHOCOLATE = new Item("strawberry_chocolate");
public static final ItemFood STRAWBERRY_CHOCOLATE_COATED = new ItemFood("strawberry_chocolate_coated", 8);

static void register()
{
Expand All @@ -50,6 +52,8 @@ static void register()
Registry.register(SANDWICH_CHICKEN);
Registry.register(SANDWICH_FISH);
Registry.register(STRAWBERRY);
Registry.register(STRAWBERRY_CHOCOLATE);
Registry.register(STRAWBERRY_CHOCOLATE_COATED);
}

static void render()
Expand All @@ -74,5 +78,7 @@ static void render()
Registry.render(SANDWICH_CHICKEN);
Registry.render(SANDWICH_FISH);
Registry.render(STRAWBERRY);
Registry.render(STRAWBERRY_CHOCOLATE);
Registry.render(STRAWBERRY_CHOCOLATE_COATED);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,12 @@ public static void register()
new ItemStack(Items.BREAD_SLICE, 2),
Items.BREAD
);

Registry.addShapelessRecipe(
new ItemStack(Items.STRAWBERRY_CHOCOLATE),
Items.STRAWBERRY,
Items.CHOCOLATE_PIECE,
Items.CHOCOLATE_PIECE
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,10 @@ public static void register()
Items.FISH_STICK_RAW,
new ItemStack(Items.FISH_STICK)
);

Registry.addSmelting(
Items.STRAWBERRY_CHOCOLATE,
new ItemStack(Items.STRAWBERRY_CHOCOLATE_COATED)
);
}
}
2 changes: 2 additions & 0 deletions src/main/resources/assets/morefood/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ item.sandwich_porkchop.name=Porkchop Sandwich
item.sandwich_chicken.name=Chicken Sandwich
item.sandwich_fish.name=Fish Sandwich
item.strawberry.name=Strawberry
item.strawberry_chocolate.name=Strawberry + Chocolate
item.strawberry_chocolate_coated.name=Chocolate Coated Strawberry
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "morefood:item/_default",
"textures": {
"layer0": "morefood:items/strawberry_chocolate"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "morefood:item/_default",
"textures": {
"layer0": "morefood:items/strawberry_chocolate_coated"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 22722f4

Please sign in to comment.