From a23b2bd9a983ca0cc225bb448e076499d0dce0de Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 5 Feb 2020 17:08:50 -0500 Subject: [PATCH] start of finder profiles --- .../seedcracker/command/FinderCommand.java | 4 +-- .../seedcracker/finder/FinderQueue.java | 13 ++++----- .../finder/profile/FinderProfile.java | 17 ++++++++++++ .../finder/profile/VanillaProfile.java | 27 +++++++++++++++++++ 4 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 src/main/java/kaptainwutax/seedcracker/finder/profile/FinderProfile.java create mode 100644 src/main/java/kaptainwutax/seedcracker/finder/profile/VanillaProfile.java diff --git a/src/main/java/kaptainwutax/seedcracker/command/FinderCommand.java b/src/main/java/kaptainwutax/seedcracker/command/FinderCommand.java index 04a25c8..5d7ea62 100644 --- a/src/main/java/kaptainwutax/seedcracker/command/FinderCommand.java +++ b/src/main/java/kaptainwutax/seedcracker/command/FinderCommand.java @@ -41,7 +41,7 @@ public class FinderCommand extends ClientCommand { } private int printFinderType(FinderConfig.Type finderType) { - this.sendFeedback("Finder " + finderType + " is set to [" + String.valueOf(FinderQueue.get().finderConfig.getTypeState(finderType)).toUpperCase() + "].", false); + this.sendFeedback("Finder " + finderType + " is set to [" + String.valueOf(FinderQueue.get().finderProfile.getTypeState(finderType)).toUpperCase() + "].", false); return 0; } @@ -51,7 +51,7 @@ public class FinderCommand extends ClientCommand { } private int setFinderType(FinderConfig.Type finderType, boolean flag) { - FinderQueue.get().finderConfig.setTypeState(finderType, flag); + FinderQueue.get().finderProfile.setTypeState(finderType, flag); this.sendFeedback("Finder " + finderType + " has been set to [" + String.valueOf(flag).toUpperCase() + "].", false); return 0; } diff --git a/src/main/java/kaptainwutax/seedcracker/finder/FinderQueue.java b/src/main/java/kaptainwutax/seedcracker/finder/FinderQueue.java index 28995f0..7929b16 100644 --- a/src/main/java/kaptainwutax/seedcracker/finder/FinderQueue.java +++ b/src/main/java/kaptainwutax/seedcracker/finder/FinderQueue.java @@ -2,6 +2,7 @@ package kaptainwutax.seedcracker.finder; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; +import kaptainwutax.seedcracker.finder.profile.VanillaProfile; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; @@ -16,7 +17,7 @@ public class FinderQueue { public static ExecutorService SERVICE = Executors.newFixedThreadPool(5); public RenderType renderType = RenderType.XRAY; - public FinderConfig finderConfig = new DefaultFinderConfig(); + public FinderConfig finderProfile = new VanillaProfile(); private FinderQueue() { this.clear(); @@ -27,15 +28,15 @@ public class FinderQueue { } public void onChunkData(World world, ChunkPos chunkPos) { - this.finderConfig.getActiveFinderTypes().forEach(type -> { - SERVICE.submit(() -> { + this.finderProfile.getActiveFinderTypes().forEach(type -> { + SERVICE.submit(() -> { try { List finders = type.finderBuilder.build(world, chunkPos); finders.forEach(finder -> { if(finder.isValidDimension(world.dimension.getType())) { finder.findInChunk(); - this.finderConfig.addFinder(type, finder); + this.finderProfile.addFinder(type, finder); } }); } catch(Exception e) { @@ -58,7 +59,7 @@ public class FinderQueue { GlStateManager.disableDepthTest(); } - this.finderConfig.getActiveFinders().forEach(finder -> { + this.finderProfile.getActiveFinders().forEach(finder -> { if(finder.shouldRender()) { finder.render(); } @@ -69,7 +70,7 @@ public class FinderQueue { public void clear() { this.renderType = RenderType.XRAY; - this.finderConfig = new DefaultFinderConfig(); + this.finderProfile = new VanillaProfile(); } public enum RenderType { diff --git a/src/main/java/kaptainwutax/seedcracker/finder/profile/FinderProfile.java b/src/main/java/kaptainwutax/seedcracker/finder/profile/FinderProfile.java new file mode 100644 index 0000000..484635f --- /dev/null +++ b/src/main/java/kaptainwutax/seedcracker/finder/profile/FinderProfile.java @@ -0,0 +1,17 @@ +package kaptainwutax.seedcracker.finder.profile; + +import kaptainwutax.seedcracker.finder.FinderConfig; + +public abstract class FinderProfile extends FinderConfig { + + public FinderProfile(boolean defaultState) { + super(defaultState); + } + + public abstract String getAuthor(); + public abstract boolean getLocked(); + + public abstract void setAuthor(String author); + public abstract void setLocked(boolean locked); + +} diff --git a/src/main/java/kaptainwutax/seedcracker/finder/profile/VanillaProfile.java b/src/main/java/kaptainwutax/seedcracker/finder/profile/VanillaProfile.java new file mode 100644 index 0000000..005cb18 --- /dev/null +++ b/src/main/java/kaptainwutax/seedcracker/finder/profile/VanillaProfile.java @@ -0,0 +1,27 @@ +package kaptainwutax.seedcracker.finder.profile; + +public class VanillaProfile extends FinderProfile { + + public VanillaProfile() { + super(true); + } + + @Override + public String getAuthor() { + return "KaptainWutax"; + } + + @Override + public boolean getLocked() { + return true; + } + + @Override + public void setAuthor(String author) { + } + + @Override + public void setLocked(boolean locked) { + } + +}