From f4b28df13340ed36c3a42bb015d06761758e20c4 Mon Sep 17 00:00:00 2001 From: youhavetrouble Date: Sun, 16 Apr 2023 11:25:46 +0200 Subject: [PATCH] move WorkSplitter to api package and make its methods protected so internal logic doesn't leak --- .../me/youhavetrouble/blockedit/api/BlockEditAPI.java | 1 - .../youhavetrouble/blockedit/{ => api}/WorkSplitter.java | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) rename src/main/java/me/youhavetrouble/blockedit/{ => api}/WorkSplitter.java (86%) diff --git a/src/main/java/me/youhavetrouble/blockedit/api/BlockEditAPI.java b/src/main/java/me/youhavetrouble/blockedit/api/BlockEditAPI.java index 31831e2..b8ce741 100644 --- a/src/main/java/me/youhavetrouble/blockedit/api/BlockEditAPI.java +++ b/src/main/java/me/youhavetrouble/blockedit/api/BlockEditAPI.java @@ -1,6 +1,5 @@ package me.youhavetrouble.blockedit.api; -import me.youhavetrouble.blockedit.WorkSplitter; import me.youhavetrouble.blockedit.util.ChunkWork; import me.youhavetrouble.blockedit.util.Selection; diff --git a/src/main/java/me/youhavetrouble/blockedit/WorkSplitter.java b/src/main/java/me/youhavetrouble/blockedit/api/WorkSplitter.java similarity index 86% rename from src/main/java/me/youhavetrouble/blockedit/WorkSplitter.java rename to src/main/java/me/youhavetrouble/blockedit/api/WorkSplitter.java index cfde6ec..5c6433f 100644 --- a/src/main/java/me/youhavetrouble/blockedit/WorkSplitter.java +++ b/src/main/java/me/youhavetrouble/blockedit/api/WorkSplitter.java @@ -1,6 +1,6 @@ -package me.youhavetrouble.blockedit; +package me.youhavetrouble.blockedit.api; -import me.youhavetrouble.blockedit.api.BlockEditOperation; +import me.youhavetrouble.blockedit.BlockEdit; import me.youhavetrouble.blockedit.util.ChunkWork; import me.youhavetrouble.blockedit.util.Selection; import org.bukkit.Bukkit; @@ -11,12 +11,11 @@ import org.bukkit.util.BoundingBox; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; public class WorkSplitter { - public static HashSet getOperatedOnChunks(BoundingBox boundingBox) { + protected static HashSet getOperatedOnChunks(BoundingBox boundingBox) { HashSet chunks = new HashSet<>(); ChunkWork chunkWork = new ChunkWork(0,0); // TODO Find a way to get chunks in the selection more efficiently @@ -30,7 +29,7 @@ public class WorkSplitter { return chunks; } - public static void runOperation(HashSet chunkWorks, Selection selection, int chunksPerTick, BlockEditOperation operation) { + protected static void runOperation(HashSet chunkWorks, Selection selection, int chunksPerTick, BlockEditOperation operation) { if (selection == null) return; List chunkWork = new ArrayList<>(chunkWorks); AtomicInteger element = new AtomicInteger(chunkWork.size()-1);