diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-12-01 08:27:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 08:27:08 +0100 |
| commit | 8f29b031f80b722a1ab3cb8d646acb9bf5b7c259 (patch) | |
| tree | d4dcd4d32d76a9757995446d77fb996c06f4e482 | |
| parent | bcb96530531ba1485952f19c3157b06cfa898b68 (diff) | |
| parent | bda74ad7cb364e02965aac66cd6b08554fd53a3b (diff) | |
| download | GT5-Unofficial-8f29b031f80b722a1ab3cb8d646acb9bf5b7c259.tar.gz GT5-Unofficial-8f29b031f80b722a1ab3cb8d646acb9bf5b7c259.tar.bz2 GT5-Unofficial-8f29b031f80b722a1ab3cb8d646acb9bf5b7c259.zip | |
Merge pull request #764 from GTNewHorizons/assline-arrays-fix
fix wrong Arrays being used in assline datasticks
| -rw-r--r-- | .github/test-scala-presence.toml | 2 | ||||
| -rw-r--r-- | .github/workflow/gradle.yml | 34 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java | 4 |
3 files changed, 38 insertions, 2 deletions
diff --git a/.github/test-scala-presence.toml b/.github/test-scala-presence.toml new file mode 100644 index 0000000000..ae0e9acd49 --- /dev/null +++ b/.github/test-scala-presence.toml @@ -0,0 +1,2 @@ +[exclude] +"src/main/java/**/*.java" = "import scala."
\ No newline at end of file diff --git a/.github/workflow/gradle.yml b/.github/workflow/gradle.yml new file mode 100644 index 0000000000..bffb3d2b1b --- /dev/null +++ b/.github/workflow/gradle.yml @@ -0,0 +1,34 @@ +name: Build Project + +on: + push: + branches: [ experimental ] + pull_request: + branches: [ experimental ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + cache: gradle + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Setup the workspace + run: ./gradlew setupCIWorkspace + - name: Build with Gradle + run: ./gradlew build + + test-scala-presence: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Check + uses: mattsb42-meta/not-grep@1.0.0 + with: + config-file: ./.github/test-scala-presence.toml
\ No newline at end of file diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java index f35f1962d1..62238a8112 100644 --- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java +++ b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java @@ -2,6 +2,7 @@ package gregtech.api.util; import static gregtech.GT_Mod.GT_FML_LOGGER; +import java.util.Arrays; import java.util.HashMap; import cpw.mods.fml.common.FMLCommonHandler; @@ -14,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraftforge.fluids.FluidStack; -import scala.actors.threadpool.Arrays; public class GT_AssemblyLineUtils { @@ -159,7 +159,7 @@ public class GT_AssemblyLineUtils { for (GT_Recipe_AssemblyLine aRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { if (aRecipe.mEUt == aEU && aRecipe.mDuration == aTime) { if (GT_Utility.areStacksEqual(aOutputs[0], aRecipe.mOutput, true)) { - if (Arrays.equals(aRecipe.mInputs, aInputs) && Arrays.equals(aRecipe.mFluidInputs, aFluidInputs)) { + if (Arrays.equals(aRecipe.mInputs, aInputs) && Arrays.equals(aRecipe.mFluidInputs, aFluidInputs)) { // Cache it String aRecipeHash = generateRecipeHash(aRecipe); sRecipeCacheByRecipeHash.put(aRecipeHash, aRecipe); |