New item: Raw Pizza

common/src/generated/resources/data/brewinandchewin/advancement/recipes/food/pizza.json

@@ -1,11 +1,11 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_cheese": {
+    "has_raw_pizza": {
       "conditions": {
         "items": [
           {
-            "items": "brewinandchewin:flaxen_cheese_wedge"
+            "items": "brewinandchewin:raw_pizza"
           }
         ]
       },
@@ -21,12 +21,13 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_cheese"
+      "has_raw_pizza"
     ]
   ],
   "rewards": {
     "recipes": [
-      "brewinandchewin:pizza"
+      "brewinandchewin:pizza",
+      "brewinandchewin:pizza_from_campfire_cooking"
     ]
   }
 }

common/src/generated/resources/data/brewinandchewin/advancement/recipes/food/raw_pizza.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_cheese": {
+      "conditions": {
+        "items": [
+          {
+            "items": "brewinandchewin:flaxen_cheese_wedge"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "brewinandchewin:raw_pizza"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_cheese"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "brewinandchewin:raw_pizza"
+    ]
+  }
+}

common/src/generated/resources/data/brewinandchewin/recipe/pizza.json

@@ -1,25 +1,11 @@
 {
-  "type": "minecraft:crafting_shaped",
+  "type": "minecraft:smelting",
   "category": "misc",
-  "key": {
-    "f": {
-      "tag": "brewinandchewin:foods/cheese_wedge"
-    },
-    "p": {
-      "tag": "brewinandchewin:foods/pizza_topping"
-    },
-    "t": {
-      "item": "farmersdelight:tomato_sauce"
-    },
-    "w": {
-      "item": "minecraft:wheat"
-    }
+  "cookingtime": 200,
+  "experience": 0.35,
+  "ingredient": {
+    "item": "brewinandchewin:raw_pizza"
   },
-  "pattern": [
-    " f ",
-    "ptp",
-    "www"
-  ],
   "result": {
     "count": 1,
     "id": "brewinandchewin:pizza"

common/src/generated/resources/data/brewinandchewin/recipe/pizza_from_campfire_cooking.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:campfire_cooking",
+  "category": "misc",
+  "cookingtime": 600,
+  "experience": 0.35,
+  "ingredient": {
+    "item": "brewinandchewin:raw_pizza"
+  },
+  "result": {
+    "count": 1,
+    "id": "brewinandchewin:pizza"
+  }
+}

common/src/generated/resources/data/brewinandchewin/recipe/raw_pizza.json

@@ -0,0 +1,27 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "f": {
+      "tag": "brewinandchewin:foods/cheese_wedge"
+    },
+    "p": {
+      "tag": "brewinandchewin:foods/pizza_topping"
+    },
+    "t": {
+      "item": "farmersdelight:tomato_sauce"
+    },
+    "d": {
+      "item": "farmersdelight:wheat_dough"
+    }
+  },
+  "pattern": [
+    " f ",
+    "ptp",
+    "ddd"
+  ],
+  "result": {
+    "count": 1,
+    "id": "brewinandchewin:raw_pizza"
+  }
+}

common/src/generated/resources/data/brewinandchewin/tags/item/foods/pizza_topping.json

@@ -14,6 +14,10 @@
       "id": "#c:foods/cooked_beef",
       "required": false
     },
+    {
+      "id": "#c:foods/cooked_salmon",
+      "required": false
+    },
     {
       "id": "#c:foods/cooked_cod",
       "required": false
@@ -25,6 +29,10 @@
     {
       "id": "#c:foods/cooked_pork",
       "required": false
+    },
+    {
+      "id": "#c:foods/cooked_chicken",
+      "required": false
     }
   ]
 }

common/src/main/java/umpaz/brewinandchewin/common/block/PizzaBlock.java

