From 934b0123b68bc081a588e52b7f084e620dfbf0a9 Mon Sep 17 00:00:00 2001 From: Stefan Wimmer Date: Sun, 3 Jul 2016 09:26:49 +0200 Subject: [PATCH] Pre-release 0.4.0 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../java/io/teammion/morefood/CreativeTabs.java | 4 ++-- src/main/java/io/teammion/morefood/Items.java | 6 ++++++ .../morefood/recipes/ShapelessRecipes.java | 8 ++++++++ .../morefood/recipes/SmeltingRecipes.java | 5 +++++ .../resources/assets/morefood/lang/en_US.lang | 5 +++++ .../assets/morefood/models/item/fish_stick.json | 6 ++++++ .../morefood/models/item/fish_stick_raw.json | 6 ++++++ .../assets/morefood/textures/items/fish_stick.png | Bin 0 -> 389 bytes .../morefood/textures/items/fish_stick_raw.png | Bin 0 -> 343 bytes 11 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/morefood/models/item/fish_stick.json create mode 100644 src/main/resources/assets/morefood/models/item/fish_stick_raw.json create mode 100644 src/main/resources/assets/morefood/textures/items/fish_stick.png create mode 100644 src/main/resources/assets/morefood/textures/items/fish_stick_raw.png diff --git a/build.gradle b/build.gradle index 8d5bdd7..e8a7601 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" } */ -version = "0.3.0" +version = "0.4.0" group= "io.teammion.morefood" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "morefood" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848..0158e6e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 +#Sun Jul 03 09:22:54 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip diff --git a/src/main/java/io/teammion/morefood/CreativeTabs.java b/src/main/java/io/teammion/morefood/CreativeTabs.java index 053c19a..12fef58 100644 --- a/src/main/java/io/teammion/morefood/CreativeTabs.java +++ b/src/main/java/io/teammion/morefood/CreativeTabs.java @@ -7,8 +7,8 @@ */ public abstract class CreativeTabs extends net.minecraft.creativetab.CreativeTabs { - public static final CreativeTabs MOREFOOD_ITEMS = new Impl("morefood", Items.COCOA_BEAN_GROUND); - public static final CreativeTabs MOREFOOD_FOOD = new Impl("morefood", Items.CHOCOLATE); + // public static final CreativeTabs MOREFOOD_ITEMS = new Impl("morefood_items", Items.COCOA_BEAN_GROUND); + // public static final CreativeTabs MOREFOOD_FOOD = new Impl("morefood_food", Items.CHOCOLATE); public CreativeTabs(String label, Item tabIconItem) { diff --git a/src/main/java/io/teammion/morefood/Items.java b/src/main/java/io/teammion/morefood/Items.java index 8514394..a93731d 100644 --- a/src/main/java/io/teammion/morefood/Items.java +++ b/src/main/java/io/teammion/morefood/Items.java @@ -22,6 +22,8 @@ public class Items extends net.minecraft.init.Items public static final ItemFood EGG_BOILED = new ItemFood("egg_boiled", 3); public static final Item APPLE_CHOCOLATE = new Item("apple_chocolate"); public static final ItemFood APPLE_CHOCOLATE_COATED = new ItemFood("apple_chocolate_coated", 8); + public static final Item FISH_STICK_RAW = new Item("fish_stick_raw"); + public static final ItemFood FISH_STICK = new ItemFood("fish_stick", 6); static void register() { @@ -37,6 +39,8 @@ static void register() Registry.register(EGG_BOILED); Registry.register(APPLE_CHOCOLATE); Registry.register(APPLE_CHOCOLATE_COATED); + Registry.register(FISH_STICK_RAW); + Registry.register(FISH_STICK); } static void render() @@ -53,5 +57,7 @@ static void render() Registry.render(EGG_BOILED); Registry.render(APPLE_CHOCOLATE); Registry.render(APPLE_CHOCOLATE_COATED); + Registry.render(FISH_STICK_RAW); + Registry.render(FISH_STICK); } } diff --git a/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java b/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java index d4664eb..008d7f8 100644 --- a/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java +++ b/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java @@ -53,5 +53,13 @@ public static void register() Items.CHOCOLATE_PIECE, Items.CHOCOLATE_PIECE ); + + Registry.addShapelessRecipe( + new ItemStack(Items.FISH_STICK_RAW), + Items.FISH, + Items.EGG, + Items.FLOUR, + Items.FLOUR + ); } } diff --git a/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java b/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java index 1472979..4786487 100644 --- a/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java +++ b/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java @@ -30,5 +30,10 @@ public static void register() Items.APPLE_CHOCOLATE, new ItemStack(Items.APPLE_CHOCOLATE_COATED) ); + + Registry.addSmelting( + Items.FISH_STICK_RAW, + new ItemStack(Items.FISH_STICK) + ); } } diff --git a/src/main/resources/assets/morefood/lang/en_US.lang b/src/main/resources/assets/morefood/lang/en_US.lang index fc408d4..2986f11 100644 --- a/src/main/resources/assets/morefood/lang/en_US.lang +++ b/src/main/resources/assets/morefood/lang/en_US.lang @@ -1,3 +1,6 @@ +itemGroup.morefood_items=MoreFood: Items +itemGroup.morefood_food=MoreFood: Food + item.milk_bottle.name=Milk Bottle item.cocoa_bean_roasted.name=Roasted Cocoa Bean item.cocoa_bean_ground.name=Ground Cocoa Bean @@ -10,3 +13,5 @@ item.schnitzel.name=Schnitzel item.egg_boiled.name=Boiled Egg item.apple_chocolate.name=Apple + Chocolate item.apple_chocolate_coated.name=Chocolate Coated Apple +item.fish_stick_raw.name=Raw Fish Stick +item.fish_stick.name=Fish Stick diff --git a/src/main/resources/assets/morefood/models/item/fish_stick.json b/src/main/resources/assets/morefood/models/item/fish_stick.json new file mode 100644 index 0000000..413851d --- /dev/null +++ b/src/main/resources/assets/morefood/models/item/fish_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "morefood:item/_default", + "textures": { + "layer0": "morefood:items/fish_stick" + } +} diff --git a/src/main/resources/assets/morefood/models/item/fish_stick_raw.json b/src/main/resources/assets/morefood/models/item/fish_stick_raw.json new file mode 100644 index 0000000..d33c5c0 --- /dev/null +++ b/src/main/resources/assets/morefood/models/item/fish_stick_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "morefood:item/_default", + "textures": { + "layer0": "morefood:items/fish_stick_raw" + } +} diff --git a/src/main/resources/assets/morefood/textures/items/fish_stick.png b/src/main/resources/assets/morefood/textures/items/fish_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..814f2a168ff3ed037bf3d0bfc882f3549542b5c9 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqs{}Wvrdr2qYoL&9W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6o2XI;uvCadg^3*u0sYQ$M$<{Jv)W@3zMsc#a9knhl8GX zzHr@Jyt=Px@)w4=bFH+d#3@8i_uHm%#8Juf?ffs>SwHQod0(y1qTFI9`pUA_hSP_$ zR_oM^&f5pYj`O-m8ebHf^Hp^Iwqgc{NueKN*uAg2O$x35Ud8(Dxj2IY*9^5qUHn`t zP8^zJ{)|uM)7Pf!9Zbu18lO_&lHiIvTs${Za*M1=#Jo4Pc)WXYz<^9V&4@dahJK1=W+$tTY=vOa>@;UirFh#FKjnak6%&N@ALQE>#MU@ aNY*gi{+-$r*!|T96dIncelF{r5}E*f4v>QY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/morefood/textures/items/fish_stick_raw.png b/src/main/resources/assets/morefood/textures/items/fish_stick_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..213f62f8b96ba4ad0428c4324b962f9ec230e743 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqs{}WjWc$hE5kMi?%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dD8Ad%#WBR<^weNOzC#8A#etClY;9dz|1^kiR5-Qx)Q#%~ zpO`l-;^7hWZZ`@D7x%c_z1?MFvh_|T?j3U1n`6vl<4=_Cbg`SO|KS`HgHI@P2D@gE z+6e}R_isE{=Jo%+zw_!Ghs$3tuifv`rOujkW5(Khj1T7?&8z2FbRjmV!OS<*KV{m? zw+*%z8dot#E)ofLpP=$hpm|mE_Ig&;G*^Wu^(Xoa(&J?t&5yTS5qzS(V);kw(zh1p e%=6eE|6yD%81wd=`b0^P|2$p&T-G@yGywnzqkD+} literal 0 HcmV?d00001