Skip to content

Commit 8ec4adc

Browse files
eyesniper2eyesniper2
committed
A very late 1.9.28 Update
1 parent 0b6416c commit 8ec4adc

9 files changed

+34
-23
lines changed

‎build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.6.21'
33
repositories {
44
mavenCentral()
55
}
@@ -27,7 +27,7 @@ compileTestJava.options.encoding = 'UTF-8'
2727
// compileJava.options.verbose = true
2828

2929
group = 'net.rayfall.eyesniper2.skrayfall'
30-
version = '1.9.27'
30+
version = '1.9.29'
3131

3232
description = """"""
3333

@@ -48,6 +48,7 @@ repositories {
4848
url "http://maven.elmakers.com/repository/"
4949
allowInsecureProtocol true
5050
}
51+
maven { url "https://maven.playpro.com" }
5152
maven { url "https://repo1.maven.org/maven2/" }
5253
maven { url "https://repo.inventivetalent.org/content/groups/public/" }
5354
maven { url 'https://repo.destroystokyo.com/repository/maven-public/' }
@@ -61,6 +62,7 @@ dependencies {
6162
implementation group: 'org.bstats', name: 'bstats-bukkit', version:'1.7'
6263
implementation group: 'de.slikey', name: 'EffectLib', version:'6.5-SNAPSHOT'
6364
implementation 'com.github.gravitylow:Updater:2.3'
65+
implementation 'net.coreprotect:coreprotect:21.2'
6466
implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version:'1.1.0'
6567

6668
implementation group: 'org.spigotmc', name: 'spigot', version:'1.18-R0.1-SNAPSHOT'

‎src/main/java/net/rayfall/eyesniper2/skrayfall/TypeManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void registerSyntax(){
3030
}
3131

3232
private void registerV1_9Elements() {
33-
Classes.registerClass(new ClassInfo<>(RayFallBarColor.class, "bossbarcolor")
33+
Classes.registerClass(new ClassInfo<>(RayFallBarColor.class, "skrayfallbossbarcolor")
3434
.parser(new Parser<RayFallBarColor>() {
3535
@Override
3636
public String getVariableNamePattern() {
@@ -61,7 +61,7 @@ public String toVariableNameString(RayFallBarColor eff) {
6161
.description("A data type to call the colors for the new 1.9 bossbars.")
6262
.usage("blue, green, pink, purple, red, white or yellow")
6363
);
64-
Classes.registerClass(new ClassInfo<>(RayFallBarFlag.class, "bossbarflag")
64+
Classes.registerClass(new ClassInfo<>(RayFallBarFlag.class, "skrayfallbossbarflag")
6565
.parser(new Parser<RayFallBarFlag>() {
6666
@Override
6767
public String getVariableNamePattern() {
@@ -92,7 +92,7 @@ public String toVariableNameString(RayFallBarFlag eff) {
9292
.description("Bar Flags to support the new 1.9 bossbars.")
9393
.usage("create fog, darken sky or play boss music")
9494
);
95-
Classes.registerClass(new ClassInfo<>(RayFallBarStyle.class, "bossbarstyle")
95+
Classes.registerClass(new ClassInfo<>(RayFallBarStyle.class, "skrayfallbossbarstyle")
9696
.parser(new Parser<RayFallBarStyle>() {
9797
@Override
9898
public String getVariableNamePattern() {

‎src/main/java/net/rayfall/eyesniper2/skrayfall/VersionedGeneralSyntaxManager.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ class VersionedGeneralSyntaxManager(val plugin: Plugin) : SyntaxManagerInterface
152152
// New bossbar content
153153
Skript.registerEffect(EffCreateModernBossBar::class.java,
154154
"create (bossbar|boss bar) title[d] %string% and id %string% for %players% "
155-
+ "[with (value|progress) %number%] [with colors %-bossbarcolor%] "
156-
+ "[with style %-bossbarstyle%] [with flags %-bossbarflag%]")
155+
+ "[with (value|progress) %number%] [with colors %-skrayfallbossbarcolor%] "
156+
+ "[with style %-skrayfallbossbarstyle%] [with flags %-skrayfallbossbarflag%]")
157157
Skript.registerEffect(EffDeleteModernBossBar::class.java, "(remove|destroy) bossbar %string%")
158158
Skript.registerEffect(EffRemovePlayerFromBossBar::class.java,
159159
"remove %players% [from] bossbar %string%")
@@ -163,15 +163,15 @@ class VersionedGeneralSyntaxManager(val plugin: Plugin) : SyntaxManagerInterface
163163
Skript.registerEffect(EffChangeBossBarValue::class.java,
164164
"(set|edit) bossbar %string% (value|progress) to %number%")
165165
Skript.registerEffect(EffChangeBossBarColor::class.java,
166-
"(set|edit) bossbar %string% colo[u]r to %bossbarcolor%")
166+
"(set|edit) bossbar %string% colo[u]r to %skrayfallbossbarcolor%")
167167
Skript.registerEffect(EffChangeBossBarTitle::class.java,
168168
"(set|edit) bossbar %string% (title|name) to %string%")
169169
Skript.registerEffect(EffChangeBossBarStyle::class.java,
170-
"(set|edit) bossbar %string% style to %bossbarstyle%")
170+
"(set|edit) bossbar %string% style to %skrayfallbossbarstyle%")
171171
Skript.registerEffect(EffBossBarAddFlag::class.java,
172-
"(add|set) [a] [the] flag %bossbarflag% to [the] bossbar %string%")
172+
"(add|set) [a] [the] flag %skrayfallbossbarflag% to [the] bossbar %string%")
173173
Skript.registerEffect(EffBossBarRemoveFlag::class.java,
174-
"(remove|delete) [a] [the] flag %bossbarflag% [to] [from] [the] bossbar %string%")
174+
"(remove|delete) [a] [the] flag %skrayfallbossbarflag% [to] [from] [the] bossbar %string%")
175175
Skript.registerEffect(EffBossBarShow::class.java, "(show|display|unhide) bossbar %string%")
176176
Skript.registerEffect(EffBossBarHide::class.java, "hide bossbar %string%")
177177
Skript.registerExpression(ExprBossBarTitle::class.java, String::class.java, ExpressionType.SIMPLE,

‎src/main/java/net/rayfall/eyesniper2/skrayfall/bossbar/EffBossBarAddFlag.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Description("Add a flag to a ID based Bossbar.")
1717
public class EffBossBarAddFlag extends Effect {
1818

19-
// (add|set)[a|the] flag %bossbarflags% to bossbar %string%
19+
// (add|set)[a|the] flag %skrayfallbossbarflags% to bossbar %string%
2020

2121
private Expression<RayFallBarFlag> flag;
2222
private Expression<String> id;

‎src/main/java/net/rayfall/eyesniper2/skrayfall/bossbar/EffChangeBossBarColor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Description("Set the color of an ID based Bossbar.")
1717
public class EffChangeBossBarColor extends Effect {
1818

19-
// (set|edit) bossbar %string% colo[u]r to %bossbarcolor%
19+
// (set|edit) bossbar %string% colo[u]r to %skrayfallbossbarcolor%
2020

2121
private Expression<String> id;
2222
private Expression<RayFallBarColor> color;

‎src/main/java/net/rayfall/eyesniper2/skrayfall/bossbar/EffChangeBossBarStyle.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Description("Set the style of an ID based Bossbar.")
1717
public class EffChangeBossBarStyle extends Effect {
1818

19-
// (set|edit) bossbar %string% style to %bossbarstyle%
19+
// (set|edit) bossbar %string% style to %skrayfallbossbarstyle%
2020

2121
private Expression<RayFallBarStyle> style;
2222
private Expression<String> id;

‎src/main/java/net/rayfall/eyesniper2/skrayfall/bossbar/EffCreateModernBossBar.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
public class EffCreateModernBossBar extends Effect {
2525

2626
// create (bossbar|boss bar) title[d] %string% and id %string% for %players% [with
27-
// (value|progress) %number%] [with colors %-bossbarcolors%] [with style %-bossbarstyle%] [with
28-
// flags %-bossbarflags%]
27+
// (value|progress) %number%] [with colors %-skrayfallbossbarcolors%] [with style %-skrayfallbossbarstyle%] [with
28+
// flags %-skrayfallbossbarflags%]
2929

3030
private Expression<String> id;
3131
private Expression<String> title;

‎src/main/java/net/rayfall/eyesniper2/skrayfall/coreprotect/CoreProtectSyntaxManager.kt

+15-6
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,28 @@ import org.bukkit.plugin.Plugin
99
class CoreProtectSyntaxManager(val plugin: Plugin) : SyntaxManagerInterface {
1010

1111
var skCoreProtect: CoreProtectAPI? = null
12+
val oldestCoreProtectSupported = 9
1213

1314
override fun registerSyntax() {
1415
if (plugin.server.pluginManager.isPluginEnabled("CoreProtect")) {
1516
val coreProtect = (plugin.server.pluginManager.getPlugin("CoreProtect") as CoreProtect).api
16-
if (coreProtect.APIVersion() < 7) {
17-
skCoreProtect = coreProtect
18-
plugin.logger.info("Cooking bacon for the CoreProtect loggers.")
19-
Skript.registerCondition(CondIsNaturalCoreProtect::class.java, "%block% is natural")
20-
Skript.registerCondition(CondIsNotNaturalCoreProtect::class.java, "%block% is not natural")
21-
} else {
17+
18+
if (!coreProtect.isEnabled)
19+
{
20+
plugin.logger.warning("CoreProtect's API is not enabled")
21+
return
22+
}
23+
24+
if (coreProtect.APIVersion() < oldestCoreProtectSupported) {
2225
plugin.logger.warning("Unable to get bacon for the CoreProtect loggers " +
2326
"[Unsupported API version (${coreProtect.APIVersion()})].")
27+
return
2428
}
29+
30+
skCoreProtect = coreProtect
31+
plugin.logger.info("Cooking bacon for the CoreProtect loggers.")
32+
Skript.registerCondition(CondIsNaturalCoreProtect::class.java, "%block% is natural")
33+
Skript.registerCondition(CondIsNotNaturalCoreProtect::class.java, "%block% is not natural")
2534
}
2635
}
2736
}

‎src/main/resources/plugin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: An addon for skript that adds Citizens support, EffectLib support a
33
author: eyesniper2
44
website: https://sk.rayfall.net/
55
main: net.rayfall.eyesniper2.skrayfall.Core
6-
version: 1.9.27
6+
version: 1.9.29
77
depend: [Skript]
88
softdepend: [Citizens, EffectLib, Votifier, ProtocolLib, Builder, HolographicDisplays, Sentry, CrackShot, CoreProtect, BossBarAPI]
99
api-version: 1.16

0 commit comments

Comments
 (0)