mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering

Browse source
This commit is contained in:
grimmauld 2021-01-13 22:41:59 +01:00
commit 6af884edb7
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
# mod version info # mod version info
mod_version=0.3d mod_version=0.3e
minecraft_version=1.15.2 minecraft_version=1.15.2
forge_version=31.2.47 forge_version=31.2.47

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)) { if (world.isRemote && carts.containsKey(uniqueID)) {
MinecartController minecartController = carts.get(uniqueID); MinecartController minecartController = carts.get(uniqueID);
AbstractMinecartEntity minecartEntity = minecartController.cart(); if (minecartController != null) {
if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId()) AbstractMinecartEntity minecartEntity = minecartController.cart();
continue; // Away with you, Fake Entities! if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId())
continue; // Away with you, Fake Entities!
}
} }
cartsWithCoupling.remove(uniqueID); cartsWithCoupling.remove(uniqueID);
@ -145,6 +147,8 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
.getPos(); .getPos();
Map<UUID, MinecartController> carts = loadedMinecartsByUUID.get(event.getWorld()); Map<UUID, MinecartController> carts = loadedMinecartsByUUID.get(event.getWorld());
for (MinecartController minecartController : carts.values()) { for (MinecartController minecartController : carts.values()) {
if (minecartController == null)
continue;
if (!minecartController.isPresent()) if (!minecartController.isPresent())
continue; continue;
AbstractMinecartEntity cart = minecartController.cart(); 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; 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) @OnlyIn(Dist.CLIENT)
public void animateTick(BlockState state, World world, BlockPos pos, Random random) { public void animateTick(BlockState state, World world, BlockPos pos, Random random) {
if (random.nextInt(10) != 0) 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 @Override
public VoxelShape getCollisionShape(BlockState state, IBlockReader reader, BlockPos pos, public VoxelShape getCollisionShape(BlockState state, IBlockReader reader, BlockPos pos,
ISelectionContext context) { ISelectionContext context) {