clean

Author: TexBlock

common/src/main/java/org/thinkingstudio/randomtitlerework/RandomTitleHelper.java

@@ -1,6 +1,6 @@
 package org.thinkingstudio.randomtitlerework;
 
-import org.thinkingstudio.randomtitlerework.config.RTRModConfigHelper;
+import org.thinkingstudio.randomtitlerework.config.ConfigHelper;
 import org.thinkingstudio.randomtitlerework.config.RandomTitleSource;
 import org.thinkingstudio.randomtitlerework.hitokoto.Hitokoto;
 import org.thinkingstudio.randomtitlerework.hitokoto.HitokotoClient;
@@ -14,7 +14,7 @@ private static String getTitleFromList() {
         String title = "";
 
         try {
-            List<String> titles = RTRModConfigHelper.getConfig().titleList;
+            List<String> titles = ConfigHelper.getConfig().titleList;
             title = titles.get(new Random().nextInt(titles.size()));
         } catch (Throwable e) {
             RandomTitleReworkMod.LOGGER.error("Failed to get title from config!", e);
@@ -51,7 +51,7 @@ private static String getTitleFromHitokoto() {
     }
 
     public static String getRandomTitle() {
-        RandomTitleSource titleSource = RTRModConfigHelper.getConfig().randomTitleSource;
+        RandomTitleSource titleSource = ConfigHelper.getConfig().randomTitleSource;
 
         if (titleSource == RandomTitleSource.HITOKOTO) {
             return getTitleFromHitokoto();

common/src/main/java/org/thinkingstudio/randomtitlerework/config/ConfigHelper.java

@@ -0,0 +1,21 @@
+package org.thinkingstudio.randomtitlerework.config;
+
+import me.shedaniel.autoconfig.AutoConfig;
+import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
+import net.minecraft.client.gui.screen.Screen;
+
+public class ConfigHelper {
+    private static ModConfigs modConfigs;
+
+    public static ModConfigs getConfig() {
+        if (modConfigs == null) {
+            AutoConfig.register(ModConfigs.class, Toml4jConfigSerializer::new);
+            modConfigs = AutoConfig.getConfigHolder(ModConfigs.class).getConfig();
+        }
+        return modConfigs;
+    }
+
+    public static Screen setConfigScreen(Screen screen) {
+        return AutoConfig.getConfigScreen(ModConfigs.class, screen).get();
+    }
+}

…domtitlerework/config/RTRModConfigs.java …randomtitlerework/config/ModConfigs.javacommon/src/main/java/org/thinkingstudio/randomtitlerework/config/RTRModConfigs.java renamed to common/src/main/java/org/thinkingstudio/randomtitlerework/config/ModConfigs.java common/src/main/java/org/thinkingstudio/randomtitlerework/config/RTRModConfigs.java renamed to common/src/main/java/org/thinkingstudio/randomtitlerework/config/ModConfigs.java

@@ -2,12 +2,14 @@
 
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
+import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import org.thinkingstudio.randomtitlerework.RandomTitleReworkMod;
 
 import java.util.List;
 
 @Config(name = RandomTitleReworkMod.MOD_ID)
-public class RTRModConfigs implements ConfigData {
+public class ModConfigs implements ConfigData {
+    @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
     public RandomTitleSource randomTitleSource = RandomTitleSource.HITOKOTO;
 
     public List<String> titleList = List.of(

common/src/main/java/org/thinkingstudio/randomtitlerework/config/RTRModConfigHelper.java

@@ -9,25 +9,27 @@
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.thinkingstudio.randomtitlerework.RTRModPlatform;
 import org.thinkingstudio.randomtitlerework.RandomTitleHelper;
-import org.thinkingstudio.randomtitlerework.config.RTRModConfigHelper;
-import org.thinkingstudio.randomtitlerework.config.RTRModConfigs;
+import org.thinkingstudio.randomtitlerework.config.ConfigHelper;
+import org.thinkingstudio.randomtitlerework.config.ModConfigs;
 
 import java.text.SimpleDateFormat;
 
 @Mixin(MinecraftClient.class)
 public abstract class MinecraftClientMixin {
-    RTRModConfigs randomTitleRework$config = RTRModConfigHelper.getConfig();
+    @Unique
+    ModConfigs randomTitleRework$config = ConfigHelper.getConfig();
+    @Unique
     private final String randomTitleRework$randomTitle = RandomTitleHelper.getRandomTitle();
 
     @Shadow
     private IntegratedServer server;
 
-
     @Shadow
     @Nullable
     public abstract ClientPlayNetworkHandler getNetworkHandler();

common/src/main/java/org/thinkingstudio/randomtitlerework/mixin/MinecraftClientMixin.java

@@ -2,11 +2,11 @@
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
-import org.thinkingstudio.randomtitlerework.config.RTRModConfigHelper;
+import org.thinkingstudio.randomtitlerework.config.ConfigHelper;
 
-public class RTRModMenuCompat implements ModMenuApi {
+public class ModMenuCompat implements ModMenuApi {
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return RTRModConfigHelper::setConfigScreen;
+        return ConfigHelper::setConfigScreen;
     }
 }

…titlerework/fabric/RTRModMenuCompat.java …domtitlerework/fabric/ModMenuCompat.javafabric/src/main/java/org/thinkingstudio/randomtitlerework/fabric/RTRModMenuCompat.java renamed to fabric/src/main/java/org/thinkingstudio/randomtitlerework/fabric/ModMenuCompat.java fabric/src/main/java/org/thinkingstudio/randomtitlerework/fabric/RTRModMenuCompat.java renamed to fabric/src/main/java/org/thinkingstudio/randomtitlerework/fabric/ModMenuCompat.java

@@ -18,7 +18,7 @@
       "org.thinkingstudio.randomtitlerework.fabric.RandomTitleReworkModFabricClient"
     ],
     "modmenu": [
-      "org.thinkingstudio.randomtitlerework.fabric.RTRModMenuCompat"
+      "org.thinkingstudio.randomtitlerework.fabric.ModMenuCompat"
     ]
   },
   "mixins": [

fabric/src/main/resources/fabric.mod.json

@@ -8,15 +8,15 @@
 
 import net.minecraftforge.fml.loading.FMLLoader;
 import org.thinkingstudio.randomtitlerework.RandomTitleReworkMod;
-import org.thinkingstudio.randomtitlerework.config.RTRModConfigHelper;
+import org.thinkingstudio.randomtitlerework.config.ConfigHelper;
 
 @Mod(RandomTitleReworkMod.MOD_ID)
 public final class RandomTitleReworkModForge {
     public RandomTitleReworkModForge() {
         if (FMLLoader.getDist().isClient()) {
             ModContainer modContainer = ModList.get().getModContainerById(RandomTitleReworkMod.MOD_ID).orElseThrow();
             modContainer.registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true));
-            modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((client, screen) -> RTRModConfigHelper.setConfigScreen(screen)));
+            modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((client, screen) -> ConfigHelper.setConfigScreen(screen)));
         } else if (FMLLoader.getDist().isDedicatedServer()) {
             throw new RuntimeException("This mod is a client-only mod. Currently, it is being run on a DedicatedServer, which is not supported.");
         }