diff --git a/src/java/mmm/food/FCookableMeal.java b/src/java/mmm/food/FCookableMeal.java index f5e9b42..07cc909 100644 --- a/src/java/mmm/food/FCookableMeal.java +++ b/src/java/mmm/food/FCookableMeal.java @@ -29,11 +29,11 @@ public class FCookableMeal if ( dangerous ) { this.RAW.setPotionEffect( new PotionEffect( MobEffects.HUNGER , 600 , 0 ) , .3f ); } - CRegistry.setIdentifiers( this.RAW , "food" , "meals" , name , "raw" ); + CRegistry.setIdentifiers( this.RAW , "food" , "meal" , name , "raw" ); CRegistry.addItem( this.RAW ); this.COOKED = new ItemFood( amount , saturation , wolfLikes ); - CRegistry.setIdentifiers( this.COOKED , "food" , "meals" , name , "cooked" ); + CRegistry.setIdentifiers( this.COOKED , "food" , "meal" , name , "cooked" ); CRegistry.addItem( this.COOKED ); this.quantity = quantity; @@ -54,7 +54,7 @@ public class FCookableMeal this.recipe = null; } - GameRegistry.addSmelting( this.RAW , new ItemStack( this.COOKED ) , 0.35f ); + GameRegistry.addSmelting( this.RAW , new ItemStack( this.COOKED ) , 0.15f ); } } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index f2b7041..971b3ec 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -144,8 +144,8 @@ item.mmm.food.milk.pig.name=Pig milk item.mmm.food.milk.horse.name=Horse milk item.mmm.food.milk.donkey.name=Donkey milk -item.mmm.food.meals.sausage.raw.name=Raw Sausage -item.mmm.food.meals.sausage.cooked.name=Sausage +item.mmm.food.meal.sausage.raw.name=Raw Sausage +item.mmm.food.meal.sausage.cooked.name=Sausage tile.mmm.deco.smoothstone.limestone.name=Polished Limestone diff --git a/src/resources/assets/mmm/models/item/food/meals/sausage/cooked.json b/src/resources/assets/mmm/models/item/food/meal/sausage/cooked.json similarity index 54% rename from src/resources/assets/mmm/models/item/food/meals/sausage/cooked.json rename to src/resources/assets/mmm/models/item/food/meal/sausage/cooked.json index 450ac4f..e56de9c 100644 --- a/src/resources/assets/mmm/models/item/food/meals/sausage/cooked.json +++ b/src/resources/assets/mmm/models/item/food/meal/sausage/cooked.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/food/meals/sausage/cooked" + "layer0": "mmm:items/food/meal/sausage/cooked" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/food/meals/sausage/raw.json b/src/resources/assets/mmm/models/item/food/meal/sausage/raw.json similarity index 55% rename from src/resources/assets/mmm/models/item/food/meals/sausage/raw.json rename to src/resources/assets/mmm/models/item/food/meal/sausage/raw.json index a19d2b2..41aea0a 100644 --- a/src/resources/assets/mmm/models/item/food/meals/sausage/raw.json +++ b/src/resources/assets/mmm/models/item/food/meal/sausage/raw.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/food/meals/sausage/raw" + "layer0": "mmm:items/food/meal/sausage/raw" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/food/meals/sausage/cooked.png b/src/resources/assets/mmm/textures/items/food/meal/sausage/cooked.png similarity index 100% rename from src/resources/assets/mmm/textures/items/food/meals/sausage/cooked.png rename to src/resources/assets/mmm/textures/items/food/meal/sausage/cooked.png diff --git a/src/resources/assets/mmm/textures/items/food/meals/sausage/raw.png b/src/resources/assets/mmm/textures/items/food/meal/sausage/raw.png similarity index 100% rename from src/resources/assets/mmm/textures/items/food/meals/sausage/raw.png rename to src/resources/assets/mmm/textures/items/food/meal/sausage/raw.png