From b08cd13305786743f42aa2288b2d93d66cec6339 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 20:13:16 +0200 Subject: [PATCH] spotlessApply (#32) Co-authored-by: GitHub GTNH Actions <> --- .../oreprocessing/DiagramBuilder.java | 10 +++++----- .../oreprocessing/GregTechOreProcessing.java | 20 ++++++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/DiagramBuilder.java b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/DiagramBuilder.java index 8f78188..068ffed 100644 --- a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/DiagramBuilder.java +++ b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/DiagramBuilder.java @@ -10,6 +10,8 @@ import java.util.function.Function; import java.util.stream.Collectors; +import javax.annotation.Nullable; + import com.github.dcysteine.neicustomdiagram.api.diagram.Diagram; import com.github.dcysteine.neicustomdiagram.api.diagram.component.Component; import com.github.dcysteine.neicustomdiagram.api.diagram.component.DisplayComponent; @@ -34,8 +36,6 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import javax.annotation.Nullable; - class DiagramBuilder { private static final ItemComponent STONE_DUST = ItemComponent @@ -52,7 +52,7 @@ class DiagramBuilder { private final Diagram.Builder diagramBuilder; DiagramBuilder(LayoutHandler layoutHandler, LabelHandler labelHandler, RecipeHandler recipeHandler, - List rawOres, @Nullable ItemComponent trueRawOres) { + List rawOres, @Nullable ItemComponent trueRawOres) { this.layoutHandler = layoutHandler; this.labelHandler = labelHandler; this.recipeHandler = recipeHandler; @@ -84,10 +84,10 @@ class DiagramBuilder { void buildDiagram(ComponentDiagramMatcher.Builder matcherBuilder) { diagramBuilder.addAllOptionalLayouts(layoutHandler.layouts()) .insertIntoSlot(LayoutHandler.SlotKeys.RAW_ORE, DisplayComponent.builder(rawOre).build()); - trueRawOre.ifPresent(v -> { + trueRawOre.ifPresent(v -> { diagramBuilder.autoInsertIntoSlotGroup(LayoutHandler.SlotGroupKeys.TRUE_RAW_ORE) .insertIntoNextSlot(DisplayComponent.builder(v).build()); - }); + }); Optional crushedOreOptional = handleRecipes( RecipeHandler.RecipeMap.MACERATOR, diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/GregTechOreProcessing.java b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/GregTechOreProcessing.java index 25eefc6..55a2951 100644 --- a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/GregTechOreProcessing.java +++ b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/oreprocessing/GregTechOreProcessing.java @@ -4,7 +4,8 @@ import java.util.List; import java.util.Optional; -import it.unimi.dsi.fastutil.Pair; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -29,8 +30,6 @@ import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.material.Material; -import javax.annotation.Nullable; - /** Generates ore processing diagrams for GregTech ores. */ public final class GregTechOreProcessing implements DiagramGenerator { @@ -53,7 +52,6 @@ public final class GregTechOreProcessing implements DiagramGenerator { OrePrefixes.oreEnd, OrePrefixes.rawOre); - private final DiagramGroupInfo info; private final LabelHandler labelHandler; @@ -137,8 +135,14 @@ public DiagramGroup generate() { return new DiagramGroup(info, matcherBuilder.build()); } - private void buildDiagram(ComponentDiagramMatcher.Builder matcherBuilder, List rawOres, @Nullable ItemComponent trueRawOre) { - DiagramBuilder diagramBuilder = new DiagramBuilder(layoutHandler, labelHandler, recipeHandler, rawOres, trueRawOre); + private void buildDiagram(ComponentDiagramMatcher.Builder matcherBuilder, List rawOres, + @Nullable ItemComponent trueRawOre) { + DiagramBuilder diagramBuilder = new DiagramBuilder( + layoutHandler, + labelHandler, + recipeHandler, + rawOres, + trueRawOre); diagramBuilder.buildDiagram(matcherBuilder); Logger.GREGTECH_5_ORE_PROCESSING.debug("Generated diagram [{}]", rawOres.get(0)); @@ -150,7 +154,9 @@ static boolean isGregTechOreBlock(ItemComponent itemComponent) { } static boolean isGregTechRawOreItem(ItemComponent itemComponent) { - if (itemComponent == null) {return false;} + if (itemComponent == null) { + return false; + } return itemComponent.item() instanceof GT_MetaGenerated_Item_03; } }