Skip to content
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

Fix empty crates and drums not stacking with new ones #2449

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Fix empty crates and drums not stacking with new ones #2449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f70fa8
check if the drum has any fluid in it before saving the tag
omergunr100 Nov 28, 2024
a7c44b6
check if the crate is taped before saving tag
omergunr100 Nov 28, 2024
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
5 changes: 5 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ public void saveToItem(CompoundTag tag) {
}
}

@Override
public boolean saveBreak() {
return isTaped;
}

@Override
public void onMachineRemoved() {
if (!isTaped) clearInventory(inventory.storage);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ public InteractionResult onUse(BlockState state, Level world, BlockPos pos, Play
return world.isClientSide ? InteractionResult.SUCCESS : InteractionResult.PASS;
}

@Override
public boolean saveBreak() {
return !stored.isEmpty();
}

@Override
protected InteractionResult onScrewdriverClick(Player playerIn, InteractionHand hand, Direction gridSide,
BlockHitResult hitResult) {
Expand Down