From 0ca0a6b6b16bbcd09f8b420b0bbeb2b0cfa3ac66 Mon Sep 17 00:00:00 2001 From: zenfyr Date: Mon, 29 Jun 2026 00:34:28 +0700 Subject: [PATCH] refactor: switch dark matter to pulsar --- .github/dependabot.yml | 2 +- .../flightpanel/api/elements/AbstractConfigElement.java | 2 +- .../api/elements/AbstractNumberTextBoxElement.java | 4 ++-- .../flightpanel/api/elements/AbstractTextBoxElement.java | 2 +- .../flightpanel/api/generators/GuiProviderFactory.java | 2 +- .../me/melontini/flightpanel/api/generators/GuiRegistry.java | 2 +- src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java | 4 ++-- src/main/java/me/melontini/flightpanel/impl/TestInit.java | 2 +- .../flightpanel/impl/elements/StringTextBoxElement.java | 2 +- .../impl/elements/numbers/DoubleTextBoxElement.java | 4 ++-- .../impl/elements/numbers/FloatTextBoxElement.java | 4 ++-- .../flightpanel/impl/elements/numbers/IntTextBoxElement.java | 4 ++-- .../flightpanel/impl/elements/numbers/LongTextBoxElement.java | 4 ++-- .../impl/generators/CollapsibleObjectProviderFactory.java | 2 +- .../flightpanel/impl/generators/EnumProviderFactory.java | 2 +- .../flightpanel/impl/generators/ListProviderFactory.java | 2 +- .../flightpanel/impl/generators/PrimitiveProviderFactory.java | 2 +- .../flightpanel/impl/generators/StringProviderFactory.java | 2 +- .../flightpanel/impl/widgets/ConfigElementListWidget.java | 2 +- .../me/melontini/flightpanel/impl/widgets/IconDrawer.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 21 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4290155..1c23c94 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,7 +17,7 @@ updates: - gradle-plugins - maven-central ignore: - - dependency-name: me.melontini:dark-matter* + - dependency-name: dev.zenfyr:pulsar - dependency-name: net.fabricmc.fabric-api:fabric-api directory: / schedule: diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractConfigElement.java b/src/main/java/me/melontini/flightpanel/api/elements/AbstractConfigElement.java index 5bfa4f5..b35b1f2 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractConfigElement.java +++ b/src/main/java/me/melontini/flightpanel/api/elements/AbstractConfigElement.java @@ -1,11 +1,11 @@ package me.melontini.flightpanel.api.elements; +import dev.zenfyr.pulsar.api.util.ColorUtil; import java.util.Collection; import java.util.Collections; import java.util.List; import lombok.Getter; import lombok.experimental.Accessors; -import me.melontini.dark_matter.api.base.util.ColorUtil; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.util.ConfigScreenProxy; import me.melontini.flightpanel.api.util.SquareData; diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberTextBoxElement.java b/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberTextBoxElement.java index edeee5b..c468e0f 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberTextBoxElement.java +++ b/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberTextBoxElement.java @@ -1,9 +1,9 @@ package me.melontini.flightpanel.api.elements; +import dev.zenfyr.pulsar.api.util.Result; +import dev.zenfyr.pulsar.api.util.tuple.Tuple; import lombok.Getter; import lombok.experimental.Accessors; -import me.melontini.dark_matter.api.base.util.Result; -import me.melontini.dark_matter.api.base.util.tuple.Tuple; import me.melontini.flightpanel.api.builders.elements.numbers.RangedNumberElementBuilder; import net.minecraft.text.Text; diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractTextBoxElement.java b/src/main/java/me/melontini/flightpanel/api/elements/AbstractTextBoxElement.java index fd86dea..b32319f 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractTextBoxElement.java +++ b/src/main/java/me/melontini/flightpanel/api/elements/AbstractTextBoxElement.java @@ -1,9 +1,9 @@ package me.melontini.flightpanel.api.elements; +import dev.zenfyr.pulsar.api.util.Result; import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; import me.melontini.flightpanel.api.util.SquareData; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/GuiProviderFactory.java b/src/main/java/me/melontini/flightpanel/api/generators/GuiProviderFactory.java index 9610004..703b97b 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/GuiProviderFactory.java +++ b/src/main/java/me/melontini/flightpanel/api/generators/GuiProviderFactory.java @@ -1,6 +1,6 @@ package me.melontini.flightpanel.api.generators; -import me.melontini.dark_matter.api.base.util.Result; +import dev.zenfyr.pulsar.api.util.Result; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.elements.AbstractConfigElement; import me.melontini.flightpanel.api.generators.context.FactoryContext; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/GuiRegistry.java b/src/main/java/me/melontini/flightpanel/api/generators/GuiRegistry.java index 33dec2c..a6d952c 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/GuiRegistry.java +++ b/src/main/java/me/melontini/flightpanel/api/generators/GuiRegistry.java @@ -1,6 +1,7 @@ package me.melontini.flightpanel.api.generators; import com.google.common.collect.ImmutableList; +import dev.zenfyr.pulsar.api.util.Result; import java.lang.reflect.Field; import java.util.LinkedHashSet; import java.util.List; @@ -8,7 +9,6 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.function.Supplier; import lombok.NonNull; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.builders.elements.CollapsibleObjectBuilder; import me.melontini.flightpanel.api.elements.AbstractConfigElement; diff --git a/src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java b/src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java index 5e81223..75649f4 100644 --- a/src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java +++ b/src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java @@ -2,10 +2,10 @@ package me.melontini.flightpanel.impl; import com.google.common.collect.Maps; import com.mojang.blaze3d.systems.RenderSystem; +import dev.zenfyr.pulsar.api.util.ColorUtil; +import dev.zenfyr.pulsar.api.util.MakeSure; import java.util.*; import java.util.stream.Collectors; -import me.melontini.dark_matter.api.base.util.ColorUtil; -import me.melontini.dark_matter.api.base.util.MakeSure; import me.melontini.flightpanel.api.builders.CategoryBuilder; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.elements.AbstractConfigElement; diff --git a/src/main/java/me/melontini/flightpanel/impl/TestInit.java b/src/main/java/me/melontini/flightpanel/impl/TestInit.java index a29e91c..218f239 100644 --- a/src/main/java/me/melontini/flightpanel/impl/TestInit.java +++ b/src/main/java/me/melontini/flightpanel/impl/TestInit.java @@ -3,10 +3,10 @@ package me.melontini.flightpanel.impl; import static me.melontini.flightpanel.api.generators.Transformations.*; import com.google.common.collect.Lists; +import dev.zenfyr.pulsar.api.util.MathUtil; import java.util.List; import lombok.EqualsAndHashCode; import lombok.ToString; -import me.melontini.dark_matter.api.base.util.MathUtil; import me.melontini.flightpanel.api.builders.ConfigScreenBuilder; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.generators.GuiRegistry; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/StringTextBoxElement.java b/src/main/java/me/melontini/flightpanel/impl/elements/StringTextBoxElement.java index f481a74..8ad55bf 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/StringTextBoxElement.java +++ b/src/main/java/me/melontini/flightpanel/impl/elements/StringTextBoxElement.java @@ -1,7 +1,7 @@ package me.melontini.flightpanel.impl.elements; +import dev.zenfyr.pulsar.api.util.Result; import java.util.function.Function; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.StringTextBoxBuilder; import me.melontini.flightpanel.api.elements.AbstractTextBoxElement; import net.minecraft.text.Text; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java index 0713bba..f9435b2 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java +++ b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java @@ -1,8 +1,8 @@ package me.melontini.flightpanel.impl.elements.numbers; import com.google.common.primitives.Doubles; -import me.melontini.dark_matter.api.base.util.Result; -import me.melontini.dark_matter.api.base.util.tuple.Tuple; +import dev.zenfyr.pulsar.api.util.Result; +import dev.zenfyr.pulsar.api.util.tuple.Tuple; import me.melontini.flightpanel.api.builders.elements.numbers.DoubleTextBoxBuilder; import me.melontini.flightpanel.api.elements.AbstractNumberTextBoxElement; import net.minecraft.text.Text; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatTextBoxElement.java b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatTextBoxElement.java index 69a9756..59cb7b2 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatTextBoxElement.java +++ b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatTextBoxElement.java @@ -1,8 +1,8 @@ package me.melontini.flightpanel.impl.elements.numbers; import com.google.common.primitives.Floats; -import me.melontini.dark_matter.api.base.util.Result; -import me.melontini.dark_matter.api.base.util.tuple.Tuple; +import dev.zenfyr.pulsar.api.util.Result; +import dev.zenfyr.pulsar.api.util.tuple.Tuple; import me.melontini.flightpanel.api.builders.elements.numbers.FloatTextBoxBuilder; import me.melontini.flightpanel.api.elements.AbstractNumberTextBoxElement; import net.minecraft.text.Text; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntTextBoxElement.java b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntTextBoxElement.java index e420c45..09bfeba 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntTextBoxElement.java +++ b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntTextBoxElement.java @@ -1,8 +1,8 @@ package me.melontini.flightpanel.impl.elements.numbers; import com.google.common.primitives.Ints; -import me.melontini.dark_matter.api.base.util.Result; -import me.melontini.dark_matter.api.base.util.tuple.Tuple; +import dev.zenfyr.pulsar.api.util.Result; +import dev.zenfyr.pulsar.api.util.tuple.Tuple; import me.melontini.flightpanel.api.builders.elements.numbers.IntTextBoxBuilder; import me.melontini.flightpanel.api.elements.AbstractNumberTextBoxElement; import net.minecraft.text.Text; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongTextBoxElement.java b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongTextBoxElement.java index 5d236f2..bb29d96 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongTextBoxElement.java +++ b/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongTextBoxElement.java @@ -1,8 +1,8 @@ package me.melontini.flightpanel.impl.elements.numbers; import com.google.common.primitives.Longs; -import me.melontini.dark_matter.api.base.util.Result; -import me.melontini.dark_matter.api.base.util.tuple.Tuple; +import dev.zenfyr.pulsar.api.util.Result; +import dev.zenfyr.pulsar.api.util.tuple.Tuple; import me.melontini.flightpanel.api.builders.elements.numbers.LongTextBoxBuilder; import me.melontini.flightpanel.api.elements.AbstractNumberTextBoxElement; import net.minecraft.text.Text; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java b/src/main/java/me/melontini/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java index 8c78614..990d159 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java +++ b/src/main/java/me/melontini/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java @@ -1,10 +1,10 @@ package me.melontini.flightpanel.impl.generators; +import dev.zenfyr.pulsar.api.util.Result; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.function.Supplier; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.builders.elements.CollapsibleObjectBuilder; import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/EnumProviderFactory.java b/src/main/java/me/melontini/flightpanel/impl/generators/EnumProviderFactory.java index eace933..6674592 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/EnumProviderFactory.java +++ b/src/main/java/me/melontini/flightpanel/impl/generators/EnumProviderFactory.java @@ -1,10 +1,10 @@ package me.melontini.flightpanel.impl.generators; +import dev.zenfyr.pulsar.api.util.Result; import java.util.Arrays; import java.util.List; import java.util.function.Function; import java.util.function.Supplier; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.builders.elements.collections.ListButtonBuilder; import me.melontini.flightpanel.api.builders.elements.collections.ListSliderBuilder; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/ListProviderFactory.java b/src/main/java/me/melontini/flightpanel/impl/generators/ListProviderFactory.java index c5b6754..41828d6 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/ListProviderFactory.java +++ b/src/main/java/me/melontini/flightpanel/impl/generators/ListProviderFactory.java @@ -1,12 +1,12 @@ package me.melontini.flightpanel.impl.generators; +import dev.zenfyr.pulsar.api.util.Result; import java.lang.reflect.AnnotatedParameterizedType; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collections; import java.util.List; import java.util.function.Supplier; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.builders.elements.collections.NestedListBuilder; import me.melontini.flightpanel.api.elements.AbstractConfigElement; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/PrimitiveProviderFactory.java b/src/main/java/me/melontini/flightpanel/impl/generators/PrimitiveProviderFactory.java index 5fb4440..e7c8662 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/PrimitiveProviderFactory.java +++ b/src/main/java/me/melontini/flightpanel/impl/generators/PrimitiveProviderFactory.java @@ -3,13 +3,13 @@ package me.melontini.flightpanel.impl.generators; import static me.melontini.flightpanel.api.generators.Transformations.Range; import static me.melontini.flightpanel.api.generators.Transformations.Slider; +import dev.zenfyr.pulsar.api.util.Result; import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.builders.elements.BooleanToggleBuilder; import me.melontini.flightpanel.api.builders.elements.numbers.*; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/StringProviderFactory.java b/src/main/java/me/melontini/flightpanel/impl/generators/StringProviderFactory.java index 8500e2d..ed2b84f 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/StringProviderFactory.java +++ b/src/main/java/me/melontini/flightpanel/impl/generators/StringProviderFactory.java @@ -1,7 +1,7 @@ package me.melontini.flightpanel.impl.generators; +import dev.zenfyr.pulsar.api.util.Result; import java.util.function.Supplier; -import me.melontini.dark_matter.api.base.util.Result; import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import me.melontini.flightpanel.api.builders.elements.StringTextBoxBuilder; import me.melontini.flightpanel.api.elements.AbstractConfigElement; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/ConfigElementListWidget.java b/src/main/java/me/melontini/flightpanel/impl/widgets/ConfigElementListWidget.java index 55a4c89..7f068a4 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/ConfigElementListWidget.java +++ b/src/main/java/me/melontini/flightpanel/impl/widgets/ConfigElementListWidget.java @@ -1,12 +1,12 @@ package me.melontini.flightpanel.impl.widgets; import com.google.common.collect.ImmutableList; +import dev.zenfyr.pulsar.api.util.ColorUtil; import java.util.ArrayList; import java.util.List; import java.util.Optional; import lombok.Setter; import lombok.experimental.Accessors; -import me.melontini.dark_matter.api.base.util.ColorUtil; import me.melontini.flightpanel.api.elements.AbstractConfigElement; import me.melontini.flightpanel.api.util.ConfigScreenProxy; import me.melontini.flightpanel.api.util.SquareData; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/IconDrawer.java b/src/main/java/me/melontini/flightpanel/impl/widgets/IconDrawer.java index dd5aa5b..b823df3 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/IconDrawer.java +++ b/src/main/java/me/melontini/flightpanel/impl/widgets/IconDrawer.java @@ -1,10 +1,10 @@ package me.melontini.flightpanel.impl.widgets; +import dev.zenfyr.pulsar.api.util.ColorUtil; import lombok.Builder; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; -import me.melontini.dark_matter.api.base.util.ColorUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.util.Identifier; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 66a94c6..6bd3586 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ "depends": { "fabricloader": ">=${loader_version}", "fabric": ">=${fabric_version}", - "minecraft": ">=${minecraft_version}", - "dark-matter-base": "*" + "minecraft": "${minecraft_version}", + "pulsar": ">=${pulsar_version}" } } -- 2.51.2