From 19e7ee01cca49e7c095499d2f147b035ff31d1a1 Mon Sep 17 00:00:00 2001 From: rubensworks Date: Sun, 20 Sep 2026 07:56:32 +0000 Subject: [PATCH 1/3] Update to Minecraft 26.3 Tooling, matching CyclopsCore: - Gradle 9.7.1, needed by Fabric Loom 1.18 (which requires a Java 25 JVM for the build itself) - Fabric Loom 1.18.2, NeoForge ModDev 2.0.147 - NeoForge 26.3.0.7-beta, Forge 26.3-66.0.2, Fabric API 0.161.0+26.3, Fabric Loader 0.19.5, NeoForm 26.3-1, Forge Config API Port 26.3.0 cyclopscore_version still points at a 26.2 build, since no CyclopsCore 26.3 build is published yet. Building this needs cyclopscore_version_local in secrets.properties until then. Code: - The block type MapCodec registry and Block#codec were removed, so the CODEC field and codec() override are dropped from BlockStructuredCrafter Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01V35MFZ7JSgoLe79J4d1uxf --- build.gradle | 4 ++-- gradle.properties | 16 +++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../block/BlockStructuredCrafter.java | 7 ------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index ea8e63c9..105d8845 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,8 @@ plugins { id 'com.diffplug.spotless' version '7.2.1' apply false id 'com.modrinth.minotaur' version '2.+' apply false - id 'net.fabricmc.fabric-loom' version '1.17-SNAPSHOT' apply false - id 'net.neoforged.moddev' version '2.0.141' apply false + id 'net.fabricmc.fabric-loom' version '1.18.2' apply false + id 'net.neoforged.moddev' version '2.0.147' apply false id 'net.minecraftforge.accesstransformers' version '5.0.3' apply false id 'net.minecraftforge.gradle' version '[7.0.21,8.0)' apply false } diff --git a/gradle.properties b/gradle.properties index 1018b089..99d8fcb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ group=org.cyclops.structuredcrafting java_version=25 # Common -minecraft_version=26.2 +minecraft_version=26.3 mod_name=StructuredCrafting mod_author=rubensworks (aka kroeser) mod_id=structuredcrafting @@ -14,23 +14,23 @@ issue_tracker_url=https://github.com/CyclopsMC/StructuredCrafting/issues display_url=https://www.curseforge.com/minecraft/mc-mods/structured-crafting description=Craft stuff in your world, automatically. fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44 -neo_form_version=26.2-1 +neo_form_version=26.3-1 curseforge_project_id=233151 modrinth_project_id=GTi2kHAW # Fabric -fabric_version=0.152.2+26.2 -fabric_loader_version=0.19.3 +fabric_version=0.161.0+26.3 +fabric_loader_version=0.19.5 # Dependencies -fabric_forgeconfigapiport_version=26.2.0 +fabric_forgeconfigapiport_version=26.3.0 # NeoForge -neoforge_version=26.2.0.6-beta +neoforge_version=26.3.0.7-beta neoforge_loader_version_range=[4,) neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/structured-crafting.json # Forge -forge_version=65.0.0 +forge_version=66.0.2 forge_loader_version_range=[2,) forge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/forge_update/structured-crafting.json @@ -42,4 +42,6 @@ org.gradle.configuration-cache=true org.gradle.configureondemand=true # Common dependencies +# TODO: bump to the first CyclopsCore 26.3 build once CyclopsMC/CyclopsCore#243 is merged and published. +# Until then this does not resolve, so build locally with cyclopscore_version_local in secrets.properties. cyclopscore_version=1.30.0-1038 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f0d24e58..11c44cc3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/loader-common/src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java b/loader-common/src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java index 44b5384b..5d80fa02 100644 --- a/loader-common/src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java +++ b/loader-common/src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java @@ -1,6 +1,5 @@ package org.cyclops.structuredcrafting.block; -import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -15,7 +14,6 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -33,7 +31,6 @@ */ public class BlockStructuredCrafter extends BlockWithEntity { - public static final MapCodec CODEC = BlockBehaviour.simpleCodec(BlockStructuredCrafter::new); public static final EnumProperty FACING = BlockStateProperties.FACING; @@ -44,10 +41,6 @@ public BlockStructuredCrafter(Block.Properties properties) { .setValue(FACING, Direction.DOWN)); } - @Override - protected MapCodec codec() { - return CODEC; - } @Override @Nullable From ef0468e34ed8a68c75729326b715297d4ae8f2bf Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 20 Sep 2026 09:09:31 +0000 Subject: [PATCH 2/3] Ignore ClientDevBridge session state Appended automatically by clientdevbridge on first use, matching the entry already present in CyclopsCore. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01V35MFZ7JSgoLe79J4d1uxf --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index cc1a2f9a..21f396da 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,7 @@ changelog.txt loader-neoforge/.cache loader-neoforge/config + +# ClientDevBridge session state (golden images are intentionally kept) +.clientdevbridge/* +!.clientdevbridge/golden/ From f842cb58566813bf447db53be29846bc367e953a Mon Sep 17 00:00:00 2001 From: rubensworks Date: Sun, 20 Sep 2026 11:16:12 +0000 Subject: [PATCH 3/3] Use the published CyclopsCore 26.3 build CyclopsMC/CyclopsCore#243 is merged, and its master-26 run published cyclopscore 1.30.0-1159, so the placeholder version and the note about building locally are no longer needed. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01V35MFZ7JSgoLe79J4d1uxf --- gradle.properties | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 99d8fcb2..4ea39c03 100644 --- a/gradle.properties +++ b/gradle.properties @@ -42,6 +42,4 @@ org.gradle.configuration-cache=true org.gradle.configureondemand=true # Common dependencies -# TODO: bump to the first CyclopsCore 26.3 build once CyclopsMC/CyclopsCore#243 is merged and published. -# Until then this does not resolve, so build locally with cyclopscore_version_local in secrets.properties. -cyclopscore_version=1.30.0-1038 +cyclopscore_version=1.30.0-1159