MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some Mixins

Browse source
This commit is contained in:
Frank 2023-05-24 23:22:42 +02:00
parent 4bf32937c1
commit 35cea3bcc2
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java
View file

@ -15,6 +15,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.progress.ChunkProgressListener; import net.minecraft.server.level.progress.ChunkProgressListener;
import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.util.profiling.ProfilerFiller;
import net.minecraft.world.RandomSequences;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
@ -81,6 +82,7 @@ public abstract class ServerLevelMixin extends Level {
long seed, long seed,
List list, List list,
boolean bl2, boolean bl2,
RandomSequences randomSequences,
CallbackInfo ci CallbackInfo ci
) { ) {
TerrainGenerator.onServerLevelInit(ServerLevel.class.cast(this), levelStem, seed); TerrainGenerator.onServerLevelInit(ServerLevel.class.cast(this), levelStem, seed);

8
src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java
View file

@ -85,7 +85,7 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt
public void be_changeDimension(ServerLevel destination, CallbackInfoReturnable<Entity> info) { public void be_changeDimension(ServerLevel destination, CallbackInfoReturnable<Entity> info) {
if (be_canTeleport() && level() instanceof ServerLevel) { if (be_canTeleport() && level() instanceof ServerLevel) {
isChangingDimension = true; isChangingDimension = true;
ServerLevel serverWorld = getLevel(); ServerLevel serverWorld = serverLevel();
LevelData worldProperties = destination.getLevelData(); LevelData worldProperties = destination.getLevelData();
ServerPlayer player = ServerPlayer.class.cast(this); ServerPlayer player = ServerPlayer.class.cast(this);
@ -153,9 +153,6 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt
return super.getDimensionChangingDelay(); return super.getDimensionChangingDelay();
} }
@Shadow
public abstract ServerLevel getLevel();
@Shadow @Shadow
abstract void triggerDimensionChangeTriggers(ServerLevel origin); abstract void triggerDimensionChangeTriggers(ServerLevel origin);
@ -163,6 +160,9 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt
@Override @Override
protected abstract PortalInfo findDimensionEntryPoint(ServerLevel destination); protected abstract PortalInfo findDimensionEntryPoint(ServerLevel destination);
@Shadow
public abstract ServerLevel serverLevel();
@Override @Override
public void be_setExitPos(BlockPos pos) { public void be_setExitPos(BlockPos pos) {
this.exitPos = pos.immutable(); this.exitPos = pos.immutable();