Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Jesse Boyd 2019-08-26 05:49:00 +01:00
commit edb626a961
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/CommonConfig.kt
View File

@ -16,7 +16,7 @@ fun Project.applyCommonConfiguration() {
maven { url = uri("https://ci.athion.net/job/FAWE-Piston/ws/") } maven { url = uri("https://ci.athion.net/job/FAWE-Piston/ws/") }
ivy { url = uri("https://ci.athion.net/job") ivy { url = uri("https://ci.athion.net/job")
patternLayout { patternLayout {
artifact("/[organisation]/[revision]/artifact/[module].[ext]") artifact("/[organisation]/[module]/artifact/[revision].[ext]")
}} }}
} }
configurations.all { configurations.all {

23
worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
View File

@ -88,7 +88,6 @@ import com.sk89q.worldedit.command.ToolUtilCommands;
import com.sk89q.worldedit.command.ToolUtilCommandsRegistration; import com.sk89q.worldedit.command.ToolUtilCommandsRegistration;
import com.sk89q.worldedit.command.TransformCommands; import com.sk89q.worldedit.command.TransformCommands;
import com.sk89q.worldedit.command.TransformCommandsRegistration; import com.sk89q.worldedit.command.TransformCommandsRegistration;
import com.sk89q.worldedit.command.TransformCommandsRegistration;
import com.sk89q.worldedit.command.UtilityCommands; import com.sk89q.worldedit.command.UtilityCommands;
import com.sk89q.worldedit.command.UtilityCommandsRegistration; import com.sk89q.worldedit.command.UtilityCommandsRegistration;
import com.sk89q.worldedit.command.WorldEditCommands; import com.sk89q.worldedit.command.WorldEditCommands;
@ -419,17 +418,17 @@ public final class PlatformCommandManager {
AnvilCommandsRegistration.builder(), AnvilCommandsRegistration.builder(),
new AnvilCommands(worldEdit) new AnvilCommands(worldEdit)
); );
registerSubCommands( // registerSubCommands(
"transforms", // "transforms",
ImmutableList.of(), // ImmutableList.of(),
"Transforms modify how a block is placed\n" + // "Transforms modify how a block is placed\n" +
" - Use [brackets] for arguments\n" + // " - Use [brackets] for arguments\n" +
" - Use , to OR multiple\n" + // " - Use , to OR multiple\n" +
" - Use & to AND multiple\n" + // " - Use & to AND multiple\n" +
"More Info: https://git.io/v9KHO", // "More Info: https://git.io/v9KHO",
TransformCommandsRegistration.builder(), // TransformCommandsRegistration.builder(),
new TransformCommands() // new TransformCommands()
); // );
this.registration.register( this.registration.register(
commandManager, commandManager,
BiomeCommandsRegistration.builder(), BiomeCommandsRegistration.builder(),

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
View File

@ -42,6 +42,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import javax.annotation.Nullable; import javax.annotation.Nullable;