From e7a47c199b9facf0242df389a98725acce8549f5 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 6 Jul 2024 12:13:22 -0700 Subject: [PATCH] Enable checkstyle --- gradle.properties | 2 +- .../structurelib/ClientProxy.java | 7 ++++++- .../alignment/enumerable/ExtendedFacing.java | 13 ++++++++++-- .../structure/StructureDefinition.java | 11 ++++++++-- .../structure/StructureUtility.java | 21 +++++++++++++++++-- .../structurelib/util/InventoryUtility.java | 5 ++++- .../structurelib/util/SortedRegistry.java | 8 ++++++- 7 files changed, 57 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index afde19a3..3843bb65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -176,7 +176,7 @@ curseForgeRelations = # disableSpotless = true # Uncomment this to disable Checkstyle checks (currently wildcard import check). -disableCheckstyle = true +# disableCheckstyle = true # Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle" # (force use delegated build). diff --git a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java index 088faab8..aef996c0 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java +++ b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java @@ -2,7 +2,12 @@ package com.gtnewhorizon.structurelib; import static com.gtnewhorizon.structurelib.StructureLib.RANDOM; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gtnewhorizon/structurelib/alignment/enumerable/ExtendedFacing.java b/src/main/java/com/gtnewhorizon/structurelib/alignment/enumerable/ExtendedFacing.java index eb08049c..6358b1a6 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/alignment/enumerable/ExtendedFacing.java +++ b/src/main/java/com/gtnewhorizon/structurelib/alignment/enumerable/ExtendedFacing.java @@ -4,9 +4,18 @@ import static com.gtnewhorizon.structurelib.alignment.IAlignment.FLIPS_COUNT; import static com.gtnewhorizon.structurelib.alignment.IAlignment.ROTATIONS_COUNT; import static java.lang.Math.abs; import static java.util.Arrays.stream; -import static java.util.stream.Collectors.*; +import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.toMap; +import static java.util.stream.Collectors.toSet; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java index 5e085c7f..2c335b9d 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java @@ -1,8 +1,15 @@ package com.gtnewhorizon.structurelib.structure; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.notAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.step; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; import java.util.stream.Collectors; import com.gtnewhorizon.structurelib.util.Vec3Impl; diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index fba7b170..d69e2281 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -2,9 +2,26 @@ package com.gtnewhorizon.structurelib.structure; import static java.lang.Integer.MIN_VALUE; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; -import java.util.function.*; +import java.util.Objects; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.function.BiConsumer; +import java.util.function.BiFunction; +import java.util.function.BiPredicate; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java b/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java index 770043b2..d7c609d0 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java @@ -14,7 +14,10 @@ */ package com.gtnewhorizon.structurelib.util; -import java.util.*; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Function; import java.util.function.Predicate; diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java b/src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java index 90253c70..aeb2f8c8 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java +++ b/src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java @@ -1,6 +1,12 @@ package com.gtnewhorizon.structurelib.util; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.NavigableMap; +import java.util.Spliterator; +import java.util.TreeMap; import java.util.function.Consumer; public class SortedRegistry implements Iterable {