From 95b091e37e40272d2b6959054bf53983ce63a296 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Tue, 5 Aug 2025 21:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/context/event/EventFunctions.java | 38 ++----------------- .../function/RemoveFurnitureFunction.java | 8 ++-- .../function/ReplaceFurnitureFunction.java | 8 ++-- .../function/SpawnFurnitureFunction.java | 8 ++-- .../parameter/FurnitureParameterProvider.java | 8 ++-- 5 files changed, 19 insertions(+), 51 deletions(-) diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java index b646c323e..fbb129296 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java @@ -1,41 +1,7 @@ package net.momirealms.craftengine.core.plugin.context.event; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext; -import net.momirealms.craftengine.core.plugin.context.function.ActionBarFunction; -import net.momirealms.craftengine.core.plugin.context.function.BreakBlockFunction; -import net.momirealms.craftengine.core.plugin.context.function.CancelEventFunction; -import net.momirealms.craftengine.core.plugin.context.function.CommandFunction; -import net.momirealms.craftengine.core.plugin.context.function.CommonFunctions; -import net.momirealms.craftengine.core.plugin.context.function.DropLootFunction; -import net.momirealms.craftengine.core.plugin.context.function.Function; -import net.momirealms.craftengine.core.plugin.context.function.FunctionFactory; -import net.momirealms.craftengine.core.plugin.context.function.LevelerExpFunction; -import net.momirealms.craftengine.core.plugin.context.function.MessageFunction; -import net.momirealms.craftengine.core.plugin.context.function.MythicMobsSkillFunction; -import net.momirealms.craftengine.core.plugin.context.function.OpenWindowFunction; -import net.momirealms.craftengine.core.plugin.context.function.ParticleFunction; -import net.momirealms.craftengine.core.plugin.context.function.PlaceBlockFunction; -import net.momirealms.craftengine.core.plugin.context.function.PlaySoundFunction; -import net.momirealms.craftengine.core.plugin.context.function.PotionEffectFunction; -import net.momirealms.craftengine.core.plugin.context.function.RemoveCooldownFunction; -import net.momirealms.craftengine.core.plugin.context.function.RemoveFurnitureFunction; -import net.momirealms.craftengine.core.plugin.context.function.RemovePotionEffectFunction; -import net.momirealms.craftengine.core.plugin.context.function.ReplaceFurnitureFunction; -import net.momirealms.craftengine.core.plugin.context.function.RunFunction; -import net.momirealms.craftengine.core.plugin.context.function.SetCooldownFunction; -import net.momirealms.craftengine.core.plugin.context.function.SetCountFunction; -import net.momirealms.craftengine.core.plugin.context.function.SetFoodFunction; -import net.momirealms.craftengine.core.plugin.context.function.SetSaturationFunction; -import net.momirealms.craftengine.core.plugin.context.function.SpawnFurnitureFunction; -import net.momirealms.craftengine.core.plugin.context.function.SwingHandFunction; -import net.momirealms.craftengine.core.plugin.context.function.TitleFunction; -import net.momirealms.craftengine.core.plugin.context.function.UpdateInteractionFunction; +import net.momirealms.craftengine.core.plugin.context.function.*; import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException; import net.momirealms.craftengine.core.registry.BuiltInRegistries; import net.momirealms.craftengine.core.registry.Registries; @@ -45,6 +11,8 @@ import net.momirealms.craftengine.core.util.MiscUtils; import net.momirealms.craftengine.core.util.ResourceConfigUtils; import net.momirealms.craftengine.core.util.ResourceKey; +import java.util.*; + public class EventFunctions { static { diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/RemoveFurnitureFunction.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/RemoveFurnitureFunction.java index e2caefed5..0fa908dec 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/RemoveFurnitureFunction.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/RemoveFurnitureFunction.java @@ -1,9 +1,5 @@ package net.momirealms.craftengine.core.plugin.context.function; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import net.momirealms.craftengine.core.entity.furniture.Furniture; import net.momirealms.craftengine.core.plugin.context.Condition; import net.momirealms.craftengine.core.plugin.context.Context; @@ -12,6 +8,10 @@ import net.momirealms.craftengine.core.util.Key; import net.momirealms.craftengine.core.util.ResourceConfigUtils; import net.momirealms.craftengine.core.world.WorldPosition; +import java.util.List; +import java.util.Map; +import java.util.Optional; + public class RemoveFurnitureFunction extends AbstractConditionalFunction { private final boolean dropLoot; private final boolean playSound; diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/ReplaceFurnitureFunction.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/ReplaceFurnitureFunction.java index fd671a065..171674596 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/ReplaceFurnitureFunction.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/ReplaceFurnitureFunction.java @@ -1,9 +1,5 @@ package net.momirealms.craftengine.core.plugin.context.function; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import net.momirealms.craftengine.core.entity.furniture.AnchorType; import net.momirealms.craftengine.core.entity.furniture.CustomFurniture; import net.momirealms.craftengine.core.entity.furniture.Furniture; @@ -18,6 +14,10 @@ import net.momirealms.craftengine.core.util.Key; import net.momirealms.craftengine.core.util.ResourceConfigUtils; import net.momirealms.craftengine.core.world.WorldPosition; +import java.util.List; +import java.util.Map; +import java.util.Optional; + public class ReplaceFurnitureFunction extends AbstractConditionalFunction { private final Key newFurnitureId; private final NumberProvider x; diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/SpawnFurnitureFunction.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/SpawnFurnitureFunction.java index e18a1e8f4..f3234e792 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/SpawnFurnitureFunction.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/SpawnFurnitureFunction.java @@ -1,9 +1,5 @@ package net.momirealms.craftengine.core.plugin.context.function; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import net.momirealms.craftengine.core.entity.furniture.AnchorType; import net.momirealms.craftengine.core.entity.furniture.CustomFurniture; import net.momirealms.craftengine.core.entity.furniture.FurnitureExtraData; @@ -18,6 +14,10 @@ import net.momirealms.craftengine.core.util.ResourceConfigUtils; import net.momirealms.craftengine.core.world.World; import net.momirealms.craftengine.core.world.WorldPosition; +import java.util.List; +import java.util.Map; +import java.util.Optional; + public class SpawnFurnitureFunction extends AbstractConditionalFunction { private final Key furnitureId; private final NumberProvider x; diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/parameter/FurnitureParameterProvider.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/parameter/FurnitureParameterProvider.java index b3e20fab4..dc4774853 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/parameter/FurnitureParameterProvider.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/parameter/FurnitureParameterProvider.java @@ -1,14 +1,14 @@ package net.momirealms.craftengine.core.plugin.context.parameter; +import net.momirealms.craftengine.core.entity.furniture.Furniture; +import net.momirealms.craftengine.core.plugin.context.ChainParameterProvider; +import net.momirealms.craftengine.core.plugin.context.ContextKey; + import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.function.Function; -import net.momirealms.craftengine.core.entity.furniture.Furniture; -import net.momirealms.craftengine.core.plugin.context.ChainParameterProvider; -import net.momirealms.craftengine.core.plugin.context.ContextKey; - public class FurnitureParameterProvider implements ChainParameterProvider { private static final Map, Function> CONTEXT_FUNCTIONS = new HashMap<>(); static {