From 85044fdb0907284bafbedfc6a42f88be4a92f0fb Mon Sep 17 00:00:00 2001 From: Florian C Date: Sun, 21 May 2017 00:06:05 +0200 Subject: [PATCH 1/4] Describe what is BSkyblock in comparison to ASkyBlock --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7c1aa2edb..4327ce831 100755 --- a/README.md +++ b/README.md @@ -2,15 +2,17 @@ BSkyBlock ========== [![Build Status](https://travis-ci.org/tastybento/bskyblock.svg?branch=master)](https://travis-ci.org/tastybento/bskyblock) -A Skyblock Bukkit plugin for Minecraft derived from BSkyBlock! - +A Skyblock Bukkit plugin for Minecraft derived from the well-known ASkyBlock! This is a survival game where the player starts with an island in the sky. +BSkyBlock (Better SkyBlock) represents a turning point on ASkyBlock's history : Tastybento and Poslovitch thought and designed together this complete rewrite in order to provide a whole new way to play Skyblock. + +**Discover today BSkyBlock, its gameplay overhaul, and enjoy the Skyblock revival!** + Bugs and Feature requests ========================= File bug and feature requests here: https://github.com/tastybento/BSkyBlock-Bugs-N-Features/issues - Note for developers =================== This is an actively developed project. Pull requests are accepted if they address a specific issue and are of high enough quality. The best way to do a pull request is to file an issue, then say that you'll fix it so we know it's coming and can coordinate with you. From 7e8ffea32b9a7a29d54f65e949158b783ebc9341 Mon Sep 17 00:00:00 2001 From: Ben Date: Sat, 20 May 2017 22:04:52 -0700 Subject: [PATCH 2/4] We can use the issues on this project because we are both collaborators. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4327ce831..d9fcd88ee 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ BSkyBlock (Better SkyBlock) represents a turning point on ASkyBlock's history : Bugs and Feature requests ========================= -File bug and feature requests here: https://github.com/tastybento/BSkyBlock-Bugs-N-Features/issues +File bug and feature requests here: https://github.com/tastybento/bskyblock/issues Note for developers =================== From 3e381ec1f6880711634b160e184a7d44d82a12a1 Mon Sep 17 00:00:00 2001 From: Poslovitch Date: Sun, 21 May 2017 08:03:17 +0200 Subject: [PATCH 3/4] Changed ASB classes prefix to BSB --- .../java/us/tastybento/bskyblock/BSkyBlock.java | 16 ++++++++-------- .../config/{ASBLocale.java => BSBLocale.java} | 4 ++-- .../us/tastybento/bskyblock/config/Settings.java | 2 +- .../{ASBDatabase.java => BSBDatabase.java} | 8 ++++---- .../bskyblock/database/IslandsManager.java | 4 ++-- .../database/OfflineHistoryMessages.java | 4 ++-- .../bskyblock/database/PlayersManager.java | 4 ++-- .../database/flatfile/FlatFileDatabase.java | 4 ++-- .../bskyblock/database/mysql/MySQLDatabase.java | 4 ++-- .../database/sqlite/SQLiteDatabase.java | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) rename src/main/java/us/tastybento/bskyblock/config/{ASBLocale.java => BSBLocale.java} (98%) mode change 100755 => 100644 rename src/main/java/us/tastybento/bskyblock/database/{ASBDatabase.java => BSBDatabase.java} (89%) mode change 100755 => 100644 diff --git a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java index 5f6281803..147c6041a 100755 --- a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java +++ b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java @@ -7,9 +7,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import us.tastybento.bskyblock.config.ASBLocale; +import us.tastybento.bskyblock.config.BSBLocale; import us.tastybento.bskyblock.config.Settings; -import us.tastybento.bskyblock.database.ASBDatabase; +import us.tastybento.bskyblock.database.BSBDatabase; import us.tastybento.bskyblock.database.IslandsManager; import us.tastybento.bskyblock.database.OfflineHistoryMessages; import us.tastybento.bskyblock.database.PlayersManager; @@ -23,7 +23,7 @@ import us.tastybento.bskyblock.util.VaultHelper; public class BSkyBlock extends JavaPlugin{ private static BSkyBlock plugin; - private HashMap locales = new HashMap(); + private HashMap locales = new HashMap(); // Databases private PlayersManager playersManager; @@ -116,7 +116,7 @@ public class BSkyBlock extends JavaPlugin{ @Override public String getValue() { - return ASBDatabase.getDatabase().toString(); + return BSBDatabase.getDatabase().toString(); } }); } @@ -133,7 +133,7 @@ public class BSkyBlock extends JavaPlugin{ * Returns an HashMap of locale identifier and the related object * @return the locales */ - public HashMap getLocales(){ + public HashMap getLocales(){ return locales; } @@ -141,7 +141,7 @@ public class BSkyBlock extends JavaPlugin{ * Returns the default locale * @return the default locale */ - public ASBLocale getLocale(){ + public BSBLocale getLocale(){ return locales.get(Settings.defaultLanguage); } @@ -150,7 +150,7 @@ public class BSkyBlock extends JavaPlugin{ * @param sender - CommandSender to get the locale * @return if sender is a player, the player's locale, otherwise the default locale */ - public ASBLocale getLocale(CommandSender sender){ + public BSBLocale getLocale(CommandSender sender){ if(sender instanceof Player) return getLocale(((Player) sender).getUniqueId()); else return getLocale(); } @@ -160,7 +160,7 @@ public class BSkyBlock extends JavaPlugin{ * @param player - Player to get the locale * @return the locale for this player */ - public ASBLocale getLocale(UUID player){ + public BSBLocale getLocale(UUID player){ String locale = getPlayers().getPlayer(player).getLocale(); if(locale.isEmpty() || !locales.containsKey(locale)) return locales.get(Settings.defaultLanguage); diff --git a/src/main/java/us/tastybento/bskyblock/config/ASBLocale.java b/src/main/java/us/tastybento/bskyblock/config/BSBLocale.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/us/tastybento/bskyblock/config/ASBLocale.java rename to src/main/java/us/tastybento/bskyblock/config/BSBLocale.java index 3a359b2e7..0609207f7 --- a/src/main/java/us/tastybento/bskyblock/config/ASBLocale.java +++ b/src/main/java/us/tastybento/bskyblock/config/BSBLocale.java @@ -15,7 +15,7 @@ import us.tastybento.bskyblock.BSkyBlock; * @author Tastybento * @author Poslovitch */ -public class ASBLocale { +public class BSBLocale { private BSkyBlock plugin; @@ -29,7 +29,7 @@ public class ASBLocale { * @param plugin * @param localeName - name of the yaml file that will be used */ - public ASBLocale(BSkyBlock plugin, String localeID){ + public BSBLocale(BSkyBlock plugin, String localeID){ this.plugin = plugin; this.localeID = localeID; getLocale(localeID); diff --git a/src/main/java/us/tastybento/bskyblock/config/Settings.java b/src/main/java/us/tastybento/bskyblock/config/Settings.java index 478a42f79..54ba55f51 100755 --- a/src/main/java/us/tastybento/bskyblock/config/Settings.java +++ b/src/main/java/us/tastybento/bskyblock/config/Settings.java @@ -3,7 +3,7 @@ package us.tastybento.bskyblock.config; import java.util.HashMap; import java.util.List; -import us.tastybento.bskyblock.database.ASBDatabase.DatabaseType; +import us.tastybento.bskyblock.database.BSBDatabase.DatabaseType; import us.tastybento.bskyblock.database.OfflineHistoryMessages.HistoryMessageType; import us.tastybento.bskyblock.database.objects.Island.SettingsFlag; diff --git a/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java b/src/main/java/us/tastybento/bskyblock/database/BSBDatabase.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java rename to src/main/java/us/tastybento/bskyblock/database/BSBDatabase.java index fef81d501..22214a332 --- a/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/BSBDatabase.java @@ -11,9 +11,9 @@ import us.tastybento.bskyblock.database.objects.Island; import us.tastybento.bskyblock.database.objects.APlayer; import us.tastybento.bskyblock.database.sqlite.SQLiteDatabase; -public abstract class ASBDatabase { +public abstract class BSBDatabase { - public static ASBDatabase getDatabase(){ + public static BSBDatabase getDatabase(){ for(DatabaseType type : DatabaseType.values()){ if(type == Settings.databaseType) return type.database; } @@ -34,9 +34,9 @@ public abstract class ASBDatabase { MYSQL(new MySQLDatabase()), SQLITE(new SQLiteDatabase()); - ASBDatabase database; + BSBDatabase database; - DatabaseType(ASBDatabase database){ + DatabaseType(BSBDatabase database){ this.database = database; } } diff --git a/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java b/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java index 0edb71da6..cc02bc77b 100755 --- a/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java @@ -12,7 +12,7 @@ import us.tastybento.bskyblock.database.objects.Island; public class IslandsManager { private BSkyBlock plugin; - private ASBDatabase database; + private BSBDatabase database; private HashMap islands; private Island spawn; @@ -22,7 +22,7 @@ public class IslandsManager { public IslandsManager(BSkyBlock plugin){ this.plugin = plugin; - database = ASBDatabase.getDatabase(); + database = BSBDatabase.getDatabase(); islands = new HashMap(); spawn = null; } diff --git a/src/main/java/us/tastybento/bskyblock/database/OfflineHistoryMessages.java b/src/main/java/us/tastybento/bskyblock/database/OfflineHistoryMessages.java index 1248e8289..b2516fac0 100755 --- a/src/main/java/us/tastybento/bskyblock/database/OfflineHistoryMessages.java +++ b/src/main/java/us/tastybento/bskyblock/database/OfflineHistoryMessages.java @@ -18,14 +18,14 @@ import us.tastybento.bskyblock.config.Settings; */ public class OfflineHistoryMessages { private BSkyBlock plugin; - private ASBDatabase database; + private BSBDatabase database; // Offline Messages private HashMap> messages; public OfflineHistoryMessages(BSkyBlock plugin){ this.plugin = plugin; - database = ASBDatabase.getDatabase(); + database = BSBDatabase.getDatabase(); messages = new HashMap>(); } diff --git a/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java b/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java index 8969f4528..aef07f79a 100755 --- a/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java @@ -10,13 +10,13 @@ import us.tastybento.bskyblock.database.objects.APlayer; public class PlayersManager{ private BSkyBlock plugin; - private ASBDatabase database; + private BSBDatabase database; private HashMap players; public PlayersManager(BSkyBlock plugin){ this.plugin = plugin; - database = ASBDatabase.getDatabase(); + database = BSBDatabase.getDatabase(); players = new HashMap(); } diff --git a/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java index 2733bace2..e1eacc8d8 100755 --- a/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java @@ -4,11 +4,11 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; -import us.tastybento.bskyblock.database.ASBDatabase; import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.database.BSBDatabase; import us.tastybento.bskyblock.database.objects.APlayer; -public class FlatFileDatabase extends ASBDatabase{ +public class FlatFileDatabase extends BSBDatabase{ @Override public APlayer loadPlayerData(UUID uuid) { diff --git a/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java index c09177ef3..4235ab33c 100755 --- a/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java @@ -4,11 +4,11 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; -import us.tastybento.bskyblock.database.ASBDatabase; import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.database.BSBDatabase; import us.tastybento.bskyblock.database.objects.APlayer; -public class MySQLDatabase extends ASBDatabase{ +public class MySQLDatabase extends BSBDatabase{ @Override public APlayer loadPlayerData(UUID uuid) { diff --git a/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java b/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java index e7fe58fe0..e10469b41 100755 --- a/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java @@ -4,11 +4,11 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; -import us.tastybento.bskyblock.database.ASBDatabase; import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.database.BSBDatabase; import us.tastybento.bskyblock.database.objects.APlayer; -public class SQLiteDatabase extends ASBDatabase{ +public class SQLiteDatabase extends BSBDatabase{ @Override public APlayer loadPlayerData(UUID uuid) { From ba9a59df16aefabe2f4bcb09300a857a634adedf Mon Sep 17 00:00:00 2001 From: Poslovitch Date: Sun, 21 May 2017 08:06:26 +0200 Subject: [PATCH 4/4] Changed ASBCommand to BSBCommand --- .../java/us/tastybento/bskyblock/commands/AdminCommand.java | 2 +- .../bskyblock/commands/{ASBCommand.java => BSBCommand.java} | 4 ++-- .../java/us/tastybento/bskyblock/commands/IslandCommand.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/us/tastybento/bskyblock/commands/{ASBCommand.java => BSBCommand.java} (98%) mode change 100755 => 100644 diff --git a/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java b/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java index f71b5d58c..38721d8b5 100755 --- a/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java @@ -4,7 +4,7 @@ import org.bukkit.command.CommandSender; import us.tastybento.bskyblock.BSkyBlock; -public class AdminCommand extends ASBCommand{ +public class AdminCommand extends BSBCommand{ public AdminCommand(BSkyBlock plugin) { super(plugin); diff --git a/src/main/java/us/tastybento/bskyblock/commands/ASBCommand.java b/src/main/java/us/tastybento/bskyblock/commands/BSBCommand.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/us/tastybento/bskyblock/commands/ASBCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/BSBCommand.java index 9cc80aaff..0a4f6ef4b --- a/src/main/java/us/tastybento/bskyblock/commands/ASBCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/BSBCommand.java @@ -21,10 +21,10 @@ import us.tastybento.bskyblock.util.Util; * * @author Poslovitch */ -public abstract class ASBCommand implements CommandExecutor, TabCompleter{ +public abstract class BSBCommand implements CommandExecutor, TabCompleter{ private Map arguments; - protected ASBCommand(BSkyBlock plugin){ + protected BSBCommand(BSkyBlock plugin){ arguments = new HashMap(); // Automatically register the help argument diff --git a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java index f17dd075a..506dd1a52 100755 --- a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java @@ -18,7 +18,7 @@ import us.tastybento.bskyblock.util.VaultHelper; * @author Tastybento * @author Poslovitch */ -public class IslandCommand extends ASBCommand{ +public class IslandCommand extends BSBCommand{ private BSkyBlock plugin; public IslandCommand(BSkyBlock plugin) {