diff --git a/shared/src/main/java/com/epherical/croptopia/common/BlockNames.java b/shared/src/main/java/com/epherical/croptopia/common/BlockNames.java index 65193f58f..e445ca768 100644 --- a/shared/src/main/java/com/epherical/croptopia/common/BlockNames.java +++ b/shared/src/main/java/com/epherical/croptopia/common/BlockNames.java @@ -29,6 +29,7 @@ public class BlockNames { public static final String WALNUT_CROP = "walnut_crop"; public static final String CINNAMON_LEAVES = "cinnamon_leaves"; public static final String SALT_ORE = "salt_ore"; + public static final String CHOCOLATE_BLOCK = "chocolate_block"; public static final String ARTICHOKE_CROP = "artichoke_crop"; public static final String ASPARAGUS_CROP = "asparagus_crop"; public static final String BARLEY_CROP = "barley_crop"; diff --git a/shared/src/main/java/com/epherical/croptopia/common/ItemNames.java b/shared/src/main/java/com/epherical/croptopia/common/ItemNames.java index a589556ea..a50c0476a 100644 --- a/shared/src/main/java/com/epherical/croptopia/common/ItemNames.java +++ b/shared/src/main/java/com/epherical/croptopia/common/ItemNames.java @@ -291,6 +291,7 @@ public class ItemNames { public static final String COOKING_POT = "cooking_pot"; public static final String MORTAR_AND_PESTLE = "mortar_and_pestle"; public static final String SALT_ORE = "salt_ore"; + public static final String CHOCOLATE_BLOCK = "chocolate_block"; public static final String BURRITO = "burrito"; public static final String TOSTADA = "tostada"; diff --git a/shared/src/main/java/com/epherical/croptopia/common/ItemNamesV2.java b/shared/src/main/java/com/epherical/croptopia/common/ItemNamesV2.java index 5f5bdd3aa..66fe3385b 100644 --- a/shared/src/main/java/com/epherical/croptopia/common/ItemNamesV2.java +++ b/shared/src/main/java/com/epherical/croptopia/common/ItemNamesV2.java @@ -219,6 +219,7 @@ public class ItemNamesV2 { public static final String COOKING_POT = "cooking_pot"; public static final String MORTAR_AND_PESTLE = "mortar_and_pestle"; public static final String SALT_ORE = "salt_ore"; + public static final String CHOCOLATE_BLOCK = "chocolate_block"; public static final String BURRITO = "burrito"; public static final String TOSTADA = "tostada"; diff --git a/shared/src/main/java/com/epherical/croptopia/register/Content.java b/shared/src/main/java/com/epherical/croptopia/register/Content.java index 7b4df1b0d..938b18e44 100644 --- a/shared/src/main/java/com/epherical/croptopia/register/Content.java +++ b/shared/src/main/java/com/epherical/croptopia/register/Content.java @@ -423,6 +423,9 @@ public class Content { public static Block SALT_ORE_BLOCK = new Block(BlockBehaviour.Properties.of(Material.SAND).strength(0.5F).sound(SoundType.SAND)); public static final Item SALT_ORE = new ItemNameBlockItem(SALT_ORE_BLOCK, createGroup()); + public static Block CHOCOLATE_BLOCK_BLOCK = new Block(BlockBehaviour.Properties.of(Material.CAKE).strength(1F).sound(SoundType.STONE)); + public static final Item CHOCOLATE_BLOCK = new ItemNameBlockItem(CHOCOLATE_BLOCK_BLOCK, createGroup()); + public static Item GUIDE; public static void registerBlocks(RegisterFunction register) { @@ -632,6 +635,7 @@ public static void registerItems(RegisterFunction register) { register.register(createIdentifier(ItemNamesV2.THE_BIG_BREAKFAST), THE_BIG_BREAKFAST); register.register(createIdentifier(ItemNamesV2.SALT_ORE), SALT_ORE); + register.register(createIdentifier(ItemNamesV2.CHOCOLATE_BLOCK), CHOCOLATE_BLOCK); } public static Stream createCropStream() { diff --git a/shared/src/main/resources/assets/croptopia/blockstates/chocolate_block.json b/shared/src/main/resources/assets/croptopia/blockstates/chocolate_block.json new file mode 100644 index 000000000..cca9251c5 --- /dev/null +++ b/shared/src/main/resources/assets/croptopia/blockstates/chocolate_block.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": { + "model": "croptopia:block/chocolate_block" + } + } +} + diff --git a/shared/src/main/resources/assets/croptopia/lang/en_us.json b/shared/src/main/resources/assets/croptopia/lang/en_us.json index f850e619c..af351ec3b 100644 --- a/shared/src/main/resources/assets/croptopia/lang/en_us.json +++ b/shared/src/main/resources/assets/croptopia/lang/en_us.json @@ -425,6 +425,7 @@ "item.croptopia.guide": "Croptopia", "item.croptopia.salt_ore": "Salt Ore", + "item.croptopia.chocolate_block": "Chocolate Block", "block.croptopia.salt_ore": "Salt Ore", "block.croptopia.apple_crop": "Apple Crop", diff --git a/shared/src/main/resources/assets/croptopia/models/block/chocolate_block.json b/shared/src/main/resources/assets/croptopia/models/block/chocolate_block.json new file mode 100644 index 000000000..dfcca6c67 --- /dev/null +++ b/shared/src/main/resources/assets/croptopia/models/block/chocolate_block.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "croptopia:block/chocolate_block" + } +} + diff --git a/shared/src/main/resources/assets/croptopia/models/item/chocolate_block.json b/shared/src/main/resources/assets/croptopia/models/item/chocolate_block.json new file mode 100644 index 000000000..e7cdfa2e7 --- /dev/null +++ b/shared/src/main/resources/assets/croptopia/models/item/chocolate_block.json @@ -0,0 +1,4 @@ +{ + "parent": "croptopia:block/chocolate_block" +} + diff --git a/shared/src/main/resources/assets/croptopia/textures/block/chocolate_block.png b/shared/src/main/resources/assets/croptopia/textures/block/chocolate_block.png new file mode 100644 index 000000000..9da887bec Binary files /dev/null and b/shared/src/main/resources/assets/croptopia/textures/block/chocolate_block.png differ diff --git a/shared/src/main/resources/data/croptopia/advancements/recipes/chocolate_block.json b/shared/src/main/resources/data/croptopia/advancements/recipes/chocolate_block.json new file mode 100644 index 000000000..84211003a --- /dev/null +++ b/shared/src/main/resources/data/croptopia/advancements/recipes/chocolate_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "croptopia:chocolate_block" + ] + }, + "criteria": { + "has_chocolate": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["croptopia:chocolate"] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "croptopia:chocolate_block" + } + } + }, + "requirements": [ + [ + "has_chocolate", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/shared/src/main/resources/data/croptopia/advancements/recipes/chocolate_from_block.json b/shared/src/main/resources/data/croptopia/advancements/recipes/chocolate_from_block.json new file mode 100644 index 000000000..a45f6fe12 --- /dev/null +++ b/shared/src/main/resources/data/croptopia/advancements/recipes/chocolate_from_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "croptopia:chocolate_from_block" + ] + }, + "criteria": { + "has_chocolate_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["croptopia:chocolate_block"] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "croptopia:chocolate_from_block" + } + } + }, + "requirements": [ + [ + "has_chocolate_block", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/shared/src/main/resources/data/croptopia/loot_tables/blocks/chocolate_block.json b/shared/src/main/resources/data/croptopia/loot_tables/blocks/chocolate_block.json new file mode 100644 index 000000000..e2773e93c --- /dev/null +++ b/shared/src/main/resources/data/croptopia/loot_tables/blocks/chocolate_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "croptopia:chocolate_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/shared/src/main/resources/data/croptopia/recipes/chocolate_block.json b/shared/src/main/resources/data/croptopia/recipes/chocolate_block.json new file mode 100644 index 000000000..d61813620 --- /dev/null +++ b/shared/src/main/resources/data/croptopia/recipes/chocolate_block.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + }, + { + "item": "croptopia:chocolate" + } + ], + "result": { + "item": "croptopia:chocolate_block", + "count": 1 + } +} \ No newline at end of file diff --git a/shared/src/main/resources/data/croptopia/recipes/chocolate_from_block.json b/shared/src/main/resources/data/croptopia/recipes/chocolate_from_block.json new file mode 100644 index 000000000..d40a06b90 --- /dev/null +++ b/shared/src/main/resources/data/croptopia/recipes/chocolate_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "croptopia:chocolate_block" + } + ], + "result": { + "item": "croptopia:chocolate", + "count": 9 + } +} \ No newline at end of file