aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-07-26 17:59:44 +0900
committerGitHub <noreply@github.com>2023-07-26 10:59:44 +0200
commitf77c892701abef6d468ec19c9706a3ba31044ead (patch)
treeb3bbf671d146f51cbbe1c36e5b6a5f20f0b57151
parent32c339a7a2c3f8850c3fc7baa4e2f8344473cdf5 (diff)
downloadGT5-Unofficial-f77c892701abef6d468ec19c9706a3ba31044ead.tar.gz
GT5-Unofficial-f77c892701abef6d468ec19c9706a3ba31044ead.tar.bz2
GT5-Unofficial-f77c892701abef6d468ec19c9706a3ba31044ead.zip
Remove reference to sByProductList (#187)
-rwxr-xr-x.github/scripts/test_no_error_reports51
-rw-r--r--src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java49
2 files changed, 0 insertions, 100 deletions
diff --git a/.github/scripts/test_no_error_reports b/.github/scripts/test_no_error_reports
deleted file mode 100755
index 1fcc7396c6..0000000000
--- a/.github/scripts/test_no_error_reports
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-# bashsupport disable=BP5006 # Global environment variables
-RUNDIR="run" \
- CRASH="crash-reports" \
- SERVERLOG="server.log"
-
-# enable nullglob to get 0 results when no match rather than the pattern
-shopt -s nullglob
-
-# store matches in array
-crash_reports=("$RUNDIR/$CRASH/crash"*.txt)
-
-# if array not empty there are crash_reports
-if [ "${#crash_reports[@]}" -gt 0 ]; then
- # get the latest crash_report from array
- latest_crash_report="${crash_reports[-1]}"
- {
- printf 'Latest crash report detected %s:\n' "${latest_crash_report##*/}"
- cat "$latest_crash_report"
- } >&2
- exit 1
-fi
-
-if grep --quiet --fixed-strings 'Fatal errors were detected' "$SERVERLOG"; then
- {
- printf 'Fatal errors detected:\n'
- cat server.log
- } >&2
- exit 1
-fi
-
-if grep --quiet --fixed-strings 'The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED' \
- "$SERVERLOG"; then
- {
- printf 'Server force stopped:'
- cat server.log
- } >&2
- exit 1
-fi
-
-if ! grep --quiet --perl-regexp --only-matching '.+Done \(.+\)\! For help, type "help" or "\?"' "$SERVERLOG"; then
- {
- printf 'Server did not finish startup:'
- cat server.log
- } >&2
- exit 1
-fi
-
-printf 'No crash reports detected'
-exit 0
diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 2288bdb31c..fd6b7ed43b 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -1031,55 +1031,6 @@ public class NaquadahReworkRecipeLoader {
GT_Log.out.print("Simple Washer done!\n");
}
- // For ByProduct List
- for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sByProductList.mRecipeList) {
- ItemStack input = recipe.mInputs[0];
- if (GT_Utility.isStackValid(input)) {
- int[] oreDict = OreDictionary.getOreIDs(input);
- for (int oreDictID : oreDict) {
- if (OreDictionary.getOreName(oreDictID).startsWith("ore")
- && OreDictionary.getOreName(oreDictID).contains("Naq")) {
- GT_Recipe tRecipe = recipe.copy();
- boolean modified = false;
- for (int i = 0; i < tRecipe.mOutputs.length; i++) {
- if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
- if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(
- tRecipe.mOutputs[i].stackSize,
- naquadahEarth.get(OrePrefixes.dust, 1));
- modified = true;
- } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(
- tRecipe.mOutputs[i].stackSize,
- enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
- modified = true;
- } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(
- tRecipe.mOutputs[i].stackSize,
- naquadriaEarth.get(OrePrefixes.dust, 1));
- modified = true;
- }
- }
- if (modified) {
- reAdd.add(tRecipe);
- remove.add(recipe);
- }
- break;
- }
- }
- }
- }
- GT_Recipe.GT_Recipe_Map.sByProductList.mRecipeList.removeAll(remove);
- GT_Recipe.GT_Recipe_Map.sByProductList.mRecipeList.addAll(reAdd);
- GT_Recipe.GT_Recipe_Map.sByProductList.reInit();
-
- GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! ");
-
- remove.clear();
- reAdd.clear();
-
- GT_Log.out.print("ByProduct List done!\n");
-
// For Cauldron Wash
registerCauldronCleaningFor(Materials.Naquadah, naquadahEarth.getBridgeMaterial());
registerCauldronCleaningFor(Materials.NaquadahEnriched, enrichedNaquadahEarth.getBridgeMaterial());