Organise imports

Signed-off-by: shedaniel <daniel@shedaniel.me>

.github/workflows/publish.yml

@@ -24,4 +24,4 @@ jobs:
                   !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.pull_request.title, '[ci skip]')
               env:
                   MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
-                  curse_api_key: ${{ secrets.CURSE_API_KEY }}
+                  curse_api_key: ${{ secrets.CF_API_KEY }}

README.md

@@ -1,4 +1,4 @@
-# Cloth Config [ ![Download](https://api.bintray.com/packages/shedaniel/cloth-config-2/config-2/images/download.svg) ](https://bintray.com/shedaniel/cloth-config-2/config-2/_latestVersion)
+# Cloth Config
 [Help translate ClothConfig on Crowdin!](https://crowdin.com/project/cloth-config)
 
 **[Read the wiki for API documentations](https://github.com/shedaniel/ClothConfig/wiki)**

common/src/main/java/me/shedaniel/clothconfig2/ClothConfigDemo.java

@@ -26,7 +26,6 @@ import me.shedaniel.clothconfig2.gui.entries.MultiElementListEntry;
 import me.shedaniel.clothconfig2.gui.entries.NestedListListEntry;
 import me.shedaniel.clothconfig2.impl.builders.DropdownMenuBuilder;
 import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.Registry;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;

common/src/main/java/me/shedaniel/clothconfig2/api/AbstractConfigEntry.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.api;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.AbstractConfigScreen;
 import me.shedaniel.clothconfig2.gui.ClothConfigScreen;
 import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget;
@@ -30,7 +31,7 @@ import net.minecraft.network.chat.MutableComponent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;

common/src/main/java/me/shedaniel/clothconfig2/api/ConfigBuilder.java

@@ -26,6 +26,7 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+
 import java.util.function.Consumer;
 
 @Environment(EnvType.CLIENT)

common/src/main/java/me/shedaniel/clothconfig2/api/ConfigScreen.java

@@ -19,11 +19,11 @@
 
 package me.shedaniel.clothconfig2.api;
 
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.resources.ResourceLocation;
 
 public interface ConfigScreen {
     void setSavingRunnable(@Nullable Runnable savingRunnable);

common/src/main/java/me/shedaniel/clothconfig2/api/Modifier.java

@@ -22,6 +22,7 @@ package me.shedaniel.clothconfig2.api;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screens.Screen;
+
 import java.util.Objects;
 
 /**

common/src/main/java/me/shedaniel/clothconfig2/api/Tooltip.java

@@ -23,6 +23,7 @@ import me.shedaniel.math.Point;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.FormattedText;
 import net.minecraft.util.FormattedCharSequence;
+
 import java.util.List;
 
 public interface Tooltip {

common/src/main/java/me/shedaniel/clothconfig2/gui/AbstractTabbedConfigScreen.java

@@ -24,6 +24,7 @@ import me.shedaniel.clothconfig2.api.TabbedConfigScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+
 import java.util.Map;
 
 public abstract class AbstractTabbedConfigScreen extends AbstractConfigScreen implements TabbedConfigScreen {

common/src/main/java/me/shedaniel/clothconfig2/gui/ClothConfigTabButton.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.gui;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.api.Tooltip;
 import me.shedaniel.math.Point;
 import net.fabricmc.api.EnvType;
@@ -28,7 +29,7 @@ import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.FormattedText;
 import org.jetbrains.annotations.Nullable;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.Optional;
 import java.util.function.Supplier;
 

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/AbstractTextFieldListListEntry.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.gui.entries;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
@@ -29,7 +30,7 @@ import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/BaseListCell.java

@@ -19,11 +19,12 @@
 
 package me.shedaniel.clothconfig2.gui.entries;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.network.chat.Component;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.Optional;
 import java.util.function.Supplier;
 
@@ -64,4 +65,4 @@ public abstract class BaseListCell extends AbstractContainerEventHandler {
     public void onAdd() {}
     
     public void onDelete() {}
-}
+}

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/ColorEntry.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.gui.entries;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.widget.ColorDisplayWidget;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.EditBox;
@@ -27,7 +28,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Consumer;

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/SubCategoryListEntry.java

@@ -36,6 +36,7 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/TextListEntry.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.gui.entries;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
@@ -26,7 +27,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.FormattedCharSequence;
 import org.jetbrains.annotations.ApiStatus;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

common/src/main/java/me/shedaniel/clothconfig2/gui/entries/TooltipListEntry.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.gui.entries;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
 import me.shedaniel.clothconfig2.api.Tooltip;
 import me.shedaniel.math.Point;
@@ -27,7 +28,7 @@ import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.Optional;
 import java.util.function.Supplier;
 

common/src/main/java/me/shedaniel/clothconfig2/gui/widget/DynamicEntryListWidget.java

@@ -28,7 +28,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.math.Matrix4f;
 import me.shedaniel.clothconfig2.api.ScissorsHandler;
-import me.shedaniel.clothconfig2.gui.widget.DynamicEntryListWidget.Entries;
 import me.shedaniel.math.Rectangle;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -39,7 +38,6 @@ import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.AbstractList;
 import java.util.ArrayList;

common/src/main/java/me/shedaniel/clothconfig2/gui/widget/DynamicNewSmoothScrollingEntryListWidget.java

@@ -19,6 +19,11 @@
 
 package me.shedaniel.clothconfig2.gui.widget;
 
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.math.Matrix4f;
 import me.shedaniel.clothconfig2.ClothConfigInitializer;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
@@ -31,12 +36,6 @@ import net.minecraft.util.Mth;
 import static me.shedaniel.clothconfig2.api.ScrollingContainer.clampExtension;
 import static me.shedaniel.clothconfig2.api.ScrollingContainer.handleScrollingPosition;
 
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.math.Matrix4f;
-
 @Environment(EnvType.CLIENT)
 public abstract class DynamicNewSmoothScrollingEntryListWidget<E extends DynamicEntryListWidget.Entry<E>> extends DynamicEntryListWidget<E> {
     

common/src/main/java/me/shedaniel/clothconfig2/impl/builders/DropdownMenuBuilder.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.impl.builders;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.entries.DropdownBoxEntry;
 import me.shedaniel.clothconfig2.gui.entries.DropdownBoxEntry.DefaultSelectionCellCreator;
 import me.shedaniel.clothconfig2.gui.entries.DropdownBoxEntry.DefaultSelectionTopCellElement;
@@ -37,7 +38,7 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import org.jetbrains.annotations.NotNull;
-import com.mojang.blaze3d.vertex.PoseStack;
+
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;

common/src/main/java/me/shedaniel/clothconfig2/impl/builders/KeyCodeBuilder.java

@@ -19,6 +19,7 @@
 
 package me.shedaniel.clothconfig2.impl.builders;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import me.shedaniel.clothconfig2.api.Modifier;
 import me.shedaniel.clothconfig2.api.ModifierKeyCode;
 import me.shedaniel.clothconfig2.gui.entries.KeyCodeEntry;
@@ -27,7 +28,7 @@ import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.mojang.blaze3d.platform.InputConstants;
+
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;