Эх сурвалжийг харах

Move TextColor gui provider to extension

Lortseam 3 жил өмнө
parent
commit
b3e5db2afe

+ 8 - 0
lib/src/main/java/me/lortseam/completeconfig/extension/minecraft/MinecraftGuiExtension.java

@@ -1,16 +1,24 @@
 package me.lortseam.completeconfig.extension.minecraft;
 package me.lortseam.completeconfig.extension.minecraft;
 
 
+import me.lortseam.completeconfig.data.ColorEntry;
 import me.lortseam.completeconfig.data.Entry;
 import me.lortseam.completeconfig.data.Entry;
 import me.lortseam.completeconfig.extension.clothconfig.GuiExtension;
 import me.lortseam.completeconfig.extension.clothconfig.GuiExtension;
 import me.lortseam.completeconfig.gui.cloth.GuiProvider;
 import me.lortseam.completeconfig.gui.cloth.GuiProvider;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.InputUtil;
+import net.minecraft.text.TextColor;
 
 
 public final class MinecraftGuiExtension implements GuiExtension {
 public final class MinecraftGuiExtension implements GuiExtension {
 
 
     @Override
     @Override
     public GuiProvider[] getProviders() {
     public GuiProvider[] getProviders() {
         return new GuiProvider[] {
         return new GuiProvider[] {
+                GuiProvider.create(ColorEntry.class, (ColorEntry<TextColor> entry) -> ConfigEntryBuilder.create()
+                        .startColorField(entry.getText(), entry.getValue())
+                        .setDefaultValue(entry.getDefaultValue())
+                        .setTooltip(entry.getTooltip())
+                        .setSaveConsumer3(entry::setValue),
+                        entry -> !entry.isAlphaMode(), TextColor.class),
                 GuiProvider.create((Entry<InputUtil.Key> entry) -> ConfigEntryBuilder.create()
                 GuiProvider.create((Entry<InputUtil.Key> entry) -> ConfigEntryBuilder.create()
                         .startKeyCodeField(entry.getText(), entry.getValue())
                         .startKeyCodeField(entry.getText(), entry.getValue())
                         .setDefaultValue(entry.getDefaultValue())
                         .setDefaultValue(entry.getDefaultValue())

+ 1 - 8
lib/src/main/java/me/lortseam/completeconfig/gui/cloth/GuiProviderRegistry.java

@@ -10,7 +10,6 @@ import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import me.shedaniel.clothconfig2.impl.builders.DropdownMenuBuilder;
 import me.shedaniel.clothconfig2.impl.builders.DropdownMenuBuilder;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.api.Environment;
-import net.minecraft.text.TextColor;
 
 
 import java.util.*;
 import java.util.*;
 import java.util.stream.Stream;
 import java.util.stream.Stream;
@@ -190,13 +189,7 @@ public final class GuiProviderRegistry {
                     .setDefaultValue(Arrays.asList(entry.getDefaultValue()))
                     .setDefaultValue(Arrays.asList(entry.getDefaultValue()))
                     .setTooltip(entry.getTooltip())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(list -> entry.setValue(list.toArray(new String[0]))),
                     .setSaveConsumer(list -> entry.setValue(list.toArray(new String[0]))),
-                    String[].class),
-            GuiProvider.create(ColorEntry.class, (ColorEntry<TextColor> entry) -> ConfigEntryBuilder.create()
-                    .startColorField(entry.getText(), entry.getValue())
-                    .setDefaultValue(entry.getDefaultValue())
-                    .setTooltip(entry.getTooltip())
-                    .setSaveConsumer3(entry::setValue),
-                    entry -> !entry.isAlphaMode(), TextColor.class)
+                    String[].class)
     );
     );
 
 
     static {
     static {