rebrand to limelight

build.gradle

@@ -19,7 +19,7 @@ loom {
     splitEnvironmentSourceSets()
 
     mods {
-        "flashlight" {
+        "limelight" {
             sourceSet sourceSets.main
             sourceSet sourceSets.client
         }
@@ -50,7 +50,7 @@ dependencies {
     modLocalRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
 }
 
-processResources {
+processClientResources {
     inputs.property "version", project.version
 
     filesMatching("fabric.mod.json") {

gradle.properties

@@ -10,8 +10,8 @@ loader_version=0.15.11
 
 # Mod Properties
 mod_version=1.0.0
-maven_group=me.basiqueevangelist.flashlight
-archives_base_name=flashlight
+maven_group=me.basiqueevangelist.limelight
+archives_base_name=limelight
 
 # Dependencies
 fabric_version=0.100.8+1.21

settings.gradle

@@ -7,4 +7,6 @@ pluginManagement {
 		mavenCentral()
 		gradlePluginPortal()
 	}
-}
+}
+
+rootProject.name = "Limelight"

src/client/java/me/basiqueevangelist/limelight/api/LimelightEntrypoint.java

@@ -0,0 +1,11 @@
+package me.basiqueevangelist.limelight.api;
+
+import me.basiqueevangelist.limelight.api.module.LimelightModule;
+
+import java.util.function.Consumer;
+
+public interface LimelightEntrypoint {
+    String KEY = "limelight";
+
+    void registerModules(Consumer<LimelightModule> moduleRegistry);
+}

src/client/java/me/basiqueevangelist/flashlight/api/action/InvokeResultEntryAction.java → src/client/java/me/basiqueevangelist/limelight/api/action/InvokeResultEntryAction.java

@@ -1,8 +1,8 @@
-package me.basiqueevangelist.flashlight.api.action;
+package me.basiqueevangelist.limelight.api.action;
 
 public non-sealed interface InvokeResultEntryAction extends ResultEntryAction {
     /**
-     * @return whether the Flashlight screen should be closed before running this action.
+     * @return whether the Limelight screen should be closed before running this action.
      */
     default boolean closesScreen() {
         return true;

src/client/java/me/basiqueevangelist/flashlight/api/action/ResultEntryAction.java → src/client/java/me/basiqueevangelist/limelight/api/action/ResultEntryAction.java

@@ -1,4 +1,4 @@
-package me.basiqueevangelist.flashlight.api.action;
+package me.basiqueevangelist.limelight.api.action;
 
 public sealed interface ResultEntryAction permits InvokeResultEntryAction {
 }

src/client/java/me/basiqueevangelist/flashlight/api/entry/ResultEntry.java → src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntry.java

@@ -1,17 +1,17 @@
-package me.basiqueevangelist.flashlight.api.entry;
+package me.basiqueevangelist.limelight.api.entry;
 
-import me.basiqueevangelist.flashlight.api.module.FlashlightModule;
-import me.basiqueevangelist.flashlight.api.action.ResultEntryAction;
+import me.basiqueevangelist.limelight.api.module.LimelightModule;
+import me.basiqueevangelist.limelight.api.action.ResultEntryAction;
 import net.minecraft.text.Text;
 
 /**
- * Represents a result entry in the Flashlight GUI.
+ * Represents a result entry in the Limelight GUI.
  */
 public interface ResultEntry {
     /**
      * @return the module that generated this entry
      */
-    FlashlightModule module();
+    LimelightModule module();
 
     /**
      * @return the text of this entry

src/client/java/me/basiqueevangelist/flashlight/api/entry/ResultEntryGatherer.java → src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntryGatherer.java

@@ -1,4 +1,4 @@
-package me.basiqueevangelist.flashlight.api.entry;
+package me.basiqueevangelist.limelight.api.entry;
 
 import java.util.function.Consumer;
 

src/client/java/me/basiqueevangelist/flashlight/api/module/FlashlightModule.java → src/client/java/me/basiqueevangelist/limelight/api/module/LimelightModule.java

@@ -1,7 +1,7 @@
-package me.basiqueevangelist.flashlight.api.module;
+package me.basiqueevangelist.limelight.api.module;
 
-import me.basiqueevangelist.flashlight.api.entry.ResultEntry;
-import me.basiqueevangelist.flashlight.api.entry.ResultEntryGatherer;
+import me.basiqueevangelist.limelight.api.entry.ResultEntry;
+import me.basiqueevangelist.limelight.api.entry.ResultEntryGatherer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -10,19 +10,19 @@
 import java.util.function.Consumer;
 
 /**
- * Base interface for extending Flashlight.
+ * Base interface for extending Limelight.
  */
-public interface FlashlightModule extends ResultEntryGatherer {
+public interface LimelightModule extends ResultEntryGatherer {
     /**
-     * @return the unique identifier of this specific Flashlight module
+     * @return the unique identifier of this specific Limelight module
      */
     Identifier id();
 
     /**
      * @return the name of this module, to be used in the main and config screens
      */
     default Text name() {
-        return Text.translatable(Util.createTranslationKey("flashlightModule", id()));
+        return Text.translatable(Util.createTranslationKey("limelightModule", id()));
     }
 
     default @Nullable ResultEntryGatherer checkExclusiveGatherer(String searchText) {

src/client/java/me/basiqueevangelist/limelight/api/module/LimelightModules.java

@@ -0,0 +1,16 @@
+package me.basiqueevangelist.limelight.api.module;
+
+import me.basiqueevangelist.limelight.impl.ModuleManager;
+import org.jetbrains.annotations.UnmodifiableView;
+
+import java.util.List;
+
+public final class LimelightModules {
+    public LimelightModules() {
+
+    }
+
+    public static @UnmodifiableView List<LimelightModule> allModules() {
+        return ModuleManager.allModules();
+    }
+}

src/client/java/me/basiqueevangelist/flashlight/impl/Flashlight.java → src/client/java/me/basiqueevangelist/limelight/impl/Limelight.java

@@ -1,31 +1,31 @@
-package me.basiqueevangelist.flashlight.impl;
+package me.basiqueevangelist.limelight.impl;
 
-import me.basiqueevangelist.flashlight.impl.ui.FlashlightScreen;
+import me.basiqueevangelist.limelight.impl.ui.LimelightScreen;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.util.Identifier;
 import org.lwjgl.glfw.GLFW;
 
-public class Flashlight implements ClientModInitializer {
-	public static KeyBinding OPEN_FLASHLIGHT = new KeyBinding("key.flashlight.open", GLFW.GLFW_KEY_LEFT_BRACKET, KeyBinding.MISC_CATEGORY);
+public class Limelight implements ClientModInitializer {
+	public static KeyBinding OPEN_LIMELIGHT = new KeyBinding("key.limelight.open", GLFW.GLFW_KEY_LEFT_BRACKET, KeyBinding.MISC_CATEGORY);
 
 	@Override
 	public void onInitializeClient() {
-		KeyBindingHelper.registerKeyBinding(OPEN_FLASHLIGHT);
+		KeyBindingHelper.registerKeyBinding(OPEN_LIMELIGHT);
 
 		ModuleManager.init();
 
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
-			if (!OPEN_FLASHLIGHT.wasPressed()) return;
+			if (!OPEN_LIMELIGHT.wasPressed()) return;
 			if (client.player == null) return;
 
-			client.setScreen(new FlashlightScreen());
+			client.setScreen(new LimelightScreen());
 		});
 	}
 
 	public static Identifier id(String path) {
-		return Identifier.of("flashlight", path);
+		return Identifier.of("limelight", path);
 	}
 }

src/client/java/me/basiqueevangelist/flashlight/impl/ModuleManager.java → src/client/java/me/basiqueevangelist/limelight/impl/ModuleManager.java

@@ -1,7 +1,7 @@
-package me.basiqueevangelist.flashlight.impl;
+package me.basiqueevangelist.limelight.impl;
 
-import me.basiqueevangelist.flashlight.api.FlashlightEntrypoint;
-import me.basiqueevangelist.flashlight.api.module.FlashlightModule;
+import me.basiqueevangelist.limelight.api.LimelightEntrypoint;
+import me.basiqueevangelist.limelight.api.module.LimelightModule;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
@@ -12,17 +12,17 @@
 import java.util.Map;
 
 public final class ModuleManager {
-    private static final Logger LOGGER = LoggerFactory.getLogger("Flashlight/ModuleManager");
-    private static final Map<Identifier, FlashlightModule> MODULES_BY_ID = new HashMap<>();
-    private static List<FlashlightModule> MODULES;
+    private static final Logger LOGGER = LoggerFactory.getLogger("Limelight/ModuleManager");
+    private static final Map<Identifier, LimelightModule> MODULES_BY_ID = new HashMap<>();
+    private static List<LimelightModule> MODULES;
 
     private ModuleManager() {
 
     }
 
     public static void init() {
-        var entrypoints = FabricLoader.getInstance().getEntrypointContainers(FlashlightEntrypoint.KEY, FlashlightEntrypoint.class);
-        Map<Identifier, FlashlightModule> modules = new HashMap<>();
+        var entrypoints = FabricLoader.getInstance().getEntrypointContainers(LimelightEntrypoint.KEY, LimelightEntrypoint.class);
+        Map<Identifier, LimelightModule> modules = new HashMap<>();
 
         for (var entry : entrypoints) {
             String modId = entry.getProvider().getMetadata().getId();
@@ -38,7 +38,7 @@ public static void init() {
                     modules.put(id, module);
                 });
             } catch (Throwable t) {
-                LOGGER.error("{}'s FlashlightEntrypoint handler threw an error.", modId, t);
+                LOGGER.error("{}'s LimelightEntrypoint handler threw an error.", modId, t);
             }
         }
 
@@ -47,10 +47,10 @@ public static void init() {
 
         MODULES = MODULES_BY_ID.values().stream().toList();
 
-        LOGGER.info("Loaded {} Flashlight modules.", MODULES_BY_ID.size());
+        LOGGER.info("Loaded {} Limelight modules.", MODULES_BY_ID.size());
     }
 
-    public static List<FlashlightModule> allModules() {
+    public static List<LimelightModule> allModules() {
         return MODULES;
     }
 }

src/client/java/me/basiqueevangelist/flashlight/impl/ResultGatherer.java → src/client/java/me/basiqueevangelist/limelight/impl/ResultGatherer.java

@@ -1,7 +1,7 @@
-package me.basiqueevangelist.flashlight.impl;
+package me.basiqueevangelist.limelight.impl;
 
-import me.basiqueevangelist.flashlight.api.entry.ResultEntry;
-import me.basiqueevangelist.flashlight.api.module.FlashlightModules;
+import me.basiqueevangelist.limelight.api.entry.ResultEntry;
+import me.basiqueevangelist.limelight.api.module.LimelightModules;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +15,7 @@ public static List<ResultEntry> gatherResults(String searchText) {
         List<ResultEntry> results = new ArrayList<>();
 
         // TODO: only use enabled modules
-        for (var module : FlashlightModules.allModules()) {
+        for (var module : LimelightModules.allModules()) {
             var gatherer = module.checkExclusiveGatherer(searchText);
 
             if (gatherer != null) {
@@ -24,7 +24,7 @@ public static List<ResultEntry> gatherResults(String searchText) {
             }
         }
 
-        for (var module : FlashlightModules.allModules()) {
+        for (var module : LimelightModules.allModules()) {
             module.gatherEntries(searchText, results::add);
             var gatherer = module.checkExclusiveGatherer(searchText);
 

src/client/java/me/basiqueevangelist/limelight/impl/builtin/BuiltinModules.java

@@ -0,0 +1,15 @@
+package me.basiqueevangelist.limelight.impl.builtin;
+
+import me.basiqueevangelist.limelight.api.LimelightEntrypoint;
+import me.basiqueevangelist.limelight.api.module.LimelightModule;
+import net.fabricmc.loader.api.FabricLoader;
+
+import java.util.function.Consumer;
+
+public class BuiltinModules implements LimelightEntrypoint {
+    @Override
+    public void registerModules(Consumer<LimelightModule> moduleRegistry) {
+        moduleRegistry.accept(KeyBindingsModule.INSTANCE);
+        if (FabricLoader.getInstance().isModLoaded("modmenu")) moduleRegistry.accept(ModConfigModule.INSTANCE);
+    }
+}

src/client/java/me/basiqueevangelist/flashlight/impl/builtin/KeyBindingsModule.java → src/client/java/me/basiqueevangelist/limelight/impl/builtin/KeyBindingsModule.java

@@ -1,11 +1,11 @@
-package me.basiqueevangelist.flashlight.impl.builtin;
+package me.basiqueevangelist.limelight.impl.builtin;
 
-import me.basiqueevangelist.flashlight.api.module.FlashlightModule;
-import me.basiqueevangelist.flashlight.api.entry.ResultEntry;
-import me.basiqueevangelist.flashlight.api.action.InvokeResultEntryAction;
-import me.basiqueevangelist.flashlight.api.action.ResultEntryAction;
-import me.basiqueevangelist.flashlight.impl.Flashlight;
-import me.basiqueevangelist.flashlight.mixin.KeyBindingAccessor;
+import me.basiqueevangelist.limelight.api.module.LimelightModule;
+import me.basiqueevangelist.limelight.api.entry.ResultEntry;
+import me.basiqueevangelist.limelight.api.action.InvokeResultEntryAction;
+import me.basiqueevangelist.limelight.api.action.ResultEntryAction;
+import me.basiqueevangelist.limelight.impl.Limelight;
+import me.basiqueevangelist.limelight.mixin.KeyBindingAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.text.Text;
@@ -14,8 +14,8 @@
 
 import java.util.function.Consumer;
 
-public class KeyBindingsModule implements FlashlightModule {
-    public static final Identifier ID = Flashlight.id("key_bindings");
+public class KeyBindingsModule implements LimelightModule {
+    public static final Identifier ID = Limelight.id("key_bindings");
     public static final KeyBindingsModule INSTANCE = new KeyBindingsModule();
 
     private KeyBindingsModule() { }
@@ -36,7 +36,7 @@ public void gatherEntries(String searchText, Consumer<ResultEntry> entryConsumer
 
     private record KeyBindingResult(KeyBinding binding) implements ResultEntry, InvokeResultEntryAction {
         @Override
-        public FlashlightModule module() {
+        public LimelightModule module() {
             return INSTANCE;
         }