diff --git a/SaneEconomyCore/pom.xml b/SaneEconomyCore/pom.xml index 94042a9..b09397b 100644 --- a/SaneEconomyCore/pom.xml +++ b/SaneEconomyCore/pom.xml @@ -118,7 +118,7 @@ votuvo - https://nexus.votuvo.com/repository/maven-snapshots/ + https://nexus.sw4t.net/repository/maven-snapshots/ diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java index 4870fab..08fe975 100644 --- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java +++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java @@ -45,13 +45,15 @@ public class EconomyStorageBackendMySQL extends EconomyStorageBackendCaching { if (schemaVersion == -1) { conn.prepareStatement(String.format("CREATE TABLE IF NOT EXISTS `%s` (`key` VARCHAR(32) PRIMARY KEY, `val` TEXT)", dbConn.getTable("saneeconomy_schema"))).executeUpdate(); - conn.prepareStatement(String.format("REPLACE INTO %s (`key`, `val`) VALUES ('schema_version', 2)", dbConn.getTable("saneeconomy_schema"))).executeUpdate(); + conn.prepareStatement(String.format("REPLACE INTO %s (`key`, `val`) VALUES ('schema_version', 3)", dbConn.getTable("saneeconomy_schema"))).executeUpdate(); conn.prepareStatement(String.format("CREATE TABLE `%s` (unique_identifier VARCHAR(128) PRIMARY KEY, last_name VARCHAR(16), balance DECIMAL(18, 2))", dbConn.getTable("saneeconomy_balances"))).executeUpdate(); schemaVersion = 3; } if (schemaVersion == 2) { - conn.prepareStatement("ALTER TABLE `%s` ADD `last_name` VARCHAR(16)").executeUpdate(); + conn.prepareStatement(String.format("ALTER TABLE `%s` ADD `last_name` VARCHAR(16)", dbConn.getTable("saneeconomy_balances"))).executeUpdate(); + conn.prepareStatement(String.format("REPLACE INTO %s (`key`, `val`) VALUES ('schema_version', 3)", dbConn.getTable("saneeconomy_schema"))).executeUpdate(); + schemaVersion = 3; } diff --git a/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockServer.java b/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockServer.java index 77f094c..d455f2d 100644 --- a/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockServer.java +++ b/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockServer.java @@ -2,10 +2,8 @@ package org.appledash.saneeconomy.test.mock; import org.bukkit.*; import org.bukkit.advancement.Advancement; -import org.bukkit.boss.BarColor; -import org.bukkit.boss.BarFlag; -import org.bukkit.boss.BarStyle; -import org.bukkit.boss.BossBar; +import org.bukkit.block.data.BlockData; +import org.bukkit.boss.*; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -16,6 +14,7 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.generator.ChunkGenerator; import org.bukkit.help.HelpMap; import org.bukkit.inventory.*; +import org.bukkit.loot.LootTable; import org.bukkit.map.MapView; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; @@ -28,6 +27,7 @@ import org.bukkit.util.CachedServerIcon; import java.awt.image.BufferedImage; import java.io.File; import java.util.*; +import java.util.function.Consumer; import java.util.logging.Logger; /** @@ -94,16 +94,6 @@ public class MockServer implements Server { return null; } - @Override - public String getServerName() { - return null; - } - - @Override - public String getServerId() { - return null; - } - @Override public String getWorldType() { return null; @@ -240,12 +230,23 @@ public class MockServer implements Server { } @Override - public MapView getMap(short i) { + public MapView getMap(int id) { + return null; + } + + + @Override + public MapView createMap(World world) { return null; } @Override - public MapView createMap(World world) { + public ItemStack createExplorerMap(World world, Location location, StructureType structureType) { + return null; + } + + @Override + public ItemStack createExplorerMap(World world, Location location, StructureType structureType, int radius, boolean findUnexplored) { return null; } @@ -529,6 +530,26 @@ public class MockServer implements Server { return null; } + @Override + public KeyedBossBar createBossBar(NamespacedKey key, String title, BarColor color, BarStyle style, BarFlag... flags) { + return null; + } + + @Override + public Iterator getBossBars() { + return null; + } + + @Override + public KeyedBossBar getBossBar(NamespacedKey key) { + return null; + } + + @Override + public boolean removeBossBar(NamespacedKey key) { + return false; + } + @Override public Entity getEntity(UUID uuid) { return null; @@ -544,6 +565,46 @@ public class MockServer implements Server { return null; } + @Override + public BlockData createBlockData(Material material) { + return null; + } + + @Override + public BlockData createBlockData(Material material, Consumer consumer) { + return null; + } + + @Override + public BlockData createBlockData(String data) throws IllegalArgumentException { + return null; + } + + @Override + public BlockData createBlockData(Material material, String data) throws IllegalArgumentException { + return null; + } + + @Override + public Tag getTag(String registry, NamespacedKey tag, Class clazz) { + return null; + } + + @Override + public Iterable> getTags(String registry, Class clazz) { + return null; + } + + @Override + public LootTable getLootTable(NamespacedKey key) { + return null; + } + + @Override + public List selectEntities(CommandSender sender, String selector) throws IllegalArgumentException { + return null; + } + @Override public UnsafeValues getUnsafe() { return null; diff --git a/SaneEconomySignShop/pom.xml b/SaneEconomySignShop/pom.xml index dfd4809..ff97c69 100644 --- a/SaneEconomySignShop/pom.xml +++ b/SaneEconomySignShop/pom.xml @@ -10,7 +10,7 @@ 4.0.0 SaneEconomySignShop - 0.1.7-SNAPSHOT + 0.1.8-SNAPSHOT diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java index e10c73d..a66dda0 100644 --- a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java +++ b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java @@ -1,11 +1,11 @@ package org.appledash.saneeconomysignshop.listeners; import com.google.common.base.Strings; -import net.md_5.bungee.api.ChatColor; import org.appledash.saneeconomysignshop.SaneEconomySignShop; import org.appledash.saneeconomysignshop.signshop.SignShop; import org.appledash.saneeconomysignshop.util.ItemDatabase; import org.appledash.saneeconomysignshop.util.ItemDatabase.InvalidItemException; +import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/ItemDatabase.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/ItemDatabase.java index 5190054..964314d 100644 --- a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/ItemDatabase.java +++ b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/ItemDatabase.java @@ -41,11 +41,14 @@ public class ItemDatabase { } } - public static Optional> getIDAndDamageForName(String name) { + public static Optional> getIDAndDamageForName(String name) { if (Material.getMaterial(name) != null) { - return Optional.of(Pair.of(Material.getMaterial(name).getId(), (short) 0)); + return Optional.of(Pair.of(Material.getMaterial(name), (short) 0)); } - return Optional.ofNullable(itemMap.get(name.toLowerCase())); + + return Optional.empty(); + // TODO + //return Optional.ofNullable(itemMap.get(name.toLowerCase())); } public static ItemStack parseGive(String rawItemName) throws InvalidItemException { @@ -72,7 +75,7 @@ public class ItemDatabase { Optional materialOptional = parseMaterialFromName(itemName); if (!materialOptional.isPresent()) { - Optional> parsedItem = getIDAndDamageForName(normalizeItemName(itemName)); + Optional> parsedItem = getIDAndDamageForName(normalizeItemName(itemName)); if (!parsedItem.isPresent()) { throw new InvalidItemException("Item by that name does not exist."); } @@ -89,11 +92,6 @@ public class ItemDatabase { } private static Optional parseMaterialFromName(String materialName) { - // Try to parse an integral item ID first, for legacy reasons. - try { - return Optional.ofNullable(Material.getMaterial(Integer.valueOf(materialName))); - } catch (NumberFormatException ignored) { } - for (Material mat : Material.values()) { if (normalizeItemName(mat.name()).equals(normalizeItemName(materialName))) { return Optional.of(mat);