Merge pull request baguchi#23 from YukkuriLaboratory/baguchi#21

baguchi#21 豆腐ステーキ、五平餅、赤いスープ

src/generated/resources/assets/tofucraft/models/item/crimson_soup.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tofucraft:item/crimson_soup"
+  }
+}

src/generated/resources/assets/tofucraft/models/item/goheimochi.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tofucraft:item/goheimochi"
+  }
+}

src/generated/resources/assets/tofucraft/models/item/tofusteak.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tofucraft:item/tofusteak"
+  }
+}

src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/campfire_cooking_tofusteak.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "tofucraft:tofuishi"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "tofucraft:campfire_cooking_tofusteak"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "tofucraft:campfire_cooking_tofusteak"
+    ]
+  }
+}

src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/crimson_soup.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "tofucraft:seeds_soybeans_nether"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "tofucraft:crimson_soup"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "tofucraft:crimson_soup"
+    ]
+  }
+}

src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/goheimochi.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "tofucraft:miso"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "tofucraft:goheimochi"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "tofucraft:goheimochi"
+    ]
+  }
+}

src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/smelting_tofusteak.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "tofucraft:tofuishi"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "tofucraft:smelting_tofusteak"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "tofucraft:smelting_tofusteak"
+    ]
+  }
+}

src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/smoking_tofusteak.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "tofucraft:tofuishi"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "tofucraft:smoking_tofusteak"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "tofucraft:smoking_tofusteak"
+    ]
+  }
+}

src/generated/resources/data/tofucraft/recipes/campfire_cooking_tofusteak.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:campfire_cooking",
+  "cookingtime": 600,
+  "experience": 0.1,
+  "ingredient": {
+    "item": "tofucraft:tofuishi"
+  },
+  "result": "tofucraft:tofusteak"
+}

src/generated/resources/data/tofucraft/recipes/crimson_soup.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "tofucraft:seeds_soybeans_nether"
+    },
+    {
+      "item": "tofucraft:seeds_soybeans_nether"
+    },
+    {
+      "item": "minecraft:crimson_fungus"
+    },
+    {
+      "item": "minecraft:bowl"
+    }
+  ],
+  "result": {
+    "item": "tofucraft:crimson_soup"
+  }
+}

src/generated/resources/data/tofucraft/recipes/goheimochi.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "key": {
+    "#": {
+      "item": "tofucraft:onigiri"
+    },
+    "M": {
+      "item": "tofucraft:miso"
+    },
+    "S": {
+      "item": "minecraft:stick"
+    }
+  },
+  "pattern": [
+    "#",
+    "M",
+    "S"
+  ],
+  "result": {
+    "item": "tofucraft:goheimochi"
+  }
+}

src/generated/resources/data/tofucraft/recipes/smelting_tofusteak.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smelting",
+  "cookingtime": 200,
+  "experience": 0.1,
+  "ingredient": {
+    "item": "tofucraft:tofuishi"
+  },
+  "result": "tofucraft:tofusteak"
+}

src/generated/resources/data/tofucraft/recipes/smoking_tofusteak.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smoking",
+  "cookingtime": 100,
+  "experience": 0.1,
+  "ingredient": {
+    "item": "tofucraft:tofuishi"
+  },
+  "result": "tofucraft:tofusteak"
+}

src/main/java/baguchan/tofucraft/data/CraftingGenerator.java

@@ -151,6 +151,7 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
 				.requires(Items.BOWL)
 				.unlockedBy("has_item", has(TofuItems.TOFUFRIED_POUCH.get()))
 				.save(consumer);
+		foodCooking(TofuItems.TOFUISHI, TofuItems.TOFU_STEAK, 0.1F, consumer);
 		ShapelessRecipeBuilder.shapeless(TofuItems.TOFU_MINCED.get(), 1)
 				.requires(TofuItems.TOFUMOMEN.get())
 				.requires(TofuItems.ROLLINGPIN.get())
