Skip to content

Pull-up method refactoring #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lavitaep wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pull-up method refactoring #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion arminterface/src/main/java/net/alex9849/inter/WorldGuardInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
import com.sk89q.worldguard.protection.flags.RegionGroup;
import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public abstract class WorldGuardInterface {

Expand All @@ -31,7 +34,16 @@ public abstract class WorldGuardInterface {

public abstract RegionGroup parseFlagInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat;

public abstract List<String> tabCompleteRegions(String regionName, World world);
public List<String> tabCompleteRegions(String regionName, World world) {
Map<String, ProtectedRegion> regions = this.getRegionManager(world).getRegions();
List<String> regionIds = new ArrayList<>();
for(Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
if(entry.getKey().toLowerCase().startsWith(regionName.toLowerCase())) {
regionIds.add(entry.getValue().getId());
}
}
return regionIds;
}

public abstract Flag fuzzyMatchFlag(String id);
}
12 changes: 0 additions & 12 deletions wg6_1adapter/src/main/java/net/alex9849/adapters/WorldGuard6_1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,4 @@ public RegionGroup parseFlagInput(RegionGroupFlag flag, String input) throws Inv
return flag.parseInput(WorldGuardPlugin.inst(), null, input);
}

@Override
public List<String> tabCompleteRegions(String regionName, World world) {
Map<String, ProtectedRegion> regions = this.getRegionManager(world).getRegions();
List<String> regionIds = new ArrayList<>();
for(Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
if(entry.getKey().toLowerCase().startsWith(regionName.toLowerCase())) {
regionIds.add(entry.getValue().getId());
}
}
return regionIds;
}

}
12 changes: 0 additions & 12 deletions wg7adapter/src/main/java/net/alex9849/adapters/WorldGuard7.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,4 @@ public RegionGroup parseFlagInput(RegionGroupFlag flag, String input) throws Inv
return flag.parseInput(FlagContext.create().setInput(input).build());
}

@Override
public List<String> tabCompleteRegions(String regionName, World world) {
Map<String, ProtectedRegion> regions = this.getRegionManager(world).getRegions();
List<String> regionIds = new ArrayList<>();
for(Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
if(entry.getKey().toLowerCase().startsWith(regionName.toLowerCase())) {
regionIds.add(entry.getValue().getId());
}
}
return regionIds;
}

}