Skip to content

Update Hydraulic to Minecraft: Java Edition 26.2 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SleepyPopp wants to merge 1 commit into from
+16 −15
Closed

Update Hydraulic to Minecraft: Java Edition 26.2 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/hydraulic.base-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion fabric/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"hydraulic-fabric.mixins.json"
],
"depends": {
"fabricloader": ">=0.19.2",
"fabricloader": ">=0.19.3",
"fabric-api": "*",
"geyser-fabric": "*",
"minecraft": ">=${minecraft_version}",
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion neoforge/src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
7 changes: 4 additions & 3 deletions shared/src/main/java/org/geysermc/hydraulic/item/ArmorPackModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -65,11 +66,11 @@ private void postProcess(@NotNull PackPostProcessContext<ArmorPackModule> contex
if (optionalEntityType.isPresent()) {
HolderSet<EntityType<?>> 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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading