Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-11-23 12:18:35 +01:00
Code Issues Projects Releases Wiki Activity

added a button to send craft items back

Browse source 
closes #215
This commit is contained in:
Ell 2024-11-22 13:41:13 +01:00
parent e0e0b550e2
commit 09a471c042
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java
View file

@ -121,6 +121,10 @@ public record PacketButton(BlockPos pos, int result, List<Integer> data) impleme
var tile = Utility.getBlockEntity(CraftingTerminalBlockEntity.class, player.level(), pos);
tile.requestCraftingItems(player, data.getFirst(), data.get(1) > 0);
}),
CRAFT_TERMINAL_SEND_BACK((pos, data, player) -> {
var tile = Utility.getBlockEntity(CraftingTerminalBlockEntity.class, player.level(), pos);
tile.sendItemsBack();
}),
CANCEL_CRAFTING((pos, data, player) -> {
var tile = Utility.getBlockEntity(ItemTerminalBlockEntity.class, player.level(), pos);
tile.cancelCrafting();

12
src/main/java/de/ellpeck/prettypipes/terminal/CraftingTerminalBlockEntity.java
View file

@ -26,6 +26,7 @@ import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.neoforge.items.ItemHandlerHelper;
import net.neoforged.neoforge.items.ItemStackHandler;
import net.neoforged.neoforge.items.wrapper.RangedWrapper;
import net.neoforged.neoforge.network.PacketDistributor;
import org.apache.commons.lang3.mutable.MutableInt;
@ -139,6 +140,17 @@ public class CraftingTerminalBlockEntity extends ItemTerminalBlockEntity {
network.endProfile();
}
public void sendItemsBack() {
var outputInventory = new RangedWrapper(this.items, 6, 12);
for (var i = 0; i < this.craftItems.getSlots(); i++) {
var stack = this.craftItems.getStackInSlot(i);
if (!stack.isEmpty()) {
var remain = ItemHandlerHelper.insertItemStacked(outputInventory, stack, false);
this.craftItems.setStackInSlot(i, remain);
}
}
}
@Override
public void saveAdditional(CompoundTag compound, HolderLookup.Provider provider) {
super.saveAdditional(compound, provider);

16
src/main/java/de/ellpeck/prettypipes/terminal/containers/CraftingTerminalGui.java
View file

@ -5,6 +5,7 @@ import de.ellpeck.prettypipes.PrettyPipes;
import de.ellpeck.prettypipes.packets.PacketButton;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.Tooltip;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
@ -12,11 +13,13 @@ import net.minecraft.world.entity.player.Inventory;
import net.neoforged.neoforge.network.PacketDistributor;
import java.util.Arrays;
import java.util.List;
public class CraftingTerminalGui extends ItemTerminalGui {
private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(PrettyPipes.ID, "textures/gui/crafting_terminal.png");
private Button requestButton;
private Button sendBackButton;
public CraftingTerminalGui(ItemTerminalContainer screenContainer, Inventory inv, Component titleIn) {
super(screenContainer, inv, titleIn);
@ -32,6 +35,9 @@ public class CraftingTerminalGui extends ItemTerminalGui {
var force = Screen.hasAltDown() || InputConstants.isKeyDown(this.minecraft.getWindow().getWindow(), 259) ? 1 : 0;
PacketDistributor.sendToServer(new PacketButton(this.menu.tile.getBlockPos(), PacketButton.ButtonResult.CRAFT_TERMINAL_REQUEST, Arrays.asList(amount, force)));
}).bounds(this.leftPos + 8, this.topPos + 100, 50, 20).build());
this.sendBackButton = this.addRenderableWidget(Button.builder(Component.literal(">"), button -> {
PacketDistributor.sendToServer(new PacketButton(this.menu.tile.getBlockPos(), PacketButton.ButtonResult.CRAFT_TERMINAL_SEND_BACK, List.of()));
}).bounds(this.leftPos + 47, this.topPos + 72, 12, 12).build());
this.tick();
}
@ -40,12 +46,14 @@ public class CraftingTerminalGui extends ItemTerminalGui {
super.containerTick();
var tile = this.getCraftingContainer().getTile();
this.requestButton.active = false;
this.sendBackButton.active = false;
for (var i = 0; i < tile.craftItems.getSlots(); i++) {
var stack = tile.getRequestedCraftItem(i);
if (!stack.isEmpty() && stack.getCount() < stack.getMaxStackSize()) {
var requestStack = tile.getRequestedCraftItem(i);
if (!requestStack.isEmpty() && requestStack.getCount() < requestStack.getMaxStackSize())
this.requestButton.active = true;
break;
}
var realStack = tile.craftItems.getStackInSlot(i);
if (!realStack.isEmpty())
this.sendBackButton.active = true;
}
}