Skip to content

Commit

Permalink
Merge branch 'fredyk'
Browse files Browse the repository at this point in the history
  • Loading branch information
MilesBHuff committed Feb 23, 2022
2 parents 140a753 + 0710f37 commit bde0bec
Show file tree
Hide file tree
Showing 23 changed files with 626 additions and 89 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
.*.sw[a-p]

# various other potential build files
/.gradle
/build
/bin
/dist
Expand All @@ -26,4 +27,4 @@

#IntelliJ IDEA
/.idea
*.iml
*.iml
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/discord.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 55 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 65 additions & 0 deletions .idea/libraries-with-intellij-classes.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/modules/Dynmap-WorldGuard.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/modules/Dynmap-WorldGuard_main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Dynmap-WorldGuard.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>BUKKIT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
</module>
61 changes: 61 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import org.apache.tools.ant.filters.ReplaceTokens

plugins {
id 'java'
id 'maven-publish'
}

repositories {
mavenLocal()
mavenCentral()

maven {
url 'https://repo.mikeprimm.com/'
}

maven {
url 'https://maven.enginehub.org/repo/'
}
}

dependencies {
compileOnly 'us.dynmap:dynmap-api:3.0-SNAPSHOT'
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5'
compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.0.0'
compileOnly 'com.sk89q:squirrelid:0.2.0'
compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
}

group = 'org.dynmap'
version = '1.3-SNAPSHOT'

java.sourceCompatibility = JavaVersion.VERSION_16
java.targetCompatibility = JavaVersion.VERSION_16

tasks {
processResources {
from("${project.rootDir}/src/main/resources") {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
project.properties.findAll().each {
prop ->
if (prop.value != null && prop.value instanceof java.lang.String) {
filter(ReplaceTokens, tokens: [(prop.key): prop.value])
filter(ReplaceTokens, tokens: [('project.' + prop.key): prop.value])
}
}
}
}

compileJava {
options.compilerArgs += ["-Xlint:all", "-Xlint:-processing"]
options.encoding = 'UTF-8'
}
}

publishing {
publications {
maven(MavenPublication) {
from(components.java)
}
}
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit bde0bec

Please sign in to comment.