Skip to content
This repository was archived by the owner on Jul 29, 2021. It is now read-only.

Commit 5210027

Browse files
committed
Fixed regex dependency compilling with plugin
1 parent a465c28 commit 5210027

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.gradle/
33
build/
44
out/
5+
server/

build.gradle

+13-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ repositories {
3434
}
3535
}
3636
configurations {
37-
dependency
37+
compileWithJar
3838
}
3939
dependencies {
4040
testCompile group: 'junit', name: 'junit', version: '4.12'
@@ -45,19 +45,28 @@ dependencies {
4545
//Skript
4646
compile 'ch.njol:skript:2.2-dev28b'
4747
//Generex API. Used to expressions to generate strings from regex
48-
compile 'com.github.mifmif:generex:1.0.2'
48+
compileWithJar files('dependencies/Generex.jar')
4949
//ViaVersion
5050
compile 'us.myles:viaversion:1.1.1'
51-
//compile 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
51+
configurations.compile.extendsFrom(configurations.compileWithJar)
52+
}
53+
54+
//Used to copy the final jar in test server located in at same place
55+
//It requires that you execute "./gradlew clean build copy"
56+
task copy(type: Copy) {
57+
from 'build/libs/TuSKe.jar'
58+
into 'server/plugins'
5259
}
5360

5461
processResources {
5562
filter ReplaceTokens, tokens: [
5663
'version': project.property('version')
5764
]
58-
5965
}
6066

6167
jar {
6268
archiveName 'TuSKe.jar'
69+
from {
70+
configurations.compileWithJar.collect { it.isDirectory() ? it : zipTree(it) }
71+
}
6372
}

dependencies/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
!Legendchat.jar
99
!Landlord.jar
1010
!ProtocolSupport.jar
11+
!Generex.jar
1112
!.gitignore
1213
!README.md

dependencies/Generex.jar

127 KB
Binary file not shown.

dependencies/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
####Dependencies
1+
#### Dependencies
22

33
Since it uses some NMS/OBC codes, It is necessary to manually add the spigot jars here.
44

@@ -19,4 +19,5 @@ Sources:
1919
* [LegendChat](https://www.spigotmc.org/resources/6268/)
2020
* [Marriage](https://www.spigotmc.org/resources/18998/)
2121
* [ProtocolSupport](https://www.spigotmc.org/resources/7201/)
22-
* [Landlord](https://www.spigotmc.org/resources/2735/)
22+
* [Landlord](https://www.spigotmc.org/resources/2735/)
23+
* [Generex](https://github.com/mifmif/Generex) - This is not a bukkit plugin, it's compiled with plugin and uses a "lite" version compiled by myself.

src/main/java/com/github/tukenuke/tuske/documentation/MarkdownFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void addSyntax(StringJoiner syntax, SyntaxInfo info, String type) {
113113
}
114114
if (Util.notEmpty(info.changers)) {
115115
syntax.add(" <th><div title=\"The possible modifiers that this expression accepts.\"><a href=\"http://bensku.github.io/Skript/effects.html#EffChange\">Changers</a></div></th>");
116-
syntax.add(" <td>" + Util.toFancyArray(info.changers) + "</td>");
116+
syntax.add(" <td>" + Util.toFancyArray((Object[]) info.changers) + "</td>");
117117
}
118118
if (info.cancellable != null) {
119119
syntax.add(" <th><div title=\"It means if you can cancel this event from happening or not.\"><a href =\"http://bensku.github.io/Skript/effects.html#EffCancelEvent\">Cancellable</a></div></th>");

0 commit comments

Comments
 (0)