JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'project-cosmetics' of

Browse Source 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
This commit is contained in:
xGamingDudex 2016-05-12 23:46:17 +02:00
commit 29d4db0bfd
5 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GameModifierPage.java
View File

@ -41,6 +41,8 @@ public class GameModifierPage extends GadgetPage
if(g.ownsGadget(getPlayer())) own++;
total++;
}
if (total == 0)
continue;
ItemStack item = type.getItemStack();
ItemMeta meta = item.getItemMeta();

3
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
View File

@ -178,7 +178,8 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
if (enabled.containsKey(type)) addGlow(hatSlot);
type = GadgetType.Costume;
lore = getLore(ownedCount.get(type), maxCount.get(type), "Sometimes going out calls for special clothes! Gain bonus effects for matching outfit.", "Usable in Lobbies", enabled.get(type));
// Fixes more than 8 costumes being counted, even without the WindUp
lore = getLore((ownedCount.get(type) > 8) ? 8 : ownedCount.get(type), /*maxCount.get(type)*/ 8, "Sometimes going out calls for special clothes! Gain bonus effects for matching outfit.", "Usable in Lobbies", enabled.get(type));
addButton(costumeSlot, new ShopItem(Material.DIAMOND_CHESTPLATE, "Costumes", lore, 1, false), new OpenCostumes(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(costumeSlot);

49
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
View File

@ -6,6 +6,26 @@ import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import mineplex.core.gadget.commands.AmmoCommand;
import mineplex.core.gadget.commands.UnlockCosmeticsCommand;
import mineplex.core.gadget.gadgets.item.*;
import mineplex.core.gadget.gadgets.outfit.*;
import mineplex.core.gadget.gadgets.outfit.ravesuit.OutfitRaveSuitBoots;
import mineplex.core.gadget.gadgets.outfit.ravesuit.OutfitRaveSuitChestplate;
import mineplex.core.gadget.gadgets.outfit.ravesuit.OutfitRaveSuitHelmet;
import mineplex.core.gadget.gadgets.outfit.ravesuit.OutfitRaveSuitLeggings;
import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitBoots;
import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitChestplate;
import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitHelmet;
import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitLeggings;
import mineplex.core.gadget.gadgets.outfit.windupsuit.*;
import mineplex.core.gadget.gadgets.particle.*;
import mineplex.core.gadget.set.*;
import mineplex.core.gadget.set.suits.SetRaveSuit;
import mineplex.core.gadget.set.suits.SetSpaceSuit;
import mineplex.core.gadget.types.gamemodifiers.kits.KitGameModifier;
import mineplex.core.gadget.types.gamemodifiers.kits.KitModifierType;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@ -275,7 +295,8 @@ public class GadgetManager extends MiniPlugin
//Costumes
addSet(new SetRaveSuit(this));
addSet(new SetSpaceSuit(this));
addSet(new SetWindUpSuit(this));
//Removes WindUp suit for now, as it's not going to be released
//addSet(new SetWindUpSuit(this));
addSet(new SetParty(this));
addSet(new SetCupidsLove(this));
addSet(new SetEmerald(this));
@ -320,10 +341,10 @@ public class GadgetManager extends MiniPlugin
addGadget(new OutfitSpaceSuitLeggings(this));
addGadget(new OutfitSpaceSuitBoots(this));
addGadget(new OutfitWindUpSuitHelmet(this));
addGadget(new OutfitWindUpSuitChestplate(this));
addGadget(new OutfitWindUpSuitLeggings(this));
addGadget(new OutfitWindUpSuitBoots(this));
//addGadget(new OutfitWindUpSuitHelmet(this));
//addGadget(new OutfitWindUpSuitChestplate(this));
//addGadget(new OutfitWindUpSuitLeggings(this));
//addGadget(new OutfitWindUpSuitBoots(this));
addGadget(new OutfitTeam(this, "Team Helmet", -1, ArmorSlot.Helmet, Material.LEATHER_HELMET, (byte)0));
addGadget(new OutfitTeam(this, "Team Shirt", -1, ArmorSlot.Chest, Material.LEATHER_CHESTPLATE, (byte)0));
@ -481,23 +502,23 @@ public class GadgetManager extends MiniPlugin
// Survival Games
// Also not being released in this update
// Beastmaster
addGadget(new ChickenKitGameModifier(this));
addGadget(new MiniGuardianKitGameModifier(this));
addGadget(new PigKitGameModifier(this));
addGadget(new SquidKitGameModifier(this));
//addGadget(new ChickenKitGameModifier(this));
//addGadget(new MiniGuardianKitGameModifier(this));
//addGadget(new PigKitGameModifier(this));
//addGadget(new SquidKitGameModifier(this));
// Horseman
addGadget(new MuleKitGameModifier(this));
addGadget(new SkeletonHorseKitGameModifier(this));
//addGadget(new MuleKitGameModifier(this));
//addGadget(new SkeletonHorseKitGameModifier(this));
// Necromancer
addGadget(new WitherSkeletonKitGameModifier(this));
//addGadget(new WitherSkeletonKitGameModifier(this));
// Bridges
addGadget(new PotatoKitGameModifier(this));
//addGadget(new PotatoKitGameModifier(this));
for(GadgetType type : GadgetType.values())
{

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java
View File

@ -20,7 +20,7 @@ public class ArrowTrailConfetti extends ArrowEffectGadget
public ArrowTrailConfetti(GadgetManager manager)
{
super(manager, "Arrow Confetti",
UtilText.splitLineToArray(C.cGray + "This " + C.cPurple + "party train" + C.cGray + "won't stop till the arrow hits your face.", LineFormat.LORE),
UtilText.splitLineToArray(C.cGray + "This " + C.cPurple + "party train" + C.cGray + " won't stop till the arrow hits your face.", LineFormat.LORE),
1, Material.FIREWORK, (byte)0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java
View File

@ -34,7 +34,7 @@ public class WinEffectRiseOfTheElderGuardian extends WinEffectGadget
public WinEffectRiseOfTheElderGuardian(GadgetManager manager)
{
super(manager, "Rise of the Elder Guardian", UtilText.splitLinesToArray(new String[]{C.cGray + C.Italics + "Say hello to my little friend...", " ", " ", C.cGray + C.Italics + "the elder guardian."}, LineFormat.LORE),
super(manager, "Rise of the Elder Guardian", UtilText.splitLinesToArray(new String[]{C.cGray + C.Italics + "Say hello to my little friend...", " ", " ", C.cGray + C.Italics + "the Elder Guardian."}, LineFormat.LORE),
1, Material.PRISMARINE, (byte) 2);
_schematicName = "ElderGuardianPodium";