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

Patch E Prep

Browse source
This commit is contained in:
simibubi 2022-03-12 20:31:12 +01:00
parent 2211632f5c
commit 0b17aab01e
6 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View file

@ -49,6 +49,7 @@ body:
label: Mod Version label: Mod Version
description: The version of the mod you were using when the bug occured description: The version of the mod you were using when the bug occured
options: options:
- "0.4.0e"
- "0.4.0d" - "0.4.0d"
- "0.4.0c" - "0.4.0c"
- "0.4.0b" - "0.4.0b"

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.4d mod_version = 0.4e
minecraft_version = 1.18.1 minecraft_version = 1.18.1
forge_version = 39.1.0 forge_version = 39.1.0

2
src/main/java/com/simibubi/create/Create.java
View file

@ -57,7 +57,7 @@ public class Create {
public static final String ID = "create"; public static final String ID = "create";
public static final String NAME = "Create"; public static final String NAME = "Create";
public static final String VERSION = "0.4d"; public static final String VERSION = "0.4e";
public static final Logger LOGGER = LogManager.getLogger(); public static final Logger LOGGER = LogManager.getLogger();

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

@ -445,8 +445,6 @@ public abstract class AbstractContraptionEntity extends Entity implements IEntit
AllPackets.channel.send(PacketDistributor.TRACKING_ENTITY.with(() -> this), AllPackets.channel.send(PacketDistributor.TRACKING_ENTITY.with(() -> this),
new ContraptionDisassemblyPacket(this.getId(), transform)); new ContraptionDisassemblyPacket(this.getId(), transform));
discard();
contraption.addBlocksToWorld(level, transform); contraption.addBlocksToWorld(level, transform);
contraption.addPassengersToWorld(level, transform, getPassengers()); contraption.addPassengersToWorld(level, transform, getPassengers());
@ -462,6 +460,8 @@ public abstract class AbstractContraptionEntity extends Entity implements IEntit
((AbstractContraptionEntity) entity).disassemble(); ((AbstractContraptionEntity) entity).disassemble();
} }
discard();
ejectPassengers(); ejectPassengers();
moveCollidedEntitiesOnDisassembly(transform); moveCollidedEntitiesOnDisassembly(transform);
AllSoundEvents.CONTRAPTION_DISASSEMBLE.playOnServer(level, blockPosition()); AllSoundEvents.CONTRAPTION_DISASSEMBLE.playOnServer(level, blockPosition());

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

@ -1129,6 +1129,8 @@ public abstract class Contraption {
if (getSeatMapping().isEmpty()) if (getSeatMapping().isEmpty())
continue; continue;
Integer seatIndex = getSeatMapping().get(seatedEntity.getUUID()); Integer seatIndex = getSeatMapping().get(seatedEntity.getUUID());
if (seatIndex == null)
continue;
BlockPos seatPos = getSeats().get(seatIndex); BlockPos seatPos = getSeats().get(seatIndex);
seatPos = transform.apply(seatPos); seatPos = transform.apply(seatPos);
if (!(world.getBlockState(seatPos) if (!(world.getBlockState(seatPos)

2
src/main/resources/META-INF/mods.toml
View file

@ -5,7 +5,7 @@ license="MIT"
[[mods]] [[mods]]
modId="create" modId="create"
version="0.4d" version="0.4e"
displayName="Create" displayName="Create"
#updateJSONURL="" #updateJSONURL=""
displayURL="https://www.curseforge.com/minecraft/mc-mods/create" displayURL="https://www.curseforge.com/minecraft/mc-mods/create"