From a9962f0460934738ac8aadab9e91dd7dcb247ac1 Mon Sep 17 00:00:00 2001 From: UnRealDinnerbone Date: Thu, 27 Jul 2023 14:35:39 -0500 Subject: [PATCH] Fix Crafting Recipe closes #8 --- CHANGELOG.md | 4 +-- .../048cbd7596a74e9a5aebee5c3e5ec0f2019e93c5 | 2 +- .../8592a013770b9a918aaf0557b8379b5e00456828 | 2 +- .../dbdf4bbea9f55df734427dda8ee4bcb7c4c8439e | 2 +- .../ee14de1d8ce97975f07dd66153061c5d3791ad6f | 3 ++ .../efc17561285db336505206f3ced1e22d2913ad29 | 2 +- .../recipes/transportation/obsidian_boat.json | 35 +++++++++++++++++++ .../obsidianboat/recipes/obsidian_boat.json | 17 +++++++++ .../obsidianboat/data/OBFabricData.java | 1 + .../obsidianboat/data/RecipeProvider.java | 30 ++++++++++++++++ gradle.properties | 2 +- 11 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 Common/src/generated/resources/.cache/ee14de1d8ce97975f07dd66153061c5d3791ad6f create mode 100644 Common/src/generated/resources/data/obsidianboat/advancements/recipes/transportation/obsidian_boat.json create mode 100644 Common/src/generated/resources/data/obsidianboat/recipes/obsidian_boat.json create mode 100644 Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/RecipeProvider.java diff --git a/CHANGELOG.md b/CHANGELOG.md index f56f873..a49f453 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -### 3.0.1 +### 3.0.2 -Fix Fabirc not having dependency on Trenzalore +Fix recipe not existing \ No newline at end of file diff --git a/Common/src/generated/resources/.cache/048cbd7596a74e9a5aebee5c3e5ec0f2019e93c5 b/Common/src/generated/resources/.cache/048cbd7596a74e9a5aebee5c3e5ec0f2019e93c5 index 3dea171..17c0b85 100644 --- a/Common/src/generated/resources/.cache/048cbd7596a74e9a5aebee5c3e5ec0f2019e93c5 +++ b/Common/src/generated/resources/.cache/048cbd7596a74e9a5aebee5c3e5ec0f2019e93c5 @@ -1,2 +1,2 @@ -// 1.20 2023-06-10T12:35:03.3405424 Obsidian Boat/Model Definitions +// 1.20.1 2023-07-27T14:32:18.018293 Obsidian Boat/Model Definitions db54f38a1594a0f71ae2b4dd7367a72f9ba6d320 assets\obsidianboat\models\item\obsidian_boat.json diff --git a/Common/src/generated/resources/.cache/8592a013770b9a918aaf0557b8379b5e00456828 b/Common/src/generated/resources/.cache/8592a013770b9a918aaf0557b8379b5e00456828 index b0c9298..71bb831 100644 --- a/Common/src/generated/resources/.cache/8592a013770b9a918aaf0557b8379b5e00456828 +++ b/Common/src/generated/resources/.cache/8592a013770b9a918aaf0557b8379b5e00456828 @@ -1,2 +1,2 @@ -// 1.20 2023-06-10T12:35:03.3400423 Obsidian Boat/Language (en_us) +// 1.20.1 2023-07-27T14:32:18.0177916 Obsidian Boat/Language (en_us) a7d157e3941a596cf1a9fb9925adc58d085baaab assets\obsidianboat\lang\en_us.json diff --git a/Common/src/generated/resources/.cache/dbdf4bbea9f55df734427dda8ee4bcb7c4c8439e b/Common/src/generated/resources/.cache/dbdf4bbea9f55df734427dda8ee4bcb7c4c8439e index 8aef955..dce61b6 100644 --- a/Common/src/generated/resources/.cache/dbdf4bbea9f55df734427dda8ee4bcb7c4c8439e +++ b/Common/src/generated/resources/.cache/dbdf4bbea9f55df734427dda8ee4bcb7c4c8439e @@ -1,2 +1,2 @@ -// 1.20 2023-06-10T12:35:03.3324919 Obsidian Boat/Advancements +// 1.20.1 2023-07-27T14:32:18.0157923 Obsidian Boat/Advancements 0add7ba9f9ed61d9dac42378e162dcd94f9bd98e data\obsidianboat\advancements\obsidianboat.json diff --git a/Common/src/generated/resources/.cache/ee14de1d8ce97975f07dd66153061c5d3791ad6f b/Common/src/generated/resources/.cache/ee14de1d8ce97975f07dd66153061c5d3791ad6f new file mode 100644 index 0000000..d1eb1bc --- /dev/null +++ b/Common/src/generated/resources/.cache/ee14de1d8ce97975f07dd66153061c5d3791ad6f @@ -0,0 +1,3 @@ +// 1.20.1 2023-07-27T14:32:18.018293 Obsidian Boat/Recipes +42167c87c3b2c9db6d765326f2c81d2ab816b20a data\obsidianboat\advancements\recipes\transportation\obsidian_boat.json +8d0abd28f06bfb7ca69ca3bd3ec89ab50b768085 data\obsidianboat\recipes\obsidian_boat.json diff --git a/Common/src/generated/resources/.cache/efc17561285db336505206f3ced1e22d2913ad29 b/Common/src/generated/resources/.cache/efc17561285db336505206f3ced1e22d2913ad29 index 4aecfe1..36f4556 100644 --- a/Common/src/generated/resources/.cache/efc17561285db336505206f3ced1e22d2913ad29 +++ b/Common/src/generated/resources/.cache/efc17561285db336505206f3ced1e22d2913ad29 @@ -1,2 +1,2 @@ -// 1.20 2023-06-10T12:35:03.3390412 Obsidian Boat/Pack Metadata +// 1.20.1 2023-07-27T14:32:18.0172916 Obsidian Boat/Pack Metadata bf3a2399e4449bd8af5b7765ddce0ed0a7d28f19 pack.mcmeta diff --git a/Common/src/generated/resources/data/obsidianboat/advancements/recipes/transportation/obsidian_boat.json b/Common/src/generated/resources/data/obsidianboat/advancements/recipes/transportation/obsidian_boat.json new file mode 100644 index 0000000..ef21191 --- /dev/null +++ b/Common/src/generated/resources/data/obsidianboat/advancements/recipes/transportation/obsidian_boat.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_obsidian": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:obsidian" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "obsidianboat:obsidian_boat" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_obsidian", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "obsidianboat:obsidian_boat" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/obsidianboat/recipes/obsidian_boat.json b/Common/src/generated/resources/data/obsidianboat/recipes/obsidian_boat.json new file mode 100644 index 0000000..ea10f46 --- /dev/null +++ b/Common/src/generated/resources/data/obsidianboat/recipes/obsidian_boat.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "O": { + "item": "minecraft:obsidian" + } + }, + "pattern": [ + "O O", + "OOO" + ], + "result": { + "item": "obsidianboat:obsidian_boat" + }, + "show_notification": true +} \ No newline at end of file diff --git a/Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/OBFabricData.java b/Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/OBFabricData.java index de6c988..44e8dda 100644 --- a/Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/OBFabricData.java +++ b/Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/OBFabricData.java @@ -14,5 +14,6 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider((output, registriesFuture) -> PackMetadataGenerator.forFeaturePack(output, Component.literal(ObsidianBoat.MOD_ID))); pack.addProvider(ModelProvider::new); pack.addProvider(LangProvider::new); + pack.addProvider(RecipeProvider::new); } } diff --git a/Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/RecipeProvider.java b/Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/RecipeProvider.java new file mode 100644 index 0000000..c43a0ed --- /dev/null +++ b/Fabric/src/main/java/com/unrealdinnerbone/obsidianboat/data/RecipeProvider.java @@ -0,0 +1,30 @@ +package com.unrealdinnerbone.obsidianboat.data; + +import com.unrealdinnerbone.obsidianboat.OBRegistry; +import com.unrealdinnerbone.obsidianboat.ObsidianBoat; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; + +import java.util.function.Consumer; + +public class RecipeProvider extends FabricRecipeProvider { + + public RecipeProvider(FabricDataOutput output) { + super(output); + } + + @Override + public void buildRecipes(Consumer exporter) { + ShapedRecipeBuilder.shaped(RecipeCategory.TRANSPORTATION, OBRegistry.BOAT_ITEM.get(), 1) + .pattern("O O") + .pattern("OOO") + .unlockedBy("has_obsidian", has(Blocks.OBSIDIAN)) + .define('O', Blocks.OBSIDIAN).save(exporter, new ResourceLocation(ObsidianBoat.MOD_ID, "obsidian_boat")); + } +} diff --git a/gradle.properties b/gradle.properties index 19d6a3f..7386242 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version=3.0.1 +mod_version=3.0.2 maven_group=com.unrealdinnerbone mod_name=ObsidianBoat mod_author=UnRealDinnerbone