From a5f5a2ad9acef8760509592488e3db17ceada112 Mon Sep 17 00:00:00 2001 From: Stefan Wimmer Date: Sun, 17 Jul 2016 21:55:25 +0200 Subject: [PATCH] Fix errors, Release 1.0.0 --- build.gradle | 2 +- package.json | 2 +- src/main/java/io/teammion/morefood/Items.java | 6 ++++++ src/main/java/io/teammion/morefood/Registry.java | 2 +- .../morefood/recipes/ShapelessRecipes.java | 6 ++++++ .../morefood/recipes/SmeltingRecipes.java | 5 +++++ .../morefood/models/item/apple_chocolate.json | 6 ------ .../models/item/apple_chocolate_coated.json | 6 ------ .../assets/morefood/models/item/bread_slice.json | 6 ------ .../assets/morefood/models/item/chocolate.json | 6 ------ .../morefood/models/item/chocolate_drink.json | 6 ------ .../morefood/models/item/chocolate_piece.json | 6 ------ .../morefood/models/item/cocoa_bean_ground.json | 6 ------ .../morefood/models/item/cocoa_bean_roasted.json | 6 ------ .../assets/morefood/models/item/egg_boiled.json | 6 ------ .../assets/morefood/models/item/fish_stick.json | 6 ------ .../morefood/models/item/fish_stick_raw.json | 6 ------ .../assets/morefood/models/item/flour.json | 6 ------ .../assets/morefood/models/item/milk_bottle.json | 6 ------ .../morefood/models/item/sandwich_chicken.json | 6 ------ .../morefood/models/item/sandwich_fish.json | 6 ------ .../morefood/models/item/sandwich_porkchop.json | 6 ------ .../morefood/models/item/sandwich_schnitzel.json | 6 ------ .../assets/morefood/models/item/schnitzel.json | 6 ------ .../morefood/models/item/schnitzel_raw.json | 6 ------ .../assets/morefood/models/item/strawberry.json | 6 ------ .../models/item/strawberry_chocolate.json | 6 ------ .../models/item/strawberry_chocolate_coated.json | 6 ------ .../{morefood => tm-morefood}/lang/en_US.lang | 2 ++ .../models/item/_default.json | 0 .../tm-morefood/models/item/apple_chocolate.json | 6 ++++++ .../models/item/apple_chocolate_coated.json | 6 ++++++ .../tm-morefood/models/item/bread_slice.json | 6 ++++++ .../assets/tm-morefood/models/item/chocolate.json | 6 ++++++ .../tm-morefood/models/item/chocolate_drink.json | 6 ++++++ .../tm-morefood/models/item/chocolate_piece.json | 6 ++++++ .../models/item/cocoa_bean_ground.json | 6 ++++++ .../models/item/cocoa_bean_roasted.json | 6 ++++++ .../tm-morefood/models/item/egg_boiled.json | 6 ++++++ .../tm-morefood/models/item/fish_stick.json | 6 ++++++ .../tm-morefood/models/item/fish_stick_raw.json | 6 ++++++ .../assets/tm-morefood/models/item/flour.json | 6 ++++++ .../tm-morefood/models/item/french_fries.json | 6 ++++++ .../tm-morefood/models/item/french_fries_raw.json | 6 ++++++ .../tm-morefood/models/item/milk_bottle.json | 6 ++++++ .../tm-morefood/models/item/sandwich_chicken.json | 6 ++++++ .../tm-morefood/models/item/sandwich_fish.json | 6 ++++++ .../models/item/sandwich_porkchop.json | 6 ++++++ .../models/item/sandwich_schnitzel.json | 6 ++++++ .../assets/tm-morefood/models/item/schnitzel.json | 6 ++++++ .../tm-morefood/models/item/schnitzel_raw.json | 6 ++++++ .../tm-morefood/models/item/strawberry.json | 6 ++++++ .../models/item/strawberry_chocolate.json | 6 ++++++ .../models/item/strawberry_chocolate_coated.json | 6 ++++++ .../textures/items/apple_chocolate.png | Bin .../textures/items/apple_chocolate_coated.png | Bin .../textures/items/bread_slice.png | Bin .../textures/items/chocolate.png | Bin .../textures/items/chocolate_drink.png | Bin .../textures/items/chocolate_piece.png | Bin .../textures/items/cocoa_bean_ground.png | Bin .../textures/items/cocoa_bean_roasted.png | Bin .../textures/items/egg_boiled.png | Bin .../textures/items/fish_stick.png | Bin .../textures/items/fish_stick_raw.png | Bin .../textures/items/flour.png | Bin .../tm-morefood/textures/items/french_fries.png | Bin 0 -> 325 bytes .../textures/items/french_fries_raw.png | Bin 0 -> 320 bytes .../textures/items/milk_bottle.png | Bin .../textures/items/sandwich_chicken.png | Bin .../textures/items/sandwich_fish.png | Bin .../textures/items/sandwich_porkchop.png | Bin .../textures/items/sandwich_schnitzel.png | Bin .../textures/items/schnitzel.png | Bin .../textures/items/schnitzel_raw.png | Bin .../textures/items/strawberry.png | Bin .../textures/items/strawberry_chocolate.png | Bin .../items/strawberry_chocolate_coated.png | Bin update.sh | 4 ---- 79 files changed, 166 insertions(+), 139 deletions(-) delete mode 100644 src/main/resources/assets/morefood/models/item/apple_chocolate.json delete mode 100644 src/main/resources/assets/morefood/models/item/apple_chocolate_coated.json delete mode 100644 src/main/resources/assets/morefood/models/item/bread_slice.json delete mode 100644 src/main/resources/assets/morefood/models/item/chocolate.json delete mode 100644 src/main/resources/assets/morefood/models/item/chocolate_drink.json delete mode 100644 src/main/resources/assets/morefood/models/item/chocolate_piece.json delete mode 100644 src/main/resources/assets/morefood/models/item/cocoa_bean_ground.json delete mode 100644 src/main/resources/assets/morefood/models/item/cocoa_bean_roasted.json delete mode 100644 src/main/resources/assets/morefood/models/item/egg_boiled.json delete mode 100644 src/main/resources/assets/morefood/models/item/fish_stick.json delete mode 100644 src/main/resources/assets/morefood/models/item/fish_stick_raw.json delete mode 100644 src/main/resources/assets/morefood/models/item/flour.json delete mode 100644 src/main/resources/assets/morefood/models/item/milk_bottle.json delete mode 100644 src/main/resources/assets/morefood/models/item/sandwich_chicken.json delete mode 100644 src/main/resources/assets/morefood/models/item/sandwich_fish.json delete mode 100644 src/main/resources/assets/morefood/models/item/sandwich_porkchop.json delete mode 100644 src/main/resources/assets/morefood/models/item/sandwich_schnitzel.json delete mode 100644 src/main/resources/assets/morefood/models/item/schnitzel.json delete mode 100644 src/main/resources/assets/morefood/models/item/schnitzel_raw.json delete mode 100644 src/main/resources/assets/morefood/models/item/strawberry.json delete mode 100644 src/main/resources/assets/morefood/models/item/strawberry_chocolate.json delete mode 100644 src/main/resources/assets/morefood/models/item/strawberry_chocolate_coated.json rename src/main/resources/assets/{morefood => tm-morefood}/lang/en_US.lang (92%) rename src/main/resources/assets/{morefood => tm-morefood}/models/item/_default.json (100%) create mode 100644 src/main/resources/assets/tm-morefood/models/item/apple_chocolate.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/apple_chocolate_coated.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/bread_slice.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/chocolate.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/chocolate_drink.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/chocolate_piece.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/cocoa_bean_ground.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/cocoa_bean_roasted.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/egg_boiled.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/fish_stick.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/fish_stick_raw.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/flour.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/french_fries.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/french_fries_raw.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/milk_bottle.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/sandwich_chicken.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/sandwich_fish.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/sandwich_porkchop.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/sandwich_schnitzel.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/schnitzel.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/schnitzel_raw.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/strawberry.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate.json create mode 100644 src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate_coated.json rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/apple_chocolate.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/apple_chocolate_coated.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/bread_slice.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/chocolate.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/chocolate_drink.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/chocolate_piece.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/cocoa_bean_ground.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/cocoa_bean_roasted.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/egg_boiled.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/fish_stick.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/fish_stick_raw.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/flour.png (100%) create mode 100644 src/main/resources/assets/tm-morefood/textures/items/french_fries.png create mode 100644 src/main/resources/assets/tm-morefood/textures/items/french_fries_raw.png rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/milk_bottle.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/sandwich_chicken.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/sandwich_fish.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/sandwich_porkchop.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/sandwich_schnitzel.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/schnitzel.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/schnitzel_raw.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/strawberry.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/strawberry_chocolate.png (100%) rename src/main/resources/assets/{morefood => tm-morefood}/textures/items/strawberry_chocolate_coated.png (100%) diff --git a/build.gradle b/build.gradle index 5213bb8..d56975b 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.4" +version = "1.0.0" group = "io.teammion.morefood" archivesBaseName = "tm-morefood" diff --git a/package.json b/package.json index 168f36b..57c3a9c 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/main/java/io/teammion/morefood/Items.java b/src/main/java/io/teammion/morefood/Items.java index c09c47b..a931462 100644 --- a/src/main/java/io/teammion/morefood/Items.java +++ b/src/main/java/io/teammion/morefood/Items.java @@ -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() { @@ -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() @@ -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); } } diff --git a/src/main/java/io/teammion/morefood/Registry.java b/src/main/java/io/teammion/morefood/Registry.java index 52fc82d..53ac993 100644 --- a/src/main/java/io/teammion/morefood/Registry.java +++ b/src/main/java/io/teammion/morefood/Registry.java @@ -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" ) ); } diff --git a/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java b/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java index 766ad22..7e4e35d 100644 --- a/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java +++ b/src/main/java/io/teammion/morefood/recipes/ShapelessRecipes.java @@ -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 + ); } } diff --git a/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java b/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java index 670feda..db28c15 100644 --- a/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java +++ b/src/main/java/io/teammion/morefood/recipes/SmeltingRecipes.java @@ -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) + ); } } diff --git a/src/main/resources/assets/morefood/models/item/apple_chocolate.json b/src/main/resources/assets/morefood/models/item/apple_chocolate.json deleted file mode 100644 index cddbf03..0000000 --- a/src/main/resources/assets/morefood/models/item/apple_chocolate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/apple_chocolate" - } -} diff --git a/src/main/resources/assets/morefood/models/item/apple_chocolate_coated.json b/src/main/resources/assets/morefood/models/item/apple_chocolate_coated.json deleted file mode 100644 index 5ec322e..0000000 --- a/src/main/resources/assets/morefood/models/item/apple_chocolate_coated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/apple_chocolate_coated" - } -} diff --git a/src/main/resources/assets/morefood/models/item/bread_slice.json b/src/main/resources/assets/morefood/models/item/bread_slice.json deleted file mode 100644 index cfc01f8..0000000 --- a/src/main/resources/assets/morefood/models/item/bread_slice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/bread_slice" - } -} diff --git a/src/main/resources/assets/morefood/models/item/chocolate.json b/src/main/resources/assets/morefood/models/item/chocolate.json deleted file mode 100644 index 578f34f..0000000 --- a/src/main/resources/assets/morefood/models/item/chocolate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/chocolate" - } -} diff --git a/src/main/resources/assets/morefood/models/item/chocolate_drink.json b/src/main/resources/assets/morefood/models/item/chocolate_drink.json deleted file mode 100644 index 429ea7a..0000000 --- a/src/main/resources/assets/morefood/models/item/chocolate_drink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/chocolate_drink" - } -} diff --git a/src/main/resources/assets/morefood/models/item/chocolate_piece.json b/src/main/resources/assets/morefood/models/item/chocolate_piece.json deleted file mode 100644 index 7b9230f..0000000 --- a/src/main/resources/assets/morefood/models/item/chocolate_piece.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/chocolate_piece" - } -} diff --git a/src/main/resources/assets/morefood/models/item/cocoa_bean_ground.json b/src/main/resources/assets/morefood/models/item/cocoa_bean_ground.json deleted file mode 100644 index b2a24f4..0000000 --- a/src/main/resources/assets/morefood/models/item/cocoa_bean_ground.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/cocoa_bean_ground" - } -} diff --git a/src/main/resources/assets/morefood/models/item/cocoa_bean_roasted.json b/src/main/resources/assets/morefood/models/item/cocoa_bean_roasted.json deleted file mode 100644 index c431b2c..0000000 --- a/src/main/resources/assets/morefood/models/item/cocoa_bean_roasted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/cocoa_bean_roasted" - } -} diff --git a/src/main/resources/assets/morefood/models/item/egg_boiled.json b/src/main/resources/assets/morefood/models/item/egg_boiled.json deleted file mode 100644 index 8ebdf76..0000000 --- a/src/main/resources/assets/morefood/models/item/egg_boiled.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/egg_boiled" - } -} diff --git a/src/main/resources/assets/morefood/models/item/fish_stick.json b/src/main/resources/assets/morefood/models/item/fish_stick.json deleted file mode 100644 index 413851d..0000000 --- a/src/main/resources/assets/morefood/models/item/fish_stick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index d33c5c0..0000000 --- a/src/main/resources/assets/morefood/models/item/fish_stick_raw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/fish_stick_raw" - } -} diff --git a/src/main/resources/assets/morefood/models/item/flour.json b/src/main/resources/assets/morefood/models/item/flour.json deleted file mode 100644 index a4dd139..0000000 --- a/src/main/resources/assets/morefood/models/item/flour.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/flour" - } -} diff --git a/src/main/resources/assets/morefood/models/item/milk_bottle.json b/src/main/resources/assets/morefood/models/item/milk_bottle.json deleted file mode 100644 index e589d6d..0000000 --- a/src/main/resources/assets/morefood/models/item/milk_bottle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/milk_bottle" - } -} diff --git a/src/main/resources/assets/morefood/models/item/sandwich_chicken.json b/src/main/resources/assets/morefood/models/item/sandwich_chicken.json deleted file mode 100644 index b83f8aa..0000000 --- a/src/main/resources/assets/morefood/models/item/sandwich_chicken.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/sandwich_chicken" - } -} diff --git a/src/main/resources/assets/morefood/models/item/sandwich_fish.json b/src/main/resources/assets/morefood/models/item/sandwich_fish.json deleted file mode 100644 index 00de8ab..0000000 --- a/src/main/resources/assets/morefood/models/item/sandwich_fish.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/sandwich_fish" - } -} diff --git a/src/main/resources/assets/morefood/models/item/sandwich_porkchop.json b/src/main/resources/assets/morefood/models/item/sandwich_porkchop.json deleted file mode 100644 index b662af1..0000000 --- a/src/main/resources/assets/morefood/models/item/sandwich_porkchop.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/sandwich_porkchop" - } -} diff --git a/src/main/resources/assets/morefood/models/item/sandwich_schnitzel.json b/src/main/resources/assets/morefood/models/item/sandwich_schnitzel.json deleted file mode 100644 index 7bcd1e3..0000000 --- a/src/main/resources/assets/morefood/models/item/sandwich_schnitzel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/sandwich_schnitzel" - } -} diff --git a/src/main/resources/assets/morefood/models/item/schnitzel.json b/src/main/resources/assets/morefood/models/item/schnitzel.json deleted file mode 100644 index bf6addd..0000000 --- a/src/main/resources/assets/morefood/models/item/schnitzel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/schnitzel" - } -} diff --git a/src/main/resources/assets/morefood/models/item/schnitzel_raw.json b/src/main/resources/assets/morefood/models/item/schnitzel_raw.json deleted file mode 100644 index 8eeaaf5..0000000 --- a/src/main/resources/assets/morefood/models/item/schnitzel_raw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/schnitzel_raw" - } -} diff --git a/src/main/resources/assets/morefood/models/item/strawberry.json b/src/main/resources/assets/morefood/models/item/strawberry.json deleted file mode 100644 index fb34d19..0000000 --- a/src/main/resources/assets/morefood/models/item/strawberry.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/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 deleted file mode 100644 index 68503ab..0000000 --- a/src/main/resources/assets/morefood/models/item/strawberry_chocolate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 12eafff..0000000 --- a/src/main/resources/assets/morefood/models/item/strawberry_chocolate_coated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "morefood:item/_default", - "textures": { - "layer0": "morefood:items/strawberry_chocolate_coated" - } -} diff --git a/src/main/resources/assets/morefood/lang/en_US.lang b/src/main/resources/assets/tm-morefood/lang/en_US.lang similarity index 92% rename from src/main/resources/assets/morefood/lang/en_US.lang rename to src/main/resources/assets/tm-morefood/lang/en_US.lang index 115c1fc..df04d62 100644 --- a/src/main/resources/assets/morefood/lang/en_US.lang +++ b/src/main/resources/assets/tm-morefood/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/morefood/models/item/_default.json b/src/main/resources/assets/tm-morefood/models/item/_default.json similarity index 100% rename from src/main/resources/assets/morefood/models/item/_default.json rename to src/main/resources/assets/tm-morefood/models/item/_default.json diff --git a/src/main/resources/assets/tm-morefood/models/item/apple_chocolate.json b/src/main/resources/assets/tm-morefood/models/item/apple_chocolate.json new file mode 100644 index 0000000..c97ab86 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/apple_chocolate.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/apple_chocolate" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/apple_chocolate_coated.json b/src/main/resources/assets/tm-morefood/models/item/apple_chocolate_coated.json new file mode 100644 index 0000000..649e127 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/apple_chocolate_coated.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/apple_chocolate_coated" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/bread_slice.json b/src/main/resources/assets/tm-morefood/models/item/bread_slice.json new file mode 100644 index 0000000..e9c03f9 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/bread_slice.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/bread_slice" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/chocolate.json b/src/main/resources/assets/tm-morefood/models/item/chocolate.json new file mode 100644 index 0000000..684d7d0 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/chocolate.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/chocolate" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/chocolate_drink.json b/src/main/resources/assets/tm-morefood/models/item/chocolate_drink.json new file mode 100644 index 0000000..1d2d1ab --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/chocolate_drink.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/chocolate_drink" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/chocolate_piece.json b/src/main/resources/assets/tm-morefood/models/item/chocolate_piece.json new file mode 100644 index 0000000..85b0ee2 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/chocolate_piece.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/chocolate_piece" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/cocoa_bean_ground.json b/src/main/resources/assets/tm-morefood/models/item/cocoa_bean_ground.json new file mode 100644 index 0000000..183f9c3 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/cocoa_bean_ground.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/cocoa_bean_ground" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/cocoa_bean_roasted.json b/src/main/resources/assets/tm-morefood/models/item/cocoa_bean_roasted.json new file mode 100644 index 0000000..05bcf8a --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/cocoa_bean_roasted.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/cocoa_bean_roasted" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/egg_boiled.json b/src/main/resources/assets/tm-morefood/models/item/egg_boiled.json new file mode 100644 index 0000000..c8ed66b --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/egg_boiled.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/egg_boiled" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/fish_stick.json b/src/main/resources/assets/tm-morefood/models/item/fish_stick.json new file mode 100644 index 0000000..3685f2b --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/fish_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/fish_stick" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/fish_stick_raw.json b/src/main/resources/assets/tm-morefood/models/item/fish_stick_raw.json new file mode 100644 index 0000000..7232694 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/fish_stick_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/fish_stick_raw" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/flour.json b/src/main/resources/assets/tm-morefood/models/item/flour.json new file mode 100644 index 0000000..b2fff39 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/flour.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/flour" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/french_fries.json b/src/main/resources/assets/tm-morefood/models/item/french_fries.json new file mode 100644 index 0000000..88409fe --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/french_fries.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/french_fries" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/french_fries_raw.json b/src/main/resources/assets/tm-morefood/models/item/french_fries_raw.json new file mode 100644 index 0000000..363e1ba --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/french_fries_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/french_fries_raw" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/milk_bottle.json b/src/main/resources/assets/tm-morefood/models/item/milk_bottle.json new file mode 100644 index 0000000..8efc6a1 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/milk_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/milk_bottle" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/sandwich_chicken.json b/src/main/resources/assets/tm-morefood/models/item/sandwich_chicken.json new file mode 100644 index 0000000..b0e101f --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/sandwich_chicken.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/sandwich_chicken" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/sandwich_fish.json b/src/main/resources/assets/tm-morefood/models/item/sandwich_fish.json new file mode 100644 index 0000000..de058db --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/sandwich_fish.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/sandwich_fish" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/sandwich_porkchop.json b/src/main/resources/assets/tm-morefood/models/item/sandwich_porkchop.json new file mode 100644 index 0000000..07e5fcc --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/sandwich_porkchop.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/sandwich_porkchop" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/sandwich_schnitzel.json b/src/main/resources/assets/tm-morefood/models/item/sandwich_schnitzel.json new file mode 100644 index 0000000..a98c31b --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/sandwich_schnitzel.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/sandwich_schnitzel" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/schnitzel.json b/src/main/resources/assets/tm-morefood/models/item/schnitzel.json new file mode 100644 index 0000000..f8d23ec --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/schnitzel.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/schnitzel" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/schnitzel_raw.json b/src/main/resources/assets/tm-morefood/models/item/schnitzel_raw.json new file mode 100644 index 0000000..6e5bf58 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/schnitzel_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/schnitzel_raw" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/strawberry.json b/src/main/resources/assets/tm-morefood/models/item/strawberry.json new file mode 100644 index 0000000..7f4259e --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/strawberry.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/strawberry" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate.json b/src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate.json new file mode 100644 index 0000000..e366f5f --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/strawberry_chocolate" + } +} diff --git a/src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate_coated.json b/src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate_coated.json new file mode 100644 index 0000000..8d54884 --- /dev/null +++ b/src/main/resources/assets/tm-morefood/models/item/strawberry_chocolate_coated.json @@ -0,0 +1,6 @@ +{ + "parent": "tm-morefood:item/_default", + "textures": { + "layer0": "tm-morefood:items/strawberry_chocolate_coated" + } +} diff --git a/src/main/resources/assets/morefood/textures/items/apple_chocolate.png b/src/main/resources/assets/tm-morefood/textures/items/apple_chocolate.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/apple_chocolate.png rename to src/main/resources/assets/tm-morefood/textures/items/apple_chocolate.png diff --git a/src/main/resources/assets/morefood/textures/items/apple_chocolate_coated.png b/src/main/resources/assets/tm-morefood/textures/items/apple_chocolate_coated.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/apple_chocolate_coated.png rename to src/main/resources/assets/tm-morefood/textures/items/apple_chocolate_coated.png diff --git a/src/main/resources/assets/morefood/textures/items/bread_slice.png b/src/main/resources/assets/tm-morefood/textures/items/bread_slice.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/bread_slice.png rename to src/main/resources/assets/tm-morefood/textures/items/bread_slice.png diff --git a/src/main/resources/assets/morefood/textures/items/chocolate.png b/src/main/resources/assets/tm-morefood/textures/items/chocolate.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/chocolate.png rename to src/main/resources/assets/tm-morefood/textures/items/chocolate.png diff --git a/src/main/resources/assets/morefood/textures/items/chocolate_drink.png b/src/main/resources/assets/tm-morefood/textures/items/chocolate_drink.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/chocolate_drink.png rename to src/main/resources/assets/tm-morefood/textures/items/chocolate_drink.png diff --git a/src/main/resources/assets/morefood/textures/items/chocolate_piece.png b/src/main/resources/assets/tm-morefood/textures/items/chocolate_piece.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/chocolate_piece.png rename to src/main/resources/assets/tm-morefood/textures/items/chocolate_piece.png diff --git a/src/main/resources/assets/morefood/textures/items/cocoa_bean_ground.png b/src/main/resources/assets/tm-morefood/textures/items/cocoa_bean_ground.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/cocoa_bean_ground.png rename to src/main/resources/assets/tm-morefood/textures/items/cocoa_bean_ground.png diff --git a/src/main/resources/assets/morefood/textures/items/cocoa_bean_roasted.png b/src/main/resources/assets/tm-morefood/textures/items/cocoa_bean_roasted.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/cocoa_bean_roasted.png rename to src/main/resources/assets/tm-morefood/textures/items/cocoa_bean_roasted.png diff --git a/src/main/resources/assets/morefood/textures/items/egg_boiled.png b/src/main/resources/assets/tm-morefood/textures/items/egg_boiled.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/egg_boiled.png rename to src/main/resources/assets/tm-morefood/textures/items/egg_boiled.png diff --git a/src/main/resources/assets/morefood/textures/items/fish_stick.png b/src/main/resources/assets/tm-morefood/textures/items/fish_stick.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/fish_stick.png rename to src/main/resources/assets/tm-morefood/textures/items/fish_stick.png diff --git a/src/main/resources/assets/morefood/textures/items/fish_stick_raw.png b/src/main/resources/assets/tm-morefood/textures/items/fish_stick_raw.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/fish_stick_raw.png rename to src/main/resources/assets/tm-morefood/textures/items/fish_stick_raw.png diff --git a/src/main/resources/assets/morefood/textures/items/flour.png b/src/main/resources/assets/tm-morefood/textures/items/flour.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/flour.png rename to src/main/resources/assets/tm-morefood/textures/items/flour.png diff --git a/src/main/resources/assets/tm-morefood/textures/items/french_fries.png b/src/main/resources/assets/tm-morefood/textures/items/french_fries.png new file mode 100644 index 0000000000000000000000000000000000000000..392ccdb2d27d906159cdd225209439520963eddc GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqCmWxo#$S_1AR*bzkcblJ{M_8syb>Unfx)>bHL)Z$ zMWH;iBtya7(>EYRFO?lAzS7ghF~s6@a)QLp2Ok!`aC{`>Rx{~%SmdAdgoK0*JRj3j zfOJC2DwT5#Gu$*YQ`vx^E#3dUQAFDhV<8iU*=`__)fG@ETsPa|G)p+{}Xx#q`3_z9xG_owUpuk zD&^ttk561Nvxs?J#mP^bdm?xh!j0W@1h@=lF)-MwhRloWn*{car>mdKI;Vst01Rw! A%m4rY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tm-morefood/textures/items/french_fries_raw.png b/src/main/resources/assets/tm-morefood/textures/items/french_fries_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..25eb7f1d030b28d1fc734f0b73e5ffb3b1ec8841 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqCmWv`qlH}BZlI8CW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6kp=$;uvCa`t8JxyoU?~T<0q<^KcOkTylcV!oZ{J%t4l! z%}tIShuK6#G<;Kzod~pa+El2b;&M3u{r>g4>pxt7zck7D@>Qkr!{UvRqi1TU@*ZGR5(h^MQc%Q~lo FCIDV)aM1t& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/morefood/textures/items/milk_bottle.png b/src/main/resources/assets/tm-morefood/textures/items/milk_bottle.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/milk_bottle.png rename to src/main/resources/assets/tm-morefood/textures/items/milk_bottle.png diff --git a/src/main/resources/assets/morefood/textures/items/sandwich_chicken.png b/src/main/resources/assets/tm-morefood/textures/items/sandwich_chicken.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/sandwich_chicken.png rename to src/main/resources/assets/tm-morefood/textures/items/sandwich_chicken.png diff --git a/src/main/resources/assets/morefood/textures/items/sandwich_fish.png b/src/main/resources/assets/tm-morefood/textures/items/sandwich_fish.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/sandwich_fish.png rename to src/main/resources/assets/tm-morefood/textures/items/sandwich_fish.png diff --git a/src/main/resources/assets/morefood/textures/items/sandwich_porkchop.png b/src/main/resources/assets/tm-morefood/textures/items/sandwich_porkchop.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/sandwich_porkchop.png rename to src/main/resources/assets/tm-morefood/textures/items/sandwich_porkchop.png diff --git a/src/main/resources/assets/morefood/textures/items/sandwich_schnitzel.png b/src/main/resources/assets/tm-morefood/textures/items/sandwich_schnitzel.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/sandwich_schnitzel.png rename to src/main/resources/assets/tm-morefood/textures/items/sandwich_schnitzel.png diff --git a/src/main/resources/assets/morefood/textures/items/schnitzel.png b/src/main/resources/assets/tm-morefood/textures/items/schnitzel.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/schnitzel.png rename to src/main/resources/assets/tm-morefood/textures/items/schnitzel.png diff --git a/src/main/resources/assets/morefood/textures/items/schnitzel_raw.png b/src/main/resources/assets/tm-morefood/textures/items/schnitzel_raw.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/schnitzel_raw.png rename to src/main/resources/assets/tm-morefood/textures/items/schnitzel_raw.png diff --git a/src/main/resources/assets/morefood/textures/items/strawberry.png b/src/main/resources/assets/tm-morefood/textures/items/strawberry.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/strawberry.png rename to src/main/resources/assets/tm-morefood/textures/items/strawberry.png diff --git a/src/main/resources/assets/morefood/textures/items/strawberry_chocolate.png b/src/main/resources/assets/tm-morefood/textures/items/strawberry_chocolate.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/strawberry_chocolate.png rename to src/main/resources/assets/tm-morefood/textures/items/strawberry_chocolate.png diff --git a/src/main/resources/assets/morefood/textures/items/strawberry_chocolate_coated.png b/src/main/resources/assets/tm-morefood/textures/items/strawberry_chocolate_coated.png similarity index 100% rename from src/main/resources/assets/morefood/textures/items/strawberry_chocolate_coated.png rename to src/main/resources/assets/tm-morefood/textures/items/strawberry_chocolate_coated.png diff --git a/update.sh b/update.sh index 02df29e..fa20d11 100755 --- a/update.sh +++ b/update.sh @@ -18,10 +18,6 @@ sed -i "/$old_version/c\version = \"$version\"" build.gradle sed -i "/group/c\group = \"io.teammion.morefood\"" build.gradle sed -i "/archivesBaseName/c\archivesBaseName = \"$modid\"" build.gradle -# Update MoreFood.java -echo "Updating MoreFood.java..." -sed -i "/@Mod(/c\@Mod(modid = \"$modid\")" src/main/java/io/teammion/morefood/MoreFood.java - # Update mcmod.info echo "Updating mcmod.info..." sed -i "/modid/c\ \"modid\": \"$modid\"," src/main/resources/mcmod.info