Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-19 15:09:15 +00:00
Code Issues Releases Activity

优化命名

Browse Source
This commit is contained in:
XiaoMoMi
2025-12-05 18:30:36 +08:00
parent 727df39d2c
commit 15593345ea
27 changed files with 122 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/CraftEngineFurniture.java
View File

@@ -9,8 +9,8 @@ import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer;
import net.momirealms.craftengine.bukkit.world.BukkitWorld;
import net.momirealms.craftengine.core.entity.furniture.AnchorType;
import net.momirealms.craftengine.core.entity.furniture.CustomFurniture;
import net.momirealms.craftengine.core.entity.furniture.Furniture;
import net.momirealms.craftengine.core.entity.furniture.FurnitureConfig;
import net.momirealms.craftengine.core.entity.furniture.FurnitureDataAccessor;
import net.momirealms.craftengine.core.entity.player.InteractionHand;
import net.momirealms.craftengine.core.item.Item;
@@ -49,7 +49,7 @@ public final class CraftEngineFurniture {
* @return a non-null map containing all loaded custom furniture
*/
@NotNull
public static Map<Key, FurnitureConfig> loadedFurniture() {
public static Map<Key, CustomFurniture> loadedFurniture() {
return BukkitFurnitureManager.instance().loadedFurniture();
}
@@ -59,7 +59,7 @@ public final class CraftEngineFurniture {
* @param id id
* @return the custom furniture
*/
public static FurnitureConfig byId(@NotNull Key id) {
public static CustomFurniture byId(@NotNull Key id) {
return BukkitFurnitureManager.instance().furnitureById(id).orElse(null);
}
@@ -111,7 +111,7 @@ public final class CraftEngineFurniture {
*/
@Nullable
public static BukkitFurniture place(Location location, Key furnitureId) {
FurnitureConfig furniture = byId(furnitureId);
CustomFurniture furniture = byId(furnitureId);
if (furniture == null) return null;
return place(location, furniture, furniture.anyVariantName(), false);
}
@@ -140,7 +140,7 @@ public final class CraftEngineFurniture {
*/
@Nullable
public static BukkitFurniture place(Location location, Key furnitureId, String variant) {
FurnitureConfig furniture = byId(furnitureId);
CustomFurniture furniture = byId(furnitureId);
if (furniture == null) return null;
return BukkitFurnitureManager.instance().place(location, furniture, FurnitureDataAccessor.ofVariant(variant), true);
}
@@ -155,7 +155,7 @@ public final class CraftEngineFurniture {
*/
@NotNull
@Deprecated(since = "0.0.66", forRemoval = true)
public static BukkitFurniture place(Location location, FurnitureConfig furniture, AnchorType anchorType) {
public static BukkitFurniture place(Location location, CustomFurniture furniture, AnchorType anchorType) {
return place(location, furniture, anchorType.variantName(), true);
}
@@ -171,7 +171,7 @@ public final class CraftEngineFurniture {
@Nullable
@Deprecated(since = "0.0.66", forRemoval = true)
public static BukkitFurniture place(Location location, Key furnitureId, AnchorType anchorType, boolean playSound) {
FurnitureConfig furniture = byId(furnitureId);
CustomFurniture furniture = byId(furnitureId);
if (furniture == null) return null;
return place(location, furniture, anchorType.variantName(), playSound);
}
@@ -187,7 +187,7 @@ public final class CraftEngineFurniture {
*/
@Nullable
public static BukkitFurniture place(Location location, Key furnitureId, String variant, boolean playSound) {
FurnitureConfig furniture = byId(furnitureId);
CustomFurniture furniture = byId(furnitureId);
if (furniture == null) return null;
return place(location, furniture, variant, playSound);
}
@@ -203,7 +203,7 @@ public final class CraftEngineFurniture {
*/
@NotNull
@Deprecated(since = "0.0.66", forRemoval = true)
public static BukkitFurniture place(Location location, FurnitureConfig furniture, AnchorType anchorType, boolean playSound) {
public static BukkitFurniture place(Location location, CustomFurniture furniture, AnchorType anchorType, boolean playSound) {
return place(location, furniture, anchorType.variantName(), playSound);
}
@@ -217,7 +217,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@NotNull
public static BukkitFurniture place(Location location, FurnitureConfig furniture, String variant, boolean playSound) {
public static BukkitFurniture place(Location location, CustomFurniture furniture, String variant, boolean playSound) {
return BukkitFurnitureManager.instance().place(location, furniture, FurnitureDataAccessor.ofVariant(variant), playSound);
}
@@ -231,7 +231,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@NotNull
public static BukkitFurniture place(Location location, FurnitureConfig furniture, CompoundTag data, boolean playSound) {
public static BukkitFurniture place(Location location, CustomFurniture furniture, CompoundTag data, boolean playSound) {
return BukkitFurnitureManager.instance().place(location, furniture, FurnitureDataAccessor.of(data), playSound);
}
@@ -245,7 +245,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@NotNull
public static BukkitFurniture place(Location location, FurnitureConfig furniture, FurnitureDataAccessor dataAccessor, boolean playSound) {
public static BukkitFurniture place(Location location, CustomFurniture furniture, FurnitureDataAccessor dataAccessor, boolean playSound) {
return BukkitFurnitureManager.instance().place(location, furniture, dataAccessor, playSound);
}

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureAttemptPlaceEvent.java
View File

@@ -1,6 +1,6 @@
package net.momirealms.craftengine.bukkit.api.event;
import net.momirealms.craftengine.core.entity.furniture.FurnitureConfig;
import net.momirealms.craftengine.core.entity.furniture.CustomFurniture;
import net.momirealms.craftengine.core.entity.furniture.FurnitureVariant;
import net.momirealms.craftengine.core.entity.player.InteractionHand;
import org.bukkit.Location;
@@ -14,14 +14,14 @@ import org.jetbrains.annotations.NotNull;
public final class FurnitureAttemptPlaceEvent extends PlayerEvent implements Cancellable {
private static final HandlerList HANDLER_LIST = new HandlerList();
private boolean cancelled;
private final FurnitureConfig furniture;
private final CustomFurniture furniture;
private final Location location;
private final FurnitureVariant variant;
private final Block clickedBlock;
private final InteractionHand hand;
public FurnitureAttemptPlaceEvent(@NotNull Player player,
@NotNull FurnitureConfig furniture,
@NotNull CustomFurniture furniture,
@NotNull FurnitureVariant variant,
@NotNull Location location,
@NotNull InteractionHand hand,
@@ -60,7 +60,7 @@ public final class FurnitureAttemptPlaceEvent extends PlayerEvent implements Can
}
@NotNull
public FurnitureConfig furniture() {
public CustomFurniture furniture() {
return furniture;
}

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java
View File

@@ -30,7 +30,7 @@ public class BukkitFurniture extends Furniture {
private final WeakReference<ItemDisplay> metaEntity;
private Location location;
public BukkitFurniture(ItemDisplay metaEntity, FurnitureConfig config, FurnitureDataAccessor data) {
public BukkitFurniture(ItemDisplay metaEntity, CustomFurniture config, FurnitureDataAccessor data) {
super(new BukkitEntity(metaEntity), data, config);
this.metaEntity = new WeakReference<>(metaEntity);
this.location = metaEntity.getLocation();

14
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
View File

@@ -62,11 +62,11 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
}
@Override
public Furniture place(WorldPosition position, FurnitureConfig furniture, FurnitureDataAccessor dataAccessor, boolean playSound) {
public Furniture place(WorldPosition position, CustomFurniture furniture, FurnitureDataAccessor dataAccessor, boolean playSound) {
return this.place(LocationUtils.toLocation(position), furniture, dataAccessor, playSound);
}
public BukkitFurniture place(Location location, FurnitureConfig furniture, FurnitureDataAccessor data, boolean playSound) {
public BukkitFurniture place(Location location, CustomFurniture furniture, FurnitureDataAccessor data, boolean playSound) {
Entity furnitureEntity = EntityUtils.spawnEntity(location.getWorld(), location, EntityType.ITEM_DISPLAY, entity -> {
ItemDisplay display = (ItemDisplay) entity;
display.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_KEY, PersistentDataType.STRING, furniture.id().toString());
@@ -218,7 +218,7 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
// 获取家具配置
Key key = Key.of(id);
Optional<FurnitureConfig> optionalFurniture = furnitureById(key);
Optional<CustomFurniture> optionalFurniture = furnitureById(key);
if (optionalFurniture.isEmpty()) return;
// 只对1.20.2及以上生效，1.20.1比较特殊
@@ -227,7 +227,7 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
}
// 已经在其他事件里加载过了
FurnitureConfig customFurniture = optionalFurniture.get();
CustomFurniture customFurniture = optionalFurniture.get();
BukkitFurniture previous = this.byMetaEntityId.get(entity.getEntityId());
if (previous != null) return;
@@ -254,11 +254,11 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
// 获取家具配置
Key key = Key.of(id);
Optional<FurnitureConfig> optionalFurniture = furnitureById(key);
Optional<CustomFurniture> optionalFurniture = furnitureById(key);
if (optionalFurniture.isEmpty()) return;
// 已经在其他事件里加载过了
FurnitureConfig customFurniture = optionalFurniture.get();
CustomFurniture customFurniture = optionalFurniture.get();
BukkitFurniture previous = this.byMetaEntityId.get(entity.getEntityId());
if (previous != null) return;
@@ -321,7 +321,7 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
}
// 创建家具实例，并初始化碰撞实体
private BukkitFurniture createFurnitureInstance(ItemDisplay display, FurnitureConfig furniture) {
private BukkitFurniture createFurnitureInstance(ItemDisplay display, CustomFurniture furniture) {
BukkitFurniture bukkitFurniture = new BukkitFurniture(display, furniture, getFurnitureDataAccessor(display));
initFurniture(bukkitFurniture);
Location location = display.getLocation();

4
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java
View File

@@ -74,7 +74,7 @@ public class FurnitureItemBehavior extends ItemBehavior {
}
public InteractionResult place(UseOnContext context) {
Optional<FurnitureConfig> optionalCustomFurniture = BukkitFurnitureManager.instance().furnitureById(this.id);
Optional<CustomFurniture> optionalCustomFurniture = BukkitFurnitureManager.instance().furnitureById(this.id);
if (optionalCustomFurniture.isEmpty()) {
CraftEngine.instance().logger().warn("Furniture " + this.id + " not found");
return InteractionResult.FAIL;
@@ -87,7 +87,7 @@ public class FurnitureItemBehavior extends ItemBehavior {
case DOWN -> AnchorType.CEILING;
};
FurnitureConfig customFurniture = optionalCustomFurniture.get();
CustomFurniture customFurniture = optionalCustomFurniture.get();
FurnitureVariant variant = customFurniture.getVariant(anchorType.variantName());
if (variant == null) {
return InteractionResult.FAIL;

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugSpawnFurnitureCommand.java
View File

@@ -4,7 +4,7 @@ import net.momirealms.craftengine.bukkit.api.CraftEngineFurniture;
import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature;
import net.momirealms.craftengine.bukkit.util.KeyUtils;
import net.momirealms.craftengine.core.entity.furniture.FurnitureConfig;
import net.momirealms.craftengine.core.entity.furniture.CustomFurniture;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.command.CraftEngineCommandManager;
import net.momirealms.craftengine.core.plugin.command.FlagKeys;
@@ -48,7 +48,7 @@ public class DebugSpawnFurnitureCommand extends BukkitCommandFeature<CommandSend
NamespacedKey namespacedKey = context.get("id");
Key id = KeyUtils.namespacedKey2Key(namespacedKey);
BukkitFurnitureManager furnitureManager = BukkitFurnitureManager.instance();
Optional<FurnitureConfig> optionalCustomFurniture = furnitureManager.furnitureById(id);
Optional<CustomFurniture> optionalCustomFurniture = furnitureManager.furnitureById(id);
return optionalCustomFurniture.<CompletableFuture<? extends Iterable<? extends Suggestion>>>map(config -> CompletableFuture.completedFuture(config.variants().keySet().stream().map(Suggestion::suggestion).toList())).orElseGet(() -> CompletableFuture.completedFuture(List.of()));
}
}))
@@ -57,12 +57,12 @@ public class DebugSpawnFurnitureCommand extends BukkitCommandFeature<CommandSend
NamespacedKey namespacedKey = context.get("id");
Key id = KeyUtils.namespacedKey2Key(namespacedKey);
BukkitFurnitureManager furnitureManager = BukkitFurnitureManager.instance();
Optional<FurnitureConfig> optionalCustomFurniture = furnitureManager.furnitureById(id);
Optional<CustomFurniture> optionalCustomFurniture = furnitureManager.furnitureById(id);
if (optionalCustomFurniture.isEmpty()) {
return;
}
Location location = context.get("location");
FurnitureConfig customFurniture = optionalCustomFurniture.get();
CustomFurniture customFurniture = optionalCustomFurniture.get();
String variant = (String) context.optional("variant").orElse(customFurniture.anyVariantName());
boolean playSound = context.flags().hasFlag("silent");
CraftEngineFurniture.place(location, customFurniture, variant, playSound);