Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

even more switch uniformity #440

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

even more switch uniformity #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ...a/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityDisguisesScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
if (name.equals("entity")) {
return entity;
}
else if (name.equals("disguise")) {
return disguise;
}
return super.getContext(name);
return switch (name) {
case "entity" -> entity;
case "disguise" -> disguise;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
12 changes: 5 additions & 7 deletions ...com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityUndisguisesScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
if (name.equals("entity")) {
return entity;
}
else if (name.equals("disguise")) {
return disguise;
}
return super.getContext(name);
return switch (name) {
case "entity" -> entity;
case "disguise" -> disguise;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
18 changes: 7 additions & 11 deletions ...ain/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,13 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "new_mana":
return new ElementTag(new_mana);
case "old_mana":
return new ElementTag(old_mana);
case "max_mana":
return new ElementTag(max_mana);
case "reason":
return reason;
}
return super.getContext(name);
return switch (name) {
case "new_mana" -> new ElementTag(new_mana);
case "old_mana" -> new ElementTag(old_mana);
case "max_mana" -> new ElementTag(max_mana);
case "reason" -> reason;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
38 changes: 16 additions & 22 deletions ...main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ public class SpellCastScriptEvent extends BukkitScriptEvent implements Listener
// @Events
// magicspells <entity> casts <'spell'>
//
// @Triggers when an entity starts to casts a spell.
// @Triggers when an entity starts to cast a spell.
//
// @Cancellable true
//
// @Context
// <context.spell_name> returns the name of the spell.
// <context.caster> returns the entity that casted the spell.
// <context.caster> returns the entity that cast the spell.
// <context.power> returns an ElementTag(Decimal) of the power of the spell.
// <context.cast_time> returns an ElementTag(Number) of the cast time of the spell.
// <context.cooldown> returns an ElementTag(Decimal) of the cooldown of the spell.
Expand Down Expand Up @@ -190,40 +190,34 @@ else if (name.equals("spell_name")) {
else if (name.startsWith("spell_reagent_")) {
SpellReagents reagents = event.getReagents();
if (reagents != null) {
switch (name) {
case "spell_reagant_mana":
return new ElementTag(reagents.getMana());
case "spell_reagant_health":
return new ElementTag(reagents.getHealth());
case "spell_reagant_hunger":
return new ElementTag(reagents.getHunger());
case "spell_reagant_experience":
return new ElementTag(reagents.getExperience());
case "spell_reagant_levels":
return new ElementTag(reagents.getLevels());
case "spell_reagant_durability":
return new ElementTag(reagents.getDurability());
case "spell_reagant_money":
return new ElementTag(reagents.getMoney());
case "spell_reagant_variables": {
return switch (name) {
case "spell_reagant_mana" -> new ElementTag(reagents.getMana());
case "spell_reagant_health" -> new ElementTag(reagents.getHealth());
case "spell_reagant_hunger" -> new ElementTag(reagents.getHunger());
case "spell_reagant_experience" -> new ElementTag(reagents.getExperience());
case "spell_reagant_levels" -> new ElementTag(reagents.getLevels());
case "spell_reagant_durability" -> new ElementTag(reagents.getDurability());
case "spell_reagant_money" -> new ElementTag(reagents.getMoney());
case "spell_reagant_variables" -> {
ListTag list = new ListTag();
if (reagents.getVariables() != null) {
for (Map.Entry<String, Double> entry : reagents.getVariables().entrySet()) {
list.add(entry.getKey() + "/" + entry.getValue());
}
}
return list;
yield list;
}
case "spell_reagant_items": {
case "spell_reagant_items" -> {
ListTag list = new ListTag();
if (reagents.getItems() != null) {
for (ItemStack item : reagents.getItems()) {
list.addObject(new ItemTag(item));
}
}
return list;
yield list;
}
}
default -> super.getContext(name);
};
}
}
return super.getContext(name);
Expand Down
18 changes: 7 additions & 11 deletions ...in/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastedScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,13 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "power":
return new ElementTag(power);
case "caster":
return caster.getDenizenObject();
case "cooldown":
return new ElementTag(cooldown);
case "spell_name":
return spell;
}
return super.getContext(name);
return switch (name) {
case "power" -> new ElementTag(power);
case "caster" -> caster.getDenizenObject();
case "cooldown" -> new ElementTag(cooldown);
case "spell_name" -> spell;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
12 changes: 5 additions & 7 deletions ...ain/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellLearnScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
if (name.equals("source")) {
return source;
}
else if (name.equals("spell_name")) {
return spell;
}
return super.getContext(name);
return switch (name) {
case "source" -> source;
case "spell_name" -> spell;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
15 changes: 6 additions & 9 deletions ...om/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityActivateScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,12 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "skill":
return skill;
case "skill_level":
return skill_level;
case "ability":
return ability;
}
return super.getContext(name);
return switch (name) {
case "skill" -> skill;
case "skill_level" -> skill_level;
case "ability" -> ability;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
15 changes: 6 additions & 9 deletions .../denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityDeactivateScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,12 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "skill":
return skill;
case "skill_level":
return skill_level;
case "ability":
return ability;
}
return super.getContext(name);
return switch (name) {
case "skill" -> skill;
case "skill_level" -> skill_level;
case "ability" -> ability;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
15 changes: 6 additions & 9 deletions ...n/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,12 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "skill":
return skill;
case "xp":
return xp;
case "cause":
return cause;
}
return super.getContext(name);
return switch (name) {
case "skill" -> skill;
case "xp" -> xp;
case "cause" -> cause;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
15 changes: 6 additions & 9 deletions ...va/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,12 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "skill":
return skill;
case "level":
return new ElementTag(level);
case "cause":
return new ElementTag(cause);
}
return super.getContext(name);
return switch (name) {
case "skill" -> skill;
case "level" -> new ElementTag(level);
case "cause" -> new ElementTag(cause);
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
21 changes: 8 additions & 13 deletions ...java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,14 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "skill":
return skill;
case "new_level":
return new ElementTag(new_level);
case "old_level":
return new ElementTag(new_level + levels_lost);
case "levels_lost":
return new ElementTag(levels_lost);
case "cause":
return cause;
}
return super.getContext(name);
return switch (name) {
case "skill" -> skill;
case "new_level" -> new ElementTag(new_level);
case "old_level" -> new ElementTag(new_level + levels_lost);
case "levels_lost" -> new ElementTag(levels_lost);
case "cause" -> cause;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
21 changes: 8 additions & 13 deletions ...n/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,14 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "skill":
return skill;
case "new_level":
return new ElementTag(new_level);
case "old_level":
return new ElementTag(new_level - levels_gained);
case "levels_gained":
return new ElementTag(levels_gained);
case "cause":
return new ElementTag(cause);
}
return super.getContext(name);
return switch (name) {
case "skill" -> skill;
case "new_level" -> new ElementTag(new_level);
case "old_level" -> new ElementTag(new_level - levels_gained);
case "levels_gained" -> new ElementTag(levels_gained);
case "cause" -> new ElementTag(cause);
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
12 changes: 5 additions & 7 deletions ...main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,11 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
if (name.equals("arena")) {
return arena;
}
else if (name.equals("wave")) {
return wave;
}
return super.getContext(name);
return switch (name) {
case "arena" -> arena;
case "wave" -> wave;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
if (name.equals("arena")) {
return arena;
}
return super.getContext(name);
return switch (name) {
case "arena" -> arena;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
12 changes: 5 additions & 7 deletions ...va/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaWaveChangesScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,11 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
if (name.equals("arena")) {
return arena;
}
else if (name.equals("wave")) {
return wave;
}
return super.getContext(name);
return switch (name) {
case "arena" -> arena;
case "wave" -> wave;
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
8 changes: 4 additions & 4 deletions ...a/com/denizenscript/depenizen/bukkit/events/mythickeys/MythicKeysKeyPressScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ public ScriptEntryData getScriptEntryData() {

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "id": return new ElementTag(event.getId().toString());
}
return super.getContext(name);
return switch (name) {
case "id" -> new ElementTag(event.getId().toString());
default -> super.getContext(name);
};
}

@EventHandler
Expand Down
Loading