Skip to content

Commit 5ad1d98

Browse files
committed
Merge branch 'fredyk'
2 parents 140a753 + 0710f37 commit 5ad1d98

23 files changed

+625
-89
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
.*.sw[a-p]
1717

1818
# various other potential build files
19+
/.gradle
1920
/build
2021
/bin
2122
/dist
@@ -26,4 +27,4 @@
2627

2728
#IntelliJ IDEA
2829
/.idea
29-
*.iml
30+
*.iml

.idea/.gitignore

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/discord.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries-with-intellij-classes.xml

Lines changed: 65 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/Dynmap-WorldGuard.main.iml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/Dynmap-WorldGuard_main.iml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dynmap-WorldGuard.iml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id="Dynmap-WorldGuard" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="org.dynmap" external.system.module.version="1.3-SNAPSHOT" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="minecraft" name="Minecraft">
5+
<configuration>
6+
<autoDetectTypes>
7+
<platformType>BUKKIT</platformType>
8+
</autoDetectTypes>
9+
</configuration>
10+
</facet>
11+
</component>
12+
</module>

build.gradle

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import org.apache.tools.ant.filters.ReplaceTokens
2+
3+
plugins {
4+
id 'java'
5+
id 'maven-publish'
6+
}
7+
8+
repositories {
9+
mavenLocal()
10+
mavenCentral()
11+
12+
maven {
13+
url 'https://repo.mikeprimm.com/'
14+
}
15+
16+
maven {
17+
url 'https://maven.enginehub.org/repo/'
18+
}
19+
}
20+
21+
dependencies {
22+
compileOnly 'us.dynmap:dynmap-api:3.0-SNAPSHOT'
23+
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5'
24+
compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.0.0'
25+
compileOnly 'com.sk89q:squirrelid:0.2.0'
26+
compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
27+
}
28+
29+
group = 'org.dynmap'
30+
version = '1.3-SNAPSHOT'
31+
32+
java.sourceCompatibility = JavaVersion.VERSION_16
33+
java.targetCompatibility = JavaVersion.VERSION_16
34+
35+
tasks {
36+
processResources {
37+
from("${project.rootDir}/src/main/resources") {
38+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
39+
project.properties.findAll().each {
40+
prop ->
41+
if (prop.value != null && prop.value instanceof java.lang.String) {
42+
filter(ReplaceTokens, tokens: [(prop.key): prop.value])
43+
filter(ReplaceTokens, tokens: [('project.' + prop.key): prop.value])
44+
}
45+
}
46+
}
47+
}
48+
49+
compileJava {
50+
options.compilerArgs += ["-Xlint:all", "-Xlint:-processing"]
51+
options.encoding = 'UTF-8'
52+
}
53+
}
54+
55+
publishing {
56+
publications {
57+
maven(MavenPublication) {
58+
from(components.java)
59+
}
60+
}
61+
}

gradle/wrapper/gradle-wrapper.jar

58.1 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)