From a7256a4ba05df744aae0d145845bbdd2fd2ea94d Mon Sep 17 00:00:00 2001 From: zenfyr Date: Sat, 27 Jun 2026 01:53:33 +0700 Subject: [PATCH] refactor: split api/impl refactor: add missing package infos particles: post-merge fixes particles: post-merge fixes --- .../{ => api}/client/events/AfterFirstReload.java | 2 +- .../{ => api}/client/fakelevel/BrightLightTexture.java | 2 +- .../pulsar/{ => api}/client/fakelevel/FakeLevel.java | 6 +++--- .../client/particles/AbstractScreenParticle.java | 2 +- .../{ => api}/client/particles/ItemStackParticle.java | 4 ++-- .../client/particles/ScreenParticleHelper.java | 10 +++++----- .../dev/zenfyr/pulsar/{ => api}/codec/ExtraCodecs.java | 4 ++-- .../pulsar/{ => api}/codec/JsonCodecDataLoader.java | 2 +- .../zenfyr/pulsar/{ => api}/codec/SafeEitherCodec.java | 2 +- .../pulsar/{ => api}/codec/SafeEitherMapCodec.java | 2 +- .../pulsar/{ => api}/codec/SafeOptionalCodec.java | 2 +- .../{ => api}/creativetab/CreativeModeTabAnimaton.java | 4 ++-- .../{ => api}/creativetab/CreativeModeTabBuilder.java | 3 ++- .../pulsar/{ => api}/creativetab/PulsarEntries.java | 4 ++-- .../pulsar/{ => api}/itemstack/ItemStackUtil.java | 4 ++-- .../dev/zenfyr/pulsar/{ => api}/loot/LootCodecs.java | 2 +- .../pulsar/{ => api}/loot/LootContextBuilder.java | 2 +- .../dev/zenfyr/pulsar/{ => api}/mixin/AsmUtil.java | 4 ++-- .../zenfyr/pulsar/{ => api}/mixin/VirtualMixins.java | 8 ++++---- .../pulsar/{ => api}/nbt/CompoundTagBuilder.java | 3 ++- .../java/dev/zenfyr/pulsar/{ => api}/nbt/NbtUtil.java | 2 +- .../zenfyr/pulsar/{ => api}/reflection/Reflect.java | 2 +- .../reflection/wrappers/GenericConstructor.java | 6 +++--- .../{ => api}/reflection/wrappers/GenericField.java | 6 +++--- .../{ => api}/reflection/wrappers/GenericMethod.java | 6 +++--- .../zenfyr/pulsar/{ => api}/registry/RegistryUtil.java | 4 ++-- .../{ => api}/resources/DataPackContentsAccessor.java | 2 +- .../pulsar/{ => api}/resources/ReloaderType.java | 2 +- .../{ => api}/resources/ServerReloadersEvent.java | 2 +- .../dev/zenfyr/pulsar/{ => api}/util/ColorUtil.java | 2 +- .../zenfyr/pulsar/{ => api}/util/ExceptionUtil.java | 10 +++++----- .../dev/zenfyr/pulsar/{ => api}/util/MakeSure.java | 2 +- .../dev/zenfyr/pulsar/{ => api}/util/MathUtil.java | 2 +- .../dev/zenfyr/pulsar/{ => api}/util/PlayerUtil.java | 2 +- .../java/dev/zenfyr/pulsar/{ => api}/util/Result.java | 2 +- .../dev/zenfyr/pulsar/{ => api}/util/SupportUtil.java | 4 ++-- .../dev/zenfyr/pulsar/{ => api}/util/TextUtil.java | 2 +- .../dev/zenfyr/pulsar/{ => api}/util/Utilities.java | 2 +- .../pulsar/{ => api}/util/functions/Memoize.java | 2 +- .../{ => api}/util/functions/ThrowingConsumer.java | 2 +- .../{ => api}/util/functions/ThrowingFunction.java | 2 +- .../{ => api}/util/functions/ThrowingRunnable.java | 2 +- .../{ => api}/util/functions/ThrowingSupplier.java | 2 +- .../pulsar/{ => api}/util/functions/TriConsumer.java | 2 +- .../pulsar/{ => api}/util/functions/TriFunction.java | 2 +- .../pulsar/{ => api}/util/functions/TriPredicate.java | 2 +- .../pulsar/{ => api}/util/tuple/ImmutableTuple.java | 2 +- .../pulsar/{ => api}/util/tuple/MutableTuple.java | 2 +- .../dev/zenfyr/pulsar/{ => api}/util/tuple/Tuple.java | 2 +- src/main/java/dev/zenfyr/pulsar/{ => impl}/Pulsar.java | 2 +- .../dev/zenfyr/pulsar/{util => impl}/PulsarLog.java | 2 +- .../zenfyr/pulsar/{ => impl}/client/PulsarClient.java | 8 ++++---- .../{ => impl}/client/fakelevel/FakeLevelImpl.java | 4 ++-- .../impl => impl/client/fakelevel}/package-info.java | 2 +- .../{resources/impl => impl/client}/package-info.java | 2 +- .../client/particles}/GuiParticleRenderState.java | 2 +- .../client/particles}/GuiParticleRenderer.java | 2 +- .../client/particles}/VanillaParticle.java | 6 +++--- .../client/particles}/VanillaParticleManager.java | 6 +++--- .../pulsar/impl/client/particles/package-info.java | 4 ++++ .../creativetab/CreativeModeTabBuilderImpl.java | 6 ++++-- .../creativetab}/CreativeModeTabExtensions.java | 4 ++-- .../{ => impl}/creativetab/PulsarEntriesImpl.java | 5 +++-- .../impl => impl/creativetab}/package-info.java | 2 +- .../client/events/MinecraftMixin.java | 4 ++-- .../itemgroup/CreativeModeInventoryScreenMixin.java | 4 ++-- .../client/itemgroup/CreativeModeTabMixin.java | 6 +++--- .../client/particles/GameRendererMixin.java | 10 +++++----- .../client/particles/GuiRendererMixin.java | 6 +++--- .../client/particles/MinecraftMixin.java | 4 ++-- .../client/particles/ParticleEngineAccessor.java | 2 +- .../client/particles/ParticleEngineMixin.java | 4 ++-- .../client/particles/ParticleFeatureRendererMixin.java | 6 +++--- .../resources/MinecraftServerMixin.java | 6 +++--- .../resources/ReloadableServerResourcesMixin.java | 6 +++--- .../resources/ResourceManagerHelperImplMixin.java | 8 ++++---- .../pulsar/{ => impl}/nbt/CompoundTagBuilderImpl.java | 5 +++-- .../java/dev/zenfyr/pulsar/impl/nbt/package-info.java | 4 ++++ src/main/java/dev/zenfyr/pulsar/impl/package-info.java | 4 ++++ .../impl => impl/resources}/ContextImpl.java | 6 +++--- .../resources}/InternalContentsAccessor.java | 4 ++-- .../impl => impl/resources}/InternalContext.java | 2 +- .../dev/zenfyr/pulsar/impl/resources/package-info.java | 4 ++++ src/main/resources/fabric.mod.json | 6 +++--- src/main/resources/pulsar.mixins.json | 2 +- .../dev/zenfyr/pulsar/test/util/ColorUtilTest.java | 2 +- .../java/dev/zenfyr/pulsar/test/util/MakeSureTest.java | 2 +- .../java/dev/zenfyr/pulsar/test/util/MathUtilTest.java | 2 +- .../java/dev/zenfyr/pulsar/test/util/MemoizeTest.java | 2 +- .../dev/zenfyr/pulsar/test/util/UtilitiesTest.java | 2 +- .../gametest/client/CreativeTabAnimationTest.java | 2 +- .../gametest/client/ScreenParticleHelperTest.java | 6 +++--- .../pulsar/gametest/common/CreativeTabBuilderTest.java | 4 ++-- .../pulsar/gametest/common/RegistryUtilTest.java | 2 +- .../gametest/common/ServerReloadersEventTest.java | 6 +++--- .../pulsar/gametest/common/VirtualMixinsTest.java | 2 +- .../pulsar/gametest/server/ItemStackUtilTest.java | 2 +- .../gametest/util/client/PulsarTestmodClient.java | 2 +- 98 files changed, 186 insertions(+), 164 deletions(-) rename src/main/java/dev/zenfyr/pulsar/{ => api}/client/events/AfterFirstReload.java (92%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/client/fakelevel/BrightLightTexture.java (92%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/client/fakelevel/FakeLevel.java (90%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/client/particles/AbstractScreenParticle.java (97%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/client/particles/ItemStackParticle.java (93%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/client/particles/ScreenParticleHelper.java (96%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/codec/ExtraCodecs.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/codec/JsonCodecDataLoader.java (97%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/codec/SafeEitherCodec.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/codec/SafeEitherMapCodec.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/codec/SafeOptionalCodec.java (97%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/creativetab/CreativeModeTabAnimaton.java (91%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/creativetab/CreativeModeTabBuilder.java (92%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/creativetab/PulsarEntries.java (94%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/itemstack/ItemStackUtil.java (97%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/loot/LootCodecs.java (97%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/loot/LootContextBuilder.java (99%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/mixin/AsmUtil.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/mixin/VirtualMixins.java (93%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/nbt/CompoundTagBuilder.java (96%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/nbt/NbtUtil.java (99%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/reflection/Reflect.java (99%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/reflection/wrappers/GenericConstructor.java (85%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/reflection/wrappers/GenericField.java (86%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/reflection/wrappers/GenericMethod.java (86%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/registry/RegistryUtil.java (96%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/resources/DataPackContentsAccessor.java (89%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/resources/ReloaderType.java (96%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/resources/ServerReloadersEvent.java (97%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/ColorUtil.java (99%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/ExceptionUtil.java (95%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/MakeSure.java (99%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/MathUtil.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/PlayerUtil.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/Result.java (99%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/SupportUtil.java (96%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/TextUtil.java (96%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/Utilities.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/Memoize.java (98%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/ThrowingConsumer.java (84%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/ThrowingFunction.java (92%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/ThrowingRunnable.java (69%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/ThrowingSupplier.java (69%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/TriConsumer.java (85%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/TriFunction.java (85%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/functions/TriPredicate.java (91%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/tuple/ImmutableTuple.java (94%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/tuple/MutableTuple.java (96%) rename src/main/java/dev/zenfyr/pulsar/{ => api}/util/tuple/Tuple.java (97%) rename src/main/java/dev/zenfyr/pulsar/{ => impl}/Pulsar.java (81%) rename src/main/java/dev/zenfyr/pulsar/{util => impl}/PulsarLog.java (88%) rename src/main/java/dev/zenfyr/pulsar/{ => impl}/client/PulsarClient.java (52%) rename src/main/java/dev/zenfyr/pulsar/{ => impl}/client/fakelevel/FakeLevelImpl.java (96%) rename src/main/java/dev/zenfyr/pulsar/{client/particles/impl => impl/client/fakelevel}/package-info.java (57%) rename src/main/java/dev/zenfyr/pulsar/{resources/impl => impl/client}/package-info.java (60%) rename src/main/java/dev/zenfyr/pulsar/{client/particles/impl => impl/client/particles}/GuiParticleRenderState.java (95%) rename src/main/java/dev/zenfyr/pulsar/{client/particles/impl => impl/client/particles}/GuiParticleRenderer.java (97%) rename src/main/java/dev/zenfyr/pulsar/{client/particles/impl => impl/client/particles}/VanillaParticle.java (89%) rename src/main/java/dev/zenfyr/pulsar/{client/particles/impl => impl/client/particles}/VanillaParticleManager.java (95%) create mode 100644 src/main/java/dev/zenfyr/pulsar/impl/client/particles/package-info.java rename src/main/java/dev/zenfyr/pulsar/{ => impl}/creativetab/CreativeModeTabBuilderImpl.java (90%) rename src/main/java/dev/zenfyr/pulsar/{creativetab/impl => impl/creativetab}/CreativeModeTabExtensions.java (81%) rename src/main/java/dev/zenfyr/pulsar/{ => impl}/creativetab/PulsarEntriesImpl.java (90%) rename src/main/java/dev/zenfyr/pulsar/{creativetab/impl => impl/creativetab}/package-info.java (59%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/events/MinecraftMixin.java (87%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/itemgroup/CreativeModeInventoryScreenMixin.java (93%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/itemgroup/CreativeModeTabMixin.java (76%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/particles/GameRendererMixin.java (83%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/particles/GuiRendererMixin.java (88%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/particles/MinecraftMixin.java (89%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/particles/ParticleEngineAccessor.java (94%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/particles/ParticleEngineMixin.java (86%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/client/particles/ParticleFeatureRendererMixin.java (87%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/resources/MinecraftServerMixin.java (77%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/resources/ReloadableServerResourcesMixin.java (89%) rename src/main/java/dev/zenfyr/pulsar/impl/{mixin => mixins}/resources/ResourceManagerHelperImplMixin.java (91%) rename src/main/java/dev/zenfyr/pulsar/{ => impl}/nbt/CompoundTagBuilderImpl.java (94%) create mode 100644 src/main/java/dev/zenfyr/pulsar/impl/nbt/package-info.java create mode 100644 src/main/java/dev/zenfyr/pulsar/impl/package-info.java rename src/main/java/dev/zenfyr/pulsar/{resources/impl => impl/resources}/ContextImpl.java (87%) rename src/main/java/dev/zenfyr/pulsar/{resources/impl => impl/resources}/InternalContentsAccessor.java (73%) rename src/main/java/dev/zenfyr/pulsar/{resources/impl => impl/resources}/InternalContext.java (89%) create mode 100644 src/main/java/dev/zenfyr/pulsar/impl/resources/package-info.java diff --git a/src/main/java/dev/zenfyr/pulsar/client/events/AfterFirstReload.java b/src/main/java/dev/zenfyr/pulsar/api/client/events/AfterFirstReload.java similarity index 92% rename from src/main/java/dev/zenfyr/pulsar/client/events/AfterFirstReload.java rename to src/main/java/dev/zenfyr/pulsar/api/client/events/AfterFirstReload.java index dce3eb0..93abbe7 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/events/AfterFirstReload.java +++ b/src/main/java/dev/zenfyr/pulsar/api/client/events/AfterFirstReload.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.client.events; +package dev.zenfyr.pulsar.api.client.events; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/dev/zenfyr/pulsar/client/fakelevel/BrightLightTexture.java b/src/main/java/dev/zenfyr/pulsar/api/client/fakelevel/BrightLightTexture.java similarity index 92% rename from src/main/java/dev/zenfyr/pulsar/client/fakelevel/BrightLightTexture.java rename to src/main/java/dev/zenfyr/pulsar/api/client/fakelevel/BrightLightTexture.java index 4492a08..c86cbf2 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/fakelevel/BrightLightTexture.java +++ b/src/main/java/dev/zenfyr/pulsar/api/client/fakelevel/BrightLightTexture.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.client.fakelevel; +package dev.zenfyr.pulsar.api.client.fakelevel; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; diff --git a/src/main/java/dev/zenfyr/pulsar/client/fakelevel/FakeLevel.java b/src/main/java/dev/zenfyr/pulsar/api/client/fakelevel/FakeLevel.java similarity index 90% rename from src/main/java/dev/zenfyr/pulsar/client/fakelevel/FakeLevel.java rename to src/main/java/dev/zenfyr/pulsar/api/client/fakelevel/FakeLevel.java index 67f2f20..99b2a08 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/fakelevel/FakeLevel.java +++ b/src/main/java/dev/zenfyr/pulsar/api/client/fakelevel/FakeLevel.java @@ -1,11 +1,11 @@ -package dev.zenfyr.pulsar.client.fakelevel; +package dev.zenfyr.pulsar.api.client.fakelevel; import com.google.common.base.Suppliers; -import dev.zenfyr.pulsar.client.events.AfterFirstReload; +import dev.zenfyr.pulsar.api.client.events.AfterFirstReload; +import dev.zenfyr.pulsar.impl.client.fakelevel.FakeLevelImpl; import java.util.function.Supplier; import lombok.experimental.UtilityClass; import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.core.*; import org.jetbrains.annotations.ApiStatus; import sun.misc.Unsafe; diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/AbstractScreenParticle.java b/src/main/java/dev/zenfyr/pulsar/api/client/particles/AbstractScreenParticle.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/client/particles/AbstractScreenParticle.java rename to src/main/java/dev/zenfyr/pulsar/api/client/particles/AbstractScreenParticle.java index d24b118..efb953d 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/AbstractScreenParticle.java +++ b/src/main/java/dev/zenfyr/pulsar/api/client/particles/AbstractScreenParticle.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.client.particles; +package dev.zenfyr.pulsar.api.client.particles; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/ItemStackParticle.java b/src/main/java/dev/zenfyr/pulsar/api/client/particles/ItemStackParticle.java similarity index 93% rename from src/main/java/dev/zenfyr/pulsar/client/particles/ItemStackParticle.java rename to src/main/java/dev/zenfyr/pulsar/api/client/particles/ItemStackParticle.java index 43161fb..f08451a 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/ItemStackParticle.java +++ b/src/main/java/dev/zenfyr/pulsar/api/client/particles/ItemStackParticle.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.client.particles; +package dev.zenfyr.pulsar.api.client.particles; -import dev.zenfyr.pulsar.util.MathUtil; +import dev.zenfyr.pulsar.api.util.MathUtil; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/ScreenParticleHelper.java b/src/main/java/dev/zenfyr/pulsar/api/client/particles/ScreenParticleHelper.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/client/particles/ScreenParticleHelper.java rename to src/main/java/dev/zenfyr/pulsar/api/client/particles/ScreenParticleHelper.java index f44a539..af8967a 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/ScreenParticleHelper.java +++ b/src/main/java/dev/zenfyr/pulsar/api/client/particles/ScreenParticleHelper.java @@ -1,9 +1,9 @@ -package dev.zenfyr.pulsar.client.particles; +package dev.zenfyr.pulsar.api.client.particles; -import dev.zenfyr.pulsar.client.particles.impl.GuiParticleRenderState; -import dev.zenfyr.pulsar.client.particles.impl.VanillaParticle; -import dev.zenfyr.pulsar.client.particles.impl.VanillaParticleManager; -import dev.zenfyr.pulsar.util.MakeSure; +import dev.zenfyr.pulsar.api.util.MakeSure; +import dev.zenfyr.pulsar.impl.client.particles.GuiParticleRenderState; +import dev.zenfyr.pulsar.impl.client.particles.VanillaParticle; +import dev.zenfyr.pulsar.impl.client.particles.VanillaParticleManager; import java.util.*; import java.util.concurrent.ThreadLocalRandom; import java.util.function.Supplier; diff --git a/src/main/java/dev/zenfyr/pulsar/codec/ExtraCodecs.java b/src/main/java/dev/zenfyr/pulsar/api/codec/ExtraCodecs.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/codec/ExtraCodecs.java rename to src/main/java/dev/zenfyr/pulsar/api/codec/ExtraCodecs.java index e9ae2de..ff2cb17 100644 --- a/src/main/java/dev/zenfyr/pulsar/codec/ExtraCodecs.java +++ b/src/main/java/dev/zenfyr/pulsar/api/codec/ExtraCodecs.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.codec; +package dev.zenfyr.pulsar.api.codec; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableList; @@ -6,7 +6,7 @@ import com.mojang.datafixers.util.Either; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; import com.mojang.serialization.MapCodec; -import dev.zenfyr.pulsar.util.ColorUtil; +import dev.zenfyr.pulsar.api.util.ColorUtil; import java.util.List; import java.util.Locale; import java.util.Objects; diff --git a/src/main/java/dev/zenfyr/pulsar/codec/JsonCodecDataLoader.java b/src/main/java/dev/zenfyr/pulsar/api/codec/JsonCodecDataLoader.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/codec/JsonCodecDataLoader.java rename to src/main/java/dev/zenfyr/pulsar/api/codec/JsonCodecDataLoader.java index 97c8085..c3c2450 100644 --- a/src/main/java/dev/zenfyr/pulsar/codec/JsonCodecDataLoader.java +++ b/src/main/java/dev/zenfyr/pulsar/api/codec/JsonCodecDataLoader.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.codec; +package dev.zenfyr.pulsar.api.codec; import com.google.gson.JsonElement; import com.mojang.serialization.Codec; diff --git a/src/main/java/dev/zenfyr/pulsar/codec/SafeEitherCodec.java b/src/main/java/dev/zenfyr/pulsar/api/codec/SafeEitherCodec.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/codec/SafeEitherCodec.java rename to src/main/java/dev/zenfyr/pulsar/api/codec/SafeEitherCodec.java index d38e96f..ed33ae2 100644 --- a/src/main/java/dev/zenfyr/pulsar/codec/SafeEitherCodec.java +++ b/src/main/java/dev/zenfyr/pulsar/api/codec/SafeEitherCodec.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -package dev.zenfyr.pulsar.codec; +package dev.zenfyr.pulsar.api.codec; import com.mojang.datafixers.util.Either; import com.mojang.datafixers.util.Pair; diff --git a/src/main/java/dev/zenfyr/pulsar/codec/SafeEitherMapCodec.java b/src/main/java/dev/zenfyr/pulsar/api/codec/SafeEitherMapCodec.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/codec/SafeEitherMapCodec.java rename to src/main/java/dev/zenfyr/pulsar/api/codec/SafeEitherMapCodec.java index 667fac9..f7efcef 100644 --- a/src/main/java/dev/zenfyr/pulsar/codec/SafeEitherMapCodec.java +++ b/src/main/java/dev/zenfyr/pulsar/api/codec/SafeEitherMapCodec.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -package dev.zenfyr.pulsar.codec; +package dev.zenfyr.pulsar.api.codec; import com.mojang.datafixers.util.Either; import com.mojang.serialization.*; diff --git a/src/main/java/dev/zenfyr/pulsar/codec/SafeOptionalCodec.java b/src/main/java/dev/zenfyr/pulsar/api/codec/SafeOptionalCodec.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/codec/SafeOptionalCodec.java rename to src/main/java/dev/zenfyr/pulsar/api/codec/SafeOptionalCodec.java index e4d0237..25c2c4d 100644 --- a/src/main/java/dev/zenfyr/pulsar/codec/SafeOptionalCodec.java +++ b/src/main/java/dev/zenfyr/pulsar/api/codec/SafeOptionalCodec.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.codec; +package dev.zenfyr.pulsar.api.codec; import com.mojang.serialization.*; import java.util.Objects; diff --git a/src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabAnimaton.java b/src/main/java/dev/zenfyr/pulsar/api/creativetab/CreativeModeTabAnimaton.java similarity index 91% rename from src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabAnimaton.java rename to src/main/java/dev/zenfyr/pulsar/api/creativetab/CreativeModeTabAnimaton.java index e150c65..6beeec7 100644 --- a/src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabAnimaton.java +++ b/src/main/java/dev/zenfyr/pulsar/api/creativetab/CreativeModeTabAnimaton.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.creativetab; +package dev.zenfyr.pulsar.api.creativetab; -import dev.zenfyr.pulsar.creativetab.impl.CreativeModeTabExtensions; +import dev.zenfyr.pulsar.impl.creativetab.CreativeModeTabExtensions; import java.util.Optional; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabBuilder.java b/src/main/java/dev/zenfyr/pulsar/api/creativetab/CreativeModeTabBuilder.java similarity index 92% rename from src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabBuilder.java rename to src/main/java/dev/zenfyr/pulsar/api/creativetab/CreativeModeTabBuilder.java index 9ba4bdc..a1b288f 100644 --- a/src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabBuilder.java +++ b/src/main/java/dev/zenfyr/pulsar/api/creativetab/CreativeModeTabBuilder.java @@ -1,5 +1,6 @@ -package dev.zenfyr.pulsar.creativetab; +package dev.zenfyr.pulsar.api.creativetab; +import dev.zenfyr.pulsar.impl.creativetab.CreativeModeTabBuilderImpl; import java.util.Optional; import java.util.function.Supplier; import lombok.NonNull; diff --git a/src/main/java/dev/zenfyr/pulsar/creativetab/PulsarEntries.java b/src/main/java/dev/zenfyr/pulsar/api/creativetab/PulsarEntries.java similarity index 94% rename from src/main/java/dev/zenfyr/pulsar/creativetab/PulsarEntries.java rename to src/main/java/dev/zenfyr/pulsar/api/creativetab/PulsarEntries.java index 10a7e3d..73869e7 100644 --- a/src/main/java/dev/zenfyr/pulsar/creativetab/PulsarEntries.java +++ b/src/main/java/dev/zenfyr/pulsar/api/creativetab/PulsarEntries.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.creativetab; +package dev.zenfyr.pulsar.api.creativetab; -import dev.zenfyr.pulsar.util.MathUtil; +import dev.zenfyr.pulsar.api.util.MathUtil; import java.util.Collection; import net.minecraft.core.NonNullList; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/dev/zenfyr/pulsar/itemstack/ItemStackUtil.java b/src/main/java/dev/zenfyr/pulsar/api/itemstack/ItemStackUtil.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/itemstack/ItemStackUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/itemstack/ItemStackUtil.java index 62c0e3f..b2963e5 100644 --- a/src/main/java/dev/zenfyr/pulsar/itemstack/ItemStackUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/itemstack/ItemStackUtil.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.itemstack; +package dev.zenfyr.pulsar.api.itemstack; -import dev.zenfyr.pulsar.util.MathUtil; +import dev.zenfyr.pulsar.api.util.MathUtil; import java.util.Collection; import java.util.Optional; import lombok.NonNull; diff --git a/src/main/java/dev/zenfyr/pulsar/loot/LootCodecs.java b/src/main/java/dev/zenfyr/pulsar/api/loot/LootCodecs.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/loot/LootCodecs.java rename to src/main/java/dev/zenfyr/pulsar/api/loot/LootCodecs.java index 6479ff0..8084399 100644 --- a/src/main/java/dev/zenfyr/pulsar/loot/LootCodecs.java +++ b/src/main/java/dev/zenfyr/pulsar/api/loot/LootCodecs.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.loot; +package dev.zenfyr.pulsar.api.loot; import com.google.gson.*; import com.mojang.serialization.Codec; diff --git a/src/main/java/dev/zenfyr/pulsar/loot/LootContextBuilder.java b/src/main/java/dev/zenfyr/pulsar/api/loot/LootContextBuilder.java similarity index 99% rename from src/main/java/dev/zenfyr/pulsar/loot/LootContextBuilder.java rename to src/main/java/dev/zenfyr/pulsar/api/loot/LootContextBuilder.java index 2e58973..bec3bec 100644 --- a/src/main/java/dev/zenfyr/pulsar/loot/LootContextBuilder.java +++ b/src/main/java/dev/zenfyr/pulsar/api/loot/LootContextBuilder.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.loot; +package dev.zenfyr.pulsar.api.loot; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/dev/zenfyr/pulsar/mixin/AsmUtil.java b/src/main/java/dev/zenfyr/pulsar/api/mixin/AsmUtil.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/mixin/AsmUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/mixin/AsmUtil.java index 0cfb38c..83e6442 100644 --- a/src/main/java/dev/zenfyr/pulsar/mixin/AsmUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/mixin/AsmUtil.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.mixin; +package dev.zenfyr.pulsar.api.mixin; -import dev.zenfyr.pulsar.util.Utilities; +import dev.zenfyr.pulsar.api.util.Utilities; import java.util.*; import java.util.function.Consumer; import lombok.NonNull; diff --git a/src/main/java/dev/zenfyr/pulsar/mixin/VirtualMixins.java b/src/main/java/dev/zenfyr/pulsar/api/mixin/VirtualMixins.java similarity index 93% rename from src/main/java/dev/zenfyr/pulsar/mixin/VirtualMixins.java rename to src/main/java/dev/zenfyr/pulsar/api/mixin/VirtualMixins.java index 29cfd04..7502abc 100644 --- a/src/main/java/dev/zenfyr/pulsar/mixin/VirtualMixins.java +++ b/src/main/java/dev/zenfyr/pulsar/api/mixin/VirtualMixins.java @@ -1,8 +1,8 @@ -package dev.zenfyr.pulsar.mixin; +package dev.zenfyr.pulsar.api.mixin; -import dev.zenfyr.pulsar.reflection.wrappers.GenericField; -import dev.zenfyr.pulsar.reflection.wrappers.GenericMethod; -import dev.zenfyr.pulsar.util.tuple.Tuple; +import dev.zenfyr.pulsar.api.reflection.wrappers.GenericField; +import dev.zenfyr.pulsar.api.reflection.wrappers.GenericMethod; +import dev.zenfyr.pulsar.api.util.tuple.Tuple; import java.io.InputStream; import java.lang.reflect.Proxy; import java.util.function.Consumer; diff --git a/src/main/java/dev/zenfyr/pulsar/nbt/CompoundTagBuilder.java b/src/main/java/dev/zenfyr/pulsar/api/nbt/CompoundTagBuilder.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/nbt/CompoundTagBuilder.java rename to src/main/java/dev/zenfyr/pulsar/api/nbt/CompoundTagBuilder.java index 4f32fe1..c384f2c 100644 --- a/src/main/java/dev/zenfyr/pulsar/nbt/CompoundTagBuilder.java +++ b/src/main/java/dev/zenfyr/pulsar/api/nbt/CompoundTagBuilder.java @@ -1,5 +1,6 @@ -package dev.zenfyr.pulsar.nbt; +package dev.zenfyr.pulsar.api.nbt; +import dev.zenfyr.pulsar.impl.nbt.CompoundTagBuilderImpl; import java.util.List; import java.util.UUID; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/dev/zenfyr/pulsar/nbt/NbtUtil.java b/src/main/java/dev/zenfyr/pulsar/api/nbt/NbtUtil.java similarity index 99% rename from src/main/java/dev/zenfyr/pulsar/nbt/NbtUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/nbt/NbtUtil.java index 054b31d..b58df76 100644 --- a/src/main/java/dev/zenfyr/pulsar/nbt/NbtUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/nbt/NbtUtil.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.nbt; +package dev.zenfyr.pulsar.api.nbt; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.*; diff --git a/src/main/java/dev/zenfyr/pulsar/reflection/Reflect.java b/src/main/java/dev/zenfyr/pulsar/api/reflection/Reflect.java similarity index 99% rename from src/main/java/dev/zenfyr/pulsar/reflection/Reflect.java rename to src/main/java/dev/zenfyr/pulsar/api/reflection/Reflect.java index 7ba6a71..4301178 100644 --- a/src/main/java/dev/zenfyr/pulsar/reflection/Reflect.java +++ b/src/main/java/dev/zenfyr/pulsar/api/reflection/Reflect.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.reflection; +package dev.zenfyr.pulsar.api.reflection; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; diff --git a/src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericConstructor.java b/src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericConstructor.java similarity index 85% rename from src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericConstructor.java rename to src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericConstructor.java index 2c755e1..4e7369b 100644 --- a/src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericConstructor.java +++ b/src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericConstructor.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.reflection.wrappers; +package dev.zenfyr.pulsar.api.reflection.wrappers; -import dev.zenfyr.pulsar.reflection.Reflect; -import dev.zenfyr.pulsar.util.ExceptionUtil; +import dev.zenfyr.pulsar.api.reflection.Reflect; +import dev.zenfyr.pulsar.api.util.ExceptionUtil; import java.lang.reflect.Constructor; import java.util.Arrays; diff --git a/src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericField.java b/src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericField.java similarity index 86% rename from src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericField.java rename to src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericField.java index 4226afa..a2c27d7 100644 --- a/src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericField.java +++ b/src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericField.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.reflection.wrappers; +package dev.zenfyr.pulsar.api.reflection.wrappers; -import dev.zenfyr.pulsar.reflection.Reflect; -import dev.zenfyr.pulsar.util.ExceptionUtil; +import dev.zenfyr.pulsar.api.reflection.Reflect; +import dev.zenfyr.pulsar.api.util.ExceptionUtil; import java.lang.reflect.Field; @SuppressWarnings("unchecked") diff --git a/src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericMethod.java b/src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericMethod.java similarity index 86% rename from src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericMethod.java rename to src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericMethod.java index 67cff5a..2051399 100644 --- a/src/main/java/dev/zenfyr/pulsar/reflection/wrappers/GenericMethod.java +++ b/src/main/java/dev/zenfyr/pulsar/api/reflection/wrappers/GenericMethod.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.reflection.wrappers; +package dev.zenfyr.pulsar.api.reflection.wrappers; -import dev.zenfyr.pulsar.reflection.Reflect; -import dev.zenfyr.pulsar.util.ExceptionUtil; +import dev.zenfyr.pulsar.api.reflection.Reflect; +import dev.zenfyr.pulsar.api.util.ExceptionUtil; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/src/main/java/dev/zenfyr/pulsar/registry/RegistryUtil.java b/src/main/java/dev/zenfyr/pulsar/api/registry/RegistryUtil.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/registry/RegistryUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/registry/RegistryUtil.java index c522edd..cb47a7c 100644 --- a/src/main/java/dev/zenfyr/pulsar/registry/RegistryUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/registry/RegistryUtil.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.registry; +package dev.zenfyr.pulsar.api.registry; import com.google.common.base.Suppliers; -import dev.zenfyr.pulsar.util.Utilities; +import dev.zenfyr.pulsar.api.util.Utilities; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/src/main/java/dev/zenfyr/pulsar/resources/DataPackContentsAccessor.java b/src/main/java/dev/zenfyr/pulsar/api/resources/DataPackContentsAccessor.java similarity index 89% rename from src/main/java/dev/zenfyr/pulsar/resources/DataPackContentsAccessor.java rename to src/main/java/dev/zenfyr/pulsar/api/resources/DataPackContentsAccessor.java index 53b0b4b..751730e 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/DataPackContentsAccessor.java +++ b/src/main/java/dev/zenfyr/pulsar/api/resources/DataPackContentsAccessor.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.resources; +package dev.zenfyr.pulsar.api.resources; import net.minecraft.server.MinecraftServer; import net.minecraft.server.packs.resources.PreparableReloadListener; diff --git a/src/main/java/dev/zenfyr/pulsar/resources/ReloaderType.java b/src/main/java/dev/zenfyr/pulsar/api/resources/ReloaderType.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/resources/ReloaderType.java rename to src/main/java/dev/zenfyr/pulsar/api/resources/ReloaderType.java index f9f5562..90dcb7e 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/ReloaderType.java +++ b/src/main/java/dev/zenfyr/pulsar/api/resources/ReloaderType.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.resources; +package dev.zenfyr.pulsar.api.resources; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/dev/zenfyr/pulsar/resources/ServerReloadersEvent.java b/src/main/java/dev/zenfyr/pulsar/api/resources/ServerReloadersEvent.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/resources/ServerReloadersEvent.java rename to src/main/java/dev/zenfyr/pulsar/api/resources/ServerReloadersEvent.java index 0a7cb20..090a51b 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/ServerReloadersEvent.java +++ b/src/main/java/dev/zenfyr/pulsar/api/resources/ServerReloadersEvent.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.resources; +package dev.zenfyr.pulsar.api.resources; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/dev/zenfyr/pulsar/util/ColorUtil.java b/src/main/java/dev/zenfyr/pulsar/api/util/ColorUtil.java similarity index 99% rename from src/main/java/dev/zenfyr/pulsar/util/ColorUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/util/ColorUtil.java index c5f954f..6f5d39f 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/ColorUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/ColorUtil.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; import lombok.experimental.UtilityClass; diff --git a/src/main/java/dev/zenfyr/pulsar/util/ExceptionUtil.java b/src/main/java/dev/zenfyr/pulsar/api/util/ExceptionUtil.java similarity index 95% rename from src/main/java/dev/zenfyr/pulsar/util/ExceptionUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/util/ExceptionUtil.java index 24e9421..221b6fb 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/ExceptionUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/ExceptionUtil.java @@ -1,9 +1,9 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; -import dev.zenfyr.pulsar.util.functions.ThrowingConsumer; -import dev.zenfyr.pulsar.util.functions.ThrowingFunction; -import dev.zenfyr.pulsar.util.functions.ThrowingRunnable; -import dev.zenfyr.pulsar.util.functions.ThrowingSupplier; +import dev.zenfyr.pulsar.api.util.functions.ThrowingConsumer; +import dev.zenfyr.pulsar.api.util.functions.ThrowingFunction; +import dev.zenfyr.pulsar.api.util.functions.ThrowingRunnable; +import dev.zenfyr.pulsar.api.util.functions.ThrowingSupplier; import java.io.UncheckedIOException; import java.lang.reflect.InvocationTargetException; import java.util.IdentityHashMap; diff --git a/src/main/java/dev/zenfyr/pulsar/util/MakeSure.java b/src/main/java/dev/zenfyr/pulsar/api/util/MakeSure.java similarity index 99% rename from src/main/java/dev/zenfyr/pulsar/util/MakeSure.java rename to src/main/java/dev/zenfyr/pulsar/api/util/MakeSure.java index 915a70a..6a859d6 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/MakeSure.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/MakeSure.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/dev/zenfyr/pulsar/util/MathUtil.java b/src/main/java/dev/zenfyr/pulsar/api/util/MathUtil.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/util/MathUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/util/MathUtil.java index 9fa5e13..8458858 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/MathUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/MathUtil.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; diff --git a/src/main/java/dev/zenfyr/pulsar/util/PlayerUtil.java b/src/main/java/dev/zenfyr/pulsar/api/util/PlayerUtil.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/util/PlayerUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/util/PlayerUtil.java index 124d70e..eb785f3 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/PlayerUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/PlayerUtil.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; import com.google.common.collect.ImmutableList; import java.util.Comparator; diff --git a/src/main/java/dev/zenfyr/pulsar/util/Result.java b/src/main/java/dev/zenfyr/pulsar/api/util/Result.java similarity index 99% rename from src/main/java/dev/zenfyr/pulsar/util/Result.java rename to src/main/java/dev/zenfyr/pulsar/api/util/Result.java index b56d798..c1b5a07 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/Result.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/Result.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; import java.util.Optional; import java.util.function.Consumer; diff --git a/src/main/java/dev/zenfyr/pulsar/util/SupportUtil.java b/src/main/java/dev/zenfyr/pulsar/api/util/SupportUtil.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/util/SupportUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/util/SupportUtil.java index 7eb83ad..b2c4e30 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/SupportUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/SupportUtil.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; -import dev.zenfyr.pulsar.util.functions.ThrowingSupplier; +import dev.zenfyr.pulsar.api.util.functions.ThrowingSupplier; import java.util.function.BiConsumer; import java.util.function.Supplier; import lombok.experimental.UtilityClass; diff --git a/src/main/java/dev/zenfyr/pulsar/util/TextUtil.java b/src/main/java/dev/zenfyr/pulsar/api/util/TextUtil.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/util/TextUtil.java rename to src/main/java/dev/zenfyr/pulsar/api/util/TextUtil.java index a1619d8..cfb1923 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/TextUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/TextUtil.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; import lombok.experimental.UtilityClass; import net.minecraft.network.chat.Component; diff --git a/src/main/java/dev/zenfyr/pulsar/util/Utilities.java b/src/main/java/dev/zenfyr/pulsar/api/util/Utilities.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/util/Utilities.java rename to src/main/java/dev/zenfyr/pulsar/api/util/Utilities.java index 62d0764..df31b50 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/Utilities.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/Utilities.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.api.util; import java.lang.invoke.*; import java.util.List; diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/Memoize.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/Memoize.java similarity index 98% rename from src/main/java/dev/zenfyr/pulsar/util/functions/Memoize.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/Memoize.java index 5c50133..274ef25 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/Memoize.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/Memoize.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; import java.util.*; import java.util.function.Function; diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingConsumer.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingConsumer.java similarity index 84% rename from src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingConsumer.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingConsumer.java index e38b86c..83285d2 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingConsumer.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingConsumer.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; @FunctionalInterface public interface ThrowingConsumer { diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingFunction.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingFunction.java similarity index 92% rename from src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingFunction.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingFunction.java index 06a9955..3c782bf 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingFunction.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingFunction.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; import java.util.Objects; diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingRunnable.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingRunnable.java similarity index 69% rename from src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingRunnable.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingRunnable.java index b941d31..e69265c 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingRunnable.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingRunnable.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; @FunctionalInterface public interface ThrowingRunnable { diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingSupplier.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingSupplier.java similarity index 69% rename from src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingSupplier.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingSupplier.java index 33736a9..419cae1 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/ThrowingSupplier.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/ThrowingSupplier.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; @FunctionalInterface public interface ThrowingSupplier { diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/TriConsumer.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/TriConsumer.java similarity index 85% rename from src/main/java/dev/zenfyr/pulsar/util/functions/TriConsumer.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/TriConsumer.java index 698bc8f..a1c7d9a 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/TriConsumer.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/TriConsumer.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; @FunctionalInterface public interface TriConsumer { diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/TriFunction.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/TriFunction.java similarity index 85% rename from src/main/java/dev/zenfyr/pulsar/util/functions/TriFunction.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/TriFunction.java index 43eca03..8f127a8 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/TriFunction.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/TriFunction.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; import java.util.function.Function; diff --git a/src/main/java/dev/zenfyr/pulsar/util/functions/TriPredicate.java b/src/main/java/dev/zenfyr/pulsar/api/util/functions/TriPredicate.java similarity index 91% rename from src/main/java/dev/zenfyr/pulsar/util/functions/TriPredicate.java rename to src/main/java/dev/zenfyr/pulsar/api/util/functions/TriPredicate.java index b3b9ba1..67f3af8 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/functions/TriPredicate.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/functions/TriPredicate.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.functions; +package dev.zenfyr.pulsar.api.util.functions; @FunctionalInterface public interface TriPredicate { diff --git a/src/main/java/dev/zenfyr/pulsar/util/tuple/ImmutableTuple.java b/src/main/java/dev/zenfyr/pulsar/api/util/tuple/ImmutableTuple.java similarity index 94% rename from src/main/java/dev/zenfyr/pulsar/util/tuple/ImmutableTuple.java rename to src/main/java/dev/zenfyr/pulsar/api/util/tuple/ImmutableTuple.java index 8248042..bbab088 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/tuple/ImmutableTuple.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/tuple/ImmutableTuple.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.tuple; +package dev.zenfyr.pulsar.api.util.tuple; public record ImmutableTuple(L left, R right) implements Tuple { diff --git a/src/main/java/dev/zenfyr/pulsar/util/tuple/MutableTuple.java b/src/main/java/dev/zenfyr/pulsar/api/util/tuple/MutableTuple.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/util/tuple/MutableTuple.java rename to src/main/java/dev/zenfyr/pulsar/api/util/tuple/MutableTuple.java index 826a9d6..3d8dace 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/tuple/MutableTuple.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/tuple/MutableTuple.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.tuple; +package dev.zenfyr.pulsar.api.util.tuple; import java.util.Objects; import lombok.Getter; diff --git a/src/main/java/dev/zenfyr/pulsar/util/tuple/Tuple.java b/src/main/java/dev/zenfyr/pulsar/api/util/tuple/Tuple.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/util/tuple/Tuple.java rename to src/main/java/dev/zenfyr/pulsar/api/util/tuple/Tuple.java index 9cc45bd..c0a2440 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/tuple/Tuple.java +++ b/src/main/java/dev/zenfyr/pulsar/api/util/tuple/Tuple.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util.tuple; +package dev.zenfyr.pulsar.api.util.tuple; import java.util.function.Function; import org.jetbrains.annotations.Contract; diff --git a/src/main/java/dev/zenfyr/pulsar/Pulsar.java b/src/main/java/dev/zenfyr/pulsar/impl/Pulsar.java similarity index 81% rename from src/main/java/dev/zenfyr/pulsar/Pulsar.java rename to src/main/java/dev/zenfyr/pulsar/impl/Pulsar.java index 8116e7d..ba595a1 100644 --- a/src/main/java/dev/zenfyr/pulsar/Pulsar.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/Pulsar.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar; +package dev.zenfyr.pulsar.impl; import net.fabricmc.api.ModInitializer; diff --git a/src/main/java/dev/zenfyr/pulsar/util/PulsarLog.java b/src/main/java/dev/zenfyr/pulsar/impl/PulsarLog.java similarity index 88% rename from src/main/java/dev/zenfyr/pulsar/util/PulsarLog.java rename to src/main/java/dev/zenfyr/pulsar/impl/PulsarLog.java index dec4ac1..14d4dbe 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/PulsarLog.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/PulsarLog.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.util; +package dev.zenfyr.pulsar.impl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/dev/zenfyr/pulsar/client/PulsarClient.java b/src/main/java/dev/zenfyr/pulsar/impl/client/PulsarClient.java similarity index 52% rename from src/main/java/dev/zenfyr/pulsar/client/PulsarClient.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/PulsarClient.java index 7ce8df8..861d0ef 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/PulsarClient.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/PulsarClient.java @@ -1,8 +1,8 @@ -package dev.zenfyr.pulsar.client; +package dev.zenfyr.pulsar.impl.client; -import dev.zenfyr.pulsar.client.events.AfterFirstReload; -import dev.zenfyr.pulsar.client.fakelevel.BrightLightTexture; -import dev.zenfyr.pulsar.client.fakelevel.FakeLevel; +import dev.zenfyr.pulsar.api.client.events.AfterFirstReload; +import dev.zenfyr.pulsar.api.client.fakelevel.BrightLightTexture; +import dev.zenfyr.pulsar.api.client.fakelevel.FakeLevel; import net.fabricmc.api.ClientModInitializer; public class PulsarClient implements ClientModInitializer { diff --git a/src/main/java/dev/zenfyr/pulsar/client/fakelevel/FakeLevelImpl.java b/src/main/java/dev/zenfyr/pulsar/impl/client/fakelevel/FakeLevelImpl.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/client/fakelevel/FakeLevelImpl.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/fakelevel/FakeLevelImpl.java index aba73b1..a0af346 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/fakelevel/FakeLevelImpl.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/fakelevel/FakeLevelImpl.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.client.fakelevel; +package dev.zenfyr.pulsar.impl.client.fakelevel; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientPacketListener; @@ -15,7 +15,7 @@ import net.minecraft.world.level.lighting.LevelLightEngine; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; -class FakeLevelImpl extends ClientLevel { +public class FakeLevelImpl extends ClientLevel { public FakeLevelImpl( ClientPacketListener clientPacketListener, diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/package-info.java b/src/main/java/dev/zenfyr/pulsar/impl/client/fakelevel/package-info.java similarity index 57% rename from src/main/java/dev/zenfyr/pulsar/client/particles/impl/package-info.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/fakelevel/package-info.java index 50010ca..d2301d4 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/package-info.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/fakelevel/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package dev.zenfyr.pulsar.client.particles.impl; +package dev.zenfyr.pulsar.impl.client.fakelevel; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/dev/zenfyr/pulsar/resources/impl/package-info.java b/src/main/java/dev/zenfyr/pulsar/impl/client/package-info.java similarity index 60% rename from src/main/java/dev/zenfyr/pulsar/resources/impl/package-info.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/package-info.java index a4dca75..0ed35b5 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/impl/package-info.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package dev.zenfyr.pulsar.resources.impl; +package dev.zenfyr.pulsar.impl.client; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/GuiParticleRenderState.java b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/GuiParticleRenderState.java similarity index 95% rename from src/main/java/dev/zenfyr/pulsar/client/particles/impl/GuiParticleRenderState.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/particles/GuiParticleRenderState.java index 6b32f7b..0d94faa 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/GuiParticleRenderState.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/GuiParticleRenderState.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.client.particles.impl; +package dev.zenfyr.pulsar.impl.client.particles; import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.client.gui.render.state.pip.PictureInPictureRenderState; diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/GuiParticleRenderer.java b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/GuiParticleRenderer.java similarity index 97% rename from src/main/java/dev/zenfyr/pulsar/client/particles/impl/GuiParticleRenderer.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/particles/GuiParticleRenderer.java index c6c3314..b4cfbb2 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/GuiParticleRenderer.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/GuiParticleRenderer.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.client.particles.impl; +package dev.zenfyr.pulsar.impl.client.particles; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/VanillaParticle.java b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/VanillaParticle.java similarity index 89% rename from src/main/java/dev/zenfyr/pulsar/client/particles/impl/VanillaParticle.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/particles/VanillaParticle.java index f2c9651..a77a4b9 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/VanillaParticle.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/VanillaParticle.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.client.particles.impl; +package dev.zenfyr.pulsar.impl.client.particles; -import dev.zenfyr.pulsar.client.particles.AbstractScreenParticle; -import dev.zenfyr.pulsar.client.particles.ScreenParticleHelper; +import dev.zenfyr.pulsar.api.client.particles.AbstractScreenParticle; +import dev.zenfyr.pulsar.api.client.particles.ScreenParticleHelper; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/VanillaParticleManager.java b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/VanillaParticleManager.java similarity index 95% rename from src/main/java/dev/zenfyr/pulsar/client/particles/impl/VanillaParticleManager.java rename to src/main/java/dev/zenfyr/pulsar/impl/client/particles/VanillaParticleManager.java index 68f0cb4..b7ec116 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/impl/VanillaParticleManager.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/VanillaParticleManager.java @@ -1,9 +1,9 @@ -package dev.zenfyr.pulsar.client.particles.impl; +package dev.zenfyr.pulsar.impl.client.particles; import com.google.common.collect.EvictingQueue; import com.google.common.collect.Maps; -import dev.zenfyr.pulsar.client.fakelevel.FakeLevel; -import dev.zenfyr.pulsar.impl.mixin.client.particles.ParticleEngineAccessor; +import dev.zenfyr.pulsar.api.client.fakelevel.FakeLevel; +import dev.zenfyr.pulsar.impl.mixins.client.particles.ParticleEngineAccessor; import java.util.*; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/client/particles/package-info.java b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/package-info.java new file mode 100644 index 0000000..41d6cbb --- /dev/null +++ b/src/main/java/dev/zenfyr/pulsar/impl/client/particles/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package dev.zenfyr.pulsar.impl.client.particles; + +import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabBuilderImpl.java b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/CreativeModeTabBuilderImpl.java similarity index 90% rename from src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabBuilderImpl.java rename to src/main/java/dev/zenfyr/pulsar/impl/creativetab/CreativeModeTabBuilderImpl.java index 0d0c748..9accb3e 100644 --- a/src/main/java/dev/zenfyr/pulsar/creativetab/CreativeModeTabBuilderImpl.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/CreativeModeTabBuilderImpl.java @@ -1,5 +1,7 @@ -package dev.zenfyr.pulsar.creativetab; +package dev.zenfyr.pulsar.impl.creativetab; +import dev.zenfyr.pulsar.api.creativetab.CreativeModeTabBuilder; +import dev.zenfyr.pulsar.api.creativetab.PulsarEntries; import java.util.Objects; import java.util.function.Supplier; import lombok.NonNull; @@ -12,7 +14,7 @@ import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal -class CreativeModeTabBuilderImpl implements CreativeModeTabBuilder { +public class CreativeModeTabBuilderImpl implements CreativeModeTabBuilder { private final Identifier identifier; private Supplier icon = () -> ItemStack.EMPTY; diff --git a/src/main/java/dev/zenfyr/pulsar/creativetab/impl/CreativeModeTabExtensions.java b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/CreativeModeTabExtensions.java similarity index 81% rename from src/main/java/dev/zenfyr/pulsar/creativetab/impl/CreativeModeTabExtensions.java rename to src/main/java/dev/zenfyr/pulsar/impl/creativetab/CreativeModeTabExtensions.java index e671961..73d505d 100644 --- a/src/main/java/dev/zenfyr/pulsar/creativetab/impl/CreativeModeTabExtensions.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/CreativeModeTabExtensions.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.creativetab.impl; +package dev.zenfyr.pulsar.impl.creativetab; -import dev.zenfyr.pulsar.creativetab.CreativeModeTabAnimaton; +import dev.zenfyr.pulsar.api.creativetab.CreativeModeTabAnimaton; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.world.item.CreativeModeTab; diff --git a/src/main/java/dev/zenfyr/pulsar/creativetab/PulsarEntriesImpl.java b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/PulsarEntriesImpl.java similarity index 90% rename from src/main/java/dev/zenfyr/pulsar/creativetab/PulsarEntriesImpl.java rename to src/main/java/dev/zenfyr/pulsar/impl/creativetab/PulsarEntriesImpl.java index 26430d0..41d510a 100644 --- a/src/main/java/dev/zenfyr/pulsar/creativetab/PulsarEntriesImpl.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/PulsarEntriesImpl.java @@ -1,5 +1,6 @@ -package dev.zenfyr.pulsar.creativetab; +package dev.zenfyr.pulsar.impl.creativetab; +import dev.zenfyr.pulsar.api.creativetab.PulsarEntries; import java.util.LinkedHashSet; import java.util.LinkedList; import net.minecraft.world.item.CreativeModeTab; @@ -7,7 +8,7 @@ import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal -class PulsarEntriesImpl implements PulsarEntries { +public class PulsarEntriesImpl implements PulsarEntries { private final CreativeModeTab.Output entries; diff --git a/src/main/java/dev/zenfyr/pulsar/creativetab/impl/package-info.java b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/package-info.java similarity index 59% rename from src/main/java/dev/zenfyr/pulsar/creativetab/impl/package-info.java rename to src/main/java/dev/zenfyr/pulsar/impl/creativetab/package-info.java index 3f5e83f..efecd9a 100644 --- a/src/main/java/dev/zenfyr/pulsar/creativetab/impl/package-info.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/creativetab/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Internal -package dev.zenfyr.pulsar.creativetab.impl; +package dev.zenfyr.pulsar.impl.creativetab; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/events/MinecraftMixin.java similarity index 87% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/events/MinecraftMixin.java index 4b281c4..2499a8a 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/events/MinecraftMixin.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.impl.mixin.client.events; +package dev.zenfyr.pulsar.impl.mixins.client.events; -import dev.zenfyr.pulsar.client.events.AfterFirstReload; +import dev.zenfyr.pulsar.api.client.events.AfterFirstReload; import net.minecraft.CrashReport; import net.minecraft.client.Minecraft; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeInventoryScreenMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/itemgroup/CreativeModeInventoryScreenMixin.java similarity index 93% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeInventoryScreenMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/itemgroup/CreativeModeInventoryScreenMixin.java index 959a69d..cedbcf9 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeInventoryScreenMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/itemgroup/CreativeModeInventoryScreenMixin.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.impl.mixin.client.itemgroup; +package dev.zenfyr.pulsar.impl.mixins.client.itemgroup; import com.llamalad7.mixinextras.sugar.Local; -import dev.zenfyr.pulsar.creativetab.impl.CreativeModeTabExtensions; +import dev.zenfyr.pulsar.impl.creativetab.CreativeModeTabExtensions; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeTabMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/itemgroup/CreativeModeTabMixin.java similarity index 76% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeTabMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/itemgroup/CreativeModeTabMixin.java index 30404ce..75e9163 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeTabMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/itemgroup/CreativeModeTabMixin.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.impl.mixin.client.itemgroup; +package dev.zenfyr.pulsar.impl.mixins.client.itemgroup; -import dev.zenfyr.pulsar.creativetab.CreativeModeTabAnimaton; -import dev.zenfyr.pulsar.creativetab.impl.CreativeModeTabExtensions; +import dev.zenfyr.pulsar.api.creativetab.CreativeModeTabAnimaton; +import dev.zenfyr.pulsar.impl.creativetab.CreativeModeTabExtensions; import net.minecraft.world.item.CreativeModeTab; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GameRendererMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/GameRendererMixin.java similarity index 83% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GameRendererMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/GameRendererMixin.java index d00870e..693a705 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GameRendererMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/GameRendererMixin.java @@ -1,10 +1,10 @@ -package dev.zenfyr.pulsar.impl.mixin.client.particles; +package dev.zenfyr.pulsar.impl.mixins.client.particles; import com.llamalad7.mixinextras.sugar.Local; -import dev.zenfyr.pulsar.client.fakelevel.BrightLightTexture; -import dev.zenfyr.pulsar.client.particles.ScreenParticleHelper; -import dev.zenfyr.pulsar.client.particles.impl.GuiParticleRenderer; -import dev.zenfyr.pulsar.client.particles.impl.VanillaParticleManager; +import dev.zenfyr.pulsar.api.client.fakelevel.BrightLightTexture; +import dev.zenfyr.pulsar.api.client.particles.ScreenParticleHelper; +import dev.zenfyr.pulsar.impl.client.particles.GuiParticleRenderer; +import dev.zenfyr.pulsar.impl.client.particles.VanillaParticleManager; import net.minecraft.client.DeltaTracker; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GuiRendererMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/GuiRendererMixin.java similarity index 88% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GuiRendererMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/GuiRendererMixin.java index 9ef192f..4dc1236 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GuiRendererMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/GuiRendererMixin.java @@ -1,9 +1,9 @@ -package dev.zenfyr.pulsar.impl.mixin.client.particles; +package dev.zenfyr.pulsar.impl.mixins.client.particles; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.systems.RenderSystem; -import dev.zenfyr.pulsar.client.particles.ScreenParticleHelper; -import dev.zenfyr.pulsar.client.particles.impl.VanillaParticleManager; +import dev.zenfyr.pulsar.api.client.particles.ScreenParticleHelper; +import dev.zenfyr.pulsar.impl.client.particles.VanillaParticleManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.render.GuiRenderer; import net.minecraft.client.gui.render.state.GuiRenderState; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/MinecraftMixin.java similarity index 89% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/MinecraftMixin.java index c3ea310..2053390 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/MinecraftMixin.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.impl.mixin.client.particles; +package dev.zenfyr.pulsar.impl.mixins.client.particles; -import dev.zenfyr.pulsar.client.particles.ScreenParticleHelper; +import dev.zenfyr.pulsar.api.client.particles.ScreenParticleHelper; import net.minecraft.client.Minecraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineAccessor.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleEngineAccessor.java similarity index 94% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineAccessor.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleEngineAccessor.java index 1ebc620..f840ad8 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineAccessor.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleEngineAccessor.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.impl.mixin.client.particles; +package dev.zenfyr.pulsar.impl.mixins.client.particles; import java.util.List; import net.minecraft.client.particle.Particle; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleEngineMixin.java similarity index 86% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleEngineMixin.java index 29b71c5..1040788 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleEngineMixin.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.impl.mixin.client.particles; +package dev.zenfyr.pulsar.impl.mixins.client.particles; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import dev.zenfyr.pulsar.client.particles.impl.VanillaParticleManager; +import dev.zenfyr.pulsar.impl.client.particles.VanillaParticleManager; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.ParticleEngine; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleFeatureRendererMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleFeatureRendererMixin.java similarity index 87% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleFeatureRendererMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleFeatureRendererMixin.java index fd5a3dd..427a9a6 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleFeatureRendererMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/client/particles/ParticleFeatureRendererMixin.java @@ -1,10 +1,10 @@ -package dev.zenfyr.pulsar.impl.mixin.client.particles; +package dev.zenfyr.pulsar.impl.mixins.client.particles; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.textures.GpuTextureView; -import dev.zenfyr.pulsar.client.fakelevel.BrightLightTexture; -import dev.zenfyr.pulsar.client.particles.impl.GuiParticleRenderer; +import dev.zenfyr.pulsar.api.client.fakelevel.BrightLightTexture; +import dev.zenfyr.pulsar.impl.client.particles.GuiParticleRenderer; import net.minecraft.client.renderer.feature.ParticleFeatureRenderer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/MinecraftServerMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/MinecraftServerMixin.java similarity index 77% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/MinecraftServerMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/MinecraftServerMixin.java index df20050..45380ac 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/MinecraftServerMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/MinecraftServerMixin.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.impl.mixin.resources; +package dev.zenfyr.pulsar.impl.mixins.resources; -import dev.zenfyr.pulsar.resources.DataPackContentsAccessor; -import dev.zenfyr.pulsar.resources.ReloaderType; +import dev.zenfyr.pulsar.api.resources.DataPackContentsAccessor; +import dev.zenfyr.pulsar.api.resources.ReloaderType; import net.minecraft.server.MinecraftServer; import net.minecraft.server.packs.resources.PreparableReloadListener; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ReloadableServerResourcesMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/ReloadableServerResourcesMixin.java similarity index 89% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ReloadableServerResourcesMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/ReloadableServerResourcesMixin.java index e676559..9d533a7 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ReloadableServerResourcesMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/ReloadableServerResourcesMixin.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.impl.mixin.resources; +package dev.zenfyr.pulsar.impl.mixins.resources; -import dev.zenfyr.pulsar.resources.ReloaderType; -import dev.zenfyr.pulsar.resources.impl.InternalContentsAccessor; +import dev.zenfyr.pulsar.api.resources.ReloaderType; +import dev.zenfyr.pulsar.impl.resources.InternalContentsAccessor; import java.util.*; import net.minecraft.resources.Identifier; import net.minecraft.server.ReloadableServerResources; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ResourceManagerHelperImplMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/ResourceManagerHelperImplMixin.java similarity index 91% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ResourceManagerHelperImplMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/ResourceManagerHelperImplMixin.java index da3f107..f59a3c5 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ResourceManagerHelperImplMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixins/resources/ResourceManagerHelperImplMixin.java @@ -1,9 +1,9 @@ -package dev.zenfyr.pulsar.impl.mixin.resources; +package dev.zenfyr.pulsar.impl.mixins.resources; import com.llamalad7.mixinextras.sugar.Local; -import dev.zenfyr.pulsar.resources.ServerReloadersEvent; -import dev.zenfyr.pulsar.resources.impl.ContextImpl; -import dev.zenfyr.pulsar.resources.impl.InternalContentsAccessor; +import dev.zenfyr.pulsar.api.resources.ServerReloadersEvent; +import dev.zenfyr.pulsar.impl.resources.ContextImpl; +import dev.zenfyr.pulsar.impl.resources.InternalContentsAccessor; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/dev/zenfyr/pulsar/nbt/CompoundTagBuilderImpl.java b/src/main/java/dev/zenfyr/pulsar/impl/nbt/CompoundTagBuilderImpl.java similarity index 94% rename from src/main/java/dev/zenfyr/pulsar/nbt/CompoundTagBuilderImpl.java rename to src/main/java/dev/zenfyr/pulsar/impl/nbt/CompoundTagBuilderImpl.java index 8058298..555a7c4 100644 --- a/src/main/java/dev/zenfyr/pulsar/nbt/CompoundTagBuilderImpl.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/nbt/CompoundTagBuilderImpl.java @@ -1,5 +1,6 @@ -package dev.zenfyr.pulsar.nbt; +package dev.zenfyr.pulsar.impl.nbt; +import dev.zenfyr.pulsar.api.nbt.CompoundTagBuilder; import java.util.List; import java.util.UUID; import lombok.NonNull; @@ -8,7 +9,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import org.apache.commons.lang3.ArrayUtils; -class CompoundTagBuilderImpl implements CompoundTagBuilder { +public class CompoundTagBuilderImpl implements CompoundTagBuilder { private final CompoundTag tag; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/nbt/package-info.java b/src/main/java/dev/zenfyr/pulsar/impl/nbt/package-info.java new file mode 100644 index 0000000..4167fe4 --- /dev/null +++ b/src/main/java/dev/zenfyr/pulsar/impl/nbt/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package dev.zenfyr.pulsar.impl.nbt; + +import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/package-info.java b/src/main/java/dev/zenfyr/pulsar/impl/package-info.java new file mode 100644 index 0000000..cc47bd6 --- /dev/null +++ b/src/main/java/dev/zenfyr/pulsar/impl/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package dev.zenfyr.pulsar.impl; + +import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/dev/zenfyr/pulsar/resources/impl/ContextImpl.java b/src/main/java/dev/zenfyr/pulsar/impl/resources/ContextImpl.java similarity index 87% rename from src/main/java/dev/zenfyr/pulsar/resources/impl/ContextImpl.java rename to src/main/java/dev/zenfyr/pulsar/impl/resources/ContextImpl.java index 087f21f..9f9d97e 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/impl/ContextImpl.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/resources/ContextImpl.java @@ -1,7 +1,7 @@ -package dev.zenfyr.pulsar.resources.impl; +package dev.zenfyr.pulsar.impl.resources; -import dev.zenfyr.pulsar.resources.ReloaderType; -import dev.zenfyr.pulsar.resources.ServerReloadersEvent; +import dev.zenfyr.pulsar.api.resources.ReloaderType; +import dev.zenfyr.pulsar.api.resources.ServerReloadersEvent; import java.util.function.BiConsumer; import java.util.function.Function; import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener; diff --git a/src/main/java/dev/zenfyr/pulsar/resources/impl/InternalContentsAccessor.java b/src/main/java/dev/zenfyr/pulsar/impl/resources/InternalContentsAccessor.java similarity index 73% rename from src/main/java/dev/zenfyr/pulsar/resources/impl/InternalContentsAccessor.java rename to src/main/java/dev/zenfyr/pulsar/impl/resources/InternalContentsAccessor.java index def7a4f..643da95 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/impl/InternalContentsAccessor.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/resources/InternalContentsAccessor.java @@ -1,6 +1,6 @@ -package dev.zenfyr.pulsar.resources.impl; +package dev.zenfyr.pulsar.impl.resources; -import dev.zenfyr.pulsar.resources.DataPackContentsAccessor; +import dev.zenfyr.pulsar.api.resources.DataPackContentsAccessor; import java.util.Map; import net.minecraft.resources.Identifier; import net.minecraft.server.packs.resources.PreparableReloadListener; diff --git a/src/main/java/dev/zenfyr/pulsar/resources/impl/InternalContext.java b/src/main/java/dev/zenfyr/pulsar/impl/resources/InternalContext.java similarity index 89% rename from src/main/java/dev/zenfyr/pulsar/resources/impl/InternalContext.java rename to src/main/java/dev/zenfyr/pulsar/impl/resources/InternalContext.java index 4a5766a..e475184 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/impl/InternalContext.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/resources/InternalContext.java @@ -1,4 +1,4 @@ -package dev.zenfyr.pulsar.resources.impl; +package dev.zenfyr.pulsar.impl.resources; import net.minecraft.core.RegistryAccess; import net.minecraft.server.ReloadableServerResources; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/resources/package-info.java b/src/main/java/dev/zenfyr/pulsar/impl/resources/package-info.java new file mode 100644 index 0000000..3b0ed88 --- /dev/null +++ b/src/main/java/dev/zenfyr/pulsar/impl/resources/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Internal +package dev.zenfyr.pulsar.impl.resources; + +import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0dd41c3..be4fc09 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -11,10 +11,10 @@ "environment": "*", "entrypoints": { "client": [ - "dev.zenfyr.pulsar.client.PulsarClient" + "dev.zenfyr.pulsar.impl.client.PulsarClient" ], "main": [ - "dev.zenfyr.pulsar.Pulsar" + "dev.zenfyr.pulsar.impl.Pulsar" ] }, "mixins": [ @@ -32,7 +32,7 @@ }, "loom:injected_interfaces": { "net/minecraft/server/MinecraftServer": [ - "dev/zenfyr/pulsar/resources/DataPackContentsAccessor" + "dev/zenfyr/pulsar/api/resources/DataPackContentsAccessor" ] } } diff --git a/src/main/resources/pulsar.mixins.json b/src/main/resources/pulsar.mixins.json index aee7c8e..276a8eb 100644 --- a/src/main/resources/pulsar.mixins.json +++ b/src/main/resources/pulsar.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "dev.zenfyr.pulsar.impl.mixin", + "package": "dev.zenfyr.pulsar.impl.mixins", "compatibilityLevel": "JAVA_17", "mixins": [ "resources.MinecraftServerMixin", diff --git a/src/test/java/dev/zenfyr/pulsar/test/util/ColorUtilTest.java b/src/test/java/dev/zenfyr/pulsar/test/util/ColorUtilTest.java index 63be33c..d039a69 100644 --- a/src/test/java/dev/zenfyr/pulsar/test/util/ColorUtilTest.java +++ b/src/test/java/dev/zenfyr/pulsar/test/util/ColorUtilTest.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.test.util; -import dev.zenfyr.pulsar.util.ColorUtil; +import dev.zenfyr.pulsar.api.util.ColorUtil; import org.assertj.core.api.Assertions; import org.assertj.core.data.Offset; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/dev/zenfyr/pulsar/test/util/MakeSureTest.java b/src/test/java/dev/zenfyr/pulsar/test/util/MakeSureTest.java index bd9ee3e..cf81add 100644 --- a/src/test/java/dev/zenfyr/pulsar/test/util/MakeSureTest.java +++ b/src/test/java/dev/zenfyr/pulsar/test/util/MakeSureTest.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.test.util; -import dev.zenfyr.pulsar.util.MakeSure; +import dev.zenfyr.pulsar.api.util.MakeSure; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/src/test/java/dev/zenfyr/pulsar/test/util/MathUtilTest.java b/src/test/java/dev/zenfyr/pulsar/test/util/MathUtilTest.java index 79e722d..eab6e54 100644 --- a/src/test/java/dev/zenfyr/pulsar/test/util/MathUtilTest.java +++ b/src/test/java/dev/zenfyr/pulsar/test/util/MathUtilTest.java @@ -2,7 +2,7 @@ package dev.zenfyr.pulsar.test.util; import static org.junit.jupiter.api.Assertions.*; -import dev.zenfyr.pulsar.util.MathUtil; +import dev.zenfyr.pulsar.api.util.MathUtil; import java.util.Random; import org.junit.jupiter.api.Test; diff --git a/src/test/java/dev/zenfyr/pulsar/test/util/MemoizeTest.java b/src/test/java/dev/zenfyr/pulsar/test/util/MemoizeTest.java index 123d999..47fc0ec 100644 --- a/src/test/java/dev/zenfyr/pulsar/test/util/MemoizeTest.java +++ b/src/test/java/dev/zenfyr/pulsar/test/util/MemoizeTest.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.test.util; -import dev.zenfyr.pulsar.util.functions.Memoize; +import dev.zenfyr.pulsar.api.util.functions.Memoize; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.function.Supplier; diff --git a/src/test/java/dev/zenfyr/pulsar/test/util/UtilitiesTest.java b/src/test/java/dev/zenfyr/pulsar/test/util/UtilitiesTest.java index 52719d2..52adc63 100644 --- a/src/test/java/dev/zenfyr/pulsar/test/util/UtilitiesTest.java +++ b/src/test/java/dev/zenfyr/pulsar/test/util/UtilitiesTest.java @@ -2,7 +2,7 @@ package dev.zenfyr.pulsar.test.util; import static org.junit.jupiter.api.Assertions.*; -import dev.zenfyr.pulsar.util.Utilities; +import dev.zenfyr.pulsar.api.util.Utilities; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/client/CreativeTabAnimationTest.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/client/CreativeTabAnimationTest.java index ad1e20a..8dde910 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/client/CreativeTabAnimationTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/client/CreativeTabAnimationTest.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.gametest.client; -import dev.zenfyr.pulsar.creativetab.CreativeModeTabAnimaton; +import dev.zenfyr.pulsar.api.creativetab.CreativeModeTabAnimaton; import dev.zenfyr.pulsar.gametest.common.CreativeTabBuilderTest; import dev.zenfyr.pulsar.gametest.util.AutoTest; import dev.zenfyr.pulsar.gametest.util.client.ClientTestContext; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/client/ScreenParticleHelperTest.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/client/ScreenParticleHelperTest.java index 9fbf223..4ea7648 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/client/ScreenParticleHelperTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/client/ScreenParticleHelperTest.java @@ -1,10 +1,10 @@ package dev.zenfyr.pulsar.gametest.client; -import dev.zenfyr.pulsar.client.particles.ItemStackParticle; -import dev.zenfyr.pulsar.client.particles.ScreenParticleHelper; +import dev.zenfyr.pulsar.api.client.particles.ItemStackParticle; +import dev.zenfyr.pulsar.api.client.particles.ScreenParticleHelper; +import dev.zenfyr.pulsar.api.util.MathUtil; import dev.zenfyr.pulsar.gametest.util.AutoTest; import dev.zenfyr.pulsar.gametest.util.client.ClientTestContext; -import dev.zenfyr.pulsar.util.MathUtil; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/CreativeTabBuilderTest.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/CreativeTabBuilderTest.java index d469dd7..df76a6a 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/CreativeTabBuilderTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/CreativeTabBuilderTest.java @@ -1,8 +1,8 @@ package dev.zenfyr.pulsar.gametest.common; -import dev.zenfyr.pulsar.creativetab.CreativeModeTabBuilder; +import dev.zenfyr.pulsar.api.creativetab.CreativeModeTabBuilder; +import dev.zenfyr.pulsar.api.util.SupportUtil; import dev.zenfyr.pulsar.gametest.util.Utils; -import dev.zenfyr.pulsar.util.SupportUtil; import java.util.List; import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/RegistryUtilTest.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/RegistryUtilTest.java index 63626f8..3871fac 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/RegistryUtilTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/RegistryUtilTest.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.gametest.common; -import dev.zenfyr.pulsar.registry.RegistryUtil; +import dev.zenfyr.pulsar.api.registry.RegistryUtil; import net.fabricmc.api.ModInitializer; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/ServerReloadersEventTest.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/ServerReloadersEventTest.java index b21a881..a39ddbf 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/ServerReloadersEventTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/ServerReloadersEventTest.java @@ -1,9 +1,9 @@ package dev.zenfyr.pulsar.gametest.common; +import dev.zenfyr.pulsar.api.resources.ReloaderType; +import dev.zenfyr.pulsar.api.resources.ServerReloadersEvent; import dev.zenfyr.pulsar.gametest.util.Utils; -import dev.zenfyr.pulsar.resources.ReloaderType; -import dev.zenfyr.pulsar.resources.ServerReloadersEvent; -import dev.zenfyr.pulsar.util.PulsarLog; +import dev.zenfyr.pulsar.impl.PulsarLog; import java.util.Objects; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/VirtualMixinsTest.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/VirtualMixinsTest.java index 6d176e6..3de3fe8 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/common/VirtualMixinsTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/common/VirtualMixinsTest.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.gametest.common; -import dev.zenfyr.pulsar.mixin.VirtualMixins; +import dev.zenfyr.pulsar.api.mixin.VirtualMixins; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import net.fabricmc.api.ModInitializer; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/server/ItemStackUtilTest.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/server/ItemStackUtilTest.java index f569f12..6e1cf11 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/server/ItemStackUtilTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/server/ItemStackUtilTest.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.gametest.server; -import dev.zenfyr.pulsar.itemstack.ItemStackUtil; +import dev.zenfyr.pulsar.api.itemstack.ItemStackUtil; import net.fabricmc.fabric.api.gametest.v1.GameTest; import net.minecraft.core.BlockPos; import net.minecraft.gametest.framework.GameTestHelper; diff --git a/src/testmod/java/dev/zenfyr/pulsar/gametest/util/client/PulsarTestmodClient.java b/src/testmod/java/dev/zenfyr/pulsar/gametest/util/client/PulsarTestmodClient.java index 544bf04..906c375 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/gametest/util/client/PulsarTestmodClient.java +++ b/src/testmod/java/dev/zenfyr/pulsar/gametest/util/client/PulsarTestmodClient.java @@ -1,7 +1,7 @@ package dev.zenfyr.pulsar.gametest.util.client; import com.mojang.logging.LogUtils; -import dev.zenfyr.pulsar.client.events.AfterFirstReload; +import dev.zenfyr.pulsar.api.client.events.AfterFirstReload; import dev.zenfyr.pulsar.gametest.util.TestRunner; import dev.zenfyr.pulsar.gametest.util.Utils; import java.util.regex.Pattern; -- 2.51.2