Skip to content

Fix size-related issues when printing tanks and vaults #10525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Apertyotis wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
Open

Fix size-related issues when printing tanks and vaults #10525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ public void write(CompoundTag compound, HolderLookup.Provider registries, boolea
public void writeSafe(CompoundTag compound, HolderLookup.Provider registries) {
if (isController()) {
compound.putBoolean("Window", window);
compound.putInt("Size", width);
compound.putInt("Height", height);
compound.putInt("Size", 1);
compound.putInt("Height", 1);
}
}

Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.simibubi.create.AllBlockEntityTypes;
import com.simibubi.create.api.connectivity.ConnectivityHandler;
import com.simibubi.create.api.packager.InventoryIdentifier;
import com.simibubi.create.api.schematic.nbt.PartialSafeNBT;
import com.simibubi.create.foundation.ICapabilityProvider;
import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
Expand Down Expand Up @@ -39,7 +40,7 @@
import net.neoforged.neoforge.items.IItemHandlerModifiable;
import net.neoforged.neoforge.items.ItemStackHandler;

public class ItemVaultBlockEntity extends SmartBlockEntity implements IMultiBlockEntityContainer.Inventory, Clearable {
public class ItemVaultBlockEntity extends SmartBlockEntity implements IMultiBlockEntityContainer.Inventory, Clearable, PartialSafeNBT {
protected ICapabilityProvider<IItemHandler> itemCapability = null;
protected InventoryIdentifier invId;

Expand Down Expand Up @@ -315,6 +316,14 @@ protected void write(CompoundTag compound, HolderLookup.Provider registries, boo
}
}

@Override
public void writeSafe(CompoundTag compound, HolderLookup.Provider registries) {
if (isController()) {
compound.putInt("Size", 1);
compound.putInt("Length", 1);
}
}

@Override
public void clearContent() {
((ItemStackHandlerAccessor) inventory).create$getStacks().clear();
Expand Down
Loading