diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..4c7cc4031 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +* text=auto + +*.java text +*.jar binary diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java index 4f9e1db38..aa1111e9a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java @@ -24,7 +24,6 @@ import org.bukkit.Bukkit; import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; -import java.util.Objects; public class BukkitWorld implements World { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweSchematicHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweSchematicHandler.java index c1b2bbd7e..be2b3a21a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweSchematicHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweSchematicHandler.java @@ -80,4 +80,3 @@ public class FaweSchematicHandler extends SchematicHandler { } } - diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java index 51e8ad8fe..d8e845591 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java @@ -28,7 +28,6 @@ import com.plotsquared.core.generator.HybridUtils; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.plot.expiration.ExpireManager; import com.plotsquared.core.plot.expiration.PlotAnalysis; import com.plotsquared.core.plot.flag.GlobalFlagContainer; import com.plotsquared.core.plot.flag.PlotFlag; @@ -42,7 +41,6 @@ import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Arrays; import java.util.Collection; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java b/Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java index ca4024f7a..baeebeb5b 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java @@ -24,7 +24,6 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Collection; -import java.util.Objects; /** * A world that contains plots diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java index 77b1a76c3..c38eb1b88 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java @@ -24,7 +24,6 @@ import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collection; import java.util.Collections; -import java.util.Objects; /** * A plot flag is any property that can be assigned diff --git a/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java b/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java index a0aa27275..4ee917b84 100644 --- a/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java @@ -19,7 +19,6 @@ package com.plotsquared.core.util; import com.plotsquared.core.location.Location; -import com.plotsquared.core.plot.Plot; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/core/util/TabCompletions.java b/Core/src/main/java/com/plotsquared/core/util/TabCompletions.java index 13e951414..65d45dc16 100644 --- a/Core/src/main/java/com/plotsquared/core/util/TabCompletions.java +++ b/Core/src/main/java/com/plotsquared/core/util/TabCompletions.java @@ -31,7 +31,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.uuid.UUIDMapping; import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/core/util/net/AbstractDelegateOutputStream.java b/Core/src/main/java/com/plotsquared/core/util/net/AbstractDelegateOutputStream.java index 0af0d3fee..120ba15cc 100644 --- a/Core/src/main/java/com/plotsquared/core/util/net/AbstractDelegateOutputStream.java +++ b/Core/src/main/java/com/plotsquared/core/util/net/AbstractDelegateOutputStream.java @@ -55,4 +55,3 @@ public class AbstractDelegateOutputStream extends OutputStream { } } - diff --git a/Core/src/main/java/com/plotsquared/core/util/query/OwnersIncludeFilter.java b/Core/src/main/java/com/plotsquared/core/util/query/OwnersIncludeFilter.java index 702e4a640..8a9969b3e 100644 --- a/Core/src/main/java/com/plotsquared/core/util/query/OwnersIncludeFilter.java +++ b/Core/src/main/java/com/plotsquared/core/util/query/OwnersIncludeFilter.java @@ -21,7 +21,6 @@ package com.plotsquared.core.util.query; import com.plotsquared.core.plot.Plot; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Objects; import java.util.UUID; class OwnersIncludeFilter implements PlotFilter { diff --git a/Core/src/main/java/com/plotsquared/core/util/task/PlotSquaredTask.java b/Core/src/main/java/com/plotsquared/core/util/task/PlotSquaredTask.java index b7337d45b..25a3b440c 100644 --- a/Core/src/main/java/com/plotsquared/core/util/task/PlotSquaredTask.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/PlotSquaredTask.java @@ -83,4 +83,3 @@ public interface PlotSquaredTask extends Runnable { } } - diff --git a/Core/src/test/java/com/plotsquared/core/database/AbstractDBTest.java b/Core/src/test/java/com/plotsquared/core/database/AbstractDBTest.java index d4c8c7be8..18e0a5f41 100644 --- a/Core/src/test/java/com/plotsquared/core/database/AbstractDBTest.java +++ b/Core/src/test/java/com/plotsquared/core/database/AbstractDBTest.java @@ -276,4 +276,3 @@ public class AbstractDBTest implements AbstractDB { } } - diff --git a/build.gradle.kts b/build.gradle.kts index d6d7bb50b..05e70c4d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,6 +90,9 @@ subprojects { java { licenseHeaderFile(rootProject.file("HEADER.txt")) target("**/*.java") + endWithNewline() + trimTrailingWhitespace() + removeUnusedImports() } }