Merge pull request baguchi#26 from YukkuriLaboratory/baguchi#24

baguchi#24 肉巻き湯葉、豆腐ソーメン、おあげ

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tofucraft:bottle_dashi"
+              "tofucraft:bottle_soyoil"
             ]
           }
         ]

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

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

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

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

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

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "minecraft:cooked_chicken"
+    },
+    {
+      "item": "tofucraft:yuba"
+    }
+  ],
+  "result": {
+    "item": "tofucraft:meatwrapped_yuba"
+  }
+}

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

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "tofucraft:tofuslab_momen"
+    },
+    {
+      "item": "tofucraft:bottle_soyoil"
+    }
+  ],
+  "result": {
+    "count": 4,
+    "item": "tofucraft:oage"
+  }
+}

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

@@ -10,7 +10,7 @@
       }
     ],
     {
-      "item": "tofucraft:bottle_dashi"
+      "item": "tofucraft:bottle_soyoil"
     }
   ],
   "result": {

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

@@ -5,7 +5,7 @@
       "item": "tofucraft:starch"
     },
     {
-      "item": "tofucraft:bottle_dashi"
+      "item": "tofucraft:bottle_soyoil"
     },
     [
       {

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

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "tofucraft:tofukinu"
+    },
+    {
+      "item": "tofucraft:rollingpin"
+    },
+    {
+      "item": "tofucraft:salt"
+    },
+    {
+      "item": "tofucraft:starch"
+    }
+  ],
+  "result": {
+    "count": 4,
+    "item": "tofucraft:tofusomen"
+  }
+}

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "tofucraft:tofusomen"
+    },
+    {
+      "item": "tofucraft:glassbowl"
+    },
+    {
+      "item": "tofucraft:bottle_soysause"
+    },
+    {
+      "item": "tofucraft:bottle_dashi"
+    }
+  ],
+  "result": {
+    "item": "tofucraft:tofusomenbowl_glass"
+  }
+}

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

@@ -133,13 +133,13 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
 
 		ShapelessRecipeBuilder.shapeless(TofuItems.TOFUFRIED.get(), 1)
 				.requires(Ingredient.of(TofuItems.TOFUKINU.get(), TofuItems.TOFUMOMEN.get()))
-				.requires(TofuItems.BOTTLE_DASHI.get())
-				.unlockedBy("has_item", has(TofuItems.BOTTLE_DASHI.get()))
+				.requires(TofuItems.BOTTLE_SOYOIL.get())
+				.unlockedBy("has_item", has(TofuItems.BOTTLE_SOYOIL.get()))
 				.save(consumer);
 
 		ShapelessRecipeBuilder.shapeless(TofuItems.TOFUFRIED_POUCH.get(), 1)
 				.requires(TofuItems.STARCH.get())
-				.requires(TofuItems.BOTTLE_DASHI.get())
+				.requires(TofuItems.BOTTLE_SOYOIL.get())
 				.requires(Ingredient.of(TofuItems.TOFUKINU.get(), TofuItems.TOFUMOMEN.get()))
 				.unlockedBy("has_item", has(TofuItems.STARCH.get()))
 				.save(consumer);
@@ -151,7 +151,15 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
 				.requires(Items.BOWL)
 				.unlockedBy("has_item", has(TofuItems.TOFUFRIED_POUCH.get()))
 				.save(consumer);
