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

[Patch]: Disabled arrow heads from being inserted into the disassembly station #903

Merged
merged 2 commits into from
Apr 26, 2024
Merged

[Patch]: Disabled arrow heads from being inserted into the disassembly station #903

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
620c29c
* Disabled arrows from being inserted into the disassembly station
SigmundGranaas Apr 26, 2024
f45733f
* Made the test only check the specific type of the composite
SigmundGranaas Apr 26, 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
12 changes: 8 additions & 4 deletions ...dgranaas/forgero/minecraft/common/block/assemblystation/AssemblyStationScreenHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
import net.minecraft.inventory.SimpleInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
import net.minecraft.recipe.RecipeType;
import net.minecraft.registry.Registries;
import net.minecraft.resource.featuretoggle.FeatureFlags;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.screen.ScreenHandlerContext;
Expand Down Expand Up @@ -106,7 +104,6 @@ protected void dropInventory(PlayerEntity player, Inventory inventory) {
}



@Override
public void onClosed(PlayerEntity player) {
super.onClosed(player);
Expand Down Expand Up @@ -237,7 +234,14 @@ public void removeCompositeIngredient() {

@Override
public boolean canInsert(ItemStack stack) {
return this.inventory.isEmpty() && doneConstructing && stack.getDamage() == 0 && resultInventory.isEmpty() && !(DisassemblyHandler.createHandler(stack) instanceof EmptyHandler);
DisassemblyHandler handler = DisassemblyHandler.createHandler(stack);
if (handler instanceof EmptyHandler) {
return false;
} else if (handler.disassemble().isEmpty()) {
return false;
}

return this.inventory.isEmpty() && doneConstructing && stack.getDamage() == 0 && resultInventory.isEmpty();
}

public void doneConstructing() {
Expand Down
32 changes: 17 additions & 15 deletions ...sigmundgranaas/forgero/minecraft/common/block/assemblystation/state/CompositeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
package com.sigmundgranaas.forgero.minecraft.common.block.assemblystation.state;

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;

import com.sigmundgranaas.forgero.core.state.Composite;
import com.sigmundgranaas.forgero.core.type.Type;
import com.sigmundgranaas.forgero.minecraft.common.service.StateService;

import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;

public class CompositeHandler implements DisassemblyHandler {
private final Composite composite;
Expand All @@ -17,29 +21,27 @@ public CompositeHandler(Composite composite) {

@Override
public List<ItemStack> disassemble() {
if (composite.type().test(Type.ARROW_HEAD)) {
return Collections.emptyList();
}
if (composite.type().test(Type.ARROW)) {
return parts()
.filter(stack -> stack.getItem() != Items.FEATHER)
.toList();
}
return parts().toList();
}

private Stream<ItemStack> parts() {
return composite.components().stream()
.filter(state -> !state.identifier().contains("schematic"))
.map(StateService.INSTANCE::convert)
.flatMap(Optional::stream)
.toList();
.flatMap(Optional::stream);
}

public boolean isDisassembled(List<ItemStack> stacks) {
var compared = disassemble();
if (compared.size() != stacks.size()) {
return false;
}
for (int i = 0; i < stacks.size(); i++) {
if (!stacks.get(i).isOf(compared.get(i).getItem())) {
return false;
}
}
return true;
}

@Override
public DisassemblyHandler insertIntoDisassemblySlot(ItemStack stack) {
return DisassemblyHandler.createHandler(stack);
}

}
Loading