From cd2150fabc221ebe4da677e7fb1885e12b715dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A4seToatz?= Date: Sun, 14 Sep 2025 18:20:30 +0200 Subject: [PATCH] Fix server issues --- src/main/java/com/kasetoatz/boatjump/BoatJump.java | 13 ------------- .../kasetoatz/boatjump/mixin/BoatEntityMixin.java | 4 ++-- .../com/kasetoatz/boatjump/mixin/EntityMixin.java | 4 ++-- src/main/resources/fabric.mod.json | 5 ----- 4 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/com/kasetoatz/boatjump/BoatJump.java diff --git a/src/main/java/com/kasetoatz/boatjump/BoatJump.java b/src/main/java/com/kasetoatz/boatjump/BoatJump.java deleted file mode 100644 index f1d612f..0000000 --- a/src/main/java/com/kasetoatz/boatjump/BoatJump.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.kasetoatz.boatjump; - -import net.fabricmc.api.ModInitializer; -import net.minecraft.client.MinecraftClient; - -public class BoatJump implements ModInitializer { - public static MinecraftClient client; - - @Override - public void onInitialize() { - client = MinecraftClient.getInstance(); - } -} diff --git a/src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java b/src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java index 3e52711..8d2a986 100644 --- a/src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java +++ b/src/main/java/com/kasetoatz/boatjump/mixin/BoatEntityMixin.java @@ -1,7 +1,7 @@ package com.kasetoatz.boatjump.mixin; -import com.kasetoatz.boatjump.BoatJump; import net.minecraft.entity.EntityType; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.vehicle.AbstractBoatEntity; import net.minecraft.entity.vehicle.VehicleEntity; import net.minecraft.world.World; @@ -22,7 +22,7 @@ public abstract class BoatEntityMixin extends VehicleEntity { @Inject(method="tick", at=@At("HEAD")) public void tick(CallbackInfo ci) { - if (this.getControllingPassenger() == BoatJump.client.player && this.location == AbstractBoatEntity.Location.IN_WATER) { + if (this.getControllingPassenger() instanceof PlayerEntity && this.location == AbstractBoatEntity.Location.IN_WATER) { this.setOnGround(true); } } diff --git a/src/main/java/com/kasetoatz/boatjump/mixin/EntityMixin.java b/src/main/java/com/kasetoatz/boatjump/mixin/EntityMixin.java index 37d2f8d..47f609e 100644 --- a/src/main/java/com/kasetoatz/boatjump/mixin/EntityMixin.java +++ b/src/main/java/com/kasetoatz/boatjump/mixin/EntityMixin.java @@ -1,8 +1,8 @@ package com.kasetoatz.boatjump.mixin; -import com.kasetoatz.boatjump.BoatJump; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.vehicle.AbstractBoatEntity; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; @@ -17,7 +17,7 @@ public abstract class EntityMixin { @Inject(method="getStepHeight", at = @At("HEAD"), cancellable = true) public void getStepHeight(CallbackInfoReturnable cir) { - if ((Entity)(Object)this instanceof AbstractBoatEntity && this.getControllingPassenger() == BoatJump.client.player) { + if ((Entity)(Object)this instanceof AbstractBoatEntity && this.getControllingPassenger() instanceof PlayerEntity) { cir.setReturnValue(1.f); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 73d2efb..c84f20c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -10,11 +10,6 @@ }, "license": "MIT", "environment": "*", - "entrypoints": { - "main": [ - "com.kasetoatz.boatjump.BoatJump" - ] - }, "mixins": [ "boatjump.mixins.json" ],