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

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
jhqwqmc
2025-05-22 23:00:11 +08:00
parent 6b5b500576 99a161a308
commit 9737fc9f77
9 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@Nullable
public static Furniture place(Location location, Key furnitureId) {
public static BukkitFurniture place(Location location, Key furnitureId) {
CustomFurniture furniture = byId(furnitureId);
if (furniture == null) return null;
return place(location, furnitureId, furniture.getAnyPlacement());
@@ -64,7 +64,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@Nullable
public static Furniture place(Location location, Key furnitureId, AnchorType anchorType) {
public static BukkitFurniture place(Location location, Key furnitureId, AnchorType anchorType) {
CustomFurniture furniture = byId(furnitureId);
if (furniture == null) return null;
return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), true);
@@ -79,7 +79,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@NotNull
public static Furniture place(Location location, CustomFurniture furniture, AnchorType anchorType) {
public static BukkitFurniture place(Location location, CustomFurniture furniture, AnchorType anchorType) {
return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), true);
}
@@ -93,7 +93,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@Nullable
public static Furniture place(Location location, Key furnitureId, AnchorType anchorType, boolean playSound) {
public static BukkitFurniture place(Location location, Key furnitureId, AnchorType anchorType, boolean playSound) {
CustomFurniture furniture = byId(furnitureId);
if (furniture == null) return null;
return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), playSound);
@@ -109,7 +109,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@NotNull
public static Furniture place(Location location, CustomFurniture furniture, AnchorType anchorType, boolean playSound) {
public static BukkitFurniture place(Location location, CustomFurniture furniture, AnchorType anchorType, boolean playSound) {
return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), playSound);
}
@@ -153,7 +153,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@Nullable
public static Furniture getLoadedFurnitureByBaseEntity(@NotNull Entity baseEntity) {
public static BukkitFurniture getLoadedFurnitureByBaseEntity(@NotNull Entity baseEntity) {
return BukkitFurnitureManager.instance().loadedFurnitureByRealEntityId(baseEntity.getEntityId());
}
@@ -164,7 +164,7 @@ public final class CraftEngineFurniture {
* @return the loaded furniture
*/
@Nullable
public static Furniture getLoadedFurnitureBySeat(@NotNull Entity seat) {
public static BukkitFurniture getLoadedFurnitureBySeat(@NotNull Entity seat) {
Integer baseEntityId = seat.getPersistentDataContainer().get(BukkitFurnitureManager.FURNITURE_SEAT_BASE_ENTITY_KEY, PersistentDataType.INTEGER);
if (baseEntityId == null) return null;
return BukkitFurnitureManager.instance().loadedFurnitureByRealEntityId(baseEntityId);

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureBreakEvent.java
View File

@@ -26,7 +26,7 @@ public class FurnitureBreakEvent extends PlayerEvent implements Cancellable {
}
@NotNull
public Furniture furniture() {
public BukkitFurniture furniture() {
return this.furniture;
}

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureInteractEvent.java
View File

@@ -43,7 +43,7 @@ public class FurnitureInteractEvent extends PlayerEvent implements Cancellable {
}
@NotNull
public Furniture furniture() {
public BukkitFurniture furniture() {
return this.furniture;
}

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurniturePlaceEvent.java
View File

@@ -33,7 +33,7 @@ public class FurniturePlaceEvent extends PlayerEvent implements Cancellable {
}
@NotNull
public Furniture furniture() {
public BukkitFurniture furniture() {
return this.furniture;
}