Skip to content

Commit

Permalink
Fix errors, Release 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Wimmer committed Jul 17, 2016
1 parent 98484fd commit a5f5a2a
Show file tree
Hide file tree
Showing 79 changed files with 166 additions and 139 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.4"
version = "1.0.0"
group = "io.teammion.morefood"
archivesBaseName = "tm-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": "tm-morefood",
"version": "1.0.0-rc.4",
"version": "1.0.0",
"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 @@ -29,6 +29,8 @@ public class Items extends net.minecraft.init.Items
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);
public static final Item FRENCH_FRIES_RAW = new Item("french_fries_raw");
public static final ItemFood FRENCH_FRIES = new ItemFood("french_fries", 6);

static void register()
{
Expand All @@ -54,6 +56,8 @@ static void register()
Registry.register(STRAWBERRY);
Registry.register(STRAWBERRY_CHOCOLATE);
Registry.register(STRAWBERRY_CHOCOLATE_COATED);
Registry.register(FRENCH_FRIES_RAW);
Registry.register(FRENCH_FRIES);
}

static void render()
Expand All @@ -80,5 +84,7 @@ static void render()
Registry.render(STRAWBERRY);
Registry.render(STRAWBERRY_CHOCOLATE);
Registry.render(STRAWBERRY_CHOCOLATE_COATED);
Registry.render(FRENCH_FRIES_RAW);
Registry.render(FRENCH_FRIES);
}
}
2 changes: 1 addition & 1 deletion src/main/java/io/teammion/morefood/Registry.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static void render(Item item, int meta, String modelResourceLocation)
{
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(
item, meta, new ModelResourceLocation(
"morefood:" + modelResourceLocation, "inventory"
"tm-morefood:" + modelResourceLocation, "inventory"
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,11 @@ public static void register()
Items.CHOCOLATE_PIECE,
Items.CHOCOLATE_PIECE
);

Registry.addShapelessRecipe(
new ItemStack(Items.FRENCH_FRIES_RAW, 8),
Items.POTATO,
Items.POTATO
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,10 @@ public static void register()
Items.STRAWBERRY_CHOCOLATE,
new ItemStack(Items.STRAWBERRY_CHOCOLATE_COATED)
);

Registry.addSmelting(
Items.FRENCH_FRIES_RAW,
new ItemStack(Items.FRENCH_FRIES)
);
}
}

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/assets/morefood/models/item/chocolate.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/assets/morefood/models/item/flour.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/assets/morefood/models/item/schnitzel.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ item.sandwich_fish.name=Fish Sandwich
item.strawberry.name=Strawberry
item.strawberry_chocolate.name=Strawberry + Chocolate
item.strawberry_chocolate_coated.name=Chocolate Coated Strawberry
item.french_fries_raw.name=Raw French Fries
item.french_fries.name=French Fries
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/apple_chocolate"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/apple_chocolate_coated"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/bread_slice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/chocolate"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/chocolate_drink"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/chocolate_piece"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/cocoa_bean_ground"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/cocoa_bean_roasted"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/egg_boiled"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/fish_stick"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/fish_stick_raw"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/tm-morefood/models/item/flour.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/flour"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/french_fries"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/french_fries_raw"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/milk_bottle"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/sandwich_chicken"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/sandwich_fish"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/sandwich_porkchop"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/sandwich_schnitzel"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/schnitzel"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/schnitzel_raw"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/strawberry"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "tm-morefood:item/_default",
"textures": {
"layer0": "tm-morefood:items/strawberry_chocolate"
}
}
Loading

0 comments on commit a5f5a2a

Please sign in to comment.