diff --git a/gradle.properties b/gradle.properties index 706649f..4b9acfb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 # Mod Properties mod_version=0.1.0 -maven_group=me.basiqueevangelist.limelight +maven_group=io.wispforest archives_base_name=limelight # Dependencies diff --git a/src/client/java/me/basiqueevangelist/limelight/api/LimelightEntrypoint.java b/src/client/java/io/wispforest/limelight/api/LimelightEntrypoint.java similarity index 61% rename from src/client/java/me/basiqueevangelist/limelight/api/LimelightEntrypoint.java rename to src/client/java/io/wispforest/limelight/api/LimelightEntrypoint.java index 34c7f2d..6d21893 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/LimelightEntrypoint.java +++ b/src/client/java/io/wispforest/limelight/api/LimelightEntrypoint.java @@ -1,6 +1,6 @@ -package me.basiqueevangelist.limelight.api; +package io.wispforest.limelight.api; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.api.extension.LimelightExtension; import java.util.function.Consumer; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/builtin/bangs/BangDefinition.java b/src/client/java/io/wispforest/limelight/api/builtin/bangs/BangDefinition.java similarity index 74% rename from src/client/java/me/basiqueevangelist/limelight/api/builtin/bangs/BangDefinition.java rename to src/client/java/io/wispforest/limelight/api/builtin/bangs/BangDefinition.java index b21e92e..9eaabc7 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/builtin/bangs/BangDefinition.java +++ b/src/client/java/io/wispforest/limelight/api/builtin/bangs/BangDefinition.java @@ -1,6 +1,6 @@ -package me.basiqueevangelist.limelight.api.builtin.bangs; +package io.wispforest.limelight.api.builtin.bangs; -import me.basiqueevangelist.limelight.api.entry.ResultEntryGatherer; +import io.wispforest.limelight.api.entry.ResultEntryGatherer; import net.minecraft.text.Text; /** diff --git a/src/client/java/me/basiqueevangelist/limelight/api/builtin/bangs/BangsProvider.java b/src/client/java/io/wispforest/limelight/api/builtin/bangs/BangsProvider.java similarity index 85% rename from src/client/java/me/basiqueevangelist/limelight/api/builtin/bangs/BangsProvider.java rename to src/client/java/io/wispforest/limelight/api/builtin/bangs/BangsProvider.java index 73f6222..177f657 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/builtin/bangs/BangsProvider.java +++ b/src/client/java/io/wispforest/limelight/api/builtin/bangs/BangsProvider.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.builtin.bangs; +package io.wispforest.limelight.api.builtin.bangs; import java.util.List; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/builtin/package-info.java b/src/client/java/io/wispforest/limelight/api/builtin/package-info.java similarity index 57% rename from src/client/java/me/basiqueevangelist/limelight/api/builtin/package-info.java rename to src/client/java/io/wispforest/limelight/api/builtin/package-info.java index 95f26a4..f945492 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/builtin/package-info.java +++ b/src/client/java/io/wispforest/limelight/api/builtin/package-info.java @@ -1,4 +1,4 @@ /** * API for interfacing with Limelight's built-in extensions. */ -package me.basiqueevangelist.limelight.api.builtin; \ No newline at end of file +package io.wispforest.limelight.api.builtin; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/api/builtin/wiki/WikiSource.java b/src/client/java/io/wispforest/limelight/api/builtin/wiki/WikiSource.java similarity index 95% rename from src/client/java/me/basiqueevangelist/limelight/api/builtin/wiki/WikiSource.java rename to src/client/java/io/wispforest/limelight/api/builtin/wiki/WikiSource.java index 35a75be..9aa2d40 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/builtin/wiki/WikiSource.java +++ b/src/client/java/io/wispforest/limelight/api/builtin/wiki/WikiSource.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.builtin.wiki; +package io.wispforest.limelight.api.builtin.wiki; import java.util.function.Consumer; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/builtin/wiki/WikiSourceType.java b/src/client/java/io/wispforest/limelight/api/builtin/wiki/WikiSourceType.java similarity index 87% rename from src/client/java/me/basiqueevangelist/limelight/api/builtin/wiki/WikiSourceType.java rename to src/client/java/io/wispforest/limelight/api/builtin/wiki/WikiSourceType.java index 9f27a2f..164c426 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/builtin/wiki/WikiSourceType.java +++ b/src/client/java/io/wispforest/limelight/api/builtin/wiki/WikiSourceType.java @@ -1,7 +1,7 @@ -package me.basiqueevangelist.limelight.api.builtin.wiki; +package io.wispforest.limelight.api.builtin.wiki; import io.wispforest.endec.Endec; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.impl.Limelight; import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/entry/InvokeResultEntry.java b/src/client/java/io/wispforest/limelight/api/entry/InvokeResultEntry.java similarity index 88% rename from src/client/java/me/basiqueevangelist/limelight/api/entry/InvokeResultEntry.java rename to src/client/java/io/wispforest/limelight/api/entry/InvokeResultEntry.java index 2b8eddc..8bd9b79 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/entry/InvokeResultEntry.java +++ b/src/client/java/io/wispforest/limelight/api/entry/InvokeResultEntry.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.entry; +package io.wispforest.limelight.api.entry; /** * A result entry which invokes a method when run. diff --git a/src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntry.java b/src/client/java/io/wispforest/limelight/api/entry/ResultEntry.java similarity index 85% rename from src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntry.java rename to src/client/java/io/wispforest/limelight/api/entry/ResultEntry.java index b8027f4..fba710c 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntry.java +++ b/src/client/java/io/wispforest/limelight/api/entry/ResultEntry.java @@ -1,6 +1,6 @@ -package me.basiqueevangelist.limelight.api.entry; +package io.wispforest.limelight.api.entry; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.api.extension.LimelightExtension; import net.minecraft.text.Text; import net.minecraft.util.Identifier; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntryGatherer.java b/src/client/java/io/wispforest/limelight/api/entry/ResultEntryGatherer.java similarity index 88% rename from src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntryGatherer.java rename to src/client/java/io/wispforest/limelight/api/entry/ResultEntryGatherer.java index cf298eb..ac2323a 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/entry/ResultEntryGatherer.java +++ b/src/client/java/io/wispforest/limelight/api/entry/ResultEntryGatherer.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.entry; +package io.wispforest.limelight.api.entry; import java.util.function.Consumer; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/entry/ResultGatherContext.java b/src/client/java/io/wispforest/limelight/api/entry/ResultGatherContext.java similarity index 92% rename from src/client/java/me/basiqueevangelist/limelight/api/entry/ResultGatherContext.java rename to src/client/java/io/wispforest/limelight/api/entry/ResultGatherContext.java index 4141ca3..a280106 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/entry/ResultGatherContext.java +++ b/src/client/java/io/wispforest/limelight/api/entry/ResultGatherContext.java @@ -1,6 +1,6 @@ -package me.basiqueevangelist.limelight.api.entry; +package io.wispforest.limelight.api.entry; -import me.basiqueevangelist.limelight.api.util.CancellationToken; +import io.wispforest.limelight.api.util.CancellationToken; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import org.jetbrains.annotations.ApiStatus; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/entry/SetSearchTextEntry.java b/src/client/java/io/wispforest/limelight/api/entry/SetSearchTextEntry.java similarity index 77% rename from src/client/java/me/basiqueevangelist/limelight/api/entry/SetSearchTextEntry.java rename to src/client/java/io/wispforest/limelight/api/entry/SetSearchTextEntry.java index f93a7fa..84a81c4 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/entry/SetSearchTextEntry.java +++ b/src/client/java/io/wispforest/limelight/api/entry/SetSearchTextEntry.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.entry; +package io.wispforest.limelight.api.entry; /** * A result entry which sets the screen's search text when run. diff --git a/src/client/java/me/basiqueevangelist/limelight/api/entry/ToggleResultEntry.java b/src/client/java/io/wispforest/limelight/api/entry/ToggleResultEntry.java similarity index 87% rename from src/client/java/me/basiqueevangelist/limelight/api/entry/ToggleResultEntry.java rename to src/client/java/io/wispforest/limelight/api/entry/ToggleResultEntry.java index 31586e4..cd702eb 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/entry/ToggleResultEntry.java +++ b/src/client/java/io/wispforest/limelight/api/entry/ToggleResultEntry.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.entry; +package io.wispforest.limelight.api.entry; import org.jetbrains.annotations.ApiStatus; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/extension/LimelightExtension.java b/src/client/java/io/wispforest/limelight/api/extension/LimelightExtension.java similarity index 89% rename from src/client/java/me/basiqueevangelist/limelight/api/extension/LimelightExtension.java rename to src/client/java/io/wispforest/limelight/api/extension/LimelightExtension.java index 33ab49f..604e159 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/extension/LimelightExtension.java +++ b/src/client/java/io/wispforest/limelight/api/extension/LimelightExtension.java @@ -1,8 +1,8 @@ -package me.basiqueevangelist.limelight.api.extension; +package io.wispforest.limelight.api.extension; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.entry.ResultEntryGatherer; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.entry.ResultEntryGatherer; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; import net.minecraft.util.Formatting; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/extension/LimelightExtensions.java b/src/client/java/io/wispforest/limelight/api/extension/LimelightExtensions.java similarity index 83% rename from src/client/java/me/basiqueevangelist/limelight/api/extension/LimelightExtensions.java rename to src/client/java/io/wispforest/limelight/api/extension/LimelightExtensions.java index 4e2f899..70c7db9 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/extension/LimelightExtensions.java +++ b/src/client/java/io/wispforest/limelight/api/extension/LimelightExtensions.java @@ -1,6 +1,6 @@ -package me.basiqueevangelist.limelight.api.extension; +package io.wispforest.limelight.api.extension; -import me.basiqueevangelist.limelight.impl.ExtensionManager; +import io.wispforest.limelight.impl.ExtensionManager; import org.jetbrains.annotations.UnmodifiableView; import java.util.List; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/util/CancellationToken.java b/src/client/java/io/wispforest/limelight/api/util/CancellationToken.java similarity index 98% rename from src/client/java/me/basiqueevangelist/limelight/api/util/CancellationToken.java rename to src/client/java/io/wispforest/limelight/api/util/CancellationToken.java index cbcc637..b165415 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/util/CancellationToken.java +++ b/src/client/java/io/wispforest/limelight/api/util/CancellationToken.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.util; +package io.wispforest.limelight.api.util; import java.lang.ref.WeakReference; import java.util.concurrent.CancellationException; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/util/CancellationTokenSource.java b/src/client/java/io/wispforest/limelight/api/util/CancellationTokenSource.java similarity index 95% rename from src/client/java/me/basiqueevangelist/limelight/api/util/CancellationTokenSource.java rename to src/client/java/io/wispforest/limelight/api/util/CancellationTokenSource.java index 32a19e5..9eabfcd 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/util/CancellationTokenSource.java +++ b/src/client/java/io/wispforest/limelight/api/util/CancellationTokenSource.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.util; +package io.wispforest.limelight.api.util; import java.util.ArrayList; import java.util.List; diff --git a/src/client/java/me/basiqueevangelist/limelight/api/util/InfallibleCloseable.java b/src/client/java/io/wispforest/limelight/api/util/InfallibleCloseable.java similarity index 65% rename from src/client/java/me/basiqueevangelist/limelight/api/util/InfallibleCloseable.java rename to src/client/java/io/wispforest/limelight/api/util/InfallibleCloseable.java index da95642..ab272d3 100644 --- a/src/client/java/me/basiqueevangelist/limelight/api/util/InfallibleCloseable.java +++ b/src/client/java/io/wispforest/limelight/api/util/InfallibleCloseable.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.api.util; +package io.wispforest.limelight.api.util; public interface InfallibleCloseable extends AutoCloseable { @Override diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ExtensionManager.java b/src/client/java/io/wispforest/limelight/impl/ExtensionManager.java similarity index 75% rename from src/client/java/me/basiqueevangelist/limelight/impl/ExtensionManager.java rename to src/client/java/io/wispforest/limelight/impl/ExtensionManager.java index cbfc821..7438284 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ExtensionManager.java +++ b/src/client/java/io/wispforest/limelight/impl/ExtensionManager.java @@ -1,15 +1,14 @@ -package me.basiqueevangelist.limelight.impl; +package io.wispforest.limelight.impl; import io.wispforest.owo.util.Observable; -import me.basiqueevangelist.limelight.api.LimelightEntrypoint; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.impl.util.ReactiveUtils; +import io.wispforest.limelight.api.LimelightEntrypoint; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.impl.util.ReactiveUtils; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -58,8 +57,8 @@ public static void init() { LOGGER.info("Loaded {} Limelight extensions.", EXTENSIONS_BY_ID.size()); // glisco makes a dollar, I make a dime, that's why I write shit code on company time - ENABLED_EXTENSIONS = me.basiqueevangelist.limelight.impl.util.ReactiveUtils.map(me.basiqueevangelist.limelight.impl.util.ReactiveUtils.from(me.basiqueevangelist.limelight.impl.Limelight.CONFIG.>optionForKey(me.basiqueevangelist.limelight.impl.Limelight.CONFIG.keys.enabledExtensions)), e -> { - java.util.List enabled = new java.util.ArrayList<>(EXTENSIONS); + ENABLED_EXTENSIONS = ReactiveUtils.map(ReactiveUtils.from(Limelight.CONFIG.>optionForKey(Limelight.CONFIG.keys.enabledExtensions)), e -> { + java.util.List enabled = new java.util.ArrayList<>(EXTENSIONS); enabled.removeIf(x -> !e.getOrDefault(x.id(), true)); return enabled; }); diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/Limelight.java b/src/client/java/io/wispforest/limelight/impl/Limelight.java similarity index 77% rename from src/client/java/me/basiqueevangelist/limelight/impl/Limelight.java rename to src/client/java/io/wispforest/limelight/impl/Limelight.java index f871e43..d41e031 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/Limelight.java +++ b/src/client/java/io/wispforest/limelight/impl/Limelight.java @@ -1,12 +1,12 @@ -package me.basiqueevangelist.limelight.impl; +package io.wispforest.limelight.impl; import io.wispforest.owo.config.ui.ConfigScreen; -import me.basiqueevangelist.limelight.impl.config.LimelightConfig; -import me.basiqueevangelist.limelight.impl.config.LimelightConfigScreen; -import me.basiqueevangelist.limelight.impl.resource.CalculatorResourceLoader; -import me.basiqueevangelist.limelight.impl.builtin.wiki.WikiLoader; -import me.basiqueevangelist.limelight.impl.ui.LimelightScreen; -import me.basiqueevangelist.limelight.impl.util.LeastRecentlyUsedList; +import io.wispforest.limelight.impl.config.LimelightConfig; +import io.wispforest.limelight.impl.config.LimelightConfigScreen; +import io.wispforest.limelight.impl.resource.CalculatorResourceLoader; +import io.wispforest.limelight.impl.builtin.wiki.WikiLoader; +import io.wispforest.limelight.impl.ui.LimelightScreen; +import io.wispforest.limelight.impl.util.LeastRecentlyUsedList; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ResultGatherContextImpl.java b/src/client/java/io/wispforest/limelight/impl/ResultGatherContextImpl.java similarity index 93% rename from src/client/java/me/basiqueevangelist/limelight/impl/ResultGatherContextImpl.java rename to src/client/java/io/wispforest/limelight/impl/ResultGatherContextImpl.java index cda6982..5926e68 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ResultGatherContextImpl.java +++ b/src/client/java/io/wispforest/limelight/impl/ResultGatherContextImpl.java @@ -1,9 +1,9 @@ -package me.basiqueevangelist.limelight.impl; +package io.wispforest.limelight.impl; import io.wispforest.owo.util.Observable; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.util.CancellationToken; -import me.basiqueevangelist.limelight.impl.util.ReactiveUtils; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.util.CancellationToken; +import io.wispforest.limelight.impl.util.ReactiveUtils; import net.fabricmc.fabric.api.util.TriState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ResultGatherer.java b/src/client/java/io/wispforest/limelight/impl/ResultGatherer.java similarity index 72% rename from src/client/java/me/basiqueevangelist/limelight/impl/ResultGatherer.java rename to src/client/java/io/wispforest/limelight/impl/ResultGatherer.java index cb416d3..79aa003 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ResultGatherer.java +++ b/src/client/java/io/wispforest/limelight/impl/ResultGatherer.java @@ -1,8 +1,8 @@ -package me.basiqueevangelist.limelight.impl; +package io.wispforest.limelight.impl; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.extension.LimelightExtensions; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.extension.LimelightExtensions; import java.util.function.Consumer; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/BangsExtension.java b/src/client/java/io/wispforest/limelight/impl/builtin/BangsExtension.java similarity index 79% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/BangsExtension.java rename to src/client/java/io/wispforest/limelight/impl/builtin/BangsExtension.java index fc9624c..0e3df2e 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/BangsExtension.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/BangsExtension.java @@ -1,14 +1,14 @@ -package me.basiqueevangelist.limelight.impl.builtin; - -import me.basiqueevangelist.limelight.api.entry.SetSearchTextEntry; -import me.basiqueevangelist.limelight.api.builtin.bangs.BangDefinition; -import me.basiqueevangelist.limelight.api.builtin.bangs.BangsProvider; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultEntryGatherer; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.api.extension.LimelightExtensions; -import me.basiqueevangelist.limelight.impl.Limelight; +package io.wispforest.limelight.impl.builtin; + +import io.wispforest.limelight.api.entry.SetSearchTextEntry; +import io.wispforest.limelight.api.builtin.bangs.BangDefinition; +import io.wispforest.limelight.api.builtin.bangs.BangsProvider; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultEntryGatherer; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.api.extension.LimelightExtensions; +import io.wispforest.limelight.impl.Limelight; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import org.apache.commons.lang3.StringUtils; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/BuiltinExtensions.java b/src/client/java/io/wispforest/limelight/impl/builtin/BuiltinExtensions.java similarity index 75% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/BuiltinExtensions.java rename to src/client/java/io/wispforest/limelight/impl/builtin/BuiltinExtensions.java index 975ff83..b05a1f9 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/BuiltinExtensions.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/BuiltinExtensions.java @@ -1,8 +1,8 @@ -package me.basiqueevangelist.limelight.impl.builtin; +package io.wispforest.limelight.impl.builtin; -import me.basiqueevangelist.limelight.api.LimelightEntrypoint; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.impl.builtin.wiki.WikiExtension; +import io.wispforest.limelight.api.LimelightEntrypoint; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.impl.builtin.wiki.WikiExtension; import net.fabricmc.loader.api.FabricLoader; import java.util.function.Consumer; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/CalculatorExtension.java b/src/client/java/io/wispforest/limelight/impl/builtin/CalculatorExtension.java similarity index 83% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/CalculatorExtension.java rename to src/client/java/io/wispforest/limelight/impl/builtin/CalculatorExtension.java index e9ed1e7..c0e5b67 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/CalculatorExtension.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/CalculatorExtension.java @@ -1,12 +1,12 @@ -package me.basiqueevangelist.limelight.impl.builtin; - -import me.basiqueevangelist.limelight.api.entry.InvokeResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.entry.ResultEntryGatherer; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.impl.Limelight; -import me.basiqueevangelist.limelight.impl.resource.CalculatorResourceLoader; +package io.wispforest.limelight.impl.builtin; + +import io.wispforest.limelight.api.entry.InvokeResultEntry; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.entry.ResultEntryGatherer; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.impl.Limelight; +import io.wispforest.limelight.impl.resource.CalculatorResourceLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; import net.minecraft.util.Identifier; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/GameSettingsExtension.java b/src/client/java/io/wispforest/limelight/impl/builtin/GameSettingsExtension.java similarity index 86% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/GameSettingsExtension.java rename to src/client/java/io/wispforest/limelight/impl/builtin/GameSettingsExtension.java index 18fddb5..086a42b 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/GameSettingsExtension.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/GameSettingsExtension.java @@ -1,11 +1,11 @@ -package me.basiqueevangelist.limelight.impl.builtin; - -import me.basiqueevangelist.limelight.api.entry.ToggleResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.impl.Limelight; -import me.basiqueevangelist.limelight.mixin.SimpleOptionAccessor; +package io.wispforest.limelight.impl.builtin; + +import io.wispforest.limelight.api.entry.ToggleResultEntry; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.impl.Limelight; +import io.wispforest.limelight.mixin.SimpleOptionAccessor; import net.minecraft.client.option.GameOptions; import net.minecraft.client.option.SimpleOption; import net.minecraft.text.Text; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/KeyBindingsExtension.java b/src/client/java/io/wispforest/limelight/impl/builtin/KeyBindingsExtension.java similarity index 80% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/KeyBindingsExtension.java rename to src/client/java/io/wispforest/limelight/impl/builtin/KeyBindingsExtension.java index f4520d9..0eb2d47 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/KeyBindingsExtension.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/KeyBindingsExtension.java @@ -1,11 +1,11 @@ -package me.basiqueevangelist.limelight.impl.builtin; +package io.wispforest.limelight.impl.builtin; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.InvokeResultEntry; -import me.basiqueevangelist.limelight.impl.Limelight; -import me.basiqueevangelist.limelight.mixin.KeyBindingAccessor; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.InvokeResultEntry; +import io.wispforest.limelight.impl.Limelight; +import io.wispforest.limelight.mixin.KeyBindingAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.KeyBinding; import net.minecraft.text.Text; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/LavenderExtension.java b/src/client/java/io/wispforest/limelight/impl/builtin/LavenderExtension.java similarity index 88% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/LavenderExtension.java rename to src/client/java/io/wispforest/limelight/impl/builtin/LavenderExtension.java index 87ef97a..361b333 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/LavenderExtension.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/LavenderExtension.java @@ -1,14 +1,14 @@ -package me.basiqueevangelist.limelight.impl.builtin; +package io.wispforest.limelight.impl.builtin; import io.wispforest.lavender.book.Book; import io.wispforest.lavender.book.Entry; import io.wispforest.lavender.book.LavenderBookItem; import io.wispforest.lavender.client.LavenderBookScreen; -import me.basiqueevangelist.limelight.api.entry.InvokeResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.api.entry.InvokeResultEntry; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.impl.Limelight; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/ModConfigExtension.java b/src/client/java/io/wispforest/limelight/impl/builtin/ModConfigExtension.java similarity index 89% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/ModConfigExtension.java rename to src/client/java/io/wispforest/limelight/impl/builtin/ModConfigExtension.java index 4cc1525..8ba2365 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/ModConfigExtension.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/ModConfigExtension.java @@ -1,13 +1,13 @@ -package me.basiqueevangelist.limelight.impl.builtin; +package io.wispforest.limelight.impl.builtin; import com.terraformersmc.modmenu.api.ModMenuApi; -import me.basiqueevangelist.limelight.api.builtin.bangs.BangDefinition; -import me.basiqueevangelist.limelight.api.builtin.bangs.BangsProvider; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.InvokeResultEntry; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.api.builtin.bangs.BangDefinition; +import io.wispforest.limelight.api.builtin.bangs.BangsProvider; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.InvokeResultEntry; +import io.wispforest.limelight.impl.Limelight; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; diff --git a/src/client/java/me/basiqueevangelist/limelight/mixin/package-info.java b/src/client/java/io/wispforest/limelight/impl/builtin/package-info.java similarity index 58% rename from src/client/java/me/basiqueevangelist/limelight/mixin/package-info.java rename to src/client/java/io/wispforest/limelight/impl/builtin/package-info.java index 47b0141..8271a9c 100644 --- a/src/client/java/me/basiqueevangelist/limelight/mixin/package-info.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package me.basiqueevangelist.limelight.mixin; +package io.wispforest.limelight.impl.builtin; import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiDescription.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiDescription.java similarity index 89% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiDescription.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiDescription.java index dbbac07..a3bdef5 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiDescription.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiDescription.java @@ -1,11 +1,11 @@ -package me.basiqueevangelist.limelight.impl.builtin.wiki; +package io.wispforest.limelight.impl.builtin.wiki; import io.wispforest.endec.Endec; import io.wispforest.endec.StructEndec; import io.wispforest.endec.impl.StructEndecBuilder; import io.wispforest.owo.serialization.endec.MinecraftEndecs; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSourceType; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSource; +import io.wispforest.limelight.api.builtin.wiki.WikiSourceType; +import io.wispforest.limelight.api.builtin.wiki.WikiSource; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiExtension.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiExtension.java similarity index 87% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiExtension.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiExtension.java index 1de6ad6..ffb40fe 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiExtension.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiExtension.java @@ -1,16 +1,16 @@ -package me.basiqueevangelist.limelight.impl.builtin.wiki; +package io.wispforest.limelight.impl.builtin.wiki; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSource; -import me.basiqueevangelist.limelight.api.entry.InvokeResultEntry; -import me.basiqueevangelist.limelight.api.builtin.bangs.BangDefinition; -import me.basiqueevangelist.limelight.api.builtin.bangs.BangsProvider; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.api.extension.LimelightExtension; -import me.basiqueevangelist.limelight.impl.Limelight; -import me.basiqueevangelist.limelight.impl.builtin.wiki.source.BuiltinWikiSources; +import io.wispforest.limelight.api.builtin.wiki.WikiSource; +import io.wispforest.limelight.api.entry.InvokeResultEntry; +import io.wispforest.limelight.api.builtin.bangs.BangDefinition; +import io.wispforest.limelight.api.builtin.bangs.BangsProvider; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.api.extension.LimelightExtension; +import io.wispforest.limelight.impl.Limelight; +import io.wispforest.limelight.impl.builtin.wiki.source.BuiltinWikiSources; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.SharedConstants; import net.minecraft.text.Text; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiLoader.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiLoader.java similarity index 95% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiLoader.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiLoader.java index eeef1cb..b015719 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/WikiLoader.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/WikiLoader.java @@ -1,10 +1,10 @@ -package me.basiqueevangelist.limelight.impl.builtin.wiki; +package io.wispforest.limelight.impl.builtin.wiki; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import io.wispforest.endec.format.gson.GsonDeserializer; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.impl.Limelight; import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener; import net.minecraft.resource.ResourceFinder; import net.minecraft.resource.ResourceManager; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/pond/package-info.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/package-info.java similarity index 55% rename from src/client/java/me/basiqueevangelist/limelight/impl/pond/package-info.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/package-info.java index 87cd84b..1dd1265 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/pond/package-info.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.pond; +package io.wispforest.limelight.impl.builtin.wiki; import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/BuiltinWikiSources.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/BuiltinWikiSources.java similarity index 69% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/BuiltinWikiSources.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/BuiltinWikiSources.java index be28bb4..97b268b 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/BuiltinWikiSources.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/BuiltinWikiSources.java @@ -1,9 +1,9 @@ -package me.basiqueevangelist.limelight.impl.builtin.wiki.source; +package io.wispforest.limelight.impl.builtin.wiki.source; import io.wispforest.endec.Endec; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSource; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSourceType; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.api.builtin.wiki.WikiSource; +import io.wispforest.limelight.api.builtin.wiki.WikiSourceType; +import io.wispforest.limelight.impl.Limelight; import net.minecraft.registry.Registry; public class BuiltinWikiSources { diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/MediaWikiSource.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/MediaWikiSource.java similarity index 86% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/MediaWikiSource.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/MediaWikiSource.java index 85c3866..4146cd6 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/MediaWikiSource.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/MediaWikiSource.java @@ -1,11 +1,11 @@ -package me.basiqueevangelist.limelight.impl.builtin.wiki.source; +package io.wispforest.limelight.impl.builtin.wiki.source; import com.google.gson.JsonArray; import com.google.gson.JsonParser; import io.wispforest.endec.Endec; import io.wispforest.endec.impl.StructEndecBuilder; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSource; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSourceType; +import io.wispforest.limelight.api.builtin.wiki.WikiSource; +import io.wispforest.limelight.api.builtin.wiki.WikiSourceType; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/MkDocsWikiSource.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/MkDocsWikiSource.java similarity index 88% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/MkDocsWikiSource.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/MkDocsWikiSource.java index 4a2ec26..365225f 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/MkDocsWikiSource.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/MkDocsWikiSource.java @@ -1,11 +1,11 @@ -package me.basiqueevangelist.limelight.impl.builtin.wiki.source; +package io.wispforest.limelight.impl.builtin.wiki.source; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import io.wispforest.endec.Endec; import io.wispforest.endec.impl.StructEndecBuilder; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSource; -import me.basiqueevangelist.limelight.api.builtin.wiki.WikiSourceType; +import io.wispforest.limelight.api.builtin.wiki.WikiSource; +import io.wispforest.limelight.api.builtin.wiki.WikiSourceType; import java.util.function.Consumer; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/package-info.java b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/package-info.java similarity index 52% rename from src/client/java/me/basiqueevangelist/limelight/impl/builtin/package-info.java rename to src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/package-info.java index 87b6928..31485a9 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/package-info.java +++ b/src/client/java/io/wispforest/limelight/impl/builtin/wiki/source/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.builtin; +package io.wispforest.limelight.impl.builtin.wiki.source; import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/config/ExtensionConfigButton.java b/src/client/java/io/wispforest/limelight/impl/config/ExtensionConfigButton.java similarity index 94% rename from src/client/java/me/basiqueevangelist/limelight/impl/config/ExtensionConfigButton.java rename to src/client/java/io/wispforest/limelight/impl/config/ExtensionConfigButton.java index 182d603..15e2e74 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/config/ExtensionConfigButton.java +++ b/src/client/java/io/wispforest/limelight/impl/config/ExtensionConfigButton.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.config; +package io.wispforest.limelight.impl.config; import io.wispforest.owo.config.ui.component.ConfigToggleButton; import io.wispforest.owo.util.Observable; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/config/LimelightConfigModel.java b/src/client/java/io/wispforest/limelight/impl/config/LimelightConfigModel.java similarity index 93% rename from src/client/java/me/basiqueevangelist/limelight/impl/config/LimelightConfigModel.java rename to src/client/java/io/wispforest/limelight/impl/config/LimelightConfigModel.java index a8d44f4..4b52ff2 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/config/LimelightConfigModel.java +++ b/src/client/java/io/wispforest/limelight/impl/config/LimelightConfigModel.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.config; +package io.wispforest.limelight.impl.config; import blue.endless.jankson.Comment; import io.wispforest.owo.config.annotation.Config; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/config/LimelightConfigScreen.java b/src/client/java/io/wispforest/limelight/impl/config/LimelightConfigScreen.java similarity index 95% rename from src/client/java/me/basiqueevangelist/limelight/impl/config/LimelightConfigScreen.java rename to src/client/java/io/wispforest/limelight/impl/config/LimelightConfigScreen.java index 159e2fd..4f11fb7 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/config/LimelightConfigScreen.java +++ b/src/client/java/io/wispforest/limelight/impl/config/LimelightConfigScreen.java @@ -1,6 +1,6 @@ // Basically stolen from https://github.com/wisp-forest/owo-whats-this/blob/master/src/main/java/io/wispforest/owowhatsthis/client/OwoWhatsThisConfigScreen.java#L37 -package me.basiqueevangelist.limelight.impl.config; +package io.wispforest.limelight.impl.config; import io.wispforest.owo.config.Option; import io.wispforest.owo.config.ui.ConfigScreen; @@ -15,8 +15,8 @@ import io.wispforest.owo.ui.core.Positioning; import io.wispforest.owo.ui.core.Sizing; import io.wispforest.owo.ui.core.VerticalAlignment; -import me.basiqueevangelist.limelight.api.extension.LimelightExtensions; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.api.extension.LimelightExtensions; +import io.wispforest.limelight.impl.Limelight; import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/package-info.java b/src/client/java/io/wispforest/limelight/impl/config/package-info.java similarity index 58% rename from src/client/java/me/basiqueevangelist/limelight/impl/package-info.java rename to src/client/java/io/wispforest/limelight/impl/config/package-info.java index 71cd9e4..f1bdbb6 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/package-info.java +++ b/src/client/java/io/wispforest/limelight/impl/config/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package me.basiqueevangelist.limelight.impl; +package io.wispforest.limelight.impl.config; import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ui/package-info.java b/src/client/java/io/wispforest/limelight/impl/package-info.java similarity index 57% rename from src/client/java/me/basiqueevangelist/limelight/impl/ui/package-info.java rename to src/client/java/io/wispforest/limelight/impl/package-info.java index ee8e1a4..183dd1b 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ui/package-info.java +++ b/src/client/java/io/wispforest/limelight/impl/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.ui; +package io.wispforest.limelight.impl; import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/pond/TextFieldWidgetAccess.java b/src/client/java/io/wispforest/limelight/impl/pond/TextFieldWidgetAccess.java similarity index 66% rename from src/client/java/me/basiqueevangelist/limelight/impl/pond/TextFieldWidgetAccess.java rename to src/client/java/io/wispforest/limelight/impl/pond/TextFieldWidgetAccess.java index 21eed10..1d4bd92 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/pond/TextFieldWidgetAccess.java +++ b/src/client/java/io/wispforest/limelight/impl/pond/TextFieldWidgetAccess.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.pond; +package io.wispforest.limelight.impl.pond; public interface TextFieldWidgetAccess { void limelight$setDrawShadow(boolean drawShadow); diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/util/package-info.java b/src/client/java/io/wispforest/limelight/impl/pond/package-info.java similarity index 56% rename from src/client/java/me/basiqueevangelist/limelight/impl/util/package-info.java rename to src/client/java/io/wispforest/limelight/impl/pond/package-info.java index 2d5dc37..e02d07d 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/util/package-info.java +++ b/src/client/java/io/wispforest/limelight/impl/pond/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.util; +package io.wispforest.limelight.impl.pond; import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/resource/CalculatorResourceLoader.java b/src/client/java/io/wispforest/limelight/impl/resource/CalculatorResourceLoader.java similarity index 96% rename from src/client/java/me/basiqueevangelist/limelight/impl/resource/CalculatorResourceLoader.java rename to src/client/java/io/wispforest/limelight/impl/resource/CalculatorResourceLoader.java index be4af61..bb975fb 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/resource/CalculatorResourceLoader.java +++ b/src/client/java/io/wispforest/limelight/impl/resource/CalculatorResourceLoader.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.resource; +package io.wispforest.limelight.impl.resource; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -6,7 +6,7 @@ import io.wispforest.endec.Endec; import io.wispforest.endec.format.gson.GsonDeserializer; import io.wispforest.endec.impl.StructEndecBuilder; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.impl.Limelight; import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener; import net.minecraft.resource.ResourceFinder; import net.minecraft.resource.ResourceManager; diff --git a/src/client/java/io/wispforest/limelight/impl/resource/package-info.java b/src/client/java/io/wispforest/limelight/impl/resource/package-info.java new file mode 100644 index 0000000..5a6f520 --- /dev/null +++ b/src/client/java/io/wispforest/limelight/impl/resource/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package io.wispforest.limelight.impl.resource; + +import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ui/LimelightScreen.java b/src/client/java/io/wispforest/limelight/impl/ui/LimelightScreen.java similarity index 91% rename from src/client/java/me/basiqueevangelist/limelight/impl/ui/LimelightScreen.java rename to src/client/java/io/wispforest/limelight/impl/ui/LimelightScreen.java index 4a8f78e..00bca93 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ui/LimelightScreen.java +++ b/src/client/java/io/wispforest/limelight/impl/ui/LimelightScreen.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.ui; +package io.wispforest.limelight.impl.ui; import io.wispforest.owo.ui.base.BaseOwoScreen; import io.wispforest.owo.ui.component.Components; @@ -7,11 +7,11 @@ import io.wispforest.owo.ui.container.FlowLayout; import io.wispforest.owo.ui.core.*; import io.wispforest.owo.util.Observable; -import me.basiqueevangelist.limelight.impl.Limelight; -import me.basiqueevangelist.limelight.impl.ResultGatherContextImpl; -import me.basiqueevangelist.limelight.impl.pond.TextFieldWidgetAccess; -import me.basiqueevangelist.limelight.api.util.CancellationTokenSource; -import me.basiqueevangelist.limelight.impl.util.ReactiveUtils; +import io.wispforest.limelight.impl.Limelight; +import io.wispforest.limelight.impl.ResultGatherContextImpl; +import io.wispforest.limelight.impl.pond.TextFieldWidgetAccess; +import io.wispforest.limelight.api.util.CancellationTokenSource; +import io.wispforest.limelight.impl.util.ReactiveUtils; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import org.jetbrains.annotations.NotNull; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ui/ResultEntryComponent.java b/src/client/java/io/wispforest/limelight/impl/ui/ResultEntryComponent.java similarity index 92% rename from src/client/java/me/basiqueevangelist/limelight/impl/ui/ResultEntryComponent.java rename to src/client/java/io/wispforest/limelight/impl/ui/ResultEntryComponent.java index 2cef5a0..ff4c2be 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ui/ResultEntryComponent.java +++ b/src/client/java/io/wispforest/limelight/impl/ui/ResultEntryComponent.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.ui; +package io.wispforest.limelight.impl.ui; import io.wispforest.owo.ui.component.Components; import io.wispforest.owo.ui.component.SmallCheckboxComponent; @@ -6,11 +6,11 @@ import io.wispforest.owo.ui.core.Insets; import io.wispforest.owo.ui.core.Sizing; import io.wispforest.owo.ui.core.Surface; -import me.basiqueevangelist.limelight.api.entry.SetSearchTextEntry; -import me.basiqueevangelist.limelight.api.entry.ToggleResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.InvokeResultEntry; -import me.basiqueevangelist.limelight.impl.Limelight; +import io.wispforest.limelight.api.entry.SetSearchTextEntry; +import io.wispforest.limelight.api.entry.ToggleResultEntry; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.InvokeResultEntry; +import io.wispforest.limelight.impl.Limelight; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; import net.minecraft.util.Formatting; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ui/ResultsContainerComponent.java b/src/client/java/io/wispforest/limelight/impl/ui/ResultsContainerComponent.java similarity index 87% rename from src/client/java/me/basiqueevangelist/limelight/impl/ui/ResultsContainerComponent.java rename to src/client/java/io/wispforest/limelight/impl/ui/ResultsContainerComponent.java index e3886f7..215531b 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ui/ResultsContainerComponent.java +++ b/src/client/java/io/wispforest/limelight/impl/ui/ResultsContainerComponent.java @@ -1,11 +1,11 @@ -package me.basiqueevangelist.limelight.impl.ui; +package io.wispforest.limelight.impl.ui; import io.wispforest.owo.ui.container.FlowLayout; import io.wispforest.owo.ui.core.Sizing; -import me.basiqueevangelist.limelight.api.entry.ResultEntry; -import me.basiqueevangelist.limelight.api.entry.ResultGatherContext; -import me.basiqueevangelist.limelight.impl.Limelight; -import me.basiqueevangelist.limelight.impl.ResultGatherer; +import io.wispforest.limelight.api.entry.ResultEntry; +import io.wispforest.limelight.api.entry.ResultGatherContext; +import io.wispforest.limelight.impl.Limelight; +import io.wispforest.limelight.impl.ResultGatherer; import net.minecraft.client.MinecraftClient; import java.util.ArrayList; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ui/SearchBoxComponent.java b/src/client/java/io/wispforest/limelight/impl/ui/SearchBoxComponent.java similarity index 94% rename from src/client/java/me/basiqueevangelist/limelight/impl/ui/SearchBoxComponent.java rename to src/client/java/io/wispforest/limelight/impl/ui/SearchBoxComponent.java index a0d1b96..905441d 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ui/SearchBoxComponent.java +++ b/src/client/java/io/wispforest/limelight/impl/ui/SearchBoxComponent.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.ui; +package io.wispforest.limelight.impl.ui; import io.wispforest.owo.ui.component.TextBoxComponent; import io.wispforest.owo.ui.core.Sizing; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/ui/SearchRootFlowLayout.java b/src/client/java/io/wispforest/limelight/impl/ui/SearchRootFlowLayout.java similarity index 95% rename from src/client/java/me/basiqueevangelist/limelight/impl/ui/SearchRootFlowLayout.java rename to src/client/java/io/wispforest/limelight/impl/ui/SearchRootFlowLayout.java index 233041f..dc13906 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/ui/SearchRootFlowLayout.java +++ b/src/client/java/io/wispforest/limelight/impl/ui/SearchRootFlowLayout.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.ui; +package io.wispforest.limelight.impl.ui; import io.wispforest.owo.ui.container.FlowLayout; import io.wispforest.owo.ui.core.Sizing; diff --git a/src/client/java/io/wispforest/limelight/impl/ui/package-info.java b/src/client/java/io/wispforest/limelight/impl/ui/package-info.java new file mode 100644 index 0000000..d094d9a --- /dev/null +++ b/src/client/java/io/wispforest/limelight/impl/ui/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package io.wispforest.limelight.impl.ui; + +import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/util/LeastRecentlyUsedList.java b/src/client/java/io/wispforest/limelight/impl/util/LeastRecentlyUsedList.java similarity index 95% rename from src/client/java/me/basiqueevangelist/limelight/impl/util/LeastRecentlyUsedList.java rename to src/client/java/io/wispforest/limelight/impl/util/LeastRecentlyUsedList.java index 1c0a075..a0f6ba6 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/util/LeastRecentlyUsedList.java +++ b/src/client/java/io/wispforest/limelight/impl/util/LeastRecentlyUsedList.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.util; +package io.wispforest.limelight.impl.util; import com.google.common.collect.ForwardingList; import org.jetbrains.annotations.NotNull; diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/util/ReactiveUtils.java b/src/client/java/io/wispforest/limelight/impl/util/ReactiveUtils.java similarity index 97% rename from src/client/java/me/basiqueevangelist/limelight/impl/util/ReactiveUtils.java rename to src/client/java/io/wispforest/limelight/impl/util/ReactiveUtils.java index d7ae608..d1f2011 100644 --- a/src/client/java/me/basiqueevangelist/limelight/impl/util/ReactiveUtils.java +++ b/src/client/java/io/wispforest/limelight/impl/util/ReactiveUtils.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.impl.util; +package io.wispforest.limelight.impl.util; import io.wispforest.owo.config.Option; import io.wispforest.owo.util.Observable; diff --git a/src/client/java/io/wispforest/limelight/impl/util/package-info.java b/src/client/java/io/wispforest/limelight/impl/util/package-info.java new file mode 100644 index 0000000..da9e718 --- /dev/null +++ b/src/client/java/io/wispforest/limelight/impl/util/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package io.wispforest.limelight.impl.util; + +import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/mixin/KeyBindingAccessor.java b/src/client/java/io/wispforest/limelight/mixin/KeyBindingAccessor.java similarity index 86% rename from src/client/java/me/basiqueevangelist/limelight/mixin/KeyBindingAccessor.java rename to src/client/java/io/wispforest/limelight/mixin/KeyBindingAccessor.java index bd4118e..3f1c557 100644 --- a/src/client/java/me/basiqueevangelist/limelight/mixin/KeyBindingAccessor.java +++ b/src/client/java/io/wispforest/limelight/mixin/KeyBindingAccessor.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.mixin; +package io.wispforest.limelight.mixin; import net.minecraft.client.option.KeyBinding; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/client/java/me/basiqueevangelist/limelight/mixin/SimpleOptionAccessor.java b/src/client/java/io/wispforest/limelight/mixin/SimpleOptionAccessor.java similarity index 85% rename from src/client/java/me/basiqueevangelist/limelight/mixin/SimpleOptionAccessor.java rename to src/client/java/io/wispforest/limelight/mixin/SimpleOptionAccessor.java index 2185a9a..5bf9603 100644 --- a/src/client/java/me/basiqueevangelist/limelight/mixin/SimpleOptionAccessor.java +++ b/src/client/java/io/wispforest/limelight/mixin/SimpleOptionAccessor.java @@ -1,4 +1,4 @@ -package me.basiqueevangelist.limelight.mixin; +package io.wispforest.limelight.mixin; import net.minecraft.client.option.SimpleOption; import net.minecraft.text.Text; diff --git a/src/client/java/me/basiqueevangelist/limelight/mixin/TextFieldWidgetMixin.java b/src/client/java/io/wispforest/limelight/mixin/TextFieldWidgetMixin.java similarity index 95% rename from src/client/java/me/basiqueevangelist/limelight/mixin/TextFieldWidgetMixin.java rename to src/client/java/io/wispforest/limelight/mixin/TextFieldWidgetMixin.java index 6e73701..d811e81 100644 --- a/src/client/java/me/basiqueevangelist/limelight/mixin/TextFieldWidgetMixin.java +++ b/src/client/java/io/wispforest/limelight/mixin/TextFieldWidgetMixin.java @@ -1,8 +1,8 @@ -package me.basiqueevangelist.limelight.mixin; +package io.wispforest.limelight.mixin; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import me.basiqueevangelist.limelight.impl.pond.TextFieldWidgetAccess; +import io.wispforest.limelight.impl.pond.TextFieldWidgetAccess; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.TextFieldWidget; diff --git a/src/client/java/io/wispforest/limelight/mixin/package-info.java b/src/client/java/io/wispforest/limelight/mixin/package-info.java new file mode 100644 index 0000000..eb51617 --- /dev/null +++ b/src/client/java/io/wispforest/limelight/mixin/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package io.wispforest.limelight.mixin; + +import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/package-info.java b/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/package-info.java deleted file mode 100644 index 3382fe7..0000000 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.builtin.wiki; - -import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/package-info.java b/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/package-info.java deleted file mode 100644 index 029693a..0000000 --- a/src/client/java/me/basiqueevangelist/limelight/impl/builtin/wiki/source/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.builtin.wiki.source; - -import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/config/package-info.java b/src/client/java/me/basiqueevangelist/limelight/impl/config/package-info.java deleted file mode 100644 index 7546364..0000000 --- a/src/client/java/me/basiqueevangelist/limelight/impl/config/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.config; - -import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/java/me/basiqueevangelist/limelight/impl/resource/package-info.java b/src/client/java/me/basiqueevangelist/limelight/impl/resource/package-info.java deleted file mode 100644 index 3be431b..0000000 --- a/src/client/java/me/basiqueevangelist/limelight/impl/resource/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ApiStatus.Internal -package me.basiqueevangelist.limelight.impl.resource; - -import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/src/client/resources/fabric.mod.json b/src/client/resources/fabric.mod.json index cabd5a4..e99f877 100644 --- a/src/client/resources/fabric.mod.json +++ b/src/client/resources/fabric.mod.json @@ -12,22 +12,31 @@ "enjarai" ], "contact": { - "sources": "https://github.com/BasiqueEvangelist/Limelight" + "sources": "https://github.com/wisp-forest/limelight", + "issues": "https://github.com/wisp-forest/limelight/issues" }, "license": "LGPL-3.0-only", "icon": "assets/limelight/icon.png", "environment": "client", "entrypoints": { "client": [ - "me.basiqueevangelist.limelight.impl.Limelight" + "io.wispforest.limelight.impl.Limelight" ], "limelight": [ - "me.basiqueevangelist.limelight.impl.builtin.BuiltinExtensions" + "io.wispforest.limelight.impl.builtin.BuiltinExtensions" ] }, "mixins": [ "limelight.mixins.json" ], + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "https://wispforest.io/discord", + "modmenu.modrinth": "https://modrinth.com/mod/limelight" + } + } + }, "accessWidener": "limelight.accesswidener", "depends": { "fabricloader": ">=0.15.11", diff --git a/src/client/resources/limelight.mixins.json b/src/client/resources/limelight.mixins.json index c88c4a9..96eb57f 100644 --- a/src/client/resources/limelight.mixins.json +++ b/src/client/resources/limelight.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "me.basiqueevangelist.limelight.mixin", + "package": "io.wispforest.limelight.mixin", "compatibilityLevel": "JAVA_21", "client": [ "KeyBindingAccessor",