Upstream
/
EpicBosses
mirror of https://github.com/songoda/EpicBosses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1.0.0-SNAPSHOT-U203b 

+ Continued implementation of the Legacy version
This commit is contained in:
Charles 2019-01-20 22:51:50 +08:00
parent 4e992e498d
commit ea848757d2
31 changed files with 449 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.google.code.findbugs:jsr305:1.3.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.google.code.gson:gson:2.2.4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.2.4/gson-2.2.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_google_guava_guava_10_0_1.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.google.guava:guava:10.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/10.0.1/guava-10.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/10.0.1/guava-10.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.googlecode.json-simple:json-simple:1.1.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sk89q_FAWE_7_0_0.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.sk89q:FAWE:7.0.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/FAWE/7.0.0/FAWE-7.0.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/FAWE/7.0.0/FAWE-7.0.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/FAWE/7.0.0/FAWE-7.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sk89q_commandbook_2_3.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.sk89q:commandbook:2.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/commandbook/2.3/commandbook-2.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/commandbook/2.3/commandbook-2.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/commandbook/2.3/commandbook-2.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sk89q_spigot_bukkit_classloader_check_1_8_R0_1_SNAPSHOT.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.sk89q.spigot:bukkit-classloader-check:1.8-R0.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/spigot/bukkit-classloader-check/1.8-R0.1-SNAPSHOT/bukkit-classloader-check-1.8-R0.1-20150203.002820-2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/spigot/bukkit-classloader-check/1.8-R0.1-SNAPSHOT/bukkit-classloader-check-1.8-R0.1-20150203.002820-2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/spigot/bukkit-classloader-check/1.8-R0.1-SNAPSHOT/bukkit-classloader-check-1.8-R0.1-20150203.002820-2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sk89q_worldedit_6_0_0_SNAPSHOT.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.sk89q:worldedit:6.0.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldedit/6.0.0-SNAPSHOT/worldedit-6.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldedit/6.0.0-SNAPSHOT/worldedit-6.0.0-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldedit/6.0.0-SNAPSHOT/worldedit-6.0.0-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sk89q_worldguard_6_0_0_SNAPSHOT.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.sk89q:worldguard:6.0.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldguard/6.0.0-SNAPSHOT/worldguard-6.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldguard/6.0.0-SNAPSHOT/worldguard-6.0.0-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldguard/6.0.0-SNAPSHOT/worldguard-6.0.0-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sk89q_worldguard_7_0_0.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.sk89q:worldguard:7.0.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldguard/7.0.0/worldguard-7.0.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldguard/7.0.0/worldguard-7.0.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sk89q/worldguard/7.0.0/worldguard-7.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: commons-lang:commons-lang:2.6">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__de_schlichtherle_truezip_6_8_3.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: de.schlichtherle:truezip:6.8.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/de/schlichtherle/truezip/6.8.3/truezip-6.8.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/de/schlichtherle/truezip/6.8.3/truezip-6.8.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/de/schlichtherle/truezip/6.8.3/truezip-6.8.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: javax.persistence:persistence-api:1.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/persistence/persistence-api/1.0/persistence-api-1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__junit_junit_4_10.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: junit:junit:4.10">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_sf_opencsv_opencsv_2_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.sf.opencsv:opencsv:2.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/sf/opencsv/opencsv/2.0/opencsv-2.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/sf/opencsv/opencsv/2.0/opencsv-2.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/sf/opencsv/opencsv/2.0/opencsv-2.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_avaje_ebean_2_8_1.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.avaje:ebean:2.8.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/avaje/ebean/2.8.1/ebean-2.8.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/avaje/ebean/2.8.1/ebean-2.8.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/avaje/ebean/2.8.1/ebean-2.8.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_bukkit_bukkit_1_8_6_R0_1_SNAPSHOT.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.bukkit:bukkit:1.8.6-R0.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/bukkit/bukkit/1.8.6-R0.1-SNAPSHOT/bukkit-1.8.6-R0.1-20150605.095643-24.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/bukkit/bukkit/1.8.6-R0.1-SNAPSHOT/bukkit-1.8.6-R0.1-20150605.095643-24-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/bukkit/bukkit/1.8.6-R0.1-SNAPSHOT/bukkit-1.8.6-R0.1-20150605.095643-24-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.hamcrest:hamcrest-core:1.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_spigotmc_spigot_1_12_2.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.spigotmc:spigot:1.12.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.12.2/spigot-1.12.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.12.2/spigot-1.12.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.12.2/spigot-1.12.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_yaml_snakeyaml_1_14.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.yaml:snakeyaml:1.14">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.14/snakeyaml-1.14.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.14/snakeyaml-1.14-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.14/snakeyaml-1.14-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__rhino_js_1_7R2.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: rhino:js:1.7R2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.7R2/js-1.7R2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.7R2/js-1.7R2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.7R2/js-1.7R2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
plugin-modules/Core/resources-json/items.json
View File