+
+		ShapelessRecipeBuilder.shapeless(TofuItems.OAGE.get(), 4)
+				.requires(TofuBlocks.TOFUSLAB_MOMEN.get())
+				.requires(TofuItems.BOTTLE_SOYOIL.get())
+				.unlockedBy("has_item", has(TofuItems.BOTTLE_SOYOIL.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())
@@ -414,6 +422,12 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
 				.unlockedBy("has_item", has(TofuItems.TOFUKINU.get()))
 				.save(consumer);
 
+		ShapelessRecipeBuilder.shapeless(TofuItems.MEAT_WRAPPED_YUBA.get())
+				.requires(Items.COOKED_CHICKEN)
+				.requires(TofuItems.YUBA.get())
+				.unlockedBy("has_item", has(TofuItems.YUBA.get()))
+				.save(consumer);
+
 		ShapelessRecipeBuilder.shapeless(TofuItems.SOYSTICK.get())
 				.requires(TofuTags.Items.SOYBEAN)
 				.requires(Items.WHEAT)
@@ -657,6 +671,21 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
 				.define('#', Items.GLASS_PANE)
 				.unlockedBy("has_item", has(Items.GLASS))
 				.save(consumer);
+
+    ShapelessRecipeBuilder.shapeless(TofuItems.TOFUSOMEN.get(), 4)
+				.requires(TofuItems.TOFUKINU.get())
+				.requires(TofuItems.ROLLINGPIN.get())
+				.requires(TofuItems.SALT.get())
+				.requires(TofuItems.STARCH.get())
+				.unlockedBy("has_item", has(TofuItems.ROLLINGPIN.get()))
+				.save(consumer);
+		ShapelessRecipeBuilder.shapeless(TofuItems.TOFUSOMENBOWL_GLASS.get(), 1)
+				.requires(TofuItems.TOFUSOMEN.get())
+				.requires(TofuItems.GLASSBOWL.get())
+				.requires(TofuItems.BOTTLE_SOYSAUSE.get())
+				.requires(TofuItems.BOTTLE_DASHI.get())
+				.unlockedBy("has_item", has(TofuItems.TOFUSOMEN.get()))
+				.save(consumer);
 
 		ShapelessRecipeBuilder.shapeless(TofuItems.HIYAYAKKO_GLASS.get(), 1)
 				.requires(TofuItems.TOFUKINU.get())

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

@@ -148,6 +148,7 @@ protected void registerModels() {
 		singleTex(TofuItems.TOFUFRIED_POUCH.get());
 		singleTex(TofuItems.AGEDASHI_TOFU.get());
 		singleTex(TofuItems.TOFU_STEAK.get());
+		singleTex(TofuItems.OAGE.get());
 		singleTex(TofuItems.TOFU_MINCED.get());
 
 		singleTex(TofuItems.TOFUANNIN.get());
@@ -199,6 +200,7 @@ protected void registerModels() {
 
 		singleTex(TofuItems.TOFUCOOKIE.get());
 		singleTex(TofuItems.TTTBURGER.get());
+		singleTex(TofuItems.MEAT_WRAPPED_YUBA.get());
 		singleTex(TofuItems.SOYSTICK.get());
 		singleTex(TofuItems.SALTYMELON.get());
 
@@ -250,6 +252,10 @@ protected void registerModels() {
 		singleTex(TofuItems.TOFUFISH_SOYMILK_BUCKET.get());
 
 		singleTex(TofuItems.GLASSBOWL.get());
+
+		singleTex(TofuItems.TOFUSOMEN.get());
+		singleTex(TofuItems.TOFUSOMENBOWL_GLASS.get());
+
 		singleTex(TofuItems.HIYAYAKKO_GLASS.get());
 		singleTex(TofuItems.NATTOHIYAYAKKO_GLASS.get());
 
@@ -329,6 +335,7 @@ protected void registerModels() {
 		singleTex(TofuItems.EDAMAME_RICE.get());
 
 		singleTex(TofuItems.BOTTLE_DASHI.get());
+		singleTex(TofuItems.BOTTLE_SOYOIL.get());
 		singleTex(TofuItems.TOFUEGG.get());
 		singleTex(TofuItems.SOYSAUSE_RAMEN.get());
 		singleTex(TofuItems.SOY_CHEESE.get());

src/main/java/baguchan/tofucraft/event/TofuVillagerTradeEvent.java

@@ -59,6 +59,7 @@ public static void wanderTradeEvent(VillagerTradesEvent event) {
 			trades4.add(new ItemsForEmeralds(TofuItems.SOYMILK_TEA.get(), 1, 3, 6, 16));
 
 			trades5.add(new ItemsForEmeralds(TofuBlocks.MORIJIO.get(), 10, 2, 6, 20));
+			trades5.add(new ItemsForEmeralds(TofuItems.BOTTLE_SOYOIL.get(), 4, 3, 8, 20));
 		}
 	}