Skip to content

Commit e792dac

Browse files
datatagsdatatags
authored
Merge pull request UltraCosmetics#595 from Chris6ix/patch-1
6 new Pets :)
2 parents e43cfcd + b6c7706 commit e792dac

19 files changed

Lines changed: 196 additions & 34 deletions

‎TODO.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,13 @@
2828
- Vehicles
2929
- Skins (?)
3030
- Pets:
31-
- Iron Golem
32-
- Snow Golem
33-
- Slime
3431
- Squid
35-
- Villager
36-
- Bat
37-
- Horse
38-
- Enderman
3932
- Zombie Pigman
4033
- Spider
41-
- Blaze
4234
- Cave Spider
43-
- Creeper
4435
- Ghast
4536
- Magma Cube
46-
- Silverfish
47-
- Skeleton
4837
- Spider Jockey
49-
- Zombie
5038
- Zombie Villager
5139
- Wither Skeleton
5240
- Witch

‎core/src/main/java/be/isach/ultracosmetics/config/MessageManager.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,19 @@ private static void loadMessages() {
309309
addMessage("Pets.Goat.entity-displayname", "&l%playername%'s Goat");
310310
addMessage("Pets.Silverfish.menu-name", "&7&lSilverfish");
311311
addMessage("Pets.Silverfish.entity-displayname", "&l%playername%'s Silverfish");
312+
313+
addMessage("Pets.Horse.menu-name", "&a&lHorse");
314+
addMessage("Pets.Horse.entity-displayname", "&l%playername%'s Horse");
315+
addMessage("Pets.Blaze.menu-name", "&c&lBlaze");
316+
addMessage("Pets.Blaze.entity-displayname", "&l%playername%'s Blaze");
317+
addMessage("Pets.Creeper.menu-name", "&a&lCreeper");
318+
addMessage("Pets.Creeper.entity-displayname", "&l%playername%'s Creeper");
319+
addMessage("Pets.Enderman.menu-name", "&5&lEnderman");
320+
addMessage("Pets.Enderman.entity-displayname", "&l%playername%'s Enderman");
321+
addMessage("Pets.Skeleton.menu-name", "&f&lSkeleton");
322+
addMessage("Pets.Skeleton.entity-displayname", "&l%playername%'s Skeleton");
323+
addMessage("Pets.Zombie.menu-name", "&2&lZombie");
324+
addMessage("Pets.Zombie.entity-displayname", "&l%playername%'s Zombie");
312325
addMessage("Pets.Equip", "%prefix% &9You spawned %petname%");
313326
addMessage("Pets.Unequip", "%prefix% &9You despawned %petname%");
314327

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetAxolotl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Represents an instance of a axolotl pet summoned by a player.
1212
*
1313
* @author Chris6ix
14-
* @since 14-01-2021
14+
* @since 14-01-2022
1515
*/
1616
public class PetAxolotl extends Pet {
1717
public PetAxolotl(UltraPlayer owner, UltraCosmetics ultraCosmetics) {

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetBee.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Represents an instance of a bee pet summoned by a player.
1212
*
1313
* @author Chris6ix
14-
* @since 18-01-2021
14+
* @since 18-01-2022
1515
*/
1616
public class PetBee extends Pet {
1717
public PetBee(UltraPlayer owner, UltraCosmetics ultraCosmetics) {

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetBlaze.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package be.isach.ultracosmetics.cosmetics.pets;
2+
3+
import com.cryptomorin.xseries.XMaterial;
4+
5+
import be.isach.ultracosmetics.UltraCosmetics;
6+
import be.isach.ultracosmetics.UltraCosmeticsData;
7+
import be.isach.ultracosmetics.cosmetics.type.PetType;
8+
import be.isach.ultracosmetics.player.UltraPlayer;
9+
import be.isach.ultracosmetics.util.ItemFactory;
10+
11+
/**
12+
* Represents an instance of a blaze pet summoned by a player.
13+
*
14+
* @author Chris6ix
15+
* @since 06-04-2022
16+
*/
17+
public class PetBlaze extends Pet {
18+
public PetBlaze(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
19+
super(owner, ultraCosmetics, PetType.getByName("blaze"), ItemFactory.create(XMaterial.BLAZE_ROD, UltraCosmeticsData.get().getItemNoPickupString()));
20+
}
21+
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetCreeper.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package be.isach.ultracosmetics.cosmetics.pets;
2+
3+
import com.cryptomorin.xseries.XMaterial;
4+
5+
import be.isach.ultracosmetics.UltraCosmetics;
6+
import be.isach.ultracosmetics.UltraCosmeticsData;
7+
import be.isach.ultracosmetics.cosmetics.type.PetType;
8+
import be.isach.ultracosmetics.player.UltraPlayer;
9+
import be.isach.ultracosmetics.util.ItemFactory;
10+
11+
/**
12+
* Represents an instance of a creeper pet summoned by a player.
13+
*
14+
* @author Chris6ix
15+
* @since 12-04-2022
16+
*/
17+
public class PetCreeper extends Pet {
18+
public PetCreeper(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
19+
super(owner, ultraCosmetics, PetType.getByName("creeper"), ItemFactory.create(XMaterial.GUNPOWDER, UltraCosmeticsData.get().getItemNoPickupString()));
20+
}
21+
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetEnderman.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package be.isach.ultracosmetics.cosmetics.pets;
2+
3+
import com.cryptomorin.xseries.XMaterial;
4+
5+
import be.isach.ultracosmetics.UltraCosmetics;
6+
import be.isach.ultracosmetics.UltraCosmeticsData;
7+
import be.isach.ultracosmetics.cosmetics.type.PetType;
8+
import be.isach.ultracosmetics.player.UltraPlayer;
9+
import be.isach.ultracosmetics.util.ItemFactory;
10+
11+
/**
12+
* Represents an instance of a enderman pet summoned by a player.
13+
*
14+
* @author Chris6ix
15+
* @since 12-04-2022
16+
*/
17+
public class PetEnderman extends Pet {
18+
public PetEnderman(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
19+
super(owner, ultraCosmetics, PetType.getByName("enderman"), ItemFactory.create(XMaterial.ENDER_PEARL, UltraCosmeticsData.get().getItemNoPickupString()));
20+
}
21+
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetFox.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Represents an instance of a fox pet summoned by a player.
1212
*
1313
* @author Chris6ix
14-
* @since 14-01-2021
14+
* @since 14-01-2022
1515
*/
1616
public class PetFox extends Pet {
1717
public PetFox(UltraPlayer owner, UltraCosmetics ultraCosmetics) {

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetGoat.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Represents an instance of a goat pet summoned by a player.
1212
*
1313
* @author Chris6ix
14-
* @since 18-01-2021
14+
* @since 18-01-2022
1515
*/
1616

1717
/*Temporarily using WHEAT as material until https://minecraft.fandom.com/wiki/Goat_Horn comes to Java edition*/

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetHorse.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package be.isach.ultracosmetics.cosmetics.pets;
2+
3+
import com.cryptomorin.xseries.XMaterial;
4+
5+
import be.isach.ultracosmetics.UltraCosmetics;
6+
import be.isach.ultracosmetics.UltraCosmeticsData;
7+
import be.isach.ultracosmetics.cosmetics.type.PetType;
8+
import be.isach.ultracosmetics.player.UltraPlayer;
9+
import be.isach.ultracosmetics.util.ItemFactory;
10+
11+
/**
12+
* Represents an instance of a horse pet summoned by a player.
13+
*
14+
* @author Chris6ix
15+
* @since 06-04-2022
16+
*/
17+
public class PetHorse extends Pet {
18+
public PetHorse(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
19+
super(owner, ultraCosmetics, PetType.getByName("horse"), ItemFactory.create(XMaterial.LEATHER_HORSE_ARMOR, UltraCosmeticsData.get().getItemNoPickupString()));
20+
}
21+
}

0 commit comments

Comments
 (0)