@@ -507,6 +508,13 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
 				.requires(TofuTags.Items.RICE)
 				.unlockedBy("has_item", has(TofuItems.KINAKO.get()))
 				.save(consumer);
+
+		ShapelessRecipeBuilder.shapeless(TofuItems.CRIMSON_SOUP.get(), 1)
+				.requires(TofuItems.SEEDS_SOYBEANS_NETHER.get(), 2)
+				.requires(Items.CRIMSON_FUNGUS)
+				.requires(Items.BOWL)
+				.unlockedBy("has_item", has(TofuItems.SEEDS_SOYBEANS_NETHER.get()))
+				.save(consumer);
 		ShapelessRecipeBuilder.shapeless(TofuItems.ZUNDA_MOCHI.get(), 1)
 				.requires(TofuItems.ZUNDA.get())
 				.requires(TofuTags.Items.RICE)
@@ -559,6 +567,15 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
 				.requires(TofuItems.LEEK.get())
 				.unlockedBy("has_item", has(TofuItems.TOFU_MINCED.get()))
 				.save(consumer);
+		ShapedRecipeBuilder.shaped(TofuItems.GOHEIMOCHI.get())
+				.pattern("#")
+				.pattern("M")
+				.pattern("S")
+				.define('#', TofuItems.ONIGIRI.get())
+				.define('M', TofuItems.MISO.get())
+				.define('S', Items.STICK)
+				.unlockedBy("has_item", has(TofuItems.MISO.get()))
+				.save(consumer);
 
 		ShapelessRecipeBuilder.shapeless(TofuItems.SOY_CHOCOLATE.get(), 6)
 				.requires(TofuItems.BUCKET_SOYMILK.get())

src/main/java/baguchan/tofucraft/data/ItemModelGenerator.java

@@ -141,6 +141,7 @@ protected void registerModels() {
 		singleTex(TofuItems.TOFUFRIED.get());
 		singleTex(TofuItems.TOFUFRIED_POUCH.get());
 		singleTex(TofuItems.AGEDASHI_TOFU.get());
+		singleTex(TofuItems.TOFU_STEAK.get());
 		singleTex(TofuItems.TOFU_MINCED.get());
 
 		singleTex(TofuItems.BITTERN_BOTTLE.get());
@@ -209,6 +210,7 @@ protected void registerModels() {
 		singleTex(TofuItems.SOUL_MANJU.get());
 
 		singleTex(TofuItems.KINAKO_MOCHI.get());
+		singleTex(TofuItems.CRIMSON_SOUP.get());
 		singleTex(TofuItems.ZUNDA_MOCHI.get());
 
 		singleTex(TofuItems.ONIGIRI.get());
@@ -220,6 +222,7 @@ protected void registerModels() {
 		singleTex(TofuItems.RICE_NATTO_LEEK.get());
 		singleTex(TofuItems.RICE_TOFU.get());
 		singleTex(TofuItems.RICE_SOBORO_TOFU.get());
+		singleTex(TofuItems.GOHEIMOCHI.get());
 
 		singleTex(TofuItems.SOY_CHOCOLATE.get());
 		singleTex(TofuItems.TOFUNIAN_SOY_CHOCOLATE.get());

src/main/java/baguchan/tofucraft/item/StickFoodItem.java

@@ -0,0 +1,22 @@
+package baguchan.tofucraft.item;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
+
+public class StickFoodItem extends Item {
+	public StickFoodItem(Item.Properties properties) {
+		super(properties);
+	}
+
+	@Override
+	public ItemStack finishUsingItem(ItemStack p_41409_, Level p_41410_, LivingEntity p_41411_) {
+		if (this.isEdible()) {
+			p_41411_.eat(p_41410_, p_41409_);
+			return new ItemStack(Items.STICK);
+		}
+		return super.finishUsingItem(p_41409_, p_41410_, p_41411_);
+	}
+}