generated from FabricMC/fabric-example-mod
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Coffee shrubs now produce coffee berries Coffee beans are obtained by smelting, smoking, or cooking coffee berries
- Loading branch information
1 parent
76c0c37
commit 0215056
Showing
22 changed files
with
256 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 7 additions & 3 deletions
10
src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,23 @@ | ||
| // 1.20.1 2023-07-29T20:45:24.1044343 Caffeinated/Recipes | ||
| // 1.20.1 2023-12-23T13:13:12.7945992 Caffeinated/Recipes | ||
| 8673497eb207defcf0d042ff52b307325dcef6ee data\caffeinated\advancements\recipes\misc\coffee_beans_from_campfire_cooking.json | ||
| 2b1061f72b3e9a1295c9aa4334d37c9dcb3dfc53 data\caffeinated\advancements\recipes\misc\java_banner_pattern.json | ||
| a01565ba0bf9276c839227dfab5f9fa1083cb376 data\caffeinated\recipes\ground_coffee_block.json | ||
| bb529f25b75b190a9da8518d7a0931d22cbaf194 data\caffeinated\advancements\recipes\decorations\coffee_bean_block.json | ||
| 06c7edbdec5cf1deb92d8e421279587f14aaab54 data\caffeinated\advancements\recipes\food\tiramisu.json | ||
| 5dfbeda6e15d9e292a25fc4e3f33d71b2ab777cb data\caffeinated\recipes\coffee_beans_from_smoking.json | ||
| f8bbfcc2f655643293992d2bc113858fedbcc78f data\caffeinated\recipes\tiramisu.json | ||
| 0c5f3057fe5d2ccf6a5bd511a99c41f7c9270949 data\caffeinated\advancements\recipes\misc\coffee_beans_from_smoking.json | ||
| 908cf4832738bbe7e7934ebe2d267c0b0ec59c08 data\caffeinated\recipes\ground_coffee.json | ||
| ca718ec02747f39187e77abb367019198eac644e data\caffeinated\recipes\brown_dye_from_ground_coffee.json | ||
| d34b1b5cba65cbe93df946e3a6badee9edc69dc0 data\caffeinated\recipes\coffee_berries.json | ||
| ca718ec02747f39187e77abb367019198eac644e data\caffeinated\recipes\brown_dye_from_ground_coffee.json | ||
| 7d3019bc5b37ce3328bf16cc9b8edb2eb0839802 data\caffeinated\advancements\recipes\food\tiramisu_from_slices.json | ||
| ebc2f568cdba0689d1071919c8b4a6bd23cc8df4 data\caffeinated\recipes\coffee_bean_block.json | ||
| 3f815caa0d14d9f4dd898dfd686a518ba07b5408 data\caffeinated\advancements\recipes\misc\brown_dye_from_ground_coffee.json | ||
| f86c55d2f85321c89c00baa260f1964d8b81bdcf data\caffeinated\recipes\tiramisu_from_slices.json | ||
| 9dd043aa58724c5f9d877d84071191951a251c2b data\caffeinated\recipes\coffee_beans_from_campfire_cooking.json | ||
| 5721d4f7e3a65f7b6f387ec00ee996f73a2f51ee data\caffeinated\advancements\recipes\misc\coffee_beans.json | ||
| d466ced2e8e679a807bdbcee307e0eb5e6547942 data\caffeinated\recipes\java_banner_pattern.json | ||
| 55a0f263de5782dd9ec9aecd1d1ae815e3760bdb data\caffeinated\advancements\recipes\decorations\ground_coffee_block.json | ||
| b67cc3f3146c0c39c1151ae25cda9e7e407ac8e2 data\caffeinated\recipes\coffee_beans.json | ||
| 0b149e84f6935ec71d6eeaa46768dd2a4a8c02d2 data\caffeinated\recipes\coffee_beans.json | ||
| c1dd44b442244812fd79333ec001551523590d59 data\caffeinated\advancements\recipes\misc\ground_coffee.json | ||
| 7ac9428c1c4810e6e439997467b8c5afad1711b9 data\caffeinated\advancements\recipes\food\coffee_berries.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
...erated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_campfire_cooking.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_coffee_berries": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "caffeinated:coffee_berries" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "minecraft:coffee_beans_from_campfire_cooking" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_coffee_berries", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecraft:coffee_beans_from_campfire_cooking" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_smoking.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_coffee_berries": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "caffeinated:coffee_berries" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "minecraft:coffee_beans_from_smoking" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_coffee_berries", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecraft:coffee_beans_from_smoking" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
16 changes: 7 additions & 9 deletions
16
src/main/generated/data/caffeinated/recipes/coffee_beans.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,10 @@ | ||
| { | ||
| "type": "minecraft:crafting_shapeless", | ||
| "type": "minecraft:smelting", | ||
| "category": "misc", | ||
| "ingredients": [ | ||
| { | ||
| "item": "caffeinated:coffee_berries" | ||
| } | ||
| ], | ||
| "result": { | ||
| "item": "caffeinated:coffee_beans" | ||
| } | ||
| "cookingtime": 200, | ||
| "experience": 0.3, | ||
| "ingredient": { | ||
| "item": "caffeinated:coffee_berries" | ||
| }, | ||
| "result": "caffeinated:coffee_beans" | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/main/generated/data/caffeinated/recipes/coffee_beans_from_campfire_cooking.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "type": "minecraft:campfire_cooking", | ||
| "category": "misc", | ||
| "cookingtime": 600, | ||
| "experience": 0.3, | ||
| "ingredient": { | ||
| "item": "caffeinated:coffee_berries" | ||
| }, | ||
| "result": "caffeinated:coffee_beans" | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/main/generated/data/caffeinated/recipes/coffee_beans_from_smoking.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "type": "minecraft:smoking", | ||
| "category": "misc", | ||
| "cookingtime": 100, | ||
| "experience": 0.3, | ||
| "ingredient": { | ||
| "item": "caffeinated:coffee_berries" | ||
| }, | ||
| "result": "caffeinated:coffee_beans" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
src/main/java/com/chikoritalover/caffeinated/CaffeinatedEarlyRiser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package com.chikoritalover.caffeinated; | ||
|
|
||
| import com.chikoritalover.caffeinated.registry.CaffeinatedItems; | ||
| import com.chocohead.mm.api.ClassTinkerers; | ||
| import net.fabricmc.loader.api.FabricLoader; | ||
| import net.fabricmc.loader.api.MappingResolver; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.Items; | ||
|
|
||
| public class CaffeinatedEarlyRiser implements Runnable { | ||
| @Override | ||
| public void run() { | ||
| MappingResolver mappingResolver = FabricLoader.getInstance().getMappingResolver(); | ||
|
|
||
| String recipeBookGroup = mappingResolver.mapClassName("intermediary", "net.minecraft.class_314"); | ||
| String itemStack = "[L" + mappingResolver.mapClassName("intermediary", "net.minecraft.class_1799") + ';'; | ||
| ClassTinkerers.enumBuilder(recipeBookGroup, itemStack).addEnum("CAFFEINATED_SMOKER_MISC", () -> new Object[]{new ItemStack[]{new ItemStack(Items.LAVA_BUCKET), new ItemStack(CaffeinatedItems.COFFEE_BERRIES)}}).build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
src/main/java/com/chikoritalover/caffeinated/mixin/ClientRecipeBookMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.chikoritalover.caffeinated.mixin; | ||
|
|
||
| import com.chocohead.mm.api.ClassTinkerers; | ||
| import net.minecraft.client.recipebook.ClientRecipeBook; | ||
| import net.minecraft.client.recipebook.RecipeBookGroup; | ||
| import net.minecraft.recipe.AbstractCookingRecipe; | ||
| import net.minecraft.recipe.Recipe; | ||
| import net.minecraft.recipe.book.CookingRecipeCategory; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| @Mixin(ClientRecipeBook.class) | ||
| public class ClientRecipeBookMixin { | ||
| private static final RecipeBookGroup SMOKER_MISC = ClassTinkerers.getEnum(RecipeBookGroup.class, "CAFFEINATED_SMOKER_MISC"); | ||
|
|
||
| @Inject(method = "getGroupForRecipe", at = @At("RETURN"), cancellable = true) | ||
| private static void getGroupForRecipe(Recipe<?> recipe, CallbackInfoReturnable<RecipeBookGroup> cir) { | ||
| if (recipe instanceof AbstractCookingRecipe abstractCookingRecipe) { | ||
| CookingRecipeCategory cookingRecipeCategory = abstractCookingRecipe.getCategory(); | ||
| if (cir.getReturnValue() == RecipeBookGroup.SMOKER_FOOD && cookingRecipeCategory == CookingRecipeCategory.MISC) { | ||
| cir.setReturnValue(SMOKER_MISC); | ||
| } | ||
| } | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/main/java/com/chikoritalover/caffeinated/mixin/CookingRecipeJsonBuilderMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.chikoritalover.caffeinated.mixin; | ||
|
|
||
| import net.minecraft.data.server.recipe.CookingRecipeJsonBuilder; | ||
| import net.minecraft.item.ItemConvertible; | ||
| import net.minecraft.recipe.AbstractCookingRecipe; | ||
| import net.minecraft.recipe.RecipeSerializer; | ||
| import net.minecraft.recipe.book.CookingRecipeCategory; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| @Mixin(CookingRecipeJsonBuilder.class) | ||
| public class CookingRecipeJsonBuilderMixin { | ||
| @Inject(method = "getCookingRecipeCategory", at = @At("HEAD"), cancellable = true) | ||
| private static void getCookingRecipeCategory(RecipeSerializer<? extends AbstractCookingRecipe> serializer, ItemConvertible output, CallbackInfoReturnable<CookingRecipeCategory> cir) { | ||
| if (serializer == RecipeSerializer.SMOKING || serializer == RecipeSerializer.CAMPFIRE_COOKING) { | ||
| cir.setReturnValue(output.asItem().isFood() ? CookingRecipeCategory.FOOD : CookingRecipeCategory.MISC); | ||
| } | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
src/main/java/com/chikoritalover/caffeinated/mixin/RecipeBookGroupMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package com.chikoritalover.caffeinated.mixin; | ||
|
|
||
| import com.chocohead.mm.api.ClassTinkerers; | ||
| import net.minecraft.client.recipebook.RecipeBookGroup; | ||
| import org.spongepowered.asm.mixin.*; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| @Mixin(RecipeBookGroup.class) | ||
| public class RecipeBookGroupMixin { | ||
| @Unique | ||
| private static final RecipeBookGroup SMOKER_MISC = ClassTinkerers.getEnum(RecipeBookGroup.class, "CAFFEINATED_SMOKER_MISC"); | ||
|
|
||
| @Mutable | ||
| @Shadow | ||
| @Final | ||
| public static Map<RecipeBookGroup, List<RecipeBookGroup>> SEARCH_MAP; | ||
|
|
||
| @Shadow | ||
| @Final | ||
| public static RecipeBookGroup SMOKER_SEARCH; | ||
|
|
||
| @Mutable | ||
| @Shadow | ||
| @Final | ||
| public static List<RecipeBookGroup> SMOKER; | ||
|
|
||
| @Inject(method = "<clinit>", at = @At("TAIL")) | ||
| private static void setSearchMap(CallbackInfo ci) { | ||
| ArrayList<RecipeBookGroup> recipeBookGroups = new ArrayList<>(SMOKER); | ||
| recipeBookGroups.add(SMOKER_MISC); | ||
| SMOKER = recipeBookGroups; | ||
|
|
||
| Map<RecipeBookGroup, List<RecipeBookGroup>> newMap = new HashMap<>(); | ||
| SEARCH_MAP.forEach((group, groups) -> { | ||
| ArrayList<RecipeBookGroup> arrayList = new ArrayList<>(groups); | ||
| if (group == SMOKER_SEARCH) { | ||
| arrayList.add(SMOKER_MISC); | ||
| } | ||
| newMap.put(group, arrayList); | ||
| }); | ||
| SEARCH_MAP = newMap; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.