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

Continue mapping migration

Browse source
This commit is contained in:
Aleksey 2021-04-12 21:38:22 +03:00
parent 99ade39404
commit f03fd03bd0
499 changed files with 12567 additions and 12723 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,19 +1,18 @@
package ru.betterend.mixin.common;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.portal.PortalInfo;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Final;
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.CallbackInfoReturnable;
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.level.Level;
import ru.betterend.interfaces.TeleportingEntity;
@Mixin(Entity.class)
@ -27,19 +26,19 @@ public abstract class EntityMixin implements TeleportingEntity {
public boolean removed;
@Shadow
public Level world;
@Final
@Shadow
public abstract void detach();
@Shadow
public abstract Vec3d getVelocity();
public abstract Vec3 getVelocity();
@Shadow
public abstract EntityType<?> getType();
@Shadow
protected abstract TeleportTarget getTeleportTarget(ServerLevel destination);
protected abstract PortalInfo getTeleportTarget(ServerLevel destination);
private BlockPos exitPos;
@ -49,33 +48,31 @@ public abstract class EntityMixin implements TeleportingEntity {
this.detach();
this.world.getProfiler().push("changeDimension");
this.world.getProfiler().push("reposition");
TeleportTarget teleportTarget = this.getTeleportTarget(destination);
PortalInfo teleportTarget = this.getTeleportTarget(destination);
if (teleportTarget != null) {
this.world.getProfiler().swap("reloading");
this.world.getProfiler().popPush("reloading");
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.setVelocity(teleportTarget.velocity);
destination.onDimensionChanged(entity);
entity.restoreFrom(Entity.class.cast(this));
entity.moveTo(teleportTarget.pos.x, teleportTarget.pos.y, teleportTarget.pos.z, teleportTarget.yRot, entity.xRot);
entity.setDeltaMovement(teleportTarget.speed);
destination.addFromAnotherDimension(entity);
}
this.removed = true;
this.world.getProfiler().pop();
((ServerLevel) world).resetIdleTimeout();
destination.resetIdleTimeout();
((ServerLevel) world).resetEmptyTime();
destination.resetEmptyTime();
this.world.getProfiler().pop();
this.beResetExitPos();
info.setReturnValue(entity);
}
}
}
@Inject(method = "getTeleportTarget", at = @At("HEAD"), cancellable = true)
protected void be_getTeleportTarget(ServerLevel destination, CallbackInfoReturnable<TeleportTarget> info) {
protected void be_getTeleportTarget(ServerLevel destination, CallbackInfoReturnable<PortalInfo> 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 PortalInfo(new Vec3(exitPos.getX() + 0.5, exitPos.getY(), exitPos.getZ() + 0.5), getVelocity(), yaw, pitch));
}
}