Skip to content

Commit f5a4e5c

Browse files
authored
Merge pull request #79 from Boy0000/1.21.5
feat: add saddle equipment-layers
2 parents d1f775d + 874313d commit f5a4e5c

File tree

3 files changed

+154
-2
lines changed

3 files changed

+154
-2
lines changed

api/src/main/java/team/unnamed/creative/equipment/Equipment.java

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,110 @@ interface Builder {
208208
default @NotNull Builder addLlamaBodyLayer(@NotNull EquipmentLayer layer) {
209209
return addLayer(EquipmentLayerType.LLAMA_BODY, layer);
210210
}
211+
212+
/**
213+
* Adds a llama saddle layer to the equipment.
214+
*
215+
* @param layer The layer to add
216+
* @return This builder
217+
* @since 1.8.4
218+
* @sinceMinecraft 1.21.5
219+
*/
220+
@Contract("_ -> this")
221+
default @NotNull Builder addCamelSaddle(@NotNull EquipmentLayer layer) {
222+
return addLayer(EquipmentLayerType.CAMEL_SADDLE, layer);
223+
}
224+
225+
/**
226+
* Adds a donkey saddle layer to the equipment.
227+
*
228+
* @param layer The layer to add
229+
* @return This builder
230+
* @since 1.8.4
231+
* @sinceMinecraft 1.21.5
232+
*/
233+
@Contract("_ -> this")
234+
default @NotNull Builder addDonkeySaddle(@NotNull EquipmentLayer layer) {
235+
return addLayer(EquipmentLayerType.DONKEY_SADDLE, layer);
236+
}
237+
238+
/**
239+
* Adds a horse saddle layer to the equipment.
240+
*
241+
* @param layer The layer to add
242+
* @return This builder
243+
* @since 1.8.4
244+
* @sinceMinecraft 1.21.5
245+
*/
246+
@Contract("_ -> this")
247+
default @NotNull Builder addHorseSaddle(@NotNull EquipmentLayer layer) {
248+
return addLayer(EquipmentLayerType.HORSE_SADDLE, layer);
249+
}
250+
251+
/**
252+
* Adds a mule saddle layer to the equipment.
253+
*
254+
* @param layer The layer to add
255+
* @return This builder
256+
* @since 1.8.4
257+
* @sinceMinecraft 1.21.5
258+
*/
259+
@Contract("_ -> this")
260+
default @NotNull Builder addMuleSaddle(@NotNull EquipmentLayer layer) {
261+
return addLayer(EquipmentLayerType.MULE_SADDLE, layer);
262+
}
263+
264+
/**
265+
* Adds a pig saddle layer to the equipment.
266+
*
267+
* @param layer The layer to add
268+
* @return This builder
269+
* @since 1.8.4
270+
* @sinceMinecraft 1.21.5
271+
*/
272+
@Contract("_ -> this")
273+
default @NotNull Builder addPigSaddle(@NotNull EquipmentLayer layer) {
274+
return addLayer(EquipmentLayerType.PIG_SADDLE, layer);
275+
}
276+
277+
/**
278+
* Adds a skeleton horse saddle layer to the equipment.
279+
*
280+
* @param layer The layer to add
281+
* @return This builder
282+
* @since 1.8.4
283+
* @sinceMinecraft 1.21.5
284+
*/
285+
@Contract("_ -> this")
286+
default @NotNull Builder addSkeletonHorseSaddle(@NotNull EquipmentLayer layer) {
287+
return addLayer(EquipmentLayerType.SKELETON_HORSE_SADDLE, layer);
288+
}
289+
290+
/**
291+
* Adds a strider saddle layer to the equipment.
292+
*
293+
* @param layer The layer to add
294+
* @return This builder
295+
* @since 1.8.4
296+
* @sinceMinecraft 1.21.5
297+
*/
298+
@Contract("_ -> this")
299+
default @NotNull Builder addStriderSaddle(@NotNull EquipmentLayer layer) {
300+
return addLayer(EquipmentLayerType.STRIDER_SADDLE, layer);
301+
}
302+
303+
/**
304+
* Adds a zombie horse saddle layer to the equipment.
305+
*
306+
* @param layer The layer to add
307+
* @return This builder
308+
* @since 1.8.4
309+
* @sinceMinecraft 1.21.5
310+
*/
311+
@Contract("_ -> this")
312+
default @NotNull Builder addZombieHorseSaddle(@NotNull EquipmentLayer layer) {
313+
return addLayer(EquipmentLayerType.ZOMBIE_HORSE_SADDLE, layer);
314+
}
211315
//#endregion
212316

213317
/**

api/src/main/java/team/unnamed/creative/equipment/EquipmentLayerType.java

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,53 @@ public enum EquipmentLayerType {
6565
* @since 1.8.0
6666
* @sinceMinecraft 1.21.2
6767
*/
68-
LLAMA_BODY // llama_body
68+
LLAMA_BODY, // llama_body
69+
70+
/**
71+
* @since 1.8.4
72+
* @sinceMinecraft 1.21.5
73+
*/
74+
CAMEL_SADDLE, // camel_saddle
75+
76+
/**
77+
* @since 1.8.4
78+
* @sinceMinecraft 1.21.5
79+
*/
80+
DONKEY_SADDLE, // donkey_saddle
81+
82+
/**
83+
* @since 1.8.4
84+
* @sinceMinecraft 1.21.5
85+
*/
86+
HORSE_SADDLE, // horse_saddle
87+
88+
/**
89+
* @since 1.8.4
90+
* @sinceMinecraft 1.21.5
91+
*/
92+
MULE_SADDLE, // mule_saddle
93+
94+
/**
95+
* @since 1.8.4
96+
* @sinceMinecraft 1.21.5
97+
*/
98+
PIG_SADDLE, // pig_saddle
99+
100+
/**
101+
* @since 1.8.4
102+
* @sinceMinecraft 1.21.5
103+
*/
104+
SKELETON_HORSE_SADDLE, // skeleton_horse_saddle
105+
106+
/**
107+
* @since 1.8.4
108+
* @sinceMinecraft 1.21.5
109+
*/
110+
STRIDER_SADDLE, // strider_saddle
111+
112+
/**
113+
* @since 1.8.4
114+
* @sinceMinecraft 1.21.5
115+
*/
116+
ZOMBIE_HORSE_SADDLE, // zombie_horse_saddle
69117
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=team.unnamed
2-
version=1.8.2-SNAPSHOT
2+
version=1.8.4-SNAPSHOT
33
description=A resource-pack library for Minecraft: Java Edition.
44
repositoryName=ossrh
55
snapshotRepository=https\://s01.oss.sonatype.org/content/repositories/snapshots/

0 commit comments

Comments
 (0)