Update of RegionGroup system

This commit is contained in:
stijnb1234 2020-06-28 17:23:04 +02:00
parent d2053ffca4
commit 328f12c425
5 changed files with 28 additions and 5 deletions

View File

@ -8,6 +8,4 @@ public interface IWrappedFlag<T> {
Optional<T> getDefaultValue();
IWrappedRegionGroupFlag getRegionGroupFlag();
}

View File

@ -4,6 +4,7 @@ import com.sk89q.worldguard.protection.flags.Flag;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.codemc.worldguardwrapper.flag.IWrappedFlag;
import org.codemc.worldguardwrapper.flag.IWrappedRegionGroupFlag;
import java.util.Optional;
@ -26,5 +27,4 @@ public abstract class AbstractWrappedFlag<T> implements IWrappedFlag<T> {
public Optional<T> getDefaultValue() {
return fromWGValue(handle.getDefault());
}
}

View File

@ -4,6 +4,7 @@ import com.sk89q.worldguard.protection.flags.Flag;
import org.bukkit.Location;
import org.bukkit.util.Vector;
import org.codemc.worldguardwrapper.flag.IWrappedRegionGroupFlag;
import org.codemc.worldguardwrapper.implementation.legacy.utility.WorldGuardFlagUtilities;
import java.util.Optional;
@ -34,5 +35,4 @@ public class WrappedPrimitiveFlag<T> extends AbstractWrappedFlag<T> {
}
return Optional.ofNullable(value);
}
}

View File

@ -0,0 +1,25 @@
package org.codemc.worldguardwrapper.implementation.legacy.flag;
import com.sk89q.worldguard.protection.flags.Flag;
import com.sk89q.worldguard.protection.flags.RegionGroup;
import org.codemc.worldguardwrapper.flag.IWrappedRegionGroupFlag;
import org.codemc.worldguardwrapper.flag.WrappedRegionGroup;
import java.util.Optional;
public class WrappedRegionGroupFlag extends AbstractWrappedFlag<WrappedRegionGroup> implements IWrappedRegionGroupFlag {
public WrappedRegionGroupFlag(Flag<RegionGroup> handle) {
super(handle);
}
@Override
public Optional<WrappedRegionGroup> fromWGValue(Object value) {
return Optional.of(Enum.valueOf(WrappedRegionGroup.class, value.toString()));
}
@Override
public Optional<Object> fromWrapperValue(WrappedRegionGroup value) {
return Optional.of(Enum.valueOf(RegionGroup.class, value.toString()));
}
}

View File

@ -2,6 +2,7 @@ package org.codemc.worldguardwrapper.implementation.legacy.flag;
import com.sk89q.worldguard.protection.flags.Flag;
import com.sk89q.worldguard.protection.flags.StateFlag;
import org.codemc.worldguardwrapper.flag.IWrappedRegionGroupFlag;
import org.codemc.worldguardwrapper.flag.IWrappedStatusFlag;
import org.codemc.worldguardwrapper.flag.WrappedState;
@ -24,5 +25,4 @@ public class WrappedStatusFlag extends AbstractWrappedFlag<WrappedState> impleme
return Optional.ofNullable(value)
.map(state -> state == WrappedState.ALLOW ? StateFlag.State.ALLOW : StateFlag.State.DENY);
}
}