From 7ed5ac9b47bd0bdbe0a800dd19b06930fe309a61 Mon Sep 17 00:00:00 2001 From: zenfyr Date: Wed, 08 Jul 2026 07:41:05 +0000 Subject: [PATCH] refactor: update pulsar stuff --- src/main/java/dev/zenfyr/commander/impl/Commander.java | 10 +++++----- src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java | 2 +- src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java | 2 +- src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java | 6 +++--- src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java | 2 +- src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java | 4 ++-- src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java | 2 +- src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java | 2 +- src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java | 2 +- src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java | 2 +- src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java | 10 +++++----- src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java | 4 ++-- src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java | 2 +- src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java | 2 +- 14 file(s) changed, 26 insertion(s)(+), 26 deletion(s)(-) diff --git a/src/main/java/dev/zenfyr/commander/impl/Commander.java b/src/main/java/dev/zenfyr/commander/impl/Commander.java --- a/src/main/java/dev/zenfyr/commander/impl/Commander.java +++ b/src/main/java/dev/zenfyr/commander/impl/Commander.java @@ -8,9 +8,9 @@ import dev.zenfyr.commander.impl.expression.extension.ExpressionLootNumberProvider; import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader; import dev.zenfyr.commander.impl.util.NbtCodecs; -import dev.zenfyr.pulsar.codec.ExtraCodecs; -import dev.zenfyr.pulsar.resources.ServerReloadersEvent; -import dev.zenfyr.pulsar.util.TextUtil; +import dev.zenfyr.pulsar.api.codec.ExtraCodecs; +import dev.zenfyr.pulsar.api.resources.ServerReloadListenersEvent; +import dev.zenfyr.pulsar.api.util.TextUtil; import java.util.List; import lombok.experimental.Accessors; import net.fabricmc.api.ModInitializer; @@ -60,9 +60,9 @@ } public void onInitialize() { - ServerReloadersEvent.EVENT.register(context -> { + ServerReloadListenersEvent.EVENT.listen(context -> { this.resetCaches(); - context.register(new ExpressionLibraryLoader()); + context.register(ExpressionLibraryLoader.RELOADER.location(), new ExpressionLibraryLoader()); }); ServerLifecycleEvents.SERVER_STOPPING.register(server -> this.resetCaches()); diff --git a/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java b/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java --- a/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java +++ b/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java @@ -2,7 +2,7 @@ import com.ezylang.evalex.data.EvaluationValue; import dev.zenfyr.commander.api.expression.Expression; -import dev.zenfyr.pulsar.loot.LootContextBuilder; +import dev.zenfyr.pulsar.api.loot.LootContextBuilder; import java.util.Map; import net.fabricmc.fabric.api.gametest.v1.FabricGameTest; import net.minecraft.gametest.framework.GameTest; diff --git a/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java b/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java --- a/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java +++ b/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java @@ -15,7 +15,7 @@ public interface ExpressionLibrary { static ExpressionLibrary get(MinecraftServer server) { - return server.pulsar$getReloader(ExpressionLibraryLoader.RELOADER); + return server.pulsar$getReloadListener(ExpressionLibraryLoader.RELOADER); } /** diff --git a/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java b/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java --- a/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java +++ b/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java @@ -16,9 +16,9 @@ import dev.zenfyr.commander.impl.expression.CmdEvalException; import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader; import dev.zenfyr.commander.impl.util.DataTarget; -import dev.zenfyr.pulsar.loot.LootContextBuilder; -import dev.zenfyr.pulsar.util.MakeSure; -import dev.zenfyr.pulsar.util.TextUtil; +import dev.zenfyr.pulsar.api.loot.LootContextBuilder; +import dev.zenfyr.pulsar.api.util.MakeSure; +import dev.zenfyr.pulsar.api.util.TextUtil; import java.util.Locale; import java.util.function.BiFunction; import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget; diff --git a/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java b/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java --- a/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java +++ b/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java @@ -14,7 +14,7 @@ import dev.zenfyr.commander.impl.Commander; import dev.zenfyr.commander.impl.expression.CmdEvalException; import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader; -import dev.zenfyr.pulsar.loot.LootContextBuilder; +import dev.zenfyr.pulsar.api.loot.LootContextBuilder; import java.math.BigDecimal; import java.util.List; import java.util.StringJoiner; diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java b/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java --- a/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java +++ b/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java @@ -16,8 +16,8 @@ import dev.zenfyr.commander.impl.expression.function.*; import dev.zenfyr.commander.impl.expression.function.ArrayOf; import dev.zenfyr.commander.impl.expression.operator.SafeOrOperator; -import dev.zenfyr.pulsar.util.ExceptionUtil; -import dev.zenfyr.pulsar.util.functions.Memoize; +import dev.zenfyr.pulsar.api.util.ExceptionUtil; +import dev.zenfyr.pulsar.api.util.functions.Memoize; import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap; import java.util.*; import java.util.function.Function; diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java b/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java --- a/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java +++ b/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java @@ -3,7 +3,7 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.mojang.serialization.Codec; -import dev.zenfyr.pulsar.codec.ExtraCodecs; +import dev.zenfyr.pulsar.api.codec.ExtraCodecs; import lombok.NonNull; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.storage.loot.parameters.LootContextParam; diff --git a/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java b/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java --- a/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java +++ b/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java @@ -9,7 +9,7 @@ import dev.zenfyr.commander.api.expression.ExpressionLibrary; import dev.zenfyr.commander.impl.Commander; import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader; -import dev.zenfyr.pulsar.loot.LootContextBuilder; +import dev.zenfyr.pulsar.api.loot.LootContextBuilder; import net.minecraft.commands.CommandBuildContext; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; diff --git a/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java b/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java --- a/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java +++ b/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java @@ -10,7 +10,7 @@ import dev.zenfyr.commander.api.expression.Expression; import dev.zenfyr.commander.api.expression.ExpressionLibrary; import dev.zenfyr.commander.impl.Commander; -import dev.zenfyr.pulsar.loot.LootContextBuilder; +import dev.zenfyr.pulsar.api.loot.LootContextBuilder; import java.util.ArrayList; import java.util.Collections; import net.minecraft.commands.CommandSourceStack; diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java --- a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java +++ b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java @@ -6,7 +6,7 @@ import com.ezylang.evalex.data.adapter.TypeAdapter; import com.ezylang.evalex.data.adapter.context.MethodAdapterContext; import com.ezylang.evalex.data.adapter.context.PropertyAdapterContext; -import dev.zenfyr.pulsar.util.functions.ThrowingSupplier; +import dev.zenfyr.pulsar.api.util.functions.ThrowingSupplier; import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap; import java.lang.invoke.*; import java.lang.reflect.Method; diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java b/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java --- a/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java +++ b/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java @@ -11,9 +11,9 @@ import dev.zenfyr.commander.api.expression.Expression; import dev.zenfyr.commander.api.expression.ExpressionLibrary; import dev.zenfyr.commander.impl.Commander; -import dev.zenfyr.pulsar.codec.JsonCodecDataLoader; -import dev.zenfyr.pulsar.resources.ReloaderType; -import dev.zenfyr.pulsar.util.TextUtil; +import dev.zenfyr.pulsar.api.codec.JsonCodecDataLoader; +import dev.zenfyr.pulsar.api.resources.ReloadListenerType; +import dev.zenfyr.pulsar.api.util.TextUtil; import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap; import java.util.Collections; import java.util.Map; @@ -30,8 +30,8 @@ new DynamicCommandExceptionType( object -> TextUtil.literal("No such expression in library %s!".formatted(object))); - public static final ReloaderType RELOADER = - ReloaderType.create(Commander.id("expression_library")); + public static final ReloadListenerType RELOADER = + ReloadListenerType.create(Commander.id("expression_library")); private Map library = new Object2ReferenceOpenHashMap<>(); private Map> cache = new Object2ReferenceOpenHashMap<>(); diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java --- a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java +++ b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java @@ -9,8 +9,8 @@ import com.ezylang.evalex.data.adapter.TypeAdapter; import com.ezylang.evalex.data.adapter.context.MethodAdapterContext; import com.google.common.collect.Lists; -import dev.zenfyr.pulsar.util.ExceptionUtil; -import dev.zenfyr.pulsar.util.Utilities; +import dev.zenfyr.pulsar.api.util.ExceptionUtil; +import dev.zenfyr.pulsar.api.util.Utilities; import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java --- a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java +++ b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java @@ -9,7 +9,7 @@ import com.ezylang.evalex.data.adapter.context.MethodAdapterContext; import com.ezylang.evalex.functions.string.StringFormatFunction; import dev.zenfyr.commander.impl.Commander; -import dev.zenfyr.pulsar.util.Utilities; +import dev.zenfyr.pulsar.api.util.Utilities; import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap; import java.util.ArrayList; import java.util.IllegalFormatException; diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java b/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java --- a/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java +++ b/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java @@ -7,7 +7,7 @@ import com.ezylang.evalex.functions.AbstractFunction; import com.ezylang.evalex.functions.FunctionParameter; import com.ezylang.evalex.parser.Token; -import dev.zenfyr.pulsar.util.MathUtil; +import dev.zenfyr.pulsar.api.util.MathUtil; @FunctionParameter(name = "min") @FunctionParameter(name = "max") -- tangled.sh