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

Start migration

Browse source
This commit is contained in:
Aleksey 2021-04-08 21:55:07 +03:00
parent 6630ce0cab
commit 47ed597358
491 changed files with 12045 additions and 11953 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/main/java/ru/betterend/mixin/common/EntityMixin.java
View file

@ -7,13 +7,13 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.TeleportTarget;
import net.minecraft.world.World;
import net.minecraft.world.level.Level;
import ru.betterend.interfaces.TeleportingEntity;
@Mixin(Entity.class)
@ -26,26 +26,26 @@ public abstract class EntityMixin implements TeleportingEntity {
@Shadow
public boolean removed;
@Shadow
public World world;
public Level world;
@Final
@Shadow
public abstract void detach();
@Shadow
public abstract Vec3d getVelocity();
@Shadow
public abstract EntityType<?> getType();
@Shadow
protected abstract TeleportTarget getTeleportTarget(ServerWorld destination);
protected abstract TeleportTarget getTeleportTarget(ServerLevel destination);
private BlockPos exitPos;
@Inject(method = "moveToWorld", at = @At("HEAD"), cancellable = true)
public void be_moveToWorld(ServerWorld destination, CallbackInfoReturnable<Entity> info) {
if (!removed && beCanTeleport() && world instanceof ServerWorld) {
public void be_moveToWorld(ServerLevel destination, CallbackInfoReturnable<Entity> info) {
if (!removed && beCanTeleport() && world instanceof ServerLevel) {
this.detach();
this.world.getProfiler().push("changeDimension");
this.world.getProfiler().push("reposition");
@ -55,13 +55,14 @@ public abstract class EntityMixin implements TeleportingEntity {
Entity entity = this.getType().create(destination);
if (entity != null) {
entity.copyFrom(Entity.class.cast(this));
entity.refreshPositionAndAngles(teleportTarget.position.x, teleportTarget.position.y, teleportTarget.position.z, teleportTarget.yaw, entity.pitch);
entity.refreshPositionAndAngles(teleportTarget.position.x, teleportTarget.position.y,
teleportTarget.position.z, teleportTarget.yaw, entity.pitch);
entity.setVelocity(teleportTarget.velocity);
destination.onDimensionChanged(entity);
}
this.removed = true;
this.world.getProfiler().pop();
((ServerWorld) world).resetIdleTimeout();
((ServerLevel) world).resetIdleTimeout();
destination.resetIdleTimeout();
this.world.getProfiler().pop();
this.beResetExitPos();
@ -69,11 +70,12 @@ public abstract class EntityMixin implements TeleportingEntity {
}
}
}
@Inject(method = "getTeleportTarget", at = @At("HEAD"), cancellable = true)
protected void be_getTeleportTarget(ServerWorld destination, CallbackInfoReturnable<TeleportTarget> info) {
protected void be_getTeleportTarget(ServerLevel destination, CallbackInfoReturnable<TeleportTarget> info) {
if (beCanTeleport()) {
info.setReturnValue(new TeleportTarget(new Vec3d(exitPos.getX() + 0.5, exitPos.getY(), exitPos.getZ() + 0.5), getVelocity(), yaw, pitch));
info.setReturnValue(new TeleportTarget(
new Vec3d(exitPos.getX() + 0.5, exitPos.getY(), exitPos.getZ() + 0.5), getVelocity(), yaw, pitch));
}
}