diff --git a/.classpath b/.classpath deleted file mode 100644 index 6565430..0000000 --- a/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index ea8c4bf..c73866d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,11 @@ +# IntelliJ IDEA Stuff +/.idea +Paintball.iml +*.iml +*.eml + +# Maven Stuff /target + +# Github stuff +/.git \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 633db6d..0000000 --- a/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - UltimateCards - - - - - - org.eclipse.jdt.core.javabuilder - - - - - net.sourceforge.metrics.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - net.sourceforge.metrics.nature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6249222..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 3fac477..0000000 --- a/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,54 +0,0 @@ -cleanup.add_default_serial_version_id=true -cleanup.add_generated_serial_version_id=false -cleanup.add_missing_annotations=true -cleanup.add_missing_deprecated_annotations=false -cleanup.add_missing_methods=true -cleanup.add_missing_nls_tags=false -cleanup.add_missing_override_annotations=true -cleanup.add_missing_override_annotations_interface_methods=true -cleanup.add_serial_version_id=false -cleanup.always_use_blocks=true -cleanup.always_use_parentheses_in_expressions=false -cleanup.always_use_this_for_non_static_field_access=false -cleanup.always_use_this_for_non_static_method_access=false -cleanup.convert_to_enhanced_for_loop=true -cleanup.correct_indentation=true -cleanup.format_source_code=true -cleanup.format_source_code_changes_only=false -cleanup.make_local_variable_final=true -cleanup.make_parameters_final=false -cleanup.make_private_fields_final=true -cleanup.make_type_abstract_if_missing_method=false -cleanup.make_variable_declarations_final=false -cleanup.never_use_blocks=false -cleanup.never_use_parentheses_in_expressions=true -cleanup.organize_imports=true -cleanup.qualify_static_field_accesses_with_declaring_class=false -cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -cleanup.qualify_static_member_accesses_with_declaring_class=false -cleanup.qualify_static_method_accesses_with_declaring_class=false -cleanup.remove_private_constructors=true -cleanup.remove_trailing_whitespaces=true -cleanup.remove_trailing_whitespaces_all=true -cleanup.remove_trailing_whitespaces_ignore_empty=false -cleanup.remove_unnecessary_casts=true -cleanup.remove_unnecessary_nls_tags=true -cleanup.remove_unused_imports=true -cleanup.remove_unused_local_variables=false -cleanup.remove_unused_private_fields=true -cleanup.remove_unused_private_members=false -cleanup.remove_unused_private_methods=true -cleanup.remove_unused_private_types=true -cleanup.sort_members=true -cleanup.sort_members_all=false -cleanup.use_blocks=false -cleanup.use_blocks_only_for_return_and_throw=false -cleanup.use_parentheses_in_expressions=false -cleanup.use_this_for_non_static_field_access=true -cleanup.use_this_for_non_static_field_access_only_if_necessary=true -cleanup.use_this_for_non_static_method_access=true -cleanup.use_this_for_non_static_method_access_only_if_necessary=true -cleanup_profile=_Norbo11 -cleanup_settings_version=2 -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/UltimateCards.jardesc b/UltimateCards.jardesc deleted file mode 100644 index e747956..0000000 --- a/UltimateCards.jardesc +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml deleted file mode 100644 index f289666..0000000 --- a/dependency-reduced-pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - 4.0.0 - UltimateCards - UltimateCards - UltimateCards - 1.3.6 - UltimateCards plugin for Bukkit - - src - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - maven-shade-plugin - 2.2 - - - package - - shade - - - - - - - org.mcstats.bukkit:metrics-lite - net.gravitydevelopment.updater:updater - - - - - org.mcstats.bukkit - com.github.norbo11.metrics - - - net.gravitydevelopment.updater - com.github.norbo11.updater - - - - - - - - - gravity-repo - http://repo.gravitydevelopment.net - - - vault-repo - http://nexus.theyeticave.net/content/repositories/pub_releases - - - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - - - Plugin Metrics - http://repo.mcstats.org/content/repositories/public - - - - - net.milkbowl.vault - Vault - 1.2.31 - compile - - - org.bukkit - bukkit - 1.7.9-R0.2 - compile - - - - diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index bf17885..0cb36f1 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,42 @@ src + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 2.2 + + false + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + maven-compiler-plugin 3.1 @@ -29,69 +65,32 @@ - - - - org.mcstats.bukkit:metrics-lite - net.gravitydevelopment.updater:updater - - - - - org.mcstats.bukkit - com.github.norbo11.metrics - - - net.gravitydevelopment.updater - com.github.norbo11.updater - - - - - - gravity-repo - http://repo.gravitydevelopment.net - + vault-repo http://nexus.theyeticave.net/content/repositories/pub_releases - - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - - - Plugin Metrics - http://repo.mcstats.org/content/repositories/public - - - + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases + + + + + + org.spigotmc + spigot-api + 1.10-R0.1-SNAPSHOT + provided + + net.milkbowl.vault - Vault - 1.2.31 - compile - - - org.bukkit - bukkit - 1.7.9-R0.2 - compile - - - org.mcstats.bukkit - metrics-lite - R8-SNAPSHOT - compile - - - net.gravitydevelopment.updater - updater - 2.1 - compile + VaultAPI + 1.6 - + \ No newline at end of file diff --git a/src/com/github/norbo11/Sounds.java b/src/com/github/norbo11/Sounds.java new file mode 100644 index 0000000..4de88aa --- /dev/null +++ b/src/com/github/norbo11/Sounds.java @@ -0,0 +1,220 @@ +package com.github.norbo11; + +import org.bukkit.Sound; + +public enum Sounds { + AMBIENCE_CAVE("AMBIENCE_CAVE", "AMBIENT_CAVE"), + AMBIENCE_RAIN("AMBIENCE_RAIN", "WEATHER_RAIN"), + AMBIENCE_THUNDER("AMBIENCE_THUNDER", "ENTITY_LIGHTNING_THUNDER"), + ANVIL_BREAK("ANVIL_BREAK", "BLOCK_ANVIL_BREAK"), + ANVIL_LAND("ANVIL_LAND", "BLOCK_ANVIL_LAND"), + ANVIL_USE("ANVIL_USE", "BLOCK_ANVIL_USE"), + ARROW_HIT("ARROW_HIT", "ENTITY_ARROW_HIT"), + BURP("BURP", "ENTITY_PLAYER_BURP"), + CHEST_CLOSE("CHEST_CLOSE", "ENTITY_CHEST_CLOSE"), + CHEST_OPEN("CHEST_OPEN", "ENTITY_CHEST_OPEN"), + CLICK("CLICK", "UI_BUTTON_CLICK"), + DOOR_CLOSE("DOOR_CLOSE", "BLOCK_WOODEN_DOOR_CLOSE"), + DOOR_OPEN("DOOR_OPEN", "BLOCK_WOODEN_DOOR_OPEN"), + DRINK("DRINK", "ENTITY_GENERIC_DRINK"), + EAT("EAT", "ENTITY_GENERIC_EAT"), + EXPLODE("EXPLODE", "ENTITY_GENERIC_EXPLODE"), + FALL_BIG("FALL_BIG", "ENTITY_GENERIC_BIG_FALL"), + FALL_SMALL("FALL_SMALL", "ENTITY_GENERIC_SMALL_FALL"), + FIRE("FIRE", "BLOCK_FIRE_AMBIENT"), + FIRE_IGNITE("FIRE_IGNITE", "ITEM_FLINTANDSTEEL_USE"), + FIZZ("FIZZ", "BLOCK_FIRE_EXTINGUISH"), + FUSE("FUSE", "ENTITY_TNT_PRIMED"), + GLASS("GLASS", "BLOCK_GLASS_BREAK"), + HURT_FLESH("HURT_FLESH", "ENTITY_PLAYER_HURT"), + ITEM_BREAK("ITEM_BREAK", "ENTITY_ITEM_BREAK"), + ITEM_PICKUP("ITEM_PICKUP", "ENTITY_ITEM_PICKUP"), + LAVA("LAVA", "BLOCK_LAVA_AMBIENT"), + LAVA_POP("LAVA_POP", "BLOCK_LAVA_POP"), + LEVEL_UP("LEVEL_UP", "ENTITY_PLAYER_LEVELUP"), + MINECART_BASE("MINECART_BASE", "ENTITY_MINECART_RIDING"), + MINECART_INSIDE("MINECART_INSIDE", "ENTITY_MINECART_RIDING"), + NOTE_BASS("NOTE_BASS", "BLOCK_NOTE_BASS"), + NOTE_PIANO("NOTE_PIANO", "BLOCK_NOTE_HARP"), + NOTE_BASS_DRUM("NOTE_BASS_DRUM", "BLOCK_NOTE_BASEDRUM"), + NOTE_STICKS("NOTE_STICKS", "BLOCK_NOTE_HAT"), + NOTE_BASS_GUITAR("NOTE_BASS_GUITAR", "BLOCK_NOTE_BASS"), + NOTE_SNARE_DRUM("NOTE_SNARE_DRUM", "BLOCK_NOTE_SNARE"), + NOTE_PLING("NOTE_PLING", "BLOCK_NOTE_PLING"), + ORB_PICKUP("ORB_PICKUP", "ENTITY_EXPERIENCE_ORB_PICKUP"), + PISTON_EXTEND("PISTON_EXTEND", "BLOCK_PISTON_EXTEND"), + PISTON_RETRACT("PISTON_RETRACT", "BLOCK_PISTON_CONTRACT"), + PORTAL("PORTAL", "BLOCK_PORTAL_AMBIENT"), + PORTAL_TRAVEL("PORTAL_TRAVEL", "BLOCK_PORTAL_TRAVEL"), + PORTAL_TRIGGER("PORTAL_TRIGGER", "BLOCK_PORTAL_TRIGGER"), + SHOOT_ARROW("SHOOT_ARROW", "ENTITY_ARROW_SHOOT"), + SPLASH("SPLASH", "ENTITY_GENERIC_SPLASH"), + SPLASH2("SPLASH2", "ENTITY_BOBBER_SPLASH"), + STEP_GRASS("STEP_GRASS", "BLOCK_GRASS_STEP"), + STEP_GRAVEL("STEP_GRAVEL", "BLOCK_GRAVEL_STEP"), + STEP_LADDER("STEP_LADDER", "BLOCK_LADDER_STEP"), + STEP_SAND("STEP_SAND", "BLOCK_SAND_STEP"), + STEP_SNOW("STEP_SNOW", "BLOCK_SNOW_STEP"), + STEP_STONE("STEP_STONE", "BLOCK_STONE_STEP"), + STEP_WOOD("STEP_WOOD", "BLOCK_WOOD_STEP"), + STEP_WOOL("STEP_WOOL", "BLOCK_CLOTH_STEP"), + SWIM("SWIM", "ENTITY_GENERIC_SWIM"), + WATER("WATER", "BLOCK_WATER_AMBIENT"), + WOOD_CLICK("WOOD_CLICK", "BLOCK_WOOD_BUTTON_CLICK_ON"), + BAT_DEATH("BAT_DEATH", "ENTITY_BAT_DEATH"), + BAT_HURT("BAT_HURT", "ENTITY_BAT_HURT"), + BAT_IDLE("BAT_IDLE", "ENTITY_BAT_AMBIENT"), + BAT_LOOP("BAT_LOOP", "ENTITY_BAT_LOOP"), + BAT_TAKEOFF("BAT_TAKEOFF", "ENTITY_BAT_TAKEOFF"), + BLAZE_BREATH("BLAZE_BREATH", "ENTITY_BLAZE_AMBIENT"), + BLAZE_DEATH("BLAZE_DEATH", "ENTITY_BLAZE_DEATH"), + BLAZE_HIT("BLAZE_HIT", "ENTITY_BLAZE_HURT"), + CAT_HISS("CAT_HISS", "ENTITY_CAT_HISS"), + CAT_HIT("CAT_HIT", "ENTITY_CAT_HURT"), + CAT_MEOW("CAT_MEOW", "ENTITY_CAT_AMBIENT"), + CAT_PURR("CAT_PURR", "ENTITY_CAT_PURR"), + CAT_PURREOW("CAT_PURREOW", "ENTITY_CAT_PURREOW"), + CHICKEN_IDLE("CHICKEN_IDLE", "ENTITY_CHICKEN_AMBIENT"), + CHICKEN_HURT("CHICKEN_HURT", "ENTITY_CHICKEN_HURT"), + CHICKEN_EGG_POP("CHICKEN_EGG_POP", "ENTITY_CHICKEN_EGG"), + CHICKEN_WALK("CHICKEN_WALK", "ENTITY_CHICKEN_STEP"), + COW_IDLE("COW_IDLE", "ENTITY_COW_AMBIENT"), + COW_HURT("COW_HURT", "ENTITY_COW_HURT"), + COW_WALK("COW_WALK", "ENTITY_COW_STEP"), + CREEPER_HISS("CREEPER_HISS", "ENTITY_CREEPER_PRIMED"), + CREEPER_DEATH("CREEPER_DEATH", "ENTITY_CREEPER_DEATH"), + ENDERDRAGON_DEATH("ENDERDRAGON_DEATH", "ENTITY_ENDERDRAGON_DEATH"), + ENDERDRAGON_GROWL("ENDERDRAGON_GROWL", "ENTITY_ENDERDRAGON_GROWL"), + ENDERDRAGON_HIT("ENDERDRAGON_HIT", "ENTITY_ENDERDRAGON_HURT"), + ENDERDRAGON_WINGS("ENDERDRAGON_WINGS", "ENTITY_ENDERDRAGON_FLAP"), + ENDERMAN_DEATH("ENDERMAN_DEATH", "ENTITY_ENDERMEN_DEATH"), + ENDERMAN_HIT("ENDERMAN_HIT", "ENTITY_ENDERMEN_HURT"), + ENDERMAN_IDLE("ENDERMAN_IDLE", "ENTITY_ENDERMEN_AMBIENT"), + ENDERMAN_TELEPORT("ENDERMAN_TELEPORT", "ENTITY_ENDERMEN_TELEPORT"), + ENDERMAN_SCREAM("ENDERMAN_SCREAM", "ENTITY_ENDERMEN_SCREAM"), + ENDERMAN_STARE("ENDERMAN_STARE", "ENTITY_ENDERMEN_STARE"), + GHAST_SCREAM("GHAST_SCREAM", "ENTITY_GHAST_SCREAM"), + GHAST_SCREAM2("GHAST_SCREAM2", "ENTITY_GHAST_HURT"), + GHAST_CHARGE("GHAST_CHARGE", "ENTITY_GHAST_WARN"), + GHAST_DEATH("GHAST_DEATH", "ENTITY_GHAST_DEATH"), + GHAST_FIREBALL("GHAST_FIREBALL", "ENTITY_GHAST_SHOOT"), + GHAST_MOAN("GHAST_MOAN", "ENTITY_GHAST_AMBIENT"), + IRONGOLEM_DEATH("IRONGOLEM_DEATH", "ENTITY_IRONGOLEM_DEATH"), + IRONGOLEM_HIT("IRONGOLEM_HIT", "ENTITY_IRONGOLEM_HURT"), + IRONGOLEM_THROW("IRONGOLEM_THROW", "ENTITY_IRONGOLEM_ATTACK"), + IRONGOLEM_WALK("IRONGOLEM_WALK", "ENTITY_IRONGOLEM_STEP"), + MAGMACUBE_WALK("MAGMACUBE_WALK", "ENTITY_MAGMACUBE_SQUISH"), + MAGMACUBE_WALK2("MAGMACUBE_WALK2", "ENTITY_MAGMACUBE_SQUISH"), + MAGMACUBE_JUMP("MAGMACUBE_JUMP", "ENTITY_MAGMACUBE_JUMP"), + PIG_IDLE("PIG_IDLE", "ENTITY_PIG_AMBIENT"), + PIG_DEATH("PIG_DEATH", "ENTITY_PIG_DEATH"), + PIG_WALK("PIG_WALK", "ENTITY_PIG_STEP"), + SHEEP_IDLE("SHEEP_IDLE", "ENTITY_SHEEP_AMBIENT"), + SHEEP_SHEAR("SHEEP_SHEAR", "ENTITY_SHEEP_SHEAR"), + SHEEP_WALK("SHEEP_WALK", "ENTITY_SHEEP_STEP"), + SILVERFISH_HIT("SILVERFISH_HIT", "ENTITY_SILVERFISH_HURT"), + SILVERFISH_KILL("SILVERFISH_KILL", "ENTITY_SILVERFISH_DEATH"), + SILVERFISH_IDLE("SILVERFISH_IDLE", "ENTITY_SILVERFISH_AMBIENT"), + SILVERFISH_WALK("SILVERFISH_WALK", "ENTITY_SILVERFISH_STEP"), + SKELETON_IDLE("SKELETON_IDLE", "ENTITY_SKELETON_AMBIENT"), + SKELETON_DEATH("SKELETON_DEATH", "ENTITY_SKELETON_DEATH"), + SKELETON_HURT("SKELETON_HURT", "ENTITY_SKELETON_HURT"), + SKELETON_WALK("SKELETON_WALK", "ENTITY_SKELETON_STEP"), + SLIME_ATTACK("SLIME_ATTACK", "ENTITY_SLIME_ATTACK"), + SLIME_WALK("SLIME_WALK", "ENTITY_SLIME_JUMP"), + SLIME_WALK2("SLIME_WALK2", "ENTITY_SLIME_SQUISH"), + SPIDER_IDLE("SPIDER_IDLE", "ENTITY_SPIDER_AMBIENT"), + SPIDER_DEATH("SPIDER_DEATH", "ENTITY_SPIDER_DEATH"), + SPIDER_WALK("SPIDER_WALK", "ENTITY_SPIDER_STEP"), + WITHER_DEATH("WITHER_DEATH", "ENTITY_WITHER_DEATH"), + WITHER_HURT("WITHER_HURT", "ENTITY_WITHER_HURT"), + WITHER_IDLE("WITHER_IDLE", "ENTITY_WITHER_AMBIENT"), + WITHER_SHOOT("WITHER_SHOOT", "ENTITY_WITHER_SHOOT"), + WITHER_SPAWN("WITHER_SPAWN", "ENTITY_WITHER_SPAWN"), + WOLF_BARK("WOLF_BARK", "ENTITY_WOLF_AMBIENT"), + WOLF_DEATH("WOLF_DEATH", "ENTITY_WOLF_DEATH"), + WOLF_GROWL("WOLF_GROWL", "ENTITY_WOLF_GROWL"), + WOLF_HOWL("WOLF_HOWL", "ENTITY_WOLF_HOWL"), + WOLF_HURT("WOLF_HURT", "ENTITY_WOLF_HURT"), + WOLF_PANT("WOLF_PANT", "ENTITY_WOLF_PANT"), + WOLF_SHAKE("WOLF_SHAKE", "ENTITY_WOLF_SHAKE"), + WOLF_WALK("WOLF_WALK", "ENTITY_WOLF_STEP"), + WOLF_WHINE("WOLF_WHINE", "ENTITY_WOLF_WHINE"), + ZOMBIE_METAL("ZOMBIE_METAL", "ENTITY_ZOMBIE_ATTACK_IRON_DOOR"), + ZOMBIE_WOOD("ZOMBIE_WOOD", "ENTITY_ZOMBIE_ATTACK_DOOR_WOOD"), + ZOMBIE_WOODBREAK("ZOMBIE_WOODBREAK", "ENTITY_ZOMBIE_BREAK_DOOR_WOOD"), + ZOMBIE_IDLE("ZOMBIE_IDLE", "ENTITY_ZOMBIE_AMBIENT"), + ZOMBIE_DEATH("ZOMBIE_DEATH", "ENTITY_ZOMBIE_DEATH"), + ZOMBIE_HURT("ZOMBIE_HURT", "ENTITY_ZOMBIE_HURT"), + ZOMBIE_INFECT("ZOMBIE_INFECT", "ENTITY_ZOMBIE_INFECT"), + ZOMBIE_UNFECT("ZOMBIE_UNFECT", "ENTITY_ZOMBIE_VILLAGER_CONVERTED"), + ZOMBIE_REMEDY("ZOMBIE_REMEDY", "ENTITY_ZOMBIE_VILLAGER_CURE"), + ZOMBIE_WALK("ZOMBIE_WALK", "ENTITY_ZOMBIE_STEP"), + ZOMBIE_PIG_IDLE("ZOMBIE_PIG_IDLE", "ENTITY_ZOMBIE_PIG_AMBIENT"), + ZOMBIE_PIG_ANGRY("ZOMBIE_PIG_ANGRY", "ENTITY_ZOMBIE_PIG_ANGRY"), + ZOMBIE_PIG_DEATH("ZOMBIE_PIG_DEATH", "ENTITY_ZOMBIE_PIG_DEATH"), + ZOMBIE_PIG_HURT("ZOMBIE_PIG_HURT", "ENTITY_ZOMBIE_PIG_HURT"), + DIG_WOOL("DIG_WOOL", "BLOCK_CLOTH_BREAK"), + DIG_GRASS("DIG_GRASS", "BLOCK_GRASS_BREAK"), + DIG_GRAVEL("DIG_GRAVEL", "BLOCK_GRAVEL_BREAK"), + DIG_SAND("DIG_SAND", "BLOCK_SAND_BREAK"), + DIG_SNOW("DIG_SNOW", "BLOCK_SNOW_BREAK"), + DIG_STONE("DIG_STONE", "BLOCK_STONE_BREAK"), + DIG_WOOD("DIG_WOOD", "BLOCK_WOOD_BREAK"), + FIREWORK_BLAST("FIREWORK_BLAST", "ENTITY_FIREWORK_BLAST"), + FIREWORK_BLAST2("FIREWORK_BLAST2", "ENTITY_FIREWORK_BLAST_FAR"), + FIREWORK_LARGE_BLAST("FIREWORK_LARGE_BLAST", "ENTITY_FIREWORK_LARGE_BLAST"), + FIREWORK_LARGE_BLAST2("FIREWORK_LARGE_BLAST2", "ENTITY_FIREWORK_LARGE_BLAST_FAR"), + FIREWORK_TWINKLE("FIREWORK_TWINKLE", "ENTITY_FIREWORK_TWINKLE"), + FIREWORK_TWINKLE2("FIREWORK_TWINKLE2", "ENTITY_FIREWORK_TWINKLE_FAR"), + FIREWORK_LAUNCH("FIREWORK_LAUNCH", "ENTITY_FIREWORK_LAUNCH"), + SUCCESSFUL_HIT("SUCCESSFUL_HIT", "ENTITY_PLAYER_ATTACK_STRONG"), + HORSE_ANGRY("HORSE_ANGRY", "ENTITY_HORSE_ANGRY"), + HORSE_ARMOR("HORSE_ARMOR", "ENTITY_HORSE_ARMOR"), + HORSE_BREATHE("HORSE_BREATHE", "ENTITY_HORSE_BREATHE"), + HORSE_DEATH("HORSE_DEATH", "ENTITY_HORSE_DEATH"), + HORSE_GALLOP("HORSE_GALLOP", "ENTITY_HORSE_GALLOP"), + HORSE_HIT("HORSE_HIT", "ENTITY_HORSE_HURT"), + HORSE_IDLE("HORSE_IDLE", "ENTITY_HORSE_AMBIENT"), + HORSE_JUMP("HORSE_JUMP", "ENTITY_HORSE_JUMP"), + HORSE_LAND("HORSE_LAND", "ENTITY_HORSE_LAND"), + HORSE_SADDLE("HORSE_SADDLE", "ENTITY_HORSE_SADDLE"), + HORSE_SOFT("HORSE_SOFT", "ENTITY_HORSE_STEP"), + HORSE_WOOD("HORSE_WOOD", "ENTITY_HORSE_STEP_WOOD"), + DONKEY_ANGRY("DONKEY_ANGRY", "ENTITY_DONKEY_ANGRY"), + DONKEY_DEATH("DONKEY_DEATH", "ENTITY_DONKEY_DEATH"), + DONKEY_HIT("DONKEY_HIT", "ENTITY_DONKEY_HURT"), + DONKEY_IDLE("DONKEY_IDLE", "ENTITY_DONKEY_AMBIENT"), + HORSE_SKELETON_DEATH("HORSE_SKELETON_DEATH", "ENTITY_SKELETON_HORSE_DEATH"), + HORSE_SKELETON_HIT("HORSE_SKELETON_HIT", "ENTITY_SKELETON_HORSE_HURT"), + HORSE_SKELETON_IDLE("HORSE_SKELETON_IDLE", "ENTITY_SKELETON_HORSE_AMBIENT"), + HORSE_ZOMBIE_DEATH("HORSE_ZOMBIE_DEATH", "ENTITY_ZOMBIE_HORSE_DEATH"), + HORSE_ZOMBIE_HIT("HORSE_ZOMBIE_HIT", "ENTITY_ZOMBIE_HORSE_HURT"), + HORSE_ZOMBIE_IDLE("HORSE_ZOMBIE_IDLE", "ENTITY_ZOMBIE_HORSE_AMBIENT"), + VILLAGER_DEATH("VILLAGER_DEATH", "ENTITY_VILLAGER_DEATH"), + VILLAGER_HAGGLE("VILLAGER_HAGGLE", "ENTITY_VILLAGER_TRADING"), + VILLAGER_HIT("VILLAGER_HIT", "ENTITY_VILLAGER_HURT"), + VILLAGER_IDLE("VILLAGER_IDLE", "ENTITY_VILLAGER_AMBIENT"), + VILLAGER_NO("VILLAGER_NO", "ENTITY_VILLAGER_NO"), + VILLAGER_YES("VILLAGER_YES", "ENTITY_VILLAGER_YES"); + + private String pre19sound; + private String post19sound; + private Sound resolvedSound = null; + + Sounds(String pre19sound, String post19sound) { + this.pre19sound = pre19sound; + this.post19sound = post19sound; + } + + public Sound bukkitSound() { + if (resolvedSound != null) return resolvedSound; + + try { + return resolvedSound = Sound.valueOf(post19sound); + } catch (IllegalArgumentException e) { + //Try 1.8 sound + return resolvedSound = Sound.valueOf(pre19sound); + } + } +} \ No newline at end of file diff --git a/src/com/github/norbo11/UltimateCards.java b/src/com/github/norbo11/UltimateCards.java old mode 100644 new mode 100755 index e186336..8bb0457 --- a/src/com/github/norbo11/UltimateCards.java +++ b/src/com/github/norbo11/UltimateCards.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.logging.Logger; -import net.gravitydevelopment.updater.Updater; import net.milkbowl.vault.Vault; import net.milkbowl.vault.economy.Economy; @@ -14,8 +13,6 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; -import org.mcstats.MetricsLite; - import com.github.norbo11.commands.PluginCommand; import com.github.norbo11.commands.PluginExecutor; import com.github.norbo11.listeners.CardsListener; @@ -189,23 +186,6 @@ public void onEnable() { e.printStackTrace(); } - // Metrics - try { - MetricsLite metrics = new MetricsLite(this); - metrics.start(); - } catch (IOException e) { - System.out.println("Couldn't submit Metrics data!"); - } - - // Update - Updater updater; - if (PluginConfig.isAutoUpdate()) { - updater = new Updater(this, 39468, getFile(), Updater.UpdateType.DEFAULT, true); - if (updater.getResult() == Updater.UpdateResult.SUCCESS) { - log.info("To apply the update, reload/restart your server."); - } - } - // Set all commands to the command executor getCommand("cards").setExecutor(pluginExecutor); getCommand("table").setExecutor(pluginExecutor); diff --git a/src/com/github/norbo11/commands/PluginCommand.java b/src/com/github/norbo11/commands/PluginCommand.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/PluginExecutor.java b/src/com/github/norbo11/commands/PluginExecutor.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/blackjack/BlackjackBet.java b/src/com/github/norbo11/commands/blackjack/BlackjackBet.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/blackjack/BlackjackDouble.java b/src/com/github/norbo11/commands/blackjack/BlackjackDouble.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/blackjack/BlackjackHit.java b/src/com/github/norbo11/commands/blackjack/BlackjackHit.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/blackjack/BlackjackSplit.java b/src/com/github/norbo11/commands/blackjack/BlackjackSplit.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/blackjack/BlackjackStand.java b/src/com/github/norbo11/commands/blackjack/BlackjackStand.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerAllin.java b/src/com/github/norbo11/commands/poker/PokerAllin.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerBet.java b/src/com/github/norbo11/commands/poker/PokerBet.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerBoard.java b/src/com/github/norbo11/commands/poker/PokerBoard.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerCall.java b/src/com/github/norbo11/commands/poker/PokerCall.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerCheck.java b/src/com/github/norbo11/commands/poker/PokerCheck.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerFold.java b/src/com/github/norbo11/commands/poker/PokerFold.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerHand.java b/src/com/github/norbo11/commands/poker/PokerHand.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerPot.java b/src/com/github/norbo11/commands/poker/PokerPot.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/poker/PokerReveal.java b/src/com/github/norbo11/commands/poker/PokerReveal.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableBan.java b/src/com/github/norbo11/commands/table/TableBan.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableClose.java b/src/com/github/norbo11/commands/table/TableClose.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableCreate.java b/src/com/github/norbo11/commands/table/TableCreate.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableDelete.java b/src/com/github/norbo11/commands/table/TableDelete.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableDetails.java b/src/com/github/norbo11/commands/table/TableDetails.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableInvite.java b/src/com/github/norbo11/commands/table/TableInvite.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableKick.java b/src/com/github/norbo11/commands/table/TableKick.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableLeave.java b/src/com/github/norbo11/commands/table/TableLeave.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableListSettings.java b/src/com/github/norbo11/commands/table/TableListSettings.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableMoney.java b/src/com/github/norbo11/commands/table/TableMoney.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableOpen.java b/src/com/github/norbo11/commands/table/TableOpen.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TablePlayers.java b/src/com/github/norbo11/commands/table/TablePlayers.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableRebuy.java b/src/com/github/norbo11/commands/table/TableRebuy.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableReload.java b/src/com/github/norbo11/commands/table/TableReload.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableSave.java b/src/com/github/norbo11/commands/table/TableSave.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableSet.java b/src/com/github/norbo11/commands/table/TableSet.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableSit.java b/src/com/github/norbo11/commands/table/TableSit.java old mode 100644 new mode 100755 index 6741017..282eecc --- a/src/com/github/norbo11/commands/table/TableSit.java +++ b/src/com/github/norbo11/commands/table/TableSit.java @@ -37,7 +37,14 @@ public boolean conditions() { CardsPlayer cardsPlayer = CardsPlayer.getCardsPlayer(getPlayer().getName()); if (cardsPlayer == null) { String idString = getArgs()[1]; - int id = NumberMethods.getPositiveInteger(idString); + + int id = 0; + try { + id = NumberMethods.getPositiveInteger(idString); + } catch (NumberFormatException exc) { + return false; + } + // Check ID isn't a number if (id == -99999) { id = NumberMethods.getInteger(idString); diff --git a/src/com/github/norbo11/commands/table/TableStart.java b/src/com/github/norbo11/commands/table/TableStart.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableTables.java b/src/com/github/norbo11/commands/table/TableTables.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableTeleport.java b/src/com/github/norbo11/commands/table/TableTeleport.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableUnban.java b/src/com/github/norbo11/commands/table/TableUnban.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableUnsave.java b/src/com/github/norbo11/commands/table/TableUnsave.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/commands/table/TableWithdraw.java b/src/com/github/norbo11/commands/table/TableWithdraw.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/blackjack/BlackjackDealer.java b/src/com/github/norbo11/game/blackjack/BlackjackDealer.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/blackjack/BlackjackHand.java b/src/com/github/norbo11/game/blackjack/BlackjackHand.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/blackjack/BlackjackPlayer.java b/src/com/github/norbo11/game/blackjack/BlackjackPlayer.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/blackjack/BlackjackTable.java b/src/com/github/norbo11/game/blackjack/BlackjackTable.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/blackjack/BlackjackTableSettings.java b/src/com/github/norbo11/game/blackjack/BlackjackTableSettings.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/cards/Card.java b/src/com/github/norbo11/game/cards/Card.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/cards/CardsPlayer.java b/src/com/github/norbo11/game/cards/CardsPlayer.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/cards/CardsTable.java b/src/com/github/norbo11/game/cards/CardsTable.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/cards/CardsTableSettings.java b/src/com/github/norbo11/game/cards/CardsTableSettings.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/cards/Deck.java b/src/com/github/norbo11/game/cards/Deck.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/cards/Hand.java b/src/com/github/norbo11/game/cards/Hand.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/cards/TableSetting.java b/src/com/github/norbo11/game/cards/TableSetting.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/PokerPhase.java b/src/com/github/norbo11/game/poker/PokerPhase.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/PokerPlayer.java b/src/com/github/norbo11/game/poker/PokerPlayer.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/PokerTable.java b/src/com/github/norbo11/game/poker/PokerTable.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/PokerTableSettings.java b/src/com/github/norbo11/game/poker/PokerTableSettings.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/eval/EvalCard.java b/src/com/github/norbo11/game/poker/eval/EvalCard.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/eval/EvalDeck.java b/src/com/github/norbo11/game/poker/eval/EvalDeck.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/eval/EvalHand.java b/src/com/github/norbo11/game/poker/eval/EvalHand.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/game/poker/eval/HandEvaluator.java b/src/com/github/norbo11/game/poker/eval/HandEvaluator.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/listeners/CardsListener.java b/src/com/github/norbo11/listeners/CardsListener.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/DateMethods.java b/src/com/github/norbo11/util/DateMethods.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/ErrorMessages.java b/src/com/github/norbo11/util/ErrorMessages.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/ExceptionCatcher.java b/src/com/github/norbo11/util/ExceptionCatcher.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/Formatter.java b/src/com/github/norbo11/util/Formatter.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/InventoryHelper.java b/src/com/github/norbo11/util/InventoryHelper.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/Log.java b/src/com/github/norbo11/util/Log.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/MapMethods.java b/src/com/github/norbo11/util/MapMethods.java old mode 100644 new mode 100755 index 3188d64..94c6d27 --- a/src/com/github/norbo11/util/MapMethods.java +++ b/src/com/github/norbo11/util/MapMethods.java @@ -109,13 +109,14 @@ public void render(MapView mapView, MapCanvas mapCanvas, Player player) { } // Draw dealer score - mapCanvas.drawText(80, 18, MinecraftFont.Font, "§32;" + blackjackPlayer.getTable().getDealer().getScore()); + mapCanvas.drawText(80, 18, MinecraftFont.Font, "§32;" + blackjackPlayer.getTable().getDealer().getScore()); // Draw player score - mapCanvas.drawText(80, 47, MinecraftFont.Font, "§32;" + blackjackPlayer.scoreToString()); + mapCanvas.drawText(80, 47, MinecraftFont.Font, "§32;" + blackjackPlayer.scoreToString()); // Draw your bet - mapCanvas.drawText(80, 76, MinecraftFont.Font, "§32;" + Formatter.formatMoneyWithoutColor(blackjackPlayer.getTotalAmountBet())); + // � -> § + mapCanvas.drawText(80, 76, MinecraftFont.Font, "§32;" + Formatter.formatMoneyWithoutColor(blackjackPlayer.getTotalAmountBet())); redrawsNeeded.put(player.getName(), false); player.sendMap(mapView); @@ -185,10 +186,11 @@ public void render(MapView mapView, MapCanvas mapCanvas, Player player) { } // Draw current bet - mapCanvas.drawText(56, 94, MinecraftFont.Font, "§32;" + Formatter.formatMoneyWithoutColor(pokerPlayer.getPokerTable().getCurrentBet())); + mapCanvas.drawText(56, 94, MinecraftFont.Font, "§32;" + Formatter.formatMoneyWithoutColor(pokerPlayer.getPokerTable().getCurrentBet())); + // � // Draw total in pots - mapCanvas.drawText(56, 115, MinecraftFont.Font, "§32;" + Formatter.formatMoneyWithoutColor(pokerPlayer.getPokerTable().getHighestPot())); + mapCanvas.drawText(56, 115, MinecraftFont.Font, "§32;" + Formatter.formatMoneyWithoutColor(pokerPlayer.getPokerTable().getHighestPot())); redrawsNeeded.put(player.getName(), false); player.sendMap(mapView); diff --git a/src/com/github/norbo11/util/Messages.java b/src/com/github/norbo11/util/Messages.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/MoneyMethods.java b/src/com/github/norbo11/util/MoneyMethods.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/NumberMethods.java b/src/com/github/norbo11/util/NumberMethods.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/PlayerControlled.java b/src/com/github/norbo11/util/PlayerControlled.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/ResourceManager.java b/src/com/github/norbo11/util/ResourceManager.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/Sound.java b/src/com/github/norbo11/util/Sound.java old mode 100644 new mode 100755 index 2e23d22..4f8d341 --- a/src/com/github/norbo11/util/Sound.java +++ b/src/com/github/norbo11/util/Sound.java @@ -9,6 +9,7 @@ import com.github.norbo11.UltimateCards; import com.github.norbo11.game.cards.CardsPlayer; import com.github.norbo11.game.cards.CardsTable; +import com.github.norbo11.Sounds; public class Sound { public static UltimateCards p; @@ -22,7 +23,7 @@ public static void lost(final Player player) { @Override public void run() { - player.playSound(player.getLocation(), org.bukkit.Sound.NOTE_PIANO, 1.0F, pitch); + player.playSound(player.getLocation(), Sounds.NOTE_PIANO.bukkitSound(), 1.0F, pitch); pitch -= 0.1F; i++; if (i == 7) { @@ -35,8 +36,8 @@ public void run() { public static void otherTurn(final Player player) { if (player != null) { - player.playSound(player.getLocation(), org.bukkit.Sound.NOTE_BASS_DRUM, 1.0F, 1.0F); - player.playSound(player.getLocation(), org.bukkit.Sound.NOTE_BASS_DRUM, 1.0F, 2.0F); + player.playSound(player.getLocation(), Sounds.NOTE_BASS_DRUM.bukkitSound(), 1.0F, 1.0F); + player.playSound(player.getLocation(), Sounds.NOTE_BASS_DRUM.bukkitSound(), 1.0F, 2.0F); } } @@ -51,8 +52,8 @@ public static void tableTurnSounds(CardsTable table, String player) { public static void turn(Player player) { if (player != null) { - player.playSound(player.getLocation(), org.bukkit.Sound.NOTE_PIANO, 1.0F, 1.0F); - player.playSound(player.getLocation(), org.bukkit.Sound.NOTE_PIANO, 1.0F, 2.0F); + player.playSound(player.getLocation(), Sounds.NOTE_PIANO.bukkitSound(), 1.0F, 1.0F); + player.playSound(player.getLocation(), Sounds.NOTE_PIANO.bukkitSound(), 1.0F, 2.0F); } } @@ -64,7 +65,7 @@ public static void won(final Player player) { @Override public void run() { - player.playSound(player.getLocation(), org.bukkit.Sound.NOTE_PIANO, 1.0F, pitch); + player.playSound(player.getLocation(), Sounds.NOTE_PIANO.bukkitSound(), 1.0F, pitch); pitch += 0.1F; i++; if (i == 7) { diff --git a/src/com/github/norbo11/util/Timers.java b/src/com/github/norbo11/util/Timers.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/config/PluginConfig.java b/src/com/github/norbo11/util/config/PluginConfig.java old mode 100644 new mode 100755 diff --git a/src/com/github/norbo11/util/config/SavedTables.java b/src/com/github/norbo11/util/config/SavedTables.java old mode 100644 new mode 100755 diff --git a/src/config.yml b/src/config.yml old mode 100644 new mode 100755 diff --git a/src/images/blackjack_base.png b/src/images/blackjack_base.png old mode 100644 new mode 100755 diff --git a/src/images/blackjack_base_split.png b/src/images/blackjack_base_split.png old mode 100644 new mode 100755 diff --git a/src/images/button.png b/src/images/button.png old mode 100644 new mode 100755 diff --git a/src/images/card10.png b/src/images/card10.png old mode 100644 new mode 100755 diff --git a/src/images/card100.png b/src/images/card100.png old mode 100644 new mode 100755 diff --git a/src/images/card101.png b/src/images/card101.png old mode 100644 new mode 100755 diff --git a/src/images/card102.png b/src/images/card102.png old mode 100644 new mode 100755 diff --git a/src/images/card103.png b/src/images/card103.png old mode 100644 new mode 100755 diff --git a/src/images/card11.png b/src/images/card11.png old mode 100644 new mode 100755 diff --git a/src/images/card110.png b/src/images/card110.png old mode 100644 new mode 100755 diff --git a/src/images/card111.png b/src/images/card111.png old mode 100644 new mode 100755 diff --git a/src/images/card112.png b/src/images/card112.png old mode 100644 new mode 100755 diff --git a/src/images/card113.png b/src/images/card113.png old mode 100644 new mode 100755 diff --git a/src/images/card12.png b/src/images/card12.png old mode 100644 new mode 100755 diff --git a/src/images/card120.png b/src/images/card120.png old mode 100644 new mode 100755 diff --git a/src/images/card121.png b/src/images/card121.png old mode 100644 new mode 100755 diff --git a/src/images/card122.png b/src/images/card122.png old mode 100644 new mode 100755 diff --git a/src/images/card123.png b/src/images/card123.png old mode 100644 new mode 100755 diff --git a/src/images/card13.png b/src/images/card13.png old mode 100644 new mode 100755 diff --git a/src/images/card130.png b/src/images/card130.png old mode 100644 new mode 100755 diff --git a/src/images/card131.png b/src/images/card131.png old mode 100644 new mode 100755 diff --git a/src/images/card132.png b/src/images/card132.png old mode 100644 new mode 100755 diff --git a/src/images/card133.png b/src/images/card133.png old mode 100644 new mode 100755 diff --git a/src/images/card20.png b/src/images/card20.png old mode 100644 new mode 100755 diff --git a/src/images/card21.png b/src/images/card21.png old mode 100644 new mode 100755 diff --git a/src/images/card22.png b/src/images/card22.png old mode 100644 new mode 100755 diff --git a/src/images/card23.png b/src/images/card23.png old mode 100644 new mode 100755 diff --git a/src/images/card30.png b/src/images/card30.png old mode 100644 new mode 100755 diff --git a/src/images/card31.png b/src/images/card31.png old mode 100644 new mode 100755 diff --git a/src/images/card32.png b/src/images/card32.png old mode 100644 new mode 100755 diff --git a/src/images/card33.png b/src/images/card33.png old mode 100644 new mode 100755 diff --git a/src/images/card40.png b/src/images/card40.png old mode 100644 new mode 100755 diff --git a/src/images/card41.png b/src/images/card41.png old mode 100644 new mode 100755 diff --git a/src/images/card42.png b/src/images/card42.png old mode 100644 new mode 100755 diff --git a/src/images/card43.png b/src/images/card43.png old mode 100644 new mode 100755 diff --git a/src/images/card50.png b/src/images/card50.png old mode 100644 new mode 100755 diff --git a/src/images/card51.png b/src/images/card51.png old mode 100644 new mode 100755 diff --git a/src/images/card52.png b/src/images/card52.png old mode 100644 new mode 100755 diff --git a/src/images/card53.png b/src/images/card53.png old mode 100644 new mode 100755 diff --git a/src/images/card60.png b/src/images/card60.png old mode 100644 new mode 100755 diff --git a/src/images/card61.png b/src/images/card61.png old mode 100644 new mode 100755 diff --git a/src/images/card62.png b/src/images/card62.png old mode 100644 new mode 100755 diff --git a/src/images/card63.png b/src/images/card63.png old mode 100644 new mode 100755 diff --git a/src/images/card70.png b/src/images/card70.png old mode 100644 new mode 100755 diff --git a/src/images/card71.png b/src/images/card71.png old mode 100644 new mode 100755 diff --git a/src/images/card72.png b/src/images/card72.png old mode 100644 new mode 100755 diff --git a/src/images/card73.png b/src/images/card73.png old mode 100644 new mode 100755 diff --git a/src/images/card80.png b/src/images/card80.png old mode 100644 new mode 100755 diff --git a/src/images/card81.png b/src/images/card81.png old mode 100644 new mode 100755 diff --git a/src/images/card82.png b/src/images/card82.png old mode 100644 new mode 100755 diff --git a/src/images/card83.png b/src/images/card83.png old mode 100644 new mode 100755 diff --git a/src/images/card90.png b/src/images/card90.png old mode 100644 new mode 100755 diff --git a/src/images/card91.png b/src/images/card91.png old mode 100644 new mode 100755 diff --git a/src/images/card92.png b/src/images/card92.png old mode 100644 new mode 100755 diff --git a/src/images/card93.png b/src/images/card93.png old mode 100644 new mode 100755 diff --git a/src/images/card_empty.png b/src/images/card_empty.png old mode 100644 new mode 100755 diff --git a/src/images/card_facedown.png b/src/images/card_facedown.png old mode 100644 new mode 100755 diff --git a/src/images/player_box_action.png b/src/images/player_box_action.png old mode 100644 new mode 100755 diff --git a/src/images/player_box_folded.png b/src/images/player_box_folded.png old mode 100644 new mode 100755 diff --git a/src/images/player_box_normal.png b/src/images/player_box_normal.png old mode 100644 new mode 100755 diff --git a/src/images/poker_base.png b/src/images/poker_base.png old mode 100644 new mode 100755 diff --git a/src/plugin.yml b/src/plugin.yml old mode 100644 new mode 100755 index 6cbef4b..a79f4e6 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,4 +1,4 @@ -name: UltimateCards +name: UltimateCardsReloaded description: 'The ultimate Texas Holdem and Blackjack plugin for Bukkit!' version: 1.3.6 main: com.github.norbo11.UltimateCards diff --git a/src/tables.yml b/src/tables.yml old mode 100644 new mode 100755