Update to MC 26.2

Author: rubensworks

build.gradle

@@ -1,9 +1,17 @@
+buildscript {
+    configurations.classpath {
+        resolutionStrategy {
+            force 'net.minecraftforge:srgutils:0.6.2'
+        }
+    }
+}
+
 plugins {
     id 'net.darkhax.curseforgegradle' version '1.1.28' apply false
     id 'com.diffplug.spotless' version '6.25.0' apply false
 	id 'com.modrinth.minotaur' version '2.+' apply false
 
-	id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT' 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.minecraftforge.accesstransformers' version '5.0.3' apply false
 	id 'net.minecraftforge.gradle' version '[7.0.21,8.0)' apply false

buildSrc/src/main/groovy/multiloader-loader-forge.gradle

@@ -21,7 +21,7 @@ repositories {
 
 dependencies {
     implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
-    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.10'
+    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.5'
     annotationProcessor 'org.spongepowered:mixin:0.8.7:processor'
 
     testImplementation "junit:junit:4.12"

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.capabilityproxy
 java_version=25
 
 # Common
-minecraft_version=26.1.2
+minecraft_version=26.2
 mod_name=CapabilityProxy
 mod_author=rubensworks (aka kroeser)
 mod_id=capabilityproxy
@@ -14,27 +14,27 @@ issue_tracker_url=https://github.com/CyclopsMC/CapabilityProxy/issues
 display_url=https://www.curseforge.com/minecraft/mc-mods/capabilityproxy
 description=Access block capabilities from multiple sides.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
-neo_form_version=26.1.2-1
+neo_form_version=26.2-1
 curseforge_project_id=266479
 modrinth_project_id=3mPgwv8n
 
 # Fabric
-fabric_version=0.146.1+26.1.2
-fabric_loader_version=0.18.5
+fabric_version=0.152.2+26.2
+fabric_loader_version=0.19.3
 # Dependencies
-fabric_forgeconfigapiport_version=26.1.3
+fabric_forgeconfigapiport_version=26.2.0
 # https://maven.fabricmc.net/teamreborn/energy/
 fabric_teamrebornenergy_version=5.0.0
 # https://maven.fabricmc.net/TechReborn/
-fabric_techreborn_version=TechReborn-25.1:6.0.1
+fabric_techreborn_version=TechReborn-26.2:6.1.0
 
 # NeoForge
-neoforge_version=26.1.2.22-beta
+neoforge_version=26.2.0.6-beta
 neoforge_loader_version_range=[4,)
 neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/capabilityproxy.json
 
 # Forge
-forge_version=64.0.4
+forge_version=65.0.0
 forge_loader_version_range=[2,)
 forge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/forge_update/capabilityproxy.json
 
@@ -44,4 +44,4 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Common dependencies
-cyclopscore_version=1.29.5-1012
+cyclopscore_version=1.30.0-1038

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

loader-common/src/main/java/org/cyclops/capabilityproxy/gametest/GameTestsCommon.java

@@ -8,7 +8,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.vehicle.minecart.MinecartChest;
 import net.minecraft.world.item.ItemStack;
@@ -20,6 +20,7 @@
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
 import org.cyclops.capabilityproxy.Reference;
 import org.cyclops.capabilityproxy.RegistryEntries;
 import org.cyclops.capabilityproxy.block.BlockCapabilityProxy;
@@ -194,7 +195,7 @@ public void testBlockProxyForwardGuiHopper(GameTestHelper helper) {
         helper.succeedIf(() -> {
             // Open screen of target
             BlockState blockState = helper.getBlockState(POS.offset(2, 2, 3));
-            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(POS.offset(2, 2, 3).getBottomCenter(), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 3)), false));
+            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atBottomCenterOf(POS.offset(2, 2, 3)), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 3)), false));
             helper.assertTrue(result.equals(InteractionResult.SUCCESS), Component.literal("Interaction failed"));
         });
     }
@@ -234,7 +235,7 @@ public void testBlockProxyForwardChainGuiHopper(GameTestHelper helper) {
         helper.succeedWhen(() -> {
             // Open screen of target
             BlockState blockState = helper.getBlockState(POS.offset(3, 5, 5));
-            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(POS.offset(3, 5, 5).getBottomCenter(), Direction.NORTH, helper.absolutePos(POS.offset(3, 5, 5)), false));
+            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atBottomCenterOf(POS.offset(3, 5, 5)), Direction.NORTH, helper.absolutePos(POS.offset(3, 5, 5)), false));
             helper.assertTrue(result.equals(InteractionResult.SUCCESS), Component.literal("Interaction failed"));
         });
     }
@@ -260,7 +261,7 @@ public void testBlockProxyCycleGui(GameTestHelper helper) {
         helper.succeedWhen(() -> {
             // Open screen of target
             BlockState blockState = helper.getBlockState(POS.offset(2, 2, 2));
-            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(POS.offset(2, 2, 2).getBottomCenter(), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 2)), false));
+            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atBottomCenterOf(POS.offset(2, 2, 2)), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 2)), false));
             helper.assertTrue(result.equals(InteractionResult.FAIL), Component.literal("Interaction did not fail"));
         });
     }
@@ -391,7 +392,7 @@ public void testBlockProxyRangedForwardGuiHopper(GameTestHelper helper) {
         helper.succeedIf(() -> {
             // Open screen of target
             BlockState blockState = helper.getBlockState(POS.offset(2, 2, 4));
-            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(POS.offset(2, 2, 4).getBottomCenter(), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 4)), false));
+            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atBottomCenterOf(POS.offset(2, 2, 4)), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 4)), false));
             helper.assertTrue(result.equals(InteractionResult.SUCCESS), Component.literal("Interaction failed"));
         });
     }
