package move

src/main/java/net/krlite/knowledges/KnowledgesClient.java

@@ -7,9 +7,9 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
-import net.krlite.knowledges.api.entrypoint.KnowledgesComponentProvider;
-import net.krlite.knowledges.api.entrypoint.KnowledgesDataProvider;
-import net.krlite.knowledges.component.AbstractInfoComponent;
+import net.krlite.knowledges.api.entrypoint.ComponentProvider;
+import net.krlite.knowledges.api.entrypoint.DataProvider;
+import net.krlite.knowledges.impl.component.AbstractInfoComponent;
 import net.krlite.knowledges.config.KnowledgesConfig;
 import net.krlite.knowledges.manager.KnowledgesComponentManager;
 import net.krlite.knowledges.manager.KnowledgesDataManager;
@@ -62,8 +62,8 @@ public void onInitializeClient() {
         AbstractInfoComponent.Animation.registerEvents();
 
         // Components
-        FabricLoader.getInstance().getEntrypointContainers(ID, KnowledgesComponentProvider.class).forEach(entrypoint -> {
-            KnowledgesComponentProvider provider = entrypoint.getEntrypoint();
+        FabricLoader.getInstance().getEntrypointContainers(ID, ComponentProvider.class).forEach(entrypoint -> {
+            ComponentProvider provider = entrypoint.getEntrypoint();
             var classes = provider.provide();
             if (classes.isEmpty()) return;
 
@@ -93,8 +93,8 @@ public void onInitializeClient() {
         });
 
         // Data
-        FabricLoader.getInstance().getEntrypointContainers(ID + "_data", KnowledgesDataProvider.class).forEach(entrypoint -> {
-            KnowledgesDataProvider provider = entrypoint.getEntrypoint();
+        FabricLoader.getInstance().getEntrypointContainers(ID + "_data", DataProvider.class).forEach(entrypoint -> {
+            DataProvider provider = entrypoint.getEntrypoint();
             var classes = provider.provide();
             if (classes.isEmpty()) return;
 

src/main/java/net/krlite/knowledges/core/util/Helper.java → src/main/java/net/krlite/knowledges/Shortcuts.java

@@ -1,7 +1,6 @@
-package net.krlite.knowledges.core.util;
+package net.krlite.knowledges;
 
 import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -12,7 +11,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-public class Helper {
+public class Shortcuts {
     public static class Map {
         public static <K, V> java.util.List<V> fastMerge(HashMap<K, java.util.List<V>> hashMap, K key, V value) {
             return hashMap.merge(

src/main/java/net/krlite/knowledges/core/animation/InterpolatedText.java → src/main/java/net/krlite/knowledges/animation/InterpolatedText.java

@@ -1,6 +1,5 @@
-package net.krlite.knowledges.core.animation;
+package net.krlite.knowledges.animation;
 
-import net.krlite.equator.math.algebra.Theory;
 import net.krlite.equator.visual.animation.interpolated.InterpolatedDouble;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.MutableText;

src/main/java/net/krlite/knowledges/api/Knowledge.java → src/main/java/net/krlite/knowledges/api/component/Knowledge.java

@@ -1,14 +1,14 @@
-package net.krlite.knowledges.api;
+package net.krlite.knowledges.api.component;
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.fabricmc.loader.api.metadata.ModMetadata;
 import net.krlite.equator.math.geometry.flat.Box;
 import net.krlite.equator.math.geometry.flat.Vector;
 import net.krlite.knowledges.KnowledgesClient;
-import net.krlite.knowledges.core.config.WithIndependentConfigPage;
-import net.krlite.knowledges.core.localization.Localizable;
-import net.krlite.knowledges.core.path.WithPath;
+import net.krlite.knowledges.api.core.config.WithIndependentConfigPage;
+import net.krlite.knowledges.api.core.localization.Localizable;
+import net.krlite.knowledges.api.core.path.WithPath;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.enums.Instrument;

src/main/java/net/krlite/knowledges/core/config/WithIndependentConfigPage.java → src/main/java/net/krlite/knowledges/api/core/config/WithIndependentConfigPage.java

@@ -1,4 +1,4 @@
-package net.krlite.knowledges.core.config;
+package net.krlite.knowledges.api.core.config;
 
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import me.shedaniel.clothconfig2.impl.builders.AbstractFieldBuilder;

src/main/java/net/krlite/knowledges/core/localization/EnumLocalizable.java → src/main/java/net/krlite/knowledges/api/core/localization/EnumLocalizable.java

@@ -1,4 +1,4 @@
-package net.krlite.knowledges.core.localization;
+package net.krlite.knowledges.api.core.localization;
 
 import net.minecraft.text.MutableText;
 

src/main/java/net/krlite/knowledges/core/localization/Localizable.java → src/main/java/net/krlite/knowledges/api/core/localization/Localizable.java

@@ -1,4 +1,4 @@
-package net.krlite.knowledges.core.localization;
+package net.krlite.knowledges.api.core.localization;
 
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;

src/main/java/net/krlite/knowledges/core/path/WithPartialPath.java → src/main/java/net/krlite/knowledges/api/core/path/WithPartialPath.java

@@ -1,4 +1,4 @@
-package net.krlite.knowledges.core.path;
+package net.krlite.knowledges.api.core.path;
 
 import org.jetbrains.annotations.NotNull;
 

src/main/java/net/krlite/knowledges/core/path/WithPath.java → src/main/java/net/krlite/knowledges/api/core/path/WithPath.java

@@ -1,4 +1,4 @@
-package net.krlite.knowledges.core.path;
+package net.krlite.knowledges.api.core.path;
 
 import org.jetbrains.annotations.NotNull;
 

src/main/java/net/krlite/knowledges/api/Data.java → src/main/java/net/krlite/knowledges/api/data/Data.java

@@ -1,10 +1,10 @@
-package net.krlite.knowledges.api;
+package net.krlite.knowledges.api.data;
 
 import net.krlite.knowledges.KnowledgesClient;
-import net.krlite.knowledges.core.config.WithIndependentConfigPage;
-import net.krlite.knowledges.core.data.DataProtocol;
-import net.krlite.knowledges.core.localization.Localizable;
-import net.krlite.knowledges.core.path.WithPath;
+import net.krlite.knowledges.api.component.Knowledge;
+import net.krlite.knowledges.api.core.config.WithIndependentConfigPage;
+import net.krlite.knowledges.api.core.localization.Localizable;
+import net.krlite.knowledges.api.core.path.WithPath;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/net/krlite/knowledges/core/data/DataInvoker.java → src/main/java/net/krlite/knowledges/api/data/DataInvoker.java

@@ -1,7 +1,7 @@
-package net.krlite.knowledges.core.data;
+package net.krlite.knowledges.api.data;
 
 import net.krlite.knowledges.KnowledgesClient;
-import net.krlite.knowledges.api.Knowledge;
+import net.krlite.knowledges.api.component.Knowledge;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;

src/main/java/net/krlite/knowledges/core/data/DataProtocol.java → src/main/java/net/krlite/knowledges/api/data/DataProtocol.java

@@ -1,6 +1,6 @@
-package net.krlite.knowledges.core.data;
+package net.krlite.knowledges.api.data;
 
-import net.krlite.knowledges.api.Knowledge;
+import net.krlite.knowledges.api.component.Knowledge;
 
 public interface DataProtocol<K extends Knowledge> {
     DataInvoker<K, ?> dataInvoker();

src/main/java/net/krlite/knowledges/api/entrypoint/ComponentProvider.java

@@ -0,0 +1,6 @@
+package net.krlite.knowledges.api.entrypoint;
+
+import net.krlite.knowledges.api.component.Knowledge;
+
+public interface ComponentProvider extends Provider<Knowledge> {
+}

src/main/java/net/krlite/knowledges/api/entrypoint/DataProvider.java

@@ -0,0 +1,6 @@
+package net.krlite.knowledges.api.entrypoint;
+
+import net.krlite.knowledges.api.data.Data;
+
+public interface DataProvider extends Provider<Data<?>> {
+}

src/main/java/net/krlite/knowledges/api/entrypoint/KnowledgesProvider.java → src/main/java/net/krlite/knowledges/api/entrypoint/Provider.java

@@ -4,6 +4,6 @@
 
 import java.util.List;
 
-public interface KnowledgesProvider<E> {
+public interface Provider<E> {
     @NotNull List<Class<? extends E>> provide();
 }

src/main/java/net/krlite/knowledges/api/proxy/KnowledgeProxy.java

@@ -0,0 +1,4 @@
+package net.krlite.knowledges.api.proxy;
+
+public class KnowledgeProxy {
+}

src/main/java/net/krlite/knowledges/core/proxy/RenderProxy.java → src/main/java/net/krlite/knowledges/api/proxy/RenderProxy.java

@@ -1,4 +1,4 @@
-package net.krlite.knowledges.core.proxy;
+package net.krlite.knowledges.api.proxy;
 
 import net.krlite.equator.math.geometry.flat.Box;
 import net.krlite.equator.math.geometry.flat.Vector;

src/main/java/net/krlite/knowledges/api/representable/BlockRepresentable.java

@@ -0,0 +1,53 @@
+package net.krlite.knowledges.api.representable;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+
+public interface BlockRepresentable extends Representable<BlockHitResult> {
+    Block block();
+
+    BlockState blockState();
+
+    BlockEntity blockEntity();
+
+    BlockPos blockPos();
+
+    Direction direction();
+
+    @Override
+    default Class<? extends Representable<BlockHitResult>> type() {
+        return BlockRepresentable.class;
+    }
+
+    interface Builder extends Representable.Builder<BlockHitResult, BlockRepresentable> {
+        Builder block(Block block);
+
+        Builder blockState(BlockState blockState);
+
+        Builder blockEntity(BlockEntity blockEntity);
+
+        Builder blockPos(BlockPos blockPos);
+
+        Builder direction(Direction direction);
+
+        @Override
+        Builder create();
+
+        @Override
+        BlockRepresentable build();
+
+        @Override
+        default Builder from(BlockRepresentable representable) {
+            return ((Builder) Representable.Builder.super.from(representable))
+                    .block(representable.block())
+                    .blockState(representable.blockState())
+                    .blockEntity(representable.blockEntity())
+                    .blockPos(representable.blockPos())
+                    .direction(representable.direction());
+        }
+    }
+}

src/main/java/net/krlite/knowledges/api/representable/EntityRepresentable.java

@@ -0,0 +1,29 @@
+package net.krlite.knowledges.api.representable;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.hit.EntityHitResult;
+
+public interface EntityRepresentable extends Representable<EntityHitResult> {
+    Entity entity();
+
+    @Override
+    default Class<? extends Representable<EntityHitResult>> type() {
+        return EntityRepresentable.class;
+    }
+
+    interface Builder extends Representable.Builder<EntityHitResult, EntityRepresentable> {
+        Builder entity(Entity entity);
+
+        @Override
+        Builder create();
+
+        @Override
+        EntityRepresentable build();
+
+        @Override
+        default Builder from(EntityRepresentable representable) {
+            return ((Builder) Representable.Builder.super.from(representable))
+                    .entity(representable.entity());
+        }
+    }
+}

src/main/java/net/krlite/knowledges/api/representable/Representable.java

@@ -0,0 +1,48 @@
+package net.krlite.knowledges.api.representable;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.world.World;
+
+public interface Representable<H extends HitResult> {
+    H hitResult();
+
+    World world();
+
+    PlayerEntity player();
+
+    NbtCompound data();
+
+    /**
+     * @return {@code true} if the server has <b>Knowledges</b> installed.
+     */
+    boolean hasServer();
+
+    Class<? extends Representable<H>> type();
+
+    interface Builder<H extends HitResult, R extends Representable<H>> {
+        Builder<H, R> hitResult(H hitResult);
+
+        Builder<H, R> world(World world);
+
+        Builder<H, R> player(PlayerEntity player);
+
+        Builder<H, R> data(NbtCompound data);
+
+        Builder<H, R> hasServer(boolean connected);
+
+        Builder<H, R> create();
+
+        Representable<H> build();
+
+        default Builder<H, R> from(R representable) {
+            return create()
+                    .hitResult(representable.hitResult())
+                    .world(representable.world())
+                    .player(representable.player())
+                    .data(representable.data())
+                    .hasServer(representable.hasServer());
+        }
+    }
+}

src/main/java/net/krlite/knowledges/config/KnowledgesConfig.java

@@ -4,8 +4,8 @@
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import me.shedaniel.autoconfig.serializer.PartitioningSerializer;
-import net.krlite.knowledges.component.CrosshairComponent;
-import net.krlite.knowledges.data.info.block.blockinformation.NoteBlockInformationData;
+import net.krlite.knowledges.impl.component.CrosshairComponent;
+import net.krlite.knowledges.impl.data.info.block.blockinformation.NoteBlockInformationData;
 
 import java.util.ArrayList;
 

src/main/java/net/krlite/knowledges/config/modmenu/KnowledgesConfigScreen.java

@@ -8,14 +8,14 @@
 import me.shedaniel.clothconfig2.impl.builders.AbstractFieldBuilder;
 import me.shedaniel.clothconfig2.impl.builders.BooleanToggleBuilder;
 import net.krlite.knowledges.KnowledgesClient;
-import net.krlite.knowledges.api.Data;
-import net.krlite.knowledges.api.Knowledge;
+import net.krlite.knowledges.api.data.Data;
+import net.krlite.knowledges.api.component.Knowledge;
 import net.krlite.knowledges.config.modmenu.impl.KnowledgesConfigBuilder;
-import net.krlite.knowledges.core.config.WithIndependentConfigPage;
-import net.krlite.knowledges.core.localization.Localizable;
-import net.krlite.knowledges.core.path.WithPath;
-import net.krlite.knowledges.core.util.Helper;
-import net.krlite.knowledges.manager.AbstractManager;
+import net.krlite.knowledges.api.core.config.WithIndependentConfigPage;
+import net.krlite.knowledges.api.core.localization.Localizable;
+import net.krlite.knowledges.api.core.path.WithPath;
+import net.krlite.knowledges.Shortcuts;
+import net.krlite.knowledges.manager.KnowledgesManager;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -72,7 +72,7 @@ public List<BooleanListEntry> entries(Object object) {
 
         public void register(Object object, BooleanListEntry entry) {
             ENTRY_INDEXED.put(entry, object);
-            Helper.Map.fastMerge(OBJECT_INDEXED, object, entry);
+            Shortcuts.Map.fastMerge(OBJECT_INDEXED, object, entry);
         }
     }
 
@@ -176,8 +176,8 @@ private BooleanToggleBuilder dataEntry(Data<?> data, boolean allowsTooltip) {
                                 (allowsTooltip && data.providesTooltip()) ? data.tooltip() : Text.empty(),
                                 Text.translatable(
                                         localizationKey("data", "footnote"),
-                                        Helper.Text.withFormatting(knowledge.name(), Formatting.GRAY),
-                                        Helper.Text.withFormatting(data.dataInvoker().name(), Formatting.GRAY)
+                                        Shortcuts.Text.withFormatting(knowledge.name(), Formatting.GRAY),
+                                        Shortcuts.Text.withFormatting(data.dataInvoker().name(), Formatting.GRAY)
                                 )
                         }))
                 .setSaveConsumer(value -> KnowledgesClient.DATA.setEnabled(data, value))
@@ -223,7 +223,7 @@ private void initDataEntries() {
                     entries.add(
                             entryBuilder.startTextDescription(Text.translatable(
                                             localizationKey("data", "classifier"),
-                                            Helper.Text.withFormatting(component.name(), Formatting.GRAY)
+                                            Shortcuts.Text.withFormatting(component.name(), Formatting.GRAY)
                                     ))
                                     .setTooltipSupplier(() -> !component.providesTooltip() ? Optional.empty() : Optional.of(
                                             new Text[]{component.tooltip()}
@@ -249,7 +249,7 @@ private void initDataEntries() {
     }
 
     private <T extends WithPath & WithIndependentConfigPage & Localizable.WithName> void initIndependentConfigPages(
-            AbstractManager<T> manager,
+            KnowledgesManager<T> manager,
             Function<T, BooleanToggleBuilder> builder,
             BooleanListEntrySyncHelper helper,
             String path