Update to Minecraft 26.3

.gitignore

@@ -33,3 +33,7 @@ changelog.txt
 
 loader-neoforge/.cache
 loader-neoforge/config
+
+# ClientDevBridge session state (golden images are intentionally kept)
+.clientdevbridge/*
+!.clientdevbridge/golden/

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
 }

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.cyclopscore
 java_version=25
 
 # Common
-minecraft_version=26.2
+minecraft_version=26.3
 mod_name=Cyclops Core
 mod_author=rubensworks (aka kroeser)
 mod_id=cyclopscore
@@ -14,25 +14,25 @@ issue_tracker_url=https://github.com/CyclopsMC/CyclopsCore/issues
 display_url=https://www.curseforge.com/minecraft/mc-mods/cyclops-core
 description=Coremod for Integrated Dynamics, EvilCraft and others.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
-neo_form_version=26.2-1
+neo_form_version=26.3-1
 curseforge_project_id=232758
 modrinth_project_id=Z9DM0LJ4
 
 # 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/cyclops-core.json
 # Dependencies
-neoforge_curios_version=15.0.0-beta.1+26.1
+neoforge_curios_version=16.0.0+26.2
 
 # 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/cyclops-core.json
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,9 @@
 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
+retries=0
+retryBackOffMs=500
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

loader-common/src/main/java/org/cyclops/cyclopscore/advancement/criterion/GuiContainerOpenTrigger.java

@@ -2,11 +2,11 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.advancements.predicates.ContextAwarePredicate;
-import net.minecraft.advancements.predicates.entity.EntityPredicate;
 import net.minecraft.advancements.triggers.SimpleCriterionTrigger;
+import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -19,7 +19,7 @@ public class GuiContainerOpenTrigger extends SimpleCriterionTrigger<GuiContainer
 
     public static final Codec<Instance> CODEC = RecordCodecBuilder.create(
             p_311401_ -> p_311401_.group(
-                            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(Instance::player),
+                            LootItemCondition.CODEC.optionalFieldOf("player").forGetter(Instance::player),
                             Codec.STRING.optionalFieldOf("container_class").forGetter(Instance::containerClass)
                     )
                     .apply(p_311401_, Instance::new)
@@ -35,7 +35,7 @@ public void trigger(ServerPlayer pPlayer, Predicate<GuiContainerOpenTrigger.Inst
     }
 
     public static record Instance(
-            Optional<ContextAwarePredicate> player,
+            Optional<Holder<LootItemCondition>> player,
             Optional<String> containerClass
     ) implements SimpleInstance, ICriterionInstanceTestable<AbstractContainerMenu> {
         @Override

loader-common/src/main/java/org/cyclops/cyclopscore/advancement/criterion/ItemCraftedTrigger.java

@@ -2,12 +2,12 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.advancements.predicates.ContextAwarePredicate;
 import net.minecraft.advancements.predicates.ItemPredicate;
-import net.minecraft.advancements.predicates.entity.EntityPredicate;
 import net.minecraft.advancements.triggers.SimpleCriterionTrigger;
+import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -20,7 +20,7 @@ public class ItemCraftedTrigger extends SimpleCriterionTrigger<ItemCraftedTrigge
 
     public static final Codec<Instance> CODEC = RecordCodecBuilder.create(
             p_311401_ -> p_311401_.group(
-                            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(Instance::player),
+                            LootItemCondition.CODEC.optionalFieldOf("player").forGetter(Instance::player),
                             ItemPredicate.CODEC.fieldOf("item").forGetter(Instance::itemPredicate)
                     )
                     .apply(p_311401_, Instance::new)
@@ -36,7 +36,7 @@ public void trigger(ServerPlayer pPlayer, Predicate<ItemCraftedTrigger.Instance>
     }
 
     public static record Instance(
-            Optional<ContextAwarePredicate> player,
+            Optional<Holder<LootItemCondition>> player,
             ItemPredicate itemPredicate
     ) implements SimpleInstance, ICriterionInstanceTestable<ItemStack> {
 
@@ -46,7 +46,7 @@ public boolean test(ServerPlayer player, ItemStack craftingStack) {
         }
 
         @Override
-        public Optional<ContextAwarePredicate> player() {
+        public Optional<Holder<LootItemCondition>> player() {
             return player;
         }
     }