Skip to content
Permalink
Browse files

Merge branch 'master' into fix/quoted

  • Loading branch information...
kenzierocks committed Jul 28, 2019
2 parents 96e2b6c + 0f420f0 commit d134820bcbcc87d44d0d94a53b3c30b53003124a
Showing with 1,763 additions and 1,633 deletions.
  1. +24 −0 CHANGELOG.txt
  2. +0 −159 build.gradle
  3. +28 −0 build.gradle.kts
  4. +36 −0 buildSrc/build.gradle.kts
  5. +40 −0 buildSrc/src/main/kotlin/ArtifactoryConfig.kt
  6. +18 −0 buildSrc/src/main/kotlin/CommonConfig.kt
  7. +12 −0 buildSrc/src/main/kotlin/GradleExtras.kt
  8. +98 −0 buildSrc/src/main/kotlin/LibsConfig.kt
  9. +112 −0 buildSrc/src/main/kotlin/PlatformConfig.kt
  10. +7 −0 buildSrc/src/main/kotlin/Versions.kt
  11. +4 −4 gradle.properties
  12. BIN gradle/wrapper/gradle-wrapper.jar
  13. +1 −2 gradle/wrapper/gradle-wrapper.properties
  14. +17 −1 gradlew
  15. +17 −1 gradlew.bat
  16. +0 −11 settings.gradle
  17. +11 −0 settings.gradle.kts
  18. +0 −63 worldedit-bukkit/build.gradle
  19. +71 −0 worldedit-bukkit/build.gradle.kts
  20. +5 −1 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
  21. +6 −7 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
  22. +4 −3 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
  23. +21 −18 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
  24. BIN worldedit-bukkit/src/main/resources/worldedit-adapters.jar
  25. +15 −15 worldedit-bukkit/src/test/java/com/sk89q/wepif/DinnerPermsResolverTest.java
  26. +4 −3 worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java
  27. +0 −52 worldedit-core/build.gradle
  28. +49 −0 worldedit-core/build.gradle.kts
  29. +3 −5 worldedit-core/doctools/build.gradle.kts
  30. +2 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
  31. +32 −7 worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
  32. +5 −5 worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java
  33. +45 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
  34. +64 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
  35. +2 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
  36. +2 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java
  37. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java
  38. +57 −23 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java
  39. +10 −9 worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java
  40. +95 −47 worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java
  41. +5 −0 worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java
  42. +67 −0 worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractBufferingExtent.java
  43. +6 −18 worldedit-core/src/main/java/com/sk89q/worldedit/extent/buffer/ExtentBuffer.java
  44. +20 −0 worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java
  45. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
  46. +3 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicWriter.java
  47. +42 −14 worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java
  48. +20 −3 worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
  49. +3 −1 worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/BlockOptimizedHistory.java
  50. +6 −4 worldedit-core/src/main/java/com/sk89q/worldedit/internal/cui/ServerCUIHandler.java
  51. +24 −9 worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector2.java
  52. +51 −11 worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java
  53. +41 −0 worldedit-core/src/main/java/com/sk89q/worldedit/scripting/MinecraftHidingClassShutter.java
  54. +1 −0 worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoCraftScriptEngine.java
  55. +0 −134 worldedit-core/src/main/java/com/sk89q/worldedit/scripting/java/RhinoScriptEngine.java
  56. +0 −153 worldedit-core/src/main/java/com/sk89q/worldedit/scripting/java/RhinoScriptEngineFactory.java
  57. +25 −21 worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/LocatedBlockList.java
  58. +0 −90 ...dit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java
  59. +5 −3 worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandListBox.java
  60. +10 −6 worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandUsageBox.java
  61. +0 −75 ...edit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/SchematicPaginationBox.java
  62. +8 −5 worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/EngineHubPaste.java
  63. +14 −11 worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java
  64. +9 −9 worldedit-core/src/test/java/com/sk89q/worldedit/extent/transform/BlockTransformExtentTest.java
  65. +2 −2 worldedit-core/src/test/java/com/sk89q/worldedit/internal/command/CommandArgParserTest.java
  66. +58 −69 worldedit-core/src/test/java/com/sk89q/worldedit/internal/expression/ExpressionTest.java
  67. +4 −4 worldedit-core/src/test/java/com/sk89q/worldedit/util/LocationTest.java
  68. +2 −2 worldedit-core/src/test/java/com/sk89q/worldedit/util/eventbus/EventBusTest.java
  69. +0 −105 worldedit-fabric/build.gradle
  70. +113 −0 worldedit-fabric/build.gradle.kts
  71. +14 −1 worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlayer.java
  72. +18 −5 worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java
  73. +0 −79 worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/TileEntityUtils.java
  74. +0 −115 worldedit-forge/build.gradle
  75. +113 −0 worldedit-forge/build.gradle.kts
  76. +1 −1 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java
  77. +14 −1 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java
  78. +21 −17 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java
  79. +1 −1 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/WorldEditFakePlayer.java
  80. +1 −17 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/net/handler/WECUIPacketHandler.java
  81. +9 −0 worldedit-libs/README.md
  82. +0 −143 worldedit-libs/build.gradle
  83. +3 −0 worldedit-libs/build.gradle.kts
  84. +11 −0 worldedit-libs/bukkit/build.gradle.kts
  85. +6 −0 worldedit-libs/core/ap/build.gradle.kts
  86. +16 −0 worldedit-libs/core/build.gradle.kts
  87. +1 −0 worldedit-libs/fabric/build.gradle.kts
  88. +1 −0 worldedit-libs/forge/build.gradle.kts
  89. +11 −0 worldedit-libs/sponge/build.gradle.kts
  90. +0 −58 worldedit-sponge/build.gradle
  91. +53 −0 worldedit-sponge/build.gradle.kts
  92. +11 −0 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
