From 59f3f8567c86b3281a2c91724f89aae2a511c288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A4seToatz?= <114029279+KaseToatz1337@users.noreply.github.com> Date: Mon, 3 Feb 2025 12:24:47 +0100 Subject: [PATCH] fix water issue --- gradle.properties | 2 +- .../boatjump/mixin/BoatEntityMixin.java | 29 +++++++++++++++++++ src/main/resources/boatjump.mixins.json | 3 +- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java diff --git a/gradle.properties b/gradle.properties index 1b77adc..4e14834 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.16.10 # Mod Properties - mod_version = 1.0 + mod_version = 1.1 maven_group = com.kasetoatz archives_base_name = BoatJump diff --git a/src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java b/src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java new file mode 100644 index 0000000..3e52711 --- /dev/null +++ b/src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java @@ -0,0 +1,29 @@ +package com.kasetoatz.boatjump.mixin; + +import com.kasetoatz.boatjump.BoatJump; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.vehicle.AbstractBoatEntity; +import net.minecraft.entity.vehicle.VehicleEntity; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + + +@Mixin(AbstractBoatEntity.class) +public abstract class BoatEntityMixin extends VehicleEntity { + @Shadow private AbstractBoatEntity.Location location; + + public BoatEntityMixin(EntityType entityType, World world) { + super(entityType, world); + } + + @Inject(method="tick", at=@At("HEAD")) + public void tick(CallbackInfo ci) { + if (this.getControllingPassenger() == BoatJump.client.player && this.location == AbstractBoatEntity.Location.IN_WATER) { + this.setOnGround(true); + } + } +} diff --git a/src/main/resources/boatjump.mixins.json b/src/main/resources/boatjump.mixins.json index d78a41f..a9738f2 100644 --- a/src/main/resources/boatjump.mixins.json +++ b/src/main/resources/boatjump.mixins.json @@ -4,7 +4,8 @@ "package": "com.kasetoatz.boatjump.mixin", "compatibilityLevel": "JAVA_21", "client": [ - "EntityMixin" + "EntityMixin", + "BoatEntityMixin" ], "injectors": { "defaultRequire": 1