Skip to content

Commit

Permalink
we do a little repackaging
Browse files Browse the repository at this point in the history
  • Loading branch information
BasiqueEvangelist committed Aug 28, 2024
1 parent 6d4bace commit 52f7b20
Show file tree
Hide file tree
Showing 66 changed files with 194 additions and 186 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.basiqueevangelist.limelight.api.builtin.bangs;
package io.wispforest.limelight.api.builtin.bangs;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
* API for interfacing with Limelight's built-in extensions.
*/
package me.basiqueevangelist.limelight.api.builtin;
package io.wispforest.limelight.api.builtin;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.basiqueevangelist.limelight.api.builtin.wiki;
package io.wispforest.limelight.api.builtin.wiki;

import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.basiqueevangelist.limelight.api.entry;
package io.wispforest.limelight.api.entry;

import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.basiqueevangelist.limelight.api.entry;
package io.wispforest.limelight.api.entry;

import org.jetbrains.annotations.ApiStatus;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.basiqueevangelist.limelight.api.util;
package io.wispforest.limelight.api.util;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.basiqueevangelist.limelight.api.util;
package io.wispforest.limelight.api.util;

public interface InfallibleCloseable extends AutoCloseable {
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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.<java.util.Map<net.minecraft.util.Identifier,java.lang.Boolean>>optionForKey(me.basiqueevangelist.limelight.impl.Limelight.CONFIG.keys.enabledExtensions)), e -> {
java.util.List<me.basiqueevangelist.limelight.api.extension.LimelightExtension> enabled = new java.util.ArrayList<>(EXTENSIONS);
ENABLED_EXTENSIONS = ReactiveUtils.map(ReactiveUtils.from(Limelight.CONFIG.<java.util.Map<net.minecraft.util.Identifier,java.lang.Boolean>>optionForKey(Limelight.CONFIG.keys.enabledExtensions)), e -> {
java.util.List<LimelightExtension> enabled = new java.util.ArrayList<>(EXTENSIONS);
enabled.removeIf(x -> !e.getOrDefault(x.id(), true));
return enabled;
});
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@ApiStatus.Internal
package me.basiqueevangelist.limelight.mixin;
package io.wispforest.limelight.impl.builtin;

import org.jetbrains.annotations.ApiStatus;
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit 52f7b20

Please sign in to comment.