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/src/main/java/kr/syeyoung/dungeonsguide') 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