From 35cea3bcc2bfcbbe36a6b85f5d3ab9bd80f7cd0d Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 24 May 2023 23:22:42 +0200 Subject: [PATCH] Fixed some Mixins --- .../betterx/betterend/mixin/common/ServerLevelMixin.java | 2 ++ .../betterx/betterend/mixin/common/ServerPlayerMixin.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java b/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java index 8c490d13..cbdbdc55 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java @@ -15,6 +15,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.progress.ChunkProgressListener; import net.minecraft.util.profiling.ProfilerFiller; +import net.minecraft.world.RandomSequences; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; @@ -81,6 +82,7 @@ public abstract class ServerLevelMixin extends Level { long seed, List list, boolean bl2, + RandomSequences randomSequences, CallbackInfo ci ) { TerrainGenerator.onServerLevelInit(ServerLevel.class.cast(this), levelStem, seed); diff --git a/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java b/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java index 219880a1..b95f0a4b 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java @@ -85,7 +85,7 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt public void be_changeDimension(ServerLevel destination, CallbackInfoReturnable info) { if (be_canTeleport() && level() instanceof ServerLevel) { isChangingDimension = true; - ServerLevel serverWorld = getLevel(); + ServerLevel serverWorld = serverLevel(); LevelData worldProperties = destination.getLevelData(); ServerPlayer player = ServerPlayer.class.cast(this); @@ -153,9 +153,6 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt return super.getDimensionChangingDelay(); } - @Shadow - public abstract ServerLevel getLevel(); - @Shadow abstract void triggerDimensionChangeTriggers(ServerLevel origin); @@ -163,6 +160,9 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt @Override protected abstract PortalInfo findDimensionEntryPoint(ServerLevel destination); + @Shadow + public abstract ServerLevel serverLevel(); + @Override public void be_setExitPos(BlockPos pos) { this.exitPos = pos.immutable();