fix merge error

src/generated/resources/assets/carbort/blockstates/bean_block.json

@@ -0,0 +1,13 @@
+{
+  "variants": {
+    "stage=0": {
+      "model": "carbort:block/bean_block"
+    },
+    "stage=1": {
+      "model": "carbort:block/bean_block_1"
+    },
+    "stage=2": {
+      "model": "carbort:block/bean_block_2"
+    }
+  }
+}

src/generated/resources/assets/carbort/blockstates/bean_crystal_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "carbort:block/bean_crystal_block"
+    }
+  }
+}

src/generated/resources/assets/carbort/blockstates/reinforced_pedestal.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "carbort:block/reinforced_pedestal"
+    }
+  }
+}

src/generated/resources/assets/carbort/models/block/bean_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "carbort:block/bean_block"
+  }
+}

src/generated/resources/assets/carbort/models/item/bean_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "carbort:block/bean_block"
+}

src/generated/resources/assets/carbort/models/item/bean_crystal.json

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

src/generated/resources/assets/carbort/models/item/bean_crystal_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "carbort:block/bean_crystal_block"
+}

src/generated/resources/assets/carbort/models/item/reinforced_pedestal.json

@@ -0,0 +1,3 @@
+{
+  "parent": "carbort:block/reinforced_pedestal"
+}

src/generated/resources/data/carbort/advancement/recipes/tools/bean_wand.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": "carbort:bean"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "carbort:bean_wand"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "carbort:bean_wand"
+    ]
+  }
+}

src/generated/resources/data/carbort/loot_table/blocks/bean_block.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "carbort:bean_block"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "carbort:blocks/bean_block"
+}

src/generated/resources/data/carbort/recipe/bean_wand.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "key": {
+    "B": {
+      "item": "carbort:bean_crystal"
+    },
+    "L": {
+      "tag": "c:leathers"
+    },
+    "S": {
+      "tag": "c:rods/wooden"
+    }
+  },
+  "pattern": [
+    "  B",
+    "LS ",
+    "SL "
+  ],
+  "result": {
+    "count": 1,
+    "id": "carbort:bean_wand"
+  }
+}

src/generated/resources/data/carbort/tags/item/show_bean_meter.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "carbort:bean_wand"
+  ]
+}

src/generated/resources/data/minecraft/advancement/recipes/building_blocks/bean_block.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bean": {
+      "conditions": {
+        "items": [
+          {
+            "items": "carbort:bean"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minecraft:bean_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_bean"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:bean_block"
+    ]
+  }
+}

src/generated/resources/data/minecraft/advancement/recipes/misc/bean.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bean_block": {
+      "conditions": {
+        "items": [
+          {
+            "items": "carbort:bean_block"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minecraft:bean"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_bean_block"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:bean"
+    ]
+  }
+}

src/generated/resources/data/minecraft/recipe/bean.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "carbort:bean_block"
+    }
+  ],
+  "result": {
+    "count": 9,
+    "id": "carbort:bean"
+  }
+}

src/generated/resources/data/minecraft/recipe/bean_block.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "#": {
+      "item": "carbort:bean"
+    }
+  },
+  "pattern": [
+    "###",
+    "###",
+    "###"
+  ],
+  "result": {
+    "count": 1,
+    "id": "carbort:bean_block"
+  }
+}

src/main/java/com/leclowndu93150/carbort/registries/CBBlocks.java

@@ -2,6 +2,7 @@
 
 import com.leclowndu93150.carbort.Carbort;
 import com.leclowndu93150.carbort.content.blocks.*;
+import com.leclowndu93150.carbort.content.items.AngelBlockItem;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -37,6 +38,8 @@ public final class CBBlocks {
             BeanCrystalBlock::new, BlockBehaviour.Properties.of());
     public static final DeferredBlock<ReinforcedPedestalBlock> REINFORCED_PEDESTAL = registerBlockAndItem("reinforced_pedestal",
             ReinforcedPedestalBlock::new, BlockBehaviour.Properties.of());
