diff options
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/roomprocessor')
11 files changed, 40 insertions, 56 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java index 4bd7993e..541d5ccc 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java @@ -1,9 +1,9 @@ package kr.syeyoung.dungeonsguide.roomprocessor; -import kr.syeyoung.dungeonsguide.Config; -import kr.syeyoung.dungeonsguide.e; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.mechanics.DungeonMechanic; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.roomedit.EditingContext; import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonRoomEdit; import lombok.Getter; @@ -34,7 +34,7 @@ public class GeneralRoomProcessor implements RoomProcessor { @Override public void drawWorld(float partialTicks) { - if (Config.DEBUG && (EditingContext.getEditingContext() == null || EditingContext.getEditingContext().getCurrent() instanceof GuiDungeonRoomEdit)) { + if (FeatureRegistry.DEBUG.isEnabled() && (EditingContext.getEditingContext() == null || EditingContext.getEditingContext().getCurrent() instanceof GuiDungeonRoomEdit)) { for (Map.Entry<String, DungeonMechanic> value : dungeonRoom.getDungeonRoomInfo().getMechanics().entrySet()) { if (value.getValue() == null) continue;; value.getValue().highlight(new Color(0,255,255,50), value.getKey(), dungeonRoom, partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java index f3b0cf4b..38acb3c8 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java @@ -1,16 +1,12 @@ package kr.syeyoung.dungeonsguide.roomprocessor; import com.google.common.base.Predicate; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import kr.syeyoung.dungeonsguide.utils.TextUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; -import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -18,8 +14,6 @@ import org.jetbrains.annotations.Nullable; import java.awt.*; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.List; public class RoomProcessorBlazeSolver extends GeneralRoomProcessor { @@ -78,7 +72,7 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_blaze) return; + if (!FeatureRegistry.SOLVER_BLAZE.isEnabled()) return; if (next == null) return; Vec3 pos = next.getPositionEyes(partialTicks); RenderUtils.highlightBox(next, new Color(0,255,0,100), partialTicks, false); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java index a6653fdc..d0c5be1c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java @@ -1,23 +1,17 @@ package kr.syeyoung.dungeonsguide.roomprocessor; import com.google.common.base.Predicate; -import kr.syeyoung.dungeonsguide.Config; -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.RenderUtils; -import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; -import scala.actors.threadpool.Arrays; import java.awt.*; import java.util.ArrayList; @@ -116,7 +110,7 @@ public class RoomProcessorCreeperSolver extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_creeper) return; + if (!FeatureRegistry.SOLVER_CREEPER.isEnabled()) return; World w = getDungeonRoom().getContext().getWorld(); for (int i = 0; i < poses.size(); i++) { BlockPos[] poset = poses.get(i); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorIcePath.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorIcePath.java index 2f30c506..42f27628 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorIcePath.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorIcePath.java @@ -1,10 +1,11 @@ package kr.syeyoung.dungeonsguide.roomprocessor; import com.google.common.base.Predicate; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntitySilverfish; @@ -119,7 +120,7 @@ public class RoomProcessorIcePath extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_icesilverfish) return; + if (!FeatureRegistry.SOLVER_SILVERFISH.isEnabled()) return; if (!err) RenderUtils.drawLines(solution, new Color(0,255,0, 255), partialTicks, false); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorRiddle.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorRiddle.java index 5ebec35d..dc2d65e2 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorRiddle.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorRiddle.java @@ -1,9 +1,9 @@ package kr.syeyoung.dungeonsguide.roomprocessor; import com.google.common.base.Predicate; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; -import kr.syeyoung.dungeonsguide.roomedit.Parameter; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.block.Block; @@ -39,7 +39,7 @@ public class RoomProcessorRiddle extends GeneralRoomProcessor { @Override public void chatReceived(IChatComponent chat) { super.chatReceived(chat); - if (!Config.solver_riddle) return; + if (!FeatureRegistry.SOLVER_RIDDLE.isEnabled()) return; String ch2 = chat.getUnformattedText(); if (!ch2.startsWith("§e[NPC] ")) { return; @@ -88,7 +88,7 @@ public class RoomProcessorRiddle extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_riddle) return; + if (!FeatureRegistry.SOLVER_RIDDLE.isEnabled()) return; if (chest != null) { RenderUtils.highlightBlock(chest, new Color(0,255,0, 50),partialTicks); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java index 844789fb..f523ffa9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java @@ -1,7 +1,8 @@ package kr.syeyoung.dungeonsguide.roomprocessor; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -63,7 +64,7 @@ public class RoomProcessorTeleportMazeSolver extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_teleport) return; + if (!FeatureRegistry.SOLVER_TELEPORT.isEnabled()) return; for (BlockPos bpos:visitedPortals) { RenderUtils.highlightBlock(bpos, new Color(255,0,0,100), partialTicks); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTicTacToeSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTicTacToeSolver.java index 353a3ed6..03c2f4e2 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTicTacToeSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTicTacToeSolver.java @@ -1,20 +1,18 @@ package kr.syeyoung.dungeonsguide.roomprocessor; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.init.Blocks; import net.minecraft.item.ItemMap; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.MinecraftError; import net.minecraft.world.World; import net.minecraft.world.storage.MapData; @@ -139,7 +137,6 @@ public class RoomProcessorTicTacToeSolver extends GeneralRoomProcessor { @Override public void tick() { super.tick(); - if (!Config.solver_tictactoe) return; if (board == null) return; if (gameEnded) return; byte[][] board = buildBoardState(); @@ -170,7 +167,7 @@ public class RoomProcessorTicTacToeSolver extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_tictactoe) return; + if (!FeatureRegistry.SOLVER_TICTACTOE.isEnabled()) return; if (chosePos != -1) { BlockPos block = board.getOffsetPointList().get(chosePos).getBlockPos(getDungeonRoom()); RenderUtils.highlightBlock(block, new Color(0,255,255,50), partialTicks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTrivia.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTrivia.java index 1b56768a..cf2538f2 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTrivia.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTrivia.java @@ -1,8 +1,9 @@ package kr.syeyoung.dungeonsguide.roomprocessor; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.RenderUtils; import kr.syeyoung.dungeonsguide.utils.SkyblockUtils; import kr.syeyoung.dungeonsguide.utils.TextUtils; @@ -73,7 +74,7 @@ public class RoomProcessorTrivia extends GeneralRoomProcessor { @Override public void chatReceived(IChatComponent chat) { super.chatReceived(chat); - if (!Config.solver_kahoot) return; + if (!FeatureRegistry.SOLVER_KAHOOT.isEnabled()) return; String ch2 = chat.getUnformattedText(); if (chat.getFormattedText().contains("§r§6§lQuestion ")) { questionDialogStart = true; @@ -149,7 +150,7 @@ public class RoomProcessorTrivia extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_kahoot) return; + if (!FeatureRegistry.SOLVER_KAHOOT.isEnabled()) return; if (correctAnswer == null) return; OffsetPoint op = (OffsetPoint) getDungeonRoom().getDungeonRoomInfo().getProperties().get(correctAnswer); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java index 1ed35e55..a8f31e78 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java @@ -1,17 +1,15 @@ package kr.syeyoung.dungeonsguide.roomprocessor.boxpuzzle; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.roomprocessor.GeneralRoomProcessor; import kr.syeyoung.dungeonsguide.roomprocessor.RoomProcessorGenerator; import kr.syeyoung.dungeonsguide.utils.RenderUtils; -import lombok.AllArgsConstructor; -import lombok.Data; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.entity.RenderIronGolem; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; @@ -79,7 +77,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor { @Override public void tick() { super.tick(); - if (!Config.solver_box) return; + if (!FeatureRegistry.SOLVER_BOX.isEnabled()) return; if (bugged) return; byte[][] currboard = buildCurrentState(); if (puzzleSolvingThread == null) { @@ -296,7 +294,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor { @Override public void chatReceived(IChatComponent chat) { - if (!Config.solver_box) return; + if (!FeatureRegistry.SOLVER_BOX.isEnabled()) return; if (chat.getFormattedText().toLowerCase().contains("recalc")) { if (calcDone) { calcReq = true; @@ -311,7 +309,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor { @Override public void drawScreen(float partialTicks) { super.drawScreen(partialTicks); - if (!Config.solver_box) return; + if (!FeatureRegistry.SOLVER_BOX.isEnabled()) return; FontRenderer fr = Minecraft.getMinecraft().fontRendererObj; fr.drawString("Type \"recalc\" in chat to recalculate the solution", 0, 0, 0xFFFFFFFF); } @@ -319,7 +317,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_box) return; + if (!FeatureRegistry.SOLVER_BOX.isEnabled()) return; if (bugged) return; if (!calcDone) return; if (solution == null) return; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/icefill/RoomProcessorIcePath2.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/icefill/RoomProcessorIcePath2.java index 6ec948a9..7d2e09a3 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/icefill/RoomProcessorIcePath2.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/icefill/RoomProcessorIcePath2.java @@ -1,8 +1,9 @@ package kr.syeyoung.dungeonsguide.roomprocessor.icefill; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.roomprocessor.GeneralRoomProcessor; import kr.syeyoung.dungeonsguide.roomprocessor.RoomProcessorGenerator; import kr.syeyoung.dungeonsguide.utils.RenderUtils; @@ -12,7 +13,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import java.awt.*; -import java.util.ArrayList; import java.util.Queue; import java.util.Arrays; import java.util.LinkedList; @@ -81,6 +81,7 @@ public class RoomProcessorIcePath2 extends GeneralRoomProcessor { @Override public void tick() { super.tick(); + if (!FeatureRegistry.SOLVER_ICEPATH.isEnabled()) return; while (!messageQueue.isEmpty()){ Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(messageQueue.poll())); } @@ -88,7 +89,7 @@ public class RoomProcessorIcePath2 extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { - if (!Config.solver_icepath) return; + if (!FeatureRegistry.SOLVER_ICEPATH.isEnabled()) return; for (List<BlockPos> solution:this.solution) RenderUtils.drawLines(solution, new Color(0,255,0, 255), partialTicks, true); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java index c4787d48..ace719c9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java @@ -1,16 +1,13 @@ package kr.syeyoung.dungeonsguide.roomprocessor.waterpuzzle; -import kr.syeyoung.dungeonsguide.Config; +import kr.syeyoung.dungeonsguide.config.Config; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.roomprocessor.GeneralRoomProcessor; -import kr.syeyoung.dungeonsguide.roomprocessor.RoomProcessor; -import kr.syeyoung.dungeonsguide.roomprocessor.RoomProcessorBlazeSolver; import kr.syeyoung.dungeonsguide.roomprocessor.RoomProcessorGenerator; import kr.syeyoung.dungeonsguide.utils.RenderUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.BlockPos; import java.awt.*; @@ -50,7 +47,7 @@ public class RoomProcessorWaterPuzzle extends GeneralRoomProcessor { @Override public void tick() { super.tick(); - if (!Config.solver_waterpuzzle) return; + if (!FeatureRegistry.SOLVER_WATERPUZZLE.isEnabled()) return; if (!argumentsFulfilled) return; try { waterBoard.tick(); @@ -67,7 +64,7 @@ public class RoomProcessorWaterPuzzle extends GeneralRoomProcessor { @Override public void drawWorld(float partialTicks) { super.drawWorld(partialTicks); - if (!Config.solver_waterpuzzle) return; + if (!FeatureRegistry.SOLVER_WATERPUZZLE.isEnabled()) return; if (!argumentsFulfilled) return; if (waterBoard == null) return; |