From cff4713e3d0dbf58ebf417c4ef4e4a6488da2cdb Mon Sep 17 00:00:00 2001 From: stijnb1234 Date: Sun, 28 Jun 2020 19:47:49 +0200 Subject: [PATCH] Moved getter of regiongroup --- .../org/codemc/worldguardwrapper/flag/IWrappedFlag.java | 2 ++ .../implementation/legacy/flag/AbstractWrappedFlag.java | 7 +++++++ .../implementation/v6/flag/AbstractWrappedFlag.java | 6 ++++++ .../implementation/v7/flag/AbstractWrappedFlag.java | 6 ++++++ 4 files changed, 21 insertions(+) diff --git a/api/src/main/java/org/codemc/worldguardwrapper/flag/IWrappedFlag.java b/api/src/main/java/org/codemc/worldguardwrapper/flag/IWrappedFlag.java index f2f45f2..dc194bd 100644 --- a/api/src/main/java/org/codemc/worldguardwrapper/flag/IWrappedFlag.java +++ b/api/src/main/java/org/codemc/worldguardwrapper/flag/IWrappedFlag.java @@ -8,4 +8,6 @@ public interface IWrappedFlag { Optional getDefaultValue(); + IWrappedFlag getRegionGroupFlag(); + } diff --git a/implementation/legacy/src/main/java/org/codemc/worldguardwrapper/implementation/legacy/flag/AbstractWrappedFlag.java b/implementation/legacy/src/main/java/org/codemc/worldguardwrapper/implementation/legacy/flag/AbstractWrappedFlag.java index 097f0f9..df724a4 100644 --- a/implementation/legacy/src/main/java/org/codemc/worldguardwrapper/implementation/legacy/flag/AbstractWrappedFlag.java +++ b/implementation/legacy/src/main/java/org/codemc/worldguardwrapper/implementation/legacy/flag/AbstractWrappedFlag.java @@ -5,6 +5,8 @@ import lombok.AllArgsConstructor; import lombok.Getter; import org.codemc.worldguardwrapper.flag.IWrappedFlag; import org.codemc.worldguardwrapper.flag.IWrappedRegionGroupFlag; +import org.codemc.worldguardwrapper.flag.WrappedRegionGroup; +import org.codemc.worldguardwrapper.implementation.legacy.utility.WorldGuardFlagUtilities; import java.util.Optional; @@ -27,4 +29,9 @@ public abstract class AbstractWrappedFlag implements IWrappedFlag { public Optional getDefaultValue() { return fromWGValue(handle.getDefault()); } + + @Override + public IWrappedFlag getRegionGroupFlag() { + return WorldGuardFlagUtilities.wrap(handle.getRegionGroupFlag(), WrappedRegionGroup.class); + } } diff --git a/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/flag/AbstractWrappedFlag.java b/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/flag/AbstractWrappedFlag.java index c543dd0..5ace205 100644 --- a/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/flag/AbstractWrappedFlag.java +++ b/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/flag/AbstractWrappedFlag.java @@ -4,6 +4,8 @@ import com.sk89q.worldguard.protection.flags.Flag; import lombok.AllArgsConstructor; import lombok.Getter; import org.codemc.worldguardwrapper.flag.IWrappedFlag; +import org.codemc.worldguardwrapper.flag.WrappedRegionGroup; +import org.codemc.worldguardwrapper.implementation.v6.utility.WorldGuardFlagUtilities; import java.util.Optional; @@ -27,4 +29,8 @@ public abstract class AbstractWrappedFlag implements IWrappedFlag { return fromWGValue(handle.getDefault()); } + @Override + public IWrappedFlag getRegionGroupFlag() { + return WorldGuardFlagUtilities.wrap(handle.getRegionGroupFlag(), WrappedRegionGroup.class); + } } diff --git a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/flag/AbstractWrappedFlag.java b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/flag/AbstractWrappedFlag.java index e3f067e..015f676 100644 --- a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/flag/AbstractWrappedFlag.java +++ b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/flag/AbstractWrappedFlag.java @@ -4,6 +4,8 @@ import com.sk89q.worldguard.protection.flags.Flag; import lombok.AllArgsConstructor; import lombok.Getter; import org.codemc.worldguardwrapper.flag.IWrappedFlag; +import org.codemc.worldguardwrapper.flag.WrappedRegionGroup; +import org.codemc.worldguardwrapper.implementation.v7.utility.WorldGuardFlagUtilities; import java.util.Optional; @@ -27,4 +29,8 @@ public abstract class AbstractWrappedFlag implements IWrappedFlag { return fromWGValue(handle.getDefault()); } + @Override + public IWrappedFlag getRegionGroupFlag() { + return WorldGuardFlagUtilities.wrap(handle.getRegionGroupFlag(), WrappedRegionGroup.class); + } }