+    public static final DeferredBlock<AngelBlock> ANGEL_BLOCK = BLOCKS.registerBlock("angel_block", AngelBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK));
+    public static final DeferredItem<BlockItem> ANGEL_BLOCK_ITEM = CBItems.ITEMS.registerItem("angel_block", AngelBlockItem::new);
     public static final DeferredBlock<BeanCropBlock> BEANS = BLOCKS.register("beans",
             () -> new BeanCropBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CARROTS)));
     public static final DeferredBlock<Block> BEDROCK_ORE = registerBlockAndItem("bedrock_ore",

src/main/resources/assets/carbort/models/block/bean_block_1.json

@@ -0,0 +1,82 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "carbort:block/bean_block",
+		"particle": "carbort:block/bean_block"
+	},
+	"elements": [
+		{
+			"from": [3, 0, 3],
+			"to": [13, 14, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 3]},
+			"faces": {
+				"north": {"uv": [0, 0, 10, 14], "texture": "#0"},
+				"east": {"uv": [0, 0, 10, 14], "texture": "#0"},
+				"south": {"uv": [0, 0, 10, 14], "texture": "#0"},
+				"west": {"uv": [0, 0, 10, 14], "texture": "#0"},
+				"up": {"uv": [4, 4, 14, 14], "texture": "#0"},
+				"down": {"uv": [0, 0, 10, 10], "texture": "#0"}
+			}
+		},
+		{
+			"from": [1, 0, 5],
+			"to": [3, 4, 15],
+			"rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 5]},
+			"faces": {
+				"north": {"uv": [5, 2, 7, 6], "texture": "#0"},
+				"east": {"uv": [0, 0, 10, 4], "texture": "#0"},
+				"south": {"uv": [3, 9, 5, 13], "texture": "#0"},
+				"west": {"uv": [2, 0, 12, 4], "texture": "#0"},
+				"up": {"uv": [7, 6, 9, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 2, 10], "texture": "#0"}
+			}
+		},
+		{
+			"from": [3, 0, 13],
+			"to": [11, 4, 15],
+			"rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 5]},
+			"faces": {
+				"north": {"uv": [0, 0, 8, 4], "texture": "#0"},
+				"east": {"uv": [13, 5, 15, 9], "texture": "#0"},
+				"south": {"uv": [5, 0, 13, 4], "texture": "#0"},
+				"west": {"uv": [0, 0, 2, 4], "texture": "#0"},
+				"up": {"uv": [8, 5, 16, 7], "texture": "#0"},
+				"down": {"uv": [0, 3, 8, 5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [5, 0, 1],
+			"to": [11, 2, 3],
+			"rotation": {"angle": 0, "axis": "y", "origin": [2, 0, -7]},
+			"faces": {
+				"north": {"uv": [0, 0, 6, 2], "texture": "#0"},
+				"east": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"south": {"uv": [0, 0, 6, 2], "texture": "#0"},
+				"west": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"up": {"uv": [0, 0, 6, 2], "texture": "#0"},
+				"down": {"uv": [0, 0, 6, 2], "texture": "#0"}
+			}
+		},
+		{
+			"from": [13, 0, 4],
+			"to": [15, 7, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 2]},
+			"faces": {
+				"north": {"uv": [0, 0, 2, 7], "texture": "#0"},
+				"east": {"uv": [3, 0, 9, 7], "texture": "#0"},
+				"south": {"uv": [2, 0, 4, 7], "texture": "#0"},
+				"west": {"uv": [0, 0, 6, 7], "texture": "#0"},
+				"up": {"uv": [0, 0, 2, 6], "texture": "#0"},
+				"down": {"uv": [0, 0, 2, 6], "texture": "#0"}
+			}
+		}
+	],
+	"groups": [
+		{
+			"name": "VoxelShapes",
+			"origin": [8, 8, 8],
+			"color": 0,
+			"children": [0, 1, 2, 3, 4]
+		}
+	]
+}