diff --git a/build-logic/src/main/kotlin/hydraulic.base-conventions.gradle.kts b/build-logic/src/main/kotlin/hydraulic.base-conventions.gradle.kts index cf2e4d0..d558d8b 100644 --- a/build-logic/src/main/kotlin/hydraulic.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/hydraulic.base-conventions.gradle.kts @@ -6,7 +6,7 @@ plugins { val minecraftVersion = project.property("minecraft_version") as String dependencies { - compileOnly("org.checkerframework:checker-qual:4.1.0") + compileOnly("org.checkerframework:checker-qual:4.2.0") } indra { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index fa025fa..a710be2 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ "hydraulic-fabric.mixins.json" ], "depends": { - "fabricloader": ">=0.19.2", + "fabricloader": ">=0.19.3", "fabric-api": "*", "geyser-fabric": "*", "minecraft": ">=${minecraft_version}", diff --git a/gradle.properties b/gradle.properties index 8d36657..d0b76e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ group=org.geysermc.hydraulic version=1.0.0-SNAPSHOT description="A companion mod to Geyser which allows for Bedrock players to join modded Minecraft: Java Edition servers." -minecraft_version=26.1.2 +minecraft_version=26.2 common_runs_enabled=false common_client_run_name=Common Client common_server_run_name=Common Server diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a59c817..c592a1f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,21 @@ [versions] mixin = "0.8.7" mixinextras = "0.5.4" -geyser = "2.10.0-SNAPSHOT" +geyser = "preview-feature-26.2-SNAPSHOT" auto-service = "1.1.1" pack-converter = "3.4.3-SNAPSHOT" indra = "4.0.0" -shadow = "9.4.1" +shadow = "9.4.2" architectury-plugin = "3.5-SNAPSHOT" -architectury-loom = "1.14-SNAPSHOT" +architectury-loom = "1.17-SNAPSHOT" asm = "5.2" # Fabric -fabric-loader = "0.19.2" -fabric-api = "0.149.1+26.1.2" +fabric-loader = "0.19.3" +fabric-api = "0.152.2+26.2" # NeoForge -neoforge-version = "26.1.2.65-beta" +neoforge-version = "26.2.0.6-beta" [libraries] mixin = { group = "org.spongepowered", name = "mixin", version.ref = "mixin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5dd3c01..7e7d24f 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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 96ae5f3..4aab0ac 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -14,7 +14,7 @@ config = "hydraulic.mixins.json" [[dependencies.hydraulic]] modId="neoforge" type="required" - versionRange="[26.1.0.1-beta,)" + versionRange="[26.2.0.0-beta,)" ordering="NONE" side="BOTH" diff --git a/shared/src/main/java/org/geysermc/hydraulic/item/ArmorPackModule.java b/shared/src/main/java/org/geysermc/hydraulic/item/ArmorPackModule.java index 5aa03b1..3829173 100644 --- a/shared/src/main/java/org/geysermc/hydraulic/item/ArmorPackModule.java +++ b/shared/src/main/java/org/geysermc/hydraulic/item/ArmorPackModule.java @@ -8,6 +8,7 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.resources.Identifier; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EntityTypes; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.Item; import net.minecraft.world.item.equipment.Equippable; @@ -65,11 +66,11 @@ private void postProcess(@NotNull PackPostProcessContext contex if (optionalEntityType.isPresent()) { HolderSet> entityTypeHolderSet = optionalEntityType.get(); - if (entityTypeHolderSet.contains(BuiltInRegistries.ENTITY_TYPE.wrapAsHolder(EntityType.HORSE))) { + if (entityTypeHolderSet.contains(BuiltInRegistries.ENTITY_TYPE.wrapAsHolder(EntityTypes.HORSE))) { layerType = EquipmentLayerType.HORSE_BODY; - } else if (entityTypeHolderSet.contains(BuiltInRegistries.ENTITY_TYPE.wrapAsHolder(EntityType.WOLF))) { + } else if (entityTypeHolderSet.contains(BuiltInRegistries.ENTITY_TYPE.wrapAsHolder(EntityTypes.WOLF))) { layerType = EquipmentLayerType.WOLF_BODY; - } else if (entityTypeHolderSet.contains(BuiltInRegistries.ENTITY_TYPE.wrapAsHolder(EntityType.LLAMA))) { + } else if (entityTypeHolderSet.contains(BuiltInRegistries.ENTITY_TYPE.wrapAsHolder(EntityTypes.LLAMA))) { layerType = EquipmentLayerType.LLAMA_BODY; } } diff --git a/test/src/main/resources/fabric.mod.json b/test/src/main/resources/fabric.mod.json index 5e74737..cadef33 100644 --- a/test/src/main/resources/fabric.mod.json +++ b/test/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ "hydraulic_test_mod.mixins.json" ], "depends": { - "fabricloader": ">=0.19.2", + "fabricloader": ">=0.19.3", "fabric-api": "*", "minecraft": "${minecraft_version}", "java": ">=25"