@@ -1,3 +1,27 @@
7.0.1 Release Candidate 1
- Improve //naturalize over large areas
- Fixed //restore with 1.14 worlds
- Added item brush support to WorldEdit for Bukkit (Formerly just Forge)
- Create an internal state ID mapping for performance
- Improve rotation for some blocks
- Added .self permission node to undo/redo to only allow undoing and redoing own history
- Improve sponge schematic implementation
- Re-add the delchunks command
- Added 1.14 blocks, items, tags, etc to the API (Remains compatible with 1.13)
- Made the navigation and selection wands normal tools that can be rebound per-user with //selwand and //navwand
- Added //wand -n to get the navigation wand
- Improved movement of paintings
- Allow command suggestions for selectors
- Allow block replacer to work with tile entities
- Fixed pasting leashed entities
- Fixed setting player heads with names
- Added a mask flag to //count
- Setup pagination for //distr
- Fixed an entity-related error being caused by plugins improperly using Spigot.
- Fixed gravity brush
- Modify chunk batching for performance
- Further legacy schematic loading improvements

7.0.0
See https://matthewmiller.dev/blog/introducing-worldedit-7/ for a friendlier explanation of some new features

This file was deleted.

@@ -0,0 +1,28 @@
import org.ajoberstar.grgit.Grgit

logger.lifecycle("""
*******************************************
You are building WorldEdit!
If you encounter trouble:
1) Read COMPILING.md if you haven't yet
2) Try running 'build' in a separate Gradle run
3) Use gradlew and not gradle
4) If you still need help, ask on Discord! https://discord.gg/enginehub
Output files will be in [subproject]/build/libs
*******************************************
""")

applyRootArtifactoryConfig()

if (!project.hasProperty("gitCommitHash")) {
apply(plugin = "org.ajoberstar.grgit")
ext["gitCommitHash"] = try {
(ext["grgit"] as Grgit?)?.head()?.abbreviatedId
} catch (e: Exception) {
logger.warn("Error getting commit hash", e)

"no_git_id"
}
}
@@ -0,0 +1,36 @@
plugins {
`kotlin-dsl`
kotlin("jvm") version embeddedKotlinVersion
}

repositories {
jcenter()
gradlePluginPortal()
maven {
name = "Forge Maven"
url = uri("https://files.minecraftforge.net/maven")
}
}

configurations.all {
resolutionStrategy {
// Fabric needs this.
force(
"commons-io:commons-io:2.5",
"org.ow2.asm:asm:7.1",
"org.ow2.asm:asm-commons:7.1"
)
}
}

dependencies {
implementation(gradleApi())
implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
implementation("org.ajoberstar.grgit:grgit-gradle:3.1.1")
implementation("com.github.jengelman.gradle.plugins:shadow:5.1.0")
implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.7")
implementation("gradle.plugin.org.spongepowered:spongegradle:0.9.0")
implementation("net.minecraftforge.gradle:ForgeGradle:3.0.130")
}
@@ -0,0 +1,40 @@
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.named
import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask

private const val ARTIFACTORY_CONTEXT_URL = "artifactory_contextUrl"
private const val ARTIFACTORY_USER = "artifactory_user"
private const val ARTIFACTORY_PASSWORD = "artifactory_password"

fun Project.applyRootArtifactoryConfig() {
if (!project.hasProperty(ARTIFACTORY_CONTEXT_URL)) ext[ARTIFACTORY_CONTEXT_URL] = "http://localhost"
if (!project.hasProperty(ARTIFACTORY_USER)) ext[ARTIFACTORY_USER] = "guest"
if (!project.hasProperty(ARTIFACTORY_PASSWORD)) ext[ARTIFACTORY_PASSWORD] = ""

apply(plugin = "com.jfrog.artifactory")
configure<ArtifactoryPluginConvention> {
setContextUrl("${project.property(ARTIFACTORY_CONTEXT_URL)}")
clientConfig.publisher.run {
repoKey = when {
"${project.version}".contains("SNAPSHOT") -> "libs-snapshot-local"
else -> "libs-release-local"
}
username = "${project.property(ARTIFACTORY_USER)}"
password = "${project.property(ARTIFACTORY_PASSWORD)}"
isMaven = true
isIvy = false
}
}
tasks.named<ArtifactoryTask>("artifactoryPublish") {
isSkip = true
}
}

fun Project.applyCommonArtifactoryConfig() {
tasks.named<ArtifactoryTask>("artifactoryPublish") {
publishConfigs("archives")
}
}
@@ -0,0 +1,18 @@
import org.gradle.api.Project
import org.gradle.kotlin.dsl.repositories

fun Project.applyCommonConfiguration() {
group = rootProject.group
version = rootProject.version

repositories {
mavenCentral()
maven { url = uri("https://maven.sk89q.com/repo/") }
maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
}
configurations.all {
resolutionStrategy {
cacheChangingModulesFor(5, "minutes")
}
}
}
@@ -0,0 +1,12 @@
import org.gradle.api.Project
import org.gradle.api.plugins.ExtraPropertiesExtension
import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.tasks.SourceSetContainer
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.the

val Project.ext: ExtraPropertiesExtension
get() = extensions.getByType()

val Project.sourceSets: SourceSetContainer
get() = the<JavaPluginConvention>().sourceSets

0 comments on commit d134820

Please sign in to comment.
You can’t perform that action at this time.