@@ -431,7 +432,7 @@ public void testBlockProxyRangedForwardChainGuiHopper(GameTestHelper helper) {
         helper.succeedWhen(() -> {
             // Open screen of target
             BlockState blockState = helper.getBlockState(POS.offset(3, 5, 6));
-            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(POS.offset(3, 5, 6).getBottomCenter(), Direction.NORTH, helper.absolutePos(POS.offset(3, 5, 6)), false));
+            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atBottomCenterOf(POS.offset(3, 5, 6)), Direction.NORTH, helper.absolutePos(POS.offset(3, 5, 6)), false));
             helper.assertTrue(result.equals(InteractionResult.SUCCESS), Component.literal("Interaction failed"));
         });
     }
@@ -457,7 +458,7 @@ public void testBlockProxyRangedCycleGui(GameTestHelper helper) {
         helper.succeedWhen(() -> {
             // Open screen of target
             BlockState blockState = helper.getBlockState(POS.offset(2, 2, 2));
-            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(POS.offset(2, 2, 2).getBottomCenter(), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 2)), false));
+            InteractionResult result = blockState.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atBottomCenterOf(POS.offset(2, 2, 2)), Direction.NORTH, helper.absolutePos(POS.offset(2, 2, 2)), false));
             helper.assertTrue(result.equals(InteractionResult.PASS) || result.equals(InteractionResult.FAIL), Component.literal("Interaction did not pass"));
         });
     }
@@ -633,7 +634,7 @@ public void testBlockProxyEntityFillChestMinecartFromHopper(GameTestHelper helpe
 
         // Place chest minecart at target
         helper.setBlock(POS.offset(2, 0, 2), Blocks.RAIL.defaultBlockState());
-        MinecartChest minecart = helper.spawn(EntityType.CHEST_MINECART, POS.offset(2, 0, 2));
+        MinecartChest minecart = helper.spawn(EntityTypes.CHEST_MINECART, POS.offset(2, 0, 2));
 
         // Make hopper target proxy
         helper.setBlock(POS.offset(2, 0, 4), Blocks.HOPPER

loader-fabric/src/main/java/org/cyclops/capabilityproxy/CapabilityProxyFabric.java

@@ -56,7 +56,7 @@ protected boolean hasDefaultCreativeModeTab() {
     @Override
     protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTab.Builder builder) {
         return super.constructDefaultCreativeModeTab(builder)
-                .icon(() -> new ItemStack(RegistryEntries.ITEM_CAPABILITY_PROXY));
+                .icon(() -> new ItemStack(RegistryEntries.ITEM_CAPABILITY_PROXY.getHolder()));
     }
 
     @Override

loader-fabric/src/main/java/org/cyclops/capabilityproxy/apilookup/EntityApiRegistrar.java

@@ -12,7 +12,7 @@
 import net.fabricmc.fabric.impl.lookup.entity.EntityApiLookupImpl;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.Identifier;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import org.cyclops.capabilityproxy.blockentity.BlockEntityCapabilityProxyFabricConfig;
 import org.cyclops.capabilityproxy.blockentity.BlockEntityEntityCapabilityProxyFabric;
@@ -40,7 +40,7 @@ public void initializeCapabilityRegistrationsIfNeeded(BlockEntityType<? extends
             if (BlockEntityCapabilityProxyFabricConfig.registerPlayerItemStorage) {
                 EntityApiLookup<Storage<ItemVariant>, @Nullable Direction> SIDED =
                         EntityApiLookup.get(Identifier.fromNamespaceAndPath("fabric", "sided_item_storage"), Storage.asClass(), Direction.class);
-                SIDED.registerForType((entity, context) -> ContainerStorage.of(entity.getInventory(), context), EntityType.PLAYER);
+                SIDED.registerForType((entity, context) -> ContainerStorage.of(entity.getInventory(), context), EntityTypes.PLAYER);
             }
 
             Map<Identifier, EntityApiLookup<?, ?>> entityCapabilities = TypedApiHelpers.getTypedApiLookupsKeyed((Class<EntityApiLookup<?, ?>>) (Class) EntityApiLookupImpl.class);

loader-forge/src/main/java/org/cyclops/capabilityproxy/CapabilityProxyForge.java

@@ -52,7 +52,7 @@ protected boolean hasDefaultCreativeModeTab() {
     @Override
     protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTab.Builder builder) {
         return super.constructDefaultCreativeModeTab(builder)
-                .icon(() -> new ItemStack(RegistryEntries.ITEM_CAPABILITY_PROXY));
+                .icon(() -> new ItemStack(RegistryEntries.ITEM_CAPABILITY_PROXY.getHolder()));
     }
 
     @Override

loader-neoforge/src/main/java/org/cyclops/capabilityproxy/CapabilityProxyNeoForge.java

@@ -51,7 +51,7 @@ protected ICommonProxy constructCommonProxy() {
     @Override
     protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTab.Builder builder) {
         return super.constructDefaultCreativeModeTab(builder)
-                .icon(() -> new ItemStack(RegistryEntries.ITEM_CAPABILITY_PROXY));
+                .icon(() -> new ItemStack(RegistryEntries.ITEM_CAPABILITY_PROXY.getHolder()));
     }
 
     @Override