diff --git a/src/main/generated/data/acesbs/advancement/recipes/food/cigarette.json b/src/main/generated/data/acesbs/advancement/recipes/food/cigarette.json new file mode 100644 index 0000000..34d7b86 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/food/cigarette.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:cigarette" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tobacco": { + "conditions": { + "items": [ + { + "items": "acesbs:tobacco" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tobacco" + ] + ], + "rewards": { + "recipes": [ + "acesbs:cigarette" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/food/cigarette_funny.json b/src/main/generated/data/acesbs/advancement/recipes/food/cigarette_funny.json new file mode 100644 index 0000000..8788924 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/food/cigarette_funny.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cigarette": { + "conditions": { + "items": [ + { + "items": "acesbs:cigarette" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:cigarette_funny" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cigarette" + ] + ], + "rewards": { + "recipes": [ + "acesbs:cigarette_funny" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/food/cigarette_lemon.json b/src/main/generated/data/acesbs/advancement/recipes/food/cigarette_lemon.json new file mode 100644 index 0000000..09604c4 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/food/cigarette_lemon.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cigarette": { + "conditions": { + "items": [ + { + "items": "acesbs:cigarette" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:cigarette_lemon" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cigarette" + ] + ], + "rewards": { + "recipes": [ + "acesbs:cigarette_lemon" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/cigarette.json b/src/main/generated/data/acesbs/recipe/cigarette.json new file mode 100644 index 0000000..754c762 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/cigarette.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:paper" + }, + { + "item": "acesbs:tobacco" + } + ], + "result": { + "count": 1, + "id": "acesbs:cigarette" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/cigarette_funny.json b/src/main/generated/data/acesbs/recipe/cigarette_funny.json new file mode 100644 index 0000000..6797030 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/cigarette_funny.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "acesbs:cigarette" + }, + { + "item": "acesbs:infernal_ashes" + } + ], + "result": { + "count": 1, + "id": "acesbs:cigarette_funny" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/cigarette_lemon.json b/src/main/generated/data/acesbs/recipe/cigarette_lemon.json new file mode 100644 index 0000000..9abacab --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/cigarette_lemon.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "acesbs:cigarette" + }, + { + "item": "acesbs:combustible_lemon" + } + ], + "result": { + "count": 1, + "id": "acesbs:cigarette_lemon" + } +} \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index 5b0759c..ebfd0e1 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -59,6 +59,24 @@ public class ModRecipeProvider extends FabricRecipeProvider { .criterion(hasItem(ModItems.STABLE_ENDTROPY), conditionsFromItem(ModItems.STABLE_ENDTROPY)) .offerTo(recipeExporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, ModItems.CIGARETTE, 1) + .input(Items.PAPER, 1) + .input(ModItems.TOBACCO, 1) + .criterion(hasItem(ModItems.TOBACCO), conditionsFromItem(ModItems.TOBACCO)) + .offerTo(recipeExporter); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, ModItems.CIGARETTE_LEMON, 1) + .input(ModItems.CIGARETTE, 1) + .input(ModItems.COMBUSTIBLE_LEMON, 1) + .criterion(hasItem(ModItems.CIGARETTE), conditionsFromItem(ModItems.CIGARETTE)) + .offerTo(recipeExporter); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, ModItems.CIGARETTE_FUNNY, 1) + .input(ModItems.CIGARETTE, 1) + .input(ModItems.INFERNAL_ASHES, 1) + .criterion(hasItem(ModItems.CIGARETTE), conditionsFromItem(ModItems.CIGARETTE)) + .offerTo(recipeExporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, ModBlocks.CRYSTAL_ENTROPY, 8) .pattern("###") .pattern("#S#") diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index 58ae6af..5a3410e 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -50,7 +50,7 @@ "item.acesbs.tobacco": "Tobacco", "item.acesbs.cigarette": "Cigarette", "item.acesbs.cigarette_lemon": "Cigarette", - "item.acesbs.cigarette_funny": "Cigarette", + "item.acesbs.cigarette_funny": "Hazy Cigarette", "item.acesbs.fren_spawn_egg": "Fren Spawn Egg",