Skip to content
This repository was archived by the owner on Jun 29, 2023. It is now read-only.

Commit 4338445

Browse files
RadBuilderRadBuilder
committed
Merged #353 and resolved merge conflicts
2 parents 8682702 + e1ce6b9 commit 4338445

223 files changed

Lines changed: 1477 additions & 2542 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
allprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' group = 'be.isach' version = '2.4.9-RELEASE' compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 targetCompatibility = 1.8 configurations { shaded compile.extendsFrom shaded } afterEvaluate { jar { dependsOn configurations.shaded from configurations.shaded.collect { it.isDirectory() ? it : zipTree(it) } } }}boolean local = falseif (local) libsDirName = '/Users/sacha/Documents/Development/Java/UC_1_11/testserver/plugins'dependencies { subprojects.each { p -> shaded(p) { transitive false } }}subprojects { repositories { mavenLocal() mavenCentral() // Vault maven { url 'http://nexus.hc.to/content/repositories/pub_releases' } // Lib's Disguises maven { url 'http://repo.md-5.net/content/groups/public/' } // Use BuildTools to download Spigot to your local maven repository. More information: https://www.spigotmc.org/wiki/buildtools/ // BungeeCord maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } }}
1+
allprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' group = 'be.isach' version = '2.5.0-RELEASE' compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 targetCompatibility = 1.8 configurations { shaded compile.extendsFrom shaded } afterEvaluate { jar { dependsOn configurations.shaded from configurations.shaded.collect { it.isDirectory() ? it : zipTree(it) } } }}boolean local = falseif (local) libsDirName = '/Users/sacha/Documents/Development/Java/UC_1_11/testserver/plugins'dependencies { subprojects.each { p -> shaded(p) { transitive false } }}subprojects { repositories { mavenLocal() mavenCentral() // Vault maven { url 'http://nexus.hc.to/content/repositories/pub_releases' } // Lib's Disguises maven { url 'http://repo.md-5.net/content/groups/public/' } // Use BuildTools to download Spigot to your local maven repository. More information: https://www.spigotmc.org/wiki/buildtools/ // BungeeCord maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } }}

