mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-01-18 12:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version/7.2.x'

Browse Source
This commit is contained in:
Madeline Miller 2023-08-16 17:59:48 +10:00
commit f8144e584d
No known key found for this signature in database
GPG Key ID: B8EA2E5693115D81
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/build.gradle.kts
View File

@ -53,10 +53,10 @@
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0") implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0")
implementation("org.spongepowered:spongegradle-plugin-development:2.1.1") implementation("org.spongepowered:spongegradle-plugin-development:2.1.1")
implementation("org.spongepowered:vanillagradle:0.2.1-20230603.203956-54") 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:fabric-loom:$loomVersion")
implementation("net.fabricmc:sponge-mixin:$mixinVersion") implementation("net.fabricmc:sponge-mixin:$mixinVersion")
implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0") 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("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")
} }

2
worldedit-bukkit/adapters/adapter-1.18.2/build.gradle.kts
View File

@ -4,5 +4,5 @@
dependencies { dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/ // 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")
} }

2
worldedit-bukkit/adapters/adapter-1.19.4/build.gradle.kts
View File

@ -4,5 +4,5 @@
dependencies { dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/ // 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")
} }

2
worldedit-bukkit/adapters/adapter-1.20/build.gradle.kts
View File

@ -4,5 +4,5 @@
dependencies { dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/ // 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")
} }

2
worldedit-bukkit/adapters/adapter-1.20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java
View File

@ -680,7 +680,7 @@ public boolean simulateItemUse(World world, BlockVector3 position, BaseItem item
final net.minecraft.core.Direction enumFacing = adapt(face); final net.minecraft.core.Direction enumFacing = adapt(face);
BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false); BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false);
UseOnContext context = new UseOnContext(fakePlayer, InteractionHand.MAIN_HAND, rayTrace); 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 (result != InteractionResult.SUCCESS) {
if (worldServer.getBlockState(blockPos).use(worldServer, fakePlayer, InteractionHand.MAIN_HAND, rayTrace).consumesAction()) { if (worldServer.getBlockState(blockPos).use(worldServer, fakePlayer, InteractionHand.MAIN_HAND, rayTrace).consumesAction()) {
result = InteractionResult.SUCCESS; result = InteractionResult.SUCCESS;

2
worldedit-core/build.gradle.kts
View File

@ -72,7 +72,7 @@
"compileOnly"("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}") "compileOnly"("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}")
"annotationProcessor"("com.google.auto.value:auto-value:${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}") "testRuntimeOnly"("org.apache.logging.log4j:log4j-core:${Versions.LOG4J}")
} }