This repository has been archived by the owner on Sep 9, 2022. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
+ fixes a bug where old recipes were still chosen due to missing buffer update + copyright update + version increase Signed-off-by: bartimaeusnek <[email protected]>
- Loading branch information
1 parent
6f1ec50
commit 1256381
Showing
8 changed files
with
162 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
src/main/java/com/github/bartimaeusnek/bartworks/util/NonNullWrappedHashSet.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright (c) 2018-2020 bartimaeusnek | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package com.github.bartimaeusnek.bartworks.util; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.HashSet; | ||
|
|
||
| public class NonNullWrappedHashSet<E> extends HashSet<E> { | ||
|
|
||
| public NonNullWrappedHashSet() { | ||
| super(); | ||
| } | ||
|
|
||
| public NonNullWrappedHashSet(Collection<? extends E> c) { | ||
| super(); | ||
| this.addAll(c); | ||
| } | ||
|
|
||
| public NonNullWrappedHashSet(int initialCapacity, float loadFactor) { | ||
| super(initialCapacity, loadFactor); | ||
| } | ||
|
|
||
| public NonNullWrappedHashSet(int initialCapacity) { | ||
| super(initialCapacity); | ||
| } | ||
|
|
||
| public boolean add(E e) { | ||
| if (e != null) | ||
| return super.add(e); | ||
| return false; | ||
| } | ||
|
|
||
| public boolean addAll(Collection<? extends E> c) { | ||
| boolean wasChanged = false; | ||
| for (E element : c) { | ||
| if (element != null) | ||
| wasChanged |= this.add(element); | ||
| } | ||
| return wasChanged; | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
src/main/java/com/github/bartimaeusnek/bartworks/util/StreamUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Copyright (c) 2018-2020 bartimaeusnek | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package com.github.bartimaeusnek.bartworks.util; | ||
|
|
||
| import gregtech.api.util.GT_Recipe; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.function.Predicate; | ||
|
|
||
| public class StreamUtils { | ||
| private StreamUtils(){} | ||
|
|
||
| public static Predicate<GT_Recipe.GT_Recipe_Map> filterVisualMaps() { | ||
| return gt_recipe_map -> { | ||
| Optional<GT_Recipe> op = gt_recipe_map.mRecipeList.stream().findAny(); | ||
| return op.isPresent() && !op.get().mFakeRecipe; | ||
| }; | ||
| } | ||
|
|
||
| public static boolean filterVisualMaps(GT_Recipe.GT_Recipe_Map gt_recipe_map) { | ||
| return filterVisualMaps().test(gt_recipe_map); | ||
| } | ||
| } |