‎core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
compile 'org.spigotmc:spigot:1.12-R0.1-SNAPSHOT'
3-
compile('LibsDisguises:LibsDisguises:9.0.7') {
3+
compile('LibsDisguises:LibsDisguises:9.4.0') {
44
exclude group: 'org.spigotmc'
55
exclude group: 'com.comphenix.protocol'
66
}

‎core/src/main/java/be/isach/ultracosmetics/CosmeticManager.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
package be.isach.ultracosmetics;
22

33
import be.isach.ultracosmetics.cosmetics.Category;
4-
import be.isach.ultracosmetics.cosmetics.type.EmoteType;
5-
import be.isach.ultracosmetics.cosmetics.type.GadgetType;
6-
import be.isach.ultracosmetics.cosmetics.type.HatType;
7-
import be.isach.ultracosmetics.cosmetics.type.MorphType;
8-
import be.isach.ultracosmetics.cosmetics.type.MountType;
9-
import be.isach.ultracosmetics.cosmetics.type.ParticleEffectType;
10-
import be.isach.ultracosmetics.cosmetics.type.PetType;
11-
import be.isach.ultracosmetics.cosmetics.type.SuitType;
4+
import be.isach.ultracosmetics.cosmetics.Cosmetic;
5+
import be.isach.ultracosmetics.cosmetics.type.*;
126

137
import java.io.IOException;
148
import java.util.ArrayList;
@@ -45,22 +39,24 @@ public void setupCosmeticsConfigs() {
4539
ultraCosmetics.getConfig().addDefault("Ammo-System-For-Gadgets.Show-Ammo-In-Menu-As-Item-Amount", true, "Do you want that in the gadgets menu", "each gadget item has an amount", "corresponding to your ammo.");
4640

4741
// CALL STATIC BLOCK.
48-
GadgetType.ANTIGRAVITY.getConfigName();
49-
MountType.DRAGON.getConfigName();
50-
ParticleEffectType.ANGELWINGS.getConfigName();
51-
PetType.CHICK.getConfigName();
52-
SuitType.ASTRONAUT.getConfigName();
42+
GadgetType.register();
43+
MountType.register();
44+
ParticleEffectType.register();
45+
PetType.register();
46+
HatType.register();
47+
SuitType.register();
5348
EmoteType.ANGRY.getConfigName();
5449
if (Category.MORPHS.isEnabled()) {
55-
MorphType.BAT.getConfigName();
50+
MorphType.register();
51+
// MorphType.valueOf("bat").getConfigName();
5652
}
5753

5854
for (GadgetType gadgetType : GadgetType.values()) {
5955
ultraCosmetics.getConfig().addDefault("Gadgets." + gadgetType.getConfigName() + ".Affect-Players", true, "Should it affect players? (Velocity, etc.)");
6056
ultraCosmetics.getConfig().addDefault("Gadgets." + gadgetType.getConfigName() + ".Enabled", true, "if true, the gadget will be enabled.");
6157
ultraCosmetics.getConfig().addDefault("Gadgets." + gadgetType.getConfigName() + ".Show-Description", true, "if true, the description of gadget will be showed.");
6258
ultraCosmetics.getConfig().addDefault("Gadgets." + gadgetType.getConfigName() + ".Can-Be-Found-In-Treasure-Chests", true, "if true, it'll be possible to find", "it in treasure chests");
63-
if (gadgetType == GadgetType.PAINTBALLGUN) {
59+
if (gadgetType == GadgetType.valueOf("paintballgun")) {
6460
ultraCosmetics.getConfig().addDefault("Gadgets." + gadgetType.getConfigName() + ".Block-Type", "STAINED_CLAY", "With what block will it paint?");
6561
ultraCosmetics.getConfig().addDefault("Gadgets." + gadgetType.getConfigName() + ".Particle.Enabled", false, "Should it display particles?");
6662
ultraCosmetics.getConfig().addDefault("Gadgets." + gadgetType.getConfigName() + ".Particle.Effect", "FIREWORKS_SPARK", "what particles? (List: http://pastebin.com/CVKkufck)");

‎core/src/main/java/be/isach/ultracosmetics/command/subcommands/SubCommandClear.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import be.isach.ultracosmetics.UltraCosmetics;
44
import be.isach.ultracosmetics.command.SubCommand;
5+
import be.isach.ultracosmetics.cosmetics.suits.ArmorSlot;
56
import be.isach.ultracosmetics.player.UltraPlayer;
67
import org.bukkit.Bukkit;
78
import org.bukkit.ChatColor;
@@ -57,12 +58,13 @@ private void common(CommandSender sender, String... args) {
5758
else if (s.startsWith("pa")) up.removeParticleEffect();
5859
else if (s.startsWith("pe")) up.removePet();
5960
else if (s.startsWith("h")) up.removeHat();
60-
else if (s.startsWith("s")) up.removeSuit();
61+
else if (s.startsWith("s") && !s.contains(":")) up.removeSuit();
62+
else if (s.startsWith("s") && s.contains(":")) up.removeSuit(ArmorSlot.getByName(s.split(":")[1]));
6163
else if (s.startsWith("mor")) up.removeMorph();
6264
else if (s.startsWith("mou")) up.removeMount();
6365
else if (s.startsWith("e")) up.removeEmote();
6466
else {
65-
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "/uc menu <menu>\n" + ChatColor.RED + "" + ChatColor.BOLD + "Invalid Type.\n" + ChatColor.RED + "" + ChatColor.BOLD + "Available types: gadgets, particleeffects, pets, mounts, suits, hats, morphs");
67+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "/uc clear <player> <type>\n" + ChatColor.RED + "" + ChatColor.BOLD + "Invalid Type.\n" + ChatColor.RED + "" + ChatColor.BOLD + "Available types: gadgets, particleeffects, pets, mounts, suits, hats, morphs");
6668
}
6769
}
6870
}

‎core/src/main/java/be/isach/ultracosmetics/command/subcommands/SubCommandToggle.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ protected void onExePlayer(Player sender, String... args) {
9393
return;
9494
}
9595
}
96-
Object[] cosmeticTypes = category.getEnabled().stream().filter(cosmeticType -> cosmeticType.isEnabled() && cosmeticType.toString().toLowerCase().contains(cosm)).toArray();
96+
Object[] cosmeticTypes = category.getEnabled().stream().filter(cosmeticType -> cosmeticType.isEnabled() && cosmeticType.toString().toLowerCase().contains(cosm.split(":")[0])).toArray();
9797
if (cosmeticTypes.length == 1) {
9898
CosmeticType cosmeticType = (CosmeticType) cosmeticTypes[0];
9999
if (args.length > 3) {
100100
try {
101101
UltraPlayer other = getUltraCosmetics().getPlayerManager().getUltraPlayer(Bukkit.getPlayer(args[3]));
102102
if (cosmeticType.getCategory() == Category.SUITS) {
103103
try {
104-
ArmorSlot armorSlot = ArmorSlot.getByName(args[2].split(":")[1]);
105-
SuitType suitType = SuitType.valueOf(args[2].split(":")[0]);
104+
ArmorSlot armorSlot = ArmorSlot.getByName(cosm.split(":")[1]);
105+
SuitType suitType = SuitType.valueOf(cosm.split(":")[0]);
106106
suitType.equip(other, getUltraCosmetics(), armorSlot);
107107
} catch (Exception ex) {
108108
sender.sendMessage(MessageManager.getMessage("Prefix") + " §c§l/uc toggle suit <suit type:suit piece> <player>.");
@@ -148,8 +148,7 @@ protected void onExeConsole(ConsoleCommandSender sender, String... args) {
148148
if (!UltraCosmeticsData.get().getEnabledWorlds().contains(Bukkit.getPlayer(args[3]).getWorld().getName())) {
149149
sender.sendMessage(MessageManager.getMessage("World-Disabled"));
150150
return;
151-
}
152-
} catch (Exception e) {
151+
} } catch (Exception e) {
153152
sender.sendMessage(MessageManager.getMessage("Prefix") + " §c§lInvalid player.");
154153
return;
155154
}
@@ -174,7 +173,7 @@ protected void onExeConsole(ConsoleCommandSender sender, String... args) {
174173
sender.sendMessage(MessageManager.getMessage("Prefix") + " §c§lInvalid player.");
175174
return;
176175
}
177-
Object[] cosmeticTypes = category.getEnabled().stream().filter(cosmeticType -> cosmeticType.isEnabled() && cosmeticType.toString().toLowerCase().startsWith(cosm)).toArray();
176+
Object[] cosmeticTypes = category.getEnabled().stream().filter(cosmeticType -> cosmeticType.isEnabled() && cosmeticType.toString().toLowerCase().startsWith(cosm.split(":")[0])).toArray();
178177
if (cosmeticTypes.length == 1) {
179178
CosmeticType cosmeticType = (CosmeticType) cosmeticTypes[0];
180179
try {
@@ -200,4 +199,4 @@ protected void onExeConsole(ConsoleCommandSender sender, String... args) {
200199
sender.sendMessage(MessageManager.getMessage("Prefix") + " §c§lInvalid category.");
201200
}
202201
}
203-
}
202+
}

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,20 @@ private void loadMessages() {
228228
addMessage("Pets.ChristmasElf.entity-displayname", "&l%playername%'s Christmas elf");
229229
addMessage("Pets.Mooshroom.menu-name", "&4&lMooshroom");
230230
addMessage("Pets.Mooshroom.entity-displayname", "&l%playername%'s Mooshroom");
231+
addMessage("Pets.IronGolem.menu-name", "&7&lIronGolem");
232+
addMessage("Pets.IronGolem.entity-displayname", "&l%playername%'s IronGolem");
233+
addMessage("Pets.Snowman.menu-name", "&f&lSnowman");
234+
addMessage("Pets.Snowman.entity-displayname", "&l%playername%'s Snowman");
235+
addMessage("Pets.Villager.menu-name", "&a&lVillager");
236+
addMessage("Pets.Villager.entity-displayname", "&l%playername%'s Villager");
237+
addMessage("Pets.Bat.menu-name", "&8&lBat");
238+
addMessage("Pets.Bat.entity-displayname", "&l%playername%'s Bat");
239+
addMessage("Pets.PolarBear.menu-name", "&b&lPolarBear");
240+
addMessage("Pets.PolarBear.entity-displayname", "&l%playername%'s PolarBear");
241+
addMessage("Pets.Llama.menu-name", "&7&lLlama");
242+
addMessage("Pets.Llama.entity-displayname", "&l%playername%'s Llama");
243+
addMessage("Pets.Parrot.menu-name", "&a&lParrot");
244+
addMessage("Pets.Parrot.entity-displayname", "&l%playername%'s Parrot");
231245
addMessage("Pets.Spawn", "%prefix% &9You spawned %petname%");
232246
addMessage("Pets.Despawn", "%prefix% &9You despawned %petname%");
233247

@@ -300,6 +314,54 @@ private void loadMessages() {
300314
addMessage("Hats.Present.Name", "&c&lPresent");
301315
addMessage("Hats.Elf.Name", "&a&lElf");
302316
addMessage("Hats.Bedrock.Name", "&8&lBedrock");
317+
addMessage("Hats.Bread.Name", "&f&lBread");
318+
addMessage("Hats.Cheese.Name", "&e&lCheese");
319+
addMessage("Hats.Pancakes.Name", "&f&lPancakes");
320+
addMessage("Hats.Cake.Name", "&c&lCake");
321+
addMessage("Hats.Cookie.Name", "&6&lCookie");
322+
addMessage("Hats.CandyCane.Name", "&c&lCandy &f&lCane");
323+
addMessage("Hats.Chocolate.Name", "&a&lChocolate");
324+
addMessage("Hats.WhiteChocolate.Name", "&f&lWhite Chocolate");
325+
addMessage("Hats.Apple.Name", "&4&lApple");
326+
addMessage("Hats.Melon.Name", "&a&lMelon");
327+
addMessage("Hats.CarvedPumpkin.Name", "&6&lCarved Pumpkin");
328+
addMessage("Hats.Strawberry.Name", "&c&lStrawberry");
329+
addMessage("Hats.Coconut.Name", "&f&lCoconut");
330+
addMessage("Hats.Taco.Name", "&e&lTaco");
331+
addMessage("Hats.Bacon.Name", "&f&lBacon");
332+
addMessage("Hats.Fries.Name", "&6&lFries");
333+
addMessage("Hats.Hamburger.Name", "&6&lHamburger");
334+
addMessage("Hats.Popcorn.Name", "&6&lPopcorn");
335+
addMessage("Hats.WhiteDonut.Name", "&f&lWhite Donut");
336+
addMessage("Hats.PinkDonut.Name", "&d&lPink Donut");
337+
addMessage("Hats.ChocolateDonut.Name", "&a&lChocolate Donut");
338+
addMessage("Hats.Pie.Name", "&4&lPie");
339+
addMessage("Hats.A.Name", "&6&lA");
340+
addMessage("Hats.B.Name", "&4&lB");
341+
addMessage("Hats.C.Name", "&2&lC");
342+
addMessage("Hats.D.Name", "&b&lD");
343+
addMessage("Hats.E.Name", "&e&lE");
344+
addMessage("Hats.F.Name", "&5&lF");
345+
addMessage("Hats.G.Name", "&d&lG");
346+
addMessage("Hats.H.Name", "&a&lH");
347+
addMessage("Hats.I.Name", "&6&lI");
348+
addMessage("Hats.J.Name", "&4&lJ");
349+
addMessage("Hats.K.Name", "&2&lK");
350+
addMessage("Hats.L.Name", "&b&lL");
351+
addMessage("Hats.M.Name", "&e&lM");
352+
addMessage("Hats.N.Name", "&5&lN");
353+
addMessage("Hats.O.Name", "&d&lO");
354+
addMessage("Hats.P.Name", "&a&lP");
355+
addMessage("Hats.Q.Name", "&6&lQ");
356+
addMessage("Hats.R.Name", "&4&lR");
357+
addMessage("Hats.S.Name", "&2&lS");
358+
addMessage("Hats.T.Name", "&b&lT");
359+
addMessage("Hats.U.Name", "&e&lU");
360+
addMessage("Hats.V.Name", "&5&lV");
361+
addMessage("Hats.W.Name", "&d&lW");
362+
addMessage("Hats.X.Name", "&a&lX");
363+
addMessage("Hats.Y.Name", "&6&lY");
364+
addMessage("Hats.Z.Name", "&4&lZ");
303365
addMessage("Hats.Must-Remove-Hat", "%prefix% &c&lYou must remove your helmet to equip a hat!");
304366

305367
//SUITS

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/Category.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import be.isach.ultracosmetics.cosmetics.type.MountType;
1313
import be.isach.ultracosmetics.cosmetics.type.ParticleEffectType;
1414
import be.isach.ultracosmetics.cosmetics.type.PetType;
15+
import be.isach.ultracosmetics.cosmetics.type.SuitType;
1516
import be.isach.ultracosmetics.menu.CosmeticMenu;
1617
import be.isach.ultracosmetics.util.ItemFactory;
1718
import org.bukkit.Bukkit;
@@ -106,7 +107,7 @@ public CosmeticMenu getMenu(UltraCosmetics ultraCosmetics) {
106107

107108
@Override
108109
public List<? extends CosmeticType> getEnabled() {
109-
return EmoteType.enabled();
110+
return SuitType.enabled();
110111
}
111112
},
112113
EMOTES("Emotes", "Equip", "Unequip", "Clear-Emote", "%emotename%", "Equip", "Unequip") {

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetAntiGravity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class GadgetAntiGravity extends Gadget {
2929
private boolean running;
3030

3131
public GadgetAntiGravity(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
32-
super(owner, GadgetType.ANTIGRAVITY, ultraCosmetics);
32+
super(owner, GadgetType.valueOf("antigravity"), ultraCosmetics);
3333
}
3434

3535
@Override

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetBatBlaster.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class GadgetBatBlaster extends Gadget {
3232
private List<Bat> bats;
3333

3434
public GadgetBatBlaster(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
35-
super(owner, GadgetType.BATBLASTER, ultraCosmetics);
35+
super(owner, GadgetType.valueOf("batblaster"), ultraCosmetics);
3636
}
3737

3838
@Override

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetBlackHole.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class GadgetBlackHole extends Gadget {
3131
private Item item;
3232

3333
public GadgetBlackHole(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
34-
super(owner, GadgetType.BLACKHOLE, ultraCosmetics);
34+
super(owner, GadgetType.valueOf("blackhole"), ultraCosmetics);
3535
}
3636

3737
@Override

0 commit comments

Comments
 (0)