Merge branch 'version/7.2.x'

EngineHub · Aug 16, 2023 · f8144e5 · f8144e5
2 parents d623488 + 8af61f1
commit f8144e5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -53,10 +53,10 @@ dependencies {
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0")
     implementation("org.spongepowered:spongegradle-plugin-development:2.1.1")
     implementation("org.spongepowered:vanillagradle:0.2.1-20230603.203956-54")
-    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.6")
+    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.11")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")
     implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.5")
-    implementation("org.spongepowered:mixingradle:0.7.33")
+    implementation("org.spongepowered:mixingradle:0.7.38")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1.18.2/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1.18.2/build.gradle.kts
@@ -4,5 +4,5 @@ applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.18.2-R0.1-20220304.102823-4")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.18.2-R0.1-20220920.010157-167")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1.19.4/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1.19.4/build.gradle.kts
@@ -4,5 +4,5 @@ applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.4-R0.1-20230315.180941-2")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.4-R0.1-20230608.201059-104")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1.20/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1.20/build.gradle.kts
@@ -4,5 +4,5 @@ applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20-R0.1-20230608.125933-3")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.1-R0.1-20230816.041652-110")
 }
diff --git a/...20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java b/...20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java
@@ -680,7 +680,7 @@ public boolean simulateItemUse(World world, BlockVector3 position, BaseItem item
         final net.minecraft.core.Direction enumFacing = adapt(face);
         BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false);
         UseOnContext context = new UseOnContext(fakePlayer, InteractionHand.MAIN_HAND, rayTrace);
-        InteractionResult result = stack.useOn(context, InteractionHand.MAIN_HAND);
+        InteractionResult result = stack.useOn(context);
         if (result != InteractionResult.SUCCESS) {
             if (worldServer.getBlockState(blockPos).use(worldServer, fakePlayer, InteractionHand.MAIN_HAND, rayTrace).consumesAction()) {
                 result = InteractionResult.SUCCESS;

diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts
@@ -72,7 +72,7 @@ dependencies {
     "compileOnly"("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}")
     "annotationProcessor"("com.google.auto.value:auto-value:${Versions.AUTO_VALUE}")
 
-    "languageFiles"("${project.group}:worldedit-lang:7.2.6:355@zip")
+    "languageFiles"("${project.group}:worldedit-lang:7.2.16:1029@zip")
 
     "testRuntimeOnly"("org.apache.logging.log4j:log4j-core:${Versions.LOG4J}")
 }