Bennett/AquaDX
1
0
Fork 0
forked from Cookies_Github_mirror/AquaDX
Code Pull Requests Actions Releases Activity

[+] More work on import feature (TODO)

Browse Source
This commit is contained in:
Azalea
2024-03-20 18:52:11 -04:00
parent ac18234e29
commit fc8ecb7470
7 changed files with 86 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameSettingHandler.java
View File

@@ -67,8 +67,8 @@ public class GetGameSettingHandler implements BaseHandler {
localAddr = "localhost";
}
String addr = ALLNET_HOST.equals("") ? localAddr : ALLNET_HOST;
String port = ALLNET_PORT.equals("") ? SERVER_PORT : ALLNET_PORT;
String addr = ALLNET_HOST.isEmpty() ? localAddr : ALLNET_HOST;
String port = ALLNET_PORT.isEmpty() ? SERVER_PORT : ALLNET_PORT;
GameSetting gameSetting = new GameSetting(
ROM_VERSION, // Chusan checks these two versions to determine if it can enable game modes

39
src/main/java/icu/samnyan/aqua/sega/maimai2/model/gamedata/GameCharge.java
View File

@@ -1,39 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.model.gamedata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import jakarta.persistence.*;
import java.io.Serializable;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Entity(name = "Maimai2GameCharge")
@Table(name = "maimai2_game_charge")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class GameCharge implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@JsonIgnore
private long id;
private int orderId;
@Column(unique = true)
private int chargeId;
private int price;
private String startDate;
private String endDate;
}

35
src/main/java/icu/samnyan/aqua/sega/maimai2/model/gamedata/GameCharge.kt Normal file
View File

@@ -0,0 +1,35 @@
package icu.samnyan.aqua.sega.maimai2.model.gamedata
import icu.samnyan.aqua.net.games.BaseEntity
import jakarta.persistence.Column
import jakarta.persistence.Entity
import jakarta.persistence.Table
import lombok.AllArgsConstructor
import lombok.Data
import lombok.NoArgsConstructor
import java.io.Serializable
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Entity(name = "Maimai2GameCharge")
@Table(name = "maimai2_game_charge")
@Data
@AllArgsConstructor
@NoArgsConstructor
class GameCharge : Serializable, BaseEntity() {
val orderId = 0
@Column(unique = true)
var chargeId = 0
val price = 0
val startDate: String? = null
val endDate: String? = null
companion object {
const val serialVersionUID = 1L
}
}

9
src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserDetail.kt
View File

@@ -1,10 +1,10 @@
package icu.samnyan.aqua.sega.maimai2.model.userdata
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.annotation.JsonSerialize
import ext.Str
import icu.samnyan.aqua.net.games.BaseEntity
import icu.samnyan.aqua.net.games.IGenericUserData
import icu.samnyan.aqua.sega.general.model.Card
import icu.samnyan.aqua.sega.maimai2.util.IntegerListConverter
@@ -18,11 +18,6 @@ import java.io.Serializable
@Entity(name = "Maimai2UserData")
@Table(name = "maimai2_user_detail")
class UserDetail(
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@JsonIgnore
var id: Long = 0,
@JsonSerialize(using = AccessCodeSerializer::class)
@JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY)
@OneToOne
@@ -158,7 +153,7 @@ class UserDetail(
// TODO: Make these non-nullable with default value
var currentPlayCount: Int? = 0,
var renameCredit: Int? = 0
) : Serializable, IGenericUserData {
) : Serializable, IGenericUserData, BaseEntity() {
override val totalScore: Long
get() = totalDeluxscore
}