diff options
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide')
17 files changed, 6 insertions, 25 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java index 0852ef79..2515698f 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java @@ -226,7 +226,7 @@ public class MapProcessor { DungeonRoom rooms = buildRoom(mapData, new Point(x,y)); if (rooms == null) continue; e.sendDebugChat(new ChatComponentText("New Map discovered! shape: "+rooms.getShape()+ " color: "+rooms.getColor()+" unitPos: "+x+","+y)); - e.sendDebugChat(new ChatComponentText("New Map discovered! mapMin: "+rooms.getMin())); + e.sendDebugChat(new ChatComponentText("New Map discovered! mapMin: "+rooms.getMin() + " mapMx: "+rooms.getMax())); StringBuilder builder = new StringBuilder(); for (int dy =0;dy<4;dy++) { builder.append("\n"); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java index 2d1912c5..b9508ae4 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java @@ -40,7 +40,6 @@ public class ActionInteract extends AbstractAction { private boolean interacted = false; @Override public void onLivingInteract(DungeonRoom dungeonRoom, PlayerInteractEntityEvent event) { - System.out.println("eve"); if (interacted) return; Vec3 spawnLoc = DungeonActionManager.getSpawnLocation().get(event.getEntity().getEntityId()); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java index 78ae7ab9..284a9590 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java @@ -50,9 +50,9 @@ public class OffsetPoint implements Cloneable, Serializable { for (int i = 0; i < dungeonRoom.getRoomMatcher().getRotation(); i++) { rot2 = VectorUtils.rotateCounterClockwise(rot2); if (i % 2 == 0) { - rot2.y += dungeonRoom.getMax().getX() - dungeonRoom.getMin().getX() + 1; - } else { rot2.y += dungeonRoom.getMax().getZ() - dungeonRoom.getMin().getZ() + 1; + } else { + rot2.y += dungeonRoom.getMax().getX() - dungeonRoom.getMin().getX() + 1; } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java index 1bd708d3..19f2fd3c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java @@ -61,7 +61,6 @@ public class DungeonRoomInfoRegistry { public static void saveAll(File dir) { dir.mkdirs(); boolean isDev = Minecraft.getMinecraft().getSession().getPlayerID().replace("-","").equals("e686fe0aab804a71ac7011dc8c2b534c"); - System.out.println(isDev); String nameidstring = "name,uuid,processsor,secrets"; String ids = ""; for (DungeonRoomInfo dungeonRoomInfo : registered) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java index c4bc596c..d8b7c47b 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java @@ -35,6 +35,7 @@ public class RoomMatcher { for (int x = 0; x < xx; x++) { if (x % 8 == 0 && z % 8 == 0 && dungeonRoom.getContext().getWorld().getChunkFromBlockCoords(dungeonRoom.getRelativeBlockPosAt(x, 0, z)).isEmpty()) { throw new IllegalStateException("chunk is not loaded"); + } } } @@ -61,8 +62,6 @@ public class RoomMatcher { private boolean tryMatching(DungeonRoomInfo dungeonRoomInfo, int rotation) { if (dungeonRoomInfo.getColor() != dungeonRoom.getColor()) return false; - System.out.println("Matching "+dungeonRoomInfo.getName()+" At "+rotation); - int[][] res = dungeonRoomInfo.getBlocks(); for (int i = 0; i < rotation; i++) res = ArrayUtils.rotateCounterClockwise(res); @@ -74,7 +73,6 @@ public class RoomMatcher { Block b = dungeonRoom.getRelativeBlockAt(x,0,z); if (b == null || Block.getIdFromBlock(b) != data) { - System.out.println("Failed At "+x+"."+z + " "+data+" found " + Block.getIdFromBlock(b) +" found"); return false; } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeatureDisableMessage.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeatureDisableMessage.java index 2c562883..a9ab8f84 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeatureDisableMessage.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeatureDisableMessage.java @@ -51,7 +51,6 @@ public class FeatureDisableMessage extends SimpleFeature implements ChatListener if (!isEnabled()) return; if (!skyblockStatus.isOnSkyblock()) return; String msg = clientChatReceivedEvent.message.getFormattedText(); - System.out.println(msg); for (MessageData md:PRE_DEFINED) { if (this.<Boolean>getParameter(md.key).getValue() && md.pattern.matcher(msg).matches()) { clientChatReceivedEvent.setCanceled(true); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java index fb4ba784..7c79c805 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java @@ -66,7 +66,6 @@ public class MEditableAColor extends MPanel { } }; portable.setColor(color); - System.out.println(relMouseX+ " " +relMouseY); portable.setBounds(new Rectangle(relMouseX, relMouseY, 100, 60)); add(portable); } else if (portable != null && !portable.getBounds().contains(relMouseX, relMouseY)) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java index 3f46f498..4250045c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/RoomMatchDisplayPane.java @@ -28,7 +28,7 @@ public class RoomMatchDisplayPane extends MPanel { public RoomMatchDisplayPane(DungeonRoom dungeonRoom, UUID uid, int rotation) { this.dungeonRoom = dungeonRoom; - currentBlocks = dungeonRoom.getDungeonRoomInfo().getBlocks(); + currentBlocks = dungeonRoom.getRoomMatcher().createNew().getBlocks(); targetBlocks = DungeonRoomInfoRegistry.getByUUID(uid).getBlocks(); for (int i = 0; i < rotation; i++) targetBlocks = ArrayUtils.rotateCounterClockwise(targetBlocks); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java index b904c039..fe711ad7 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditAColor.java @@ -127,7 +127,6 @@ public class ValueEditAColor extends MPanel implements ValueEdit<AColor> { s.updateSelected(); v.updateSelected(); a.updateSelected(); - System.out.println(((AColor)parameter.getNewData()).getAlpha()); } @Override public void render(int absMousex, int absMousey, int relMousex0, int relMousey0, float partialTicks, Rectangle scissor) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java index 75d8c968..f0461a1e 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java @@ -182,7 +182,6 @@ public class GeneralRoomProcessor implements RoomProcessor { public void onInteractBlock(PlayerInteractEvent event) { if (path != null) path.onPlayerInteract(event); - System.out.println(event.action); if (event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Items.stick && FeatureRegistry.ADVANCED_ROOMEDIT.isEnabled() && diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java index 5bafcc95..9d0e8557 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorCreeperSolver.java @@ -55,8 +55,6 @@ public class RoomProcessorCreeperSolver extends GeneralRoomProcessor { } } - System.out.println("prismarins: "+prismarines); - while (prismarines.size() > 1) { BlockPos first = prismarines.get(0); BlockPos highestMatch = null; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java index 10226293..c1fcff54 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorTeleportMazeSolver.java @@ -60,7 +60,6 @@ public class RoomProcessorTeleportMazeSolver extends GeneralRoomProcessor { double yInt1 = posZ1 - posX1 * slope1; double yInt2 = posZ2 - posX2 * slope2; - System.out.println("pos1 (" + posX1 + "," + posZ1 + ") pos2 (" + posX2 + "," + posZ2 + ") slope (" + slope1 + "," + slope2 + ") intercept (" + yInt1 + "," + yInt2 + ")"); intersectionX = (yInt2 - yInt1) / (slope1 - slope2); @@ -80,7 +79,6 @@ public class RoomProcessorTeleportMazeSolver extends GeneralRoomProcessor { } if (teleport) { - System.out.println(lookVec +" - "+ (times %2)); if (times % 4 == 0) { times ++; } else if (times % 4 == 2){ diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java index c1db6045..fc86aeb9 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java @@ -119,7 +119,6 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor { set.getRight().setProcessor(bdcg.createRight(set.getRight(), this)); if (bdcg instanceof ImpossibleMatcher) impossible=true; if (bdcg instanceof MazeProcessorMatcher) maze = true; - System.out.println("Matched "+bdcg.getName()+" with "+set.getLeft().getLevel()); break; } } @@ -149,7 +148,6 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor { w.flush(); byte[] bytes = baos.toByteArray(); String str = Base64.encode(bytes); - System.out.println(str); Minecraft.getMinecraft().thePlayer.sendChatMessage("/pc $DG-BD " +str); } catch (IOException e2) { e2.printStackTrace(); @@ -172,7 +170,6 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor { try { String data = component.getFormattedText().substring(component.getFormattedText().indexOf("$DG-BD")); String actual = TextUtils.stripColor(data).trim().split(" ")[1]; - System.out.println(actual); byte[] data2 = Base64.decode(actual); NBTTagCompound compound = CompressedStreamTools.readCompressed(new ByteArrayInputStream(data2)); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java index 0b503dd5..89d989c9 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java @@ -95,7 +95,7 @@ public class ColorRightProcessor extends GeneralDefuseChamberProcessor { NBTTagList list = item.getTagCompound().getCompoundTag("SkullOwner").getCompoundTag("Properties").getTagList("textures", 10); String str = ((NBTTagCompound)list.get(0)).getString("Value"); if (!integers.containsKey(str)) { - System.out.println("Cant determine "+str); +// System.out.println("Cant determine "+str); } return (byte) (!integers.containsKey(str) ? 0 : integers.get(str)); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java index e7d964aa..1abac165 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java @@ -63,7 +63,6 @@ public class CreeperRightProcessor extends GeneralDefuseChamberProcessor { event.setCanceled(true); } } - System.out.println(event.isCanceled()); } } @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java index 94b173e6..fd0f40ec 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java @@ -66,8 +66,6 @@ public class NumberRightProcessor extends GeneralDefuseChamberProcessor { if (a2 == d2 && pos.equals(d2p)) event.setCanceled(true); if (a3 == d3 && pos.equals(d3p)) event.setCanceled(true); if (a4 == d4 && pos.equals(d4p)) event.setCanceled(true); - - System.out.println(" block ? "+event.isCanceled()); } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/utils/AhUtils.java b/src/main/java/kr/syeyoung/dungeonsguide/utils/AhUtils.java index b09d9ebc..cc751c09 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/utils/AhUtils.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/utils/AhUtils.java @@ -52,7 +52,6 @@ public class AhUtils { } public static void loadAuctions() throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, InvalidAlgorithmParameterException, NoSuchPaddingException, BadPaddingException, KeyStoreException, IllegalBlockSizeException, KeyManagementException { - System.out.println("I think i'm loading ah"); try { Map<String, AuctionData> semi_auctions = new HashMap<String, AuctionData>(); |