@@ -22,11 +22,13 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import umpaz.brewinandchewin.common.registry.BnCBlocks;
 import umpaz.brewinandchewin.common.registry.BnCItems;
 
 public class PizzaBlock extends Block
 {
     public static final IntegerProperty SERVINGS = IntegerProperty.create("servings", 0, 3);
+    private final boolean is_raw;
 
     protected static final VoxelShape[] SHAPES = new VoxelShape[]{
             Block.box(0.0D, 0.0D, 0.0D, 8.0D, 2.0D, 8.0D),
@@ -35,9 +37,10 @@ public class PizzaBlock extends Block
             Block.box(0.0D, 0.0D, 0.0D, 16.0D, 2.0D, 16.0D),
     };
 
-    public PizzaBlock(Properties properties) {
+    public PizzaBlock(Properties properties, boolean raw) {
         super(properties);
         this.registerDefaultState(this.stateDefinition.any().setValue(SERVINGS, 3));
+        this.is_raw = raw;
     }
 
     @Override
@@ -57,6 +60,8 @@ public InteractionResult useWithoutItem(BlockState state, Level level, BlockPos
     }
 
     private InteractionResult takeServing(Level level, BlockPos pos, BlockState state, Player player, InteractionHand handIn) {
+        if (this.is_raw) {return InteractionResult.PASS;}
+
         int servings = state.getValue(SERVINGS);
         ItemStack heldStack = player.getItemInHand(handIn);
         if (heldStack.isEmpty() || heldStack.getItem().equals(BnCItems.PIZZA_SLICE)) {

common/src/main/java/umpaz/brewinandchewin/common/registry/BnCBlocks.java

@@ -38,7 +38,10 @@ public class BnCBlocks {
             FieryFonduePotBlock(Block.Properties.ofFullCopy(Blocks.CAULDRON));
 
     public static final Block PIZZA = new
-            PizzaBlock(Block.Properties.ofFullCopy(Blocks.CAKE));
+            PizzaBlock(Block.Properties.ofFullCopy(Blocks.CAKE), false);
+
+    public static final Block RAW_PIZZA = new
+            PizzaBlock(Block.Properties.ofFullCopy(Blocks.CAKE), true);
 
     public static final Block QUICHE = new
             PieBlock(Block.Properties.ofFullCopy(Blocks.CAKE), () -> BnCItems.QUICHE_SLICE);
@@ -57,6 +60,7 @@ public static void registerAll() {
 
         Registry.register(BuiltInRegistries.BLOCK, BrewinAndChewin.asResource("fiery_fondue_pot"), FIERY_FONDUE_POT);
         Registry.register(BuiltInRegistries.BLOCK, BrewinAndChewin.asResource("pizza"), PIZZA);
+        Registry.register(BuiltInRegistries.BLOCK, BrewinAndChewin.asResource("raw_pizza"), RAW_PIZZA);
         Registry.register(BuiltInRegistries.BLOCK, BrewinAndChewin.asResource("quiche"), QUICHE);
     }
 }

common/src/main/java/umpaz/brewinandchewin/common/registry/BnCItems.java

@@ -88,6 +88,7 @@ public static void registerWithTab(String name, Item item, @Nullable String requ
     public static final Item FIERY_FONDUE = new ConsumableItem(new Item.Properties().stacksTo(16).food(BnCFoods.FIERY_FONDUE).craftRemainder(Items.BOWL), true);
 
     public static final Item PIZZA = new BlockItem(BnCBlocks.PIZZA, new Item.Properties().stacksTo(1));
+    public static final Item RAW_PIZZA = new BlockItem(BnCBlocks.RAW_PIZZA, new Item.Properties().stacksTo(1));
     public static final Item QUICHE = new BlockItem(BnCBlocks.QUICHE, new Item.Properties());
 
     public static final Item PIZZA_SLICE = new Item(new Item.Properties().food(BnCFoods.PIZZA_SLICE));
@@ -148,6 +149,7 @@ public static void registerAll() {
         registerWithTab("fiery_fondue_pot", FIERY_FONDUE_POT);
         registerWithTab("fiery_fondue", FIERY_FONDUE);
 
+        registerWithTab("raw_pizza", RAW_PIZZA);
         registerWithTab("pizza", PIZZA);
         registerWithTab("quiche", QUICHE);
 

common/src/main/resources/assets/brewinandchewin/blockstates/raw_pizza.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "servings=3": {
+      "model": "brewinandchewin:block/raw_pizza"
+    },
+    "servings=2": {
+      "model": "brewinandchewin:block/raw_pizza_slice1"
+    },
+    "servings=1": {
+      "model": "brewinandchewin:block/raw_pizza_slice2"
+    },
+    "servings=0": {
+      "model": "brewinandchewin:block/raw_pizza_slice3"
+    }
+  }
+}

common/src/main/resources/assets/brewinandchewin/lang/en_us.json

@@ -56,6 +56,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "Scarlet Cheese Wheel",
   "item.brewinandchewin.flaxen_cheese_wedge": "Flaxen Cheese Wedge",
   "item.brewinandchewin.scarlet_cheese_wedge": "Scarlet Cheese Wedge",
+  "block.brewinandchewin.raw_pizza": "Raw Pizza",
   "block.brewinandchewin.pizza": "Pizza",
   "item.brewinandchewin.pizza_slice": "Pizza Slice",
   "block.brewinandchewin.fiery_fondue_pot": "Pot of Fiery Fondue",

common/src/main/resources/assets/brewinandchewin/lang/ja_jp.json

@@ -55,6 +55,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "スカーレットチーズホイール",
   "item.brewinandchewin.flaxen_cheese_wedge": "分けられた亜麻チーズ",
   "item.brewinandchewin.scarlet_cheese_wedge": "分けられたスカーレットチーズ",
+  "block.brewinandchewin.raw_pizza": "生ピザ",
   "block.brewinandchewin.pizza": "ピザ",
   "item.brewinandchewin.pizza_slice": "ピザスライス",
   "block.brewinandchewin.fiery_fondue_pot": "激辛フォンデュ鍋",

common/src/main/resources/assets/brewinandchewin/lang/kk_kz.json

@@ -56,6 +56,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "Қызыл ірімшік шеңбері",
   "item.brewinandchewin.flaxen_cheese_wedge": "Сары ірімшік доғасы",
   "item.brewinandchewin.scarlet_cheese_wedge": "Қызыл ірімшік доғасы",
+  "block.brewinandchewin.raw_pizza": "түүхий пицца",
   "block.brewinandchewin.pizza": "Пицца",
   "item.brewinandchewin.pizza_slice": "Пицца тілімі",
   "block.brewinandchewin.fiery_fondue_pot": "Өртенген фондю қазаны",

common/src/main/resources/assets/brewinandchewin/lang/ko_kr.json

@@ -56,6 +56,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "진홍빛 치즈 덩어리",
   "item.brewinandchewin.flaxen_cheese_wedge": "노란 치즈 조각",
   "item.brewinandchewin.scarlet_cheese_wedge": "진홍빛 치즈 조각",
+  "block.brewinandchewin.raw_pizza": "원시 피자",
   "block.brewinandchewin.pizza": "피자",
   "item.brewinandchewin.pizza_slice": "피자 조각",
   "block.brewinandchewin.fiery_fondue_pot": "가마솥에 담긴 작열의 퐁듀",
@@ -170,3 +171,4 @@
 
   "tag.damage_type.brewinandchewin.triggers_raging": "Triggers Raging"
 }
+

common/src/main/resources/assets/brewinandchewin/lang/ru_ru.json

@@ -56,6 +56,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "Алый сырный круг",
   "item.brewinandchewin.flaxen_cheese_wedge": "Долька льняного сыра",
   "item.brewinandchewin.scarlet_cheese_wedge": "Долька алого сыра",
+  "block.brewinandchewin.raw_pizza": "сырая пицца",
   "block.brewinandchewin.pizza": "Пицца",
   "item.brewinandchewin.pizza_slice": "Кусочек пиццы",
   "block.brewinandchewin.fiery_fondue_pot": "Горшочек с огненным фондю",

common/src/main/resources/assets/brewinandchewin/lang/tr_tr.json

@@ -56,6 +56,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "Kızıl Peynir Tekeri",
   "item.brewinandchewin.flaxen_cheese_wedge": "Sarı Peynir Dilimi",
   "item.brewinandchewin.scarlet_cheese_wedge": "Kızıl Peynir Dilimi",
+  "block.brewinandchewin.raw_pizza": "Çiğ Pizza",
   "block.brewinandchewin.pizza": "Pizza",
   "item.brewinandchewin.pizza_slice": "Pizza Dilimi",
   "block.brewinandchewin.fiery_fondue_pot": "Ateşli Fondü Kazanı",

common/src/main/resources/assets/brewinandchewin/lang/zh_cn.json

@@ -55,6 +55,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "绯红奶酪轮",
   "item.brewinandchewin.flaxen_cheese_wedge": "淡黄奶酪块",
   "item.brewinandchewin.scarlet_cheese_wedge": "绯红奶酪块",
+  "block.brewinandchewin.raw_pizza": "生披萨",
   "block.brewinandchewin.pizza": "披萨",
   "item.brewinandchewin.pizza_slice": "披萨切片",
   "block.brewinandchewin.fiery_fondue_pot": "锅装火辣奶酪火锅",

common/src/main/resources/assets/brewinandchewin/lang/zh_tw.json

@@ -53,6 +53,7 @@
   "block.brewinandchewin.scarlet_cheese_wheel": "紅色起司輪",
   "item.brewinandchewin.flaxen_cheese_wedge": "黃色起司片",
   "item.brewinandchewin.scarlet_cheese_wedge": "紅色起司片",
+  "block.brewinandchewin.raw_pizza": "生披薩",
   "block.brewinandchewin.pizza": "披薩",
   "item.brewinandchewin.pizza_slice": "披薩片",
   "block.brewinandchewin.fiery_fondue_pot": "火熱熱鍋釜",

common/src/main/resources/assets/brewinandchewin/models/block/raw_pizza.json

@@ -0,0 +1,23 @@
+{
+    "parent": "minecraft:block/block",
+	"textures": {
+		"top": "brewinandchewin:block/raw_pizza_top",
+		"side": "brewinandchewin:block/raw_pizza_side",
+		"bottom": "brewinandchewin:block/raw_pizza_bottom",
+		"particle": "brewinandchewin:block/raw_pizza_top"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 2, 16],
+			"faces": {
+				"north": {"uv": [0, 14, 16, 16], "texture": "#side"},
+				"east": {"uv": [0, 14, 16, 16], "texture": "#side"},
+				"south": {"uv": [0, 14, 16, 16], "texture": "#side"},
+				"west": {"uv": [0, 14, 16, 16], "texture": "#side"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#top"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
+			}
+		}
+	]
+}

common/src/main/resources/assets/brewinandchewin/models/block/raw_pizza_slice1.json

@@ -0,0 +1,36 @@
+{
+    "parent": "minecraft:block/block",
+	"textures": {
+		"top": "brewinandchewin:block/raw_pizza_top",
+		"inside": "brewinandchewin:block/raw_pizza_inside",
+		"side": "brewinandchewin:block/raw_pizza_side",
+		"bottom": "brewinandchewin:block/raw_pizza_bottom",
+		"particle": "brewinandchewin:block/raw_pizza_top"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 2, 8],
+			"faces": {
+				"north": {"uv": [0, 14, 16, 16], "texture": "#side"},
+				"east": {"uv": [8, 14, 16, 16], "texture": "#side"},
+				"south": {"uv": [0, 14, 16, 16], "texture": "#inside"},
+				"west": {"uv": [0, 14, 8, 16], "texture": "#side"},
+				"up": {"uv": [0, 0, 16, 8], "texture": "#top"},
+				"down": {"uv": [0, 8, 16, 16], "texture": "#bottom"}
+			}
+		},
+		{
+			"from": [0, 0, 8],
+			"to": [8, 2, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 8, 2], "texture": "#inside"},
+				"east": {"uv": [0, 14, 8, 16], "texture": "#inside"},
+				"south": {"uv": [0, 14, 8, 16], "texture": "#side"},
+				"west": {"uv": [8, 14, 16, 16], "texture": "#side"},
+				"up": {"uv": [0, 8, 8, 16], "texture": "#top"},
+				"down": {"uv": [0, 0, 8, 8], "texture": "#bottom"}
+			}
+		}
+	]
+}