diff --git a/LICENSE b/LICENSE index 629415b..3ed4ec7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2024 melontini +Copyright (c) 2026 zenfyr Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index d8f89b5..14205a1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Flight Panel -![License MIT](https://raw.githubusercontent.com/melontini/mini-badges/main/licenses/MIT.svg) +![License MIT](https://raw.githubusercontent.com/zenfyrdev/mini-badges/v1/licenses/mit/mit.svg) > [!CAUTION] > **This project is in early stages of development!**
diff --git a/src/main/java/me/melontini/flightpanel/api/builders/CategoryBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/CategoryBuilder.java similarity index 96% rename from src/main/java/me/melontini/flightpanel/api/builders/CategoryBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/CategoryBuilder.java index 345dee6..908af27 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/CategoryBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/CategoryBuilder.java @@ -1,8 +1,8 @@ -package me.melontini.flightpanel.api.builders; +package dev.zenfyr.flightpanel.api.builders; import com.google.common.collect.ImmutableList; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; import java.util.*; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/melontini/flightpanel/api/builders/ConfigScreenBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/ConfigScreenBuilder.java similarity index 92% rename from src/main/java/me/melontini/flightpanel/api/builders/ConfigScreenBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/ConfigScreenBuilder.java index a49d305..76e7441 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/ConfigScreenBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/ConfigScreenBuilder.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.api.builders; +package dev.zenfyr.flightpanel.api.builders; +import dev.zenfyr.flightpanel.impl.ConfigScreen; import java.util.LinkedHashMap; import java.util.Map; import lombok.NonNull; -import me.melontini.flightpanel.impl.ConfigScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/BaseElementBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/BaseElementBuilder.java similarity index 92% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/BaseElementBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/BaseElementBuilder.java index 69b3ad3..1cfd52e 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/BaseElementBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/BaseElementBuilder.java @@ -1,12 +1,12 @@ -package me.melontini.flightpanel.api.builders.elements; +package dev.zenfyr.flightpanel.api.builders.elements; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.util.DataType; import java.util.Collections; import java.util.IdentityHashMap; import java.util.List; import java.util.function.Supplier; import lombok.EqualsAndHashCode; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.util.DataType; import net.minecraft.network.chat.Component; @EqualsAndHashCode diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/BooleanToggleBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/BooleanToggleBuilder.java similarity index 80% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/BooleanToggleBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/BooleanToggleBuilder.java index caaf402..39def59 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/BooleanToggleBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/BooleanToggleBuilder.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.builders.elements; +package dev.zenfyr.flightpanel.api.builders.elements; -import me.melontini.flightpanel.impl.elements.BooleanToggleElement; +import dev.zenfyr.flightpanel.impl.elements.BooleanToggleElement; import net.minecraft.network.chat.Component; public class BooleanToggleBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/CollapsibleObjectBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/CollapsibleObjectBuilder.java similarity index 95% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/CollapsibleObjectBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/CollapsibleObjectBuilder.java index 4eb3f0b..e7db22f 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/CollapsibleObjectBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/CollapsibleObjectBuilder.java @@ -1,8 +1,8 @@ -package me.melontini.flightpanel.api.builders.elements; +package dev.zenfyr.flightpanel.api.builders.elements; +import dev.zenfyr.flightpanel.api.util.DataType; +import dev.zenfyr.flightpanel.impl.elements.CollapsibleObjectElement; import java.util.*; -import me.melontini.flightpanel.api.util.DataType; -import me.melontini.flightpanel.impl.elements.CollapsibleObjectElement; import net.minecraft.network.chat.Component; import org.apache.commons.compress.utils.Lists; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/StringTextBoxBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/StringTextBoxBuilder.java similarity index 81% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/StringTextBoxBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/StringTextBoxBuilder.java index aced7c8..bf5f5f9 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/StringTextBoxBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/StringTextBoxBuilder.java @@ -1,8 +1,8 @@ -package me.melontini.flightpanel.api.builders.elements; +package dev.zenfyr.flightpanel.api.builders.elements; +import dev.zenfyr.flightpanel.api.util.DataType; +import dev.zenfyr.flightpanel.impl.elements.StringTextBoxElement; import java.util.function.Function; -import me.melontini.flightpanel.api.util.DataType; -import me.melontini.flightpanel.impl.elements.StringTextBoxElement; import net.minecraft.network.chat.Component; public class StringTextBoxBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/ValuedElementBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/ValuedElementBuilder.java similarity index 88% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/ValuedElementBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/ValuedElementBuilder.java index fa720db..5be2282 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/ValuedElementBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/ValuedElementBuilder.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.api.builders.elements; +package dev.zenfyr.flightpanel.api.builders.elements; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.DataType; import java.util.function.Consumer; import java.util.function.Supplier; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.DataType; import net.minecraft.network.chat.Component; public abstract class ValuedElementBuilder< diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListBasedBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListBasedBuilder.java similarity index 77% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListBasedBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListBasedBuilder.java index b7453a7..8539304 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListBasedBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListBasedBuilder.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.api.builders.elements.collections; +package dev.zenfyr.flightpanel.api.builders.elements.collections; +import dev.zenfyr.flightpanel.api.builders.elements.ValuedElementBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.DataType; import java.util.List; import java.util.function.Function; -import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.DataType; import net.minecraft.network.chat.Component; public abstract class ListBasedBuilder< diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListButtonBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListButtonBuilder.java similarity index 87% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListButtonBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListButtonBuilder.java index f55b934..eac5e85 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListButtonBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListButtonBuilder.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.api.builders.elements.collections; +package dev.zenfyr.flightpanel.api.builders.elements.collections; +import dev.zenfyr.flightpanel.impl.elements.collections.ListButtonElement; import java.util.Arrays; import java.util.List; import java.util.function.Function; -import me.melontini.flightpanel.impl.elements.collections.ListButtonElement; import net.minecraft.network.chat.Component; public class ListButtonBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListSliderBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListSliderBuilder.java similarity index 87% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListSliderBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListSliderBuilder.java index 83ee27f..a74d597 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/ListSliderBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/ListSliderBuilder.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.api.builders.elements.collections; +package dev.zenfyr.flightpanel.api.builders.elements.collections; +import dev.zenfyr.flightpanel.impl.elements.collections.ListSliderElement; import java.util.Arrays; import java.util.List; import java.util.function.Function; -import me.melontini.flightpanel.impl.elements.collections.ListSliderElement; import net.minecraft.network.chat.Component; public class ListSliderBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/NestedListBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/NestedListBuilder.java similarity index 83% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/collections/NestedListBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/NestedListBuilder.java index 82f1a07..9d66a4a 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/collections/NestedListBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/collections/NestedListBuilder.java @@ -1,13 +1,13 @@ -package me.melontini.flightpanel.api.builders.elements.collections; +package dev.zenfyr.flightpanel.api.builders.elements.collections; +import dev.zenfyr.flightpanel.api.builders.elements.CollapsibleObjectBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.ValuedElementBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.DataType; +import dev.zenfyr.flightpanel.impl.elements.collections.NestedListElement; import java.util.List; import java.util.function.BiFunction; import java.util.function.Supplier; -import me.melontini.flightpanel.api.builders.elements.CollapsibleObjectBuilder; -import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.DataType; -import me.melontini.flightpanel.impl.elements.collections.NestedListElement; import net.minecraft.network.chat.Component; public class NestedListBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/DoubleSliderBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/DoubleSliderBuilder.java similarity index 83% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/DoubleSliderBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/DoubleSliderBuilder.java index c6a5bf0..355f4ad 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/DoubleSliderBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/DoubleSliderBuilder.java @@ -1,8 +1,8 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; +import dev.zenfyr.flightpanel.api.util.DataType; +import dev.zenfyr.flightpanel.impl.elements.numbers.DoubleSliderElement; import java.math.RoundingMode; -import me.melontini.flightpanel.api.util.DataType; -import me.melontini.flightpanel.impl.elements.numbers.DoubleSliderElement; import net.minecraft.network.chat.Component; public class DoubleSliderBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/DoubleTextBoxBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/DoubleTextBoxBuilder.java similarity index 79% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/DoubleTextBoxBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/DoubleTextBoxBuilder.java index 6d7a38c..474b3fc 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/DoubleTextBoxBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/DoubleTextBoxBuilder.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; -import me.melontini.flightpanel.impl.elements.numbers.DoubleTextBoxElement; +import dev.zenfyr.flightpanel.impl.elements.numbers.DoubleTextBoxElement; import net.minecraft.network.chat.Component; public class DoubleTextBoxBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/FloatSliderBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/FloatSliderBuilder.java similarity index 86% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/FloatSliderBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/FloatSliderBuilder.java index 93e2353..75832e1 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/FloatSliderBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/FloatSliderBuilder.java @@ -1,7 +1,7 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; +import dev.zenfyr.flightpanel.impl.elements.numbers.FloatSliderElement; import java.math.RoundingMode; -import me.melontini.flightpanel.impl.elements.numbers.FloatSliderElement; import net.minecraft.network.chat.Component; public class FloatSliderBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/FloatTextBoxBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/FloatTextBoxBuilder.java similarity index 78% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/FloatTextBoxBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/FloatTextBoxBuilder.java index 70f87d0..76ec7bf 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/FloatTextBoxBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/FloatTextBoxBuilder.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; -import me.melontini.flightpanel.impl.elements.numbers.FloatTextBoxElement; +import dev.zenfyr.flightpanel.impl.elements.numbers.FloatTextBoxElement; import net.minecraft.network.chat.Component; public class FloatTextBoxBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/IntSliderBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/IntSliderBuilder.java similarity index 80% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/IntSliderBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/IntSliderBuilder.java index 6d1b8dc..5fb1539 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/IntSliderBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/IntSliderBuilder.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; -import me.melontini.flightpanel.impl.elements.numbers.IntSliderElement; +import dev.zenfyr.flightpanel.impl.elements.numbers.IntSliderElement; import net.minecraft.network.chat.Component; public class IntSliderBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/IntTextBoxBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/IntTextBoxBuilder.java similarity index 78% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/IntTextBoxBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/IntTextBoxBuilder.java index 1adb2c5..9a7ca7d 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/IntTextBoxBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/IntTextBoxBuilder.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; -import me.melontini.flightpanel.impl.elements.numbers.IntTextBoxElement; +import dev.zenfyr.flightpanel.impl.elements.numbers.IntTextBoxElement; import net.minecraft.network.chat.Component; public class IntTextBoxBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/LongSliderBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/LongSliderBuilder.java similarity index 81% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/LongSliderBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/LongSliderBuilder.java index e269672..f3d92d7 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/LongSliderBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/LongSliderBuilder.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; -import me.melontini.flightpanel.impl.elements.numbers.LongSliderElement; +import dev.zenfyr.flightpanel.impl.elements.numbers.LongSliderElement; import net.minecraft.network.chat.Component; public class LongSliderBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/LongTextBoxBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/LongTextBoxBuilder.java similarity index 78% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/LongTextBoxBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/LongTextBoxBuilder.java index 4d55ca5..b1ab4e6 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/LongTextBoxBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/LongTextBoxBuilder.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; -import me.melontini.flightpanel.impl.elements.numbers.LongTextBoxElement; +import dev.zenfyr.flightpanel.impl.elements.numbers.LongTextBoxElement; import net.minecraft.network.chat.Component; public class LongTextBoxBuilder diff --git a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/RangedNumberElementBuilder.java b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/RangedNumberElementBuilder.java similarity index 74% rename from src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/RangedNumberElementBuilder.java rename to src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/RangedNumberElementBuilder.java index c1923e6..99ec214 100644 --- a/src/main/java/me/melontini/flightpanel/api/builders/elements/numbers/RangedNumberElementBuilder.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/builders/elements/numbers/RangedNumberElementBuilder.java @@ -1,8 +1,8 @@ -package me.melontini.flightpanel.api.builders.elements.numbers; +package dev.zenfyr.flightpanel.api.builders.elements.numbers; -import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.DataType; +import dev.zenfyr.flightpanel.api.builders.elements.ValuedElementBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.DataType; import net.minecraft.network.chat.Component; public abstract class RangedNumberElementBuilder< diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractConfigElement.java b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractConfigElement.java similarity index 95% rename from src/main/java/me/melontini/flightpanel/api/elements/AbstractConfigElement.java rename to src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractConfigElement.java index 7e5383c..e6ee0cc 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractConfigElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractConfigElement.java @@ -1,16 +1,16 @@ -package me.melontini.flightpanel.api.elements; +package dev.zenfyr.flightpanel.api.elements; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.util.ConfigScreenProxy; +import dev.zenfyr.flightpanel.api.util.SquareData; +import dev.zenfyr.flightpanel.impl.ConfigScreen; +import dev.zenfyr.flightpanel.impl.util.TextUtil; 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.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.util.ConfigScreenProxy; -import me.melontini.flightpanel.api.util.SquareData; -import me.melontini.flightpanel.impl.ConfigScreen; -import me.melontini.flightpanel.impl.util.TextUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberSliderElement.java b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractNumberSliderElement.java similarity index 78% rename from src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberSliderElement.java rename to src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractNumberSliderElement.java index a379721..a64aec7 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberSliderElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractNumberSliderElement.java @@ -1,8 +1,8 @@ -package me.melontini.flightpanel.api.elements; +package dev.zenfyr.flightpanel.api.elements; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.RangedNumberElementBuilder; import lombok.Getter; import lombok.experimental.Accessors; -import me.melontini.flightpanel.api.builders.elements.numbers.RangedNumberElementBuilder; @Accessors(fluent = true) public abstract class AbstractNumberSliderElement< diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberTextBoxElement.java b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractNumberTextBoxElement.java similarity index 92% rename from src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberTextBoxElement.java rename to src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractNumberTextBoxElement.java index b88b377..3ada541 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractNumberTextBoxElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractNumberTextBoxElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.api.elements; +package dev.zenfyr.flightpanel.api.elements; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.RangedNumberElementBuilder; 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.flightpanel.api.builders.elements.numbers.RangedNumberElementBuilder; import net.minecraft.network.chat.Component; @Accessors(fluent = true) diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractSliderElement.java b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractSliderElement.java similarity index 93% rename from src/main/java/me/melontini/flightpanel/api/elements/AbstractSliderElement.java rename to src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractSliderElement.java index 9545e4b..e61c4b3 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractSliderElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractSliderElement.java @@ -1,8 +1,8 @@ -package me.melontini.flightpanel.api.elements; +package dev.zenfyr.flightpanel.api.elements; +import dev.zenfyr.flightpanel.api.builders.elements.ValuedElementBuilder; +import dev.zenfyr.flightpanel.api.util.SquareData; import java.util.List; -import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; -import me.melontini.flightpanel.api.util.SquareData; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractSliderButton; import net.minecraft.client.gui.components.events.GuiEventListener; diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractTextBoxElement.java b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractTextBoxElement.java similarity index 94% rename from src/main/java/me/melontini/flightpanel/api/elements/AbstractTextBoxElement.java rename to src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractTextBoxElement.java index e50debe..add2225 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractTextBoxElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractTextBoxElement.java @@ -1,11 +1,11 @@ -package me.melontini.flightpanel.api.elements; +package dev.zenfyr.flightpanel.api.elements; +import dev.zenfyr.flightpanel.api.builders.elements.ValuedElementBuilder; +import dev.zenfyr.flightpanel.api.util.SquareData; import dev.zenfyr.pulsar.api.util.Result; import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; -import me.melontini.flightpanel.api.util.SquareData; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.events.GuiEventListener; diff --git a/src/main/java/me/melontini/flightpanel/api/elements/AbstractValuedElement.java b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractValuedElement.java similarity index 95% rename from src/main/java/me/melontini/flightpanel/api/elements/AbstractValuedElement.java rename to src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractValuedElement.java index 55d6642..78f7bf1 100644 --- a/src/main/java/me/melontini/flightpanel/api/elements/AbstractValuedElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/elements/AbstractValuedElement.java @@ -1,5 +1,8 @@ -package me.melontini.flightpanel.api.elements; +package dev.zenfyr.flightpanel.api.elements; +import dev.zenfyr.flightpanel.api.builders.elements.ValuedElementBuilder; +import dev.zenfyr.flightpanel.api.util.SquareData; +import dev.zenfyr.flightpanel.impl.widgets.IconDrawer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -11,9 +14,6 @@ import java.util.function.Supplier; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; -import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; -import me.melontini.flightpanel.api.util.SquareData; -import me.melontini.flightpanel.impl.widgets.IconDrawer; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/DefaultElements.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/DefaultElements.java similarity index 88% rename from src/main/java/me/melontini/flightpanel/api/generators/DefaultElements.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/DefaultElements.java index b37a3d5..a3ad020 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/DefaultElements.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/DefaultElements.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.generators; +package dev.zenfyr.flightpanel.api.generators; -import me.melontini.flightpanel.impl.generators.*; +import dev.zenfyr.flightpanel.impl.generators.*; public class DefaultElements { diff --git a/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiFieldTransformer.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiFieldTransformer.java new file mode 100644 index 0000000..9e197df --- /dev/null +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiFieldTransformer.java @@ -0,0 +1,10 @@ +package dev.zenfyr.flightpanel.api.generators; + +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; +import java.lang.reflect.Field; + +public interface GuiFieldTransformer { + + void transform(BaseElementBuilder builder, Field field, ProviderContext context); +} diff --git a/src/main/java/me/melontini/flightpanel/api/generators/GuiProvider.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiProvider.java similarity index 69% rename from src/main/java/me/melontini/flightpanel/api/generators/GuiProvider.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/GuiProvider.java index 403f683..175da1d 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/GuiProvider.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiProvider.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.api.generators; +package dev.zenfyr.flightpanel.api.generators; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; import java.util.Optional; import java.util.function.Supplier; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.generators.context.ProviderContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/GuiProviderFactory.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiProviderFactory.java similarity index 57% rename from src/main/java/me/melontini/flightpanel/api/generators/GuiProviderFactory.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/GuiProviderFactory.java index 703b97b..c23edbd 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/GuiProviderFactory.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiProviderFactory.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.api.generators; +package dev.zenfyr.flightpanel.api.generators; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.generators.context.FactoryContext; 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; import org.jetbrains.annotations.NotNull; public interface GuiProviderFactory { diff --git a/src/main/java/me/melontini/flightpanel/api/generators/GuiRegistry.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiRegistry.java similarity index 86% rename from src/main/java/me/melontini/flightpanel/api/generators/GuiRegistry.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/GuiRegistry.java index a6d952c..3efa62a 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/GuiRegistry.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/GuiRegistry.java @@ -1,6 +1,14 @@ -package me.melontini.flightpanel.api.generators; +package dev.zenfyr.flightpanel.api.generators; import com.google.common.collect.ImmutableList; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.CollapsibleObjectBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.generators.context.FactoryContext; +import dev.zenfyr.flightpanel.api.generators.context.HierarchyAccessor; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; +import dev.zenfyr.flightpanel.api.generators.context.TypeContext; +import dev.zenfyr.flightpanel.impl.generators.CollapsibleObjectProviderFactory; import dev.zenfyr.pulsar.api.util.Result; import java.lang.reflect.Field; import java.util.LinkedHashSet; @@ -9,14 +17,6 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.function.Supplier; import lombok.NonNull; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.builders.elements.CollapsibleObjectBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.generators.context.FactoryContext; -import me.melontini.flightpanel.api.generators.context.HierarchyAccessor; -import me.melontini.flightpanel.api.generators.context.ProviderContext; -import me.melontini.flightpanel.api.generators.context.TypeContext; -import me.melontini.flightpanel.impl.generators.CollapsibleObjectProviderFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/Transformations.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/Transformations.java similarity index 96% rename from src/main/java/me/melontini/flightpanel/api/generators/Transformations.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/Transformations.java index 1d954f8..cf15d13 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/Transformations.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/Transformations.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.api.generators; +package dev.zenfyr.flightpanel.api.generators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/context/FactoryContext.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/FactoryContext.java similarity index 80% rename from src/main/java/me/melontini/flightpanel/api/generators/context/FactoryContext.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/context/FactoryContext.java index b5a1db6..0cd7c93 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/context/FactoryContext.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/FactoryContext.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.api.generators.context; +package dev.zenfyr.flightpanel.api.generators.context; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/context/HierarchyAccessor.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/HierarchyAccessor.java similarity index 96% rename from src/main/java/me/melontini/flightpanel/api/generators/context/HierarchyAccessor.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/context/HierarchyAccessor.java index d22fa89..33431e9 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/context/HierarchyAccessor.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/HierarchyAccessor.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.api.generators.context; +package dev.zenfyr.flightpanel.api.generators.context; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedType; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/context/ProviderContext.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/ProviderContext.java similarity index 87% rename from src/main/java/me/melontini/flightpanel/api/generators/context/ProviderContext.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/context/ProviderContext.java index 0991b9c..775987e 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/context/ProviderContext.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/ProviderContext.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.api.generators.context; +package dev.zenfyr.flightpanel.api.generators.context; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/context/TypeContext.java b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/TypeContext.java similarity index 92% rename from src/main/java/me/melontini/flightpanel/api/generators/context/TypeContext.java rename to src/main/java/dev/zenfyr/flightpanel/api/generators/context/TypeContext.java index e926bd0..841c6b8 100644 --- a/src/main/java/me/melontini/flightpanel/api/generators/context/TypeContext.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/generators/context/TypeContext.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.api.generators.context; +package dev.zenfyr.flightpanel.api.generators.context; import com.google.gson.reflect.TypeToken; import java.lang.reflect.AnnotatedType; diff --git a/src/main/java/me/melontini/flightpanel/api/util/ConfigScreenProxy.java b/src/main/java/dev/zenfyr/flightpanel/api/util/ConfigScreenProxy.java similarity index 74% rename from src/main/java/me/melontini/flightpanel/api/util/ConfigScreenProxy.java rename to src/main/java/dev/zenfyr/flightpanel/api/util/ConfigScreenProxy.java index 612ce5b..f3ee286 100644 --- a/src/main/java/me/melontini/flightpanel/api/util/ConfigScreenProxy.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/util/ConfigScreenProxy.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.util; +package dev.zenfyr.flightpanel.api.util; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; public interface ConfigScreenProxy { diff --git a/src/main/java/me/melontini/flightpanel/api/util/DataType.java b/src/main/java/dev/zenfyr/flightpanel/api/util/DataType.java similarity index 70% rename from src/main/java/me/melontini/flightpanel/api/util/DataType.java rename to src/main/java/dev/zenfyr/flightpanel/api/util/DataType.java index 7151cd7..1e9d3dc 100644 --- a/src/main/java/me/melontini/flightpanel/api/util/DataType.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/util/DataType.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.api.util; +package dev.zenfyr.flightpanel.api.util; public class DataType { diff --git a/src/main/java/me/melontini/flightpanel/api/util/SquareData.java b/src/main/java/dev/zenfyr/flightpanel/api/util/SquareData.java similarity index 90% rename from src/main/java/me/melontini/flightpanel/api/util/SquareData.java rename to src/main/java/dev/zenfyr/flightpanel/api/util/SquareData.java index b8b1e60..15f894b 100644 --- a/src/main/java/me/melontini/flightpanel/api/util/SquareData.java +++ b/src/main/java/dev/zenfyr/flightpanel/api/util/SquareData.java @@ -1,6 +1,6 @@ -package me.melontini.flightpanel.api.util; +package dev.zenfyr.flightpanel.api.util; -import me.melontini.flightpanel.impl.widgets.ConfigElementListWidget; +import dev.zenfyr.flightpanel.impl.widgets.ConfigElementListWidget; public record SquareData(int x, int y, int endX, int endY, int width, int height) { diff --git a/src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java b/src/main/java/dev/zenfyr/flightpanel/impl/ConfigScreen.java similarity index 95% rename from src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java rename to src/main/java/dev/zenfyr/flightpanel/impl/ConfigScreen.java index 31ed6f9..c2bcd9a 100644 --- a/src/main/java/me/melontini/flightpanel/impl/ConfigScreen.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/ConfigScreen.java @@ -1,20 +1,20 @@ -package me.melontini.flightpanel.impl; +package dev.zenfyr.flightpanel.impl; import com.google.common.collect.Maps; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; +import dev.zenfyr.flightpanel.api.builders.CategoryBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.util.ConfigScreenProxy; +import dev.zenfyr.flightpanel.impl.widgets.ConfigElementListWidget; +import dev.zenfyr.flightpanel.impl.widgets.OptionInfoWidget; +import dev.zenfyr.flightpanel.impl.widgets.tab.TabManager; +import dev.zenfyr.flightpanel.impl.widgets.tab.TabNavigationWidget; 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.flightpanel.api.builders.CategoryBuilder; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.util.ConfigScreenProxy; -import me.melontini.flightpanel.impl.widgets.ConfigElementListWidget; -import me.melontini.flightpanel.impl.widgets.OptionInfoWidget; -import me.melontini.flightpanel.impl.widgets.tab.TabManager; -import me.melontini.flightpanel.impl.widgets.tab.TabNavigationWidget; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; diff --git a/src/main/java/me/melontini/flightpanel/impl/TestInit.java b/src/main/java/dev/zenfyr/flightpanel/impl/TestInit.java similarity index 90% rename from src/main/java/me/melontini/flightpanel/impl/TestInit.java rename to src/main/java/dev/zenfyr/flightpanel/impl/TestInit.java index 9c0c2fe..364cf24 100644 --- a/src/main/java/me/melontini/flightpanel/impl/TestInit.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/TestInit.java @@ -1,15 +1,15 @@ -package me.melontini.flightpanel.impl; +package dev.zenfyr.flightpanel.impl; -import static me.melontini.flightpanel.api.generators.Transformations.*; +import static dev.zenfyr.flightpanel.api.generators.Transformations.*; import com.google.common.collect.Lists; +import dev.zenfyr.flightpanel.api.builders.ConfigScreenBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.generators.GuiRegistry; import dev.zenfyr.pulsar.api.util.MathUtil; import java.util.List; import lombok.EqualsAndHashCode; import lombok.ToString; -import me.melontini.flightpanel.api.builders.ConfigScreenBuilder; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.generators.GuiRegistry; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; import net.minecraft.client.gui.screens.OptionsScreen; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/BooleanToggleElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/BooleanToggleElement.java similarity index 89% rename from src/main/java/me/melontini/flightpanel/impl/elements/BooleanToggleElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/BooleanToggleElement.java index 6b200b7..0bc826f 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/BooleanToggleElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/BooleanToggleElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.impl.elements; +package dev.zenfyr.flightpanel.impl.elements; +import dev.zenfyr.flightpanel.api.builders.elements.BooleanToggleBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.SquareData; import java.util.List; import java.util.function.Supplier; -import me.melontini.flightpanel.api.builders.elements.BooleanToggleBuilder; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.SquareData; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/CollapsibleObjectElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/CollapsibleObjectElement.java similarity index 91% rename from src/main/java/me/melontini/flightpanel/impl/elements/CollapsibleObjectElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/CollapsibleObjectElement.java index c53de28..23e8314 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/CollapsibleObjectElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/CollapsibleObjectElement.java @@ -1,12 +1,12 @@ -package me.melontini.flightpanel.impl.elements; - +package dev.zenfyr.flightpanel.impl.elements; + +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.CollapsibleObjectBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.SquareData; +import dev.zenfyr.flightpanel.impl.widgets.IconDrawer; import java.util.*; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.builders.elements.CollapsibleObjectBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.SquareData; -import me.melontini.flightpanel.impl.widgets.IconDrawer; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/StringTextBoxElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/StringTextBoxElement.java similarity index 79% rename from src/main/java/me/melontini/flightpanel/impl/elements/StringTextBoxElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/StringTextBoxElement.java index 952bbed..515c94f 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/StringTextBoxElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/StringTextBoxElement.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.impl.elements; +package dev.zenfyr.flightpanel.impl.elements; +import dev.zenfyr.flightpanel.api.builders.elements.StringTextBoxBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractTextBoxElement; import dev.zenfyr.pulsar.api.util.Result; import java.util.function.Function; -import me.melontini.flightpanel.api.builders.elements.StringTextBoxBuilder; -import me.melontini.flightpanel.api.elements.AbstractTextBoxElement; import net.minecraft.network.chat.Component; public class StringTextBoxElement extends AbstractTextBoxElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/collections/ListButtonElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/ListButtonElement.java similarity index 87% rename from src/main/java/me/melontini/flightpanel/impl/elements/collections/ListButtonElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/ListButtonElement.java index 243ca7b..814d7c1 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/collections/ListButtonElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/ListButtonElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.impl.elements.collections; +package dev.zenfyr.flightpanel.impl.elements.collections; +import dev.zenfyr.flightpanel.api.builders.elements.collections.ListButtonBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.SquareData; import java.util.List; import java.util.function.Function; -import me.melontini.flightpanel.api.builders.elements.collections.ListButtonBuilder; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.SquareData; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/collections/ListSliderElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/ListSliderElement.java similarity index 80% rename from src/main/java/me/melontini/flightpanel/impl/elements/collections/ListSliderElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/ListSliderElement.java index 7d918ca..750bb8d 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/collections/ListSliderElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/ListSliderElement.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.impl.elements.collections; +package dev.zenfyr.flightpanel.impl.elements.collections; +import dev.zenfyr.flightpanel.api.builders.elements.collections.ListSliderBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractSliderElement; import java.util.List; import java.util.function.Function; -import me.melontini.flightpanel.api.builders.elements.collections.ListSliderBuilder; -import me.melontini.flightpanel.api.elements.AbstractSliderElement; import net.minecraft.network.chat.Component; public class ListSliderElement extends AbstractSliderElement> { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/collections/NestedListElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/NestedListElement.java similarity index 95% rename from src/main/java/me/melontini/flightpanel/impl/elements/collections/NestedListElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/NestedListElement.java index f3620a0..c49fd83 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/collections/NestedListElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/collections/NestedListElement.java @@ -1,15 +1,15 @@ -package me.melontini.flightpanel.impl.elements.collections; - +package dev.zenfyr.flightpanel.impl.elements.collections; + +import dev.zenfyr.flightpanel.api.builders.elements.CollapsibleObjectBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.collections.NestedListBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.util.SquareData; +import dev.zenfyr.flightpanel.impl.widgets.IconDrawer; import java.util.*; import java.util.function.BiFunction; import java.util.function.Supplier; import java.util.stream.Stream; -import me.melontini.flightpanel.api.builders.elements.CollapsibleObjectBuilder; -import me.melontini.flightpanel.api.builders.elements.collections.NestedListBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.util.SquareData; -import me.melontini.flightpanel.impl.widgets.IconDrawer; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleSliderElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/DoubleSliderElement.java similarity index 82% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleSliderElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/DoubleSliderElement.java index 54ec468..cdf0e18 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleSliderElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/DoubleSliderElement.java @@ -1,9 +1,9 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.DoubleSliderBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberSliderElement; import java.math.BigDecimal; import java.math.RoundingMode; -import me.melontini.flightpanel.api.builders.elements.numbers.DoubleSliderBuilder; -import me.melontini.flightpanel.api.elements.AbstractNumberSliderElement; import net.minecraft.network.chat.Component; public class DoubleSliderElement extends AbstractNumberSliderElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java similarity index 81% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java index 229b923..aa61871 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/DoubleTextBoxElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; import com.google.common.primitives.Doubles; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.DoubleTextBoxBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberTextBoxElement; 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.network.chat.Component; public class DoubleTextBoxElement diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatSliderElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/FloatSliderElement.java similarity index 76% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatSliderElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/FloatSliderElement.java index 4280133..0004783 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatSliderElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/FloatSliderElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.DoubleSliderBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.FloatSliderBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberSliderElement; import java.math.BigDecimal; import java.math.RoundingMode; -import me.melontini.flightpanel.api.builders.elements.numbers.DoubleSliderBuilder; -import me.melontini.flightpanel.api.builders.elements.numbers.FloatSliderBuilder; -import me.melontini.flightpanel.api.elements.AbstractNumberSliderElement; import net.minecraft.network.chat.Component; public class FloatSliderElement extends AbstractNumberSliderElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatTextBoxElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/FloatTextBoxElement.java similarity index 81% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatTextBoxElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/FloatTextBoxElement.java index d9035bd..1582dc1 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/FloatTextBoxElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/FloatTextBoxElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; import com.google.common.primitives.Floats; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.FloatTextBoxBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberTextBoxElement; 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.network.chat.Component; public class FloatTextBoxElement extends AbstractNumberTextBoxElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntSliderElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/IntSliderElement.java similarity index 74% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntSliderElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/IntSliderElement.java index c0b4747..46d06ef 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntSliderElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/IntSliderElement.java @@ -1,7 +1,7 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; -import me.melontini.flightpanel.api.builders.elements.numbers.IntSliderBuilder; -import me.melontini.flightpanel.api.elements.AbstractNumberSliderElement; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.IntSliderBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberSliderElement; import net.minecraft.network.chat.Component; public class IntSliderElement extends AbstractNumberSliderElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntTextBoxElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/IntTextBoxElement.java similarity index 81% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntTextBoxElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/IntTextBoxElement.java index 11dee4e..75e76f0 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/IntTextBoxElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/IntTextBoxElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; import com.google.common.primitives.Ints; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.IntTextBoxBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberTextBoxElement; 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.network.chat.Component; public class IntTextBoxElement extends AbstractNumberTextBoxElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongSliderElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/LongSliderElement.java similarity index 74% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongSliderElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/LongSliderElement.java index 6249828..ad06ef7 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongSliderElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/LongSliderElement.java @@ -1,7 +1,7 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; -import me.melontini.flightpanel.api.builders.elements.numbers.LongSliderBuilder; -import me.melontini.flightpanel.api.elements.AbstractNumberSliderElement; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.LongSliderBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberSliderElement; import net.minecraft.network.chat.Component; public class LongSliderElement extends AbstractNumberSliderElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongTextBoxElement.java b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/LongTextBoxElement.java similarity index 81% rename from src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongTextBoxElement.java rename to src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/LongTextBoxElement.java index a658df9..a9a72bc 100644 --- a/src/main/java/me/melontini/flightpanel/impl/elements/numbers/LongTextBoxElement.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/elements/numbers/LongTextBoxElement.java @@ -1,10 +1,10 @@ -package me.melontini.flightpanel.impl.elements.numbers; +package dev.zenfyr.flightpanel.impl.elements.numbers; import com.google.common.primitives.Longs; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.LongTextBoxBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractNumberTextBoxElement; 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.network.chat.Component; public class LongTextBoxElement extends AbstractNumberTextBoxElement { diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java b/src/main/java/dev/zenfyr/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java similarity index 86% rename from src/main/java/me/melontini/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java rename to src/main/java/dev/zenfyr/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java index 8b4d373..bf529c0 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/generators/CollapsibleObjectProviderFactory.java @@ -1,23 +1,23 @@ -package me.melontini.flightpanel.impl.generators; - +package dev.zenfyr.flightpanel.impl.generators; + +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.CollapsibleObjectBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.ValuedElementBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.generators.GuiProvider; +import dev.zenfyr.flightpanel.api.generators.GuiProviderFactory; +import dev.zenfyr.flightpanel.api.generators.GuiRegistry; +import dev.zenfyr.flightpanel.api.generators.Transformations; +import dev.zenfyr.flightpanel.api.generators.context.FactoryContext; +import dev.zenfyr.flightpanel.api.generators.context.HierarchyAccessor; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; +import dev.zenfyr.flightpanel.api.generators.context.TypeContext; +import dev.zenfyr.flightpanel.impl.elements.CollapsibleObjectElement; 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.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.builders.elements.CollapsibleObjectBuilder; -import me.melontini.flightpanel.api.builders.elements.ValuedElementBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.generators.GuiProvider; -import me.melontini.flightpanel.api.generators.GuiProviderFactory; -import me.melontini.flightpanel.api.generators.GuiRegistry; -import me.melontini.flightpanel.api.generators.Transformations; -import me.melontini.flightpanel.api.generators.context.FactoryContext; -import me.melontini.flightpanel.api.generators.context.HierarchyAccessor; -import me.melontini.flightpanel.api.generators.context.ProviderContext; -import me.melontini.flightpanel.api.generators.context.TypeContext; -import me.melontini.flightpanel.impl.elements.CollapsibleObjectElement; import net.minecraft.network.chat.Component; import org.apache.commons.lang3.ClassUtils; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/EnumProviderFactory.java b/src/main/java/dev/zenfyr/flightpanel/impl/generators/EnumProviderFactory.java similarity index 76% rename from src/main/java/me/melontini/flightpanel/impl/generators/EnumProviderFactory.java rename to src/main/java/dev/zenfyr/flightpanel/impl/generators/EnumProviderFactory.java index 694c89b..39b2fdf 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/EnumProviderFactory.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/generators/EnumProviderFactory.java @@ -1,22 +1,22 @@ -package me.melontini.flightpanel.impl.generators; +package dev.zenfyr.flightpanel.impl.generators; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.collections.ListButtonBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.collections.ListSliderBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.generators.GuiProvider; +import dev.zenfyr.flightpanel.api.generators.GuiProviderFactory; +import dev.zenfyr.flightpanel.api.generators.GuiRegistry; +import dev.zenfyr.flightpanel.api.generators.Transformations; +import dev.zenfyr.flightpanel.api.generators.context.FactoryContext; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; +import dev.zenfyr.flightpanel.impl.elements.collections.ListButtonElement; +import dev.zenfyr.flightpanel.impl.elements.collections.ListSliderElement; 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.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.builders.elements.collections.ListButtonBuilder; -import me.melontini.flightpanel.api.builders.elements.collections.ListSliderBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.generators.GuiProvider; -import me.melontini.flightpanel.api.generators.GuiProviderFactory; -import me.melontini.flightpanel.api.generators.GuiRegistry; -import me.melontini.flightpanel.api.generators.Transformations; -import me.melontini.flightpanel.api.generators.context.FactoryContext; -import me.melontini.flightpanel.api.generators.context.ProviderContext; -import me.melontini.flightpanel.impl.elements.collections.ListButtonElement; -import me.melontini.flightpanel.impl.elements.collections.ListSliderElement; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/ListProviderFactory.java b/src/main/java/dev/zenfyr/flightpanel/impl/generators/ListProviderFactory.java similarity index 73% rename from src/main/java/me/melontini/flightpanel/impl/generators/ListProviderFactory.java rename to src/main/java/dev/zenfyr/flightpanel/impl/generators/ListProviderFactory.java index 41828d6..d3c36b9 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/ListProviderFactory.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/generators/ListProviderFactory.java @@ -1,5 +1,16 @@ -package me.melontini.flightpanel.impl.generators; +package dev.zenfyr.flightpanel.impl.generators; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.collections.NestedListBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.elements.AbstractValuedElement; +import dev.zenfyr.flightpanel.api.generators.GuiProvider; +import dev.zenfyr.flightpanel.api.generators.GuiProviderFactory; +import dev.zenfyr.flightpanel.api.generators.GuiRegistry; +import dev.zenfyr.flightpanel.api.generators.context.FactoryContext; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; +import dev.zenfyr.flightpanel.api.generators.context.TypeContext; +import dev.zenfyr.flightpanel.impl.elements.collections.NestedListElement; import dev.zenfyr.pulsar.api.util.Result; import java.lang.reflect.AnnotatedParameterizedType; import java.lang.reflect.ParameterizedType; @@ -7,17 +18,6 @@ import java.lang.reflect.Type; import java.util.Collections; import java.util.List; import java.util.function.Supplier; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.builders.elements.collections.NestedListBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.elements.AbstractValuedElement; -import me.melontini.flightpanel.api.generators.GuiProvider; -import me.melontini.flightpanel.api.generators.GuiProviderFactory; -import me.melontini.flightpanel.api.generators.GuiRegistry; -import me.melontini.flightpanel.api.generators.context.FactoryContext; -import me.melontini.flightpanel.api.generators.context.ProviderContext; -import me.melontini.flightpanel.api.generators.context.TypeContext; -import me.melontini.flightpanel.impl.elements.collections.NestedListElement; import org.jetbrains.annotations.NotNull; public class ListProviderFactory implements GuiProviderFactory { diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/PrimitiveProviderFactory.java b/src/main/java/dev/zenfyr/flightpanel/impl/generators/PrimitiveProviderFactory.java similarity index 88% rename from src/main/java/me/melontini/flightpanel/impl/generators/PrimitiveProviderFactory.java rename to src/main/java/dev/zenfyr/flightpanel/impl/generators/PrimitiveProviderFactory.java index e7c8662..cf6451d 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/PrimitiveProviderFactory.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/generators/PrimitiveProviderFactory.java @@ -1,8 +1,19 @@ -package me.melontini.flightpanel.impl.generators; - -import static me.melontini.flightpanel.api.generators.Transformations.Range; -import static me.melontini.flightpanel.api.generators.Transformations.Slider; - +package dev.zenfyr.flightpanel.impl.generators; + +import static dev.zenfyr.flightpanel.api.generators.Transformations.Range; +import static dev.zenfyr.flightpanel.api.generators.Transformations.Slider; + +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.BooleanToggleBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.numbers.*; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.generators.GuiProvider; +import dev.zenfyr.flightpanel.api.generators.GuiProviderFactory; +import dev.zenfyr.flightpanel.api.generators.GuiRegistry; +import dev.zenfyr.flightpanel.api.generators.context.FactoryContext; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; +import dev.zenfyr.flightpanel.impl.elements.BooleanToggleElement; +import dev.zenfyr.flightpanel.impl.elements.numbers.*; import dev.zenfyr.pulsar.api.util.Result; import java.util.HashMap; import java.util.Map; @@ -10,17 +21,6 @@ import java.util.Objects; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.builders.elements.BooleanToggleBuilder; -import me.melontini.flightpanel.api.builders.elements.numbers.*; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.generators.GuiProvider; -import me.melontini.flightpanel.api.generators.GuiProviderFactory; -import me.melontini.flightpanel.api.generators.GuiRegistry; -import me.melontini.flightpanel.api.generators.context.FactoryContext; -import me.melontini.flightpanel.api.generators.context.ProviderContext; -import me.melontini.flightpanel.impl.elements.BooleanToggleElement; -import me.melontini.flightpanel.impl.elements.numbers.*; import org.apache.commons.lang3.ClassUtils; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/melontini/flightpanel/impl/generators/StringProviderFactory.java b/src/main/java/dev/zenfyr/flightpanel/impl/generators/StringProviderFactory.java similarity index 60% rename from src/main/java/me/melontini/flightpanel/impl/generators/StringProviderFactory.java rename to src/main/java/dev/zenfyr/flightpanel/impl/generators/StringProviderFactory.java index ed2b84f..8b515d5 100644 --- a/src/main/java/me/melontini/flightpanel/impl/generators/StringProviderFactory.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/generators/StringProviderFactory.java @@ -1,16 +1,16 @@ -package me.melontini.flightpanel.impl.generators; +package dev.zenfyr.flightpanel.impl.generators; +import dev.zenfyr.flightpanel.api.builders.elements.BaseElementBuilder; +import dev.zenfyr.flightpanel.api.builders.elements.StringTextBoxBuilder; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.generators.GuiProvider; +import dev.zenfyr.flightpanel.api.generators.GuiProviderFactory; +import dev.zenfyr.flightpanel.api.generators.GuiRegistry; +import dev.zenfyr.flightpanel.api.generators.context.FactoryContext; +import dev.zenfyr.flightpanel.api.generators.context.ProviderContext; +import dev.zenfyr.flightpanel.impl.elements.StringTextBoxElement; import dev.zenfyr.pulsar.api.util.Result; import java.util.function.Supplier; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.builders.elements.StringTextBoxBuilder; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.generators.GuiProvider; -import me.melontini.flightpanel.api.generators.GuiProviderFactory; -import me.melontini.flightpanel.api.generators.GuiRegistry; -import me.melontini.flightpanel.api.generators.context.FactoryContext; -import me.melontini.flightpanel.api.generators.context.ProviderContext; -import me.melontini.flightpanel.impl.elements.StringTextBoxElement; import org.jetbrains.annotations.NotNull; public class StringProviderFactory implements GuiProviderFactory { diff --git a/src/main/java/me/melontini/flightpanel/impl/util/TextUtil.java b/src/main/java/dev/zenfyr/flightpanel/impl/util/TextUtil.java similarity index 89% rename from src/main/java/me/melontini/flightpanel/impl/util/TextUtil.java rename to src/main/java/dev/zenfyr/flightpanel/impl/util/TextUtil.java index 1cb9f0e..e03bf6e 100644 --- a/src/main/java/me/melontini/flightpanel/impl/util/TextUtil.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/util/TextUtil.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.impl.util; +package dev.zenfyr.flightpanel.impl.util; import java.util.Optional; import net.minecraft.network.chat.Component; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/ConfigElementListWidget.java b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/ConfigElementListWidget.java similarity index 96% rename from src/main/java/me/melontini/flightpanel/impl/widgets/ConfigElementListWidget.java rename to src/main/java/dev/zenfyr/flightpanel/impl/widgets/ConfigElementListWidget.java index 845046b..62a5a87 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/ConfigElementListWidget.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/ConfigElementListWidget.java @@ -1,15 +1,15 @@ -package me.melontini.flightpanel.impl.widgets; +package dev.zenfyr.flightpanel.impl.widgets; import com.google.common.collect.ImmutableList; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.api.util.ConfigScreenProxy; +import dev.zenfyr.flightpanel.api.util.SquareData; 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.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.api.util.ConfigScreenProxy; -import me.melontini.flightpanel.api.util.SquareData; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.*; import net.minecraft.client.gui.components.Renderable; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/IconDrawer.java b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/IconDrawer.java similarity index 97% rename from src/main/java/me/melontini/flightpanel/impl/widgets/IconDrawer.java rename to src/main/java/dev/zenfyr/flightpanel/impl/widgets/IconDrawer.java index 864a49d..f9119e8 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/IconDrawer.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/IconDrawer.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.impl.widgets; +package dev.zenfyr.flightpanel.impl.widgets; import dev.zenfyr.pulsar.api.util.ColorUtil; import lombok.Builder; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/OptionInfoWidget.java b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/OptionInfoWidget.java similarity index 94% rename from src/main/java/me/melontini/flightpanel/impl/widgets/OptionInfoWidget.java rename to src/main/java/dev/zenfyr/flightpanel/impl/widgets/OptionInfoWidget.java index 48b3a71..3cb7d71 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/OptionInfoWidget.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/OptionInfoWidget.java @@ -1,12 +1,12 @@ -package me.melontini.flightpanel.impl.widgets; +package dev.zenfyr.flightpanel.impl.widgets; +import dev.zenfyr.flightpanel.api.elements.AbstractConfigElement; +import dev.zenfyr.flightpanel.impl.util.TextUtil; import java.util.Collection; import java.util.List; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; -import me.melontini.flightpanel.api.elements.AbstractConfigElement; -import me.melontini.flightpanel.impl.util.TextUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabButtonWidget.java b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabButtonWidget.java similarity index 98% rename from src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabButtonWidget.java rename to src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabButtonWidget.java index 77ffa64..7d31009 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabButtonWidget.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabButtonWidget.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.impl.widgets.tab; +package dev.zenfyr.flightpanel.impl.widgets.tab; import lombok.Getter; import net.fabricmc.api.EnvType; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabManager.java b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabManager.java similarity index 95% rename from src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabManager.java rename to src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabManager.java index c0f60ea..1cdab19 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabManager.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabManager.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.impl.widgets.tab; +package dev.zenfyr.flightpanel.impl.widgets.tab; import java.util.Objects; import java.util.function.Consumer; diff --git a/src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabNavigationWidget.java b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabNavigationWidget.java similarity index 99% rename from src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabNavigationWidget.java rename to src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabNavigationWidget.java index 0055ef3..a439346 100644 --- a/src/main/java/me/melontini/flightpanel/impl/widgets/tab/TabNavigationWidget.java +++ b/src/main/java/dev/zenfyr/flightpanel/impl/widgets/tab/TabNavigationWidget.java @@ -1,4 +1,4 @@ -package me.melontini.flightpanel.impl.widgets.tab; +package dev.zenfyr.flightpanel.impl.widgets.tab; import com.google.common.collect.ImmutableList; import java.util.*; diff --git a/src/main/java/me/melontini/flightpanel/api/generators/GuiFieldTransformer.java b/src/main/java/me/melontini/flightpanel/api/generators/GuiFieldTransformer.java deleted file mode 100644 index a8fc9aa..0000000 --- a/src/main/java/me/melontini/flightpanel/api/generators/GuiFieldTransformer.java +++ /dev/null @@ -1,10 +0,0 @@ -package me.melontini.flightpanel.api.generators; - -import java.lang.reflect.Field; -import me.melontini.flightpanel.api.builders.elements.BaseElementBuilder; -import me.melontini.flightpanel.api.generators.context.ProviderContext; - -public interface GuiFieldTransformer { - - void transform(BaseElementBuilder builder, Field field, ProviderContext context); -} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6bd3586..d79400d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,19 +3,19 @@ "id": "flight-panel", "version": "${version}", "name": "Flight Panel", - "description": "Every captain needs controls!", + "description": "Config screen generation utility", "authors": [ - "melontini" + "zenfyr" ], "contact": { - "repo": "https://github.com/melontini/flight-panel" + "repo": "https://github.com/constellation-mc/flight-panel" }, "license": "MIT", "icon": "icon.png", "environment": "client", "entrypoints": { "client": [ - "me.melontini.flightpanel.impl.TestInit" + "dev.zenfyr.flightpanel.impl.TestInit" ] }, "mixins": [ diff --git a/src/main/resources/flight-panel.mixins.json b/src/main/resources/flight-panel.mixins.json index 4e044af..b7d3f70 100644 --- a/src/main/resources/flight-panel.mixins.json +++ b/src/main/resources/flight-panel.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "me.melontini.flightpanel.mixin", + "package": "dev.zenfyr.flightpanel.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ],