Lortseam vor 4 Jahren
Ursprung
Commit
79b5d36ebd

+ 2 - 2
src/main/java/me/lortseam/completeconfig/data/Collection.java

@@ -3,7 +3,7 @@ package me.lortseam.completeconfig.data;
 import lombok.Getter;
 import me.lortseam.completeconfig.api.ConfigEntryContainer;
 import me.lortseam.completeconfig.api.ConfigGroup;
-import me.lortseam.completeconfig.data.part.FlatDataPart;
+import me.lortseam.completeconfig.data.structure.FlatDataPart;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 import me.lortseam.completeconfig.exception.IllegalAnnotationTargetException;
 import net.minecraft.text.Text;
@@ -30,7 +30,7 @@ public class Collection implements FlatDataPart<ConfigMap> {
     }
 
     public Text getText() {
-        return translation.translate();
+        return translation.toText();
     }
 
     private void resolve(ConfigEntryContainer container) {

+ 2 - 2
src/main/java/me/lortseam/completeconfig/data/ConfigMap.java

@@ -3,8 +3,8 @@ package me.lortseam.completeconfig.data;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
-import me.lortseam.completeconfig.data.part.DataPart;
-import me.lortseam.completeconfig.data.part.ParentDataPart;
+import me.lortseam.completeconfig.data.structure.DataPart;
+import me.lortseam.completeconfig.data.structure.ParentDataPart;
 import org.apache.commons.lang3.StringUtils;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 

+ 3 - 3
src/main/java/me/lortseam/completeconfig/data/Entry.java

@@ -8,7 +8,7 @@ import me.lortseam.completeconfig.api.ConfigEntry;
 import me.lortseam.completeconfig.api.ConfigEntryContainer;
 import me.lortseam.completeconfig.data.entry.EntryOrigin;
 import me.lortseam.completeconfig.data.entry.Transformation;
-import me.lortseam.completeconfig.data.part.DataPart;
+import me.lortseam.completeconfig.data.structure.DataPart;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 import me.lortseam.completeconfig.exception.IllegalAnnotationParameterException;
 import me.lortseam.completeconfig.extensions.CompleteConfigExtension;
@@ -154,7 +154,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
     }
 
     public Text getText() {
-        return getTranslation().translate();
+        return getTranslation().toText();
     }
 
     public Optional<Text[]> getTooltip() {
@@ -169,7 +169,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
                 return Optional.empty();
             }
         }
-        return Optional.of(Arrays.stream(translation).map(TranslationIdentifier::translate).toArray(Text[]::new));
+        return Optional.of(Arrays.stream(translation).map(TranslationIdentifier::toText).toArray(Text[]::new));
     }
 
     public boolean requiresRestart() {

+ 1 - 1
src/main/java/me/lortseam/completeconfig/data/EnumEntry.java

@@ -23,7 +23,7 @@ public class EnumEntry<T extends Enum> extends Entry<T> {
     }
 
     public Function<Enum, Text> getEnumNameProvider() {
-        return enumValue -> getTranslation().append(CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, enumValue.name())).translate();
+        return enumValue -> getTranslation().append(CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, enumValue.name())).toText();
     }
 
     public enum DisplayType {

+ 1 - 1
src/main/java/me/lortseam/completeconfig/data/part/DataPart.java → src/main/java/me/lortseam/completeconfig/data/structure/DataPart.java

@@ -1,4 +1,4 @@
-package me.lortseam.completeconfig.data.part;
+package me.lortseam.completeconfig.data.structure;
 
 import org.spongepowered.configurate.CommentedConfigurationNode;
 

+ 1 - 1
src/main/java/me/lortseam/completeconfig/data/part/FlatDataPart.java → src/main/java/me/lortseam/completeconfig/data/structure/FlatDataPart.java

@@ -1,4 +1,4 @@
-package me.lortseam.completeconfig.data.part;
+package me.lortseam.completeconfig.data.structure;
 
 import org.spongepowered.configurate.CommentedConfigurationNode;
 

+ 1 - 1
src/main/java/me/lortseam/completeconfig/data/part/ParentDataPart.java → src/main/java/me/lortseam/completeconfig/data/structure/ParentDataPart.java

@@ -1,4 +1,4 @@
-package me.lortseam.completeconfig.data.part;
+package me.lortseam.completeconfig.data.structure;
 
 import org.spongepowered.configurate.CommentedConfigurationNode;
 

+ 2 - 1
src/main/java/me/lortseam/completeconfig/data/text/TranslationIdentifier.java

@@ -3,6 +3,7 @@ package me.lortseam.completeconfig.data.text;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -39,7 +40,7 @@ public final class TranslationIdentifier {
         return I18n.hasTranslation(getKey());
     }
 
-    public TranslatableText translate() {
+    public Text toText() {
         return new TranslatableText(getKey());
     }
 

+ 1 - 1
src/main/java/me/lortseam/completeconfig/gui/cloth/ClothGuiBuilder.java

@@ -39,7 +39,7 @@ public class ClothGuiBuilder implements GuiBuilder {
                 .setParentScreen(parentScreen)
                 .setSavingRunnable(savingRunnable);
         TranslationIdentifier customTitle = config.getTranslation().append("title");
-        builder.setTitle(customTitle.exists() ? customTitle.translate() : new TranslatableText("completeconfig.gui.defaultTitle", FabricLoader.getInstance().getModContainer(config.getModID()).get().getMetadata().getName()));
+        builder.setTitle(customTitle.exists() ? customTitle.toText() : new TranslatableText("completeconfig.gui.defaultTitle", FabricLoader.getInstance().getModContainer(config.getModID()).get().getMetadata().getName()));
         for(Collection collection : config.values()) {
             ConfigCategory category = builder.getOrCreateCategory(collection.getText());
             for (AbstractConfigListEntry<?> entry : buildCollection(collection)) {