tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'mc1.15/dev' into mc1.16/dev

Browse source
This commit is contained in:
simibubi 2021-01-13 18:31:38 +01:00
commit f41f7b3efa
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
View file

@ -102,9 +102,11 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
if (world.isRemote && carts.containsKey(uniqueID)) {
MinecartController minecartController = carts.get(uniqueID);
AbstractMinecartEntity minecartEntity = minecartController.cart();
if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId())
continue; // Away with you, Fake Entities!
if (minecartController != null) {
AbstractMinecartEntity minecartEntity = minecartController.cart();
if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId())
continue; // Away with you, Fake Entities!
}
}
cartsWithCoupling.remove(uniqueID);
@ -145,6 +147,8 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
.getPos();
Map<UUID, MinecartController> carts = loadedMinecartsByUUID.get(event.getWorld());
for (MinecartController minecartController : carts.values()) {
if (minecartController == null)
continue;
if (!minecartController.isPresent())
continue;
AbstractMinecartEntity cart = minecartController.cart();

10
src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
View file

@ -217,6 +217,16 @@ public class BlazeBurnerBlock extends Block implements ITE<BlazeBurnerTileEntity
return builder;
}
@Override
public boolean hasComparatorInputOverride(BlockState p_149740_1_) {
return true;
}
@Override
public int getComparatorInputOverride(BlockState state, World p_180641_2_, BlockPos p_180641_3_) {
return Math.max(0, state.get(HEAT_LEVEL).ordinal() -1);
}
@OnlyIn(Dist.CLIENT)
public void animateTick(BlockState state, World world, BlockPos pos, Random random) {
if (random.nextInt(10) != 0)

10
src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java
View file

@ -98,6 +98,16 @@ public class LitBlazeBurnerBlock extends Block {
}
}
@Override
public boolean hasComparatorInputOverride(BlockState p_149740_1_) {
return true;
}
@Override
public int getComparatorInputOverride(BlockState state, World p_180641_2_, BlockPos p_180641_3_) {
return 1;
}
@Override
public VoxelShape getCollisionShape(BlockState state, IBlockReader reader, BlockPos pos,
ISelectionContext context) {