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: Precise Assembler cannot accept UEV+ machine blocks. #3844

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix: Precise Assembler cannot accept UEV+ machine blocks. #3844

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed62eed
PreciseAssembler shall not accept Bronze Plated Bricks or any blocks …
Apeiria01 Jan 21, 2025
37a30c9
spotless
serenibyss Jan 21, 2025
edea04d
Merge branch 'master' of https://github.com/Apeiria01/GT5-Unofficial
Apeiria01 Jan 21, 2025
a377463
FIX
Apeiria01 Jan 21, 2025
6d7f0ff
Merge branch 'GTNewHorizons:master' into master
Apeiria01 Jan 21, 2025
a9e72f4
PreciseAssembler: Machine blocks' tier should <= energy hathes' tier
Apeiria01 Jan 21, 2025
a9981ec
Merge remote-tracking branch 'Mine/master'
Apeiria01 Jan 21, 2025
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
22 changes: 17 additions & 5 deletions src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;

import javax.annotation.Nonnull;

Expand Down Expand Up @@ -159,11 +160,22 @@ public IStructureDefinition<MTEPreciseAssembler> getStructureDefinition() {
withChannel(
"machine casing",
StructureUtility.ofBlocksTiered(
(block, meta) -> (block == GregTechAPI.sBlockCasings1 && meta >= 0 && meta <= 9) ? meta
: -2,
IntStream.range(0, 10)
.mapToObj(
meta -> org.apache.commons.lang3.tuple.Pair.of(GregTechAPI.sBlockCasings1, meta))
(block,
meta) -> (block == GregTechAPI.sBlockCasings1 && meta >= 0 && meta <= 9)
|| (block == GregTechAPI.sBlockCasingsNH && meta >= 10 && meta <= 14) ? meta : -2,
Stream.concat(
IntStream.range(0, 10)
.mapToObj(
meta -> org.apache.commons.lang3.tuple.Pair
.of(GregTechAPI.sBlockCasings1, meta))
.collect(Collectors.toList())
.stream(),
IntStream.range(10, 15)
.mapToObj(
meta -> org.apache.commons.lang3.tuple.Pair
.of(GregTechAPI.sBlockCasingsNH, meta))
.collect(Collectors.toList())
.stream())
.collect(Collectors.toList()),
-1,
MTEPreciseAssembler::setMachineTier,
Expand Down
Loading