From 22722f472875e52c6ffae5f1b4c731a20b4176a7 Mon Sep 17 00:00:00 2001 From: Stefan Wimmer Date: Sat, 16 Jul 2016 17:14:51 +0200 Subject: [PATCH] Add strawberry + chocolate, add chocolate coated strawberry, pre-release 1.0.0-rc.2 --- build.gradle | 2 +- package.json | 2 +- src/main/java/io/teammion/morefood/Items.java | 6 ++++++ .../morefood/recipes/ShapelessRecipes.java | 7 +++++++ .../morefood/recipes/SmeltingRecipes.java | 5 +++++ .../resources/assets/morefood/lang/en_US.lang | 2 ++ .../models/item/strawberry_chocolate.json | 6 ++++++ .../models/item/strawberry_chocolate_coated.json | 6 ++++++ .../textures/items/strawberry_chocolate.png | Bin 0 -> 456 bytes .../items/strawberry_chocolate_coated.png | Bin 0 -> 366 bytes 10 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/morefood/models/item/strawberry_chocolate.json create mode 100644 src/main/resources/assets/morefood/models/item/strawberry_chocolate_coated.json create mode 100644 src/main/resources/assets/morefood/textures/items/strawberry_chocolate.png create mode 100644 src/main/resources/assets/morefood/textures/items/strawberry_chocolate_coated.png diff --git a/build.gradle b/build.gradle index f9efbba..8564692 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/package.json b/package.json index efb6d54..ac8dff5 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/main/java/io/teammion/morefood/Items.java b/src/main/java/io/teammion/morefood/Items.java index aa44aca..c09c47b 100644 --- a/src/main/java/io/teammion/morefood/Items.java +++ b/src/main/java/io/teammion/morefood/Items.java @@ -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() { @@ -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() @@ -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); } } diff --git a/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java b/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java index fbeea82..766ad22 100644 --- a/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java +++ b/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java @@ -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 + ); } } diff --git a/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java b/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java index 4786487..670feda 100644 --- a/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java +++ b/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java @@ -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) + ); } } diff --git a/src/main/resources/assets/morefood/lang/en_US.lang b/src/main/resources/assets/morefood/lang/en_US.lang index 828f319..115c1fc 100644 --- a/src/main/resources/assets/morefood/lang/en_US.lang +++ b/src/main/resources/assets/morefood/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/morefood/models/item/strawberry_chocolate.json b/src/main/resources/assets/morefood/models/item/strawberry_chocolate.json new file mode 100644 index 0000000..68503ab --- /dev/null +++ b/src/main/resources/assets/morefood/models/item/strawberry_chocolate.json @@ -0,0 +1,6 @@ +{ + "parent": "morefood:item/_default", + "textures": { + "layer0": "morefood:items/strawberry_chocolate" + } +} diff --git a/src/main/resources/assets/morefood/models/item/strawberry_chocolate_coated.json b/src/main/resources/assets/morefood/models/item/strawberry_chocolate_coated.json new file mode 100644 index 0000000..12eafff --- /dev/null +++ b/src/main/resources/assets/morefood/models/item/strawberry_chocolate_coated.json @@ -0,0 +1,6 @@ +{ + "parent": "morefood:item/_default", + "textures": { + "layer0": "morefood:items/strawberry_chocolate_coated" + } +} diff --git a/src/main/resources/assets/morefood/textures/items/strawberry_chocolate.png b/src/main/resources/assets/morefood/textures/items/strawberry_chocolate.png new file mode 100644 index 0000000000000000000000000000000000000000..ce0fc6a0fd1318fba88a1c2a4d3fe3c3a9b3f389 GIT binary patch literal 456 zcmV;(0XP1MP)FEj*=K|{2( zy9MGF)hJRprE-c6-U-RmpoWw`&Y)*|-}m`^czC|Nz<*RBALc?n%t3nBrVp-dvuoR| zX$kh;p0Cckq??ywq zRueM?uaN{c_o9q`AO2+v$Y}WRJOIE;v5#bKfTMO>%-zAA*G2rjGiu0aqY1{9%nfkm zeTt>qBt-?s4^TA>KEI9fV1>&jo6Y71k&{~KhY~qEmMNLYi4i&bllw0?pnv^<#8aOD0000AW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6u;!@;uvCa`s~ELe2k7Ft@{O~RtHxwT74AS-FeD;g=vTl zT*qOB}a{O=DR7l&RsD+Tp9EnIBf@hl@8nyd#{?rezbo zPWgC{@1(+n^ZQv#6F&6hG==tx{rk-^by4act*@nP8&A5hGpoeu^DR?PY~oM1FPZj7 zM3Up+KvA*e4w-s*>a2|Iskjicql^dBH^d%F6$taD0e0sxCE BgE0UA literal 0 HcmV?d00001