mirror of
https://github.com/Jozufozu/Flywheel.git
synced 2025-01-01 01:46:39 +01:00
Hopefully fix ServerWorld class cast exception
- Avoid changing Entity.world, maintain contraption related state in the mixin. - Add a mixin to playSound to shift the position of the sound.
This commit is contained in:
parent
7a6b1c6949
commit
75f2516408
2 changed files with 47 additions and 25 deletions
|
@ -8,13 +8,17 @@ import net.minecraft.block.BlockRenderType;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.MoverType;
|
import net.minecraft.entity.MoverType;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.particles.BlockParticleData;
|
import net.minecraft.particles.BlockParticleData;
|
||||||
import net.minecraft.particles.ParticleTypes;
|
import net.minecraft.particles.ParticleTypes;
|
||||||
|
import net.minecraft.util.SoundEvent;
|
||||||
import net.minecraft.util.math.AxisAlignedBB;
|
import net.minecraft.util.math.AxisAlignedBB;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Vec3d;
|
import net.minecraft.util.math.Vec3d;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.gen.feature.template.Template;
|
import net.minecraft.world.gen.feature.template.Template;
|
||||||
|
import net.minecraftforge.common.capabilities.CapabilityProvider;
|
||||||
|
|
||||||
import org.apache.logging.log4j.util.TriConsumer;
|
import org.apache.logging.log4j.util.TriConsumer;
|
||||||
import org.spongepowered.asm.mixin.Final;
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
@ -30,14 +34,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Mixin(Entity.class)
|
@Mixin(Entity.class)
|
||||||
public abstract class StepSoundMixin {
|
public abstract class EntityContraptionInteractionMixin extends CapabilityProvider<Entity> {
|
||||||
|
private EntityContraptionInteractionMixin(Class<Entity> baseClass) {
|
||||||
|
super(baseClass);
|
||||||
|
}
|
||||||
|
|
||||||
private final Entity self = (Entity) (Object) this;
|
private final Entity self = (Entity) (Object) this;
|
||||||
|
|
||||||
@Shadow
|
private AbstractContraptionEntity contraption;
|
||||||
public boolean collided;
|
|
||||||
|
|
||||||
@Shadow
|
|
||||||
public World world;
|
|
||||||
|
|
||||||
@Final
|
@Final
|
||||||
@Shadow
|
@Shadow
|
||||||
|
@ -46,30 +50,21 @@ public abstract class StepSoundMixin {
|
||||||
@Shadow
|
@Shadow
|
||||||
private float nextStepDistance;
|
private float nextStepDistance;
|
||||||
|
|
||||||
@Shadow
|
|
||||||
public abstract BlockPos getPosition();
|
|
||||||
|
|
||||||
@Shadow
|
|
||||||
public abstract Vec3d getPositionVec();
|
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
protected abstract float determineNextStepDistance();
|
protected abstract float determineNextStepDistance();
|
||||||
|
|
||||||
@Shadow
|
|
||||||
public abstract AxisAlignedBB getBoundingBox();
|
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
protected abstract void playStepSound(BlockPos p_180429_1_, BlockState p_180429_2_);
|
protected abstract void playStepSound(BlockPos p_180429_1_, BlockState p_180429_2_);
|
||||||
|
|
||||||
private Set<AbstractContraptionEntity> getIntersectingContraptions() {
|
private Set<AbstractContraptionEntity> getIntersectingContraptions() {
|
||||||
Set<AbstractContraptionEntity> contraptions = ContraptionHandler.loadedContraptions.get(this.world)
|
Set<AbstractContraptionEntity> contraptions = ContraptionHandler.loadedContraptions.get(self.world)
|
||||||
.values()
|
.values()
|
||||||
.stream()
|
.stream()
|
||||||
.map(Reference::get)
|
.map(Reference::get)
|
||||||
.filter(cEntity -> cEntity != null && cEntity.collidingEntities.containsKey(self))
|
.filter(cEntity -> cEntity != null && cEntity.collidingEntities.containsKey(self))
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
contraptions.addAll(this.world.getEntitiesWithinAABB(AbstractContraptionEntity.class, getBoundingBox().grow(1f)));
|
contraptions.addAll(self.world.getEntitiesWithinAABB(AbstractContraptionEntity.class, self.getBoundingBox().grow(1f)));
|
||||||
return contraptions;
|
return contraptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,20 +93,18 @@ public abstract class StepSoundMixin {
|
||||||
method = "move"
|
method = "move"
|
||||||
)
|
)
|
||||||
private void movementMixin(MoverType mover, Vec3d movement, CallbackInfo ci) {
|
private void movementMixin(MoverType mover, Vec3d movement, CallbackInfo ci) {
|
||||||
World entityWorld = world;
|
|
||||||
Vec3d worldPos = self.getPositionVector().add(0, -0.2, 0);
|
Vec3d worldPos = self.getPositionVector().add(0, -0.2, 0);
|
||||||
AtomicBoolean stepped = new AtomicBoolean(false);
|
AtomicBoolean stepped = new AtomicBoolean(false);
|
||||||
|
|
||||||
forCollision(worldPos, (contraption, blockstate, blockPos) -> {
|
forCollision(worldPos, (contraption, blockstate, blockPos) -> {
|
||||||
this.world = contraption.getContraptionWorld();
|
bindContraption(contraption);
|
||||||
this.playStepSound(blockPos, blockstate);
|
playStepSound(blockPos, blockstate);
|
||||||
|
unbindContraption();
|
||||||
stepped.set(true);
|
stepped.set(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (stepped.get())
|
if (stepped.get())
|
||||||
this.nextStepDistance = this.determineNextStepDistance();
|
this.nextStepDistance = this.determineNextStepDistance();
|
||||||
|
|
||||||
world = entityWorld;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "createRunningParticles", at = @At("TAIL"))
|
@Inject(method = "createRunningParticles", at = @At("TAIL"))
|
||||||
|
@ -120,13 +113,42 @@ public abstract class StepSoundMixin {
|
||||||
BlockPos pos = new BlockPos(worldPos); // pos where particles are spawned
|
BlockPos pos = new BlockPos(worldPos); // pos where particles are spawned
|
||||||
|
|
||||||
forCollision(worldPos, (contraption, blockstate, blockpos) -> {
|
forCollision(worldPos, (contraption, blockstate, blockpos) -> {
|
||||||
if (!blockstate.addRunningEffects(world, blockpos, self) && blockstate.getRenderType() != BlockRenderType.INVISIBLE) {
|
if (!blockstate.addRunningEffects(self.world, blockpos, self) && blockstate.getRenderType() != BlockRenderType.INVISIBLE) {
|
||||||
Vec3d vec3d = self.getMotion();
|
Vec3d vec3d = self.getMotion();
|
||||||
this.world.addParticle(new BlockParticleData(ParticleTypes.BLOCK, blockstate).setPos(pos),
|
self.world.addParticle(new BlockParticleData(ParticleTypes.BLOCK, blockstate).setPos(pos),
|
||||||
self.getX() + ((double) rand.nextFloat() - 0.5D) * (double) self.getWidth(),
|
self.getX() + ((double) rand.nextFloat() - 0.5D) * (double) self.getWidth(),
|
||||||
self.getY() + 0.1D, self.getZ() + ((double) rand.nextFloat() - 0.5D) * (double) self.getWidth(),
|
self.getY() + 0.1D, self.getZ() + ((double) rand.nextFloat() - 0.5D) * (double) self.getWidth(),
|
||||||
vec3d.x * -4.0D, 1.5D, vec3d.z * -4.0D);
|
vec3d.x * -4.0D, 1.5D, vec3d.z * -4.0D);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Inject(method = "playSound", at = @At("HEAD"), cancellable = true)
|
||||||
|
private void playSoundShifted(SoundEvent event, float pitch, float volume, CallbackInfo ci) {
|
||||||
|
if (this.contraption != null && (!self.isSilent() || self instanceof PlayerEntity)) {
|
||||||
|
double x = self.getX();
|
||||||
|
double y = self.getY();
|
||||||
|
double z = self.getZ();
|
||||||
|
Vec3d worldPos = ContraptionCollider.getWorldToLocalTranslation(new Vec3d(x, y, z), this.contraption);
|
||||||
|
|
||||||
|
worldPos = worldPos.add(x, y, z);
|
||||||
|
|
||||||
|
self.world.playSound(null, worldPos.x + x, worldPos.y + y, worldPos.z + z, event, self.getSoundCategory(), pitch, volume);
|
||||||
|
|
||||||
|
ci.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void bindContraption(Contraption contraption) {
|
||||||
|
bindContraption(contraption.entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void bindContraption(AbstractContraptionEntity contraption) {
|
||||||
|
this.contraption = contraption;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void unbindContraption() {
|
||||||
|
this.contraption = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
"RenderHooksMixin",
|
"RenderHooksMixin",
|
||||||
"ShaderCloseMixin",
|
"ShaderCloseMixin",
|
||||||
"TileRemoveMixin",
|
"TileRemoveMixin",
|
||||||
"StepSoundMixin"
|
"EntityContraptionInteractionMixin"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
|
Loading…
Reference in a new issue