Skip to content

Commit cfb6463

Browse files
committed
Address review
1 parent 6803c66 commit cfb6463

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/java/gregtech/api/recipes/RecipeBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import java.util.ArrayList;
5656
import java.util.Arrays;
5757
import java.util.Collection;
58-
import java.util.HashMap;
58+
import java.util.Collections;
5959
import java.util.List;
6060
import java.util.Map;
6161

@@ -132,6 +132,8 @@ protected RecipeBuilder(RecipeBuilder<R> recipeBuilder) {
132132
this.hidden = recipeBuilder.hidden;
133133
this.category = recipeBuilder.category;
134134
this.recipePropertyStorage = recipeBuilder.recipePropertyStorage.copy();
135+
this.ignoreAllBuildActions = recipeBuilder.ignoreAllBuildActions;
136+
this.ignoredBuildActions = new Object2ObjectOpenHashMap<>(recipeBuilder.ignoredBuildActions);
135137
}
136138

137139
public R cleanroom(@Nullable CleanroomType cleanroom) {
@@ -909,9 +911,6 @@ public R ignoreBuildAction(ResourceLocation buildActionName) {
909911
GTLog.logger.error("Recipe map {} does not contain build action {}!", recipeMap, buildActionName,
910912
new Throwable());
911913
return (R) this;
912-
} else if (ignoredBuildActions.containsKey(buildActionName)) {
913-
GTLog.logger.error("Builder already ignores {}!", buildActionName, new Throwable());
914-
return (R) this;
915914
}
916915

917916
ignoredBuildActions.put(buildActionName, recipeMap.getBuildActions().get(buildActionName));
@@ -1091,15 +1090,16 @@ public boolean ignoresAllBuildActions() {
10911090

10921091
/**
10931092
* Get all ignored build actions for the recipe map.
1094-
* Will return an empty map if none are ignored.
1093+
*
1094+
* @return A map of ignored build actions.
10951095
*/
10961096
public @NotNull Map<ResourceLocation, RecipeBuildAction<R>> getIgnoredBuildActions() {
10971097
if (ignoreAllBuildActions) {
10981098
return recipeMap.getBuildActions();
10991099
}
11001100

11011101
if (ignoredBuildActions == null) {
1102-
return new HashMap<>();
1102+
return Collections.emptyMap();
11031103
}
11041104

11051105
return ignoredBuildActions;

0 commit comments

Comments
 (0)