Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ permissions:
contents: read

env:
COMMON_BRANCH: main
COMMON_BRANCH: common
COMMON_DIR: Dissolver Enhanced (Common)
TARGET_DIR: Dissolver Enhanced (Target)

jobs:
build-common:
name: Build Common
if: ${{ github.ref_name == 'main' }}
if: ${{ github.ref_name == 'common' }}
runs-on: ubuntu-22.04
steps:
- name: Checkout Common
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

discover-version-branches:
name: Discover Version Branches
if: ${{ github.ref_name == 'main' }}
if: ${{ github.ref_name == 'common' }}
runs-on: ubuntu-22.04
outputs:
branches: ${{ steps.branches.outputs.branches }}
Expand All @@ -81,7 +81,7 @@ jobs:

build-all-version-branches:
name: Build ${{ matrix.branch }}
if: ${{ github.ref_name == 'main' && needs.discover-version-branches.outputs.branches != '[]' }}
if: ${{ github.ref_name == 'common' && needs.discover-version-branches.outputs.branches != '[]' }}
needs: discover-version-branches
runs-on: ubuntu-22.04
strategy:
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:

package-all-builds:
name: Package All Builds
if: ${{ github.ref_name == 'main' && needs.build-common.result == 'success' && needs.build-all-version-branches.result == 'success' }}
if: ${{ github.ref_name == 'common' && needs.build-common.result == 'success' && needs.build-all-version-branches.result == 'success' }}
needs:
- build-common
- build-all-version-branches
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ version = project.mod_version
group = project.maven_group

def commonDir = [
"../../common/minecraft",
"../Common/minecraft",
"../Dissolver Enhanced (Common)/minecraft",
"Common/minecraft"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -990,10 +990,7 @@ private static void addRecipeSourceDetail(
int resultCount,
BigInteger extraEMC
) {
List<String> sourceDetails = new ArrayList<>();
if (RECIPE_ITEM_SOURCE_DETAILS.containsKey(resultId)) {
sourceDetails = RECIPE_ITEM_SOURCE_DETAILS.get(resultId);
}
List<String> sourceDetails = RECIPE_ITEM_SOURCE_DETAILS.computeIfAbsent(resultId, ignored -> new ArrayList<>());

String sourceDetail = formatRecipeSourceDetail(recipeKey, resultId, resultCount, ingredients, emcValue, extraEMC);
if (!sourceDetails.contains(sourceDetail)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -237,6 +239,30 @@ void test_setEMC_COLLECTION() {
}


@Test
void recipeSourceDetailReplacesNullList() throws Exception {
Field detailsField = EMCValues.class.getDeclaredField("RECIPE_ITEM_SOURCE_DETAILS");
detailsField.setAccessible(true);
@SuppressWarnings("unchecked")
Map<String, List<String>> details = (Map<String, List<String>>) detailsField.get(null);
details.clear();
details.put("test:result", null);

Method addSourceDetail = EMCValues.class.getDeclaredMethod(
"addRecipeSourceDetail",
String.class,
String.class,
BigInteger.class,
List.class,
int.class,
BigInteger.class
);
addSourceDetail.setAccessible(true);
addSourceDetail.invoke(null, "test:result", "test:recipe__1__0__1", BigInteger.ONE, List.of("minecraft:dirt"), 1, BigInteger.ZERO);

assertThat(details.get("test:result")).contains("Recipe test:recipe__1__0__1: 1x minecraft:dirt -> 1x test:result = 1 EMC");
}

private void validateEMCValues(List<EMCRecord> expected) {
Set<String> set = EMCValues.getList();

Expand Down
Loading