diff --git a/src/generated/resources/assets/tofucraft/models/item/bottle_soyoil.json b/src/generated/resources/assets/tofucraft/models/item/bottle_soyoil.json new file mode 100644 index 000000000..649c5546a --- /dev/null +++ b/src/generated/resources/assets/tofucraft/models/item/bottle_soyoil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tofucraft:item/bottle_soyoil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tofucraft/models/item/meatwrapped_yuba.json b/src/generated/resources/assets/tofucraft/models/item/meatwrapped_yuba.json new file mode 100644 index 000000000..1224936a4 --- /dev/null +++ b/src/generated/resources/assets/tofucraft/models/item/meatwrapped_yuba.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tofucraft:item/meatwrapped_yuba" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tofucraft/models/item/oage.json b/src/generated/resources/assets/tofucraft/models/item/oage.json new file mode 100644 index 000000000..b5347a4a1 --- /dev/null +++ b/src/generated/resources/assets/tofucraft/models/item/oage.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tofucraft:item/oage" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tofucraft/models/item/tofusomen.json b/src/generated/resources/assets/tofucraft/models/item/tofusomen.json new file mode 100644 index 000000000..e5fb689e4 --- /dev/null +++ b/src/generated/resources/assets/tofucraft/models/item/tofusomen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tofucraft:item/tofusomen" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tofucraft/models/item/tofusomenbowl_glass.json b/src/generated/resources/assets/tofucraft/models/item/tofusomenbowl_glass.json new file mode 100644 index 000000000..61a99c7db --- /dev/null +++ b/src/generated/resources/assets/tofucraft/models/item/tofusomenbowl_glass.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tofucraft:item/tofusomenbowl_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/meatwrapped_yuba.json b/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/meatwrapped_yuba.json new file mode 100644 index 000000000..4ed7bc818 --- /dev/null +++ b/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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/oage.json b/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/oage.json new file mode 100644 index 000000000..451074b37 --- /dev/null +++ b/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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofufried.json b/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofufried.json index 93e895463..887489677 100644 --- a/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofufried.json +++ b/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofufried.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "tofucraft:bottle_dashi" + "tofucraft:bottle_soyoil" ] } ] diff --git a/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofusomen.json b/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofusomen.json new file mode 100644 index 000000000..79995a539 --- /dev/null +++ b/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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofusomenbowl_glass.json b/src/generated/resources/data/tofucraft/advancements/recipes/tofucraft/tofusomenbowl_glass.json new file mode 100644 index 000000000..bef8a3867 --- /dev/null +++ b/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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/recipes/meatwrapped_yuba.json b/src/generated/resources/data/tofucraft/recipes/meatwrapped_yuba.json new file mode 100644 index 000000000..8b5e3c92c --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/recipes/oage.json b/src/generated/resources/data/tofucraft/recipes/oage.json new file mode 100644 index 000000000..1f7bdae82 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/recipes/tofufried.json b/src/generated/resources/data/tofucraft/recipes/tofufried.json index d01941f05..08bac8ff7 100644 --- a/src/generated/resources/data/tofucraft/recipes/tofufried.json +++ b/src/generated/resources/data/tofucraft/recipes/tofufried.json @@ -10,7 +10,7 @@ } ], { - "item": "tofucraft:bottle_dashi" + "item": "tofucraft:bottle_soyoil" } ], "result": { diff --git a/src/generated/resources/data/tofucraft/recipes/tofufried_pouch.json b/src/generated/resources/data/tofucraft/recipes/tofufried_pouch.json index 89c275a14..2ad125ac1 100644 --- a/src/generated/resources/data/tofucraft/recipes/tofufried_pouch.json +++ b/src/generated/resources/data/tofucraft/recipes/tofufried_pouch.json @@ -5,7 +5,7 @@ "item": "tofucraft:starch" }, { - "item": "tofucraft:bottle_dashi" + "item": "tofucraft:bottle_soyoil" }, [ { diff --git a/src/generated/resources/data/tofucraft/recipes/tofusomen.json b/src/generated/resources/data/tofucraft/recipes/tofusomen.json new file mode 100644 index 000000000..be22bf4f0 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tofucraft/recipes/tofusomenbowl_glass.json b/src/generated/resources/data/tofucraft/recipes/tofusomenbowl_glass.json new file mode 100644 index 000000000..76c7e6294 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/java/baguchan/tofucraft/data/CraftingGenerator.java b/src/main/java/baguchan/tofucraft/data/CraftingGenerator.java index a83b983bf..edb317410 100644 --- a/src/main/java/baguchan/tofucraft/data/CraftingGenerator.java +++ b/src/main/java/baguchan/tofucraft/data/CraftingGenerator.java @@ -133,13 +133,13 @@ protected void buildCraftingRecipes(Consumer 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 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 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 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()) diff --git a/src/main/java/baguchan/tofucraft/data/ItemModelGenerator.java b/src/main/java/baguchan/tofucraft/data/ItemModelGenerator.java index 9f4c0ad57..9611df1a5 100644 --- a/src/main/java/baguchan/tofucraft/data/ItemModelGenerator.java +++ b/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()); diff --git a/src/main/java/baguchan/tofucraft/event/TofuVillagerTradeEvent.java b/src/main/java/baguchan/tofucraft/event/TofuVillagerTradeEvent.java index d1d4f3fec..3fed0a980 100644 --- a/src/main/java/baguchan/tofucraft/event/TofuVillagerTradeEvent.java +++ b/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)); } } diff --git a/src/main/java/baguchan/tofucraft/item/RollingPinItem.java b/src/main/java/baguchan/tofucraft/item/RollingPinItem.java new file mode 100644 index 000000000..f76671261 --- /dev/null +++ b/src/main/java/baguchan/tofucraft/item/RollingPinItem.java @@ -0,0 +1,21 @@ +package baguchan.tofucraft.item; + +import baguchan.tofucraft.registry.TofuItems; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +public class RollingPinItem extends Item { + public RollingPinItem(Item.Properties properties) { + super(properties); + } + + @Override + public ItemStack getCraftingRemainingItem(ItemStack itemStack) { + return new ItemStack(TofuItems.ROLLINGPIN.get()); + } + + @Override + public boolean hasCraftingRemainingItem(ItemStack stack) { + return true; + } +} diff --git a/src/main/java/baguchan/tofucraft/item/StackableGlassBowlItem.java b/src/main/java/baguchan/tofucraft/item/StackableGlassBowlItem.java new file mode 100644 index 000000000..359e4e8c1 --- /dev/null +++ b/src/main/java/baguchan/tofucraft/item/StackableGlassBowlItem.java @@ -0,0 +1,48 @@ +package baguchan.tofucraft.item; + +import baguchan.tofucraft.registry.TofuItems; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.stats.Stats; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.Level; + +public class StackableGlassBowlItem extends Item { + public StackableGlassBowlItem(Properties properties) { + super(properties); + } + + @Override + public ItemStack finishUsingItem(ItemStack p_41409_, Level p_41410_, LivingEntity p_41411_) { + super.finishUsingItem(p_41409_, p_41410_, p_41411_); + if (p_41411_ instanceof ServerPlayer) { + ServerPlayer serverplayerentity = (ServerPlayer) p_41411_; + CriteriaTriggers.CONSUME_ITEM.trigger(serverplayerentity, p_41409_); + serverplayerentity.awardStat(Stats.ITEM_USED.get(this)); + } + if (p_41411_ instanceof Player && !((Player) p_41411_).getAbilities().instabuild) { + p_41409_.shrink(1); + } + + if (p_41409_.isEmpty()) + return new ItemStack(TofuItems.GLASSBOWL.get()); + if (p_41411_ instanceof Player && !((Player) p_41411_).getAbilities().instabuild) { + ItemStack itemstack = new ItemStack(TofuItems.GLASSBOWL.get()); + Player playerentity = (Player) p_41411_; + if (!playerentity.getInventory().add(itemstack)) { + playerentity.drop(itemstack, false); + } + } + return p_41409_; + } + + @Override + public UseAnim getUseAnimation(ItemStack p_41452_) { + return UseAnim.EAT; + } +} + diff --git a/src/main/java/baguchan/tofucraft/registry/TofuFoods.java b/src/main/java/baguchan/tofucraft/registry/TofuFoods.java index 5a544cb0f..b454fe7ed 100644 --- a/src/main/java/baguchan/tofucraft/registry/TofuFoods.java +++ b/src/main/java/baguchan/tofucraft/registry/TofuFoods.java @@ -10,6 +10,7 @@ public class TofuFoods { public static final FoodProperties ISHITOFU = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).fast().build(); public static final FoodProperties TOFUSTEAK = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.6F).fast().build(); + public static final FoodProperties OAGE = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).fast().build(); public static final FoodProperties TOFUHELL = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).alwaysEat().effect(() -> new MobEffectInstance(MobEffects.FIRE_RESISTANCE, 600), 1.0F).build(); public static final FoodProperties TOFUSOUL = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).fast().effect(() -> new MobEffectInstance(MobEffects.ABSORPTION, 1200), 1.0F).build(); @@ -33,6 +34,8 @@ public class TofuFoods { public static final FoodProperties TOFUCOOKIE = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).build(); public static final FoodProperties TTTBURGER = (new FoodProperties.Builder()).nutrition(9).saturationMod(0.85F).build(); + public static final FoodProperties MEAT_WRAPPED_YUBA = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.825F).build(); + public static final FoodProperties SOYSTICK = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.6F).fast().build(); @@ -73,6 +76,8 @@ public class TofuFoods { public static final FoodProperties YUDOFU = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).fast().build(); public static final FoodProperties EDAMAME_RICE = stew(5).build(); + public static final FoodProperties TOFUSOMEN = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).build(); + public static final FoodProperties HIYAYAKKO = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).build(); public static final FoodProperties NATTOHIYAYAKKO = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.35F).build(); diff --git a/src/main/java/baguchan/tofucraft/registry/TofuItems.java b/src/main/java/baguchan/tofucraft/registry/TofuItems.java index 72edf1ff0..322b91041 100644 --- a/src/main/java/baguchan/tofucraft/registry/TofuItems.java +++ b/src/main/java/baguchan/tofucraft/registry/TofuItems.java @@ -11,10 +11,12 @@ import baguchan.tofucraft.item.KoujiBaseItem; import baguchan.tofucraft.item.NetherFukumameItem; import baguchan.tofucraft.item.RamuneSoymilkBottleItem; +import baguchan.tofucraft.item.RollingPinItem; import baguchan.tofucraft.item.SeedAndRootItem; import baguchan.tofucraft.item.SoulFukumameItem; import baguchan.tofucraft.item.SoymilkBottleItem; import baguchan.tofucraft.item.StackableBowlItem; +import baguchan.tofucraft.item.StackableGlassBowlItem; import baguchan.tofucraft.item.StickFoodItem; import baguchan.tofucraft.item.TofuScoopItem; import baguchan.tofucraft.item.TofuShieldItem; @@ -57,8 +59,6 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import java.util.Objects; - import static baguchan.tofucraft.TofuCraftReload.MODID; public class TofuItems { @@ -81,6 +81,7 @@ public class TofuItems { public static final RegistryObject AGEDASHI_TOFU = ITEMS.register("agedashi_tofu", () -> new StackableBowlItem((new Item.Properties()).stacksTo(16).craftRemainder(Items.BOWL).food(TofuFoods.AGEDASHI_TOFU).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject TOFU_STEAK = ITEMS.register("tofusteak", () -> new Item((new Item.Properties()).food(TofuFoods.TOFUSTEAK).tab(TofuCreativeModeTab.TOFUCRAFT))); + public static final RegistryObject OAGE = ITEMS.register("oage", () -> new Item((new Item.Properties()).food(TofuFoods.OAGE).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject TOFU_MINCED = ITEMS.register("tofuminced", () -> new Item((new Item.Properties()).food(TofuFoods.TOFU).tab(TofuCreativeModeTab.TOFUCRAFT))); @@ -134,6 +135,7 @@ public class TofuItems { public static final RegistryObject COOKED_TOFU_FISH = ITEMS.register("cooked_tofufish", () -> new Item((new Item.Properties()).food(TofuFoods.COOKED_TOFUFISH).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject TOFUCOOKIE = ITEMS.register("tofucookie", () -> new Item((new Item.Properties()).food(TofuFoods.TOFUCOOKIE).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject TTTBURGER = ITEMS.register("tttburger", () -> new Item((new Item.Properties()).food(TofuFoods.TTTBURGER).tab(TofuCreativeModeTab.TOFUCRAFT))); + public static final RegistryObject MEAT_WRAPPED_YUBA = ITEMS.register("meatwrapped_yuba", () -> new Item((new Item.Properties()).food(TofuFoods.MEAT_WRAPPED_YUBA).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject SOYSTICK = ITEMS.register("soystick", () -> new Item((new Item.Properties()).food(TofuFoods.SOYSTICK).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject SALTYMELON = ITEMS.register("saltymelon", () -> new Item((new Item.Properties()).food(TofuFoods.SALTYMELON).tab(TofuCreativeModeTab.TOFUCRAFT))); @@ -187,8 +189,12 @@ public class TofuItems { public static final RegistryObject BUCKET_BITTERN = ITEMS.register("bucket_bittern", () -> new BucketItem(TofuFluids.BITTERN, (new Item.Properties()).craftRemainder(Items.BUCKET).stacksTo(1).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject GLASSBOWL = ITEMS.register("glassbowl", () -> new Item((new Item.Properties()).tab(TofuCreativeModeTab.TOFUCRAFT))); - public static final RegistryObject HIYAYAKKO_GLASS = ITEMS.register("hiyayakko", () -> new Item((new Item.Properties()).stacksTo(1).food(TofuFoods.HIYAYAKKO).tab(TofuCreativeModeTab.TOFUCRAFT))); - public static final RegistryObject NATTOHIYAYAKKO_GLASS = ITEMS.register("nattohiyayakko", () -> new Item((new Item.Properties()).stacksTo(1).food(TofuFoods.NATTOHIYAYAKKO).tab(TofuCreativeModeTab.TOFUCRAFT))); + + public static final RegistryObject TOFUSOMEN = ITEMS.register("tofusomen", () -> new Item((new Item.Properties()).tab(TofuCreativeModeTab.TOFUCRAFT))); + public static final RegistryObject TOFUSOMENBOWL_GLASS = ITEMS.register("tofusomenbowl_glass", () -> new StackableGlassBowlItem((new Item.Properties()).stacksTo(16).food(TofuFoods.TOFUSOMEN).tab(TofuCreativeModeTab.TOFUCRAFT))); + + public static final RegistryObject HIYAYAKKO_GLASS = ITEMS.register("hiyayakko", () -> new StackableGlassBowlItem((new Item.Properties()).stacksTo(1).food(TofuFoods.HIYAYAKKO).tab(TofuCreativeModeTab.TOFUCRAFT))); + public static final RegistryObject NATTOHIYAYAKKO_GLASS = ITEMS.register("nattohiyayakko", () -> new StackableGlassBowlItem((new Item.Properties()).stacksTo(1).food(TofuFoods.NATTOHIYAYAKKO).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject TOFU_KINU_SWORD = ITEMS.register("tofu_kinu_sword", () -> new SwordItem(TofuItemTier.KINU, 0, -2.2F, (new Item.Properties()).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject TOFU_KINU_AXE = ITEMS.register("tofu_kinu_axe", () -> new AxeItem(TofuItemTier.KINU, 0.0F, -2.25F, (new Item.Properties()).tab(TofuCreativeModeTab.TOFUCRAFT))); @@ -244,7 +250,7 @@ public class TofuItems { public static final RegistryObject TOFU_SHIELD = ITEMS.register("tofu_shield", () -> new TofuShieldItem((new Item.Properties()).stacksTo(1).durability(420).tab(TofuCreativeModeTab.TOFUCRAFT))); - public static final RegistryObject ROLLINGPIN = ITEMS.register("rollingpin", () -> new Item((new Item.Properties()).craftRemainder(Objects.requireNonNull(TofuItems.ROLLINGPIN.get())).tab(TofuCreativeModeTab.TOFUCRAFT))); + public static final RegistryObject ROLLINGPIN = ITEMS.register("rollingpin", () -> new RollingPinItem((new Item.Properties()).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject BUGLE = ITEMS.register("bugle", () -> new BugleItem((new Item.Properties()).stacksTo(1).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject TOFUSCOOP = ITEMS.register("tofuscoop", () -> new TofuScoopItem((new Item.Properties()).stacksTo(1).durability(264).tab(TofuCreativeModeTab.TOFUCRAFT))); @@ -270,6 +276,8 @@ public class TofuItems { public static final RegistryObject YUDOFU = ITEMS.register("yudofu", () -> new StackableBowlItem((new Item.Properties()).stacksTo(16).craftRemainder(Items.BOWL).food(TofuFoods.YUDOFU).tab(TofuCreativeModeTab.TOFU_DELIGHT))); public static final RegistryObject EDAMAME_RICE = ITEMS.register("edamame_rice", () -> new StackableBowlItem((new Item.Properties()).stacksTo(16).craftRemainder(Items.BOWL).food(TofuFoods.EDAMAME_RICE).tab(TofuCreativeModeTab.TOFU_DELIGHT))); public static final RegistryObject BOTTLE_DASHI = ITEMS.register("bottle_dashi", () -> new Item((new Item.Properties()).stacksTo(16).craftRemainder(Items.GLASS_BOTTLE).tab(TofuCreativeModeTab.TOFUCRAFT))); + public static final RegistryObject BOTTLE_SOYOIL = ITEMS.register("bottle_soyoil", () -> new Item((new Item.Properties()).stacksTo(16).craftRemainder(Items.GLASS_BOTTLE).tab(TofuCreativeModeTab.TOFUCRAFT))); + public static final RegistryObject TOFUEGG = ITEMS.register("tofuegg", () -> new Item((new Item.Properties()).food(TofuFoods.TOFU_EGG).tab(TofuCreativeModeTab.TOFUCRAFT))); public static final RegistryObject SOYSAUSE_RAMEN = ITEMS.register("soysause_ramen", () -> new StackableBowlItem((new Item.Properties()).stacksTo(16).craftRemainder(Items.BOWL).food(TofuFoods.SOYSAUSE_RAMEN).tab(TofuCreativeModeTab.TOFU_DELIGHT))); public static final RegistryObject SOY_CHEESE = ITEMS.register("soy_cheese", () -> new Item((new Item.Properties()).food(TofuFoods.SOY_CHEESE).tab(TofuCreativeModeTab.TOFU_DELIGHT))); diff --git a/src/main/resources/assets/tofucraft/lang/en_us.json b/src/main/resources/assets/tofucraft/lang/en_us.json index 839e1dcb7..f37bfee58 100644 --- a/src/main/resources/assets/tofucraft/lang/en_us.json +++ b/src/main/resources/assets/tofucraft/lang/en_us.json @@ -14,6 +14,7 @@ "item.tofucraft.tofudried": "Dried Tofu", "item.tofucraft.tofufried": "Fried Tofu", "item.tofucraft.tofufried_pouch": "Fried Pouch Tofu", + "item.tofucraft.oage": "Oage", "item.tofucraft.agedashi_tofu": "Agedashi Tofu", "item.tofucraft.tofusteak": "Tofu Steak", "item.tofucraft.tofuannin": "Annin Tofu", @@ -35,6 +36,7 @@ "item.tofucraft.tofucookie": "Tofu Cookie", "item.tofucraft.soystick": "Soy Stick™", "item.tofucraft.tttburger": "TTT burger", + "item.tofucraft.meatwrapped_yuba": "Meat Wrapped Yuba", "item.tofucraft.soy_chocolate": "Soy Chocolate", "item.tofucraft.tofunian_soy_chocolate": "Tofunian Soy Chocolate", "item.tofucraft.soy_cheese": "Soy Cheese", @@ -58,6 +60,8 @@ "item.tofucraft.bucket_soymilk_soul": "Soul Soymilk Bucket", "item.tofucraft.bucket_bittern": "Bittern Bucket", "item.tofucraft.glassbowl": "Glass Bowl", + "item.tofucraft.tofusomen": "Tofu Somen", + "item.tofucraft.tofusomenbowl_glass": "Tofu Somen Glass Bowl", "item.tofucraft.hiyayakko": "Hiyayakko", "item.tofucraft.nattohiyayakko": "Natto Hiyayakko", "item.tofucraft.seeds_soybeans": "Seeds Soybeans", @@ -82,6 +86,7 @@ "item.tofucraft.yakionigiri_miso": "Yakionigiri Miso", "item.tofucraft.yakionigiri_shoyu": "Yakionigiri Shoyu", "item.tofucraft.riceburger": "Rice Burger", + "item.tofucraft.meat_wrapped_yuba": "Meat Wrapped Yuba", "item.tofucraft.ricenatto": "Rice Natto", "item.tofucraft.ricenattoleek": "Rice Natto Leek", "item.tofucraft.ricetofu": "Rice Tofu", @@ -108,6 +113,7 @@ "item.tofucraft.miso": "Miso", "item.tofucraft.bottle_soysause": "Bottle SoySauce", "item.tofucraft.bottle_dashi": "Bottle Dashi", + "item.tofucraft.bottle_soyoil": "Bottle SoyOil", "item.tofucraft.natto": "Natto", "item.tofucraft.zunda": "Zunda", "item.tofucraft.zundama": "Zundama", diff --git a/src/main/resources/assets/tofucraft/lang/ja_jp.json b/src/main/resources/assets/tofucraft/lang/ja_jp.json index 65ab5ec46..6587f3b57 100644 --- a/src/main/resources/assets/tofucraft/lang/ja_jp.json +++ b/src/main/resources/assets/tofucraft/lang/ja_jp.json @@ -14,6 +14,7 @@ "item.tofucraft.tofudried": "高野豆腐", "item.tofucraft.tofufried": "厚揚げ", "item.tofucraft.tofufried_pouch": "揚げ豆腐", + "item.tofucraft.oage": "お揚げ", "item.tofucraft.agedashi_tofu": "揚げ出し豆腐", "item.tofucraft.tofusteak": "豆腐ステーキ", "item.tofucraft.tofuannin": "杏仁豆腐", @@ -35,6 +36,7 @@ "item.tofucraft.tofucookie": "豆腐クッキー", "item.tofucraft.soystick": "ソイスティック™", "item.tofucraft.tttburger": "豆腐バーガー", + "item.tofucraft.meatwrapped_yuba": "肉巻き湯葉", "item.tofucraft.soy_chocolate": "ソイチョコレート", "item.tofucraft.tofunian_soy_chocolate": "トーフニアン ソイチョコレート", "item.tofucraft.soy_cheese": "豆乳チーズ", @@ -58,6 +60,8 @@ "item.tofucraft.bucket_soymilk_soul": "魂豆乳入りバケツ", "item.tofucraft.bucket_bittern": "にがり入りバケツ", "item.tofucraft.glassbowl": "ガラスの器", + "item.tofucraft.tofusomen": "豆腐そうめん", + "item.tofucraft.tofusomenbowl_glass": "豆腐そうめん入りガラスの器", "item.tofucraft.hiyayakko": "冷奴", "item.tofucraft.nattohiyayakko": "納豆冷奴", "item.tofucraft.seeds_soybeans": "大豆", @@ -82,6 +86,7 @@ "item.tofucraft.yakionigiri_miso": "焼き味噌おにぎり", "item.tofucraft.yakionigiri_shoyu": "焼き醬油おにぎり", "item.tofucraft.riceburger": "ライスバーガー", + "item.tofucraft.meat_wrapped_yuba": "肉巻き湯葉", "item.tofucraft.ricenatto": "納豆ごはん", "item.tofucraft.ricenattoleek": "ネギ入り納豆ごはん", "item.tofucraft.ricetofu": "豆腐ごはん", @@ -108,6 +113,7 @@ "item.tofucraft.miso": "味噌", "item.tofucraft.bottle_soysause": "醬油瓶", "item.tofucraft.bottle_dashi": "出汁瓶", + "item.tofucraft.bottle_soyoil": "大豆油瓶", "item.tofucraft.natto": "納豆", "item.tofucraft.zunda": "ずんだペースト", "item.tofucraft.zundama": "ずんだま", diff --git a/src/main/resources/assets/tofucraft/textures/item/soyoil.png b/src/main/resources/assets/tofucraft/textures/item/bottle_soyoil.png similarity index 100% rename from src/main/resources/assets/tofucraft/textures/item/soyoil.png rename to src/main/resources/assets/tofucraft/textures/item/bottle_soyoil.png