From 718b2c5391e0aa27fced545e2cb3c33477a8e422 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 7 Sep 2018 00:56:18 +0100 Subject: [PATCH] Fix Bawk Bawk's maps not loading --- .../src/mineplex/core/game/{ => nano}/NanoDisplay.java | 6 +++--- .../src/mineplex/core/game/nano/NanoFavourite.java | 1 - .../src/mineplex/core/game/nano/NanoFavouritePage.java | 3 +-- .../src/mineplex/game/nano/cycle/GameCycle.java | 2 +- .../src/mineplex/game/nano/game/GameType.java | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) rename Plugins/Mineplex.Core/src/mineplex/core/game/{ => nano}/NanoDisplay.java (94%) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/NanoDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoDisplay.java similarity index 94% rename from Plugins/Mineplex.Core/src/mineplex/core/game/NanoDisplay.java rename to Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoDisplay.java index 0cb705850..8a94e5a23 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/game/NanoDisplay.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoDisplay.java @@ -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) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavourite.java b/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavourite.java index c869018b8..a020e65a3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavourite.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavourite.java @@ -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> diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavouritePage.java b/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavouritePage.java index b965faa55..5efff3a75 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavouritePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/game/nano/NanoFavouritePage.java @@ -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 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; diff --git a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/cycle/GameCycle.java b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/cycle/GameCycle.java index 9502b797a..d1ecf9449 100644 --- a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/cycle/GameCycle.java +++ b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/cycle/GameCycle.java @@ -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; diff --git a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/GameType.java b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/GameType.java index def337305..2fb661e8f 100644 --- a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/GameType.java +++ b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/GameType.java @@ -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;