diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-03-17 20:17:02 +0100 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-03-17 20:17:02 +0100 |
| commit | 5959633bc9eea56859e4e569c2aa8b8a427e5ea2 (patch) | |
| tree | e524dfdb8a7b625488f1e223d63bd362ead9f1ff /src/main/java | |
| parent | 1922f34f1f8782f160e4808f4f6bb75a50703871 (diff) | |
| download | GT5-Unofficial-5959633bc9eea56859e4e569c2aa8b8a427e5ea2.tar.gz GT5-Unofficial-5959633bc9eea56859e4e569c2aa8b8a427e5ea2.tar.bz2 GT5-Unofficial-5959633bc9eea56859e4e569c2aa8b8a427e5ea2.zip | |
reverted parallel stream change
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 2c05a2eb85..4498f52251 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2054,19 +2054,18 @@ public static Materials Shadow = new Materials( 368, TextureSet }
private static void fillGeneratedMaterialsMap() {
- synchronized (GregTech_API.sGeneratedMaterials) {
- getAll().parallelStream().filter(aMaterial -> aMaterial.mMetaItemSubID >= 0).forEach(aMaterial -> {
- if (aMaterial.mMetaItemSubID < 1000) {
- if (aMaterial.mHasParentMod) {
- if (GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] == null) {
- GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] = aMaterial;
- } else
- throw new IllegalArgumentException("The Material Index " + aMaterial.mMetaItemSubID + " for " + aMaterial.mName + " is already used!");
- }
+ for (Materials aMaterial : MATERIALS_ARRAY) {
+ if (aMaterial.mMetaItemSubID >= 0) {
+ if (aMaterial.mMetaItemSubID < 1000) {
+ if (aMaterial.mHasParentMod) {
+ if (GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] == null) {
+ GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] = aMaterial;
} else
- throw new IllegalArgumentException("The Material Index " + aMaterial.mMetaItemSubID + " for " + aMaterial.mName + " is/over the maximum of 1000");
+ throw new IllegalArgumentException("The Material Index " + aMaterial.mMetaItemSubID + " for " + aMaterial.mName + " is already used!");
}
- );
+ } else
+ throw new IllegalArgumentException("The Material Index " + aMaterial.mMetaItemSubID + " for " + aMaterial.mName + " is/over the maximum of 1000");
+ }
}
}
|