Skip to content

Commit e1b74d8

Browse files
committed
Update FontEntity definition (#20)
1 parent a6f9c76 commit e1b74d8

1 file changed

Lines changed: 63 additions & 110 deletions

File tree

src/main/java/net/onelitefeather/vulpes/api/model/FontEntity.java

Lines changed: 63 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ public class FontEntity implements VulpesModel {
2626
@GeneratedValue(strategy = GenerationType.UUID)
2727
@VulpesGenerator
2828
private UUID id;
29-
private String modelName;
30-
private String name;
31-
private String description;
32-
private String type;
33-
private int ascent;
29+
private String uiName;
30+
private String variableName;
31+
private String provider;
32+
private String mapper = "font";
33+
private String texturePath;
34+
private String comment;
3435
private int height;
36+
private int ascent;
3537
@ElementCollection
3638
private List<String> chars;
37-
@ElementCollection
38-
private List<Double> shift;
3939

4040
/**
4141
* Default constructor for JPA and Micronaut Data.
@@ -50,26 +50,25 @@ public FontEntity() {
5050
/**
5151
* Constructs a new {@link FontEntity} with the specified values.
5252
*
53-
* @param id the unique identifier of the font
54-
* @param modelName the model name associated with the font
55-
* @param name the name of the font
56-
* @param description a description of the font
57-
* @param type the type of the font
58-
* @param ascent the ascent of the font
59-
* @param height the height of the font
60-
* @param chars the list of characters included in the font
61-
* @param shift the list of shift values for the font
53+
* @param id the unique identifier of the font
54+
* @param uiName the user interface name of the font
55+
* @param variableName the variable name of the font
56+
* @param provider the provider of the font
57+
* @param texturePath the path to the texture of the font
58+
* @param height the height of the font
59+
* @param ascent the ascent of the font
60+
* @param chars the list of characters included in the font
6261
*/
63-
public FontEntity(UUID id, String modelName, String name, String description, String type, int ascent, int height, List<String> chars, List<Double> shift) {
62+
public FontEntity(UUID id, String uiName, String variableName, String provider, String texturePath, String comment, int height, int ascent, List<String> chars) {
6463
this.id = id;
65-
this.modelName = modelName;
66-
this.name = name;
67-
this.description = description;
68-
this.type = type;
69-
this.ascent = ascent;
64+
this.uiName = uiName;
65+
this.variableName = variableName;
66+
this.provider = provider;
67+
this.texturePath = texturePath;
68+
this.comment = comment;
7069
this.height = height;
70+
this.ascent = ascent;
7171
this.chars = chars;
72-
this.shift = shift;
7372
}
7473

7574
// Getters and setters for each field
@@ -92,76 +91,52 @@ public void setId(UUID id) {
9291
this.id = id;
9392
}
9493

95-
/**
96-
* Returns the model name associated with the font
97-
*
98-
* @return the model name of the font
99-
*/
100-
public String getModelName() {
101-
return modelName;
94+
public void setUiName(String uiName) {
95+
this.uiName = uiName;
10296
}
10397

104-
/**
105-
* Sets the model name associated with the font
106-
*
107-
* @param modelName the model name to set
108-
*/
109-
public void setModelName(String modelName) {
110-
this.modelName = modelName;
98+
public String getUiName() {
99+
return uiName;
111100
}
112101

113-
/**
114-
* Returns the name of the font
115-
*
116-
* @return the name of the font
117-
*/
118-
public String getName() {
119-
return name;
102+
public void setVariableName(String variableName) {
103+
this.variableName = variableName;
120104
}
121105

122-
/**
123-
* Sets the name of the font
124-
*
125-
* @param name the name to set
126-
*/
127-
public void setName(String name) {
128-
this.name = name;
106+
public String getVariableName() {
107+
return variableName;
129108
}
130109

131-
/**
132-
* Returns the description of the font
133-
*
134-
* @return the description of the font
135-
*/
136-
public String getDescription() {
137-
return description;
110+
public void setMapper(String mapper) {
111+
this.mapper = mapper;
138112
}
139113

140-
/**
141-
* Sets the description of the font
142-
*
143-
* @param description the description to set
144-
*/
145-
public void setDescription(String description) {
146-
this.description = description;
114+
public String getMapper() {
115+
return mapper;
147116
}
148117

149-
/**
150-
* Returns the type of the font
151-
*
152-
* @return the type of the font
153-
*/
154-
public String getType() {
155-
return type;
118+
public void setProvider(String provider) {
119+
this.provider = provider;
156120
}
157121

158-
/**
159-
* Sets the type of the font
160-
*
161-
* @param type the type to set
162-
*/
163-
public void setType(String type) {
164-
this.type = type;
122+
public String getProvider() {
123+
return provider;
124+
}
125+
126+
public void setTexturePath(String texturePath) {
127+
this.texturePath = texturePath;
128+
}
129+
130+
public String getTexturePath() {
131+
return texturePath;
132+
}
133+
134+
public void setComment(String comment) {
135+
this.comment = comment;
136+
}
137+
138+
public String getComment() {
139+
return comment;
165140
}
166141

167142
/**
@@ -218,41 +193,19 @@ public void setChars(List<String> chars) {
218193
this.chars = chars;
219194
}
220195

221-
/**
222-
* Returns the list of shift values for the font
223-
*
224-
* @return the list of shift values for the font
225-
*/
226-
public List<Double> getShift() {
227-
return shift;
228-
}
229-
230-
/**
231-
* Sets the list of shift values for the font
232-
*
233-
* @param shift the list of shift values to set
234-
*/
235-
public void setShift(List<Double> shift) {
236-
this.shift = shift;
237-
}
238-
239-
/**
240-
* Provides a string representation of the FontModel
241-
*
242-
* @return a string representation
243-
*/
244196
@Override
245197
public String toString() {
246-
return "FontModel{" +
247-
"id='" + id + '\'' +
248-
", modelName='" + modelName + '\'' +
249-
", name='" + name + '\'' +
250-
", description='" + description + '\'' +
251-
", type='" + type + '\'' +
252-
", ascent=" + ascent +
198+
return "FontEntity{" +
199+
"id=" + id +
200+
", uiName='" + uiName + '\'' +
201+
", variableName='" + variableName + '\'' +
202+
", provider='" + provider + '\'' +
203+
", mapper='" + mapper + '\'' +
204+
", texturePath='" + texturePath + '\'' +
205+
", comment='" + comment + '\'' +
253206
", height=" + height +
207+
", ascent=" + ascent +
254208
", chars=" + chars +
255-
", shift=" + shift +
256209
'}';
257210
}
258211
}

0 commit comments

Comments
 (0)