From 4c1eba3f820e9312db37af4cff42e3454ce8aeb7 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Fri, 19 Jun 2026 14:22:46 +0200 Subject: [PATCH 1/6] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 76e520a..aa6d8f5 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.44-beta +neo_version=26.1.2.75 ## Mod Properties From 858ee19402f2e0f6137861fe0d9a014576bd2657 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Fri, 19 Jun 2026 15:05:17 +0200 Subject: [PATCH 2/6] Update LootTableHelper.java --- .../com/devdyna/cakesticklib/api/utils/LootTableHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/devdyna/cakesticklib/api/utils/LootTableHelper.java b/src/main/java/com/devdyna/cakesticklib/api/utils/LootTableHelper.java index 435afc7..ccfa376 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/utils/LootTableHelper.java +++ b/src/main/java/com/devdyna/cakesticklib/api/utils/LootTableHelper.java @@ -21,7 +21,7 @@ public class LootTableHelper { /** * mainly useful to define valid blocks on Datagen SubLootBlocksProvider */ - public List getValidBlocks(DeferredRegister.Blocks... blocks) { + public static List getValidBlocks(DeferredRegister.Blocks... blocks) { List result = new ArrayList<>(); List.of(blocks).forEach(t -> result.addAll(t.getEntries() .stream() From 56300cafa043cb537a40aecb6522476ddcc48d9a Mon Sep 17 00:00:00 2001 From: DevDyna Date: Fri, 19 Jun 2026 16:19:34 +0200 Subject: [PATCH 3/6] fixed getItemsResult can cause AIR when the plant is multiblock --- .../cakesticklib/api/factories/plants/VanillaPlants.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/devdyna/cakesticklib/api/factories/plants/VanillaPlants.java b/src/main/java/com/devdyna/cakesticklib/api/factories/plants/VanillaPlants.java index 8554445..7a08fba 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/factories/plants/VanillaPlants.java +++ b/src/main/java/com/devdyna/cakesticklib/api/factories/plants/VanillaPlants.java @@ -84,8 +84,9 @@ public static List checkReplant(Level level, BlockPos pos, @Nullable var ctx = Harvestable.Context.of(level, pos, player); if (harvestable.canHarvest(ctx)) { + var items = harvestable.getItemsResult(ctx);// required to prevent to harvest AIR harvestable.replant(ctx); - return harvestable.getItemsResult(ctx); + return items; } } From 68602705145a9501d48f1f95d99423b97256a895 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Fri, 19 Jun 2026 16:32:40 +0200 Subject: [PATCH 4/6] neoforge deprecated method --- .../cakesticklib/api/aspect/logic/BucketInteraction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/devdyna/cakesticklib/api/aspect/logic/BucketInteraction.java b/src/main/java/com/devdyna/cakesticklib/api/aspect/logic/BucketInteraction.java index 2845596..38b92e1 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/aspect/logic/BucketInteraction.java +++ b/src/main/java/com/devdyna/cakesticklib/api/aspect/logic/BucketInteraction.java @@ -47,7 +47,7 @@ default InteractionResult bucketAction(ItemStack item, BlockState blockState, Le if (level.isClientSide()) return InteractionResult.SUCCESS; - if (FluidUtil.interactWithFluidHandler(player, hand, level, blockPos, blockHitResult.getDirection())) + if (FluidUtil.interactWithFluidHandler(player, hand, level, blockPos, blockHitResult.getDirection(),null)) return InteractionResult.SUCCESS; return InteractionResult.PASS; From 341eabc01e8ac99ef5e63ef02b880f708672ba47 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Fri, 19 Jun 2026 16:32:56 +0200 Subject: [PATCH 5/6] expanded Harvestable.Context --- .../api/factories/plants/Harvestable.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/main/java/com/devdyna/cakesticklib/api/factories/plants/Harvestable.java b/src/main/java/com/devdyna/cakesticklib/api/factories/plants/Harvestable.java index 9328336..c3981d3 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/factories/plants/Harvestable.java +++ b/src/main/java/com/devdyna/cakesticklib/api/factories/plants/Harvestable.java @@ -10,6 +10,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.IntegerProperty; @@ -54,5 +55,42 @@ public BlockState state() { public BlockState state(Direction d) { return level.getBlockState(pos.relative(d)); } + + public Block block() { + return state().getBlock(); + } + + public Block block(Direction d) { + return state(d).getBlock(); + } + + public Context modify(BlockPos pos) { + return modify(pos, player()); + } + + public boolean is(BlockPos pos) { + return pos().equals(pos); + } + + public boolean is(BlockState state) { + return is(state.getBlock()); + } + + public boolean is(Block block) { + return state().is(block); + } + + public boolean is(Direction dir,Block block) { + return state(dir).is(block); + } + + public Context modify(Player player) { + return modify(pos(), player); + } + + public Context modify(BlockPos pos, Player player) { + return of(level(), pos, player); + } + } } From 8d2795cfa8845713565fcf0e00181d6726f778b2 Mon Sep 17 00:00:00 2001 From: DevDyna Date: Fri, 19 Jun 2026 16:33:02 +0200 Subject: [PATCH 6/6] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index aa6d8f5..8bc29eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ neo_version=26.1.2.75 mod_id=cakesticklib mod_name=CakeStickLib mod_license=Ora Et Labora License -mod_version=1.11 +mod_version=1.11.1 mod_group_id=com.devdyna.cakestick mod_authors=DevDyna mod_description=A standalone port of Synergy API to unify most of the code