mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'concealed/mc1.21.1/dev' into mc1.21.1/dev

Browse source
This commit is contained in:
IThundxr 2025-01-30 19:13:36 -05:00
commit e215789b17
Failed to generate hash of commit
9 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -27,7 +27,7 @@ registrate_version = MC1.21-1.3.0+61
flywheel_minecraft_version = 1.21.1
flywheel_version = 1.0.0-beta-1
flywheel_version_range = [1.0.0-alpha,2.0)
ponder_version = 1.0.30
ponder_version = 1.0.31
jei_minecraft_version = 1.21.1
jei_version = 19.21.0.247
curios_minecraft_version = 1.21.1

7
src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java
View file

@ -249,8 +249,11 @@ public abstract class AbstractContraptionEntity extends Entity implements IEntit
return null;
Vec3 transformedVector = toGlobalVector(Vec3.atLowerCornerOf(seat)
.add(.5, -passenger.getVehicleAttachmentPoint(this).y + ySize + .125, .5), partialTicks)
.add(VecHelper.getCenterOf(BlockPos.ZERO))
.add(.5,
-passenger.getVehicleAttachmentPoint(this).y + ySize + .125
- SeatEntity.getCustomEntitySeatOffset(passenger),
.5),
partialTicks).add(VecHelper.getCenterOf(BlockPos.ZERO))
.subtract(0.5, ySize, 0.5);
return transformedVector;
}

4
src/main/java/com/simibubi/create/content/contraptions/Contraption.java
View file

@ -758,7 +758,9 @@ public abstract class Contraption {
c -> superglue.add(SuperGlueEntity.readBoundingBox(c)));
seats.clear();
NBTHelper.iterateCompoundList(nbt.getList("Seats", Tag.TAG_COMPOUND), c -> seats.add(NBTHelper.readBlockPos(c, "Pos")));
NBTHelper.iterateCompoundList(nbt.getList("Seats", Tag.TAG_COMPOUND),
c -> seats.add(c.contains("Pos") ? NBTHelper.readBlockPos(c, "Pos")
: new BlockPos(c.getInt("X"), c.getInt("Y"), c.getInt("Z"))));
seatMapping.clear();
NBTHelper.iterateCompoundList(nbt.getList("Passengers", Tag.TAG_COMPOUND),

2
src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java
View file

@ -79,7 +79,7 @@ public class SeatEntity extends Entity implements IEntityWithComplexSpawn {
if (entity instanceof Spider)
return 1 / 8.0;
if (entity instanceof PackageEntity)
return 1 / 4f;
return 3 / 32f;
return 0;
}

2
src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintEntity.java
View file

@ -202,7 +202,7 @@ public class BlueprintEntity extends HangingEntity
@Override
protected void recalculateBoundingBox() {
if (this.direction != null && this.verticalOrientation != null) {
recalculateBoundingBox();
setBoundingBox(calculateBoundingBox(pos, direction));
}
}
@Override

9
src/main/java/com/simibubi/create/content/logistics/box/PackageEntity.java
View file

@ -285,10 +285,15 @@ public class PackageEntity extends LivingEntity implements IEntityWithComplexSpa
}
}
// TODO - Lookover
@Override
public Vec3 getPassengerRidingPosition(Entity entity) {
return new Vec3(0, entity.getDimensions(getPose()).height(), 0);
return position().add(0, entity.getDimensions(getPose())
.height(), 0);
}
@Override
protected Vec3 getPassengerAttachmentPoint(Entity entity, EntityDimensions dimensions, float partialTick) {
return super.getPassengerAttachmentPoint(entity, dimensions, partialTick).add(0, 2 / 16f, 0);
}
@Override

2
src/main/java/com/simibubi/create/content/logistics/depot/storage/DepotMountedStorage.java
View file

@ -24,7 +24,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp
import net.neoforged.neoforge.items.ItemStackHandler;
public class DepotMountedStorage extends WrapperMountedItemStorage<Handler> implements SyncedMountedStorage {
public static final MapCodec<DepotMountedStorage> CODEC = ItemStack.CODEC.xmap(
public static final MapCodec<DepotMountedStorage> CODEC = ItemStack.OPTIONAL_CODEC.xmap(
DepotMountedStorage::new, DepotMountedStorage::getItem
).fieldOf("value");

3
src/main/java/com/simibubi/create/content/logistics/tableCloth/TableClothBlockEntity.java
View file

@ -304,7 +304,8 @@ public class TableClothBlockEntity extends SmartBlockEntity {
protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean clientPacket) {
super.read(tag, registries, clientPacket);
manuallyAddedItems = NBTHelper.readItemList(tag.getList("Items", Tag.TAG_COMPOUND), registries);
requestData = CatnipCodecUtils.decode(AutoRequestData.CODEC, tag.get("RequestData")).orElseThrow();
requestData = CatnipCodecUtils.decode(AutoRequestData.CODEC, tag.get("RequestData"))
.orElse(new AutoRequestData());
owner = tag.contains("OwnerUUID") ? tag.getUUID("OwnerUUID") : null;
facing = Direction.from2DDataValue(Mth.positiveModulo(tag.getInt("Facing"), 4));
}

3
src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java
View file

@ -84,7 +84,8 @@ public class TrackNodeLocation extends Vec3i {
}
public static TrackNodeLocation read(CompoundTag tag, DimensionPalette dimensions) {
TrackNodeLocation location = fromPackedPos(NBTHelper.readBlockPos(tag, "Pos"));
TrackNodeLocation location = fromPackedPos(tag.contains("Pos") ? NBTHelper.readBlockPos(tag, "Pos")
: new BlockPos(tag.getInt("X"), tag.getInt("Y"), tag.getInt("Z")));
if (dimensions != null)
location.dimension = dimensions.decode(tag.getInt("D"));
location.yOffsetPixels = tag.getInt("YO");