From 6e20763522083c858f32e82129239af9d2e16c82 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 24 Oct 2022 13:20:30 +0100 Subject: [PATCH] Refactor --- eco-api/src/main/java/com/willfp/eco/core/Eco.java | 2 +- .../willfp/eco/core/{placeholder => math}/MathContext.java | 4 +++- eco-api/src/main/java/com/willfp/eco/core/price/Prices.java | 2 +- eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java | 2 +- .../src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt | 2 +- .../com/willfp/eco/internal/spigot/math/CrunchHandler.kt | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) rename eco-api/src/main/java/com/willfp/eco/core/{placeholder => math}/MathContext.java (84%) diff --git a/eco-api/src/main/java/com/willfp/eco/core/Eco.java b/eco-api/src/main/java/com/willfp/eco/core/Eco.java index e6a9d108..2b9276c9 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/Eco.java +++ b/eco-api/src/main/java/com/willfp/eco/core/Eco.java @@ -22,7 +22,7 @@ import com.willfp.eco.core.gui.menu.MenuType; import com.willfp.eco.core.gui.slot.SlotBuilder; import com.willfp.eco.core.gui.slot.functional.SlotProvider; import com.willfp.eco.core.items.TestableItem; -import com.willfp.eco.core.placeholder.MathContext; +import com.willfp.eco.core.math.MathContext; import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.scheduling.Scheduler; import net.kyori.adventure.platform.bukkit.BukkitAudiences; diff --git a/eco-api/src/main/java/com/willfp/eco/core/placeholder/MathContext.java b/eco-api/src/main/java/com/willfp/eco/core/math/MathContext.java similarity index 84% rename from eco-api/src/main/java/com/willfp/eco/core/placeholder/MathContext.java rename to eco-api/src/main/java/com/willfp/eco/core/math/MathContext.java index 5cb76f91..bd537a06 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/placeholder/MathContext.java +++ b/eco-api/src/main/java/com/willfp/eco/core/math/MathContext.java @@ -1,6 +1,8 @@ -package com.willfp.eco.core.placeholder; +package com.willfp.eco.core.math; import com.willfp.eco.core.integrations.placeholder.PlaceholderManager; +import com.willfp.eco.core.placeholder.AdditionalPlayer; +import com.willfp.eco.core.placeholder.PlaceholderInjectable; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/eco-api/src/main/java/com/willfp/eco/core/price/Prices.java b/eco-api/src/main/java/com/willfp/eco/core/price/Prices.java index 5872a3c7..426c4288 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/price/Prices.java +++ b/eco-api/src/main/java/com/willfp/eco/core/price/Prices.java @@ -2,7 +2,7 @@ package com.willfp.eco.core.price; import com.willfp.eco.core.items.Items; import com.willfp.eco.core.items.TestableItem; -import com.willfp.eco.core.placeholder.MathContext; +import com.willfp.eco.core.math.MathContext; import com.willfp.eco.core.price.impl.PriceEconomy; import com.willfp.eco.core.price.impl.PriceFree; import com.willfp.eco.core.price.impl.PriceItem; diff --git a/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java b/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java index d0af08a7..b9a31cf2 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java +++ b/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java @@ -4,7 +4,7 @@ import com.willfp.eco.core.Eco; import com.willfp.eco.core.integrations.placeholder.PlaceholderManager; import com.willfp.eco.core.placeholder.AdditionalPlayer; import com.willfp.eco.core.placeholder.InjectablePlaceholder; -import com.willfp.eco.core.placeholder.MathContext; +import com.willfp.eco.core.math.MathContext; import com.willfp.eco.core.placeholder.PlaceholderInjectable; import com.willfp.eco.core.placeholder.StaticPlaceholder; import org.bukkit.entity.Player; diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt index 1a50baff..05c80008 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt @@ -11,7 +11,7 @@ import com.willfp.eco.core.gui.menu.Menu import com.willfp.eco.core.gui.menu.MenuType import com.willfp.eco.core.gui.slot.functional.SlotProvider import com.willfp.eco.core.items.Items -import com.willfp.eco.core.placeholder.MathContext +import com.willfp.eco.core.math.MathContext import com.willfp.eco.internal.EcoPropsParser import com.willfp.eco.internal.config.EcoConfigHandler import com.willfp.eco.internal.config.EcoConfigSection diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/math/CrunchHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/math/CrunchHandler.kt index d1ebcc84..53751192 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/math/CrunchHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/math/CrunchHandler.kt @@ -4,7 +4,7 @@ import com.github.benmanes.caffeine.cache.Cache import com.github.benmanes.caffeine.cache.Caffeine import com.willfp.eco.core.integrations.placeholder.PlaceholderManager import com.willfp.eco.core.placeholder.AdditionalPlayer -import com.willfp.eco.core.placeholder.MathContext +import com.willfp.eco.core.math.MathContext import com.willfp.eco.core.placeholder.PlaceholderInjectable import org.bukkit.entity.Player import redempt.crunch.CompiledExpression