Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor placement system to be more flexible
- Loading branch information
Showing
6 changed files
with
167 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
worldedit-core/src/main/java/com/sk89q/worldedit/session/Placement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * WorldEdit, a Minecraft world manipulation toolkit | ||
| * Copyright (C) sk89q <http://www.sk89q.com> | ||
| * Copyright (C) WorldEdit team and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.sk89q.worldedit.session; | ||
|
|
||
| import com.sk89q.worldedit.IncompleteRegionException; | ||
| import com.sk89q.worldedit.extension.platform.Actor; | ||
| import com.sk89q.worldedit.math.BlockVector3; | ||
| import com.sk89q.worldedit.regions.RegionSelector; | ||
| import com.sk89q.worldedit.util.formatting.text.Component; | ||
| import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; | ||
|
|
||
| public class Placement { | ||
| private final PlacementType placementType; | ||
|
|
||
| public Placement(PlacementType placementType) { | ||
| this.placementType = placementType; | ||
| } | ||
|
|
||
| public PlacementType getPlacementType() { | ||
| return placementType; | ||
| } | ||
|
|
||
| public BlockVector3 getPlacementPosition(RegionSelector selector, Actor actor) throws IncompleteRegionException { | ||
| return placementType.getPlacementPosition(selector, actor); | ||
| } | ||
|
|
||
| public boolean canUseActor(Actor actor) { | ||
| return placementType.canUseActor(actor); | ||
| } | ||
|
|
||
| public Component getInfo() { | ||
| return TranslatableComponent.of(placementType.getTranslationKey()); | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
worldedit-core/src/main/java/com/sk89q/worldedit/session/PlacementType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * WorldEdit, a Minecraft world manipulation toolkit | ||
| * Copyright (C) sk89q <http://www.sk89q.com> | ||
| * Copyright (C) WorldEdit team and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.sk89q.worldedit.session; | ||
|
|
||
| import com.sk89q.worldedit.IncompleteRegionException; | ||
| import com.sk89q.worldedit.extension.platform.Actor; | ||
| import com.sk89q.worldedit.extension.platform.Locatable; | ||
| import com.sk89q.worldedit.math.BlockVector3; | ||
| import com.sk89q.worldedit.regions.RegionSelector; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
|
|
||
| public enum PlacementType { | ||
| PLAYER("worldedit.toggleplace.player") { | ||
| @Override | ||
| public BlockVector3 getPlacementPosition(RegionSelector selector, Actor actor) throws IncompleteRegionException | ||
| { | ||
| if (!canUseActor(actor)) { | ||
| throw new IncompleteRegionException(); | ||
| } | ||
| return ((Locatable) actor).getBlockLocation().toVector().toBlockPoint(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean canUseActor(Actor actor) { | ||
| checkNotNull(actor); | ||
| return actor instanceof Locatable; | ||
| } | ||
| }, | ||
|
|
||
| POS1("worldedit.toggleplace.pos1") { | ||
| @Override | ||
| public BlockVector3 getPlacementPosition(RegionSelector selector, Actor actor) throws IncompleteRegionException { | ||
| return selector.getPrimaryPosition(); | ||
| } | ||
| }; | ||
|
|
||
| private final String translationKey; | ||
|
|
||
| PlacementType(String translationKey) { | ||
| this.translationKey = translationKey; | ||
| } | ||
|
|
||
| public abstract BlockVector3 getPlacementPosition(RegionSelector selector, Actor actor) throws IncompleteRegionException; | ||
|
|
||
| public boolean canUseActor(Actor actor) { | ||
| return true; | ||
| } | ||
|
|
||
| public String getTranslationKey() { | ||
| return translationKey; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters