Skip to content

Commit 14a0221

Browse files
committed
null check ui builder and simplify
1 parent 1cc2681 commit 14a0221

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.jetbrains.annotations.Nullable;
1818

1919
import java.util.Map;
20+
import java.util.Objects;
2021
import java.util.function.Consumer;
2122

2223
import static gregtech.api.recipes.ui.RecipeMapUI.computeOverlayKey;
@@ -276,7 +277,7 @@ public RecipeMapBuilder(@NotNull String unlocalizedName, @NotNull B defaultRecip
276277

277278
public @NotNull RecipeMapBuilder<B> uiBuilder(@NotNull Consumer<RecipeMapUIBuilder> mapUIBuilder) {
278279
this.usesMui2 = true;
279-
this.mapUIBuilder = mapUIBuilder;
280+
this.mapUIBuilder = Objects.requireNonNull(mapUIBuilder, "ui builder is null");
280281
return this;
281282
}
282283

@@ -287,10 +288,8 @@ public RecipeMapBuilder(@NotNull String unlocalizedName, @NotNull B defaultRecip
287288
private @NotNull RecipeMapUI<?> buildUI(@NotNull RecipeMap<?> recipeMap) {
288289
RecipeMapUI<?> ui = new RecipeMapUI<>(recipeMap, modifyItemInputs, modifyItemOutputs, modifyFluidInputs,
289290
modifyFluidOutputs, isGenerator);
290-
if (usesMui2) {
291-
// if "usesMui2" is true, then "mapUIBuilder" is not null
292-
// noinspection DataFlowIssue
293-
this.mapUIBuilder.accept(new RecipeMapUIBuilder(ui));
291+
if (usesMui2 && this.mapUIBuilder != null) {
292+
ui.buildMui2(this.mapUIBuilder);
294293
} else {
295294
if (progressBar != null) {
296295
ui.setProgressBarTexture(progressBar);

src/main/java/gregtech/api/recipes/ui/RecipeMapUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ public boolean usesMui2() {
665665
// todo this is a quick and dirty method, find a better way
666666
/** Marked experimental as this method will be removed when all GTCEu UIs are ported to MUI2. */
667667
@ApiStatus.Experimental
668-
public RecipeMapUI<R> buildMui2(Consumer<RecipeMapUIBuilder> builderConsumer) {
668+
public RecipeMapUI<R> buildMui2(@NotNull Consumer<RecipeMapUIBuilder> builderConsumer) {
669669
builderConsumer.accept(new RecipeMapUIBuilder(this));
670670
return this;
671671
}

0 commit comments

Comments
 (0)