From d8c05b09fd70480cc046155b9bba89c4de88ffa4 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Mon, 11 May 2026 15:10:23 +0200 Subject: [PATCH 1/9] (BREAKING CHANGES) modernized x now it use more simple and clean names --- .../com/devdyna/cakesticklib/api/utils/x.java | 182 ++++++++++++++---- .../setup/common/events/ItemToolTipped.java | 2 +- .../setup/registry/builders/Chisel.java | 2 +- 3 files changed, 147 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/devdyna/cakesticklib/api/utils/x.java b/src/main/java/com/devdyna/cakesticklib/api/utils/x.java index 3e0b9f6..56af7de 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/utils/x.java +++ b/src/main/java/com/devdyna/cakesticklib/api/utils/x.java @@ -52,7 +52,7 @@ public static Identifier parse(String s) { * @param d BuiltInRegistries.BLOCK * @param i Blocks.STONE */ - public static Identifier rl(DefaultedRegistry d, T i) { + private static Identifier rl(DefaultedRegistry d, T i) { return d.getKey(i); } @@ -60,6 +60,7 @@ public static Identifier rl(DefaultedRegistry d, T i) { * @param d BuiltInRegistries.BLOCK * @param i Blocks.STONE */ + @Deprecated public static Identifier rl(DefaultedRegistry d, T i, String modid) { return rl(modid, path(d, i)); } @@ -77,71 +78,99 @@ public static Identifier rl(Block i) { } /** - * @param d BuiltInRegistries.BLOCK - * @param i Blocks.STONE + * {@code path(?)} -> {@code name(?)} */ - public static String path(DefaultedRegistry d, T i) { - return d.getKey(i).getPath(); + private static String path(DefaultedRegistry d, T i) { + return rl(d, i).getPath(); } - public static String path(TagKey t) { + public static String name(TagKey t) { return rl(t).getPath(); } - public static String path(Item i) { + public static String name(Item i) { return path(BuiltInRegistries.ITEM, i); } - public static String path(Fluid i) { + public static String name(Fluid i) { return path(BuiltInRegistries.FLUID, i); } - public static String path(ItemStack i) { - return path(i.getItem()); + public static String name(ItemStack i) { + return name(i.getItem()); } - public static String path(Block i) { + public static String name(Block i) { return path(BuiltInRegistries.BLOCK, i); } - public static String path(BlockState i) { - return path(i.getBlock()); + public static String name(BlockState i) { + return name(i.getBlock()); } - /** - * @param - * @param d BuiltInRegistries.BLOCK - * @param i "stone" - */ - public static T get(DefaultedRegistry d, String modid, String i) { - return d.getValue(rl(modid, i)); + public static String name(ItemStackTemplate i) { + return name(i.item().value()); } - public static T get(DefaultedRegistry d, Identifier i) { - return d.getValue(i); + public static String name(ItemLike i) { + return name(i.asItem()); + } + + private static String mod(DefaultedRegistry d, T i) { + return rl(d, i).getNamespace(); + } + + public static String mod(TagKey t) { + return rl(t).getNamespace(); + } + + public static String mod(Item i) { + return mod(BuiltInRegistries.ITEM, i); + } + + public static String mod(Fluid i) { + return mod(BuiltInRegistries.FLUID, i); + } + + public static String mod(ItemStack i) { + return mod(i.getItem()); + } + + public static String mod(ItemStackTemplate i) { + return mod(i.item().value()); + } + + public static String mod(ItemLike i) { + return mod(i.asItem()); + } + + public static String mod(Block i) { + return mod(BuiltInRegistries.BLOCK, i); + } + + public static String mod(BlockState i) { + return mod(i.getBlock()); } - /** - * use x.rl(Item) - */ @Deprecated - public static Identifier id(Item item) { - return BuiltInRegistries.ITEM.getKey(item); + public static T get(DefaultedRegistry d, String modid, String i) { + return d.getValue(rl(modid, i)); } - public static String getMod(Item item) { - return BuiltInRegistries.ITEM.getKey(item).getNamespace(); + private static T get(DefaultedRegistry d, Identifier i) { + return d.getValue(i); } - public static String getMod(ItemLike item) { - return getMod(item.asItem()); + + public static Item getItem(Identifier rl) { + return get(BuiltInRegistries.ITEM, rl); } - public static String getTagName(TagKey tag) { - return tag.location().getPath().toString(); + public static Fluid getFluid(Identifier rl) { + return get(BuiltInRegistries.FLUID, rl); } - public static Item get(Identifier rl) { - return BuiltInRegistries.ITEM.getValue(rl); + public static Block getBlock(Identifier rl) { + return get(BuiltInRegistries.BLOCK, rl); } // Stack types @@ -241,6 +270,7 @@ public static Ingredient itemIngredient(TagKey i, HolderLookup.Provider p) /** * This method will create a new itemtag! */ + @Deprecated public static Ingredient itemIngredient(Identifier tag) { return itemIngredient(TagKey.create(Registries.ITEM, tag)); } @@ -324,14 +354,17 @@ public static SizedFluidIngredient fluidSized(Fluid fluid) { // Block types // -------------------------------------------------// + @Deprecated public static Block block(DeferredHolder b) { return b.get(); } + @Deprecated public static BlockState state(DeferredHolder b) { return block(b).defaultBlockState(); } + @Deprecated public static Block block(BlockState b) { return b.getBlock(); } @@ -339,6 +372,7 @@ public static Block block(BlockState b) { // other // -------------------------------------------------// + @Deprecated public static ItemStack stack(DeferredHolder holder) { T obj = holder.get(); if (obj instanceof Item item) { @@ -350,28 +384,96 @@ public static ItemStack stack(DeferredHolder holder) { } } + @Deprecated public static List getFluids(SizedFluidIngredient i) { return getFluids(i.ingredient()); } + @Deprecated public static List getFluids(FluidIngredient i) { return i.fluids().stream() .map(Holder::value) .map(x::fluid).toList(); } + /** + * Mainly useful on {@code unlockedBy()} recipebuilder method + */ + public static Fluid[] getFluidsFromIngredient(FluidIngredient f) { + return f.fluids().stream() + .map(Holder::getKey) + .map(ResourceKey::identifier) + .map(BuiltInRegistries.FLUID::getValue) + .toArray(Fluid[]::new); + } + + /** + * Mainly useful on {@code unlockedBy()} recipebuilder method + */ + public static Item[] getItemsFromIngredient(Ingredient i) { + return i.getValues().stream() + .map(Holder::getKey) + .map(ResourceKey::identifier) + .map(BuiltInRegistries.ITEM::getValue) + .toArray(Item[]::new); + } + + /** + * Don't use on recipe builders! + */ + public static List getFluidStacksFromIngredient(FluidIngredient f) { + return Arrays.asList(getFluidsFromIngredient(f)) + .stream() + .map(s -> x.fluid(s)) + .toList(); + } + + /** + * Don't use on recipe builders! + */ + public static List getFluidStacksFromIngredient(SizedFluidIngredient f) { + return Arrays.asList(getFluidsFromIngredient(f.ingredient())) + .stream() + .map(s -> x.fluid(s, f.amount())) + .toList(); + } + + /** + * Don't use on recipe builders! + */ + public static List getItemStacksFromIngredient(Ingredient i) { + return Arrays.asList(getItemsFromIngredient(i)) + .stream() + .map(s -> x.item(s)) + .toList(); + } + + /** + * Don't use on recipe builders! + */ + public static List getItemStacksFromIngredient(SizedIngredient i) { + return Arrays.asList(getItemsFromIngredient(i.ingredient())) + .stream() + .map(s -> x.item(s, i.count())) + .toList(); + } + + @Deprecated public static boolean matchAny(SizedFluidIngredient s, SizedFluidIngredient f) { return getFluids(s).stream().anyMatch(i -> f.test(i)); } + @Deprecated public static boolean matchAny(SizedIngredient s, SizedIngredient f) { return getItems(s).stream().anyMatch(i -> f.test(i)); } + @Deprecated public static List getItems(SizedIngredient i) { return getItems(i.ingredient()); } + @Deprecated public static List getItems(Ingredient i) { return i.getValues().stream() .map(Holder::value) @@ -379,7 +481,10 @@ public static List getItems(Ingredient i) { } public static Block[] toBlocks(DeferredHolder... blocks) { - return Arrays.asList(blocks).stream().map(DeferredHolder::get).toArray(Block[]::new); + return Arrays.asList(blocks) + .stream() + .map(DeferredHolder::get) + .toArray(Block[]::new); } public static Item[] toItems(DeferredHolder... blocks) { @@ -387,7 +492,10 @@ public static Item[] toItems(DeferredHolder... blocks) { } public static Item[] toItems(Block... blocks) { - return Arrays.asList(blocks).stream().map(Block::asItem).toArray(Item[]::new); + return Arrays.asList(blocks) + .stream() + .map(Block::asItem) + .toArray(Item[]::new); } public static List>> getBlocks(DataMapType datamap) { diff --git a/src/main/java/com/devdyna/cakesticklib/setup/common/events/ItemToolTipped.java b/src/main/java/com/devdyna/cakesticklib/setup/common/events/ItemToolTipped.java index aed3d57..f4b200b 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/common/events/ItemToolTipped.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/common/events/ItemToolTipped.java @@ -65,7 +65,7 @@ public static void main(ItemTooltipEvent event) { if (nbt != null) tip.add(2, Component.translatable(MODULE_ID + ".info.identifier.hold") - .append(Component.translatable(x.get(nbt).getDescriptionId()) + .append(Component.translatable(x.getItem(nbt).getDescriptionId()) .withStyle(ChatFormatting.GREEN))); } diff --git a/src/main/java/com/devdyna/cakesticklib/setup/registry/builders/Chisel.java b/src/main/java/com/devdyna/cakesticklib/setup/registry/builders/Chisel.java index df076b5..ad893e4 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/registry/builders/Chisel.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/registry/builders/Chisel.java @@ -54,7 +54,7 @@ public InteractionResult useOn(UseOnContext c) { if (id == null) return InteractionResult.FAIL; - var saved = x.get(id); + var saved = x.getItem(id); var recipes = level.recipeAccess().stonecutterRecipes().selectByInput(blockItem); From 53a8b544c63b3e4048ca5534eff9fa987ee50055 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Mon, 11 May 2026 15:10:46 +0200 Subject: [PATCH 2/9] Update JEIFluidTankHelper.java --- .../api/compat/jei/JEIFluidTankHelper.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/devdyna/cakesticklib/api/compat/jei/JEIFluidTankHelper.java b/src/main/java/com/devdyna/cakesticklib/api/compat/jei/JEIFluidTankHelper.java index f9b1894..498f719 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/compat/jei/JEIFluidTankHelper.java +++ b/src/main/java/com/devdyna/cakesticklib/api/compat/jei/JEIFluidTankHelper.java @@ -1,6 +1,5 @@ package com.devdyna.cakesticklib.api.compat.jei; - import java.util.List; import java.util.function.BiFunction; @@ -19,7 +18,6 @@ public class JEIFluidTankHelper { private float h = 1f; private float w = 1f; - public JEIFluidTankHelper() { } @@ -30,17 +28,18 @@ public JEIFluidTankHelper offset(int x, int y) { } public JEIFluidTankHelper fluid(SizedFluidIngredient f) { - this.fluids = x.getFluids(f); + this.fluids = x.getFluidStacksFromIngredient(f); return this; } + public JEIFluidTankHelper fluid(FluidStack f) { - this.fluids = List.of(f); + this.fluids = List.of(f); return this; } - public JEIFluidTankHelper scale(float height,float width) { - this.w = width; - this.h = height; + public JEIFluidTankHelper scale(float height, float width) { + this.w = width; + this.h = height; return this; } @@ -49,10 +48,10 @@ public static JEIFluidTankHelper of() { } public void build(BiFunction builder) { - var height =(int) (Math.min(16, Math.max((int) ((fluids.getFirst().getAmount() + 256) * 0.016), 1))*h); - builder.apply((int) (x0* w), y0 - height) + var height = (int) (Math.min(16, Math.max((int) ((fluids.getFirst().getAmount() + 256) * 0.016), 1)) * h); + builder.apply((int) (x0 * w), y0 - height) .addIngredients(NeoForgeTypes.FLUID_STACK, fluids) - .setFluidRenderer(fluids.getFirst().getAmount(), false, (int) (w*16), height); + .setFluidRenderer(fluids.getFirst().getAmount(), false, (int) (w * 16), height); } } From 08d515a6928da107c153e0e87bf346003d9fa68f Mon Sep 17 00:00:00 2001 From: DevDyna Date: Mon, 11 May 2026 15:12:09 +0200 Subject: [PATCH 3/9] (BREAKING CHANGES) HolderLookup.Provider unification now recipe builders require it on startup intend of every time you need to use a tagkey --- .../recipeBuilder/BaseRecipeBuilder.java | 15 ++++-- .../recipe/recipeBuilder/BuilderAttach.java | 4 ++ .../api/recipe/recipeBuilder/FluidAttach.java | 18 +++---- .../api/recipe/recipeBuilder/ItemAttach.java | 53 +++++++++---------- 4 files changed, 48 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BaseRecipeBuilder.java b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BaseRecipeBuilder.java index ae432c2..7563059 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BaseRecipeBuilder.java +++ b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BaseRecipeBuilder.java @@ -7,6 +7,7 @@ import net.minecraft.advancements.AdvancementRewards; import net.minecraft.advancements.Criterion; import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; +import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.RecipeOutput; @@ -16,11 +17,15 @@ public abstract class BaseRecipeBuilder { - // public final HolderLookup.Provider provider; - // TODO breaking changes - // protected BaseRecipeBuilder(HolderLookup.Provider provider){ - // this.provider = provider; - // } + protected final HolderLookup.Provider provider; + + protected BaseRecipeBuilder(HolderLookup.Provider provider) { + this.provider = provider; + } + + public HolderLookup.Provider getProvider() { + return provider; + } protected Map> criteria; diff --git a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BuilderAttach.java b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BuilderAttach.java index 466c650..812d47c 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BuilderAttach.java +++ b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/BuilderAttach.java @@ -1,6 +1,10 @@ package com.devdyna.cakesticklib.api.recipe.recipeBuilder; +import net.minecraft.core.HolderLookup; + public interface BuilderAttach { public abstract BUILDER getBuilder(); + abstract HolderLookup.Provider getProvider(); + } diff --git a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/FluidAttach.java b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/FluidAttach.java index c4ee4ee..4c751a0 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/FluidAttach.java +++ b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/FluidAttach.java @@ -3,7 +3,6 @@ import com.devdyna.cakesticklib.api.utils.x; -import net.minecraft.core.HolderLookup; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; import net.neoforged.neoforge.fluids.FluidStackTemplate; @@ -15,12 +14,12 @@ public static interface SizedFluid extends An abstract BUILDER fluid(SizedFluidIngredient fluid); - default BUILDER fluid(TagKey fluid, int amount, HolderLookup.Provider p) { - return fluid(x.fluidSized(fluid, amount, p)); + default BUILDER fluid(TagKey fluid, int amount) { + return fluid(x.fluidSized(fluid, amount, getProvider())); } - default BUILDER fluid(TagKey fluid, HolderLookup.Provider p) { - return fluid(x.fluidSized(fluid, 1000, p)); + default BUILDER fluid(TagKey fluid) { + return fluid(x.fluidSized(fluid, 1000, getProvider())); } default BUILDER fluid(Fluid fluid) { @@ -37,17 +36,16 @@ public static interface DoubleSizedFluid exte abstract BUILDER fluids(SizedFluidIngredient a, SizedFluidIngredient b); - default BUILDER fluids(TagKey a, int a_amount, TagKey b, int b_amount, - HolderLookup.Provider p) { - return fluids(x.fluidSized(a, a_amount, p), x.fluidSized(b, b_amount, p)); + default BUILDER fluids(TagKey a, int a_amount, TagKey b, int b_amount) { + return fluids(x.fluidSized(a, a_amount, getProvider()), x.fluidSized(b, b_amount, getProvider())); } default BUILDER fluids(Fluid a, int a_amount, Fluid b, int b_amount) { return fluids(x.fluidSized(a, a_amount), x.fluidSized(b, b_amount)); } - default BUILDER fluids(TagKey a, TagKey b, HolderLookup.Provider p) { - return fluids(x.fluidSized(a, 1000, p), x.fluidSized(b, 1000, p)); + default BUILDER fluids(TagKey a, TagKey b) { + return fluids(x.fluidSized(a, 1000, getProvider()), x.fluidSized(b, 1000, getProvider())); } default BUILDER fluids(Fluid a, Fluid b) { diff --git a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/ItemAttach.java b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/ItemAttach.java index 93fd3cb..75f80b4 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/ItemAttach.java +++ b/src/main/java/com/devdyna/cakesticklib/api/recipe/recipeBuilder/ItemAttach.java @@ -5,7 +5,6 @@ import com.devdyna.cakesticklib.api.utils.x; -import net.minecraft.core.HolderLookup; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStackTemplate; @@ -49,8 +48,8 @@ default BUILDER catalyst(ItemLike... catalyst) { return catalyst(x.itemIngredient(catalyst)); } - default BUILDER catalyst(TagKey catalyst, HolderLookup.Provider p) { - return catalyst(x.itemIngredient(catalyst, p)); + default BUILDER catalyst(TagKey catalyst) { + return catalyst(x.itemIngredient(catalyst, getProvider())); } } @@ -67,8 +66,8 @@ default BUILDER input(DeferredHolder input) { return input(input.get()); } - default BUILDER input(TagKey input, HolderLookup.Provider p) { - return input(x.itemIngredient(input, p)); + default BUILDER input(TagKey input) { + return input(x.itemIngredient(input, getProvider())); } } @@ -97,8 +96,8 @@ default BUILDER add(DeferredHolder input, int c) { return add(input.get(), c); } - default BUILDER add(TagKey input, int c, HolderLookup.Provider p) { - return add(x.itemIngredient(input, p), c); + default BUILDER add(TagKey input, int c) { + return add(x.itemIngredient(input, getProvider()), c); } default BUILDER add(ItemLike input, int c) { @@ -109,8 +108,8 @@ default BUILDER add(DeferredHolder input) { return add(input.get()); } - default BUILDER add(TagKey input, HolderLookup.Provider p) { - return add(x.itemIngredient(input, p)); + default BUILDER add(TagKey input) { + return add(x.itemIngredient(input, getProvider())); } default BUILDER add(ItemLike input) { @@ -130,8 +129,8 @@ default BUILDER add(DeferredHolder input) { return add(input.get()); } - default BUILDER add(TagKey input, HolderLookup.Provider p) { - return add(x.itemIngredient(input, p)); + default BUILDER add(TagKey input) { + return add(x.itemIngredient(input, getProvider())); } default BUILDER add(ItemLike input) { @@ -155,8 +154,8 @@ default BUILDER input(DeferredHolder input) { return input(input.get()); } - default BUILDER input(TagKey input, HolderLookup.Provider p) { - return input(x.itemSized(input, p)); + default BUILDER input(TagKey input) { + return input(x.itemSized(input, getProvider())); } default BUILDER input(Item input, int c) { @@ -167,8 +166,8 @@ default BUILDER input(DeferredHolder input, int c) { return input(input.get(), c); } - default BUILDER input(TagKey input, int c, HolderLookup.Provider p) { - return input(x.itemSized(input, c, p)); + default BUILDER input(TagKey input, int c) { + return input(x.itemSized(input, c, getProvider())); } } @@ -202,28 +201,28 @@ default BUILDER inputs(DeferredHolder right, DeferredHolder right, TagKey left, HolderLookup.Provider p) { - return inputs(right, 1, left, 1, p); + default BUILDER inputs(TagKey right, TagKey left) { + return inputs(right, 1, left, 1); } - default BUILDER inputs(TagKey right, Item left, HolderLookup.Provider p) { - return inputs(x.itemIngredient(right, p), x.itemIngredient(left)); + default BUILDER inputs(TagKey right, Item left) { + return inputs(x.itemIngredient(right, getProvider()), x.itemIngredient(left)); } - default BUILDER inputs(Item right, TagKey left, HolderLookup.Provider p) { - return inputs(x.itemIngredient(right), x.itemIngredient(left, p)); + default BUILDER inputs(Item right, TagKey left) { + return inputs(x.itemIngredient(right), x.itemIngredient(left, getProvider())); } - default BUILDER inputs(TagKey right, int a, TagKey left, int b, HolderLookup.Provider p) { - return inputs(x.itemIngredient(right, p), a, x.itemIngredient(left, p), b); + default BUILDER inputs(TagKey right, int a, TagKey left, int b) { + return inputs(x.itemIngredient(right, getProvider()), a, x.itemIngredient(left, getProvider()), b); } - default BUILDER inputs(TagKey right, int a, Item left, int b, HolderLookup.Provider p) { - return inputs(x.itemIngredient(right, p), a, x.itemIngredient(left), b); + default BUILDER inputs(TagKey right, int a, Item left, int b) { + return inputs(x.itemIngredient(right, getProvider()), a, x.itemIngredient(left), b); } - default BUILDER inputs(Item right, int a, TagKey left, int b, HolderLookup.Provider p) { - return inputs(x.itemIngredient(right), a, x.itemIngredient(left, p), b); + default BUILDER inputs(Item right, int a, TagKey left, int b) { + return inputs(x.itemIngredient(right), a, x.itemIngredient(left, getProvider()), b); } } From f9f7d5d45b3b9529abb886ecd277dc668c63c433 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Mon, 11 May 2026 15:12:37 +0200 Subject: [PATCH 4/9] file renamed to match other file names --- ...cipeBuilder.java => HammeringBuilder.java} | 38 ++++++++++--------- .../oxidation/CopperOxidationBuilder.java | 13 ++++--- .../UpgradeApplicationBuilder.java | 19 +++++----- ...ion.java => UpgradeApplicationRecipe.java} | 26 ++++++------- .../setup/registry/LibRecipeTypes.java | 6 +-- 5 files changed, 53 insertions(+), 49 deletions(-) rename src/main/java/com/devdyna/cakesticklib/setup/common/recipes/hammering/{HammeringRecipeBuilder.java => HammeringBuilder.java} (60%) rename src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/{UpgradeApplication.java => UpgradeApplicationRecipe.java} (72%) diff --git a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/hammering/HammeringRecipeBuilder.java b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/hammering/HammeringBuilder.java similarity index 60% rename from src/main/java/com/devdyna/cakesticklib/setup/common/recipes/hammering/HammeringRecipeBuilder.java rename to src/main/java/com/devdyna/cakesticklib/setup/common/recipes/hammering/HammeringBuilder.java index c7da137..ebfb658 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/hammering/HammeringRecipeBuilder.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/hammering/HammeringBuilder.java @@ -12,75 +12,77 @@ import net.minecraft.advancements.Criterion; import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.core.HolderLookup; import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; -public class HammeringRecipeBuilder extends BaseRecipeBuilder implements - ItemAttach.Output.SimpleOutputItem, - ItemAttach.Input.ListedNoItemCount { +public class HammeringBuilder extends BaseRecipeBuilder implements + ItemAttach.Output.SimpleOutputItem, + ItemAttach.Input.ListedNoItemCount { private List items = new ArrayList<>(); private ItemStackTemplate output; private InputToolDurability type; - public HammeringRecipeBuilder() { + public HammeringBuilder(HolderLookup.Provider p) { + super(p); this.criteria = new LinkedHashMap>(); } - public static HammeringRecipeBuilder of() { - return new HammeringRecipeBuilder(); + public static HammeringBuilder of(HolderLookup.Provider p) { + return new HammeringBuilder(p); } - public HammeringRecipeBuilder unlockedBy() { - return unlockedBy(MODULE_ID, InventoryChangeTrigger.TriggerInstance + public HammeringBuilder unlockedBy() { + return unlockedBy(x.name(LibItems.HAMMER.get()), InventoryChangeTrigger.TriggerInstance .hasItems(LibItems.HAMMER.get())); } - public HammeringRecipeBuilder unlockedBy(String name, Criterion criterion) { + public HammeringBuilder unlockedBy(String name, Criterion criterion) { this.criteria.put(name, criterion); return this; } - public HammeringRecipeBuilder tool(InputToolDurability type) { + public HammeringBuilder tool(InputToolDurability type) { this.type = type; return this; } - public HammeringRecipeBuilder tool(Ingredient tool) { + public HammeringBuilder tool(Ingredient tool) { return tool(InputToolDurability.of(tool, 1)); } - public HammeringRecipeBuilder tool(Item tool) { + public HammeringBuilder tool(Item tool) { return tool(InputToolDurability.of(x.itemIngredient(tool), 1)); } - public HammeringRecipeBuilder tool(Ingredient tool, int d) { + public HammeringBuilder tool(Ingredient tool, int d) { return tool(InputToolDurability.of(tool, d)); } - public HammeringRecipeBuilder tool(Item tool, int d) { + public HammeringBuilder tool(Item tool, int d) { return tool(InputToolDurability.of(x.itemIngredient(tool), d)); } @Override - public HammeringRecipeBuilder output(ItemStackTemplate output) { + public HammeringBuilder output(ItemStackTemplate output) { this.output = output; return this; } @Override - public HammeringRecipeBuilder add(Ingredient input) { + public HammeringBuilder add(Ingredient input) { this.items.add(input); return this; } @Override public Identifier getSuffix(String extra) { - return x.rl(MODULE_ID, "tool_use/" + x.path(output.item().value()).toLowerCase() + extra); + return x.rl(MODULE_ID, "tool_use/" + x.name(output).toLowerCase() + extra); } @Override @@ -89,7 +91,7 @@ public Recipe createRecipe() { } @Override - public HammeringRecipeBuilder getBuilder() { + public HammeringBuilder getBuilder() { return this; } diff --git a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/oxidation/CopperOxidationBuilder.java b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/oxidation/CopperOxidationBuilder.java index 9b28b5c..924223c 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/oxidation/CopperOxidationBuilder.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/oxidation/CopperOxidationBuilder.java @@ -22,17 +22,18 @@ public class CopperOxidationBuilder extends BaseRecipeBuilder { private OxidationStatus type; private Ingredient catalyst; - public CopperOxidationBuilder() { + public CopperOxidationBuilder(HolderLookup.Provider p) { + super(p); this.criteria = new LinkedHashMap>(); } - public static CopperOxidationBuilder of() { - return new CopperOxidationBuilder(); + public static CopperOxidationBuilder of(HolderLookup.Provider p) { + return new CopperOxidationBuilder(p); } public CopperOxidationBuilder unlockedBy() { - return unlockedBy(MODULE_ID, InventoryChangeTrigger.TriggerInstance + return unlockedBy(x.name(Items.COPPER_INGOT), InventoryChangeTrigger.TriggerInstance .hasItems(Items.COPPER_INGOT)); } @@ -51,8 +52,8 @@ private CopperOxidationBuilder catalyst(Ingredient catalyst) { return this; } - public CopperOxidationBuilder catalyst(TagKey catalyst, HolderLookup.Provider p) { - return catalyst(x.itemIngredient(p.getOrThrow(catalyst))); + public CopperOxidationBuilder catalyst(TagKey catalyst) { + return catalyst(x.itemIngredient(catalyst,getProvider())); } public CopperOxidationBuilder catalyst(Item catalyst) { diff --git a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplicationBuilder.java b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplicationBuilder.java index 646d9e1..b324a7e 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplicationBuilder.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplicationBuilder.java @@ -42,17 +42,18 @@ public class UpgradeApplicationBuilder extends BaseRecipeBuilder private int luck; private int fluid; - public UpgradeApplicationBuilder() { + public UpgradeApplicationBuilder(HolderLookup.Provider p) { + super(p); this.criteria = new LinkedHashMap>(); } - public static UpgradeApplicationBuilder of() { - return new UpgradeApplicationBuilder(); + public static UpgradeApplicationBuilder of(HolderLookup.Provider p) { + return new UpgradeApplicationBuilder(p); } public UpgradeApplicationBuilder unlockedBy() { - return unlockedBy(MODULE_ID, InventoryChangeTrigger.TriggerInstance + return unlockedBy(x.name(LibItems.STEEL_PLATE.get()), InventoryChangeTrigger.TriggerInstance .hasItems(LibItems.STEEL_PLATE.get())); } @@ -104,8 +105,8 @@ public UpgradeApplicationBuilder define(Character symbol, Ingredient ingredient) } - public UpgradeApplicationBuilder define(Character symbol, TagKey tag, HolderLookup.Provider p) { - return define(symbol, Ingredient.of(p.getOrThrow(tag))); + public UpgradeApplicationBuilder define(Character symbol, TagKey tag) { + return define(symbol, x.itemIngredient(tag, getProvider())); } public UpgradeApplicationBuilder define(Character symbol, ItemLike item) { @@ -123,12 +124,12 @@ public UpgradeApplicationBuilder pattern(String row) { @Override public Identifier getSuffix(String extra) { - return x.rl(MODULE_ID, "upgrade_application/" + x.path(result.item().value()).toLowerCase() + extra); + return x.rl(MODULE_ID, "upgrade_application/" + x.name(result) + extra); } @Override public Recipe createRecipe() { - return new UpgradeApplication(ShapedRecipePattern.of(key, row), result, + return new UpgradeApplicationRecipe(ShapedRecipePattern.of(key, row), result, UpgradeComponents.builder(speed, energy, luck, fluid)); } @@ -139,7 +140,7 @@ public UpgradeApplicationBuilder getBuilder() { @Override public void onRecipeCreation(RecipeOutput c, ResourceKey> pId, Recipe created) { - buildRecipe(c, ResourceKey.create(Registries.RECIPE, getSuffix("_clear_nbt")), new UpgradeApplication( + buildRecipe(c, ResourceKey.create(Registries.RECIPE, getSuffix("_clear_nbt")), new UpgradeApplicationRecipe( ShapedRecipePattern.of(Map.of('U', x.itemIngredient(result.item().value())), List.of("U")), result, UpgradeComponents.builder(speed, energy, luck, fluid))); } diff --git a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplication.java b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplicationRecipe.java similarity index 72% rename from src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplication.java rename to src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplicationRecipe.java index ef71d40..1756787 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplication.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/common/recipes/upgrade_application/UpgradeApplicationRecipe.java @@ -16,13 +16,13 @@ import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.item.crafting.ShapedRecipePattern; -public class UpgradeApplication extends ShapedRecipe { +public class UpgradeApplicationRecipe extends ShapedRecipe { private ShapedRecipePattern pattern; private ItemStackTemplate result; private UpgradeComponents builder; - public UpgradeApplication(ShapedRecipePattern pattern, + public UpgradeApplicationRecipe(ShapedRecipePattern pattern, ItemStackTemplate result, UpgradeComponents builder) { super(RecipeBuilder.createCraftingCommonInfo(true), RecipeBuilder.createCraftingBookInfo(RecipeCategory.MISC, "upgrade_application"), pattern, result); @@ -51,20 +51,20 @@ public ItemStack assemble(CraftingInput input) { return item; } - public static final RecipeSerializer serializer() { + public static final RecipeSerializer serializer() { return new RecipeSerializer<>(CODEC, STREAM_CODEC); } - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(inst -> inst.group( - ShapedRecipePattern.MAP_CODEC.fieldOf("pattern").forGetter(UpgradeApplication::getPattern), - ItemStackTemplate.CODEC.fieldOf("result").forGetter(UpgradeApplication::getResult), - UpgradeComponents.CODEC.fieldOf("upgrades").forGetter(UpgradeApplication::getBuilder)) - .apply(inst, UpgradeApplication::new)); + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(inst -> inst.group( + ShapedRecipePattern.MAP_CODEC.fieldOf("pattern").forGetter(UpgradeApplicationRecipe::getPattern), + ItemStackTemplate.CODEC.fieldOf("result").forGetter(UpgradeApplicationRecipe::getResult), + UpgradeComponents.CODEC.fieldOf("upgrades").forGetter(UpgradeApplicationRecipe::getBuilder)) + .apply(inst, UpgradeApplicationRecipe::new)); - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ShapedRecipePattern.STREAM_CODEC, UpgradeApplication::getPattern, - ItemStackTemplate.STREAM_CODEC, UpgradeApplication::getResult, - UpgradeComponents.STREAM_CODEC, UpgradeApplication::getBuilder, - UpgradeApplication::new); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ShapedRecipePattern.STREAM_CODEC, UpgradeApplicationRecipe::getPattern, + ItemStackTemplate.STREAM_CODEC, UpgradeApplicationRecipe::getResult, + UpgradeComponents.STREAM_CODEC, UpgradeApplicationRecipe::getBuilder, + UpgradeApplicationRecipe::new); } diff --git a/src/main/java/com/devdyna/cakesticklib/setup/registry/LibRecipeTypes.java b/src/main/java/com/devdyna/cakesticklib/setup/registry/LibRecipeTypes.java index 3e820c3..65f460a 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/registry/LibRecipeTypes.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/registry/LibRecipeTypes.java @@ -4,7 +4,7 @@ import com.devdyna.cakesticklib.setup.RecipeRegister; import com.devdyna.cakesticklib.setup.common.recipes.hammering.HammeringRecipe; import com.devdyna.cakesticklib.setup.common.recipes.oxidation.CopperOxidationRecipe; -import com.devdyna.cakesticklib.setup.common.recipes.upgrade_application.UpgradeApplication; +import com.devdyna.cakesticklib.setup.common.recipes.upgrade_application.UpgradeApplicationRecipe; import net.minecraft.core.registries.Registries; import net.minecraft.world.item.crafting.RecipeSerializer; @@ -32,8 +32,8 @@ public static void register(IEventBus bus) { "hammering", () -> HammeringRecipe.serializer()); - public static final RecipeRegister UPGRADE_APPLICATION = RecipeRegister.of( + public static final RecipeRegister UPGRADE_APPLICATION = RecipeRegister.of( "upgrade_application", - () -> UpgradeApplication.serializer()); + () -> UpgradeApplicationRecipe.serializer()); } From 7ffc08d9be824cfd3b288921d967d86829db0143 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Mon, 11 May 2026 15:13:28 +0200 Subject: [PATCH 5/9] (BREAKING CHANGES) RecipeGenerators methods unification --- .../api/datagen/RecipeGenerators.java | 108 +++++++++--------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/devdyna/cakesticklib/api/datagen/RecipeGenerators.java b/src/main/java/com/devdyna/cakesticklib/api/datagen/RecipeGenerators.java index 7635c54..6ea0c71 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/datagen/RecipeGenerators.java +++ b/src/main/java/com/devdyna/cakesticklib/api/datagen/RecipeGenerators.java @@ -25,6 +25,10 @@ public interface RecipeGenerators { abstract String getModName(); + abstract HolderLookup.Provider getProvider(); + + abstract HolderGetter getItems(); + private Criterion has(ItemLike item) { return InventoryChangeTrigger.TriggerInstance.hasItems(item); } @@ -34,41 +38,41 @@ private Criterion has(TagKey tag) .hasItems(ItemPredicate.Builder.item().of(getItems(), tag)); } - abstract String getHasNameGen(ItemLike i); - - abstract String getItemNameGen(ItemLike i); + private String getConversionRecipeName(ItemLike product, ItemLike material) { + return x.name(product) + "_from_" + x.name(material); + } - abstract HolderLookup.Provider getProvider(); + default String getConversionRecipeName(ItemLike output, TagKey input) { + return x.name(output) + "_from_" + x.name(input); + } - abstract HolderGetter getItems(); + private String getHasName(ItemLike i) { + return "has_" + x.name(i); + } - abstract String getConversionRecipeNameGen(ItemLike output, ItemLike input); + default String getHasName(TagKey tag) { + return "has_" + x.name(tag); + } default String asRecipeID(Item i, String suffix) { - return getModName() + ":" + x.path(i) + suffix; + return getModName() + ":" + x.name(i) + suffix; } default String asRecipeID(Item i) { return asRecipeID(i, "_alt"); } - default String getHasName(TagKey tag) { - return "has_" + x.getTagName(tag); - } - - default String getConversionRecipeName(ItemLike output, TagKey input) { - return getItemNameGen(output) + "_from_" + x.getTagName(input); - } + // recipes default void simpleCooking(RecipeOutput c, Item input, Item output) { SimpleCookingRecipeBuilder .smelting(x.itemIngredient(input), RecipeCategory.MISC, CookingBookCategory.MISC, output, 0.1F, 200) - .unlockedBy(getHasNameGen(input), + .unlockedBy(getHasName(input), has(input)) .save(c, getModName() + ":" - + getConversionRecipeNameGen( + + getConversionRecipeName( output, input)); } @@ -91,17 +95,17 @@ default void doubleSmelt(RecipeOutput c, ItemLike input, ItemLike output) { .blasting(x.itemIngredient(input), RecipeCategory.MISC, CookingBookCategory.MISC, output.asItem(), 0.1F, 100) - .unlockedBy(getHasNameGen(input), has(output)) - .save(c, getModName() + ":" + x.path(output.asItem()) + "_from_" - + x.path(input.asItem()) + .unlockedBy(getHasName(input), has(output)) + .save(c, getModName() + ":" + x.name(output) + "_from_" + + x.name(input) + "_blasting"); SimpleCookingRecipeBuilder .smelting(x.itemIngredient(input), RecipeCategory.MISC, CookingBookCategory.MISC, output.asItem(), 0.1F, 200) - .unlockedBy(getHasNameGen(input), has(output)) - .save(c, getModName() + ":" + x.path(output.asItem()) + "_from_" - + x.path(input.asItem()) + .unlockedBy(getHasName(input), has(output)) + .save(c, getModName() + ":" + x.name(output) + "_from_" + + x.name(input) + "_smelting"); } @@ -111,23 +115,23 @@ default void doubleSmelt(RecipeOutput c, TagKey input, ItemLike output) { CookingBookCategory.MISC, output.asItem(), 0.1F, 100) .unlockedBy(getHasName(input), has(output)) - .save(c, getModName() + ":" + x.path(output.asItem()) + "_from_" - + x.path(input) + .save(c, getModName() + ":" + x.name(output) + "_from_" + + x.name(input) + "_blasting"); SimpleCookingRecipeBuilder .smelting(x.itemIngredient(input, getProvider()), RecipeCategory.MISC, CookingBookCategory.MISC, output.asItem(), 0.1F, 200) .unlockedBy(getHasName(input), has(output)) - .save(c, getModName() + ":" + x.path(output.asItem()) + "_from_" - + x.path(input) + .save(c, getModName() + ":" + x.name(output) + "_from_" + + x.name(input) + "_smelting"); } default void unpacker(RecipeOutput c, ItemLike input, ItemLike output, int count) { ShapelessRecipeBuilder.shapeless(getItems(), RecipeCategory.MISC, output, count).requires(input) - .unlockedBy(getHasNameGen(input), has(input)) - .save(c, getConversionRecipeNameGen(output, input)); + .unlockedBy(getHasName(input), has(input)) + .save(c, getConversionRecipeName(output, input)); } default void nuggetIngotBlock(RecipeOutput c, ItemLike nugget, ItemLike ingot, ItemLike block) { @@ -147,7 +151,7 @@ default void gear(RecipeOutput c, Item input, Item gear) { .pattern("# #") .pattern(" # ") .define('#', input) - .unlockedBy(getHasNameGen(input), has(input)) + .unlockedBy(getHasName(input), has(input)) .save(c); } @@ -179,7 +183,7 @@ default void twoByTwoPacker(RecipeOutput c, ItemLike output, TagKey tag) { default void twoByTwoPacker(RecipeOutput c, ItemLike i, ItemLike o, String e) { ShapedRecipeBuilder.shaped(getItems(), RecipeCategory.MISC, i, 1).define('#', o).pattern("##") .pattern("##") - .unlockedBy(getHasNameGen(o), has(o)).save(c, e); + .unlockedBy(getHasName(o), has(o)).save(c, e); } default void plate(RecipeOutput c, TagKey input, Item output) { @@ -222,7 +226,7 @@ default void plate(RecipeOutput c, Item input, Item output) { ShapedRecipeBuilder.shaped(getItems(), RecipeCategory.MISC, output, 3) .pattern("III") .define('I', input) - .unlockedBy(getHasNameGen(input), + .unlockedBy(getHasName(input), has(input)) .save(c); @@ -235,7 +239,7 @@ default void foil(RecipeOutput c, Item input, Item output) { .pattern("SI ") .define('I', input) .define('S', Items.STICK) - .unlockedBy(getHasNameGen(input), + .unlockedBy(getHasName(input), has(Items.STICK)) .save(c); @@ -248,7 +252,7 @@ default void coil(RecipeOutput c, Item input, Item output) { .pattern(" I ") .define('I', input) .define('S', Items.STICK) - .unlockedBy(getHasNameGen(input), + .unlockedBy(getHasName(input), has(Items.STICK)) .save(c); @@ -258,8 +262,8 @@ default void packUnpack(RecipeOutput c, ItemLike unpacked, ItemLike packed, bool ShapelessRecipeBuilder.shapeless(getItems(), RecipeCategory.MISC, unpacked, isSmall ? 4 : 9) .requires(packed) - .unlockedBy(getHasNameGen(packed), has(packed)) - .save(c, getModName() + ":" + x.path((Item) unpacked) + "_unpack" + .unlockedBy(getHasName(packed), has(packed)) + .save(c, getModName() + ":" + x.name(unpacked) + "_unpack" + (isSmall ? "_4" : "_9")); simplePacked(c, unpacked.asItem(), packed.asItem(), isSmall); @@ -278,8 +282,8 @@ default void simplePacked(RecipeOutput c, Item input, Item output, boolean isSma if (!isSmall) temp = temp.pattern("###"); - temp.unlockedBy(getHasNameGen(input), has(input)) - .save(c, getModName() + ":" + getConversionRecipeNameGen(output, + temp.unlockedBy(getHasName(input), has(input)) + .save(c, getModName() + ":" + getConversionRecipeName(output, input)); } @@ -287,7 +291,7 @@ default void simplePacked(RecipeOutput c, Item input, Item output, boolean isSma default void slab(ItemLike slab, ItemLike material, RecipeOutput c) { ShapedRecipeBuilder.shaped(getItems(), RecipeCategory.BUILDING_BLOCKS, slab, 6).define('#', material) .pattern("###") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c); } @@ -296,26 +300,26 @@ default void stair(ItemLike stair, ItemLike material, RecipeOutput c) { .pattern("# ") .pattern("## ") .pattern("###") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c); } default void stonecutter(RecipeOutput c, ItemLike result, ItemLike material, int resultCount) { stonecutter(c, result, material, resultCount, - getModName() + ":" + getConversionRecipeNameGen(result, material) + getModName() + ":" + getConversionRecipeName(result, material) + "_stonecutting"); } default void stonecutter(RecipeOutput c, ItemLike result, ItemLike material) { stonecutter(c, result, material, 1, - getModName() + ":" + getConversionRecipeNameGen(result, material) + getModName() + ":" + getConversionRecipeName(result, material) + "_stonecutting"); } default void slab(ItemLike slab, ItemLike material, RecipeOutput c, String extra) { ShapedRecipeBuilder.shaped(getItems(), RecipeCategory.BUILDING_BLOCKS, slab, 6).define('#', material) .pattern("###") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c, extra); } @@ -324,7 +328,7 @@ default void stair(ItemLike stair, ItemLike material, RecipeOutput c, String ext .pattern(" #") .pattern(" ##") .pattern("###") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c, extra); } @@ -333,7 +337,7 @@ default void stonecutter(RecipeOutput c, ItemLike result, ItemLike material, int SingleItemRecipeBuilder .stonecutting(Ingredient.of(material), RecipeCategory.BUILDING_BLOCKS, result, resultCount) - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c, extra); } @@ -343,7 +347,7 @@ default void stonecutter(RecipeOutput c, ItemLike result, TagKey material, .stonecutting(x.itemIngredient(material, getProvider()), RecipeCategory.BUILDING_BLOCKS, result, resultCount) - .unlockedBy(x.getTagName(material) + "_from_" + getItemNameGen(result), has(material)) + .unlockedBy(x.name(material) + "_from_" + x.name(result), has(material)) .save(c, extra); } @@ -354,7 +358,7 @@ default void stonecutter(RecipeOutput c, ItemLike result, TagKey material, default void stonecutter(RecipeOutput c, ItemLike result, TagKey material) { stonecutter(c, result, material, 1, - getModName() + ":" + getItemNameGen(result) + "_from_stonecutting"); + getModName() + ":" + x.name(result) + "_from_stonecutting"); } default void stonecutter(RecipeOutput c, ItemLike result, ItemLike material, String extra) { @@ -366,7 +370,7 @@ default void pillar(RecipeOutput c, ItemLike result, ItemLike material) { .define('#', material) .pattern("#") .pattern("#") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c); } @@ -376,7 +380,7 @@ default void pillar(RecipeOutput c, ItemLike result, ItemLike material, .define('#', material) .pattern("#") .pattern("#") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c, extra); } @@ -386,7 +390,7 @@ default void tiles(RecipeOutput c, ItemLike result, ItemLike material, .define('#', material) .pattern("##") .pattern("##") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c, extra); } @@ -395,7 +399,7 @@ default void tiles(RecipeOutput c, ItemLike result, ItemLike material) { .define('#', material) .pattern("##") .pattern("##") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c); } @@ -406,7 +410,7 @@ default void cross(RecipeOutput c, ItemLike result, ItemLike material, ItemLike .pattern(" # ") .pattern("#A#") .pattern(" # ") - .unlockedBy(getHasNameGen(material), has(material)) + .unlockedBy(getHasName(material), has(material)) .save(c); } @@ -417,7 +421,7 @@ default void cross(RecipeOutput c, ItemLike result, ItemLike material, TagKey Date: Mon, 11 May 2026 15:13:31 +0200 Subject: [PATCH 6/9] Update DataRecipe.java --- .../setup/datagen/server/DataRecipe.java | 140 ++++++++---------- 1 file changed, 65 insertions(+), 75 deletions(-) diff --git a/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataRecipe.java b/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataRecipe.java index f4c3193..883fc9c 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataRecipe.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataRecipe.java @@ -5,7 +5,7 @@ import java.util.concurrent.CompletableFuture; import com.devdyna.cakesticklib.api.datagen.RecipeGenerators; -import com.devdyna.cakesticklib.setup.common.recipes.hammering.HammeringRecipeBuilder; +import com.devdyna.cakesticklib.setup.common.recipes.hammering.HammeringBuilder; import com.devdyna.cakesticklib.setup.common.recipes.oxidation.CopperOxidationBuilder; import com.devdyna.cakesticklib.setup.common.recipes.oxidation.OxidationStatus; import com.devdyna.cakesticklib.setup.common.recipes.upgrade_application.UpgradeApplicationBuilder; @@ -56,27 +56,27 @@ protected void buildRecipes() { .unlockedBy("has_honeycomb", has(Items.HONEYCOMB)) .save(output); - CopperOxidationBuilder.of() + CopperOxidationBuilder.of(registries) .type(OxidationStatus.OXIDIZING) - .catalyst(LibTags.Items.OXIDIZER, registries) + .catalyst(LibTags.Items.OXIDIZER) .unlockedBy() .save(output); - CopperOxidationBuilder.of() + CopperOxidationBuilder.of(registries) .type(OxidationStatus.WAXING) - .catalyst(LibTags.Items.WAXING, registries) + .catalyst(LibTags.Items.WAXING) .unlockedBy() .save(output); - CopperOxidationBuilder.of() + CopperOxidationBuilder.of(registries) .type(OxidationStatus.SCRAPPING) - .catalyst(ItemTags.AXES, registries) + .catalyst(ItemTags.AXES) .unlockedBy() .save(output); - CopperOxidationBuilder.of() + CopperOxidationBuilder.of(registries) .type(OxidationStatus.UNWAXING) - .catalyst(ItemTags.AXES, registries) + .catalyst(ItemTags.AXES) .unlockedBy() .save(output); @@ -87,7 +87,7 @@ protected void buildRecipes() { .define('N', Tags.Items.NUGGETS_IRON) .define('S', Items.STICK) .define('I', Tags.Items.INGOTS_IRON) - .unlockedBy("has_iron", has(Tags.Items.INGOTS_IRON)) + .unlockedBy(getHasName(Tags.Items.INGOTS_IRON), has(Tags.Items.INGOTS_IRON)) .save(output); simpleCooking(output, LibTags.Items.FLOUR, Items.BREAD); @@ -198,56 +198,56 @@ protected void buildRecipes() { twoByTwoPacker(output, LibItems.CARBON_FIBER.get(), LibTags.Items.COAL_DUST); twoByTwoPacker(output, LibItems.CARBON_PLATE.get(), LibTags.Items.CARBON_FIBER); - UpgradeApplicationBuilder.of() + UpgradeApplicationBuilder.of(registries) .energy(-50) .pattern(" B ") .pattern("CSC") .pattern(" R ") - .define('S', LibTags.Items.STEEL_PLATE, registries) + .define('S', LibTags.Items.STEEL_PLATE) .define('R', LibItems.RESISTOR.get()) - .define('B', Tags.Items.DUSTS_REDSTONE,registries) + .define('B', Tags.Items.DUSTS_REDSTONE) .define('C', LibItems.CHIP.get()) .unlockedBy(getHasName(LibTags.Items.STEEL_PLATE), has(LibTags.Items.STEEL_PLATE)) .output(LibItems.ENERGY_UPGRADE.get()) .save(output); - UpgradeApplicationBuilder.of() + UpgradeApplicationBuilder.of(registries) .energy(125) .speed(20) .pattern(" B ") .pattern("CSC") .pattern(" R ") - .define('S', LibTags.Items.STEEL_PLATE, registries) + .define('S', LibTags.Items.STEEL_PLATE) .define('R', LibItems.CONDENSER.get()) - .define('B', Tags.Items.GEMS_DIAMOND,registries) + .define('B', Tags.Items.GEMS_DIAMOND ) .define('C', LibItems.CHIP.get()) .unlockedBy(getHasName(LibTags.Items.STEEL_PLATE), has(LibTags.Items.STEEL_PLATE)) .output(LibItems.SPEED_UPGRADE.get()) .save(output); - UpgradeApplicationBuilder.of() + UpgradeApplicationBuilder.of(registries) .energy(150) .luck(15) .pattern(" B ") .pattern("CSC") .pattern(" R ") - .define('S', LibTags.Items.STEEL_PLATE, registries) - .define('R', LibTags.Items.ELECTRON_TUBES,registries) - .define('B', Tags.Items.GEMS_LAPIS,registries) + .define('S', LibTags.Items.STEEL_PLATE) + .define('R', LibTags.Items.ELECTRON_TUBES) + .define('B', Tags.Items.GEMS_LAPIS) .define('C', LibItems.CHIP.get()) .unlockedBy(getHasName(LibTags.Items.STEEL_PLATE), has(LibTags.Items.STEEL_PLATE)) .output(LibItems.LUCK_UPGRADE.get()) .save(output); - UpgradeApplicationBuilder.of() + UpgradeApplicationBuilder.of(registries) .energy(150) .fluid(-20) .pattern(" B ") .pattern("CSC") .pattern(" R ") - .define('S', LibTags.Items.STEEL_PLATE, registries) + .define('S', LibTags.Items.STEEL_PLATE) .define('R', LibItems.METAL_BOLTS.get()) - .define('B', Tags.Items.DUSTS_GLOWSTONE,registries) + .define('B', Tags.Items.DUSTS_GLOWSTONE) .define('C', LibItems.CHIP.get()) .unlockedBy(getHasName(LibTags.Items.STEEL_PLATE), has(LibTags.Items.STEEL_PLATE)) .output(LibItems.FLUID_UPGRADE.get()) @@ -294,31 +294,28 @@ protected void buildRecipes() { packUnpack(output, LibItems.SILICON_SHARD.get(), LibItems.RAW_SILICON.get(), false); ingot(Tags.Items.RAW_MATERIALS_IRON, - Items.IRON_INGOT,Tags.Items.INGOTS_IRON, - LibItems.IRON_DUST.get(),LibTags.Items.IRON_DUST, - LibItems.IRON_PLATE.get(),LibTags.Items.IRON_PLATE, - LibItems.IRON_GEAR.get(),LibTags.Items.IRON_GEAR, - LibItems.IRON_FOIL.get(),LibTags.Items.IRON_FOIL, - LibItems.IRON_COIL.get(),LibTags.Items.IRON_COIL - ); + Items.IRON_INGOT, Tags.Items.INGOTS_IRON, + LibItems.IRON_DUST.get(), LibTags.Items.IRON_DUST, + LibItems.IRON_PLATE.get(), LibTags.Items.IRON_PLATE, + LibItems.IRON_GEAR.get(), LibTags.Items.IRON_GEAR, + LibItems.IRON_FOIL.get(), LibTags.Items.IRON_FOIL, + LibItems.IRON_COIL.get(), LibTags.Items.IRON_COIL); ingot(Tags.Items.RAW_MATERIALS_GOLD, - Items.GOLD_INGOT,Tags.Items.INGOTS_GOLD, - LibItems.GOLD_DUST.get(),LibTags.Items.GOLD_DUST, - LibItems.GOLD_PLATE.get(),LibTags.Items.GOLD_PLATE, - LibItems.GOLD_GEAR.get(),LibTags.Items.GOLD_GEAR, - LibItems.GOLD_FOIL.get(),LibTags.Items.GOLD_FOIL, - LibItems.GOLD_COIL.get(),LibTags.Items.GOLD_COIL - ); + Items.GOLD_INGOT, Tags.Items.INGOTS_GOLD, + LibItems.GOLD_DUST.get(), LibTags.Items.GOLD_DUST, + LibItems.GOLD_PLATE.get(), LibTags.Items.GOLD_PLATE, + LibItems.GOLD_GEAR.get(), LibTags.Items.GOLD_GEAR, + LibItems.GOLD_FOIL.get(), LibTags.Items.GOLD_FOIL, + LibItems.GOLD_COIL.get(), LibTags.Items.GOLD_COIL); ingot(Tags.Items.RAW_MATERIALS_COPPER, - Items.COPPER_INGOT,Tags.Items.INGOTS_COPPER, - LibItems.COPPER_DUST.get(),LibTags.Items.COPPER_DUST, - LibItems.COPPER_PLATE.get(),LibTags.Items.COPPER_PLATE, - LibItems.COPPER_GEAR.get(),LibTags.Items.COPPER_GEAR, - LibItems.COPPER_FOIL.get(),LibTags.Items.COPPER_FOIL, - LibItems.COPPER_COIL.get(),LibTags.Items.COPPER_COIL - ); + Items.COPPER_INGOT, Tags.Items.INGOTS_COPPER, + LibItems.COPPER_DUST.get(), LibTags.Items.COPPER_DUST, + LibItems.COPPER_PLATE.get(), LibTags.Items.COPPER_PLATE, + LibItems.COPPER_GEAR.get(), LibTags.Items.COPPER_GEAR, + LibItems.COPPER_FOIL.get(), LibTags.Items.COPPER_FOIL, + LibItems.COPPER_COIL.get(), LibTags.Items.COPPER_COIL); gem(Tags.Items.GEMS_AMETHYST, LibItems.AMETHYST_DUST.get()); gem(ItemTags.COALS, LibItems.CARBON_DUST.get()); @@ -329,23 +326,23 @@ protected void buildRecipes() { gem(Items.RESIN_BRICK, Items.RESIN_CLUMP); - HammeringRecipeBuilder.of() + HammeringBuilder.of(registries) .tool(LibItems.HAMMER.get()) .add(Items.WHEAT) .output(LibItems.FLOUR) .unlockedBy() .save(output); - HammeringRecipeBuilder.of() + HammeringBuilder.of(registries) .tool(LibItems.HAMMER.get()) - .add(ItemTags.LOGS, registries) + .add(ItemTags.LOGS) .output(LibItems.SAWDUST, 4) .unlockedBy() .save(output); - HammeringRecipeBuilder.of() + HammeringBuilder.of(registries) .tool(LibItems.HAMMER.get()) - .add(Tags.Items.GLASS_BLOCKS, registries) + .add(Tags.Items.GLASS_BLOCKS) .output(LibItems.GLASS_DUST) .unlockedBy() .save(output); @@ -361,8 +358,8 @@ protected void buildRecipes() { nuggetIngotBlock(output, LibItems.ADVANCED_ALLOY_NUGGET.get(), LibItems.ADVANCED_ALLOY_INGOT.get(), LibBlocks.ADVANCED_ALLOY_BLOCK.get()); - gear(output,LibTags.Items.STEEL_INGOT, LibItems.STEEL_GEAR.get()); - gear(output,ItemTags.PLANKS, LibItems.WOODEN_GEAR.get()); + gear(output, LibTags.Items.STEEL_INGOT, LibItems.STEEL_GEAR.get()); + gear(output, ItemTags.PLANKS, LibItems.WOODEN_GEAR.get()); twoByTwoPacker(output, LibItems.BLANK_MOLD.get(), LibTags.Items.STEEL_PLATE); @@ -396,30 +393,30 @@ public String getName() { public void ingot( TagKey raw, - Item ingot,TagKey ingot_tag, - Item dust,TagKey dust_tag, - Item plate,TagKey plate_tag, - Item gear,TagKey gear_tag, - Item foil,TagKey foil_tag, - Item coil,TagKey coil_tag) { + Item ingot, TagKey ingot_tag, + Item dust, TagKey dust_tag, + Item plate, TagKey plate_tag, + Item gear, TagKey gear_tag, + Item foil, TagKey foil_tag, + Item coil, TagKey coil_tag) { doubleSmelt(output, dust_tag, ingot); - HammeringRecipeBuilder.of() + HammeringBuilder.of(registries) .tool(LibItems.HAMMER.get(), 2) - .add(raw, registries) + .add(raw) .output(dust, 2) .unlockedBy() .save(output, "_from_raw"); - HammeringRecipeBuilder.of() + HammeringBuilder.of(registries) .tool(LibItems.HAMMER.get(), 1) - .add(ingot_tag,registries) + .add(ingot_tag) .output(dust) .unlockedBy() .save(output, "_from_ingot"); - gear(output,ingot_tag, gear); + gear(output, ingot_tag, gear); foil(output, plate_tag, foil); plate(output, ingot_tag, plate); coil(output, foil_tag, coil); @@ -430,9 +427,9 @@ public void gem( TagKey gem, Item dust) { - HammeringRecipeBuilder.of() + HammeringBuilder.of(registries) .tool(LibItems.HAMMER.get(), 1) - .add(gem, registries) + .add(gem) .output(dust) .unlockedBy() .save(output); @@ -443,7 +440,7 @@ public void gem( Item gem, Item dust) { - HammeringRecipeBuilder.of() + HammeringBuilder.of(registries) .tool(LibItems.HAMMER.get(), 1) .add(gem) .output(dust) @@ -456,11 +453,6 @@ public String getHasNameGen(ItemLike i) { return getHasName(i); } - @Override - public String getItemNameGen(ItemLike i) { - return getItemName(i); - } - @Override public Provider getProvider() { return this.registries; @@ -471,14 +463,12 @@ public HolderGetter getItems() { return this.items; } - @Override - public String getConversionRecipeNameGen(ItemLike product, ItemLike material) { - return getConversionRecipeName(product, material); - } - + @Override public String getModName() { return MODULE_ID; } + + } \ No newline at end of file From c88318501df39baffdbfe3d6b831555b9d9106b5 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Mon, 11 May 2026 15:13:37 +0200 Subject: [PATCH 7/9] datagen --- .../advancement/recipes/misc/copper_oxidation/oxidizing.json | 4 ++-- .../advancement/recipes/misc/copper_oxidation/scrapping.json | 4 ++-- .../advancement/recipes/misc/copper_oxidation/unwaxing.json | 4 ++-- .../advancement/recipes/misc/copper_oxidation/waxing.json | 4 ++-- .../advancement/recipes/misc/tool_use/amethyst_dust.json | 4 ++-- .../advancement/recipes/misc/tool_use/carbon_dust.json | 4 ++-- .../recipes/misc/tool_use/copper_dust_from_ingot.json | 4 ++-- .../recipes/misc/tool_use/copper_dust_from_raw.json | 4 ++-- .../advancement/recipes/misc/tool_use/diamond_dust.json | 4 ++-- .../advancement/recipes/misc/tool_use/emerald_dust.json | 4 ++-- .../cakesticklib/advancement/recipes/misc/tool_use/flour.json | 4 ++-- .../advancement/recipes/misc/tool_use/glass_dust.json | 4 ++-- .../recipes/misc/tool_use/gold_dust_from_ingot.json | 4 ++-- .../advancement/recipes/misc/tool_use/gold_dust_from_raw.json | 4 ++-- .../recipes/misc/tool_use/iron_dust_from_ingot.json | 4 ++-- .../advancement/recipes/misc/tool_use/iron_dust_from_raw.json | 4 ++-- .../advancement/recipes/misc/tool_use/lapis_dust.json | 4 ++-- .../advancement/recipes/misc/tool_use/quartz_dust.json | 4 ++-- .../advancement/recipes/misc/tool_use/resin_clump.json | 4 ++-- .../advancement/recipes/misc/tool_use/sawdust.json | 4 ++-- .../data/cakesticklib/advancement/recipes/tools/chisel.json | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/oxidizing.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/oxidizing.json index 519b3c2..5bc6b45 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/oxidizing.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/oxidizing.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "copper_ingot": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "copper_ingot" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/scrapping.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/scrapping.json index 06145f4..aae97dc 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/scrapping.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/scrapping.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "copper_ingot": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "copper_ingot" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/unwaxing.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/unwaxing.json index 179ef67..e159306 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/unwaxing.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/unwaxing.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "copper_ingot": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "copper_ingot" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/waxing.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/waxing.json index e19b106..c403d30 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/waxing.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/copper_oxidation/waxing.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "copper_ingot": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "copper_ingot" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/amethyst_dust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/amethyst_dust.json index df1b086..f6be24f 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/amethyst_dust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/amethyst_dust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/carbon_dust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/carbon_dust.json index b391627..b5561ed 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/carbon_dust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/carbon_dust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_ingot.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_ingot.json index 74be7e6..69195aa 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_ingot.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_ingot.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_raw.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_raw.json index 893d91d..d78797e 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_raw.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/copper_dust_from_raw.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/diamond_dust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/diamond_dust.json index 2165a38..e92e12a 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/diamond_dust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/diamond_dust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/emerald_dust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/emerald_dust.json index 3cfb385..40cbb47 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/emerald_dust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/emerald_dust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/flour.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/flour.json index 53e6148..2f26cc3 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/flour.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/flour.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/glass_dust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/glass_dust.json index 1b01d6c..c17d2af 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/glass_dust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/glass_dust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_ingot.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_ingot.json index b2ba74f..27fa7bc 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_ingot.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_ingot.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_raw.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_raw.json index ce8fb0e..d4372ea 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_raw.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/gold_dust_from_raw.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_ingot.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_ingot.json index efc8d53..a1d6a61 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_ingot.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_ingot.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_raw.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_raw.json index 1beff06..598f6ef 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_raw.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/iron_dust_from_raw.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/lapis_dust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/lapis_dust.json index d07ad61..0e56eea 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/lapis_dust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/lapis_dust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/quartz_dust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/quartz_dust.json index 3769350..c5fd704 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/quartz_dust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/quartz_dust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/resin_clump.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/resin_clump.json index 1297eb5..5c825e9 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/resin_clump.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/resin_clump.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/sawdust.json b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/sawdust.json index a612417..30d8e5f 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/sawdust.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/misc/tool_use/sawdust.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "cakesticklib": { + "hammer": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "cakesticklib" + "hammer" ] ], "rewards": { diff --git a/src/generated/resources/data/cakesticklib/advancement/recipes/tools/chisel.json b/src/generated/resources/data/cakesticklib/advancement/recipes/tools/chisel.json index ab29d61..4f43177 100644 --- a/src/generated/resources/data/cakesticklib/advancement/recipes/tools/chisel.json +++ b/src/generated/resources/data/cakesticklib/advancement/recipes/tools/chisel.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iron": { + "has_ingots/iron": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_iron" + "has_ingots/iron" ] ], "rewards": { From 3721a1ac24805917a57e48cd484e02935b0ea48b Mon Sep 17 00:00:00 2001 From: DevDyna Date: Mon, 11 May 2026 19:23:36 +0200 Subject: [PATCH 8/9] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5e548b6..b9909b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.caching=true org.gradle.configuration-cache=true minecraft_version=26.1.2 minecraft_version_range=[26.1,26.2] -neo_version=26.1.2.41-beta +neo_version=26.1.2.44-beta ## Mod Properties From 1be3c1588dbf8b0a37828c4a982a20a5cd694281 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Sat, 16 May 2026 21:51:07 +0200 Subject: [PATCH 9/9] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b9909b8..4c5db8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ neo_version=26.1.2.44-beta mod_id=cakesticklib mod_name=CakeStickLib mod_license=Custom License -mod_version=1.9.3 +mod_version=1.10 mod_group_id=com.devdyna.cakestick mod_authors=DevDyna mod_description=A standalone port of Synergy API to unify most of the code