From 09724692f4d30c2df897117b949a528d384a8988 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 18:39:28 -0800 Subject: Rename firstpt to firstPoint for clarity --- .../dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java index b342f6fd..a6f6fe6c 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java @@ -108,8 +108,8 @@ public class DungeonBreakableWall implements DungeonMechanic, RouteBlocker { @Override public void highlight(Color color, String name, DungeonRoom dungeonRoom, float partialTicks) { if (secretPoint.getOffsetPointList().isEmpty()) return; - OffsetPoint firstpt = secretPoint.getOffsetPointList().get(0); - BlockPos pos = firstpt.getBlockPos(dungeonRoom); + OffsetPoint firstPoint = secretPoint.getOffsetPointList().get(0); + BlockPos pos = firstPoint.getBlockPos(dungeonRoom); RenderUtils.drawTextAtWorld(name, pos.getX() +0.5f, pos.getY()+0.75f, pos.getZ()+0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks); RenderUtils.drawTextAtWorld(getCurrentState(dungeonRoom), pos.getX() +0.5f, pos.getY()+0.25f, pos.getZ()+0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks); -- cgit From 868aa159a3c127466dc014d3e646ba8f55a36caf Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 18:40:00 -0800 Subject: Rename firstpt to firstPoint for clarity --- .../java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java index ffe57433..f3c145b1 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java @@ -70,8 +70,8 @@ public class DungeonDoor implements DungeonMechanic, RouteBlocker { @Override public void highlight(Color color, String name, DungeonRoom dungeonRoom, float partialTicks) { if (secretPoint.getOffsetPointList().isEmpty()) return; - OffsetPoint firstpt = secretPoint.getOffsetPointList().get(0); - BlockPos pos = firstpt.getBlockPos(dungeonRoom); + OffsetPoint firstPoint = secretPoint.getOffsetPointList().get(0); + BlockPos pos = firstPoint.getBlockPos(dungeonRoom); RenderUtils.drawTextAtWorld(name, pos.getX() +0.5f, pos.getY()+0.75f, pos.getZ()+0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks); RenderUtils.drawTextAtWorld(getCurrentState(dungeonRoom), pos.getX() +0.5f, pos.getY()+0.25f, pos.getZ()+0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks); -- cgit From d653c3ead118de36dcf82b2a40a86383240687f3 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 18:43:52 -0800 Subject: Rename bpos to blockPos for clarity Fix typos and grammar --- .../kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java | 2 +- .../kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java | 2 +- .../dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java | 2 +- .../syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java index ef83e1ee..31dfcf58 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java @@ -45,7 +45,7 @@ public class DungeonDummy implements DungeonMechanic { @Override public Set getAction(String state, DungeonRoom dungeonRoom) { -// if (!"navigate".equalsIgnoreCase(state)) throw new IllegalArgumentException(state+" is not valid state for secret"); +// if (!"navigate".equalsIgnoreCase(state)) throw new IllegalArgumentException(state+" is not a valid state for secret"); Set base; Set preRequisites = base = new HashSet(); if (state.equalsIgnoreCase("navigate")){ diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java index 702c7fc1..d9def6a8 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java @@ -49,7 +49,7 @@ public class DungeonNPC implements DungeonMechanic { @Override public Set getAction(String state, DungeonRoom dungeonRoom) { if (!"navigate".equalsIgnoreCase(state)) - throw new IllegalArgumentException(state + " is not valid state for secret"); + throw new IllegalArgumentException(state + " is not a valid state for secret"); Set base = new HashSet<>(); ActionInteract actionClick = new ActionInteract(secretPoint); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java index 7299c11f..e6fdcc96 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java @@ -58,7 +58,7 @@ public class DungeonOnewayDoor implements DungeonMechanic, RouteBlocker { } return base; } - if (!("open".equalsIgnoreCase(state))) throw new IllegalArgumentException(state+" is not valid state for door"); + if (!("open".equalsIgnoreCase(state))) throw new IllegalArgumentException(state+" is not a valid state for door"); if (!isBlocking(dungeonRoom)) { return Collections.emptySet(); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java index f53a0f5a..38da357c 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java @@ -81,8 +81,8 @@ public class DungeonSecret implements DungeonMechanic { Vec3 vec3 = pos.subtract(player).normalize(); for (int i = 0; i < player.distanceTo(pos); i++) { Vec3 vec = player.addVector(vec3.xCoord * i, vec3.yCoord * i, vec3.zCoord * i); - BlockPos bpos = new BlockPos(vec); - IBlockState blockState = DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(bpos); + BlockPos blockPos = new BlockPos(vec); + IBlockState blockState = DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(blockPos); if (!NodeProcessorDungeonRoom.isValidBlock(blockState)) return; } @@ -139,8 +139,8 @@ public class DungeonSecret implements DungeonMechanic { Vec3 vec3 = pos.subtract(player).normalize(); for (int i = 0; i < player.distanceTo(pos); i++) { Vec3 vec = player.addVector(vec3.xCoord * i, vec3.yCoord * i, vec3.zCoord * i); - BlockPos bpos = new BlockPos(vec); - IBlockState blockState = DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(bpos); + BlockPos blockPos = new BlockPos(vec); + IBlockState blockState = DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(blockPos); if (!NodeProcessorDungeonRoom.isValidBlock(blockState)) return SecretStatus.NOT_SURE; } -- cgit From a3cd631fe7be7d476414713faa9c5ddcf0c0cf6a Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 18:44:33 -0800 Subject: Rename firstpt to firstPoint for clarity --- .../java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java index 99ece6f1..27a1a242 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java @@ -88,8 +88,8 @@ public class DungeonTomb implements DungeonMechanic, RouteBlocker { @Override public void highlight(Color color, String name, DungeonRoom dungeonRoom, float partialTicks) { if (secretPoint.getOffsetPointList().isEmpty()) return; - OffsetPoint firstpt = secretPoint.getOffsetPointList().get(0); - BlockPos pos = firstpt.getBlockPos(dungeonRoom); + OffsetPoint firstPoint = secretPoint.getOffsetPointList().get(0); + BlockPos pos = firstPoint.getBlockPos(dungeonRoom); RenderUtils.drawTextAtWorld(name, pos.getX() + 0.5f, pos.getY() + 0.75f, pos.getZ() + 0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks); RenderUtils.drawTextAtWorld(getCurrentState(dungeonRoom), pos.getX() + 0.5f, pos.getY() + 0.25f, pos.getZ() + 0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks); -- cgit From e7998613fca8ea8423f232063d2e759afa234b8c Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 18:47:06 -0800 Subject: Refactor listenened to listened --- .../main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java index b65e64aa..003b5a44 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java @@ -93,16 +93,16 @@ public class ChatProcessor { logger.info("[CHAT] {}", txt); int processed = 0; - int listenened = 0; + int listened = 0; Map context = new HashMap<>(); Iterator it = chatSubscriberQueue.iterator(); while (it.hasNext()) { ChatSubscriber chatSubscribed = it.next(); context.put("removed", processed); - context.put("onceListenered", listenened); + context.put("onceListenered", listened); ChatProcessResult chatProcessResult = chatSubscribed.process(txt, context); if (chatProcessResult.isRemoveChat()) processed++; - if (chatProcessResult.isRemoveListener()) listenened++; + if (chatProcessResult.isRemoveListener()) listened++; if (chatProcessResult.isRemoveChat()) chatReceivedEvent.setResult(Event.Result.DENY); if (chatProcessResult.isRemoveListener()) it.remove(); -- cgit From 23f0d60705cd8edea4d4af1fe4a0f9773e8f5dd4 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 18:55:08 -0800 Subject: Fix typos Adjust phrasing for more natural flow --- .../dungeonsguide/mod/commands/CommandDgDebug.java | 16 ++++++++-------- .../dungeonsguide/mod/commands/CommandDungeonsGuide.java | 10 +++++----- .../dungeonsguide/mod/commands/CommandReparty.java | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java index b6742c9c..b6b11c63 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java @@ -99,7 +99,7 @@ public class CommandDgDebug extends CommandBase { ChatTransmitter.addToQueue("VS"); } else if ("mockdungeonstart".equals(arg)) { if (!Minecraft.getMinecraft().isSingleplayer()) { - ChatTransmitter.addToQueue("This only works in singlepauer", false); + ChatTransmitter.addToQueue("This only works in singlepayer", false); return; } @@ -130,18 +130,18 @@ public class CommandDgDebug extends CommandBase { })).start(); } else if ("saverooms".equals(arg)) { DungeonRoomInfoRegistry.saveAll(Main.getConfigDir()); - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully saved user generated roomdata")); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully saved user generated room data")); } else if ("loadrooms".equals(arg)) { try { DungeonRoomInfoRegistry.loadAll(Main.getConfigDir()); - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully loaded roomdatas")); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully loaded room data")); return; } catch (BadPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | NoSuchAlgorithmException | IOException | IllegalBlockSizeException | NoSuchPaddingException e) { e.printStackTrace(); } - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cAn error has occurred while loading roomdata")); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cAn error has occurred while loading room data")); } else if ("reloadah".equals(arg)) { try { AhUtils.loadAuctions(); @@ -150,7 +150,7 @@ public class CommandDgDebug extends CommandBase { KeyStoreException | IllegalBlockSizeException | KeyManagementException e) { e.printStackTrace(); } - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fReloaded Ah data")); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fReloaded AH data")); } else if ("brand".equals(arg)) { String serverBrand = Minecraft.getMinecraft().thePlayer.getClientBrand(); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e" + serverBrand)); @@ -291,7 +291,7 @@ public class CommandDgDebug extends CommandBase { oos.close(); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully saved dungeon run to " + runFile.getAbsolutePath())); } catch (Exception e) { - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cAn error occured while writing rundata " + e.getMessage())); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cAn error occurred while writing rundata " + e.getMessage())); e.printStackTrace(); } } else if ("requeststaticresource".equals(arg)) { @@ -456,12 +456,12 @@ public class CommandDgDebug extends CommandBase { } else if ("clearprofile".equals(arg)) { Minecraft.getMinecraft().mcProfiler.clearProfiling(); } else { - sender.addChatMessage(new ChatComponentText("ain't gonna find much anything here")); + sender.addChatMessage(new ChatComponentText("ain't gonna find much of anything here")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg loadrooms §7-§f Reloads dungeon roomdata.")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg brand §7-§f View server brand.")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg info §7-§f View Current DG User info.")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg saverun §7-§f Save run to be sent to developer.")); - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg saverooms §7-§f Saves usergenerated dungeon roomdata.")); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg saverooms §7-§f Saves user-generated dungeon roomdata.")); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java index f682055f..35f7f015 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java @@ -63,14 +63,14 @@ public class CommandDungeonsGuide extends CommandBase { openConfig = true; } else if (args[0].equalsIgnoreCase("reparty")) { if (!DungeonsGuide.getDungeonsGuide().getCommandReparty().requestReparty(false)) { - ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cCurrently Repartying")); + ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cRepartying...")); } } else if (args[0].equalsIgnoreCase("gui")) { openConfig = true; } else if (args[0].equalsIgnoreCase("pvall")) { PartyManager.INSTANCE.requestPartyList((context) -> { if (context == null) { - ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cNot in Party")); + ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cYou are not in a party!")); return; } FeatureViewPlayerStatsOnJoin.processPartyMembers(context); @@ -81,7 +81,7 @@ public class CommandDungeonsGuide extends CommandBase { return; } if (!PartyManager.INSTANCE.canInvite()) { - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cYou don't have perms in the party to invite people!")); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cYou don't have permission to invite people to the party!")); } else { PartyManager.INSTANCE.toggleAllowAskToJoin(); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fToggled Ask to join to " + (PartyManager.INSTANCE.getAskToJoinSecret() != null ? "§eon" : "§coff"))); @@ -142,7 +142,7 @@ public class CommandDungeonsGuide extends CommandBase { } PartyManager.INSTANCE.setMaxParty(partyMax); - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully set partymax to §e" + PartyManager.INSTANCE.getMaxParty())); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully set the party max to §e" + PartyManager.INSTANCE.getMaxParty())); } catch (Exception e) { sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §c" + args[1] + " is not valid number.")); } @@ -156,7 +156,7 @@ public class CommandDungeonsGuide extends CommandBase { sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg reloadah §7-§f Reloads price data from server.")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg reparty §7-§f Reparty.")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg asktojoin or /dg atj §7-§f Toggle ask to join §cRequires Discord Rich Presence enabled. (/dg -> Advanced)")); - sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg partymax [number] or /dg pm [number] §7-§f Sets partymax §7(maximum amount people in party, for discord rpc)")); + sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg partymax [number] or /dg pm [number] §7-§f Sets the party max §7(maximum amount people in party, for discord rpc)")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg pv [ign] §7-§f Profile Viewer")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg pvall §7-§f Profile Viewer For all people on party")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg purge §7-§f Purge api cache.")); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandReparty.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandReparty.java index a268ad61..1be27ea1 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandReparty.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandReparty.java @@ -49,7 +49,7 @@ public class CommandReparty extends CommandBase { @Override public void processCommand(ICommandSender sender, String[] args) { if (!requestReparty(false)) { - ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cCurrently Repartying")); + ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cRepartying...")); } } @@ -65,13 +65,13 @@ public class CommandReparty extends CommandBase { PartyManager.INSTANCE.requestPartyList(pc -> { if (pc == null) { if (!noerror) - ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cNot in Party")); + ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cYou are not in a Party!")); reparting = false; return; } if (!pc.hasLeader(Minecraft.getMinecraft().getSession().getUsername())) { if (!noerror) - ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cYou're not leader")); + ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §cYou're not the leader")); reparting = false; return; } -- cgit From 3759e885f2b737fec82c1dffbf2f51ea94a59f99 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 19:04:31 -0800 Subject: Fix typos Adjust phrasing for more natural flow --- .../mod/config/guiconfig/MCategoryElement.java | 4 +-- .../dungeonsguide/mod/config/types/AColor.java | 4 +-- .../mod/cosmetics/CustomNetworkPlayerInfo.java | 6 ++--- .../chatreplacers/ChatReplacerChatByMe.java | 20 +++++++-------- .../cosmetics/chatreplacers/ChatReplacerCoop.java | 18 ++++++------- .../chatreplacers/ChatReplacerMessage.java | 18 ++++++------- .../cosmetics/chatreplacers/ChatReplacerPV.java | 16 ++++++------ .../chatreplacers/ChatReplacerSocialOptions.java | 16 ++++++------ .../chatreplacers/ChatReplacerViewProfile.java | 30 +++++++++++----------- .../dungeonsguide/mod/discord/RichPresence.java | 6 ++--- .../syeyoung/dungeonsguide/mod/discord/User.java | 10 ++++---- 11 files changed, 74 insertions(+), 74 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java index 74f5f352..af23d306 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java @@ -35,12 +35,12 @@ public class MCategoryElement extends MPanel { private int leftPad = 0; private int offsetX; private RootConfigPanel rootConfigPanel; - public MCategoryElement(String category, Runnable onClick, int leftPad, int offsetX, RootConfigPanel rooot) { + public MCategoryElement(String category, Runnable onClick, int leftPad, int offsetX, RootConfigPanel root) { this.category = category; this.onClick = onClick; this.leftPad = leftPad; this.offsetX = offsetX; - this.rootConfigPanel = rooot; + this.rootConfigPanel = root; } @Override diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java index d46e3c40..ecb0e838 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java @@ -33,8 +33,8 @@ public class AColor extends Color { super(r, g, b, a); } - public AColor(int rgba, boolean hasalpha) { - super(rgba, hasalpha); + public AColor(int rgba, boolean hasAlpha) { + super(rgba, hasAlpha); } public AColor(AColor clone) { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java index a92cd094..783b255e 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java @@ -62,11 +62,11 @@ public class CustomNetworkPlayerInfo extends NetworkPlayerInfo { playerNameWithoutColor = ""; for (String s : unformattedDisplayText.split(" ")) { - String strippped = TextUtils.stripColor(s); - if (strippped.startsWith("[")) { + String stripped = TextUtils.stripColor(s); + if (stripped.startsWith("[")) { continue; } - playerNameWithoutColor = strippped; + playerNameWithoutColor = stripped; break; } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java index 4e50b110..6f8bcb11 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java @@ -43,7 +43,7 @@ public class ChatReplacerChatByMe implements IChatReplacer { @Override public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) { - List> replaceMents = new ArrayList<>(); + List> replacements = new ArrayList<>(); List iChatComponents = new ArrayList<>( event.message.getSiblings() ); List hasMsg = new ArrayList<>(); for (IChatComponent sibling : iChatComponents) { @@ -57,13 +57,13 @@ public class ChatReplacerChatByMe implements IChatReplacer { ChatStyle origStyle = hasMsg.get(0).getChatStyle(); String name = chatComponents.getFormattedText(); - String[] splited = name.split(" "); - String actualName = splited[splited.length-1]; + String[] split = name.split(" "); + String actualName = split[split.length-1]; - List cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase()); - if (cDatas == null) return; + List cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase()); + if (cData == null) return; CosmeticData color=null, prefix=null; - for (ActiveCosmetic activeCosmetic : cDatas) { + for (ActiveCosmetic activeCosmetic : cData) { CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData()); if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) { color = cosmeticData; @@ -74,12 +74,12 @@ public class ChatReplacerChatByMe implements IChatReplacer { String building = ""; if (prefix != null) building += prefix.getData().replace("&", "§") + " "; - for (int i = 0; i < splited.length-1; i++) { - building += splited[i] +" "; + for (int i = 0; i < split.length-1; i++) { + building += split[i] +" "; } if (color != null) { - String nick = splited[splited.length-1]; + String nick = split[split.length-1]; building += color.getData().replace("&","§"); boolean foundLegitChar = false; boolean foundColor = false; @@ -94,7 +94,7 @@ public class ChatReplacerChatByMe implements IChatReplacer { } } } else { - building += splited[splited.length-1] ; + building += split[split.length-1] ; } ChatComponentText chatComponents1 = new ChatComponentText(building); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java index df003ec7..6522b4b2 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java @@ -42,14 +42,14 @@ public class ChatReplacerCoop implements IChatReplacer { @Override public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) { - List> replaceMents = new ArrayList<>(); + List> replacements = new ArrayList<>(); List iChatComponents = new ArrayList<>( event.message.getSiblings() ); IChatComponent sibling = iChatComponents.get(0); iChatComponents.remove(sibling); String[] splitInto = sibling.getUnformattedTextForChat().split(" "); int lastValidNickname = -1; - int lastprefix = -1; + int lastPrefix = -1; for (int i = 0; i < splitInto.length; i++) { String s = TextUtils.stripColor(splitInto[i]); char c = s.charAt(0); @@ -59,16 +59,16 @@ public class ChatReplacerCoop implements IChatReplacer { } if (lastValidNickname == -1) return; - if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1; - else lastprefix = lastValidNickname; + if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1; + else lastPrefix = lastValidNickname; - List cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(splitInto[lastValidNickname].substring(0, splitInto[lastValidNickname].length()-1)).toLowerCase()); + List cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(splitInto[lastValidNickname].substring(0, splitInto[lastValidNickname].length()-1)).toLowerCase()); - if (cDatas == null) return; + if (cData == null) return; CosmeticData color = null, prefix = null; - for (ActiveCosmetic activeCosmetic : cDatas) { + for (ActiveCosmetic activeCosmetic : cData) { CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData()); if (cosmeticData != null && cosmeticData.getCosmeticType().equals("color")) { color = cosmeticData; @@ -78,11 +78,11 @@ public class ChatReplacerCoop implements IChatReplacer { } String building = ""; - for (int i = 0; i < lastprefix; i++) { + for (int i = 0; i < lastPrefix; i++) { building += splitInto[i] +" "; } if (prefix != null) building += prefix.getData().replace("&", "§") + " "; - for (int i = lastprefix; i < lastValidNickname; i++) { + for (int i = lastPrefix; i < lastValidNickname; i++) { building += splitInto[i] +" "; } if (color != null) { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java index e819ca7f..db59f878 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java @@ -43,7 +43,7 @@ public class ChatReplacerMessage implements IChatReplacer { @Override public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) { - List> replaceMents = new ArrayList<>(); + List> replacements = new ArrayList<>(); List iChatComponents = new ArrayList<>( event.message.getSiblings() ); List hasMsg = new ArrayList<>(); for (IChatComponent sibling : iChatComponents) { @@ -59,13 +59,13 @@ public class ChatReplacerMessage implements IChatReplacer { String name = chatComponents.getFormattedText(); - String[] splited = name.split(" "); - String actualName = splited[splited.length-1]; + String[] split = name.split(" "); + String actualName = split[split.length-1]; - List cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase()); - if (cDatas == null || splited.length > 2) return; + List cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase()); + if (cData == null || split.length > 2) return; CosmeticData color=null, prefix=null; - for (ActiveCosmetic activeCosmetic : cDatas) { + for (ActiveCosmetic activeCosmetic : cData) { CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData()); if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) { color = cosmeticData; @@ -76,10 +76,10 @@ public class ChatReplacerMessage implements IChatReplacer { String building = ""; if (prefix != null) building += prefix.getData().replace("&", "§") + " "; - if (splited.length == 2) building += splited[0] +" "; + if (split.length == 2) building += split[0] +" "; if (color != null) { - String nick = splited[1]; + String nick = split[1]; building += color.getData().replace("&","§"); boolean foundLegitChar = false; boolean foundColor = false; @@ -94,7 +94,7 @@ public class ChatReplacerMessage implements IChatReplacer { } } } else { - building += splited[1] ; + building += split[1] ; } ChatComponentText chatComponents1 = new ChatComponentText(building); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java index b4e1b777..2f1c8da9 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java @@ -41,11 +41,11 @@ public class ChatReplacerPV implements IChatReplacer { public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) { if (event.message.getChatStyle() != null && event.message.getChatStyle().getChatClickEvent() != null && event.message.getChatStyle().getChatClickEvent().getValue().startsWith("/pv")) { String username = event.message.getChatStyle().getChatClickEvent().getValue().split(" ")[1]; - List cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase()); + List cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase()); - if (cDatas != null) { + if (cData != null) { CosmeticData color=null, prefix=null; - for (ActiveCosmetic activeCosmetic : cDatas) { + for (ActiveCosmetic activeCosmetic : cData) { CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData()); if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) { color = cosmeticData; @@ -56,7 +56,7 @@ public class ChatReplacerPV implements IChatReplacer { String[] splitInto = event.message.getUnformattedTextForChat().split(" "); int lastValidNickname = -1; - int lastprefix = -1; + int lastPrefix = -1; for (int i = 0; i < splitInto.length; i++) { String s = splitInto[i]; if (s.startsWith("§7")) s = s.substring(2); @@ -71,15 +71,15 @@ public class ChatReplacerPV implements IChatReplacer { } if (lastValidNickname == -1) return; - if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1; - else lastprefix = lastValidNickname; + if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1; + else lastPrefix = lastValidNickname; String building = ""; - for (int i = 0; i < lastprefix; i++) { + for (int i = 0; i < lastPrefix; i++) { building += splitInto[i] +" "; } if (prefix != null) building += prefix.getData().replace("&", "§") + " "; - for (int i = lastprefix; i < lastValidNickname; i++) { + for (int i = lastPrefix; i < lastValidNickname; i++) { building += splitInto[i] +" "; } if (color != null) { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java index acbdf623..af855938 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java @@ -39,11 +39,11 @@ public class ChatReplacerSocialOptions implements IChatReplacer { public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) { if (event.message.getChatStyle() != null && event.message.getChatStyle().getChatClickEvent() != null && event.message.getChatStyle().getChatClickEvent().getValue().startsWith("/socialoptions")) { String username = event.message.getChatStyle().getChatClickEvent().getValue().split(" ")[1]; - List cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase()); + List cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase()); - if (cDatas != null) { + if (cData != null) { CosmeticData color=null, prefix=null; - for (ActiveCosmetic activeCosmetic : cDatas) { + for (ActiveCosmetic activeCosmetic : cData) { CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData()); if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) { color = cosmeticData; @@ -54,7 +54,7 @@ public class ChatReplacerSocialOptions implements IChatReplacer { String[] splitInto = event.message.getUnformattedTextForChat().split(" "); int lastValidNickname = -1; - int lastprefix = -1; + int lastPrefix = -1; for (int i = 0; i < splitInto.length; i++) { String s = splitInto[i]; if (s.startsWith("§7")) s = s.substring(2); @@ -69,15 +69,15 @@ public class ChatReplacerSocialOptions implements IChatReplacer { } if (lastValidNickname == -1) return; - if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1; - else lastprefix = lastValidNickname; + if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1; + else lastPrefix = lastValidNickname; String building = ""; - for (int i = 0; i < lastprefix; i++) { + for (int i = 0; i < lastPrefix; i++) { building += splitInto[i] +" "; } if (prefix != null) building += prefix.getData().replace("&", "§") + " "; - for (int i = lastprefix; i < lastValidNickname; i++) { + for (int i = lastPrefix; i < lastValidNickname; i++) { building += splitInto[i] +" "; } if (color != null) { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java index 28d1d3d0..c2993258 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java @@ -42,18 +42,18 @@ public class ChatReplacerViewProfile implements IChatReplacer { @Override public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) { - List> replaceMents = new ArrayList<>(); + List> replacements = new ArrayList<>(); for (IChatComponent sibling : event.message.getSiblings()) { if (sibling.getChatStyle() != null && sibling.getChatStyle().getChatClickEvent() != null && sibling.getChatStyle().getChatClickEvent().getValue().startsWith("/viewprofile ")) { String uid = sibling.getChatStyle().getChatClickEvent().getValue().split(" ")[1]; // TODO: make cosmeticsManager handle usernames instead of uuids - // apperantly now hypixels /viewprofile command gives the nickname -// List cDatas = cosmeticsManager.getActiveCosmeticByPlayer().get(UUID.fromString(uid)); - List cDatas = null; + // apparently now hypixel's /viewprofile command gives the nickname +// List cData = cosmeticsManager.getActiveCosmeticByPlayer().get(UUID.fromString(uid)); + List cData = null; - if (cDatas != null) { + if (cData != null) { CosmeticData color=null, prefix=null; - for (ActiveCosmetic activeCosmetic : cDatas) { + for (ActiveCosmetic activeCosmetic : cData) { CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData()); if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) { color = cosmeticData; @@ -64,7 +64,7 @@ public class ChatReplacerViewProfile implements IChatReplacer { String[] splitInto = sibling.getUnformattedTextForChat().split(" "); int lastValidNickname = -1; - int lastprefix = -1; + int lastPrefix = -1; for (int i = 0; i < splitInto.length; i++) { String s = TextUtils.stripColor(splitInto[i]); char c = s.charAt(0); @@ -78,15 +78,15 @@ public class ChatReplacerViewProfile implements IChatReplacer { } if (lastValidNickname == -1) continue; - if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1; - else lastprefix = lastValidNickname; + if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1; + else lastPrefix = lastValidNickname; String building = ""; - for (int i = 0; i < lastprefix; i++) { + for (int i = 0; i < lastPrefix; i++) { building += splitInto[i] +" "; } if (prefix != null) building += prefix.getData().replace("&", "§") + " "; - for (int i = lastprefix; i < lastValidNickname; i++) { + for (int i = lastPrefix; i < lastValidNickname; i++) { building += splitInto[i] +" "; } if (color != null) { @@ -116,15 +116,15 @@ public class ChatReplacerViewProfile implements IChatReplacer { ChatComponentText newChatCompText = new ChatComponentText(building); newChatCompText.setChatStyle(sibling.getChatStyle()); - replaceMents.add(new Tuple<>(sibling, newChatCompText)); + replacements.add(new Tuple<>(sibling, newChatCompText)); break; } } } - for (Tuple replaceMent : replaceMents) { - int index = event.message.getSiblings().indexOf(replaceMent.getFirst()); - event.message.getSiblings().set(index, replaceMent.getSecond()); + for (Tuple replacement : replacements) { + int index = event.message.getSiblings().indexOf(replacement.getFirst()); + event.message.getSiblings().set(index, replacement.getSecond()); } } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java index 6d104b8f..27f97a0c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java @@ -73,7 +73,7 @@ public class RichPresence * Constructs a {@link JSONObject} representing a payload to send to discord * to update a user's Rich Presence. * - *

This is purely internal, and should not ever need to be called outside of + *

This is purely internal and should not ever need to be called outside * the library. * * @return A JSONObject payload for updating a user's Rich Presence. @@ -259,7 +259,7 @@ public class RichPresence } /** - * Sets party configurations for a team, lobby, or other form of group. + * Sets party configurations for a team, lobby, or another form of group. * *

The {@code partyId} is ID of the player's party. *
The {@code partySize} is the current size of the player's party. @@ -267,7 +267,7 @@ public class RichPresence * * @param partyId The ID of the player's party. * @param partySize The current size of the player's party. - * @param partyMax The maximum number of player's allowed in the party. + * @param partyMax The maximum number of players allowed in the party. * * @return This Builder. */ diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java index 45231079..986e9ed9 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java @@ -28,7 +28,7 @@ public class User * Constructs a new {@link User}.
* Only implemented internally. * @param name user's name - * @param discriminator user's discrim + * @param discriminator user's discriminator * @param id user's id * @param avatar user's avatar hash, or {@code null} if they have no avatar */ @@ -41,7 +41,7 @@ public class User } /** - * Gets the Users account name. + * Gets the User's account name. * * @return The Users account name. */ @@ -51,7 +51,7 @@ public class User } /** - * Gets the Users discriminator. + * Gets the User's discriminator. * * @return The Users discriminator. */ @@ -83,7 +83,7 @@ public class User /** * Gets the Users avatar ID. * - * @return The Users avatar ID. + * @return The User's avatar ID. */ public String getAvatarId() { @@ -133,7 +133,7 @@ public class User } /** - * Gets whether or not this User is a bot.

+ * Gets whether this User is a bot or not.

* * While, at the time of writing this documentation, bots cannot * use Rich Presence features, there may be a time in the future -- cgit From b6494f93b773d9cc7a3bffff9a9a1abb10697051 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 21:21:20 -0800 Subject: Fix typos, grammar, and article agreement Adjust variable capitalization to match camelCase --- .../mod/dungeon/actions/ActionBreakWithSuperBoom.java | 6 +++--- .../dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java | 6 +++--- .../mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java | 4 ++-- .../doorfinder/catacombs/impl/MasterModeDataProvider.java | 2 +- .../doorfinder/catacombs/impl/NormalModeDataProvider.java | 2 +- .../dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java | 6 +++--- .../mod/dungeon/map/DungeonMapConstantRetreiver.java | 9 +++------ 7 files changed, 16 insertions(+), 19 deletions(-) (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java index 23b348a1..84c3ce1c 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java @@ -80,13 +80,13 @@ public class ActionBreakWithSuperBoom extends AbstractAction { GlStateManager.enableBlend(); Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer vertexbuffer = tessellator.getWorldRenderer(); - vertexbuffer.begin(7, DefaultVertexFormats.BLOCK); + WorldRenderer vertexBuffer = tessellator.getWorldRenderer(); + vertexBuffer.begin(7, DefaultVertexFormats.BLOCK); BlockRendererDispatcher blockrendererdispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher(); blockrendererdispatcher.getBlockModelRenderer().renderModel(Minecraft.getMinecraft().theWorld, blockrendererdispatcher.getBlockModelShapes().getModelForState(Blocks.tnt.getDefaultState()), - Blocks.tnt.getDefaultState(), blockpos, vertexbuffer, false); + Blocks.tnt.getDefaultState(), blockpos, vertexBuffer, false); tessellator.draw(); GlStateManager.enableLighting(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java index 502d21a8..00469a47 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java @@ -39,9 +39,9 @@ public class DungeonDoor { public DungeonDoor(World world, BlockPos pos, EDungeonDoorType type) { this.w = world; this.position = pos; - Block itshouldbeall = world.getChunkFromBlockCoords(pos).getBlock(pos); + Block itShouldBeAll = world.getChunkFromBlockCoords(pos).getBlock(pos); - if (type == EDungeonDoorType.WITHER && itshouldbeall == Blocks.air) type = EDungeonDoorType.WITHER_FAIRY; + if (type == EDungeonDoorType.WITHER && itShouldBeAll == Blocks.air) type = EDungeonDoorType.WITHER_FAIRY; this.type = type; boolean exist = type.isExist(); @@ -50,7 +50,7 @@ public class DungeonDoor { for (int z = -1; z<=1; z++) { BlockPos pos2 = pos.add(x,y,z); Block block = world.getChunkFromBlockCoords(pos2).getBlock(pos2); - if (itshouldbeall != block) exist = false; + if (itShouldBeAll != block) exist = false; } } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java index 7730cd55..0003cd7e 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java @@ -55,12 +55,12 @@ public abstract class CatacombsDataProvider implements DungeonSpecificDataProvid } /** - * This gets all morts checks for iron bars near him + * This gets all Mort's checks for iron bars near him * and based on iron bars determine the door location * * @param w World that we are going to look for the door in * world is explicitly specified instead of mc.theWorld bc we can use cached worlds - * @param dungeonName dungeon type eg master mode, currently unused + * @param dungeonName dungeon type e.g. master mode, currently unused * @return Block pos of the dungeon entrance */ public BlockPos findDoor(World w, String dungeonName) { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java index ab3f5df3..7cb217ce 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java @@ -31,7 +31,7 @@ public class MasterModeDataProvider extends CatacombsDataProvider { @Override public BossfightProcessor createBossfightProcessor(World w, String dungeonName) { String floor = dungeonName.substring(14).trim(); - ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: Master mode "+floor+ " Building bossfight processor")); + ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: Master mode " +floor+ " Building boss fight processor")); if (floor.equals("M5")) { return new BossfightProcessorLivid(true); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java index 880cf473..563239ed 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java @@ -30,7 +30,7 @@ public class NormalModeDataProvider extends CatacombsDataProvider { @Override public BossfightProcessor createBossfightProcessor(World w, String dungeonName) { String floor = dungeonName.substring(14).trim(); - ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: "+floor+ " Building bossfight processor")); + ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: " +floor+ " Building boss fight processor")); switch (floor) { case "F1": return new BossfightProcessorBonzo(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java index ff3061e5..f1718585 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java @@ -46,9 +46,9 @@ public class DungeonEventRecorder { createEvent(new DungeonSecretCountChangeEvent(latestSecretCnt, latestSecretCnt, latestTotalSecret, FeatureRegistry.DUNGEON_SECRETS.sureOfTotalSecrets())); } if (latestCrypts != FeatureRegistry.DUNGEON_TOMBS.getTombsFound()) { - int newlatestCrypts = FeatureRegistry.DUNGEON_TOMBS.getTombsFound(); - createEvent(new DungeonCryptBrokenEvent(latestCrypts, newlatestCrypts)); - this.latestCrypts = newlatestCrypts; + int newLatestCrypts = FeatureRegistry.DUNGEON_TOMBS.getTombsFound(); + createEvent(new DungeonCryptBrokenEvent(latestCrypts, newLatestCrypts)); + this.latestCrypts = newLatestCrypts; } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java index 34e12e05..4df16ca9 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java @@ -20,12 +20,9 @@ package kr.syeyoung.dungeonsguide.mod.dungeon.map; import com.google.common.collect.Sets; import kr.syeyoung.dungeonsguide.mod.chat.ChatTransmitter; -import kr.syeyoung.dungeonsguide.mod.dungeon.events.impl.DungeonNodataEvent; -import kr.syeyoung.dungeonsguide.mod.events.impl.DungeonContextInitializationEvent; import kr.syeyoung.dungeonsguide.mod.utils.MapUtils; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; -import net.minecraftforge.common.MinecraftForge; import javax.vecmath.Vector2d; import java.awt.*; @@ -74,7 +71,7 @@ public class DungeonMapConstantRetreiver { Vector2d mapDoorOffset, Vector2d worldDoorOffset, BlockPos worldDoor) { Point unitPoint = mapPointToRoomPoint(firstRoom.getLocation(), topLeftMapPoint, firstRoom.getSize(), doorDimension); - unitPoint.translate(unitPoint.x + 1, unitPoint.y + 1); // basically we make each room 2x2 large in this coordinate, and get the center coord + unitPoint.translate(unitPoint.x + 1, unitPoint.y + 1); // basically, we make each room 2x2 large in this coordinate and get the center coord unitPoint.translate((int) mapDoorOffset.x, (int) mapDoorOffset.y); if (!worldDoorOffset.equals(mapDoorOffset)) @@ -124,10 +121,10 @@ public class DungeonMapConstantRetreiver { private static Vector2d obtainStartingRoomToFirstRoomDoorDirection(byte[] mapData, Rectangle firstRoom) { Vector2d doorDir = null; - Point midfirstRoom = new Point(firstRoom.x + firstRoom.width / 2, firstRoom.y + firstRoom.height / 2); + Point midFirstRoom = new Point(firstRoom.x + firstRoom.width / 2, firstRoom.y + firstRoom.height / 2); final int halfWidth = firstRoom.width / 2 + 2; for (Vector2d v : directions) { - byte color = MapUtils.getMapColorAt(mapData, (int) (v.x * halfWidth + midfirstRoom.x), (int) (v.y * halfWidth + midfirstRoom.y)); + byte color = MapUtils.getMapColorAt(mapData, (int) (v.x * halfWidth + midFirstRoom.x), (int) (v.y * halfWidth + midFirstRoom.y)); if (color != 0) { doorDir = v; break; -- cgit From 2c3e379ae8417b89ddccb9bfcb4162373d18e08d Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 22 Jan 2023 21:22:27 -0800 Subject: Refactor DungeonMapConstantRetreiver.java to DungeonMapConstantRetriever.java because typo --- .../dungeonsguide/mod/dungeon/DungeonContext.java | 8 +- .../dungeon/map/DungeonMapConstantRetreiver.java | 136 --------------------- .../dungeon/map/DungeonMapConstantRetriever.java | 136 +++++++++++++++++++++ 3 files changed, 141 insertions(+), 139 deletions(-) delete mode 100644 mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java create mode 100644 mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetriever.java (limited to 'mod') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonContext.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonContext.java index 037eb442..62c557d7 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonContext.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonContext.java @@ -25,7 +25,7 @@ import kr.syeyoung.dungeonsguide.mod.dungeon.doorfinder.DungeonSpecificDataProvi import kr.syeyoung.dungeonsguide.mod.dungeon.events.DungeonEventRecorder; import kr.syeyoung.dungeonsguide.mod.dungeon.events.impl.DungeonNodataEvent; import kr.syeyoung.dungeonsguide.mod.dungeon.events.impl.DungeonPuzzleFailureEvent; -import kr.syeyoung.dungeonsguide.mod.dungeon.map.DungeonMapConstantRetreiver; +import kr.syeyoung.dungeonsguide.mod.dungeon.map.DungeonMapConstantRetriever; import kr.syeyoung.dungeonsguide.mod.dungeon.map.DungeonMapLayout; import kr.syeyoung.dungeonsguide.mod.dungeon.map.DungeonRoomScaffoldParser; import kr.syeyoung.dungeonsguide.mod.dungeon.map.MapPlayerProcessor; @@ -50,8 +50,10 @@ import net.minecraftforge.common.MinecraftForge; import javax.vecmath.Vector2d; import java.awt.*; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; -import java.util.*; +import java.util.Set; public class DungeonContext { @Getter @Setter @@ -189,7 +191,7 @@ public class Dun