Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 18:13:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev

Browse source
This commit is contained in:
grimmauld 2021-03-31 21:18:43 +02:00
commit 240510e3ee
8 changed files with 63 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java
View file

@ -1,10 +1,11 @@
package com.simibubi.create.content.contraptions.components.actors;
import javax.annotation.Nullable;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer;
import com.simibubi.create.content.contraptions.components.structureMovement.render.RenderedContraption;
import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
import com.simibubi.create.foundation.utility.VecHelper;
@ -17,8 +18,6 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
public class DrillMovementBehaviour extends BlockBreakingMovementBehaviour {
@Override

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
View file

@ -461,6 +461,8 @@ public abstract class AbstractContraptionEntity extends Entity implements IEntit
if (!ticking)
contraption.stop(world);
}
if (contraption != null)
contraption.onEntityRemoved(this);
super.remove(keepData);
}

33
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
View file

@ -137,7 +137,7 @@ public abstract class Contraption {
private Map<BlockPos, Entity> initialPassengers;
private List<BlockFace> pendingSubContraptions;
private CompletableFuture<List<AxisAlignedBB>> simplifiedEntityColliderProvider;
private CompletableFuture<Void> simplifiedEntityColliderProvider;
// Client
public Map<BlockPos, TileEntity> presentTileEntities;
@ -193,6 +193,7 @@ public abstract class Contraption {
String type = nbt.getString("Type");
Contraption contraption = ContraptionType.fromType(type);
contraption.readNBT(world, nbt, spawnData);
contraption.world = new ContraptionWorld(world, contraption);
contraption.gatherBBsOffThread();
return contraption;
}
@ -260,6 +261,13 @@ public abstract class Contraption {
gatherBBsOffThread();
}
public void onEntityRemoved(AbstractContraptionEntity entity) {
if (simplifiedEntityColliderProvider != null) {
simplifiedEntityColliderProvider.cancel(false);
simplifiedEntityColliderProvider = null;
}
}
public void onEntityInitialize(World world, AbstractContraptionEntity contraptionEntity) {
if (world.isRemote)
return;
@ -282,15 +290,6 @@ public abstract class Contraption {
}
public void onEntityTick(World world) {
if (simplifiedEntityColliderProvider != null && simplifiedEntityColliderProvider.isDone()) {
try {
simplifiedEntityColliders = Optional.of(simplifiedEntityColliderProvider.join());
} catch (Exception e) {
e.printStackTrace();
}
simplifiedEntityColliderProvider = null;
}
fluidStorage.forEach((pos, mfs) -> mfs.tick(entity, pos, world.isRemote));
}
@ -1182,19 +1181,25 @@ public abstract class Contraption {
}
private void gatherBBsOffThread() {
getContraptionWorld();
simplifiedEntityColliderProvider = CompletableFuture.supplyAsync(() -> {
VoxelShape combinedShape = VoxelShapes.empty();
for (Entry<BlockPos, BlockInfo> entry : blocks.entrySet()) {
BlockInfo info = entry.getValue();
BlockPos localPos = entry.getKey();
VoxelShape collisionShape = info.state.getCollisionShape(this.world, localPos);
VoxelShape collisionShape = info.state.getCollisionShape(world, localPos);
if (collisionShape.isEmpty())
continue;
combinedShape = VoxelShapes.combineAndSimplify(combinedShape,
combinedShape = VoxelShapes.combine(combinedShape,
collisionShape.withOffset(localPos.getX(), localPos.getY(), localPos.getZ()), IBooleanFunction.OR);
}
return combinedShape.toBoundingBoxList();
});
return combinedShape.simplify()
.toBoundingBoxList();
})
.thenAccept(r -> {
simplifiedEntityColliders = Optional.of(r);
simplifiedEntityColliderProvider = null;
});
}
public static float getRadius(Set<BlockPos> blocks, Direction.Axis axis) {

13
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
View file

@ -118,7 +118,6 @@ public class ContraptionCollider {
motion = rotationMatrix.transform(motion);
// Use simplified bbs when present
// TODO: is it worth filtering out far away bbs?
final Vec3d motionCopy = motion;
List<AxisAlignedBB> collidableBBs = contraption.simplifiedEntityColliders.orElseGet(() -> {
@ -147,7 +146,17 @@ public class ContraptionCollider {
for (AxisAlignedBB bb : collidableBBs) {
Vec3d currentResponse = collisionResponse.getValue();
obb.setCenter(obbCenter.add(currentResponse));
Vec3d currentCenter = obbCenter.add(currentResponse);
if (Math.abs(currentCenter.x - bb.getCenter().x) - entityBounds.getXSize() - 1 > bb.getXSize() / 2)
continue;
if (Math.abs((currentCenter.y + motion.y) - bb.getCenter().y) - entityBounds.getYSize()
- 1 > bb.getYSize() / 2)
continue;
if (Math.abs(currentCenter.z - bb.getCenter().z) - entityBounds.getZSize() - 1 > bb.getZSize() / 2)
continue;
obb.setCenter(currentCenter);
ContinuousSeparationManifold intersect = obb.intersect(bb, motion);
if (intersect == null)

5
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
View file

@ -101,6 +101,11 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity
public void onSpeedChanged(float prevSpeed) {
super.onSpeedChanged(prevSpeed);
assembleNextTick = true;
if (movedContraption != null && Math.signum(prevSpeed) != Math.signum(getSpeed()) && prevSpeed != 0) {
movedContraption.getContraption()
.stop(world);
}
}
public float getAngularSpeed() {

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java
View file

@ -69,6 +69,8 @@ public class GantryContraptionEntity extends AbstractContraptionEntity {
if (!isStalled() && ticksExisted > 2)
move(movementVec.x, movementVec.y, movementVec.z);
if (Math.signum(prevAxisMotion) != Math.signum(axisMotion) && prevAxisMotion != 0)
contraption.stop(world);
if (!world.isRemote && (prevAxisMotion != axisMotion || ticksExisted % 3 == 0))
sendPacket();
}

8
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java
View file

@ -20,7 +20,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
public abstract class LinearActuatorTileEntity extends KineticTileEntity implements IControlContraption, IDisplayAssemblyExceptions {
public abstract class LinearActuatorTileEntity extends KineticTileEntity
implements IControlContraption, IDisplayAssemblyExceptions {
public float offset;
public boolean running;
@ -147,6 +148,11 @@ public abstract class LinearActuatorTileEntity extends KineticTileEntity impleme
super.onSpeedChanged(prevSpeed);
assembleNextTick = true;
waitingForSpeedChange = false;
if (movedContraption != null && Math.signum(prevSpeed) != Math.signum(getSpeed()) && prevSpeed != 0) {
movedContraption.getContraption()
.stop(world);
}
}
@Override

28
src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
View file

@ -31,8 +31,8 @@ public class TreeFertilizerItem extends Item {
return ActionResultType.SUCCESS;
}
TreesDreamWorld world = new TreesDreamWorld((ServerWorld) context.getWorld());
BlockPos saplingPos = context.getPos();
TreesDreamWorld world = new TreesDreamWorld((ServerWorld) context.getWorld(), saplingPos);
for (BlockPos pos : BlockPos.getAllInBoxMutable(-1, 0, -1, 1, 0, 1)) {
if (context.getWorld()
@ -45,8 +45,8 @@ public class TreeFertilizerItem extends Item {
state.with(SaplingBlock.STAGE, 1));
for (BlockPos pos : world.blocksAdded.keySet()) {
BlockPos actualPos = pos.add(saplingPos)
.down(10);
BlockPos actualPos = pos.add(saplingPos).down(10);
BlockState newState = world.blocksAdded.get(pos);
// Don't replace Bedrock
if (context.getWorld()
@ -54,21 +54,15 @@ public class TreeFertilizerItem extends Item {
.getBlockHardness(context.getWorld(), actualPos) == -1)
continue;
// Don't replace solid blocks with leaves
if (!world.getBlockState(pos)
.isNormalCube(world, pos)
if (!newState.isNormalCube(world, pos)
&& !context.getWorld()
.getBlockState(actualPos)
.getCollisionShape(context.getWorld(), actualPos)
.isEmpty())
continue;
if (world.getBlockState(pos)
.getBlock() == Blocks.GRASS_BLOCK
|| world.getBlockState(pos)
.getBlock() == Blocks.PODZOL)
continue;
context.getWorld()
.setBlockState(actualPos, world.getBlockState(pos));
.setBlockState(actualPos, newState);
}
if (context.getPlayer() != null && !context.getPlayer()
@ -83,18 +77,26 @@ public class TreeFertilizerItem extends Item {
}
private class TreesDreamWorld extends PlacementSimulationServerWorld {
private final BlockState soil;
protected TreesDreamWorld(ServerWorld wrapped) {
protected TreesDreamWorld(ServerWorld wrapped, BlockPos saplingPos) {
super(wrapped);
soil = wrapped.getBlockState(saplingPos.down());
}
@Override
public BlockState getBlockState(BlockPos pos) {
if (pos.getY() <= 9)
return Blocks.GRASS_BLOCK.getDefaultState();
return soil;
return super.getBlockState(pos);
}
@Override
public boolean setBlockState(BlockPos pos, BlockState newState, int flags) {
if (newState.getBlock() == Blocks.PODZOL)
return true;
return super.setBlockState(pos, newState, flags);
}
}
}