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

Fix Bawk Bawk's maps not loading

This commit is contained in:
Sam 2018-09-07 00:56:18 +01:00 committed by Alexander Meech
parent 2d1d017cb6
commit 718b2c5391
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/game/NanoDisplay.java → Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoDisplay.java
View File

@ -1,15 +1,16 @@
package mineplex.core.game;
package mineplex.core.game.nano;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.game.Display;
public enum NanoDisplay implements Display
{
BAWK_BAWK(20, "Bawk Bawk's Weath", Material.EGG),
BAWK_BAWK(20, "Bawk Bawk's Wrath", Material.EGG),
COPY_CAT(17, "Copy Cat", Material.MONSTER_EGG, UtilEnt.getEntityEggData(EntityType.OCELOT)),
CHICKEN_SHOOT(14, "Chicken Shoot", Material.BOW),
COLOUR_CHANGE(6, "Color Swap", Material.WOOL, (byte) 4),
@ -30,7 +31,6 @@ public enum NanoDisplay implements Display
SPLEEF(9, "AAAAAAAA! Spleef", Material.DIAMOND_SPADE),
SPLOOR(7, "Sploor", Material.DIAMOND_BARDING),
TERRITORY(16, "Slime Territory", Material.MONSTER_EGG, UtilEnt.getEntityEggData(EntityType.SLIME)),
;
public static NanoDisplay getFromId(int gameId)

1
Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavourite.java
View File

@ -15,7 +15,6 @@ import mineplex.core.MiniDbClientPlugin;
import mineplex.core.ReflectivelyCreateMiniPlugin;
import mineplex.core.common.util.F;
import mineplex.core.donation.DonationManager;
import mineplex.core.game.NanoDisplay;
@ReflectivelyCreateMiniPlugin
public class NanoFavourite extends MiniDbClientPlugin<List<NanoDisplay>>

3
Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavouritePage.java
View File

@ -7,7 +7,6 @@ import org.bukkit.entity.Player;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.game.NanoDisplay;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.recharge.Recharge;
import mineplex.core.shop.page.ShopPageBase;
@ -28,7 +27,7 @@ public class NanoFavouritePage extends ShopPageBase<NanoFavourite, NanoShop>
addButtonNoAction(4, new ItemBuilder(Material.NETHER_STAR)
.setGlow(true)
.setTitle(C.cPurple + "Favorite Games")
.addLore("Setting games as your favourite will", "increase the chance of them being", "played in Nano Games lobbies.")
.addLore("Setting games as your favorite will", "increase the chance of them being", "played in Nano Games lobbies.")
.build());
int slot = 10;

2
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/cycle/GameCycle.java
View File

@ -17,7 +17,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import mineplex.core.ReflectivelyCreateMiniPlugin;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilMath;
import mineplex.core.game.NanoDisplay;
import mineplex.core.game.nano.NanoDisplay;
import mineplex.game.nano.GameManager;
import mineplex.game.nano.NanoManager;
import mineplex.game.nano.game.Game;

2
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/GameType.java
View File

@ -3,7 +3,7 @@ package mineplex.game.nano.game;
import java.io.File;
import mineplex.core.game.GameDisplay;
import mineplex.core.game.NanoDisplay;
import mineplex.core.game.nano.NanoDisplay;
import mineplex.game.nano.NanoManager;
import mineplex.game.nano.game.games.bawkbawk.BawkBawk;
import mineplex.game.nano.game.games.chickenshoot.ChickenShoot;