Skip to content

Commit

Permalink
Pre-release 0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Wimmer committed Jul 3, 2016
1 parent 29176c4 commit 934b012
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 5 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 = "0.3.0"
version = "0.4.0"
group= "io.teammion.morefood" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "morefood"

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/main/java/io/teammion/morefood/CreativeTabs.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
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 @@ -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()
{
Expand All @@ -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()
Expand All @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
}
}
5 changes: 5 additions & 0 deletions src/main/resources/assets/morefood/lang/en_US.lang
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "morefood:item/_default",
"textures": {
"layer0": "morefood:items/fish_stick"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "morefood:item/_default",
"textures": {
"layer0": "morefood:items/fish_stick_raw"
}
}
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 934b012

Please sign in to comment.