Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 17:05:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-09-02 00:33:12 +00:00
parent 0db69882a3
commit 717a358636
584 changed files with 1252 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java
View File

@@ -6,13 +6,12 @@ import emu.grasscutter.data.binout.HomeworldDefaultSaveData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.net.proto.*;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.jetbrains.annotations.Nullable;
import java.util.Set;
import java.util.stream.Collectors;
@Entity
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@@ -20,11 +19,11 @@ import java.util.stream.Collectors;
public class HomeFurnitureItem implements HomeMarkPointProtoFactory {
public static final int PAIMON_FURNITURE_ID = 368134;
public static final int TELEPORT_FURNITURE_ID = 373501;
public static final Set<Integer> APARTMENT_FURNITURE_ID_SET = GameData.getItemDataMap().values()
.stream()
.filter(itemData -> itemData.getSpecialFurnitureType() == SpecialFurnitureType.Apartment)
.map(ItemData::getId)
.collect(Collectors.toUnmodifiableSet());
public static final Set<Integer> APARTMENT_FURNITURE_ID_SET =
GameData.getItemDataMap().values().stream()
.filter(itemData -> itemData.getSpecialFurnitureType() == SpecialFurnitureType.Apartment)
.map(ItemData::getId)
.collect(Collectors.toUnmodifiableSet());
int furnitureId;
int guid;
@@ -78,8 +77,7 @@ public class HomeFurnitureItem implements HomeMarkPointProtoFactory {
return item.getComfort();
}
@Nullable
@Override
@Nullable @Override
public HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData toMarkPointProto() {
var type = this.adjustByFurnitureId();
if (type == SpecialFurnitureType.NOT_SPECIAL) {
@@ -87,11 +85,11 @@ public class HomeFurnitureItem implements HomeMarkPointProtoFactory {
}
return HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.newBuilder()
.setFurnitureId(this.furnitureId)
.setFurnitureType(type.getValue())
.setPos(this.spawnPos.toProto())
.setGuid(this.guid)
.build();
.setFurnitureId(this.furnitureId)
.setFurnitureType(type.getValue())
.setPos(this.spawnPos.toProto())
.setGuid(this.guid)
.build();
}
@Override
@@ -99,7 +97,9 @@ public class HomeFurnitureItem implements HomeMarkPointProtoFactory {
return switch (this.furnitureId) {
case PAIMON_FURNITURE_ID -> SpecialFurnitureType.Paimon;
case TELEPORT_FURNITURE_ID -> SpecialFurnitureType.TeleportPoint;
default -> APARTMENT_FURNITURE_ID_SET.contains(this.furnitureId) ? SpecialFurnitureType.Apartment : SpecialFurnitureType.NOT_SPECIAL;
default -> APARTMENT_FURNITURE_ID_SET.contains(this.furnitureId)
? SpecialFurnitureType.Apartment
: SpecialFurnitureType.NOT_SPECIAL;
};
}
}