Move ban classes to the ban package (#3124)

SpongePowered · Aug 23, 2020 · 7bd77b2 · 7bd77b2
1 parent 97ef12f
commit 7bd77b2
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/src/main/java/org/spongepowered/common/ban/SpongeBanBuilder.java b/src/main/java/org/spongepowered/common/ban/SpongeBanBuilder.java
@@ -32,9 +32,9 @@
 import net.minecraft.server.management.IPBanEntry;
 import net.minecraft.server.management.IPBanList;
 import net.minecraft.server.management.ProfileBanEntry;
-import org.spongepowered.api.util.ban.Ban;
-import org.spongepowered.api.util.ban.BanType;
-import org.spongepowered.api.util.ban.BanTypes;
+import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.service.ban.BanType;
+import org.spongepowered.api.service.ban.BanTypes;
 import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.accessor.server.management.IPBanListAccessor;
 import org.spongepowered.common.adventure.SpongeAdventure;

diff --git a/src/main/java/org/spongepowered/common/ban/SpongeBanType.java b/src/main/java/org/spongepowered/common/ban/SpongeBanType.java
@@ -25,8 +25,8 @@
 package org.spongepowered.common.ban;
 
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.util.ban.Ban;
-import org.spongepowered.api.util.ban.BanType;
+import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.service.ban.BanType;
 import org.spongepowered.common.SpongeCatalogType;
 
 public final class SpongeBanType extends SpongeCatalogType implements BanType {

diff --git a/src/main/java/org/spongepowered/common/registry/SpongeBuilderRegistry.java b/src/main/java/org/spongepowered/common/registry/SpongeBuilderRegistry.java
@@ -91,7 +91,7 @@
 import org.spongepowered.api.scoreboard.Team;
 import org.spongepowered.api.scoreboard.objective.Objective;
 import org.spongepowered.api.util.ResettableBuilder;
-import org.spongepowered.api.util.ban.Ban;
+import org.spongepowered.api.service.ban.Ban;
 import org.spongepowered.api.world.LocatableBlock;
 import org.spongepowered.api.world.WorldArchetype;
 import org.spongepowered.api.world.WorldBorder;

diff --git a/src/main/java/org/spongepowered/common/registry/SpongeCatalogRegistry.java b/src/main/java/org/spongepowered/common/registry/SpongeCatalogRegistry.java
@@ -143,7 +143,7 @@
 import org.spongepowered.api.service.economy.Currency;
 import org.spongepowered.api.service.economy.account.AccountDeletionResultType;
 import org.spongepowered.api.util.Tuple;
-import org.spongepowered.api.util.ban.BanType;
+import org.spongepowered.api.service.ban.BanType;
 import org.spongepowered.api.world.SerializationBehavior;
 import org.spongepowered.api.world.biome.BiomeType;
 import org.spongepowered.api.world.difficulty.Difficulty;

diff --git a/src/main/java/org/spongepowered/common/registry/builtin/sponge/BanTypeStreamGenerator.java b/src/main/java/org/spongepowered/common/registry/builtin/sponge/BanTypeStreamGenerator.java
@@ -25,8 +25,8 @@
 package org.spongepowered.common.registry.builtin.sponge;
 
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.util.ban.Ban;
-import org.spongepowered.api.util.ban.BanType;
+import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.service.ban.BanType;
 import org.spongepowered.common.ban.SpongeBanType;
 
 import java.util.stream.Stream;

diff --git a/src/main/java/org/spongepowered/common/service/ban/SpongeBanService.java b/src/main/java/org/spongepowered/common/service/ban/SpongeBanService.java
@@ -35,8 +35,8 @@
 import org.spongepowered.api.event.SpongeEventFactory;
 import org.spongepowered.api.profile.GameProfile;
 import org.spongepowered.api.service.ban.BanService;
-import org.spongepowered.api.util.ban.Ban;
-import org.spongepowered.api.util.ban.BanTypes;
+import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.service.ban.BanTypes;
 import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.accessor.server.management.UserListAccessor;
 import org.spongepowered.common.event.tracking.PhaseTracker;

diff --git a/src/main/java/org/spongepowered/common/service/ban/SpongeIPBanList.java b/src/main/java/org/spongepowered/common/service/ban/SpongeIPBanList.java
@@ -28,7 +28,7 @@
 
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.service.ban.BanService;
-import org.spongepowered.api.util.ban.Ban;
+import org.spongepowered.api.service.ban.Ban;
 import org.spongepowered.common.util.NetworkUtil;
 
 import java.io.File;

diff --git a/src/main/java/org/spongepowered/common/service/ban/SpongeUserListBans.java b/src/main/java/org/spongepowered/common/service/ban/SpongeUserListBans.java
@@ -27,7 +27,7 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.profile.GameProfile;
 import org.spongepowered.api.service.ban.BanService;
-import org.spongepowered.api.util.ban.Ban;
+import org.spongepowered.api.service.ban.Ban;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/...xins/java/org/spongepowered/common/mixin/api/mcp/server/management/BanEntryMixin_API.java b/...xins/java/org/spongepowered/common/mixin/api/mcp/server/management/BanEntryMixin_API.java
@@ -26,7 +26,7 @@
 
 import net.kyori.adventure.text.Component;
 import net.minecraft.server.management.BanEntry;
-import org.spongepowered.api.util.ban.Ban;
+import org.spongepowered.api.service.ban.Ban;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/...ns/java/org/spongepowered/common/mixin/api/mcp/server/management/IPBanEntryMixin_API.java b/...ns/java/org/spongepowered/common/mixin/api/mcp/server/management/IPBanEntryMixin_API.java
@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.mixin.api.mcp.server.management;
 
-import org.spongepowered.api.util.ban.Ban;
-import org.spongepowered.api.util.ban.BanType;
-import org.spongepowered.api.util.ban.BanTypes;
+import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.service.ban.BanType;
+import org.spongepowered.api.service.ban.BanTypes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.common.bridge.server.management.IPBanEntryBridge;
 

diff --git a/...va/org/spongepowered/common/mixin/api/mcp/server/management/ProfileBanEntryMixin_API.java b/...va/org/spongepowered/common/mixin/api/mcp/server/management/ProfileBanEntryMixin_API.java
@@ -26,9 +26,9 @@
 
 import net.minecraft.server.management.ProfileBanEntry;
 import org.spongepowered.api.profile.GameProfile;
-import org.spongepowered.api.util.ban.Ban;
-import org.spongepowered.api.util.ban.BanType;
-import org.spongepowered.api.util.ban.BanTypes;
+import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.service.ban.BanType;
+import org.spongepowered.api.service.ban.BanTypes;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(ProfileBanEntry.class)