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

Better Assline checkresult #3863

Merged
merged 3 commits into from
Jan 26, 2025
Merged

Better Assline checkresult #3863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b3bd5a
update
reobf Jan 26, 2025
1803489
Merge branch 'GTNewHorizons:master' into better-Assline-checkresult
reobf Jan 26, 2025
77b6a58
Merge branch 'master' into better-Assline-checkresult
Dream-Master Jan 26, 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
2 changes: 1 addition & 1 deletion src/main/java/ggfab/mte/MTEAdvAssLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ public CheckRecipeResult checkProcessing() {
for (ItemStack stack : tDataStickList) {
GTRecipe.RecipeAssemblyLine recipe = findRecipe(stack);
if (recipe == null) {
result = CheckRecipeResultRegistry.NO_RECIPE;
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}
if (recipe.mEUt > inputVoltage) {
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public CheckRecipeResult checkProcessing() {
.findAssemblyLineRecipeFromDataStick(tDataStick, false);

if (tLookupResult.getType() == AssemblyLineUtils.LookupResultType.INVALID_STICK) {
result = CheckRecipeResultRegistry.NO_RECIPE;
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}

Expand All @@ -231,7 +231,8 @@ public CheckRecipeResult checkProcessing() {
if (tLookupResult.getType() != AssemblyLineUtils.LookupResultType.VALID_STACK_AND_VALID_HASH) {
tRecipe = AssemblyLineUtils.processDataStick(tDataStick);
if (tRecipe == null) {
result = CheckRecipeResultRegistry.NO_RECIPE;
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS)
result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}
}
Expand Down Expand Up @@ -261,7 +262,7 @@ public CheckRecipeResult checkProcessing() {
mInputHatches.size(),
tRecipe.mFluidInputs.length);
}
result = CheckRecipeResultRegistry.NO_RECIPE;
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}

Expand Down Expand Up @@ -301,13 +302,13 @@ public CheckRecipeResult checkProcessing() {
// Check Inputs allign
int[] itemConsumptions = GTRecipe.RecipeAssemblyLine.getItemConsumptionAmountArray(mInputBusses, tRecipe);
if (itemConsumptions == null || itemConsumptions.length == 0) {
result = CheckRecipeResultRegistry.NO_RECIPE;
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}
currentParallel = (int) GTRecipe.RecipeAssemblyLine
.maxParallelCalculatedByInputItems(mInputBusses, currentParallel, itemConsumptions, inputsFromME);
if (currentParallel <= 0) {
result = CheckRecipeResultRegistry.NO_RECIPE;
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}
tStacks = itemConsumptions;
Expand All @@ -324,7 +325,8 @@ public CheckRecipeResult checkProcessing() {
tRecipe.mFluidInputs,
fluidsFromME);
if (currentParallel <= 0) {
result = CheckRecipeResultRegistry.NO_RECIPE;
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS)
result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}
tFluids = tRecipe.mFluidInputs;
Expand Down
Loading