@ -1,6 +1,6 @@
{
"DefaultAutoSpawnListItem": {
"type": "GRASS_BLOCK",
"type": "GRASS",
"name": "&c&lDefault AutoSpawn List Item"
},
"DefaultDropTableRewardItem": {
@ -12,7 +12,7 @@
"name": "&c&lDefault DropTable Rewards List Item"
},
"DefaultMinionMenuSpawnItem": {
"type": "ZOMBIE_SPAWN_EGG",
"type": "MONSTER_EGG",
"name": "&c&lDefault Minion Menu Spawn Item"
},
"DefaultTextMenuItem": {
@ -24,7 +24,7 @@
"name": "&c&lDefault Boss Menu Item"
},
"DefaultDropTableMenuItem": {
"type": "OAK_PRESSURE_PLATE",
"type": "WOOD_PLATE",
"name": "&c&lDefault Drop Table Menu Item"
},
"DefaultCustomSkillTypeItem": {
@ -40,7 +40,7 @@
"name": "&c&lDefault Selected Custom Skill Type Item"
},
"DefaultSelectedDropTableItem": {
"type": "LIGHT_WEIGHTED_PRESSURE_PLATE",
"type": "GOLD_PLATE",
"name": "&c&lSelected Default Drop Table Menu Item"
},
"DefaultSkillMenuItem": {
@ -48,11 +48,12 @@
"name": "&c&lDefault Skill Menu Item"
},
"DefaultBossListEditorMenuItem": {
"type": "ZOMBIE_SPAWN_EGG",
"type": "MONSTER_EGG",
"name": "&c&lDefault Boss List Editor Menu Item"
},
"SKSpawnItem": {
"type": "SKELETON_SPAWN_EGG",
"type": "MONSTER_EGG",
"durability": 51,
"name": "&6&lSkeleton King Boss Spawn Egg",
"lore": [
"&7Right click a block to spawn",

2
plugin-modules/Core/resources-json/skills.json
View File

@ -52,7 +52,7 @@
"multiplier": 0.0,
"otherSkillData": {
"flatType": "IRON_BLOCK",
"wallType": "IRON_BARS",
"wallType": "IRON_FENCE",
"insideType": "WATER"
}
}

336
plugin-modules/Core/resources-yml/editor.yml
View File

File diff suppressed because it is too large Load Diff

4
plugin-modules/Core/src/com/songoda/epicbosses/skills/custom/Cage.java
View File

@ -68,7 +68,7 @@ public class Cage extends CustomSkillHandler {
@Override
public List<ICustomSettingAction> getOtherSkillDataActions(Skill skill, CustomSkillElement customSkillElement) {
List<ICustomSettingAction> clickActions = new ArrayList<>();
ItemStack clickStack = new ItemStack(Material.STONE_PRESSURE_PLATE);
ItemStack clickStack = new ItemStack(Material.STONE_PLATE);
ClickAction flatAction = (event -> this.flatTypeEditor.openFor((Player) event.getWhoClicked(), skill, customSkillElement));
ClickAction wallAction = (event -> this.wallTypeEditor.openFor((Player) event.getWhoClicked(), skill, customSkillElement));
ClickAction insideAction = (event -> this.insideTypeEditor.openFor((Player) event.getWhoClicked(), skill, customSkillElement));
@ -124,7 +124,7 @@ public class Cage extends CustomSkillHandler {
if(oldState != null) {
location.getBlock().setType(oldState.getType());
location.getBlock().setBlockData(oldState.getBlockData());
location.getBlock().setData(oldState.getData().getData());
}
getCageLocationDataMap().remove(location);

2
plugin-modules/Core/src/com/songoda/epicbosses/skills/custom/Minions.java
View File

@ -50,7 +50,7 @@ public class Minions extends CustomSkillHandler {
List<ICustomSettingAction> clickActions = new ArrayList<>();
clickActions.add(BossSkillManager.createCustomSkillAction("Amount Editor", getAmountCurrent(customSkillElement), new ItemStack(Material.REDSTONE), getAmountAction(skill, customSkillElement)));
clickActions.add(BossSkillManager.createCustomSkillAction("Minion to Spawn Editor", getMinionToSpawnCurrent(customSkillElement), new ItemStack(Material.CREEPER_SPAWN_EGG), getMinionToSpawnAction(skill, customSkillElement)));
clickActions.add(BossSkillManager.createCustomSkillAction("Minion to Spawn Editor", getMinionToSpawnCurrent(customSkillElement), new ItemStack(Material.MONSTER_EGG), getMinionToSpawnAction(skill, customSkillElement)));
return clickActions;
}

1
plugin-modules/Core/src/com/songoda/epicbosses/utils/EntityFinder.java
View File

@ -30,7 +30,6 @@ public enum EntityFinder {
EVOKER("Evoker", new EvokerHandler(), "evoker"),
VEX("Vex", new VexHandler(), "vex"),
VINDICATOR("Vindicator", new VindicatorHandler(), "vindicator"),
ILLUSIONER("Illusioner", new IllusionerHandler(), "illusioner"),
CREEPER("Creeper", EntityType.CREEPER, "creeper"),
SKELETON("Skeleton", EntityType.SKELETON, "skeleton"),
SPIDER("Spider", EntityType.SPIDER, "spider"),

3
plugin-modules/Core/src/com/songoda/epicbosses/utils/PotionEffectFinder.java
View File

@ -16,10 +16,8 @@ public enum PotionEffectFinder {
Absorption("Absorption", PotionEffectType.ABSORPTION),
Blindness("Blind", PotionEffectType.BLINDNESS, "blindness", "cantsee"),
ConduitPower("ConduitPower", PotionEffectType.CONDUIT_POWER, "conduit", "conduit_power"),
Confusion("Confusion", PotionEffectType.CONFUSION, "nausea"),
Resistance("Resistance", PotionEffectType.DAMAGE_RESISTANCE, "damage_resistance", "res", "damageresistance"),
DolphinsGrace("DolphinsGrace", PotionEffectType.DOLPHINS_GRACE, "grace", "dolphins_grace"),
Haste("Haste", PotionEffectType.FAST_DIGGING, "fast_digging", "haste"),
Fire_Resistance("FireResistance", PotionEffectType.FIRE_RESISTANCE, "fire_resistance", "fire_resist", "fire_res", "fireresist", "fireres"),
Glowing("Glowing", PotionEffectType.GLOWING),
@ -38,7 +36,6 @@ public enum PotionEffectFinder {
Saturation("Saturation", PotionEffectType.SATURATION, "saturated"),
Slow("Slow", PotionEffectType.SLOW, "tank"),
MiningFatigue("MiningFatigue", PotionEffectType.SLOW_DIGGING, "slow_digging"),
SlowFalling("SlowFalling", PotionEffectType.SLOW_FALLING, "slow_falling"),
Speed("Speed", PotionEffectType.SPEED, "fast", "fastboots"),
Unluck("Unlucky", PotionEffectType.UNLUCK, "unluck", "notlucky"),
WaterBreathing("WaterBreathing", PotionEffectType.WATER_BREATHING, "breathunderwater", "water_breathing", "fish"),

51
plugin-modules/Core/src/com/songoda/epicbosses/utils/dependencies/WorldGuardHelper.java
View File

@ -1,14 +1,11 @@
package com.songoda.epicbosses.utils.dependencies;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.WGBukkit;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.flags.Flags;
import com.sk89q.worldguard.protection.flags.DefaultFlag;
import com.sk89q.worldguard.protection.flags.StateFlag;
import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.protection.regions.RegionQuery;
import com.songoda.epicbosses.utils.IWorldGuardHelper;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -23,18 +20,16 @@ import java.util.List;
*/
public class WorldGuardHelper implements IWorldGuardHelper {
private WorldGuard worldGuard;
private WorldGuardPlugin worldGuard;
@Override
public boolean isPvpAllowed(Location loc) {
if(Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") != null) {
if(worldGuard == null) {
this.worldGuard = WorldGuard.getInstance();
this.worldGuard = WGBukkit.getPlugin();
}
RegionQuery regionQuery = this.worldGuard.getPlatform().getRegionContainer().createQuery();
ApplicableRegionSet applicableRegionSet = regionQuery.getApplicableRegions(BukkitAdapter.adapt(loc));
StateFlag.State state = applicableRegionSet.queryState(null, Flags.PVP);
ApplicableRegionSet applicableRegionSet = this.worldGuard.getRegionManager(loc.getWorld()).getApplicableRegions(loc);
StateFlag.State state = applicableRegionSet.queryState(null, DefaultFlag.PVP);
return state != StateFlag.State.DENY;
}
@ -46,12 +41,11 @@ public class WorldGuardHelper implements IWorldGuardHelper {
public boolean isBreakAllowed(Location loc) {
if(Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") != null) {
if(worldGuard == null) {
this.worldGuard = WorldGuard.getInstance();
this.worldGuard = WGBukkit.getPlugin();
}
RegionQuery regionQuery = this.worldGuard.getPlatform().getRegionContainer().createQuery();
ApplicableRegionSet applicableRegionSet = regionQuery.getApplicableRegions(BukkitAdapter.adapt(loc));
StateFlag.State state = applicableRegionSet.queryState(null, Flags.BLOCK_BREAK);
ApplicableRegionSet applicableRegionSet = this.worldGuard.getRegionManager(loc.getWorld()).getApplicableRegions(loc);
StateFlag.State state = applicableRegionSet.queryState(null, DefaultFlag.BLOCK_BREAK);
return state != StateFlag.State.DENY;
}
@ -63,12 +57,11 @@ public class WorldGuardHelper implements IWorldGuardHelper {
public boolean isExplosionsAllowed(Location loc) {
if(Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") != null) {
if(worldGuard == null) {
this.worldGuard = WorldGuard.getInstance();
this.worldGuard = WGBukkit.getPlugin();
}
RegionQuery regionQuery = this.worldGuard.getPlatform().getRegionContainer().createQuery();
ApplicableRegionSet applicableRegionSet = regionQuery.getApplicableRegions(BukkitAdapter.adapt(loc));
StateFlag.State state = applicableRegionSet.queryState(null, Flags.OTHER_EXPLOSION);
ApplicableRegionSet applicableRegionSet = this.worldGuard.getRegionManager(loc.getWorld()).getApplicableRegions(loc);
StateFlag.State state = applicableRegionSet.queryState(null, DefaultFlag.OTHER_EXPLOSION);
return state != StateFlag.State.DENY;
}
@ -79,18 +72,13 @@ public class WorldGuardHelper implements IWorldGuardHelper {
@Override
public List<String> getRegionNames(Location loc) {
if(Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") != null) {
if (worldGuard == null) {
this.worldGuard = WorldGuard.getInstance();
if(worldGuard == null) {
this.worldGuard = WGBukkit.getPlugin();
}
List<String> regions = new ArrayList<>();
List<String> parentNames = new ArrayList<>();
World world = BukkitAdapter.adapt(loc.getWorld());
RegionManager regionManager = this.worldGuard.getPlatform().getRegionContainer().get(world);
if (regionManager == null) return null;
ApplicableRegionSet set = regionManager.getApplicableRegions(BukkitAdapter.asVector(loc));
ApplicableRegionSet set = this.worldGuard.getRegionManager(loc.getWorld()).getApplicableRegions(loc);
for (ProtectedRegion region : set) {
String id = region.getId();
@ -119,12 +107,11 @@ public class WorldGuardHelper implements IWorldGuardHelper {
public boolean isMobSpawningAllowed(Location loc) {
if(Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") != null) {
if(worldGuard == null) {
this.worldGuard = WorldGuard.getInstance();
this.worldGuard = WGBukkit.getPlugin();
}
RegionQuery regionQuery = this.worldGuard.getPlatform().getRegionContainer().createQuery();
ApplicableRegionSet applicableRegionSet = regionQuery.getApplicableRegions(BukkitAdapter.adapt(loc));
StateFlag.State state = applicableRegionSet.queryState(null, Flags.MOB_SPAWNING);
ApplicableRegionSet applicableRegionSet = this.worldGuard.getRegionManager(loc.getWorld()).getApplicableRegions(loc);
StateFlag.State state = applicableRegionSet.queryState(null, DefaultFlag.MOB_SPAWNING);
return state != StateFlag.State.DENY;
}

2
plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackUtils.java
View File

@ -174,7 +174,7 @@ public class ItemStackUtils {
itemStack.setDurability(dura);
}
if(configurationSection.contains("owner") && itemStack.getType() == Material.PLAYER_HEAD) {
if(configurationSection.contains("owner") && itemStack.getType() == Material.SKULL_ITEM) {
SkullMeta skullMeta = (SkullMeta) itemStack.getItemMeta();
skullMeta.setOwner(owner);

6
pom.xml
View File

@ -40,14 +40,14 @@
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>FAWE</artifactId>
<version>7.0.0</version>
<artifactId>worldedit</artifactId>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>7.0.0</version>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>